CONTRIBUTING.md

@@ -1,61 +1,56 @@
 Glade official git repository is hosted by the GNOME foundation at
 gitlab.gnome.org
 
-Maintainer
+Mailing List
-============
+~~~~~~~~~~~~
-Glade is looking for a new maintainer, if you are interested please contact us
+Glade discussion takes place on glade-devel-list@gnome.org
-on gitlab.
+
+To subscribe or to consult archives visit
+	https://mail.gnome.org/mailman/listinfo/glade-devel-list
+
 
 GitLab
-========
+~~~~~~~~
 Glade bugs are tracked at
 
 	https://gitlab.gnome.org/GNOME/glade
 
 
 GIT
-===
+~~~
 You can browse the source code at https://gitlab.gnome.org/GNOME/glade
 To check out a copy of Glade you can use the following command:
 
 	git clone https://gitlab.gnome.org/GNOME/glade.git
 
 Patches
-=======
+~~~~~~~
 Patches must be in the unified format (diff -u) and must include a
 ChangeLog entry. Please send all patches to bugzilla.
 
 It is better to use git format-patch command
 
-```
 git format-patch HEAD^
-```
 
 Coding Style
-============
+~~~~~~~~~~~~
-Code in Glade should follow the GNU style of GNOME Programming Guidelines
+Code in Glade should follow the GNOME Programming Guidelines
-(https://developer.gnome.org/programming-guidelines/stable/c-coding-style.html.en),
+(http://developer.gnome.org/doc/guides/programming-guidelines/),
-basically this means being consistent with the surrounding code.
+basically this means being consistent with the sorrounding code.
 The only exception is that we prefer having braces always on a new line
 e.g.:
 
-```
 if (...)
   {
     ...
   }
-```
-
 
 Note however that a lot of the current codebase still uses the following
 style:
 
-```
 if (...) {
   ...
 }
-```
-
 
 Over time we'll migrate to the preferred form.
 
@@ -63,11 +58,11 @@ Naming conventions:
 - function names should be lowercase and prefixed with the
   file name (or, if the function is static and the name too long,
   with an abbreviation), e.g:
-  `glade_project_window_my_function ()`
+  glade_project_window_my_function ()
-  `gpw_my_loooooooooong_named_fuction ()`
+  gpw_my_loooooooooong_named_fuction ()
 - variable names should be lowercase and be short but self explanatory;
   if you need more than one word use an underscore, e.g:
-  `my_variable`
+  my_variable
 
 Also try to order your functions so that prototypes are not needed.
 

NEWS

@@ -1,31 +1,3 @@
-============
-Glade 3.40.0
-============
-	- Remove survey
-	- Add user manual menu item (Sabri Ünal)
-	- 'Clear' action in "Setup Text Attributes" dialog now clears only selected attributes (crvi)
-	- Fix issue #502 sync draw-indicator on setting xalign (Caolán McNamara)
-	- Fix issue #499 and #509 "Drop overzealous check using only the first child"
-	- Fix Segfault in gnome-builder when widget doesn't have a name (Peter Maatman)
-	- Fix issue #373 "Move separator in hamburger menu one up, to be consistent with other GNOME applications"
-	- Fix build against Python 3.9
-	- Fix issue #484 "Crash with GtkRecentChooserDialog"
-	- Fix issue #194 "Using List Store can result in program crash."
-	- Fix issue #53 "Can't choose a FileChooserDialog for a FileChooserButton"
-	- Fix issue #98 #491
-	- Fix issue #355 "Make notification text selectable"
-	- Fix windows build on msys
-	- Fix issue #360 "No examples in documentation on using custom catalogues with gtkBuilder"
-	- Fix issue #406 "AtkObject::accessible-role should not be translatable"
-	- Fix issue #479 "Glade 3.36.0 segfaults when opening a file"
-	- Fix issue #471 "XML not updated after adding element"
-	- Fix issue #474 "GtkLabel: setup text attribute issues"
-	- Fix issue #480 "version field not always updated in XML"
-	- Fix issue pasing widget with ctrl+v in GtkGrid
-	- Fix issue #470 "Widgets of type need placeholders to add children"
-	- Fix issue #472 "gnome-nightly: About dialog should display git commit rev"
-
-
 ============
 Glade 3.38.0
 ============

README.md

@@ -7,15 +7,9 @@ User interface designer for Gtk+ and GNOME
 
 Mailing Lists: 
 
-Both users and devel mailing list have been archived, you can find the archives at
+* <glade-users-list@gnome.org> - About using Glade to build applications.
+* <glade-devel-list@gnome.org> - About the development of Glade itself.
 
-* https://mail.gnome.org/archives/glade-users-list/
-* https://mail.gnome.org/archives/glade-devel-list/
-
-## Development status
-
-Glade is not being actively developed or maintained anymore. 
-If you are interested in becoming a maintainer please contact us on gitlab. 
 
 ## General Information
 
@@ -29,6 +23,7 @@ define a new GtkWidget derived object class using Gtk+ new template feature.
 By using GtkBuilder, Glade XML files can be used in numerous programming 
 languages including C, C++, C#, Vala, Java, Perl, Python, and others. 
 
+
 This version of Glade targets GTK 3  
 If you need to work with GTK 2, you can still use Glade 3.8
 ([more information](http://blogs.gnome.org/tvb/2011/01/15/the-glade-dl/))
@@ -54,19 +49,17 @@ Requirements
 
 Optional dependencies:
 
-* glib-networking plugins for TLS support (Needed for survey)
 * libwebkit2gtk-4.0 - For Webkit plugin
 * python-gi - For Python plugin
 * libgjs - For JavaScript plugin
-* gettext, itstool - For translation support
 
 Download sources from git and build using meson/ninja
 
 	# Install dependencies, for example in debian
-	sudo apt install gcc meson libgtk-3-dev libxml2-dev libgirepository1.0-dev xsltproc gettext itstool
+	sudo apt install gcc meson libgtk-3-dev libxml2-dev libgirepository1.0-dev xsltproc 
 	
 	# Optional dependencies
-	sudo apt install libgjs-dev libwebkit2gtk-4.0-dev python-gi-dev glib-networking
+	sudo apt install libgjs-dev libwebkit2gtk-4.0-dev python-gi-dev
 
 	# Clone the source repository or download tarball
 	git clone https://gitlab.gnome.org/GNOME/glade.git

data/meson.build

@@ -2,6 +2,7 @@ desktop_conf = configuration_data()
 desktop_conf.set('VERSION', glade_version)
 
 i18n.merge_file(
+  'desktop',
   type: 'desktop',
   input: configure_file(
     input: 'org.gnome.Glade.desktop.in.in',
@@ -17,6 +18,7 @@ i18n.merge_file(
 appdata = glade_name + '.appdata.xml'
 
 i18n.merge_file(
+  'appdata',
   input: 'org.gnome.Glade.appdata.xml.in',
   output: '@BASENAME@',
   po_dir: po_dir,

data/org.gnome.Glade.appdata.xml.in

@@ -49,42 +49,6 @@
   <project_group>GNOME</project_group>
   <translation type="gettext">glade</translation>
   <releases>
-    <release version="3.40.0" date="2022-08-10">
-      <description>
-        <p>Last Release!
-Glade is not being actively developed or maintained anymore.
-If you are interested in becoming a maintainer please contact us on gitlab.
-        </p>
-        <ul>
-          <li>Remove survey</li>
-	  <li>Add user manual menu item (Sabri Ünal)</li>
-	  <li>'Clear' action in "Setup Text Attributes" dialog now clears only selected attributes (crvi)</li>
-	  <li>Fix windows build on msys</li>
-	  <li>Fix build against Python 3.9</li>
-	  <li>Fix issue pasing widget with ctrl+v in GtkGrid</li>
-	  <li>Several bug fixes</li>
-        </ul>
-      </description>
-      <issues>
-	<issue url="https://gitlab.gnome.org/GNOME/glade/-/issues/502">Fix issue #502 sync draw-indicator on setting xalign (Caolán McNamara)</issue>
-	<issue url="https://gitlab.gnome.org/GNOME/glade/-/issues/499">Fix issue #499 and #509 "Drop overzealous check using only the first child"</issue>
-	<issue url="https://gitlab.gnome.org/GNOME/glade/-/issues/385">Fix Segfault in gnome-builder when widget doesn't have a name (Peter Maatman)</issue>
-	<issue url="https://gitlab.gnome.org/GNOME/glade/-/issues/373">Fix issue #373 "Move separator in hamburger menu one up, to be consistent with other GNOME applications"</issue>
-	<issue url="https://gitlab.gnome.org/GNOME/glade/-/issues/484">Fix issue #484 "Crash with GtkRecentChooserDialog"</issue>
-	<issue url="https://gitlab.gnome.org/GNOME/glade/-/issues/194">Fix issue #194 "Using List Store can result in program crash."</issue>
-	<issue url="https://gitlab.gnome.org/GNOME/glade/-/issues/53">Fix issue #53 "Can't choose a FileChooserDialog for a FileChooserButton"</issue>
-	<issue url="https://gitlab.gnome.org/GNOME/glade/-/issues/98">Fix issue #98 #491</issue>
-	<issue url="https://gitlab.gnome.org/GNOME/glade/-/issues/355">Fix issue #355 "Make notification text selectable"</issue>
-	<issue url="https://gitlab.gnome.org/GNOME/glade/-/issues/360">Fix issue #360 "No examples in documentation on using custom catalogues with gtkBuilder"</issue>
-	<issue url="https://gitlab.gnome.org/GNOME/glade/-/issues/406">Fix issue #406 "AtkObject::accessible-role should not be translatable"</issue>
-	<issue url="https://gitlab.gnome.org/GNOME/glade/-/issues/479">Fix issue #479 "Glade 3.36.0 segfaults when opening a file"</issue>
-	<issue url="https://gitlab.gnome.org/GNOME/glade/-/issues/471">Fix issue #471 "XML not updated after adding element"</issue>
-	<issue url="https://gitlab.gnome.org/GNOME/glade/-/issues/474">Fix issue #474 "GtkLabel: setup text attribute issues"</issue>
-	<issue url="https://gitlab.gnome.org/GNOME/glade/-/issues/480">Fix issue #480 "version field not always updated in XML"</issue>
-	<issue url="https://gitlab.gnome.org/GNOME/glade/-/issues/470">Fix issue #470 "Widgets of type need placeholders to add children"</issue>
-	<issue url="https://gitlab.gnome.org/GNOME/glade/-/issues/472">Fix issue #472 "gnome-nightly: About dialog should display git commit rev"</issue>
-      </issues>
-    </release>
     <release version="3.38.0" date="2020-09-12">
       <description>
         <p>Glade 3.38.0 release!</p>

data/org.gnome.Glade.desktop.in.in

@@ -13,3 +13,7 @@ Icon=org.gnome.Glade
 Categories=GNOME;GTK;Development;GUIDesigner;
 MimeType=application/x-gtk-builder;application/x-glade;
 X-GNOME-DocPath=glade/glade.xml
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=glade
+X-GNOME-Bugzilla-Version=@VERSION@
+X-GNOME-Bugzilla-Component=general

doc/catalogintro.sgml

@@ -35,20 +35,6 @@ some basic examples and describe a wealth of options that can be used to
 enhance UI editing and workaround exceptions.
     </para>
 
-    <para>
-Keep in mind you need to take extra steps to ensure GtkBuilder can pick up your
-new object types at runtime. Ussualy all you need is to link your executable
-with your widget library assuming it has properly named get_type() functions.
-
-<![CDATA[GtkWindow -> gtk_window_get_type
-GtkHBox -> gtk_hbox_get_type
-GtkUIManager -> gtk_ui_manager_get_type
-GWeatherLocation -> gweather_location_get_type]]>
-
-If not you can always register your widgets with the type system with g_type_ensure ()
-
-    </para>
-
     <para>
 The catalog file starts by specifying the name of the catalog and the plugin
 library to use, the following examples assume you have a namespace "Foo" and

glade.doap

@@ -9,20 +9,20 @@
   <description>Glade is a RAD tool to enable quick and easy development of user interfaces for the GTK+ 3 toolkit and the GNOME desktop environment.</description>
   <shortdesc xml:lang="en">User Interface Builder for GTK+ applications</shortdesc>
   <homepage rdf:resource="http://glade.gnome.org/" />
-  <developer-forum rdf:resource="https://discourse.gnome.org/tag/glade" />
+  <mailing-list rdf:resource="http://lists.ximian.com/mailman/listinfo/glade-devel" />
-  <download-page rdf:resource="https://download.gnome.org/sources/glade/" />
+  <download-page rdf:resource="http://download.gnome.org/sources/glade/" />
   <bug-database rdf:resource="https://gitlab.gnome.org/GNOME/glade/issues" />
 
   <category rdf:resource="http://api.gnome.org/doap-extensions#apps" />
   <programming-language>C</programming-language>
 
-<!--  <maintainer>
+  <maintainer>
     <foaf:Person>
       <foaf:name>Tristan Van Berkom</foaf:name>
       <foaf:mbox rdf:resource="mailto:tristan.van.berkom@gmail.com" />
       <gnome:userid>tvb</gnome:userid>
     </foaf:Person>
-  </maintainer> -->
+  </maintainer>
   <maintainer>
     <foaf:Person>
       <foaf:name>Juan Pablo Ugarte</foaf:name>

gladeui/glade-accumulators.h

@@ -1,27 +1,3 @@
-/*
- * glade-clipboard.h
- *
- * Copyright (C) 2005 The GNOME Foundation.
- *
- * Author(s):
- *      Tristan Van Berkom <tvb@gnome.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
- */
-
 #ifndef __GLADE_ACCUMULATORS_H__
 #define __GLADE_ACCUMULATORS_H__
 

gladeui/glade-app.c

@@ -178,10 +178,10 @@ build_package_paths (void)
 # endif
 
   if (!pixmaps_dir)
-    pixmaps_dir = g_build_filename (prefix, "share", PACKAGE_NAME, "pixmaps", NULL);
+    pixmaps_dir = g_build_filename (prefix, "share", PACKAGE, "pixmaps", NULL);
 
-  catalogs_dir = g_build_filename (prefix, "share", PACKAGE_NAME, "catalogs", NULL);
+  catalogs_dir = g_build_filename (prefix, "share", PACKAGE, "catalogs", NULL);
-  modules_dir = g_build_filename (prefix, "lib", PACKAGE_NAME, "modules", NULL);
+  modules_dir = g_build_filename (prefix, "lib", PACKAGE, "modules", NULL);
   locale_dir = g_build_filename (prefix, "share", "locale", NULL);
   bin_dir = g_build_filename (prefix, "bin", NULL);
   lib_dir = g_build_filename (prefix, "lib", NULL);

gladeui/glade-base-editor.c

@@ -1,3 +1,4 @@
+
 /*
  * Copyright (C) 2006-2016 Juan Pablo Ugarte.
  *

gladeui/glade-base-editor.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Juan Pablo Ugarte <juanpablougarte@gmail.com>
  */
-
 #ifndef __GLADE_BASE_EDITOR_H__
 #define __GLADE_BASE_EDITOR_H__
 

gladeui/glade-builtins.h

@@ -1,27 +1,3 @@
-/*
- * glade-clipboard.c - An object for handling Cut/Copy/Paste.
- *
- * Copyright (C) 2005 The GNOME Foundation.
- *
- * Author(s):
- *      Tristan Van Berkom <tvb@gnome.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
- */
-
 #ifndef __GLADE_BUILTINS_H__
 #define __GLADE_BUILTINS_H__
 

gladeui/glade-catalog.c

@@ -769,7 +769,7 @@ glade_catalog_load_all (void)
   /* First load catalogs from user specified directories ... */
   if ((search_path = g_getenv (GLADE_ENV_CATALOG_PATH)) != NULL)
     {
-      g_auto(GStrv) split = NULL;
+      g_auto(GStrv) split;
 
       if ((split = g_strsplit (search_path, ":", 0)) != NULL)
         {

gladeui/glade-clipboard.h

@@ -1,27 +1,3 @@
-/*
- * glade-clipboard.h
- *
- * Copyright (C) 2001 The GNOME Foundation.
- *
- * Author(s):
- *      Archit Baweja <bighead@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
- */
-
 #ifndef __GLADE_CLIPBOARD_H__
 #define __GLADE_CLIPBOARD_H__
 

gladeui/glade-command.c

@@ -19,7 +19,6 @@
  *   Joaquín Cuenca Abela <e98cuenc@yahoo.com>
  *   Archit Baweja <bighead@users.sourceforge.net>
  */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -427,12 +426,12 @@ glade_command_property_enabled_collapse (GladeCommand *this_cmd,
     this_priv->description =
       g_strdup_printf (_("Enabling property %s on widget %s"),
                        glade_property_def_get_name (pdef),
-                       glade_widget_get_display_name (widget));
+                       glade_widget_get_name (widget));
   else
     this_priv->description =
       g_strdup_printf (_("Disabling property %s on widget %s"),
                        glade_property_def_get_name (pdef),
-                       glade_widget_get_display_name (widget));
+                       glade_widget_get_name (widget));
 }
 
 /**
@@ -485,12 +484,12 @@ glade_command_set_property_enabled (GladeProperty *property,
     cmd_priv->description =
       g_strdup_printf (_("Enabling property %s on widget %s"),
                        glade_property_def_get_name (pdef),
-                       glade_widget_get_display_name (widget));
+                       glade_widget_get_name (widget));
   else
     cmd_priv->description =
       g_strdup_printf (_("Disabling property %s on widget %s"),
                        glade_property_def_get_name (pdef),
-                       glade_widget_get_display_name (widget));
+                       glade_widget_get_name (widget));
 
   glade_command_check_group (GLADE_COMMAND (me));
 
@@ -568,7 +567,7 @@ glade_command_set_property_execute (GladeCommand *cmd)
 
           g_print ("Setting %s property of %s to %s (sumode: %d)\n",
                    glade_property_def_id (pdef),
-                   glade_widget_get_display_name (widget),
+                   glade_widget_get_name (widget),
                    str, glade_property_superuser ());
 
           g_free (str);
@@ -797,13 +796,13 @@ glade_command_set_property_description (GladeCommandSetProperty *me)
         {
           description = g_strdup_printf (_("Setting %s of %s"),
                                          glade_property_def_get_name (pdef),
-                                         glade_widget_get_display_name (widget));
+                                         glade_widget_get_name (widget));
         }
       else
         {
           description = g_strdup_printf (_("Setting %s of %s to %s"),
                                          glade_property_def_get_name (pdef),
-                                         glade_widget_get_display_name (widget),
+                                         glade_widget_get_name (widget),
                                          value_name);
         }
       g_free (value_name);
@@ -1224,7 +1223,7 @@ glade_command_add (GList            *widgets,
 
   priv->description =
       g_strdup_printf (_("Add %s"), g_list_length (widgets) == 1 ?
-                       glade_widget_get_display_name (widget) : _("multiple"));
+                       glade_widget_get_name (widget) : _("multiple"));
 
   for (list = widgets; list && list->data; list = list->next)
     {
@@ -1379,9 +1378,9 @@ glade_command_remove (GList *widgets)
           glade_util_ui_message (glade_app_get_window (),
                                  GLADE_UI_WARN, NULL,
                                  _("%s is locked by %s, edit %s first."),
-                                 glade_widget_get_display_name (widget),
+                                 glade_widget_get_name (widget), 
-                                 glade_widget_get_display_name (lock),
+                                 glade_widget_get_name (lock),
-                                 glade_widget_get_display_name (lock));
+                                 glade_widget_get_name (lock));
           return;
         }
     }
@@ -1397,7 +1396,7 @@ glade_command_remove (GList *widgets)
 
   if (g_list_length (widgets) == 1)
     glade_command_push_group (_("Remove %s"),
-                              glade_widget_get_display_name (GLADE_WIDGET (widgets->data)));
+                              glade_widget_get_name (GLADE_WIDGET (widgets->data)));
   else
     glade_command_push_group (_("Remove multiple"));
 
@@ -1493,8 +1492,8 @@ glade_command_add_execute (GladeCommandAddRemove *me)
           GLADE_NOTE (COMMANDS,
                       g_print ("Adding widget '%s' to parent '%s' "
                                "(from clipboard: %s, props recorded: %s, have placeholder: %s, child_type: %s)\n",
-                               glade_widget_get_display_name (cdata->widget),
+                               glade_widget_get_name (cdata->widget),
-                               cdata->parent ? glade_widget_get_display_name (cdata->parent) : "(none)",
+                               cdata->parent ? glade_widget_get_name (cdata->parent) : "(none)",
                                me->from_clipboard ? "yes" : "no",
                                cdata->props_recorded ? "yes" : "no",
                                cdata->placeholder ? "yes" : "no",
@@ -1586,8 +1585,8 @@ glade_command_add_execute (GladeCommandAddRemove *me)
 
                   GLADE_NOTE (COMMANDS,
                               g_print ("Recorded properties for adding widget '%s' to parent '%s' (special child: %s)\n",
-                                       glade_widget_get_display_name (cdata->widget),
+                                       glade_widget_get_name (cdata->widget),
-                                       cdata->parent ? glade_widget_get_display_name (cdata->parent) : "(none)",
+                                       cdata->parent ? glade_widget_get_name (cdata->parent) : "(none)",
                                        cdata->special_type));
 
                   /* Mark the properties as recorded */
@@ -1632,8 +1631,8 @@ glade_command_remove_execute (GladeCommandAddRemove *me)
       GLADE_NOTE (COMMANDS,
                   g_print ("Removing widget '%s' from parent '%s' "
                            "(from clipboard: %s, props recorded: %s, have placeholder: %s, child_type: %s)\n",
-                           glade_widget_get_display_name (cdata->widget),
+                           glade_widget_get_name (cdata->widget),
-                           cdata->parent ? glade_widget_get_display_name (cdata->parent) : "(none)",
+                           cdata->parent ? glade_widget_get_name (cdata->parent) : "(none)",
                            me->from_clipboard ? "yes" : "no",
                            cdata->props_recorded ? "yes" : "no",
                            cdata->placeholder ? "yes" : "no",
@@ -1654,8 +1653,8 @@ glade_command_remove_execute (GladeCommandAddRemove *me)
 
           GLADE_NOTE (COMMANDS,
                       g_print ("Recorded properties for removing widget '%s' from parent '%s' (special child: %s)\n",
-                               glade_widget_get_display_name (cdata->widget),
+                               glade_widget_get_name (cdata->widget),
-                               cdata->parent ? glade_widget_get_display_name (cdata->parent) : "(none)",
+                               cdata->parent ? glade_widget_get_name (cdata->parent) : "(none)",
                                cdata->special_type));
 
           /* Mark the properties as recorded */
@@ -1758,42 +1757,6 @@ glade_command_add_remove_collapse (GladeCommand *this_cmd,
   g_return_if_reached ();
 }
 
-static void
-adjust_container_size (GladeWidget *parent, gint children)
-{
-  gint placeholders;
-  GObject *gparent;
-
-  if (!parent)
-    return;
-
-  placeholders = glade_util_count_placeholders (parent);
-  gparent = glade_widget_get_object (parent);
-
-  if ((GTK_IS_BOX (gparent) || GTK_IS_GRID (gparent)) && placeholders < children)
-    {
-      children -= placeholders;
-
-      if (GTK_IS_BOX (gparent))
-        {
-          GladeProperty *prop = glade_widget_get_property (parent, "size");
-          gint size;
-
-          glade_property_get (prop, &size);
-          glade_command_set_property (prop, size + children);
-        }
-      else
-        {
-          GladeProperty *row = glade_widget_get_property (parent, "n-rows");
-          gint ncol, nrow;
-
-          glade_widget_property_get (parent, "n-columns", &ncol);
-          glade_property_get (row, &nrow);
-          glade_command_set_property (row, nrow + (children / ncol) + ((children % ncol) ? 1 : 0));
-        }
-    }
-}
-
 /******************************************************************************
  * 
  * The following are command aliases.  Their implementations are the actual 
@@ -1819,8 +1782,8 @@ glade_command_create (GladeWidgetAdaptor *adaptor,
                       GladePlaceholder *placeholder,
                       GladeProject *project)
 {
-  GList widgets = { NULL, };
   GladeWidget *widget;
+  GList *widgets = NULL;
 
   g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
   g_return_val_if_fail (GLADE_IS_PROJECT (project), NULL);
@@ -1841,12 +1804,13 @@ glade_command_create (GladeWidgetAdaptor *adaptor,
       return NULL;
     }
 
-  widgets.data = widget;
+  widgets = g_list_prepend (widgets, widget);
-  glade_command_push_group (_("Create %s"), glade_widget_get_display_name (widget));
+  glade_command_push_group (_("Create %s"), glade_widget_get_name (widget));
-  adjust_container_size (parent, 1);
+  glade_command_add (widgets, parent, placeholder, project, FALSE);
-  glade_command_add (&widgets, parent, placeholder, project, FALSE);
   glade_command_pop_group ();
 
+  g_list_free (widgets);
+
   /* Make selection change immediately when a widget is created */
   glade_project_selection_changed (project);
 
@@ -1869,7 +1833,7 @@ glade_command_delete (GList *widgets)
   widget = widgets->data;
   glade_command_push_group (_("Delete %s"),
                             g_list_length (widgets) == 1 ? 
-                            glade_widget_get_display_name (widget) : _("multiple"));
+                            glade_widget_get_name (widget) : _("multiple"));
   glade_command_remove (widgets);
   glade_command_pop_group ();
 }
@@ -1895,7 +1859,7 @@ glade_command_cut (GList *widgets)
   widget = widgets->data;
   glade_command_push_group (_("Cut %s"),
                             g_list_length (widgets) == 1 ? 
-                            glade_widget_get_display_name (widget) : _("multiple"));
+                            glade_widget_get_name (widget) : _("multiple"));
   glade_command_remove (widgets);
   glade_command_pop_group ();
 
@@ -1983,7 +1947,6 @@ glade_command_paste (GList *widgets,
   GList *list, *copied_widgets = NULL;
   GladeWidget *copied_widget = NULL;
   gboolean exact;
-  gint len;
 
   g_return_if_fail (widgets != NULL);
 
@@ -1997,9 +1960,10 @@ glade_command_paste (GList *widgets,
       copied_widgets = g_list_prepend (copied_widgets, copied_widget);
     }
 
-  len = g_list_length (widgets);
+  glade_command_push_group (_("Paste %s"),
-  glade_command_push_group (_("Paste %s"), len == 1 ? glade_widget_get_display_name (copied_widget) : _("multiple"));
+                            g_list_length (widgets) == 1 ? 
-  adjust_container_size (parent, len);
+                            glade_widget_get_name (copied_widget) : _("multiple"));
+
   glade_command_add (copied_widgets, parent, placeholder, project, TRUE);
   glade_command_pop_group ();
 
@@ -2040,8 +2004,8 @@ glade_command_dnd (GList *widgets,
   
   glade_command_push_group (_("Drag %s and Drop to %s"),
                             g_list_length (widgets) == 1 ? 
-                            glade_widget_get_display_name (widget) : _("multiple"),
+                            glade_widget_get_name (widget) : _("multiple"),
-                            parent ? glade_widget_get_display_name (parent) : _("root"));
+                            parent ? glade_widget_get_name (parent) : _("root"));
   glade_command_remove (widgets);
   glade_command_add (widgets, parent, placeholder, project, TRUE);
   glade_command_pop_group ();
@@ -2494,8 +2458,8 @@ glade_command_lock_widget (GladeWidget *widget, GladeWidget *locked)
   priv->project = glade_widget_get_project (widget);
   priv->description =
     g_strdup_printf (_("Locking %s by widget %s"), 
-                     glade_widget_get_display_name (locked),
+                     glade_widget_get_name (locked),
-                     glade_widget_get_display_name (widget));
+                     glade_widget_get_name (widget));
 
   glade_command_check_group (cmd);
 
@@ -2538,7 +2502,7 @@ glade_command_unlock_widget (GladeWidget *widget)
   priv = glade_command_get_instance_private (cmd);
   priv->project = glade_widget_get_project (widget);
   priv->description =
-    g_strdup_printf (_("Unlocking %s"), glade_widget_get_display_name (widget));
+    g_strdup_printf (_("Unlocking %s"), glade_widget_get_name (widget));
 
   glade_command_check_group (cmd);
 
@@ -3037,10 +3001,10 @@ gcp_template_description_new (GladeCommand *cmd)
 
   if (new_template == NULL && old_template != NULL)
     return g_strdup_printf (_("Unsetting widget '%s' as template"),
-                            glade_widget_get_display_name (GLADE_WIDGET (old_template)));
+                            glade_widget_get_name (GLADE_WIDGET (old_template)));
   else if (new_template != NULL)
     return g_strdup_printf (_("Setting widget '%s' as template"),
-                            glade_widget_get_display_name (GLADE_WIDGET (new_template)));
+                            glade_widget_get_name (GLADE_WIDGET (new_template)));
   else
     return g_strdup (_("Unsetting template"));
 }

gladeui/glade-command.h

@@ -1,25 +1,3 @@
-/*
- * Copyright (C) 2002 Joaquín Cuenca Abela
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Authors:
- *   Joaquín Cuenca Abela <e98cuenc@yahoo.com>
- *   Archit Baweja <bighead@users.sourceforge.net>
- */
-
 #ifndef __GLADE_COMMAND_H__
 #define __GLADE_COMMAND_H__
 

gladeui/glade-cursor.h

@@ -1,24 +1,3 @@
-/*
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Authors:
- *   Chema Celorio <chema@celorio.com>
- */
-
 #ifndef __GLADE_CURSOR_H__
 #define __GLADE_CURSOR_H__
 

gladeui/glade-debug.h

@@ -1,24 +1,3 @@
-/*
- * Copyright (C) 2003 Joaquin Cuenca Abela
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Authors:
- *   Joaquin Cuenca Abela <e98cuenc@yahoo.com>
- */
-
 #ifndef __GLADE_DEBUG_H__
 #define __GLADE_DEBUG_H__
 

gladeui/glade-displayable-values.c

@@ -1,5 +1,5 @@
 /*
- * glade-displayable-values.c
+ * glade-name-context.c
  *
  * Copyright (C) 2008 Tristan Van Berkom.
  *
@@ -21,7 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

gladeui/glade-displayable-values.h

@@ -1,27 +1,3 @@
-/*
- * glade-displayable-values.h
- *
- * Copyright (C) 2008 Tristan Van Berkom.
- *
- * Authors:
- *   Tristan Van Berkom <tvb@gnome.org>
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
 #ifndef __GLADE_DISAPLAYABLE_VALUES_H__
 #define __GLADE_DISAPLAYABLE_VALUES_H__
 

gladeui/glade-editable.c

@@ -21,7 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

gladeui/glade-editable.h

@@ -1,27 +1,3 @@
-/*
- * glade-editable.h
- *
- * Copyright (C) 2008 Tristan Van Berkom.
- *
- * Authors:
- *   Tristan Van Berkom <tvb@gnome.org>
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
 #ifndef __GLADE_EDITABLE_H__
 #define __GLADE_EDITABLE_H__
 

gladeui/glade-editor-property.c

@@ -204,7 +204,9 @@ glade_editor_property_commit_common (GladeEditorProperty *eprop,
   if (glade_property_def_get_construct_only (priv->property_def))
     {
       gboolean focus_set = FALSE;
-      deepest_child_grab_focus (priv->input, &focus_set);
+      gtk_container_foreach (GTK_CONTAINER (priv->input),
+                             deepest_child_grab_focus,
+                             &focus_set);
     }
 }
 
@@ -2949,7 +2951,7 @@ glade_eprop_object_populate_view_real (GtkTreeStore *model,
 
           widget_name = glade_widget_get_display_name (widget);
           if (parentless)
-            good_type = good_type && GLADE_WIDGET_ADAPTOR_IS_TOPLEVEL (adaptor);
+            good_type = good_type && !GLADE_WIDGET_ADAPTOR_IS_TOPLEVEL (adaptor);
 
           if (good_type || has_decendant)
             {

gladeui/glade-editor-property.h

@@ -1,24 +1,3 @@
-/*
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Authors:
- *   Tristan Van Berkom <tvb@gnome.org>
- */
-
 #ifndef __GLADE_EDITOR_PROPERTY_H__
 #define __GLADE_EDITOR_PROPERTY_H__
 

gladeui/glade-editor-skeleton.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef __GLADE_EDITOR_SKELETON_H__
 #define __GLADE_EDITOR_SKELETON_H__
 

gladeui/glade-editor-table.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef _GLADE_EDITOR_BUTTON_H_
 #define _GLADE_EDITOR_BUTTON_H_
 

gladeui/glade-editor.c

@@ -20,6 +20,7 @@
  *   Tristan Van Berkom <tvb@gnome.org>
  */
 
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

gladeui/glade-editor.h

@@ -1,25 +1,3 @@
-/*
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Authors:
- *   Chema Celorio <chema@celorio.com>
- *   Tristan Van Berkom <tvb@gnome.org>
- */
-
 #ifndef __GLADE_EDITOR_H__
 #define __GLADE_EDITOR_H__
 

gladeui/glade-name-context.c

@@ -21,7 +21,6 @@
  *   Tristan Van Berkom <tvb@gnome.org>
  *
  */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

gladeui/glade-name-context.h

@@ -1,27 +1,3 @@
-/*
- * glade-name-context.c
- *
- * Copyright (C) 2008 Tristan Van Berkom.
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Authors:
- *   Tristan Van Berkom <tvb@gnome.org>
- *
- */
-
 #ifndef __GLADE_NAME_CONTEXT_H__
 #define __GLADE_NAME_CONTEXT_H__
 

gladeui/glade-palette.c

@@ -24,7 +24,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

gladeui/glade-placeholder.c

@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- */
+*/
 
 #include "config.h"
 

gladeui/glade-placeholder.h

@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- */
+*/
  
 #ifndef __GLADE_PLACEHOLDER_H__
 #define __GLADE_PLACEHOLDER_H__

gladeui/glade-popup.c

@@ -68,10 +68,9 @@ glade_popup_widget_add_cb (GtkMenuItem *item, RootAddData *data)
 {
   g_return_if_fail (data->adaptor != NULL);
 
-  if (glade_command_create (data->adaptor,
+  if (glade_command_create (data->adaptor, data->parent,
-                            data->parent,
+                            data->placeholder, data->project))
-                            data->placeholder,
+
-                            data->project))
     glade_project_set_add_item (data->project, NULL);
 }
 

gladeui/glade-popup.h

@@ -1,25 +1,3 @@
-/*
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Authors:
- *   Chema Celorio <chema@celorio.com>
- *   Tristan Van Berkom <tvb@gnome.org>
- */
-
 #ifndef __GLADE_POPUP_H__
 #define __GLADE_POPUP_H__
 

gladeui/glade-previewer.c

@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-
 #include <config.h>
 
 #include "glade-previewer.h"

gladeui/glade-previewer.rc.in

@@ -1,6 +1,6 @@
 #include <winver.h>                      
 
-GLADE_ICON		ICON		"@SOURCE_ROOT@/data/icons/glade.ico"
+GLADE_ICON		ICON		"../data/icons/glade.ico"
 
 VS_VERSION_INFO VERSIONINFO
   FILEVERSION     @GLADE_MAJOR_VERSION@,@GLADE_MINOR_VERSION@,@GLADE_MICRO_VERSION@,0
@@ -15,7 +15,7 @@ VS_VERSION_INFO VERSIONINFO
         VALUE "CompanyName", "The GNOME Foundation"
         VALUE "FileDescription", "Glade Interface Designer @GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@"
         VALUE "FileVersion", "@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@.0"
-        VALUE "LegalCopyright", "Copyright 2007 The GNOME Foundation"
+        VALUE "LegalCopyright", "Copyright © 2007 The GNOME Foundation"
         VALUE "OriginalFilename", "glade-previewer.exe"
         VALUE "ProductName", "Glade Interface Designer"
         VALUE "ProductVersion", "@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@.0"

gladeui/glade-project-properties.c

@@ -129,7 +129,7 @@ typedef struct
   GtkWidget *css_filechooser;
   GtkWidget *css_checkbutton;
   
-  GHashTable *target_combos;
+  GHashTable *target_radios;
 
   /* License */
   GtkComboBox    *license_comboboxtext;
@@ -169,7 +169,7 @@ glade_project_properties_init (GladeProjectProperties *properties)
 {
   GladeProjectPropertiesPrivate *priv = GLADE_PROJECT_PROPERTIES_PRIVATE(properties);
 
-  priv->target_combos = g_hash_table_new_full (g_str_hash, g_str_equal,
+  priv->target_radios = g_hash_table_new_full (g_str_hash, g_str_equal,
                                                g_free, NULL);
 
   gtk_widget_init_template (GTK_WIDGET (properties));
@@ -262,7 +262,7 @@ glade_project_properties_finalize (GObject *object)
   GladeProjectProperties        *properties = GLADE_PROJECT_PROPERTIES (object);
   GladeProjectPropertiesPrivate *priv = GLADE_PROJECT_PROPERTIES_PRIVATE(properties);
 
-  g_hash_table_destroy (priv->target_combos);
+  g_hash_table_destroy (priv->target_radios);
 
   G_OBJECT_CLASS (glade_project_properties_parent_class)->finalize (object);
 }
@@ -289,7 +289,7 @@ combobox_populate_from_catalog (GladeProjectProperties *properties,
                                      version->major,
                                      version->minor);
 
-      gtk_combo_box_text_insert (GTK_COMBO_BOX_TEXT(combobox), position, name, name);
+      gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT(combobox), position, name);
       if (major == version->major && minor == version->minor)
         gtk_combo_box_set_active (GTK_COMBO_BOX(combobox), position);
 
@@ -299,7 +299,7 @@ combobox_populate_from_catalog (GladeProjectProperties *properties,
                          (gchar *) glade_catalog_get_name (catalog));
     }
 
-  g_hash_table_insert (priv->target_combos,
+  g_hash_table_insert (priv->target_radios,
                        g_strdup (glade_catalog_get_name (catalog)),
                        combobox);
 }
@@ -1107,19 +1107,19 @@ project_targets_changed (GladeProject           *project,
       GladeCatalog *catalog = list->data;
       GtkComboBox *combobox;
       gint minor, major;
-      const gchar *name;
 
       /* Skip if theres only one option */
       if (g_list_length (glade_catalog_get_targets (catalog)) <= 1)
         continue;
 
       /* Fetch the version for this project */
-      name = glade_catalog_get_name (catalog);
+      glade_project_get_target_version (priv->project,
-      glade_project_get_target_version (priv->project, name, &major, &minor);
+                                        glade_catalog_get_name (catalog),
+                                        &major, &minor);
 
       /* Fetch the radios for this catalog  */
-      if (priv->target_combos &&
+      if (priv->target_radios &&
-          (combobox = g_hash_table_lookup (priv->target_combos, name)) != NULL)
+          (combobox = g_hash_table_lookup (priv->target_radios, glade_catalog_get_name (catalog))) != NULL)
         {
           g_autofree gchar *id = NULL;
           id = g_strdup_printf ("%d.%d", major, minor);

gladeui/glade-project.c

@@ -3661,12 +3661,10 @@ glade_project_get_widget_by_name (GladeProject *project, const gchar *name)
   for (list = project->priv->objects; list; list = list->next)
     {
       GladeWidget *widget;
-      gchar *widget_name;
 
       widget = glade_widget_get_from_gobject (list->data);
-      widget_name = glade_widget_get_name (widget);
 
-      if (g_strcmp0 (widget_name, name) == 0)
+      if (strcmp (glade_widget_get_name (widget), name) == 0)
         return widget;
     }
 
@@ -5320,7 +5318,8 @@ glade_project_command_paste (GladeProject     *project,
 {
   GladeClipboard *clipboard;
   GList *list;
-  GladeWidget *widget = NULL, *parent = NULL;
+  GladeWidget *widget = NULL, *parent;
+  gint placeholder_relations = 0;
 
   g_return_if_fail (GLADE_IS_PROJECT (project));
 
@@ -5340,10 +5339,8 @@ glade_project_command_paste (GladeProject     *project,
   /* If there is a selection, paste in to the selected widget, otherwise
    * paste into the placeholder's parent, or at the toplevel
    */
-  if (list)
+  parent = list ? glade_widget_get_from_gobject (list->data) :
-    parent = glade_widget_get_from_gobject (list->data);
+      (placeholder) ? glade_placeholder_get_parent (placeholder) : NULL;
-  else if (placeholder)
-    parent = glade_placeholder_get_parent (placeholder);
 
   widget = glade_clipboard_widgets (clipboard) ? glade_clipboard_widgets (clipboard)->data : NULL;
 
@@ -5396,6 +5393,51 @@ glade_project_command_paste (GladeProject     *project,
         }
     }
 
+
+  /* Check that we have compatible heirarchies */
+  for (list = glade_clipboard_widgets (clipboard); list && list->data; list = list->next)
+    {
+      widget = list->data;
+
+      if (!GLADE_WIDGET_ADAPTOR_IS_TOPLEVEL (glade_widget_get_adaptor (widget)) && parent)
+        {
+          /* Count placeholder relations
+           */
+          if (glade_widget_placeholder_relation (parent, widget))
+            placeholder_relations++;
+        }
+    }
+
+  g_assert (widget);
+
+  /* A GladeWidget that doesnt use placeholders can only paste one
+   * at a time
+   *
+   * XXX: Not sure if this has to be true.
+   */
+  if (GTK_IS_WIDGET (glade_widget_get_object (widget)) &&
+      parent && !GLADE_WIDGET_ADAPTOR_USE_PLACEHOLDERS (glade_widget_get_adaptor (parent)) &&
+      g_list_length (glade_clipboard_widgets (clipboard)) != 1)
+    {
+      glade_util_ui_message (glade_app_get_window (),
+                             GLADE_UI_INFO, NULL,
+                             _("Only one widget can be pasted at a "
+                               "time to this container"));
+      return;
+    }
+
+  /* Check that enough placeholders are available */
+  if (parent &&
+      GLADE_WIDGET_ADAPTOR_USE_PLACEHOLDERS (glade_widget_get_adaptor (parent)) &&
+      glade_util_count_placeholders (parent) < placeholder_relations)
+    {
+      glade_util_ui_message (glade_app_get_window (),
+                             GLADE_UI_INFO, NULL,
+                             _("Insufficient amount of placeholders in "
+                               "target container"));
+      return;
+    }
+
   glade_command_paste (glade_clipboard_widgets (clipboard), parent, placeholder, project);
 }
 

gladeui/glade-project.h

@@ -1,26 +1,3 @@
-/*
- * Copyright (C) 2001 Ximian, Inc.
- * Copyright (C) 2008 Tristan Van Berkom
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Authors:
- *   Chema Celorio <chema@celorio.com>
- *   Tristan Van Berkom <tvb@gnome.org>
- */
-
 #ifndef __GLADE_PROJECT_H__
 #define __GLADE_PROJECT_H__
 

gladeui/glade-property-def.c

@@ -38,6 +38,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <glib/gi18n-lib.h>
+#include <locale.h>
 
 #include "glade.h"
 #include "glade-widget.h"
@@ -457,32 +458,34 @@ glade_property_def_make_string_from_objects (GladePropertyDef *
   return string;
 }
 
+static locale_t
+get_C_locale (void)
+{
+  static gsize initialized = FALSE;
+  static locale_t C_locale = NULL;
+
+  if (g_once_init_enter (&initialized))
+    {
+      C_locale = newlocale (LC_ALL_MASK, "C", NULL);
+      g_once_init_leave (&initialized, TRUE);
+    }
+
+  return C_locale;
+}
+
 static gchar *
 glade_dtostr (double number, gdouble epsilon)
 {
-  char *str = g_malloc (G_ASCII_DTOSTR_BUF_SIZE + 1);
+  char *str = g_malloc (G_ASCII_DTOSTR_BUF_SIZE);
-  char real_number[G_ASCII_DTOSTR_BUF_SIZE + 1];
-  const gchar *decimal = NULL;
   int i;
 
-  g_ascii_dtostr (str, G_ASCII_DTOSTR_BUF_SIZE, number);
+  for (i = 0; i <= 20; i++)
-  g_ascii_dtostr (real_number, G_ASCII_DTOSTR_BUF_SIZE, number);
-  decimal = g_strstr_len (real_number, G_ASCII_DTOSTR_BUF_SIZE, ".");
-
-  if (!decimal)
-    return str;
-
-  decimal++;
-
-  for (i = 1; i <= 20; i++)
     {
-      gint len = (decimal - real_number) + i;
       double rounded;
-
+      locale_t old_locale;
-      /* add up to i decimal points */
+      old_locale = uselocale (get_C_locale ());
-      str[len] = real_number[len];
+      snprintf (str, G_ASCII_DTOSTR_BUF_SIZE, "%.*f", i, number);
-      str[len+1] = '\0';
+      uselocale (old_locale);
-
       rounded = g_ascii_strtod (str, NULL);
 
       if (ABS (rounded - number) <= epsilon)
@@ -500,10 +503,15 @@ glade_dtostr (double number, gdouble epsilon)
  * Returns: A newly allocated string representation of @value
  */
 gchar *
-glade_property_def_make_string_from_gvalue (GladePropertyDef *property_def,
+glade_property_def_make_string_from_gvalue (GladePropertyDef *
-                                            const GValue     *value)
+                                              property_def,
+                                              const GValue * value)
 {
-  gchar *string = NULL;
+  gchar *string = NULL, **strv;
+  GObject *object;
+  GdkColor *color;
+  GdkRGBA *rgba;
+  GList *objects;
 
   G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   if (GLADE_PROPERTY_IS_PARAM_SPEC_VALUE_ARRAY (property_def->pspec))
@@ -543,26 +551,20 @@ glade_property_def_make_string_from_gvalue (GladePropertyDef *property_def,
     {
       if (property_def->pspec->value_type == GDK_TYPE_COLOR)
         {
-          GdkColor *color = g_value_get_boxed (value);
+          color = g_value_get_boxed (value);
           if (color)
             string = g_strdup_printf ("#%04x%04x%04x",
                                       color->red, color->green, color->blue);
         }
       else if (property_def->pspec->value_type == GDK_TYPE_RGBA)
         {
-          GdkRGBA *rgba = g_value_get_boxed (value);
+          rgba = g_value_get_boxed (value);
           if (rgba)
             string = gdk_rgba_to_string (rgba);
         }
-      else if (property_def->pspec->value_type == PANGO_TYPE_COLOR)
-        {
-          PangoColor *color = g_value_get_boxed (value);
-          if (color)
-            string = pango_color_to_string (color);
-        }
       else if (property_def->pspec->value_type == G_TYPE_STRV)
         {
-          gchar **strv = g_value_get_boxed (value);
+          strv = g_value_get_boxed (value);
           if (strv)
             string = g_strjoinv ("\n", strv);
         }
@@ -612,13 +614,13 @@ glade_property_def_make_string_from_gvalue (GladePropertyDef *property_def,
     }
   else if (G_IS_PARAM_SPEC_OBJECT (property_def->pspec))
     {
-      GObject *object = g_value_get_object (value);
+      object = g_value_get_object (value);
       string =
           glade_property_def_make_string_from_object (property_def, object);
     }
   else if (GLADE_IS_PARAM_SPEC_OBJECTS (property_def->pspec))
     {
-      GList *objects = g_value_get_boxed (value);
+      objects = g_value_get_boxed (value);
       string =
           glade_property_def_make_string_from_objects (property_def,
                                                          objects);
@@ -844,6 +846,8 @@ glade_property_def_make_gvalue_from_string (GladePropertyDef *property_def,
 {
   GValue *value = g_new0 (GValue, 1);
   gchar **strv;
+  GdkColor color = { 0, };
+  GdkRGBA rgba = { 0, };
 
   g_value_init (value, property_def->pspec->value_type);
 
@@ -890,7 +894,6 @@ glade_property_def_make_gvalue_from_string (GladePropertyDef *property_def,
     {
       if (property_def->pspec->value_type == GDK_TYPE_COLOR)
         {
-          GdkColor color;
           if (gdk_color_parse (string, &color))
             g_value_set_boxed (value, &color);
           else
@@ -898,20 +901,11 @@ glade_property_def_make_gvalue_from_string (GladePropertyDef *property_def,
         }
       else if (property_def->pspec->value_type == GDK_TYPE_RGBA)
         {
-          GdkRGBA rgba;
           if (gdk_rgba_parse (&rgba, string))
             g_value_set_boxed (value, &rgba);
           else
             g_warning ("could not parse rgba colour name `%s'", string);
         }
-      else if (property_def->pspec->value_type == PANGO_TYPE_COLOR)
-        {
-          PangoColor color;
-          if (pango_color_parse (&color, string))
-            g_value_set_boxed (value, &color);
-          else
-            g_warning ("could not parse pango color name `%s'", string);
-        }
       else if (property_def->pspec->value_type == G_TYPE_STRV)
         {
           strv = g_strsplit (string, "\n", 0);

gladeui/glade-property-def.h

@@ -1,25 +1,3 @@
-/*
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Authors:
- *   Chema Celorio <chema@celorio.com>
- *   Tristan Van Berkom <tristan.van.berkom@gmail.com>
- */
-
 #ifndef __GLADE_PROPERTY_DEF_H__
 #define __GLADE_PROPERTY_DEF_H__
 

gladeui/glade-property-label.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef __GLADE_PROPERTY_LABEL_H__
 #define __GLADE_PROPERTY_LABEL_H__
 

gladeui/glade-property-shell.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef __GLADE_PROPERTY_SHELL_H__
 #define __GLADE_PROPERTY_SHELL_H__
 

gladeui/glade-property.c

@@ -639,21 +639,11 @@ glade_property_init (GladeProperty *property)
   property->priv->precision = 2;
   property->priv->enabled = TRUE;
   property->priv->sensitive = TRUE;
-  property->priv->i18n_translatable = FALSE;
+  property->priv->i18n_translatable = TRUE;
   property->priv->i18n_comment = NULL;
   property->priv->sync_tolerance = 1;
 }
 
-static void
-glade_property_constructed (GObject *object)
-{
-  GladeProperty *property = GLADE_PROPERTY (object);
-  GParamSpec *pspec = glade_property_def_get_pspec (property->priv->def);
-
-  /* Only string properties are translatable */
-  glade_property_i18n_set_translatable (property, G_IS_PARAM_SPEC_STRING (pspec));
-}
-
 static void
 glade_property_class_init (GladePropertyClass * prop_class)
 {
@@ -662,7 +652,6 @@ glade_property_class_init (GladePropertyClass * prop_class)
   /* GObjectClass */
   object_class->set_property = glade_property_set_real_property;
   object_class->get_property = glade_property_get_real_property;
-  object_class->constructed = glade_property_constructed;
   object_class->finalize = glade_property_finalize;
 
   /* Class methods */
@@ -712,7 +701,7 @@ glade_property_class_init (GladePropertyClass * prop_class)
     g_param_spec_boolean ("i18n-translatable",
                           _("Translatable"),
                           _("Whether this property is translatable"),
-                          FALSE,
+                          TRUE,
                           G_PARAM_READWRITE);
 
   properties[PROP_STATE] =
@@ -784,9 +773,8 @@ glade_property_new (GladePropertyDef *def,
 
   g_return_val_if_fail (GLADE_IS_PROPERTY_DEF (def), NULL);
 
-  property = (GladeProperty *) g_object_new (GLADE_TYPE_PROPERTY,
+  property = (GladeProperty *) g_object_new (GLADE_TYPE_PROPERTY, NULL);
-                                             "class", def,
+  property->priv->def = def;
-                                             NULL);
   property->priv->widget = widget;
   property->priv->value = value;
 

gladeui/glade-property.h

@@ -1,26 +1,3 @@
-/*
- * Copyright (C) 2001 Ximian, Inc.
- * Copyright (C) 2006 The GNOME Foundation.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Authors:
- *   Chema Celorio <chema@celorio.com>
- *   Tristan Van Berkom <tvb@gnome.org>
- */
-
 #ifndef __GLADE_PROPERTY_H__
 #define __GLADE_PROPERTY_H__
 

gladeui/glade-signal-def.c

@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+
 #include <config.h>
 #include "glade-signal-def.h"
 #include "glade-widget-adaptor.h"

gladeui/glade-signal-editor.c

@@ -19,7 +19,6 @@
  *   Shane Butler <shane_b@users.sourceforge.net>
  *   Joaquin Cuenca Abela <e98cuenc@yahoo.com>
  */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

gladeui/glade-signal-editor.h

@@ -1,25 +1,3 @@
-/*
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Authors:
- *   Shane Butler <shane_b@users.sourceforge.net>
- *   Joaquin Cuenca Abela <e98cuenc@yahoo.com>
- */
-
 #ifndef __GLADE_SIGNAL_EDITOR_H__
 #define __GLADE_SIGNAL_EDITOR_H__
 

gladeui/glade-signal-model.c

@@ -1,6 +1,5 @@
 /*
  * glade-signal-model.c
- *
  * Copyright (C) Johannes Schmid 2010 <jhs@gnome.org>
  * 
  * This library is free software; you can redistribute it and/or modify it
@@ -17,7 +16,6 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

gladeui/glade-signal-model.h

@@ -1,6 +1,5 @@
 /*
  * glade-signal-model.h
- *
  * Copyright (C) Johannes Schmid 2010 <jhs@gnome.org>
  * 
  * This library is free software; you can redistribute it and/or modify it

gladeui/glade-signal.h

@@ -1,25 +1,3 @@
-/*
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Authors:
- *   Chema Celorio <chema@celorio.com>
- *   Paolo Borelli <pborelli@katamail.com>
- */
-
 #ifndef __GLADE_SIGNAL_H__
 #define __GLADE_SIGNAL_H__
 

gladeui/glade-utils.c

@@ -190,13 +190,6 @@ _glade_util_dialog_set_hig (GtkDialog *dialog)
   gtk_box_set_spacing (GTK_BOX (action_area), 6);
 }
 
-static void
-glade_util_ui_message_foreach (GtkWidget *widget, gpointer data)
-{
-  if (GTK_IS_LABEL (widget))
-    gtk_label_set_selectable (GTK_LABEL (widget), TRUE);
-}
-
 /**
  * glade_util_ui_message:
  * @parent: a #GtkWindow cast as a #GtkWidget
@@ -278,10 +271,6 @@ glade_util_ui_message (GtkWidget *parent,
                                    GTK_DIALOG_DESTROY_WITH_PARENT,
                                    message_type, buttons_type, NULL);
   
-  /* Make labels selectable */
-  gtk_container_forall (GTK_CONTAINER (gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog))),
-                        glade_util_ui_message_foreach, NULL);
-
   gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dialog), string);
 
   if (widget)
@@ -1176,15 +1165,15 @@ glade_util_search_devhelp (const gchar *book,
 GtkWidget *
 glade_util_get_placeholder_from_pointer (GtkContainer *container)
 {
+  GdkDeviceManager *manager;
   GdkDisplay *display;
   GdkDevice *device;
   GdkWindow *window;
-  GdkSeat *seat;
 
   if (((display = gtk_widget_get_display (GTK_WIDGET (container))) || 
        (display = gdk_display_get_default ())) &&
-      (seat = gdk_display_get_default_seat (display)) &&
+      (manager = gdk_display_get_device_manager (display)) &&
-      (device = gdk_seat_get_pointer (seat)) &&
+      (device = gdk_device_manager_get_client_pointer (manager)) &&
       (window = gdk_device_get_window_at_position (device, NULL, NULL)))
     {
       gpointer widget;
@@ -1280,8 +1269,6 @@ glade_util_get_file_mtime (const gchar *filename, GError **error)
   struct stat info;
   gint retval;
 
-  g_return_val_if_fail (filename, 0);
-
   retval = g_stat (filename, &info);
 
   if (retval != 0)
@@ -2082,14 +2069,10 @@ glade_utils_get_pointer (GtkWidget *widget,
 
   if (!device)
     {
-      GdkDisplay *dsp;
+      GdkEvent *event = gtk_get_current_event ();
-      GdkSeat *seat;
 
-      if (((dsp = gtk_widget_get_display (widget)) ||
+      device = gdk_event_get_device (event);
-           (dsp = gdk_display_get_default ())) &&
+      gdk_event_free (event);
-          (seat = gdk_display_get_default_seat (dsp)) &&
-          (device = gdk_seat_get_pointer (seat)))
-        window = gdk_device_get_window_at_position (device, NULL, NULL);
     }
 
   g_return_if_fail (GDK_IS_DEVICE (device));
@@ -2183,7 +2166,7 @@ _glade_util_file_get_relative_path (GFile *target, GFile *source)
           relative_path = g_file_get_relative_path (target, source);
 
           g_string_append (relpath, "..");
-          g_string_append_c (relpath, '/');
+          g_string_append_c (relpath, G_DIR_SEPARATOR);
 
           g_object_unref (old_target);
         }

gladeui/glade-utils.h

@@ -1,24 +1,3 @@
-/*
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Authors:
- *   Chema Celorio <chema@celorio.com>
- */
-
 #ifndef __GLADE_UTILS_H__
 #define __GLADE_UTILS_H__
 

gladeui/glade-widget-adaptor.h

@@ -1,24 +1,3 @@
-/*
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Authors:
- *   Tristan Van Berkom <tvb@gnome.org>
- */
-
 #ifndef _GLADE_WIDGET_ADAPTOR_H_
 #define _GLADE_WIDGET_ADAPTOR_H_
 

gladeui/glade-widget.h

@@ -1,28 +1,3 @@
-/*
- * Copyright (C) 2008 Tristan Van Berkom
- * Copyright (C) 2004 Joaquin Cuenca Abela
- * Copyright (C) 2001, 2002, 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Authors:
- *   Joaquin Cuenca Abela <e98cuenc@yahoo.com>
- *   Chema Celorio <chema@celorio.com>
- *   Tristan Van Berkom <tvb@gnome.org>
- */
-
 #ifndef __GLADE_WIDGET_H__
 #define __GLADE_WIDGET_H__
 

gladeui/glade-xml-utils.h

@@ -1,27 +1,4 @@
-/*
+/* TODO : s/glade_xml_get_/glade_xml_node_get/g */
- * glade-xml-utils.c - This functions are based on gnome-print/libgpa/gpa-xml.c
- * which were in turn based on gnumeric/xml-io.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Authors:
- *   Daniel Veillard <Daniel.Veillard@w3.org>
- *   Miguel de Icaza <miguel@gnu.org>
- *   Chema Celorio <chema@gnome.org>
- */
-
 #ifndef __GLADE_XML_UTILS_H__
 #define __GLADE_XML_UTILS_H__
 

gladeui/glade.h

@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-
 #ifndef __GLADE_H__
 #define __GLADE_H__
 

gladeui/gladeui.rc.in

@@ -17,7 +17,7 @@ VS_VERSION_INFO VERSIONINFO
 	VALUE "FileDescription", "Glade Interface Designer @GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@"
 	VALUE "FileVersion", "@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@.0"
 	VALUE "InternalName", "libgladeui-1-@GLADE_CURRENT_MINUS_AGE@"
-	VALUE "LegalCopyright", "Copyright 2007 The GNOME Foundation"
+	VALUE "LegalCopyright", "Copyright © 2007 The GNOME Foundation"
 	VALUE "OriginalFilename", "libgladeui-1-@GLADE_CURRENT_MINUS_AGE@.dll"
 	VALUE "ProductName", "Glade Interface Designer"
 	VALUE "ProductVersion", "@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@"

gladeui/icon-naming-spec.c

@@ -23,7 +23,7 @@
 /* 
  * Icon Naming Specification: http://standards.freedesktop.org/icon-naming-spec
  *
- */
+*/
 
 #include <glib/gi18n-lib.h>
 

gladeui/meson.build

@@ -184,8 +184,8 @@ endif
 
 if glade_system == 'windows'
   rc = configure_file(
-    input: 'gladeui.rc.in',
+    input: 'glade.rc.in',
-    output: 'gladeui.rc',
+    output: '@BASELINE@',
     configuration: rc_conf,
   )
 
@@ -193,8 +193,8 @@ if glade_system == 'windows'
 
   ldflags += cc.get_supported_link_arguments([
     # gmodule-export-2.0 on windows does not include -export-dynamic flag
-    '-Wl,--export-all-symbols',
+    '-export-dynamic',
-    '-Wl,--no-undefined',
+    '-no-undefined',
   ])
 endif
 
@@ -264,7 +264,7 @@ ldflags = []
 if glade_system == 'windows'
   rc = configure_file(
     input: 'glade-previewer.rc.in',
-    output: 'glade-previewer.rc',
+    output: '@BASELINE@',
     configuration: rc_conf,
   )
 

help/LINGUAS

@@ -1,5 +1,6 @@
 # please keep this list sorted alphabetically
 #
+da
 bg
 ca
 cs

help/ca/ca.po

@@ -216,10 +216,10 @@ msgstr ""
 "La biblioteca GTK+ ofereix una àmplia col·lecció d'elements amb els quals "
 "construir interfícies d'usuari, com ara quadres de text, quadres de diàleg, "
 "caselles de selecció i menús. Aquests elements s'anomenen <emphasis>ginys</"
-"emphasis>. Podeu utilitzar el Glade per a posicionar els ginys dins d'una "
+"emphasis>. Podeu utilitzar el Glade per posicionar els ginys dins d'una "
 "interfície gràfica. El Glade us permet modificar la disposició i propietats "
-"d'aquests ginys. També podeu utilitzar el Glade per a afegir connexions "
+"d'aquests ginys. També podeu utilitzar el Glade per afegir connexions entre "
-"entre els ginys i el codi font de l'aplicació."
+"els ginys i el codi font de l'aplicació."
 
 #. (itstool) path: sect1/para
 #: C/index.docbook:164
@@ -230,7 +230,7 @@ msgid ""
 msgstr ""
 "Les interfícies d'usuari dissenyades al Glade s'emmagatzemen utilitzant un "
 "format XML, facilitant-ne la integració amb eines externes. Podeu utilitzar "
-"la biblioteca <application>libglade</application> per a crear aquestes "
+"la biblioteca <application>libglade</application> per crear aquestes "
 "interfícies gràfiques de forma dinàmica des de la descripció en XML."
 
 #. (itstool) path: sect1/title
@@ -241,7 +241,7 @@ msgstr "Primers passos"
 #. (itstool) path: sect2/title
 #: C/index.docbook:174
 msgid "To Start <application>Glade</application>"
-msgstr "Per a iniciar el <application>Glade</application>"
+msgstr "Per iniciar el <application>Glade</application>"
 
 #. (itstool) path: sect2/para
 #: C/index.docbook:175
@@ -338,7 +338,7 @@ msgid ""
 "files in <application>Glade</application>."
 msgstr ""
 "Els menús que apareixen a la barra de menús contenen totes les ordres que "
-"necessiteu per a treballar amb fitxers al <application>Glade</application>."
+"necessiteu per treballar amb fitxers al <application>Glade</application>."
 
 #. (itstool) path: varlistentry/term
 #: C/index.docbook:220
@@ -375,7 +375,7 @@ msgstr "Paleta"
 msgid ""
 "The palette contains the widgets that can be used to build a user interface."
 msgstr ""
-"La paleta conté tots els ginys que es poden utilitzar per a construir una "
+"La paleta conté tots els ginys que es poden utilitzar per construir una "
 "interfície d'usuari."
 
 #. (itstool) path: varlistentry/term
@@ -400,8 +400,8 @@ msgid ""
 "The property editor is used to manipulate the properties of widgets, as well "
 "as adding connections to source code."
 msgstr ""
-"L'editor de propietats s'utilitza per a manipular les propietats dels ginys i "
+"L'editor de propietats s'utilitza per manipular les propietats dels ginys i "
-"per a afegir connexions al codi font."
+"per afegir connexions al codi font."
 
 #. (itstool) path: varlistentry/term
 #: C/index.docbook:245
@@ -435,7 +435,7 @@ msgid ""
 "guimenu><guimenuitem>New</guimenuitem></menuchoice>. The application "
 "displays a new blank project in the <application>Glade</application> window."
 msgstr ""
-"Per a crear un projecte nou, escolliu <menuchoice><guimenu>Fitxer</"
+"Per crear un projecte nou, escolliu <menuchoice><guimenu>Fitxer</"
 "guimenu><guimenuitem>Nou</guimenuitem></menuchoice>. L'aplicació mostrarà un "
 "projecte nou en blanc a la finestra del <application>Glade</application>."
 
@@ -451,7 +451,7 @@ msgid ""
 "guimenu><guimenuitem>Open</guimenuitem></menuchoice>. The application "
 "displays the project in the <application>Glade</application> window."
 msgstr ""
-"Per a obrir un projecte existent, seleccioneu <menuchoice><guimenu>Fitxer</"
+"Per obrir un projecte existent, seleccioneu <menuchoice><guimenu>Fitxer</"
 "guimenu><guimenuitem>Obre</guimenuitem></menuchoice>. L'aplicació mostrarà "
 "el projecte a la finestra del <application>Glade</application>."
 
@@ -472,7 +472,7 @@ msgid ""
 "<menuchoice><guimenu>File</guimenu><guimenuitem>Save</guimenuitem></"
 "menuchoice>."
 msgstr ""
-"Per a desar els canvis d'un projecte que ja existeix, seleccioneu "
+"Per desar els canvis d'un projecte que ja existeix, seleccioneu "
 "<menuchoice><guimenu>Fitxer</guimenu><guimenuitem>Desa</guimenuitem></"
 "menuchoice>."
 
@@ -484,7 +484,7 @@ msgid ""
 "guimenuitem> </menuchoice>. Enter a name for the project file in the "
 "<guilabel>Save As</guilabel> dialog, then click <guibutton>Save</guibutton>."
 msgstr ""
-"Per a desar un fitxer de projecte nou o per a desar un fitxer de projecte "
+"Per a desar un fitxer de projecte nou o per desar un fitxer de projecte "
 "existent amb un nom nou, seleccioneu <menuchoice> <guimenu>Fitxer</guimenu> "
 "<guimenuitem>Anomena i desa</guimenuitem> </menuchoice>. Introduïu un nom "
 "per al fitxer del projecte al diàleg <guilabel>Anomena i desa</guilabel> i "
@@ -523,12 +523,12 @@ msgid ""
 "use the <guilabel>Properties</guilabel> window to edit the properties of the "
 "widgets."
 msgstr ""
-"Per a utilitzar el mode «selecció», feu clic a la fletxa "
+"Per utilitzar el mode «selecció», feu clic a la fletxa <guilabel>Selectora</"
-"<guilabel>Selectora</guilabel>. El punter canvia i es converteix en una "
+"guilabel>. El punter canvia i es converteix en una fletxa per tal d'indicar "
-"fletxa per tal d'indicar que el mode «selecció» està actiu. Dins d'aquest "
+"que el mode «selecció» està actiu. Dins d'aquest mode, podeu utilitzar el "
-"mode, podeu utilitzar el ratolí per a seleccionar ginys del vostre projecte. "
+"ratolí per seleccionar ginys del vostre projecte. Tot seguit, podeu "
-"Tot seguit, podeu utilitzar la finestra de <guilabel>Propietats</guilabel> "
+"utilitzar la finestra de <guilabel>Propietats</guilabel> per tal d'editar "
-"per a editar les propietats dels ginys."
+"les propietats dels ginys."
 
 #. (itstool) path: listitem/para
 #: C/index.docbook:306
@@ -536,8 +536,8 @@ msgid ""
 "You can also use the widget context menu to select a widget. Right-click on "
 "a widget to open the widget context menu."
 msgstr ""
-"També podeu utilitzar el menú contextual de ginys per a seleccionar-ne un. "
+"També podeu utilitzar el menú contextual de ginys per seleccionar-ne un. Feu "
-"Feu clic amb el botó secundari sobre un giny per tal d'obrir-ne el menú "
+"clic amb el botó secundari sobre un giny per tal d'obrir-ne el menú "
 "contextual."
 
 #. (itstool) path: listitem/para
@@ -553,7 +553,7 @@ msgstr ""
 "<guilabel>Paleta</guilabel> al projecte tot mantenint premuda la tecla "
 "<keycap>Control</keycap> en seleccionar el giny. Cal que feu clic a la "
 "fletxa <guilabel>Selector</guilabel> o a qualsevol altre giny de la "
-"<guilabel>Paleta</guilabel> per a tornar al mode normal."
+"<guilabel>Paleta</guilabel> per tornar al mode normal."
 
 #. (itstool) path: varlistentry/term
 #: C/index.docbook:318
@@ -608,7 +608,7 @@ msgid ""
 "project window. You can choose the following widget containers from the "
 "<guilabel>Palette</guilabel> window:"
 msgstr ""
-"Per a maquetar i organitzar els ginys a la finestra del projecte podeu "
+"Per maquetar i organitzar els ginys a la finestra del projecte podeu "
 "utilitzar contenidors de ginys o caixes. Podeu seleccionar els ginys "
 "contenidors següents de la <guilabel>Paleta</guilabel>:"
 
@@ -680,8 +680,8 @@ msgid ""
 "many rows or columns to create initially, though rows and columns can easily "
 "be added or deleted later."
 msgstr ""
-"Podeu combinar les caixes com vulgueu per a crear estructures de "
+"Podeu combinar les caixes com vulgueu per crear estructures de disposicions "
-"disposicions complexes. Quan creeu caixes horitzontals i verticals, el "
+"complexes. Quan creeu caixes horitzontals i verticals, el "
 "<application>Glade</application> us demana quantes columnes i files ha de "
 "crear inicialment, tot i que sempre podreu afegir-ne de noves o suprimir les "
 "que no us interessin."
@@ -795,8 +795,8 @@ msgid ""
 "change a property of a widget, select the widget and then enter an "
 "appropriate value in one of the Property window's property fields."
 msgstr ""
-"Utilitzeu l'editor de propietats per a editar les propietats del giny "
+"Utilitzeu l'editor de propietats per editar les propietats del giny "
-"seleccionat. Per a canviar una propietat d'un giny, seleccioneu el giny i "
+"seleccionat. Per canviar una propietat d'un giny, seleccioneu el giny i "
 "introduïu el valor corresponent en un dels camps que trobareu a la "
 "subfinestra de propietats."
 
@@ -857,7 +857,7 @@ msgstr ""
 "Aquest programa es distribueix sota les condicions de la Llicència pública "
 "general de GNU publicada per la Free Software Foundation, tant la versió 2 "
 "de la llicència com (si ho preferiu) qualsevol versió posterior. Es pot "
-"trobar una còpia d'aquesta llicència en aquest <ulink url=\"help:gpl\" type="
+"trobar una còpia d'aquesta llicència en aquest <ulink url=\"ghelp:gpl\" type="
 "\"help\">enllaç</ulink> o en el fitxer COPYING inclòs amb el codi font "
 "d'aquest programa."
 
@@ -905,11 +905,11 @@ msgid ""
 "aware of those trademarks, then the names are in capital letters or initial "
 "capital letters."
 msgstr ""
-"Molts dels noms que les empreses utilitzen per a distingir els seus "
+"Molts dels noms que les empreses utilitzen per distingir els seus productes "
-"productes i serveis es consideren marques comercials. Quan aquests noms "
+"i serveis es consideren marques comercials. Quan aquests noms apareguin en "
-"apareguin en qualsevol documentació del GNOME, si els membres del Projecte "
+"qualsevol documentació del GNOME, si els membres del Projecte de "
-"de documentació del GNOME han estat avisats pel que fa a les marques, els "
+"documentació del GNOME han estat avisats pel que fa a les marques, els noms "
-"noms apareixeran en majúscules o amb les inicials en majúscules."
+"apareixeran en majúscules o amb les inicials en majúscules."
 
 #. (itstool) path: listitem/para
 #: C/legal.xml:35

help/da/da.po

@@ -6,16 +6,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glade master\n"
-"POT-Creation-Date: 2021-05-02 06:11+0000\n"
+"POT-Creation-Date: 2020-03-10 14:06+0000\n"
-"PO-Revision-Date: 2022-01-23 14:11+0100\n"
+"PO-Revision-Date: 2020-03-17 09:22+0200\n"
-"Last-Translator: Alan Mortensen <alanmortensen.am@gmail.com>\n"
+"Last-Translator: scootergrisen\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.3\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -62,8 +61,8 @@ msgid ""
 "geddes@gmail.com</email></address> </affiliation>"
 msgstr ""
 "<firstname>Vincent</firstname> <surname>Geddes</surname> <affiliation> "
-"<orgname>GNOME-dokumentationsprojektet</orgname> <address><email>vincent."
+"<orgname>GNOME-dokumentationsprojektet</orgname> "
-"geddes@gmail.com</email></address> </affiliation>"
+"<address><email>vincent.geddes@gmail.com</email></address> </affiliation>"
 
 #. (itstool) path: authorgroup/author
 #: C/index.docbook:52
@@ -94,8 +93,8 @@ msgid ""
 "<revnumber>Glade Manual 3.0</revnumber> <date>5 December 2006</date> <_:"
 "revdescription-1/>"
 msgstr ""
-"<revnumber>Manual til Glade 3.0</revnumber> <date>5. december 2006</date> <_:"
+"<revnumber>Manual til Glade 3.0</revnumber> <date>5. december 2006</date> "
-"revdescription-1/>"
+"<_:revdescription-1/>"
 
 #. (itstool) path: revdescription/para
 #: C/index.docbook:95 C/index.docbook:103 C/index.docbook:111
@@ -108,8 +107,8 @@ msgid ""
 "<revnumber>Glade Manual 2.1;</revnumber> <date>17 June 2004</date> <_:"
 "revdescription-1/>"
 msgstr ""
-"<revnumber>Manual til Glade 2.1;</revnumber> <date>17. juni 2004</date> <_:"
+"<revnumber>Manual til Glade 2.1;</revnumber> <date>17. juni 2004</date> "
-"revdescription-1/>"
+"<_:revdescription-1/>"
 
 #. (itstool) path: revhistory/revision
 #: C/index.docbook:99
@@ -117,8 +116,8 @@ msgid ""
 "<revnumber>Glade User Manual 2.0</revnumber> <date>25 February 2004</date> "
 "<_:revdescription-1/>"
 msgstr ""
-"<revnumber>Brugermanual til Glade 2.0</revnumber> <date>25. februar 2004</"
+"<revnumber>Brugermanual til Glade 2.0</revnumber> <date>25. februar "
-"date> <_:revdescription-1/>"
+"2004</date> <_:revdescription-1/>"
 
 #. (itstool) path: revhistory/revision
 #: C/index.docbook:107
@@ -126,8 +125,8 @@ msgid ""
 "<revnumber>Glade User Manual 1.2</revnumber> <date>10 Feb 2004</date> <_:"
 "revdescription-1/>"
 msgstr ""
-"<revnumber>Brugermanual til Glade 1.2</revnumber> <date>10. februar 2004</"
+"<revnumber>Brugermanual til Glade 1.2</revnumber> <date>10. februar "
-"date> <_:revdescription-1/>"
+"2004</date> <_:revdescription-1/>"
 
 #. (itstool) path: revdescription/para
 #: C/index.docbook:119 C/index.docbook:127
@@ -140,8 +139,8 @@ msgid ""
 "<revnumber>Glade User Manual 1.1</revnumber> <date>30 Mar 2002</date> <_:"
 "revdescription-1/>"
 msgstr ""
-"<revnumber>Brugermanual til Glade 1.1</revnumber> <date>30. marts 2002</"
+"<revnumber>Brugermanual til Glade 1.1</revnumber> <date>30. marts "
-"date> <_:revdescription-1/>"
+"2002</date> <_:revdescription-1/>"
 
 #. (itstool) path: revhistory/revision
 #: C/index.docbook:123
@@ -169,9 +168,10 @@ msgid ""
 "manual, visit the <ulink url=\"https://gitlab.gnome.org/GNOME/glade/issues/"
 "\">GNOME Issue Tracker</ulink>."
 msgstr ""
-"Rapportér en fejl eller kom med et forslag til programmet Glade eller "
+"Rapportér en fejl eller kom med et forslag til programmet "
-"manualen ved at besøge <ulink url=\"https://gitlab.gnome.org/GNOME/glade/"
+"Glade eller manualen ved at besøge <ulink "
-"issues/\">GNOME Issue Tracker</ulink>."
+"url=\"https://gitlab.gnome.org/GNOME/glade/issues/\">GNOME Issue "
+"Tracker</ulink>."
 
 #. (itstool) path: article/indexterm
 #: C/index.docbook:144
@@ -195,9 +195,9 @@ msgid ""
 "create and edit user interface designs for <application>GTK+</application> "
 "applications."
 msgstr ""
-"Grænsefladedesigneren <application>Glade</application> giver dig mulighed "
+"Grænsefladedesigneren <application>Glade</application> giver dig "
-"for at oprette og redigere brugergrænsefladedesign til <application>GTK+</"
+"mulighed for at oprette og redigere brugergrænsefladedesign til "
-"application>-programmer."
+"<application>GTK+</application>-programmer."
 
 #. (itstool) path: sect1/para
 #: C/index.docbook:158
@@ -210,12 +210,12 @@ msgid ""
 "connections between widgets and application source code."
 msgstr ""
 "GTK+-biblioteket giver en omfattende samling af byggesten til "
-"brugergrænseflader såsom tekstbokse, dialogetiketter, talindtastninger, "
+"brugergrænseflader såsom tekstbokse, dialogetiketter, "
-"afkrydsningsbokse og menuer. Byggestenene kaldes <emphasis>kontroller</"
+"talindtastninger, afkrydsningsbokse og menuer. Byggestenene kaldes "
-"emphasis>. Du kan bruge Glade til at placere kontroller i en grafisk "
+"<emphasis>kontroller</emphasis>. Du kan bruge Glade til at placere kontroller i en "
-"brugerflade. Glade giver dig mulighed for at ændre kontrollernes layout og "
+"grafisk brugerflade. Glade giver dig mulighed for at ændre kontrollernes layout "
-"egenskaber. Du kan også bruge Glade til at tilføje forbindelser mellem "
+"og egenskaber. Du kan også bruge Glade til at "
-"kontrollerne og programmets kildekode."
+"tilføje forbindelser mellem kontrollerne og programmets kildekode."
 
 #. (itstool) path: sect1/para
 #: C/index.docbook:164
@@ -252,11 +252,11 @@ msgstr "Menuen <guimenu>Programmer</guimenu>"
 #. (itstool) path: listitem/para
 #: C/index.docbook:181
 msgid ""
-"Choose <menuchoice> <guisubmenu>Programming</guisubmenu> <guimenuitem>Glade</"
+"Choose <menuchoice> <guisubmenu>Programming</guisubmenu> <guimenuitem>Glade "
-"guimenuitem> </menuchoice>."
+"Interface Designer</guimenuitem> </menuchoice>."
 msgstr ""
-"Vælg <menuchoice> <guisubmenu>Programmering</guisubmenu> <guimenuitem>Glade</"
+"Vælg <menuchoice> <guisubmenu>Programmering</guisubmenu> "
-"guimenuitem> </menuchoice>."
+"<guimenuitem>Glade</guimenuitem> </menuchoice>."
 
 #. (itstool) path: varlistentry/term
 #: C/index.docbook:189
@@ -282,8 +282,7 @@ msgstr "Når du starter <application>Glade</application>"
 msgid ""
 "When you start <application>Glade</application>, the following window is "
 "displayed."
-msgstr ""
+msgstr "Når du starter <application>Glade</application>, vises følgende vindue."
-"Når du starter <application>Glade</application>, vises følgende vindue."
 
 #. (itstool) path: figure/title
 #: C/index.docbook:203
@@ -305,19 +304,18 @@ msgstr "[billedet er indsendt]"
 #: C/index.docbook:205
 msgid ""
 "<imageobject><imagedata fileref=\"figures/main-window.png\" format=\"PNG\"/"
-"></imageobject> <textobject><phrase>Shows the <application>Glade</"
+"></imageobject> <textobject><phrase>Shows the<application>Glade</"
 "application> window.</phrase></textobject>"
 msgstr ""
-"<imageobject><imagedata fileref=\"figures/main-window.png\" format=\"PNG\"/"
+"<imageobject><imagedata fileref=\"figures/main-window.png\" "
-"></imageobject> <textobject><phrase>Viser vinduet <application>Glade</"
+"format=\"PNG\"/></imageobject> <textobject><phrase>Viser "
-"application>.</phrase></textobject>"
+"vinduet <application>Glade</application>.</phrase></textobject>"
 
 #. (itstool) path: sect2/para
 #: C/index.docbook:212
 msgid ""
 "The <application>Glade</application> window contains the following elements:"
-msgstr ""
+msgstr "Vinduet <application>Glade</application> indeholder følgende elementer:"
-"Vinduet <application>Glade</application> indeholder følgende elementer:"
 
 #. (itstool) path: varlistentry/term
 #: C/index.docbook:215
@@ -378,8 +376,7 @@ msgstr "Inspektør"
 #. (itstool) path: listitem/para
 #: C/index.docbook:237
 msgid "The inspector displays information about the widgets in a project."
-msgstr ""
+msgstr "Inspektøren viser information om de kontroller som findes i et projekt."
-"Inspektøren viser information om de kontroller som findes i et projekt."
 
 #. (itstool) path: varlistentry/term
 #: C/index.docbook:240
@@ -392,8 +389,8 @@ msgid ""
 "The property editor is used to manipulate the properties of widgets, as well "
 "as adding connections to source code."
 msgstr ""
-"Egenskabsredigeringen bruges til at manipulere kontrollernes egenskaber samt "
+"Egenskabsredigeringen bruges til at manipulere kontrollernes egenskaber "
-"at tilføje forbindelser til kildekode."
+"samt at tilføje forbindelser til kildekode."
 
 #. (itstool) path: varlistentry/term
 #: C/index.docbook:245
@@ -426,9 +423,9 @@ msgid ""
 "guimenu><guimenuitem>New</guimenuitem></menuchoice>. The application "
 "displays a new blank project in the <application>Glade</application> window."
 msgstr ""
-"Opret et nyt projekt ved at vælge <menuchoice><guimenu>Fil</"
+"Opret et nyt projekt ved at vælge <menuchoice><guimenu>Fil</guimenu><guimenu"
-"guimenu><guimenuitem>Ny</guimenuitem></menuchoice>. Programmet viser et nyt "
+"item>Ny</guimenuitem></menuchoice>. Programmet viser et nyt tomt projekt i "
-"tomt projekt i vinduet <application>Glade</application>."
+"vinduet <application>Glade</application>."
 
 #. (itstool) path: sect2/title
 #: C/index.docbook:266
@@ -442,9 +439,9 @@ msgid ""
 "guimenu><guimenuitem>Open</guimenuitem></menuchoice>. The application "
 "displays the project in the <application>Glade</application> window."
 msgstr ""
-"Åbn et eksisterende projekt ved at vælge <menuchoice><guimenu>Fil</"
+"Åbn et eksisterende projekt ved at vælge <menuchoice><guimenu>Fil</guimenu><"
-"guimenu><guimenuitem>Åbn</guimenuitem></menuchoice>. Programmet viser "
+"guimenuitem>Åbn</guimenuitem></menuchoice>. Programmet viser projektet i "
-"projektet i vinduet <application>Glade</application>."
+"vinduet <application>Glade</application>."
 
 #. (itstool) path: sect2/title
 #: C/index.docbook:272
@@ -463,9 +460,8 @@ msgid ""
 "<menuchoice><guimenu>File</guimenu><guimenuitem>Save</guimenuitem></"
 "menuchoice>."
 msgstr ""
-"For at gemme ændringerne til en eksisterende projektfil vælges "
+"For at gemme ændringerne til en eksisterende projektfil vælges <menuchoi"
-"<menuchoice><guimenu>Fil</guimenu><guimenuitem>Gem</guimenuitem></"
+"ce><guimenu>Fil</guimenu><guimenuitem>Gem</guimenuitem></menuchoice>."
-"menuchoice>."
 
 #. (itstool) path: listitem/para
 #: C/index.docbook:277
@@ -514,11 +510,11 @@ msgid ""
 "use the <guilabel>Properties</guilabel> window to edit the properties of the "
 "widgets."
 msgstr ""
-"For at bruge markeringstilstand klikkes på pilen <guilabel>Vælger</"
+"For at bruge markeringstilstand klikkes på pilen "
-"guilabel>. Markøren skifter til en pil for at indikere at markeringstilstand "
+"<guilabel>Vælger</guilabel>. Markøren skifter til en pil for at "
-"er aktiv. I denne tilstand kan du bruge musen til at vælge kontroller i dit "
+"indikere at markeringstilstand er aktiv. I denne tilstand kan du bruge musen "
-"projekt. Du kan så bruge vinduet <guilabel>Egenskaber</guilabel> til at "
+"til at vælge kontroller i dit projekt. Du kan så bruge "
-"redigere kontrollernes egenskaber."
+"vinduet <guilabel>Egenskaber</guilabel> til at redigere kontrollernes egenskaber."
 
 #. (itstool) path: listitem/para
 #: C/index.docbook:306
@@ -526,8 +522,9 @@ msgid ""
 "You can also use the widget context menu to select a widget. Right-click on "
 "a widget to open the widget context menu."
 msgstr ""
-"Du kan også bruge kontrollens genvejsmenu til at vælge en kontrol. Højreklik "
+"Du kan også bruge kontrollens genvejsmenu til at "
-"på en kontrol for at åbne kontrollens genvejsmenu."
+"vælge en kontrol. Højreklik på en kontrol for at åbne "
+"kontrollens genvejsmenu."
 
 #. (itstool) path: listitem/para
 #: C/index.docbook:307
@@ -538,11 +535,11 @@ msgid ""
 "guilabel> arrow or another widget in the <guilabel>Palette</guilabel> to "
 "return to normal mode."
 msgstr ""
-"Du kan tilføje adskillige kontroller af en bestemt type fra <guilabel>Palet</"
+"Du kan tilføje adskillige kontroller af en bestemt type fra "
-"guilabel> til dit projekt ved at holde tasten <keycap>Control</keycap> nede "
+"<guilabel>Palet</guilabel> til dit projekt ved at holde tasten "
-"når du vælger en kontrol. Du skal klikke på pilen <guilabel>Vælger</"
+"<keycap>Control</keycap> nede når du vælger en kontrol. Du skal "
-"guilabel> eller en anden kontrol i <guilabel>Palet</guilabel> for at vende "
+"klikke på pilen <guilabel>Vælger</guilabel> eller en anden kontrol i "
-"tilbage til normal tilstand."
+"<guilabel>Palet</guilabel> for at vende tilbage til normal tilstand."
 
 #. (itstool) path: varlistentry/term
 #: C/index.docbook:318
@@ -554,35 +551,36 @@ msgstr "Kontrolplaceringstilstand"
 msgid ""
 "To use widget placement mode, select a widget in the <guilabel>Palette</"
 "guilabel> window. When you select most widgets, the pointer changes to a "
-"pointer-plus-cross. You can then place the widget inside containers, "
+"pointer-plus-cross. You can then place the widget inside containers, top-"
-"toplevel widgets, and so on. After you place a widget, the mode returns to "
+"level widgets, and so on. After you place a widget, the mode returns to "
 "selection mode."
 msgstr ""
-"For at bruge kontrolplaceringstilstand vælges en kontrol i vinduet "
+"For at bruge kontrolplaceringstilstand vælges en kontrol i "
-"<guilabel>Palet</guilabel>. Når du vælger de fleste kontroller, så ændres "
+"vinduet <guilabel>Palet</guilabel>. Når du vælger de fleste kontroller, så "
-"markøren til et markør-plus-kryds. Du kan så placere kontrollen i beholdere, "
+"ændres markøren til et markør-plus-kryds. Du kan så placere kontrollen "
-"topniveaukontroller osv. Når du har placeret en kontrol, vender tilstanden "
+"i beholdere, topniveaukontroller osv. Når du har placeret en kontrol "
-"tilbage til markeringstilstand."
+"vender tilstanden tilbage til markeringstilstand."
 
 #. (itstool) path: varlistentry/term
 #: C/index.docbook:335
-msgid "Toplevel placement mode"
+msgid "Top-level placement mode"
 msgstr "Topniveauplaceringstilstand"
 
 #. (itstool) path: listitem/para
 #: C/index.docbook:337
 msgid ""
-"To use toplevel placement mode, select a defined toplevel widget in the "
+"To use top level placement mode, select a defined top-level widget in the "
-"<guilabel>Palette</guilabel> window. When you select a toplevel widget in "
+"<guilabel>Palette</guilabel> window. When you select a top-level widget in "
 "the <guilabel>Palette</guilabel> window, the widget appears immediately on "
-"your desktop. You can then edit the widget. After you select a toplevel "
+"your desktop. You can then edit the widget. After you select a top-level "
 "widget, the mode returns to selection mode."
 msgstr ""
 "For at bruge topniveauplaceringstilstand vælges en defineret "
 "topniveaukontrol i vinduet <guilabel>Palet</guilabel>. Når du vælger en "
 "topniveaukontrol i vinduet <guilabel>Palet</guilabel>, så vises kontrollen "
-"straks på dit skrivebord. Du kan så redigere kontrollen. Når du har valgt en "
+"straks på dit skrivebord. Du kan så redigere kontrollen. "
-"topniveaukontrol, så vender tilstanden tilbage til markeringstilstand."
+"Når du har valgt en topniveaukontrol, så vender tilstanden tilbage til "
+"markeringstilstand."
 
 #. (itstool) path: sect2/title
 #: C/index.docbook:354
@@ -669,9 +667,10 @@ msgid ""
 "be added or deleted later."
 msgstr ""
 "Du kan indlejre bokse for at oprette komplekse layoutstrukturer. Når du "
-"opretter vandrette og lodrette bokse, så spørger <application>Glade</"
+"opretter vandrette og lodrette bokse, så spørger "
-"application> dig om hvor mange rækker og kolonner der skal oprettes til at "
+"<application>Glade</application> dig om hvor mange rækker og kolonner der "
-"starte med, selvom rækker og kolonner let kan tilføjes eller slettes senere."
+"skal oprettes til at starte med, selvom rækker og kolonner let kan tilføjes "
+"eller slettes senere."
 
 #. (itstool) path: sect2/para
 #: C/index.docbook:379
@@ -686,9 +685,9 @@ msgstr ""
 "Når du har oprettet alle de bokse du har brug for, så kan du tilføje "
 "bestemte kontroller såsom etiketter, knapper og mere komplekse kontroller i "
 "boksene. Bemærk at <application>Glade</application> pakker kontroller i "
-"layoutet hvilket fjerner en masse kedeligt arbejde. Brugen af bokse giver "
+"layoutet hvilket fjerner en masse kedeligt arbejde. Brugen af "
-"vinduer mulighed for at rumme etiketter med forskellig størrelse på "
+"bokse giver vinduer mulighed for at rumme etiketter med forskellig størrelse "
-"forskellige sprog når programmet er lokaliseret."
+"på forskellige sprog når programmet er lokaliseret."
 
 #. (itstool) path: sect2/title
 #: C/index.docbook:387
@@ -719,8 +718,8 @@ msgid ""
 "menuchoice>. The original widget remains attached to the parent."
 msgstr ""
 "For at kopiere en kontrol til udklipsholderen vælges kontrollen og så vælges "
-"<menuchoice> <guimenu>Redigér</guimenu> <guisubmenu>Kopiér</guisubmenu> </"
+"<menuchoice> <guimenu>Redigér</guimenu> <guisubmenu>Kopiér</guisubmenu> "
-"menuchoice>. Den oprindelige kontrol bliver ved med at være tilknyttet "
+"</menuchoice>. Den oprindelige kontrol bliver ved med at være tilknyttet "
 "ophavskomponenten."
 
 #. (itstool) path: sect2/title
@@ -736,8 +735,8 @@ msgid ""
 "menuchoice>."
 msgstr ""
 "For at indsætte en kontrol, som findes i udklipsholderen, i dit projekt "
-"vælges <menuchoice> <guimenu>Redigér</guimenu> <guisubmenu>Indsæt</"
+"vælges <menuchoice> <guimenu>Redigér</guimenu> "
-"guisubmenu> </menuchoice>."
+"<guisubmenu>Indsæt</guisubmenu> </menuchoice>."
 
 #. (itstool) path: sect2/para
 #: C/index.docbook:420
@@ -751,10 +750,10 @@ msgid ""
 msgstr ""
 "Alle kontroller skal have et unikt navn i <application>Glade</application>. "
 "Hvis du klipper en kontrol og så indsætter kontrollen i dit projekt, så "
-"beholder kontrollen og alle kontrollens underkomponenter deres oprindelige "
+"beholder kontrollen og alle kontrollens underkomponenter deres "
-"navne. Hvis du kopierer en kontrol eller indsætter kontrollen adskillige "
+"oprindelige navne. Hvis du kopierer en kontrol eller indsætter kontrollen "
-"gange i dit projekt, så genererer <application>Glade</application> nye navne "
+"adskillige gange i dit projekt, så genererer "
-"til kontrollerens kopier."
+"<application>Glade</application> nye navne til kontrollerens kopier."
 
 #. (itstool) path: sect2/title
 #: C/index.docbook:429
@@ -786,8 +785,7 @@ msgid ""
 msgstr ""
 "Egenskabsredigeringen bruges til at redigere egenskaberne i den valgte "
 "kontrol. For at ændre en egenskab i en kontrol vælges kontrollen og så "
-"indtastes den fornødne værdi i et af felterne med egenskaber i vinduet "
+"indtastes den fornødne værdi i et af felterne med egenskaber i vinduet Egenskaber."
-"Egenskaber."
 
 #. (itstool) path: sect1/title
 #: C/index.docbook:454
@@ -801,9 +799,10 @@ msgid ""
 "To find more information about Glade, please visit the <ulink url=\"http://"
 "glade.gnome.org\" type=\"http\">Glade Web site</ulink>."
 msgstr ""
-"Glade vedligeholdes af Glade-udviklerne og frivillige fra GNOME-"
+"Glade vedligeholdes af Glade-udviklerne og frivillige fra "
-"fællesskabet. For at finde mere information om Glade, besøg venligst <ulink "
+"GNOME-fællesskabet. For at finde mere information om Glade, besøg "
-"url=\"http://glade.gnome.org\" type=\"http\">Glade-webstedet</ulink>."
+"venligst <ulink url=\"http://glade.gnome.org\" type=\"http\">Glade-"
+"webstedet</ulink>."
 
 #. (itstool) path: sect1/para
 #: C/index.docbook:459
@@ -812,9 +811,10 @@ msgid ""
 "manual, you can submit them using <ulink url=\"https://gitlab.gnome.org/"
 "GNOME/glade/issues/\" type=\"http\">our issue tracking system</ulink>."
 msgstr ""
-"Rapportér en fejl eller kom med et forslag til programmet eller manualen ved "
+"Rapportér en fejl eller kom med et forslag til programmet eller "
-"at indsende dem med <ulink url=\"https://gitlab.gnome.org/GNOME/glade/issues/"
+"manualen ved at indsende dem med <ulink "
-"\" type=\"http\">vores issue-sporingssystem</ulink>."
+"url=\"https://gitlab.gnome.org/GNOME/glade/issues/\" type=\"http\">vores issue-"
+"sporingssystem</ulink>."
 
 #. (itstool) path: sect1/para
 #: C/index.docbook:466
@@ -826,11 +826,11 @@ msgid ""
 "might also want to browse the list archives, available via these same links."
 msgstr ""
 "En anden fremragende kilde med information er Glades mailinglister til "
-"<ulink url=\"http://lists.ximian.com/mailman/listinfo/glade-users\" type="
+"<ulink url=\"http://lists.ximian.com/mailman/listinfo/glade-users\" "
-"\"http\">bruger</ulink> og <ulink url=\"http://lists.ximian.com/mailman/"
+"type=\"http\">bruger</ulink> og <ulink "
-"listinfo/glade-devel\" type=\"http\">udvikler</ulink>. Udover at abonnere "
+"url=\"http://lists.ximian.com/mailman/listinfo/glade-devel\" "
-"kan du også gennemse listernes arkiver som er tilgængelige via de samme "
+"type=\"http\">udvikler</ulink>. Udover at abonnere kan du også gennemse "
-"links."
+"listernes arkiver som er tilgængelige via de samme links."
 
 #. (itstool) path: sect1/para
 #: C/index.docbook:476
@@ -844,8 +844,8 @@ msgstr ""
 "Dette program distribueres under betingelserne i GNU General Public License "
 "som udgivet af the Free Software Foundation; enten version 2 af denne licens "
 "eller (efter eget valg) enhver senere version. En kopi af denne licens kan "
-"ses på <ulink url=\"help:gpl\" type=\"help\">link</ulink>, eller i filen "
+"ses på <ulink url=\"help:gpl\" type=\"help\">link</ulink>, eller i filen COPYING "
-"COPYING inkluderet med kildekoden for dette program."
+"inkluderet med kildekoden for dette program."
 
 #. (itstool) path: para/ulink
 #: C/legal.xml:9

help/de/de.po

@@ -1,20 +1,19 @@
 # German translation of the Glade3 manual.
-#
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2009, 2013, 2016-2019.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2009, 2013, 2016-2019, 2021.
 # Mario Reyer <gnome-de@reyer.de>, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: glade3-help\n"
-"POT-Creation-Date: 2020-06-22 15:48+0000\n"
+"POT-Creation-Date: 2019-04-06 09:57+0000\n"
-"PO-Revision-Date: 2021-03-04 18:52+0100\n"
+"PO-Revision-Date: 2019-04-07 17:21+0200\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 20.12.2\n"
+"X-Generator: Poedit 2.2.1\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -166,19 +165,15 @@ msgstr "Rückmeldungen"
 
 #. (itstool) path: legalnotice/para
 #: C/index.docbook:136
-#| msgid ""
-#| "To report a bug or make a suggestion regarding the Glade application or "
-#| "this manual, follow the directions in the <ulink url=\"help:gnome-feedback"
-#| "\" type=\"help\">GNOME Feedback Page</ulink>."
 msgid ""
 "To report a bug or make a suggestion regarding the Glade application or this "
-"manual, visit the <ulink url=\"https://gitlab.gnome.org/GNOME/glade/issues/"
+"manual, follow the directions in the <ulink url=\"help:gnome-feedback\" type="
-"\">GNOME Issue Tracker</ulink>."
+"\"help\">GNOME Feedback Page</ulink>."
 msgstr ""
 "Um Fehler zu melden oder einen Vorschlag zur Anwendung <application>Glade</"
-"application> oder zu diesem Handbuch zu machen, besuchen Sie das <ulink"
+"application> oder zu diesem Handbuch zu machen, folgen Sie den Anweisungen "
-" url=\"https://gitlab.gnome.org/GNOME/glade/issues/"
+"auf der <ulink url=\"help:gnome-feedback\" type=\"help\">GNOME-Seite für "
-"\">GNOME Fehlererfassungssystem</ulink>."
+"Rückmeldungen</ulink>."
 
 #. (itstool) path: article/indexterm
 #: C/index.docbook:144
@@ -261,15 +256,12 @@ msgstr "Menü <guimenu>Anwendungen</guimenu>"
 
 #. (itstool) path: listitem/para
 #: C/index.docbook:181
-#| msgid ""
-#| "Choose <menuchoice> <guisubmenu>Programming</guisubmenu> "
-#| "<guimenuitem>Glade Interface Designer</guimenuitem> </menuchoice>."
 msgid ""
-"Choose <menuchoice> <guisubmenu>Programming</guisubmenu> <guimenuitem>Glade</"
+"Choose <menuchoice> <guisubmenu>Programming</guisubmenu> <guimenuitem>Glade "
-"guimenuitem> </menuchoice>."
+"Interface Designer</guimenuitem> </menuchoice>."
 msgstr ""
 "Wählen Sie <menuchoice><guisubmenu>Entwicklung</"
-"guisubmenu><guimenuitem>Glade</guimenuitem></"
+"guisubmenu><guimenuitem>Glade Oberflächenentwicklung</guimenuitem></"
 "menuchoice>."
 
 #. (itstool) path: varlistentry/term
@@ -319,13 +311,9 @@ msgstr "translated'"
 
 #. (itstool) path: screenshot/mediaobject
 #: C/index.docbook:205
-#| msgid ""
-#| "<imageobject><imagedata fileref=\"figures/main-window.png\" format=\"PNG"
-#| "\"/></imageobject> <textobject><phrase>Shows the<application>Glade</"
-#| "application> window.</phrase></textobject>"
 msgid ""
 "<imageobject><imagedata fileref=\"figures/main-window.png\" format=\"PNG\"/"
-"></imageobject> <textobject><phrase>Shows the <application>Glade</"
+"></imageobject> <textobject><phrase>Shows the<application>Glade</"
 "application> window.</phrase></textobject>"
 msgstr ""
 "<imageobject><imagedata fileref=\"figures/main-window.png\" format=\"PNG\"/"
@@ -577,17 +565,11 @@ msgstr "Widget-Platzierungsmodus"
 
 #. (itstool) path: listitem/para
 #: C/index.docbook:320
-#| msgid ""
-#| "To use widget placement mode, select a widget in the <guilabel>Palette</"
-#| "guilabel> window. When you select most widgets, the pointer changes to a "
-#| "pointer-plus-cross. You can then place the widget inside containers, top-"
-#| "level widgets, and so on. After you place a widget, the mode returns to "
-#| "selection mode."
 msgid ""
 "To use widget placement mode, select a widget in the <guilabel>Palette</"
 "guilabel> window. When you select most widgets, the pointer changes to a "
-"pointer-plus-cross. You can then place the widget inside containers, "
+"pointer-plus-cross. You can then place the widget inside containers, top-"
-"toplevel widgets, and so on. After you place a widget, the mode returns to "
+"level widgets, and so on. After you place a widget, the mode returns to "
 "selection mode."
 msgstr ""
 "Zum Benutzen des Platzierungsmodus wählen Sie ein Widget aus der "
@@ -599,23 +581,16 @@ msgstr ""
 
 #. (itstool) path: varlistentry/term
 #: C/index.docbook:335
-#| msgid "Top-level placement mode"
+msgid "Top-level placement mode"
-msgid "Toplevel placement mode"
 msgstr "Platzierungsmodus in der obersten Ebene"
 
 #. (itstool) path: listitem/para
 #: C/index.docbook:337
-#| msgid ""
-#| "To use top level placement mode, select a defined top-level widget in the "
-#| "<guilabel>Palette</guilabel> window. When you select a top-level widget "
-#| "in the <guilabel>Palette</guilabel> window, the widget appears "
-#| "immediately on your desktop. You can then edit the widget. After you "
-#| "select a top-level widget, the mode returns to selection mode."
 msgid ""
-"To use toplevel placement mode, select a defined toplevel widget in the "
+"To use top level placement mode, select a defined top-level widget in the "
-"<guilabel>Palette</guilabel> window. When you select a toplevel widget in "
+"<guilabel>Palette</guilabel> window. When you select a top-level widget in "
 "the <guilabel>Palette</guilabel> window, the widget appears immediately on "
-"your desktop. You can then edit the widget. After you select a toplevel "
+"your desktop. You can then edit the widget. After you select a top-level "
 "widget, the mode returns to selection mode."
 msgstr ""
 "Zum Benutzen des Platzierungsmodus in der obersten Ebene wählen Sie ein "
@@ -852,19 +827,15 @@ msgstr ""
 
 #. (itstool) path: sect1/para
 #: C/index.docbook:459
-#| msgid ""
-#| "To report a bug or make a suggestion regarding this application or this "
-#| "manual, you can submit them using <ulink url=\"http://bugzilla.gnome.org/"
-#| "enter_bug.cgi?product=glade3\" type=\"http\">bugzilla</ulink>."
 msgid ""
 "To report a bug or make a suggestion regarding this application or this "
-"manual, you can submit them using <ulink url=\"https://gitlab.gnome.org/"
+"manual, you can submit them using <ulink url=\"http://bugzilla.gnome.org/"
-"GNOME/glade/issues/\" type=\"http\">our issue tracking system</ulink>."
+"enter_bug.cgi?product=glade3\" type=\"http\">bugzilla</ulink>."
 msgstr ""
 "Um einen Fehler zu melden oder einen Vorschlag zu dieser Anwendung oder zu "
-"diesem Handbuch zu machen, benutzen Sie bitte <ulink"
+"diesem Handbuch zu machen, benutzen Sie bitte das<ulink url=\"http://"
-" url=\"https://gitlab.gnome.org/"
+"bugzilla.gnome.org/enter_bug.cgi?product=glade3\" type=\"http\">Bugzilla-"
-"GNOME/glade/issues/\" type=\"http\">unser Fehlererfassungssystem</ulink>."
+"Fehlererfassungssystem</ulink>."
 
 #. (itstool) path: sect1/para
 #: C/index.docbook:466

help/es/es.po

@@ -2,27 +2,27 @@
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008.
 # spanish translation for glade3 manual
 # traducción al español del manual de glade3
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2012-2021.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2012-2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: glade3.help.HEAD\n"
-"POT-Creation-Date: 2020-06-22 15:48+0000\n"
+"POT-Creation-Date: 2020-01-02 22:42+0000\n"
-"PO-Revision-Date: 2021-05-10 11:56+0200\n"
+"PO-Revision-Date: 2020-01-07 13:09+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Spanish - Spain <gnome-es-list@gnome.org>\n"
 "Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 40.0\n"
+"X-Generator: Gtranslator 3.34.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
-"Daniel Mustieles <daniel.mustieles@gmail.com>, 2012 - 2021\n"
+"Daniel Mustieles <daniel.mustieles@gmail.com>, 2012 - 2020\n"
 "Jorge González <jorgegonz@svn.gnome.org>, 2007-2008"
 
 #. (itstool) path: articleinfo/title
@@ -167,6 +167,10 @@ msgstr "Comentarios"
 
 #. (itstool) path: legalnotice/para
 #: C/index.docbook:136
+#| msgid ""
+#| "To report a bug or make a suggestion regarding this application or this "
+#| "manual, you can submit them using <ulink url=\"https://gitlab.gnome.org/"
+#| "GNOME/glade/issues/\" type=\"http\">our issue tracking system</ulink>."
 msgid ""
 "To report a bug or make a suggestion regarding the Glade application or this "
 "manual, visit the <ulink url=\"https://gitlab.gnome.org/GNOME/glade/issues/"
@@ -255,15 +259,13 @@ msgstr "Menú <guimenu>Aplicaciones</guimenu>"
 
 #. (itstool) path: listitem/para
 #: C/index.docbook:181
-#| msgid ""
-#| "Choose <menuchoice> <guisubmenu>Programming</guisubmenu> "
-#| "<guimenuitem>Glade Interface Designer</guimenuitem> </menuchoice>."
 msgid ""
-"Choose <menuchoice> <guisubmenu>Programming</guisubmenu> <guimenuitem>Glade</"
+"Choose <menuchoice> <guisubmenu>Programming</guisubmenu> <guimenuitem>Glade "
-"guimenuitem> </menuchoice>."
+"Interface Designer</guimenuitem> </menuchoice>."
 msgstr ""
-"Elija <menuchoice><guisubmenu>Programación</guisubmenu><guimenuitem>Glade</"
+"Elija <menuchoice><guisubmenu>Programación</"
-"guimenuitem></menuchoice>."
+"guisubmenu><guimenuitem>Diseñador de interfaces Glade</guimenuitem></"
+"menuchoice>."
 
 #. (itstool) path: varlistentry/term
 #: C/index.docbook:189
@@ -312,13 +314,9 @@ msgstr ""
 
 #. (itstool) path: screenshot/mediaobject
 #: C/index.docbook:205
-#| msgid ""
-#| "<imageobject><imagedata fileref=\"figures/main-window.png\" format=\"PNG"
-#| "\"/></imageobject> <textobject><phrase>Shows the<application>Glade</"
-#| "application> window.</phrase></textobject>"
 msgid ""
 "<imageobject><imagedata fileref=\"figures/main-window.png\" format=\"PNG\"/"
-"></imageobject> <textobject><phrase>Shows the <application>Glade</"
+"></imageobject> <textobject><phrase>Shows the<application>Glade</"
 "application> window.</phrase></textobject>"
 msgstr ""
 "<imageobject><imagedata fileref=\"figures/main-window.png\" format=\"PNG\"/"
@@ -570,17 +568,11 @@ msgstr "Modo de emplazamiento de widgets"
 
 #. (itstool) path: listitem/para
 #: C/index.docbook:320
-#| msgid ""
-#| "To use widget placement mode, select a widget in the <guilabel>Palette</"
-#| "guilabel> window. When you select most widgets, the pointer changes to a "
-#| "pointer-plus-cross. You can then place the widget inside containers, top-"
-#| "level widgets, and so on. After you place a widget, the mode returns to "
-#| "selection mode."
 msgid ""
 "To use widget placement mode, select a widget in the <guilabel>Palette</"
 "guilabel> window. When you select most widgets, the pointer changes to a "
-"pointer-plus-cross. You can then place the widget inside containers, "
+"pointer-plus-cross. You can then place the widget inside containers, top-"
-"toplevel widgets, and so on. After you place a widget, the mode returns to "
+"level widgets, and so on. After you place a widget, the mode returns to "
 "selection mode."
 msgstr ""
 "Para usar el modo de emplazamiento de widgets, seleccione un widget de la "
@@ -591,23 +583,16 @@ msgstr ""
 
 #. (itstool) path: varlistentry/term
 #: C/index.docbook:335
-#| msgid "Top-level placement mode"
+msgid "Top-level placement mode"
-msgid "Toplevel placement mode"
 msgstr "Modo de emplazamiento de nivel superior"
 
 #. (itstool) path: listitem/para
 #: C/index.docbook:337
-#| msgid ""
-#| "To use top level placement mode, select a defined top-level widget in the "
-#| "<guilabel>Palette</guilabel> window. When you select a top-level widget "
-#| "in the <guilabel>Palette</guilabel> window, the widget appears "
-#| "immediately on your desktop. You can then edit the widget. After you "
-#| "select a top-level widget, the mode returns to selection mode."
 msgid ""
-"To use toplevel placement mode, select a defined toplevel widget in the "
+"To use top level placement mode, select a defined top-level widget in the "
-"<guilabel>Palette</guilabel> window. When you select a toplevel widget in "
+"<guilabel>Palette</guilabel> window. When you select a top-level widget in "
 "the <guilabel>Palette</guilabel> window, the widget appears immediately on "
-"your desktop. You can then edit the widget. After you select a toplevel "
+"your desktop. You can then edit the widget. After you select a top-level "
 "widget, the mode returns to selection mode."
 msgstr ""
 "Para usar el modo de emplazamiento de nivel superior, seleccione un widget "

help/hu/hu.po

@@ -1,14 +1,14 @@
 # Hungarian translation for glade-help.
-# Copyright (C) 2014, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc.
+# Copyright (C) 2014, 2016, 2017, 2018, 2019 Free Software Foundation, Inc.
 # This file is distributed under the same license as the glade package.
 #
-# Balázs Úr <ur.balazs at fsf dot hu>, 2014, 2017, 2018, 2019, 2021.
+# Balázs Úr <ur.balazs at fsf dot hu>, 2014, 2017, 2018, 2019.
 # Gábor Kelemen <kelemeng at gnome dot hu>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: glade master\n"
-"POT-Creation-Date: 2020-09-04 05:03+0000\n"
+"POT-Creation-Date: 2019-04-07 15:23+0000\n"
-"PO-Revision-Date: 2021-02-20 00:49+0100\n"
+"PO-Revision-Date: 2019-04-07 22:04+0100\n"
 "Last-Translator: Balázs Úr <ur.balazs at fsf dot hu>\n"
 "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
 "Language: hu\n"
@@ -16,14 +16,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 19.12.3\n"
+"X-Generator: Lokalize 2.0\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 "Meskó Balázs <mesko.balazs at fsf dot hu>, 2011.\n"
-"Úr Balázs <ur.balazs at fsf dot hu>, 2014, 2017, 2018, 2019, 2021."
+"Úr Balázs <ur.balazs at fsf dot hu>, 2014, 2017, 2018, 2019."
 
 #. (itstool) path: articleinfo/title
 #: C/index.docbook:17
@@ -168,19 +168,14 @@ msgstr "Visszajelzés"
 
 #. (itstool) path: legalnotice/para
 #: C/index.docbook:136
-#| msgid ""
-#| "To report a bug or make a suggestion regarding this application or this "
-#| "manual, you can submit them using <ulink url=\"https://gitlab.gnome.org/"
-#| "GNOME/glade/issues/\" type=\"http\">our issue tracking system</ulink>."
 msgid ""
 "To report a bug or make a suggestion regarding the Glade application or this "
-"manual, visit the <ulink url=\"https://gitlab.gnome.org/GNOME/glade/issues/"
+"manual, follow the directions in the <ulink url=\"help:gnome-feedback\" type="
-"\">GNOME Issue Tracker</ulink>."
+"\"help\">GNOME Feedback Page</ulink>."
 msgstr ""
-"Ha hibát szeretne bejelenti, vagy javaslata van a Glade alkalmazással vagy a"
+"Egy hiba bejelentéséhez vagy a Glade alkalmazással, illetve ezzel a "
-" kézikönyvvel kapcsolatban, akkor azt a <ulink"
+"kézikönyvvel kapcsolatos javaslat tételéhez kövesse a <ulink url=\"help:"
-" url=\"https://gitlab.gnome.org/GNOME/glade/issues/\">GNOME hibakövető</ulink"
+"gnome-feedback\" type=\"help\">GNOME visszajelzés oldal</ulink> útmutatásait."
-"> segítségével teheti meg."
 
 #. (itstool) path: article/indexterm
 #: C/index.docbook:144
@@ -262,15 +257,12 @@ msgstr "<guimenu>Alkalmazások</guimenu> menü"
 
 #. (itstool) path: listitem/para
 #: C/index.docbook:181
-#| msgid ""
-#| "Choose <menuchoice> <guisubmenu>Programming</guisubmenu> "
-#| "<guimenuitem>Glade Interface Designer</guimenuitem> </menuchoice>."
 msgid ""
-"Choose <menuchoice> <guisubmenu>Programming</guisubmenu> <guimenuitem>Glade</"
+"Choose <menuchoice> <guisubmenu>Programming</guisubmenu> <guimenuitem>Glade "
-"guimenuitem> </menuchoice>."
+"Interface Designer</guimenuitem> </menuchoice>."
 msgstr ""
-"Válassza a <menuchoice> <guisubmenu>Programozás</guisubmenu> <guimenuitem"
+"Válassza a <menuchoice> <guisubmenu>Programozás</guisubmenu> "
-">Glade</guimenuitem> </menuchoice> menüpontot."
+"<guimenuitem>Glade felülettervezőt</guimenuitem> </menuchoice>."
 
 #. (itstool) path: varlistentry/term
 #: C/index.docbook:189
@@ -312,6 +304,10 @@ msgstr "A <application>Glade</application> ablaka"
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/index.docbook:206
+#| msgctxt "_"
+#| msgid ""
+#| "external ref='figures/main-window.png' "
+#| "md5='bf5cf7830cf0b9a3c901ad6c13eddbff'"
 msgctxt "_"
 msgid ""
 "external ref='figures/main-window.png' md5='5425da019396c13dbe8deb80303673ba'"
@@ -320,13 +316,9 @@ msgstr ""
 
 #. (itstool) path: screenshot/mediaobject
 #: C/index.docbook:205
-#| msgid ""
-#| "<imageobject><imagedata fileref=\"figures/main-window.png\" format=\"PNG"
-#| "\"/></imageobject> <textobject><phrase>Shows the<application>Glade</"
-#| "application> window.</phrase></textobject>"
 msgid ""
 "<imageobject><imagedata fileref=\"figures/main-window.png\" format=\"PNG\"/"
-"></imageobject> <textobject><phrase>Shows the <application>Glade</"
+"></imageobject> <textobject><phrase>Shows the<application>Glade</"
 "application> window.</phrase></textobject>"
 msgstr ""
 "<imageobject><imagedata fileref=\"figures/main-window.png\" format=\"PNG\"/"
@@ -573,44 +565,31 @@ msgstr "Felületi elem elhelyezési mód"
 
 #. (itstool) path: listitem/para
 #: C/index.docbook:320
-#| msgid ""
-#| "To use widget placement mode, select a widget in the <guilabel>Palette</"
-#| "guilabel> window. When you select most widgets, the pointer changes to a "
-#| "pointer-plus-cross. You can then place the widget inside containers, top-"
-#| "level widgets, and so on. After you place a widget, the mode returns to "
-#| "selection mode."
 msgid ""
 "To use widget placement mode, select a widget in the <guilabel>Palette</"
 "guilabel> window. When you select most widgets, the pointer changes to a "
-"pointer-plus-cross. You can then place the widget inside containers, "
+"pointer-plus-cross. You can then place the widget inside containers, top-"
-"toplevel widgets, and so on. After you place a widget, the mode returns to "
+"level widgets, and so on. After you place a widget, the mode returns to "
 "selection mode."
 msgstr ""
 "A felületi elem elhelyezési mód használatához válasszon egy felületi elemet "
-"a <guilabel>Paletta</guilabel> ablakból. Ekkor az egérmutató is megváltozik. "
+"a <guilabel>Palette</guilabel> ablakból. Ekkor az egérmutató is megváltozik. "
 "A felületi elemet konténerbe helyezheti, vagy felsőszintű ablakra teheti és "
 "így tovább. Miután elhelyezte a felületi elemet, a program újra kiválasztási "
 "módba kerül."
 
 #. (itstool) path: varlistentry/term
 #: C/index.docbook:335
-#| msgid "Top-level placement mode"
+msgid "Top-level placement mode"
-msgid "Toplevel placement mode"
 msgstr "Felsőszintű elhelyezési mód"
 
 #. (itstool) path: listitem/para
 #: C/index.docbook:337
-#| msgid ""
-#| "To use top level placement mode, select a defined top-level widget in the "
-#| "<guilabel>Palette</guilabel> window. When you select a top-level widget "
-#| "in the <guilabel>Palette</guilabel> window, the widget appears "
-#| "immediately on your desktop. You can then edit the widget. After you "
-#| "select a top-level widget, the mode returns to selection mode."
 msgid ""
-"To use toplevel placement mode, select a defined toplevel widget in the "
+"To use top level placement mode, select a defined top-level widget in the "
-"<guilabel>Palette</guilabel> window. When you select a toplevel widget in "
+"<guilabel>Palette</guilabel> window. When you select a top-level widget in "
 "the <guilabel>Palette</guilabel> window, the widget appears immediately on "
-"your desktop. You can then edit the widget. After you select a toplevel "
+"your desktop. You can then edit the widget. After you select a top-level "
 "widget, the mode returns to selection mode."
 msgstr ""
 "A felsőszintű elhelyezési mód használatához válasszon egy felsőszintűnek "

help/id/id.po

@@ -1,28 +1,25 @@
 # Indonesian translation for glade.
 # Copyright (C) 2016 glade's COPYRIGHT HOLDER
 # This file is distributed under the same license as the glade package.
-# Kukuh Syafaat <syafaatkukuh@gmail.com>, 2016.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# Andika Triwidada <andika@gmail.com>, 2021.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: glade master\n"
-"POT-Creation-Date: 2020-06-22 15:48+0000\n"
+"POT-Creation-Date: 2019-04-06 09:52+0000\n"
-"PO-Revision-Date: 2021-09-07 12:19+0700\n"
+"PO-Revision-Date: 2019-11-11 22:25+0700\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <gnome-l10n-id@googlegroups.com>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.4.3\n"
+"X-Generator: Poedit 2.2.4\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
-msgstr ""
+msgstr "Kukuh Syafaat <syafaatkukuh@gmail.com>, 2016."
-"Kukuh Syafaat <syafaatkukuh@gmail.com>, 2016.\n"
-"Andika Triwidada <andika@gmail.com>, 2021."
 
 #. (itstool) path: articleinfo/title
 #: C/index.docbook:17
@@ -157,7 +154,7 @@ msgstr ""
 #. (itstool) path: articleinfo/releaseinfo
 #: C/index.docbook:133
 msgid "This manual describes version 3.1.0 of Glade."
-msgstr "Panduan ini menjelaskan versi 3.1.0 dari Glade."
+msgstr "Panduan ini menjelaskan versi 3.1.0 dari Glade"
 
 #. (itstool) path: legalnotice/title
 #: C/index.docbook:135
@@ -168,12 +165,12 @@ msgstr "Umpan Balik"
 #: C/index.docbook:136
 msgid ""
 "To report a bug or make a suggestion regarding the Glade application or this "
-"manual, visit the <ulink url=\"https://gitlab.gnome.org/GNOME/glade/issues/"
+"manual, follow the directions in the <ulink url=\"help:gnome-feedback\" type="
-"\">GNOME Issue Tracker</ulink>."
+"\"help\">GNOME Feedback Page</ulink>."
 msgstr ""
 "Untuk melaporkan kutu atau membuat saran mengenai aplikasi Glade atau "
-"panduan ini, kunjungi <ulink url=\"https://gitlab.gnome.org/GNOME/glade/"
+"panduan ini, ikuti petunjuk pada <ulink url=\"help:gnome-feedback\" type="
-"issues/\">Pelacakan Masalah GNOME</ulink>."
+"\"help\">Laman Umpan Balik GNOME</ulink>."
 
 #. (itstool) path: article/indexterm
 #: C/index.docbook:144
@@ -254,11 +251,11 @@ msgstr "Menu <guimenu>Aplikasi</guimenu>"
 #. (itstool) path: listitem/para
 #: C/index.docbook:181
 msgid ""
-"Choose <menuchoice> <guisubmenu>Programming</guisubmenu> <guimenuitem>Glade</"
+"Choose <menuchoice> <guisubmenu>Programming</guisubmenu> <guimenuitem>Glade "
-"guimenuitem> </menuchoice>."
+"Interface Designer</guimenuitem> </menuchoice>."
 msgstr ""
-"Pilih <menuchoice> <guisubmenu>Pemrograman</guisubmenu> <guimenuitem>Glade</"
+"Pilih <menuchoice> <guisubmenu>Pemrograman</guisubmenu> "
-"guimenuitem> </menuchoice>."
+"<guimenuitem>Desainer Antarmuka Glade</guimenuitem> </menuchoice>."
 
 #. (itstool) path: varlistentry/term
 #: C/index.docbook:189
@@ -299,6 +296,10 @@ msgstr "Jendela <application>Glade</application>"
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/index.docbook:206
+#| msgctxt "_"
+#| msgid ""
+#| "external ref='figures/main-window.png' "
+#| "md5='0ab7dd8af6d049544c81748e72064941'"
 msgctxt "_"
 msgid ""
 "external ref='figures/main-window.png' md5='5425da019396c13dbe8deb80303673ba'"
@@ -309,11 +310,11 @@ msgstr ""
 #: C/index.docbook:205
 msgid ""
 "<imageobject><imagedata fileref=\"figures/main-window.png\" format=\"PNG\"/"
-"></imageobject> <textobject><phrase>Shows the <application>Glade</"
+"></imageobject> <textobject><phrase>Shows the<application>Glade</"
 "application> window.</phrase></textobject>"
 msgstr ""
 "<imageobject><imagedata fileref=\"figures/main-window.png\" format=\"PNG\"/"
-"></imageobject> <textobject><phrase>Menunjukkan jendela <application>Glade</"
+"></imageobject> <textobject><phrase>Tampilkan jendela<application>Glade</"
 "application>.</phrase></textobject>"
 
 #. (itstool) path: sect2/para
@@ -558,36 +559,36 @@ msgstr "Mode penempatan widget"
 msgid ""
 "To use widget placement mode, select a widget in the <guilabel>Palette</"
 "guilabel> window. When you select most widgets, the pointer changes to a "
-"pointer-plus-cross. You can then place the widget inside containers, "
+"pointer-plus-cross. You can then place the widget inside containers, top-"
-"toplevel widgets, and so on. After you place a widget, the mode returns to "
+"level widgets, and so on. After you place a widget, the mode returns to "
 "selection mode."
 msgstr ""
 "Untuk menggunakan mode penempatan widget, pilih widget pada jendela "
 "<guilabel>Palet</guilabel>. Bila Anda memilih widget, pointer berubah ke "
-"pointer-tambah-silang. Anda kemudian dapat menempatkan widget di dalam "
+"pointer-tambah-silangf. Anda kemudian dapat menempatkan widget didalam "
-"wadah, widget tingkat-puncak, dan sebagainya. Setelah Anda menempatkan "
+"wadah, widget tingkat-atas, dan sebagainya. Setelah Anda menempatkan sebuah "
-"sebuah widget, mode akan kembali ke mode seleksi."
+"widget, mode akan kembali ke mode seleksi."
 
 #. (itstool) path: varlistentry/term
 #: C/index.docbook:335
-msgid "Toplevel placement mode"
+msgid "Top-level placement mode"
-msgstr "Mode penempatan tingkat-puncak"
+msgstr "Mode penempatan tingkat-atas"
 
 #. (itstool) path: listitem/para
 #: C/index.docbook:337
 msgid ""
-"To use toplevel placement mode, select a defined toplevel widget in the "
+"To use top level placement mode, select a defined top-level widget in the "
-"<guilabel>Palette</guilabel> window. When you select a toplevel widget in "
+"<guilabel>Palette</guilabel> window. When you select a top-level widget in "
 "the <guilabel>Palette</guilabel> window, the widget appears immediately on "
-"your desktop. You can then edit the widget. After you select a toplevel "
+"your desktop. You can then edit the widget. After you select a top-level "
 "widget, the mode returns to selection mode."
 msgstr ""
-"Untuk menggunakan mode penempatan tingkat-puncak, pilih widget tingkat-"
+"Untuk menggunakan mode penempatan tingkat-atas, pilih widget tingkat-atas "
-"puncak yang didefinisikan dalam jendela <application>Palet</application>. "
+"yang didefinisikan dalam jendela <application>Palet</application>. Bila Anda "
-"Bila Anda memilih widget tingkat-puncak pada jendela <application>Palet</"
+"memilih widget tingkat-atas pada jendela <application>Palet</application>, "
-"application>, widget akan segera muncul di desktop Anda. Anda kemudian dapat "
+"widget akan segera muncul di destop Anda. Anda kemudian dapat menyunting "
-"menyunting widget. Setelah Anda memilih widget tingkat-puncak, mode akan "
+"widget. Setelah Anda memilih widget tingkat-atas, mode akan kembali ke mode "
-"kembali ke mode seleksi."
+"seleksi."
 
 #. (itstool) path: sect2/title
 #: C/index.docbook:354
@@ -601,9 +602,9 @@ msgid ""
 "project window. You can choose the following widget containers from the "
 "<guilabel>Palette</guilabel> window:"
 msgstr ""
-"Anda dapat menggunakan wadah widget, atau kotak, untuk mengatur tata letak "
+"Anda dapat menggunakan wadah widget, atau kotak, untuk tata letak dan "
-"dan mengorganisasi widget pada jendela proyek Anda. Anda dapat memilih wadah "
+"mengatur widget pada jendela proyek Anda. Anda dapat memilih wadah widget "
-"widget berikut dari jendela <guilabel>Palet</guilabel>:"
+"berikut dari jendela <guilabel>Palet</guilabel>."
 
 #. (itstool) path: listitem/para
 #: C/index.docbook:360

man/meson.build

@@ -4,6 +4,7 @@ assert(xsltproc.found(), 'xsltproc is required for man pages generation')
 xsltproc_cmd = [
   xsltproc,
   '--output', '@OUTPUT@',
+  '--nonet',
   '--stringparam', 'man.output.quietly', '1',
   '--stringparam', 'funcsynopsis.style', 'ansi',
   '--stringparam', 'man.th.extra1.suppress', '1',

meson.build

@@ -8,10 +8,10 @@
 # version will always know they are on a development release.
 project(
   'glade', 'c',
-  version: '3.40.0',
+  version: '3.38.0',
   license: 'GPL2',
   default_options: 'buildtype=debugoptimized',
-  meson_version: '>= 0.57.0',
+  meson_version: '>= 0.49.0',
 )
 
 glade_name = meson.project_name()
@@ -49,8 +49,8 @@ gladeui_libname = '@0@-@1@'.format(gladeui_name, gladeui_version)
 # Reference: http://www.gnu.org/software/libtool/manual/libtool.html#Versioning
 
 gladeui_revision = 0
-gladeui_current = 14
+gladeui_current = 13
-gladeui_age = 1
+gladeui_age = 0
 gladeui_current_minus_age = gladeui_current - gladeui_age
 gladeui_libversion = '@0@.@1@.@2@'.format(gladeui_current_minus_age, gladeui_age, gladeui_revision)
 
@@ -65,8 +65,6 @@ glade_unstable = glade_minor_version.is_odd()
 gnome = import('gnome')
 i18n = import('i18n')
 pkg = import('pkgconfig')
-
-# NOTE: On windows we only target MSYS2/mingw
 windows = import('windows')
 
 source_root = meson.current_source_dir()
@@ -113,7 +111,6 @@ add_project_arguments(common_flags, language: 'c')
 
 # Check required libraries
 glib_dep = dependency('glib-2.0', version: '>= 2.64.0')
-gio_dep = dependency('gio-2.0', version: '>= 2.64.0')
 gmodule_dep = dependency('gmodule-2.0')
 gmodule_export_dep = dependency('gmodule-export-2.0')
 gtk_dep = dependency('gtk+-3.0', version: '>= 3.24.0')
@@ -153,7 +150,7 @@ pygobject_version = '3.8.0'
 pygobject_dep = dependency('pygobject-3.0', version: '>= ' + pygobject_version, required: get_option('python'))
 have_python = pygobject_dep.found()
 if have_python
-  python_dep = import('python').find_installation().dependency(embed: true)
+  python_dep = dependency('python-3.8-embed', version: '>= 3.8')
 
   version_array = pygobject_version.split('.')
   config_h.set('PYGOBJECT_REQUIRED_MAJOR', version_array[0].to_int())
@@ -184,7 +181,6 @@ if glade_system == 'windows'
   rc_conf.set('GLADE_MINOR_VERSION', glade_minor_version)
   rc_conf.set('GLADE_MICRO_VERSION', glade_micro_version)
   rc_conf.set('GLADE_CURRENT_MINUS_AGE', gladeui_current_minus_age)
-  rc_conf.set('SOURCE_ROOT', source_root)
 endif
 
 subdir('po')
@@ -210,21 +206,11 @@ configure_file(
   configuration: config_h,
 )
 
-gnome.post_install(
+meson.add_install_script(
-  gtk_update_icon_cache: true,
+  'meson_post_install.py',
+  glade_datadir,
 )
 
-tls_backend_support_src = '''
-#include <stdio.h>
-#include <gio/gio.h>
-int main(int argc, char **argv)
-{
-  printf ("%s\n", g_tls_backend_supports_tls (g_tls_backend_get_default ()) ? "true" : "false");
-  return 0;
-}
-'''
-tls_backend_support = cc.run(tls_backend_support_src, dependencies: gio_dep).stdout()
-
 output = '\nConfiguration:\n\n'
 output += '\tCompiler:                ' + cc.get_id() + '\n'
 output += '\tSource code location:    ' + source_root + '\n'
@@ -236,6 +222,5 @@ output += '\tGladeui Catalog:         ' + enable_gladeui.to_string() + '\n'
 output += '\tWebKit2GTK+ Catalog:     ' + have_webkit2gtk.to_string() + '\n'
 output += '\tIntrospection Data:      ' + enable_introspection.to_string() + '\n\n'
 output += '\tBuild Reference Manual:  ' + enable_gtk_doc.to_string() + '\n'
-output += '\tBuild Manual Pages:      ' + enable_man.to_string() + '\n'
+output += '\tBuild Manual Pages:      ' + enable_man.to_string()
-output += '\tTLS backend support:     ' + tls_backend_support
 message(output)

meson_post_install.py

@@ -0,0 +1,12 @@
+#!/usr/bin/env python3
+
+import os
+import subprocess
+import sys
+
+if not os.environ.get('DESTDIR'):
+    prefix = os.environ['MESON_INSTALL_PREFIX']
+
+    icondir = os.path.join(prefix, sys.argv[1], 'icons', 'hicolor')
+    print('Update icon cache...')
+    subprocess.call(['gtk-update-icon-cache', '-f', '-t', icondir])

plugins/gjs/glade-gjs.c

@@ -93,7 +93,7 @@ glade_gjs_init (const gchar *name)
 
   /* Importing the module will create all the GTypes so that glade can use them at runtime */
   retval = gjs_context_eval (gjs_context_get_current (),
-                             import_sentence, -1, "<glade-gjs>",
+                             import_sentence, -1, NULL,
                              &exit_status,
                              &error);
   if (!retval && error)

plugins/gtk+/glade-about-dialog-editor.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef _GLADE_ABOUT_DIALOG_EDITOR_H_
 #define _GLADE_ABOUT_DIALOG_EDITOR_H_
 

plugins/gtk+/glade-accels.h

@@ -1,24 +1,3 @@
-/*
- * Copyright (C) 2008 Tristan Van Berkom
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Authors:
- *   Tristan Van Berkom <tvb@gnome.org>
- */
-
 #ifndef __GLADE_ACCELS_H__
 #define __GLADE_ACCELS_H__
 

plugins/gtk+/glade-action-bar-editor.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Matthias Clasen <mclasen@redhat.com>
  */
-
 #ifndef _GLADE_ACTION_BAR_EDITOR_H_
 #define _GLADE_ACTION_BAR_EDITOR_H_
 

plugins/gtk+/glade-action-editor.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef _GLADE_ACTION_EDITOR_H_
 #define _GLADE_ACTION_EDITOR_H_
 

plugins/gtk+/glade-activatable-editor.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef _GLADE_ACTIVATABLE_EDITOR_H_
 #define _GLADE_ACTIVATABLE_EDITOR_H_
 

plugins/gtk+/glade-app-chooser-button-editor.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef _GLADE_APP_CHOOSER_BUTTON_EDITOR_H_
 #define _GLADE_APP_CHOOSER_BUTTON_EDITOR_H_
 

plugins/gtk+/glade-app-chooser-widget-editor.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef _GLADE_APP_CHOOSER_WIDGET_EDITOR_H_
 #define _GLADE_APP_CHOOSER_WIDGET_EDITOR_H_
 

plugins/gtk+/glade-arrow-editor.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef _GLADE_ARROW_EDITOR_H_
 #define _GLADE_ARROW_EDITOR_H_
 

plugins/gtk+/glade-attributes.c

@@ -33,11 +33,6 @@
 
 #define GLADE_RESPONSE_CLEAR 42
 
-typedef struct {
-  GladeEditorProperty *eprop;
-  GtkWidget *tree_view;
-} GladeEditorPropertyData;
-
 static GList *
 glade_attr_list_copy (GList *attrs)
 {
@@ -134,11 +129,6 @@ enum
   NUM_COLUMNS
 };
 
-typedef enum
-{
-  ROW_RESET_MODE = 0,
-  ROW_APPEND_MODE
-} RowSetMode;
 
 typedef enum
 {
@@ -211,17 +201,14 @@ get_enum_model_for_combo (PangoAttrType type)
 }
 
 static gboolean
-set_empty_row_internal (GtkTreeModel *model, PangoAttrType type, GtkTreeIter *current_iter)
+append_empty_row (GtkListStore *store, PangoAttrType type)
 {
   const gchar *name = NULL;
   guint spin_digits = 0;
   GtkAdjustment *adjustment = NULL;
+  GtkListStore *model = get_enum_model_for_combo (type);
   GtkTreeIter iter;
   AttrEditType edit_type = EDIT_INVALID;
-  GtkListStore *store = GTK_LIST_STORE (model);
-  RowSetMode mode;
-
-  mode = (current_iter ? ROW_RESET_MODE : ROW_APPEND_MODE);
 
   switch (type)
     {
@@ -325,57 +312,32 @@ set_empty_row_internal (GtkTreeModel *model, PangoAttrType type, GtkTreeIter *cu
     }
 
   if (name)
-    {
-      if (mode == ROW_RESET_MODE)
-        iter = *current_iter;
-
-      if (mode == ROW_APPEND_MODE)
     {
       gtk_list_store_append (store, &iter);
+
       gtk_list_store_set (store, &iter,
                           COLUMN_TOGGLE_ACTIVE, FALSE,
                           COLUMN_SPIN_ACTIVE, FALSE,
                           COLUMN_COMBO_ACTIVE, FALSE,
                           COLUMN_BUTTON_ACTIVE, FALSE, -1);
+
       gtk_list_store_set (store, &iter,
                           COLUMN_NAME, name,
                           COLUMN_TYPE, type,
                           COLUMN_EDIT_TYPE, edit_type,
-                              ACTIVATE_COLUMN_FROM_TYPE (edit_type), TRUE, -1);
-        }
-
-      gtk_list_store_set (store, &iter,
                           COLUMN_NAME_WEIGHT, PANGO_WEIGHT_NORMAL,
                           COLUMN_TEXT, _("<Enter Value>"),
                           COLUMN_TEXT_STYLE, PANGO_STYLE_ITALIC,
                           COLUMN_TEXT_FG, "Grey",
-                          COLUMN_COMBO_MODEL, get_enum_model_for_combo (type),
+                          COLUMN_COMBO_MODEL, model,
-                          COLUMN_TOGGLE_DOWN, FALSE,
                           COLUMN_SPIN_DIGITS, spin_digits,
-                          COLUMN_SPIN_ADJUSTMENT, adjustment, -1);
+                          COLUMN_SPIN_ADJUSTMENT, adjustment,
-
+                          ACTIVATE_COLUMN_FROM_TYPE (edit_type), TRUE, -1);
       return TRUE;
     }
   return FALSE;
 }
 
-static gboolean
-append_empty_row (GtkTreeModel *model, PangoAttrType type)
-{
-  return set_empty_row_internal (model, type, NULL);
-}
-
-static gboolean
-clear_modified_row (GtkTreeModel *model, GtkTreeIter *iter)
-{
-  PangoAttrType type;
-
-  gtk_tree_model_get (model, iter,
-                      COLUMN_TYPE, &type, -1);
-
-  return set_empty_row_internal (model, type, iter);
-}
-
 static gboolean
 is_empty_row (GtkTreeModel *model, GtkTreeIter *iter)
 {
@@ -745,8 +707,7 @@ value_icon_activate (GtkCellRendererToggle *cell_renderer,
   GtkTreeIter iter;
   PangoAttrType type;
   AttrEditType edit_type;
-  PangoColor color;
+  GdkRGBA color = {0,};
-  GdkRGBA rgba;
   gchar *text = NULL, *new_text;
 
   /* Find type etc */
@@ -765,25 +726,25 @@ value_icon_activate (GtkCellRendererToggle *cell_renderer,
         dialog = gtk_color_chooser_dialog_new (_("Select a color"),
                                                GTK_WINDOW (glade_app_get_window ()));
         /* Get response etc... */
-        if (text && pango_color_parse (&color, text))
+        if (text && gdk_rgba_parse (&color, text))
-          {
+          gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog), &color);
-            rgba.red   = color.red   / 65535.0;
-            rgba.green = color.green / 65535.0;
-            rgba.blue  = color.blue  / 65535.0;
-            rgba.alpha = 1.0;
-            gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog), &rgba);
-          }
 
         if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
           {
-            gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (dialog), &rgba);
+            gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (dialog), &color);
-
-            color.red   = (gint16) (rgba.red * 65535);
-            color.green = (gint16) (rgba.green * 65535);
-            color.blue  = (gint16) (rgba.blue * 65535);
-
             /* Use PangoColor string format */
-            new_text = pango_color_to_string (&color);
+            if (((guint8)(color.red * 0xFF)) * 0x101 == (guint16)(color.red * 0xFFFF) &&
+                ((guint8)(color.green * 0xFF)) * 0x101 == (guint16)(color.green * 0xFFFF) &&
+                ((guint8)(color.blue * 0xFF)) * 0x101 == (guint16)(color.blue * 0xFFFF))
+              new_text = g_strdup_printf ("#%02X%02X%02X",
+                                          (guint8)(color.red * 0xFF),
+                                          (guint8)(color.green * 0xFF),
+                                          (guint8)(color.blue * 0xFF));
+            else
+              new_text = g_strdup_printf ("#%04X%04X%04X",
+                                          (guint16)(color.red * 0xFFFF),
+                                          (guint16)(color.green * 0xFFFF),
+                                          (guint16)(color.blue * 0xFFFF));
 
             gtk_list_store_set (GTK_LIST_STORE (eprop_attrs->model), &iter,
                                 COLUMN_TEXT, new_text,
@@ -865,7 +826,7 @@ value_combo_spin_edited (GtkCellRendererText *cell,
   gtk_tree_model_get (eprop_attrs->model, &iter, COLUMN_TYPE, &type, -1);
 
   /* Reset the column */
-  if (new_text && (*new_text == '0' || strcmp (new_text, _("None")) == 0))
+  if (new_text && (*new_text == '\0' || strcmp (new_text, _("None")) == 0))
     {
       gtk_list_store_set (GTK_LIST_STORE (eprop_attrs->model), &iter,
                           COLUMN_TEXT, _("<Enter Value>"),
@@ -927,8 +888,6 @@ glade_eprop_attrs_view (GladeEditorProperty *eprop)
   view_widget = gtk_tree_view_new_with_model (eprop_attrs->model);
   gtk_tree_view_set_show_expanders (GTK_TREE_VIEW (view_widget), FALSE);
   gtk_tree_view_set_enable_search (GTK_TREE_VIEW (view_widget), FALSE);
-  gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (view_widget)),
-                               GTK_SELECTION_MULTIPLE);
 
   /********************* attribute name column *********************/
   renderer = gtk_cell_renderer_text_new ();
@@ -1020,7 +979,7 @@ static void
 glade_eprop_attrs_populate_view (GladeEditorProperty *eprop, GtkTreeView *view)
 {
   GList *attributes, *list;
-  GtkTreeModel *model = gtk_tree_view_get_model (view);
+  GtkListStore *model = (GtkListStore *) gtk_tree_view_get_model (view);
   GtkTreeIter *iter;
   GladeAttribute *gattr;
   GladeProperty *property;
@@ -1054,7 +1013,7 @@ glade_eprop_attrs_populate_view (GladeEditorProperty *eprop, GtkTreeView *view)
     {
       gattr = list->data;
 
-      if ((iter = get_row_by_type (model, gattr->type)))
+      if ((iter = get_row_by_type (GTK_TREE_MODEL (model), gattr->type)))
         {
           text = glade_gtk_string_from_attr (gattr);
 
@@ -1075,130 +1034,26 @@ glade_eprop_attrs_populate_view (GladeEditorProperty *eprop, GtkTreeView *view)
         }
 
     }
-}
 
-static void
-clear_selected_rows (GladeEditorPropertyData *data)
-{
-  GladeEPropAttrs *eprop_attrs = GLADE_EPROP_ATTRS (data->eprop);
-  GtkTreeSelection *selection;
-  GList *selected_rows, *l;
-  GtkTreeIter iter;
-
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (data->tree_view));
-  selected_rows = gtk_tree_selection_get_selected_rows (selection, NULL);
-
-  if (!selected_rows)
-    return;
-
-  for (l = selected_rows; l; l = l->next)
-    {
-      GtkTreePath *path = l->data;
-
-      if (gtk_tree_model_get_iter (eprop_attrs->model, &iter, path))
-        {
-           if (!is_empty_row (eprop_attrs->model, &iter))
-             clear_modified_row (eprop_attrs->model, &iter);
-        }
-    }
-
-  g_list_free_full (selected_rows, (GDestroyNotify) gtk_tree_path_free);
-}
-
-static void
-selection_changed_cb (GtkTreeSelection *selection, GtkDialog *dialog)
-{
-  gint count;
-  GList *children, *l;
-
-  children =
-      gtk_container_get_children (GTK_CONTAINER
-                                  (gtk_dialog_get_action_area
-                                   (dialog)));
-
-  count = gtk_tree_selection_count_selected_rows (selection);
-  for (l = children; l; l = l->next)
-    {
-      gint response_id;
-
-      response_id =
-          gtk_dialog_get_response_for_widget (dialog, GTK_WIDGET (l->data));
-
-      if (response_id == GLADE_RESPONSE_CLEAR)
-        {
-          gtk_dialog_set_response_sensitive (dialog,
-                                             response_id, (count > 0));
-          break;
-        }
-    }
-  g_list_free (children);
-}
-
-static void
-glade_eprop_attrs_dialog_response_cb (GtkWidget *dialog,
-                                      gint response_id,
-                                      GladeEditorPropertyData *data)
-{
-  GladeEditorProperty *eprop = data->eprop;
-  GladeEPropAttrs *eprop_attrs = GLADE_EPROP_ATTRS (eprop);
-
-  gboolean done = TRUE;
-  gboolean save = FALSE;
-  GList *old_attributes;
-  GladeProperty *property;
-
-  property = glade_editor_property_get_property (eprop);
-
-  /* Keep a copy for commit time... */
-  old_attributes = g_value_dup_boxed (glade_property_inline_value (property));
-
-  switch (response_id) {
-  case GTK_RESPONSE_OK:
-    save = TRUE;
-    break;
-
-  case GLADE_RESPONSE_CLEAR:
-    done = FALSE;
-    save = TRUE;
-    clear_selected_rows (data);
-    break;
-
-  case GTK_RESPONSE_CANCEL:
-  case GTK_RESPONSE_DELETE_EVENT:
-    break;
-
-  default:
-    g_assert_not_reached ();
-    break;
-  }
-
-  if (save) {
-    /* Update from old attributes so that there a property change
-     * sitting on the undo stack.
-     */
-    glade_property_set (property, old_attributes);
-    sync_object (eprop_attrs, TRUE);
-  }
-
-  /* Clean up ...
-   */
-  if (done) {
-    gtk_widget_destroy (dialog);
-    g_clear_object (&eprop_attrs->model);
-    glade_attr_list_free (old_attributes);
-    g_free (data);
-  }
 }
 
 static void
 glade_eprop_attrs_show_dialog (GtkWidget *dialog_button,
                                GladeEditorProperty *eprop)
 {
+  GladeEPropAttrs *eprop_attrs = GLADE_EPROP_ATTRS (eprop);
   GtkWidget *dialog, *parent, *vbox, *sw, *tree_view;
-  GladeEditorPropertyData *data;
+  GladeProperty *property;
+  GList *old_attributes;
+  gint res;
 
+  property = glade_editor_property_get_property (eprop);
   parent   = gtk_widget_get_toplevel (GTK_WIDGET (eprop));
 
+
+  /* Keep a copy for commit time... */
+  old_attributes = g_value_dup_boxed (glade_property_inline_value (property));
+
   dialog = gtk_dialog_new_with_buttons (_("Setup Text Attributes"),
                                         GTK_WINDOW (parent),
                                         GTK_DIALOG_MODAL |
@@ -1207,9 +1062,6 @@ glade_eprop_attrs_show_dialog (GtkWidget *dialog_button,
                                         _("_Cancel"), GTK_RESPONSE_CANCEL,
                                         _("_OK"), GTK_RESPONSE_OK, NULL);
 
- gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
-                                    GLADE_RESPONSE_CLEAR, FALSE);
-
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_widget_show (vbox);
 
@@ -1230,21 +1082,38 @@ glade_eprop_attrs_show_dialog (GtkWidget *dialog_button,
   tree_view = glade_eprop_attrs_view (eprop);
   glade_eprop_attrs_populate_view (eprop, GTK_TREE_VIEW (tree_view));
 
-  g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)),
-                    "changed",
-                    G_CALLBACK (selection_changed_cb), dialog);
   gtk_tree_view_expand_all (GTK_TREE_VIEW (tree_view));
 
   gtk_widget_show (tree_view);
   gtk_container_add (GTK_CONTAINER (sw), tree_view);
 
-  data = g_new0 (GladeEditorPropertyData, 1);
+  /* Run the dialog */
-  data->eprop = eprop;
+  res = gtk_dialog_run (GTK_DIALOG (dialog));
-  data->tree_view = tree_view;
+  if (res == GTK_RESPONSE_OK)
+    {
+      /* Update from old attributes so that there a property change 
+       * sitting on the undo stack.
+       */
+      glade_property_set (property, old_attributes);
+      sync_object (eprop_attrs, TRUE);
+    }
+  else if (res == GLADE_RESPONSE_CLEAR)
+    {
+      GValue value = { 0, };
+      g_value_init (&value, GLADE_TYPE_ATTR_GLIST);
+      g_value_set_boxed (&value, NULL);
+      glade_editor_property_commit (eprop, &value);
+      g_value_unset (&value);
+    }
 
-  g_signal_connect (dialog, "response", G_CALLBACK (glade_eprop_attrs_dialog_response_cb), data);
+  /* Clean up ...
+   */
+  gtk_widget_destroy (dialog);
 
-  gtk_widget_show (GTK_WIDGET (dialog));
+  g_object_unref (G_OBJECT (eprop_attrs->model));
+  eprop_attrs->model = NULL;
+
+  glade_attr_list_free (old_attributes);
 }
 
 

plugins/gtk+/glade-attributes.h

@@ -1,26 +1,3 @@
-/*
- * glade-attributes.h
- *
- * Copyright (C) 2008 Tristan Van Berkom
- *
- * Author(s):
- *      Tristan Van Berkom <tvb@gnome.org>
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
 #ifndef __GLADE_ATTRIBUTES_H__
 #define __GLADE_ATTRIBUTES_H__
 

plugins/gtk+/glade-box-editor.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef _GLADE_BOX_EDITOR_H_
 #define _GLADE_BOX_EDITOR_H_
 

plugins/gtk+/glade-button-editor.c

@@ -373,7 +373,6 @@ label_toggled (GtkWidget * widget, GladeButtonEditor * button_editor)
   glade_property_get_default (property, &value);
   glade_command_set_property_value (property, &value);
   g_value_unset (&value);
-  glade_property_i18n_set_translatable (property, TRUE);
 
   glade_command_pop_group ();
 

plugins/gtk+/glade-button-editor.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef _GLADE_BUTTON_EDITOR_H_
 #define _GLADE_BUTTON_EDITOR_H_
 

plugins/gtk+/glade-cell-renderer-editor.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef _GLADE_CELL_RENDERER_EDITOR_H_
 #define _GLADE_CELL_RENDERER_EDITOR_H_
 

plugins/gtk+/glade-column-types.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Juan Pablo Ugarte <juanpablougarte@gmail.com>
  */
-
 #ifndef _GLADE_COLUMN_TYPES_H_
 #define _STV_CAP_H_
 

plugins/gtk+/glade-combo-box-editor.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef _GLADE_COMBO_BOX_EDITOR_H_
 #define _GLADE_COMBO_BOX_EDITOR_H_
 

plugins/gtk+/glade-combo-box-text-editor.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef _GLADE_COMBO_BOX_TEXT_EDITOR_H_
 #define _GLADE_COMBO_BOX_TEXT_EDITOR_H_
 

plugins/gtk+/glade-entry-editor.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef _GLADE_ENTRY_EDITOR_H_
 #define _GLADE_ENTRY_EDITOR_H_
 

plugins/gtk+/glade-file-chooser-button-editor.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef _GLADE_FILE_CHOOSER_BUTTON_EDITOR_H_
 #define _GLADE_FILE_CHOOSER_BUTTON_EDITOR_H_
 

plugins/gtk+/glade-file-chooser-dialog-editor.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef _GLADE_FILE_CHOOSER_DIALOG_EDITOR_H_
 #define _GLADE_FILE_CHOOSER_DIALOG_EDITOR_H_
 

plugins/gtk+/glade-file-chooser-editor.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef _GLADE_FILE_CHOOSER_EDITOR_H_
 #define _GLADE_FILE_CHOOSER_EDITOR_H_
 

plugins/gtk+/glade-file-chooser-widget-editor.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef _GLADE_FILE_CHOOSER_WIDGET_EDITOR_H_
 #define _GLADE_FILE_CHOOSER_WIDGET_EDITOR_H_
 

plugins/gtk+/glade-fixed.h

@@ -1,24 +1,3 @@
-/*
- * Copyright (C) 2006, 2013 Tristan Van Berkom.
- *
- * Author(s):
- *      Tristan Van Berkom <tvb@gnome.org>
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
 #ifndef __GLADE_FIXED_H__
 #define __GLADE_FIXED_H__
 

plugins/gtk+/glade-font-button-editor.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef _GLADE_FONT_BUTTON_EDITOR_H_
 #define _GLADE_FONT_BUTTON_EDITOR_H_
 

plugins/gtk+/glade-font-chooser-dialog-editor.h

@@ -18,7 +18,6 @@
  * Authors:
  *   Tristan Van Berkom <tvb@gnome.org>
  */
-
 #ifndef _GLADE_FONT_CHOOSER_DIALOG_EDITOR_H_
 #define _GLADE_FONT_CHOOSER_DIALOG_EDITOR_H_