Wed Jun 4 03:57:00 UTC 2014

2 files changed, 1651 insertions, 4 deletions

diff --git a/extra/gnome-menus/PKGBUILD b/extra/gnome-menus/PKGBUILD
index 0e85b69e6..9081b35d3 100644
--- a/extra/gnome-menus/PKGBUILD
+++ b/extra/gnome-menus/PKGBUILD
@@ -1,17 +1,24 @@
-# $Id: PKGBUILD 198017 2013-10-30 12:17:45Z allan $
+# $Id: PKGBUILD 214093 2014-06-03 12:50:34Z jgc $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-menus
 pkgver=3.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME menu specifications"
 arch=('i686' 'x86_64')
 depends=('glib2')
 makedepends=('intltool' 'gobject-introspection')
 license=('GPL' 'LGPL')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('46950aba274c1ad58234374fa9b235258650737307f3bc396af48eb983668a71')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+        git-fixes.patch)
+sha256sums=('46950aba274c1ad58234374fa9b235258650737307f3bc396af48eb983668a71'
+            'b738c2ea37784e531a2f4517d6bb5f2d1a00e488c89a5bf0dc73fdbca70374c1')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../git-fixes.patch
+}
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-menus/git-fixes.patch b/extra/gnome-menus/git-fixes.patch
new file mode 100644
index 000000000..443d553e9
--- /dev/null
+++ b/extra/gnome-menus/git-fixes.patch
@@ -0,0 +1,1640 @@
+diff --git a/libmenu/canonicalize.c b/libmenu/canonicalize.c
+index f601c4f..8a02dd9 100644
+--- a/libmenu/canonicalize.c
++++ b/libmenu/canonicalize.c
+@@ -15,9 +15,7 @@
+    Lesser General Public License for more details.
+ 
+    You should have received a copy of the GNU Lesser General Public
+-   License along with the GNU C Library; if not, write to the Free
+-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+-   02111-1307 USA.  */
++   License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>.  */
+ 
+ #include <config.h>
+ 
+diff --git a/libmenu/canonicalize.h b/libmenu/canonicalize.h
+index e3ef502..2dff7f4 100644
+--- a/libmenu/canonicalize.h
++++ b/libmenu/canonicalize.h
+@@ -15,9 +15,7 @@
+    Lesser General Public License for more details.
+ 
+    You should have received a copy of the GNU Lesser General Public
+-   License along with the GNU C Library; if not, write to the Free
+-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+-   02111-1307 USA.  */
++   License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>.  */
+ 
+ #ifndef G_CANONICALIZE_H
+ #define G_CANONICALIZE_H
+diff --git a/libmenu/desktop-entries.c b/libmenu/desktop-entries.c
+index 1e23bf2..326f311 100644
+--- a/libmenu/desktop-entries.c
++++ b/libmenu/desktop-entries.c
+@@ -12,9 +12,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #include <config.h>
+@@ -406,7 +404,7 @@ desktop_entry_ref (DesktopEntry *entry)
+   g_return_val_if_fail (entry != NULL, NULL);
+   g_return_val_if_fail (entry->refcount > 0, NULL);
+ 
+-  g_atomic_int_inc (&entry->refcount);
++  entry->refcount += 1;
+ 
+   return entry;
+ }
+@@ -699,7 +697,7 @@ desktop_entry_set_ref (DesktopEntrySet *set)
+   g_return_val_if_fail (set != NULL, NULL);
+   g_return_val_if_fail (set->refcount > 0, NULL);
+ 
+-  g_atomic_int_inc (&set->refcount);
++  set->refcount += 1;
+ 
+   return set;
+ }
+@@ -707,13 +705,11 @@ desktop_entry_set_ref (DesktopEntrySet *set)
+ void
+ desktop_entry_set_unref (DesktopEntrySet *set)
+ {
+-  gboolean is_zero;
+-
+   g_return_if_fail (set != NULL);
+   g_return_if_fail (set->refcount > 0);
+ 
+-  is_zero = g_atomic_int_dec_and_test (&set->refcount);
+-  if (is_zero)
++  set->refcount -= 1;
++  if (set->refcount == 0)
+     {
+       menu_verbose (" Deleting entry set %p\n", set);
+ 
+diff --git a/libmenu/desktop-entries.h b/libmenu/desktop-entries.h
+index 07b7c85..72ca4b8 100644
+--- a/libmenu/desktop-entries.h
++++ b/libmenu/desktop-entries.h
+@@ -12,9 +12,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #ifndef __DESKTOP_ENTRIES_H__
+diff --git a/libmenu/entry-directories.c b/libmenu/entry-directories.c
+index 67869b4..214513b 100644
+--- a/libmenu/entry-directories.c
++++ b/libmenu/entry-directories.c
+@@ -12,9 +12,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #include <config.h>
+@@ -40,12 +38,12 @@ struct EntryDirectory
+ 
+   guint entry_type : 2;
+   guint is_legacy : 1;
+-  volatile gint refcount;
++  guint refcount : 24;
+ };
+ 
+ struct EntryDirectoryList
+ {
+-  volatile int refcount;
++  int    refcount;
+   int    length;
+   GList *dirs;
+ };
+@@ -64,10 +62,10 @@ struct CachedDir
+   guint have_read_entries : 1;
+   guint deleted : 1;
+ 
++  guint references;
++
+   GFunc    notify;
+   gpointer notify_data;
+-
+-  volatile gint references;
+ };
+ 
+ struct CachedDirMonitor
+@@ -83,6 +81,7 @@ static void     cached_dir_free                   (CachedDir  *dir);
+ static gboolean cached_dir_load_entries_recursive (CachedDir  *dir,
+                                                    const char *dirname);
+ static void     cached_dir_unref                  (CachedDir *dir);
++static void     cached_dir_unref_noparent         (CachedDir *dir);
+ static CachedDir * cached_dir_add_subdir          (CachedDir  *dir,
+                                                    const char *basename,
+                                                    const char *path);
+@@ -156,7 +155,7 @@ cached_dir_free (CachedDir *dir)
+   dir->entries = NULL;
+ 
+   g_slist_foreach (dir->subdirs,
+-                   (GFunc) cached_dir_unref,
++                   (GFunc) cached_dir_unref_noparent,
+                    NULL);
+   g_slist_free (dir->subdirs);
+   dir->subdirs = NULL;
+@@ -168,18 +167,14 @@ cached_dir_free (CachedDir *dir)
+ static CachedDir *
+ cached_dir_ref (CachedDir *dir)
+ {
+-  g_atomic_int_inc (&dir->references);
+-
++  dir->references++;
+   return dir;
+ }
+ 
+ static void
+ cached_dir_unref (CachedDir *dir)
+ {
+-  gboolean is_zero;
+-
+-  is_zero = g_atomic_int_dec_and_test (&dir->references);
+-  if (is_zero)
++  if (--dir->references == 0)
+     {
+       CachedDir *parent;
+ 
+@@ -195,6 +190,18 @@ cached_dir_unref (CachedDir *dir)
+     }
+ }
+ 
++static void
++cached_dir_unref_noparent (CachedDir *dir)
++{
++  if (--dir->references == 0)
++    {
++      if (dir->notify)
++        dir->notify (dir, dir->notify_data);
++
++      cached_dir_free (dir);
++    }
++}
++
+ static inline CachedDir *
+ find_subdir (CachedDir  *dir,
+              const char *subdir)
+@@ -224,13 +231,8 @@ find_entry (CachedDir  *dir,
+   tmp = dir->entries;
+   while (tmp != NULL)
+     {
+-      const char *entry_basename;
+-
+-      entry_basename = desktop_entry_get_basename (tmp->data);
+-      if (strcmp (entry_basename, basename) == 0)
+-        {
+-          return tmp->data;
+-        }
++      if (strcmp (desktop_entry_get_basename (tmp->data), basename) == 0)
++        return tmp->data;
+ 
+       tmp = tmp->next;
+     }
+@@ -334,9 +336,7 @@ cached_dir_update_entry (CachedDir  *dir,
+   tmp = dir->entries;
+   while (tmp != NULL)
+     {
+-      const char *entry_basename;
+-      entry_basename = desktop_entry_get_basename (tmp->data);
+-      if (strcmp (entry_basename, basename) == 0)
++      if (strcmp (desktop_entry_get_basename (tmp->data), basename) == 0)
+         {
+           if (!desktop_entry_reload (tmp->data))
+ 	    {
+@@ -361,10 +361,7 @@ cached_dir_remove_entry (CachedDir  *dir,
+   tmp = dir->entries;
+   while (tmp != NULL)
+     {
+-      const char *entry_basename;
+-      entry_basename = desktop_entry_get_basename (tmp->data);
+-
+-      if (strcmp (entry_basename, basename) == 0)
++      if (strcmp (desktop_entry_get_basename (tmp->data), basename) == 0)
+         {
+           desktop_entry_unref (tmp->data);
+           dir->entries = g_slist_delete_link (dir->entries, tmp);
+@@ -420,11 +417,8 @@ cached_dir_remove_subdir (CachedDir  *dir,
+     {
+       subdir->deleted = TRUE;
+ 
+-      if (subdir->references == 0)
+-        {
+-          cached_dir_unref (subdir);
+-          dir->subdirs = g_slist_remove (dir->subdirs, subdir);
+-        }
++      cached_dir_unref (subdir);
++      dir->subdirs = g_slist_remove (dir->subdirs, subdir);
+ 
+       return TRUE;
+     }
+@@ -528,16 +522,11 @@ handle_cached_dir_changed (MenuMonitor      *monitor,
+   char     *basename;
+   char     *dirname;
+ 
+-  menu_verbose ("'%s' notified of '%s' %s - invalidating cache\n",
+-		dir->name,
+-                path,
+-                event == MENU_MONITOR_EVENT_CREATED ? ("created") :
+-                event == MENU_MONITOR_EVENT_DELETED ? ("deleted") : ("changed"));
+-
+   dirname  = g_path_get_dirname  (path);
+   basename = g_path_get_basename (path);
+ 
+   dir = cached_dir_lookup (dirname);
++  cached_dir_add_reference (dir);
+ 
+   if (g_str_has_suffix (basename, ".desktop") ||
+       g_str_has_suffix (basename, ".directory"))
+@@ -558,7 +547,7 @@ handle_cached_dir_changed (MenuMonitor      *monitor,
+           break;
+         }
+     }
+-  else /* Try recursing */
++  else if (g_file_test (path, G_FILE_TEST_IS_DIR)) /* Try recursing */
+     {
+       switch (event)
+         {
+@@ -584,6 +573,12 @@ handle_cached_dir_changed (MenuMonitor      *monitor,
+ 
+   if (handled)
+     {
++      menu_verbose ("'%s' notified of '%s' %s - invalidating cache\n",
++                    dir->name,
++                    path,
++                    event == MENU_MONITOR_EVENT_CREATED ? ("created") :
++                    event == MENU_MONITOR_EVENT_DELETED ? ("deleted") : ("changed"));
++
+       /* CHANGED events don't change the set of desktop entries */
+       if (event == MENU_MONITOR_EVENT_CREATED || event == MENU_MONITOR_EVENT_DELETED)
+         {
+@@ -592,6 +587,8 @@ handle_cached_dir_changed (MenuMonitor      *monitor,
+ 
+       cached_dir_queue_monitor_event (dir);
+     }
++
++  cached_dir_remove_reference (dir);
+ }
+ 
+ static void
+@@ -822,7 +819,7 @@ entry_directory_ref (EntryDirectory *ed)
+   g_return_val_if_fail (ed != NULL, NULL);
+   g_return_val_if_fail (ed->refcount > 0, NULL);
+ 
+-  g_atomic_int_inc (&ed->refcount);
++  ed->refcount++;
+ 
+   return ed;
+ }
+@@ -830,13 +827,10 @@ entry_directory_ref (EntryDirectory *ed)
+ void
+ entry_directory_unref (EntryDirectory *ed)
+ {
+-  gboolean is_zero;
+-
+   g_return_if_fail (ed != NULL);
+   g_return_if_fail (ed->refcount > 0);
+ 
+-  is_zero = g_atomic_int_dec_and_test (&ed->refcount);
+-  if (is_zero)
++  if (--ed->refcount == 0)
+     {
+       cached_dir_remove_reference (ed->dir);
+ 
+@@ -952,12 +946,11 @@ entry_directory_foreach_recursive (EntryDirectory            *ed,
+ 
+       if (desktop_entry_get_type (entry) == ed->entry_type)
+         {
+-          gboolean    ret;
+-          char       *file_id;
+-          const char *basename;
++          gboolean  ret;
++          char     *file_id;
+ 
+-          basename = desktop_entry_get_basename (entry);
+-          g_string_append (relative_path, basename);
++          g_string_append (relative_path,
++                           desktop_entry_get_basename (entry));
+ 
+ 	  file_id = get_desktop_file_id_from_path (ed,
+ 						   ed->entry_type,
+@@ -1037,7 +1030,7 @@ entry_directory_get_flat_contents (EntryDirectory   *ed,
+       DesktopEntry *entry = tmp->data;
+       const char   *basename;
+ 
+-      basename = desktop_entry_get_path (entry);
++      basename = desktop_entry_get_basename (entry);
+ 
+       if (desktop_entries &&
+           desktop_entry_get_type (entry) == DESKTOP_ENTRY_DESKTOP)
+@@ -1110,7 +1103,7 @@ entry_directory_list_ref (EntryDirectoryList *list)
+   g_return_val_if_fail (list != NULL, NULL);
+   g_return_val_if_fail (list->refcount > 0, NULL);
+ 
+-  g_atomic_int_inc (&list->refcount);
++  list->refcount += 1;
+ 
+   return list;
+ }
+@@ -1118,13 +1111,11 @@ entry_directory_list_ref (EntryDirectoryList *list)
+ void
+ entry_directory_list_unref (EntryDirectoryList *list)
+ {
+-  gboolean is_zero;
+-
+   g_return_if_fail (list != NULL);
+   g_return_if_fail (list->refcount > 0);
+ 
+-  is_zero = g_atomic_int_dec_and_test (&list->refcount);
+-  if (is_zero)
++  list->refcount -= 1;
++  if (list->refcount == 0)
+     {
+       g_list_foreach (list->dirs, (GFunc) entry_directory_unref, NULL);
+       g_list_free (list->dirs);
+diff --git a/libmenu/entry-directories.h b/libmenu/entry-directories.h
+index 4b1f5fb..9719a2b 100644
+--- a/libmenu/entry-directories.h
++++ b/libmenu/entry-directories.h
+@@ -12,9 +12,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #ifndef __ENTRY_DIRECTORIES_H__
+diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c
+index 091a719..f8fbbd0 100644
+--- a/libmenu/gmenu-tree.c
++++ b/libmenu/gmenu-tree.c
+@@ -12,9 +12,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #include <config.h>
+@@ -1242,12 +1240,8 @@ gmenu_tree_directory_make_path (GMenuTreeDirectory *directory,
+   append_directory_path (directory, path);
+ 
+   if (entry != NULL)
+-    {
+-      const char *basename;
+-
+-      basename = desktop_entry_get_basename (entry->desktop_entry);
+-      g_string_append (path, basename);
+-    }
++    g_string_append (path,
++		     desktop_entry_get_basename (entry->desktop_entry));
+ 
+   return g_string_free (path, FALSE);
+ }
+@@ -1277,7 +1271,7 @@ gmenu_tree_entry_get_desktop_file_path (GMenuTreeEntry *entry)
+ const char *
+ gmenu_tree_entry_get_desktop_file_id (GMenuTreeEntry *entry)
+ {
+-  g_return_val_if_fail (entry != NULL, FALSE);
++  g_return_val_if_fail (entry != NULL, NULL);
+ 
+   return entry->desktop_file_id;
+ }
+diff --git a/libmenu/gmenu-tree.h b/libmenu/gmenu-tree.h
+index 4ccdb2b..283d25b 100644
+--- a/libmenu/gmenu-tree.h
++++ b/libmenu/gmenu-tree.h
+@@ -12,9 +12,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #ifndef __GMENU_TREE_H__
+diff --git a/libmenu/menu-layout.c b/libmenu/menu-layout.c
+index 4b2a02c..cdd3763 100644
+--- a/libmenu/menu-layout.c
++++ b/libmenu/menu-layout.c
+@@ -14,9 +14,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #include <config.h>
+diff --git a/libmenu/menu-layout.h b/libmenu/menu-layout.h
+index 1a6af13..05ecfca 100644
+--- a/libmenu/menu-layout.h
++++ b/libmenu/menu-layout.h
+@@ -14,9 +14,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #ifndef __MENU_LAYOUT_H__
+diff --git a/libmenu/menu-monitor.c b/libmenu/menu-monitor.c
+index 8895b49..c9fabf5 100644
+--- a/libmenu/menu-monitor.c
++++ b/libmenu/menu-monitor.c
+@@ -15,9 +15,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #include <config.h>
+diff --git a/libmenu/menu-monitor.h b/libmenu/menu-monitor.h
+index 4a37ce2..0522e57 100644
+--- a/libmenu/menu-monitor.h
++++ b/libmenu/menu-monitor.h
+@@ -12,9 +12,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #ifndef __MENU_MONITOR_H__
+diff --git a/libmenu/menu-util.c b/libmenu/menu-util.c
+index 7bc6fd1..10f88a8 100644
+--- a/libmenu/menu-util.c
++++ b/libmenu/menu-util.c
+@@ -14,9 +14,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #include <config.h>
+diff --git a/libmenu/menu-util.h b/libmenu/menu-util.h
+index 5b0a3f4..be73086 100644
+--- a/libmenu/menu-util.h
++++ b/libmenu/menu-util.h
+@@ -14,9 +14,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #ifndef __MENU_UTIL_H__
+diff --git a/po/LINGUAS b/po/LINGUAS
+index 7a3fc8f..8cde878 100644
+--- a/po/LINGUAS
++++ b/po/LINGUAS
+@@ -33,6 +33,7 @@ fr
+ fur
+ fy
+ ga
++gd
+ gl
+ gn
+ gu
+diff --git a/po/el.po b/po/el.po
+index e3fcc56..6678cfb 100644
+--- a/po/el.po
++++ b/po/el.po
+@@ -10,16 +10,16 @@ msgstr ""
+ "Project-Id-Version: el\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "menus&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-02-19 22:31+0000\n"
+-"PO-Revision-Date: 2013-02-24 10:21+0300\n"
++"POT-Creation-Date: 2013-12-18 20:58+0000\n"
++"PO-Revision-Date: 2013-12-23 08:45+0300\n"
+ "Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>\n"
+-"Language-Team: team@gnome.gr\n"
++"Language-Team: team@lists.gnome.gr\n"
+ "Language: el\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: Virtaal 0.7.1\n"
++"X-Generator: Virtaal 0.7.0\n"
+ "X-Project-Style: gnome\n"
+ 
+ #: ../desktop-directories/AudioVideo.directory.in.h:1
+@@ -117,7 +117,7 @@ msgstr "Διάφορα"
+ 
+ #: ../desktop-directories/X-GNOME-Utilities.directory.in.h:1
+ msgid "Utilities"
+-msgstr "Βοηθήματα"
++msgstr "Βοηθητικά προγράμματα"
+ 
+ #: ../desktop-directories/X-GNOME-Utilities.directory.in.h:2
+ msgid "Small but useful GNOME tools"
+diff --git a/po/fr.po b/po/fr.po
+index 5721f91..e227f32 100644
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -14,7 +14,7 @@ msgstr ""
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "menus&keywords=I18N+L10N&component=general\n"
+ "POT-Creation-Date: 2013-02-20 09:33+0000\n"
+-"PO-Revision-Date: 2013-02-20 21:14+0100\n"
++"PO-Revision-Date: 2013-10-23 16:35+0200\n"
+ "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
+ "Language-Team: GNOME French team <gnomefr@traduc.org>\n"
+ "Language: \n"
+@@ -72,7 +72,7 @@ msgstr "Bureautique"
+ 
+ #: ../desktop-directories/Office.directory.in.h:2
+ msgid "Office Applications"
+-msgstr "Autres applications"
++msgstr "Applications de bureautique"
+ 
+ #: ../desktop-directories/System-Tools.directory.in.h:1
+ msgid "System Tools"
+diff --git a/po/gd.po b/po/gd.po
+new file mode 100644
+index 0000000..b74033c
+--- /dev/null
++++ b/po/gd.po
+@@ -0,0 +1,274 @@
++# Gaelic; Scottish translation for gnome-menus
++# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
++# This file is distributed under the same license as the gnome-menus package.
++# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: gnome-menus\n"
++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-menus&keywords=I18N+L10N&component=general\n"
++"POT-Creation-Date: 2013-08-26 14:17+0000\n"
++"PO-Revision-Date: 2013-09-17 11:39+0100\n"
++"Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\n"
++"Language-Team: Gaelic; Scottish <gd@li.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Launchpad-Export-Date: 2013-09-15 06:16+0000\n"
++"X-Generator: Launchpad (build 16761)\n"
++
++#: ../desktop-directories/AudioVideo.directory.in.h:1
++msgid "Sound & Video"
++msgstr "Fuaim ⁊ video"
++
++#: ../desktop-directories/AudioVideo.directory.in.h:2
++msgid "Multimedia menu"
++msgstr "Clàr-taice nan ioma-mheadhanan"
++
++#: ../desktop-directories/Development.directory.in.h:1
++msgid "Programming"
++msgstr "Prògramachadh"
++
++#: ../desktop-directories/Development.directory.in.h:2
++msgid "Tools for software development"
++msgstr "Innealan airson leasachadh bathair-bhog"
++
++#: ../desktop-directories/Education.directory.in.h:1
++msgid "Education"
++msgstr "Foghlam"
++
++#: ../desktop-directories/Game.directory.in.h:1
++msgid "Games"
++msgstr "Geamannan"
++
++#: ../desktop-directories/Game.directory.in.h:2
++msgid "Games and amusements"
++msgstr "Geamannan ⁊ fealla-dhà"
++
++#: ../desktop-directories/Graphics.directory.in.h:1
++msgid "Graphics"
++msgstr "Grafaigeachd"
++
++#: ../desktop-directories/Graphics.directory.in.h:2
++msgid "Graphics applications"
++msgstr "Prògraman grafaigeachd"
++
++#: ../desktop-directories/Network.directory.in.h:1
++msgid "Internet"
++msgstr "An t-eadar-lìon"
++
++#: ../desktop-directories/Network.directory.in.h:2
++msgid "Programs for Internet access such as web and email"
++msgstr "Prògraman leis am faighear cothrom air an eadar-lìon, can brabhsairean is prògraman puist-d"
++
++#: ../desktop-directories/Office.directory.in.h:1
++msgid "Office"
++msgstr "Oifis"
++
++#: ../desktop-directories/Office.directory.in.h:2
++msgid "Office Applications"
++msgstr "Prògaman oifise"
++
++#: ../desktop-directories/System-Tools.directory.in.h:1
++msgid "System Tools"
++msgstr "Innealan siostaim"
++
++#: ../desktop-directories/System-Tools.directory.in.h:2
++msgid "System configuration and monitoring"
++msgstr "Rèiteachadh an t-siostaim agus marasgladh"
++
++#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
++msgid "Universal Access"
++msgstr "Inntrigeadh uile-choitcheann"
++
++#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
++msgid "Universal Access Settings"
++msgstr "Roghainnean an inntrigidh uile-choitchinn"
++
++#: ../desktop-directories/Utility.directory.in.h:1
++msgid "Accessories"
++msgstr "Trealaich"
++
++#: ../desktop-directories/Utility.directory.in.h:2
++msgid "Desktop accessories"
++msgstr "Trealaich an deasga"
++
++#: ../desktop-directories/X-GNOME-Menu-Applications.directory.in.h:1
++msgid "Applications"
++msgstr "Aplacaidean"
++
++#: ../desktop-directories/X-GNOME-Other.directory.in.h:1
++msgid "Other"
++msgstr "Feadhainn eile"
++
++#: ../desktop-directories/X-GNOME-Other.directory.in.h:2
++msgid "Applications that did not fit in other categories"
++msgstr "Aplacaidean aig nach eil roinn-seòrsa iomchaidh eile"
++
++#: ../desktop-directories/X-GNOME-Sundry.directory.in.h:1
++msgid "Sundry"
++msgstr "An corr"
++
++#: ../desktop-directories/X-GNOME-Utilities.directory.in.h:1
++msgid "Utilities"
++msgstr "Goireasachdan"
++
++#: ../desktop-directories/X-GNOME-Utilities.directory.in.h:2
++msgid "Small but useful GNOME tools"
++msgstr "Innealan GNOME a tha beag ach feumail"
++
++#: ../desktop-directories/X-GNOME-WebApplications.directory.in.h:1
++msgid "Web Applications"
++msgstr "Aplacaidean-lìn"
++
++#: ../desktop-directories/X-GNOME-WebApplications.directory.in.h:2
++msgid "Applications and sites saved from Web"
++msgstr "Aplacaidean is làraichean a chaidh a shàbhaladh on lìon"
++
++#~ msgid "Action"
++#~ msgstr "Action"
++
++#~ msgid "Action games"
++#~ msgstr "Geamannan action"
++
++#~ msgid "Adventure"
++#~ msgstr "Driod-fhortan"
++
++#~ msgid "Adventure style games"
++#~ msgstr "Geamannan driod-fhortain"
++
++#~ msgid "Arcade"
++#~ msgstr "Arcade"
++
++#~ msgid "Arcade style games"
++#~ msgstr "Geamannan arcade"
++
++#~ msgid "Falling blocks"
++#~ msgstr "Blocaichean a' tuiteam"
++
++#~ msgid "Falling blocks games"
++#~ msgstr "Geamannan sa bheil blocaichean a' tuiteam"
++
++#~ msgid "Board"
++#~ msgstr "Bòrd"
++
++#~ msgid "Board games"
++#~ msgstr "Geamannan-bùird"
++
++#~ msgid "Cards"
++#~ msgstr "Cairtean"
++
++#~ msgid "Card games"
++#~ msgstr "Geamannan chairtean"
++
++#~ msgid "Debian"
++#~ msgstr "Debian"
++
++#~ msgid "The Debian menu"
++#~ msgstr "Clàr-taice Debian"
++
++#~ msgid "Science"
++#~ msgstr "Saidheans"
++
++#~ msgid "Scientific applications"
++#~ msgstr "Aplacaidean saidheansail"
++
++#~ msgid "Kids"
++#~ msgstr "Clann"
++
++#~ msgid "Games for kids"
++#~ msgstr "Geamannan cloinne"
++
++#~ msgid "Logic"
++#~ msgstr "Loidig"
++
++#~ msgid "Logic and puzzle games"
++#~ msgstr "Geamannan loidig ⁊ tòimhseachain"
++
++#~ msgid "Role playing"
++#~ msgstr "Cluich mas fhìor"
++
++#~ msgid "Role playing games"
++#~ msgstr "Geamannan cluich mas fhìor"
++
++#~ msgid "Administration"
++#~ msgstr "Rianachd"
++
++#~ msgid "Change system-wide settings (affects all users)"
++#~ msgstr ""
++#~ "Atharraich roghainnean aig am bi buaidh air feadh an t-siostaim (air gach "
++#~ "cleachdaiche)"
++
++#~ msgid "Preferences"
++#~ msgstr "Roghainnean"
++
++#~ msgid "Personal preferences"
++#~ msgstr "Roghainnean pearsanta"
++
++#~ msgid "Simulation"
++#~ msgstr "Samhlachadh"
++
++#~ msgid "Simulation games"
++#~ msgstr "Geamannan samhlachaidh"
++
++#~ msgid "Sports"
++#~ msgstr "Spòrs"
++
++#~ msgid "Sports games"
++#~ msgstr "Geamannan spòrs"
++
++#~ msgid "Strategy"
++#~ msgstr "Ro-innleachd"
++
++#~ msgid "Strategy games"
++#~ msgstr "Geamannan ro-innleachdail"
++
++#~ msgid "Name"
++#~ msgstr "Ainm"
++
++#~ msgid "Hardware"
++#~ msgstr "Bathar Cruaidh"
++
++#~ msgid "Personal"
++#~ msgstr "Pearsanta"
++
++#~ msgid "System"
++#~ msgstr "Siostam"
++
++#~ msgid "_Applications:"
++#~ msgstr "_Prògraman:"
++
++#~ msgid "_Menus:"
++#~ msgstr "_Clàr-iùilean:"
++
++#~ msgid "Simple Menu Editor %s"
++#~ msgstr "Deasaiche clar-taic simplidh %s"
++
++#~ msgid "Personal settings"
++#~ msgstr "Suidheachaidhean pearsanta"
++
++#~ msgid "System settings"
++#~ msgstr "Suidheachaidhean siostam"
++
++#~ msgid "Edit Menus"
++#~ msgstr "Deasaich clàr-iùilean"
++
++#~ msgid "Menu Editor"
++#~ msgstr "Deasaiche clàr-iùil"
++
++#~ msgid "_Defaults"
++#~ msgstr "_Bunaitean"
++
++#~ msgid ""
++#~ "Cannot find home directory: not set in /etc/passwd and no value for $HOME "
++#~ "in environment"
++#~ msgstr ""
++#~ "Cha b'urrainn faighinn lorg air am phasgan dhachaigh: neo-stèidheachd an /"
++#~ "etc/passwd agus gun luach airson $HOME anns a àrainneachd"
++
++#~ msgid "Show"
++#~ msgstr "Seall"
++
++#~ msgid "Settings for several hardware devices"
++#~ msgstr "Suidheachaidhean iomadaidh innleachd bathar cruaidh"
+diff --git a/po/km.po b/po/km.po
+index a56429f..b8c08ed 100644
+--- a/po/km.po
++++ b/po/km.po
+@@ -1,176 +1,179 @@
+-# translation of gnome-menus.master.po to Khmer
+-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+-# This file is distributed under the same license as the PACKAGE package.
+-# Khoem Sokhem <khoemsokhem@khmeros.info>, 2012.
+-# Morn Met <mornmet@khmeros.info>, 2012.
+-msgid ""
+-msgstr ""
+-"Project-Id-Version: gnome-menus.master\n"
+-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-menus&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2011-12-20 08:46+0000\n"
+-"PO-Revision-Date: 2012-03-01 10:09+0700\n"
+-"Last-Translator: Morn Met <mornmet@khmeros.info>\n"
+-"Language-Team: Khmer <support@khmeros.info>\n"
+-"MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=UTF-8\n"
+-"Content-Transfer-Encoding: 8bit\n"
+-"Plural-Forms: nplurals=1; plural=0;\n"
+-"X-Generator: WordForge 0.8 RC1\n"
+-"X-Language: km-KH\n"
+-
+-#: ../desktop-directories/AudioVideo.directory.in.h:1
+-msgid "Multimedia menu"
+-msgstr "ម៉ឺនុយ​ពហុមេឌៀ"
+-
+-#: ../desktop-directories/AudioVideo.directory.in.h:2
+-msgid "Sound & Video"
+-msgstr "សំឡេង និង​វីដេអូ"
+-
+-#: ../desktop-directories/Development.directory.in.h:1
+-msgid "Programming"
+-msgstr "ការ​សរសេរ​កម្មវិធី"
+-
+-#: ../desktop-directories/Development.directory.in.h:2
+-msgid "Tools for software development"
+-msgstr "ឧបករណ៍​សម្រាប់​ការ​អភិវឌ្ឍ​កម្មវិធី"
+-
+-#: ../desktop-directories/Education.directory.in.h:1
+-msgid "Education"
+-msgstr "ការ​អប់រំ"
+-
+-#: ../desktop-directories/Game.directory.in.h:1
+-msgid "Games"
+-msgstr "ល្បែង"
+-
+-#: ../desktop-directories/Game.directory.in.h:2
+-msgid "Games and amusements"
+-msgstr "ល្បែង និង​ការ​កម្សាន្ត"
+-
+-#: ../desktop-directories/Graphics.directory.in.h:1
+-msgid "Graphics"
+-msgstr "ក្រាហ្វិក"
+-
+-#: ../desktop-directories/Graphics.directory.in.h:2
+-msgid "Graphics applications"
+-msgstr "កម្មវិធី​ក្រាហ្វិក"
+-
+-#: ../desktop-directories/Hardware.directory.in.h:1
+-msgid "Hardware"
+-msgstr "ផ្នែក​រឹង"
+-
+-#: ../desktop-directories/Hardware.directory.in.h:2
+-msgid "Settings for several hardware devices"
+-msgstr "ការ​កំណត់​ឧបករណ៍​ផ្នែក​រឹង​មួយ​ចំនួន"
+-
+-#: ../desktop-directories/Network.directory.in.h:1
+-msgid "Internet"
+-msgstr "អ៊ីនធឺណិត"
+-
+-#: ../desktop-directories/Network.directory.in.h:2
+-msgid "Programs for Internet access such as web and email"
+-msgstr "កម្មវិធី​សម្រាប់​ដំណើរការ​អ៊ីនធឺណិត​ដូចជា បណ្ដាញ និង​អ៊ីមែល"
+-
+-#: ../desktop-directories/Office.directory.in.h:1
+-msgid "Office"
+-msgstr "ការិយាល័យ"
+-
+-#: ../desktop-directories/Office.directory.in.h:2
+-msgid "Office Applications"
+-msgstr "កម្មវិធី​ការិយាល័យ"
+-
+-#. Translators: this is Personal as in "Personal settings"
+-#: ../desktop-directories/Personal.directory.in.h:2
+-msgid "Personal"
+-msgstr "ផ្ទាល់ខ្លួន"
+-
+-#: ../desktop-directories/Personal.directory.in.h:3
+-msgid "Personal settings"
+-msgstr "ការ​កំណត់​ផ្ទាល់ខ្លួន"
+-
+-#: ../desktop-directories/System.directory.in.h:1
+-msgid "System"
+-msgstr "ប្រព័ន្ធ"
+-
+-#: ../desktop-directories/System.directory.in.h:2
+-msgid "System settings"
+-msgstr "ការ​កំណត់​ប្រព័ន្ធ"
+-
+-#: ../desktop-directories/System-Tools.directory.in.h:1
+-msgid "System Tools"
+-msgstr "ឧបករណ៍​ប្រព័ន្ធ"
+-
+-#: ../desktop-directories/System-Tools.directory.in.h:2
+-msgid "System configuration and monitoring"
+-msgstr "ការ​ត្រួតពិនិត្យ​ និង​ការ​កំណត់​រចនា​សម្ព័ន្ធ​ប្រព័ន្ធ"
+-
+-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+-msgid "Universal Access"
+-msgstr "ការ​ចូល​ដំណើរការ​សកល"
+-
+-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+-msgid "Universal Access Settings"
+-msgstr "ការ​កំណត់​ការ​ចូល​ដំណើរការ​សកល"
+-
+-#: ../desktop-directories/Utility.directory.in.h:1
+-msgid "Accessories"
+-msgstr "ប្រដាប់ប្រដា"
+-
+-#: ../desktop-directories/Utility.directory.in.h:2
+-msgid "Desktop accessories"
+-msgstr "ប្រដាប់ប្រដា​ផ្ទៃតុ"
+-
+-#: ../desktop-directories/X-GNOME-Menu-Applications.directory.in.h:1
+-msgid "Applications"
+-msgstr "កម្មវិធី"
+-
+-#: ../desktop-directories/X-GNOME-Other.directory.in.h:1
+-msgid "Applications that did not fit in other categories"
+-msgstr "កម្មវិធី​ដែល​មិន​សម​នៅ​ក្នុង​ប្រភេទ​ផ្សេង​​ៗ​ទៀត"
+-
+-#: ../desktop-directories/X-GNOME-Other.directory.in.h:2
+-msgid "Other"
+-msgstr "ផ្សេងទៀត"
+-
+-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
+-msgid "Menu Editor"
+-msgstr "កម្មវិធី​កែសម្រួល​ម៉ឺនុយ"
+-
+-#: ../simple-editor/gmenu-simple-editor.ui.h:1
+-msgid "Edit Menus"
+-msgstr "កែសម្រួល​ម៉ឺនុយ"
+-
+-#: ../simple-editor/gmenu-simple-editor.ui.h:2
+-msgid "_Applications:"
+-msgstr "កម្មវិធី ៖"
+-
+-#: ../simple-editor/gmenu-simple-editor.ui.h:3
+-msgid "_Defaults"
+-msgstr "លំនាំដើម"
+-
+-#: ../simple-editor/gmenu-simple-editor.ui.h:4
+-msgid "_Menus:"
+-msgstr "ម៉ឺនុយ ៖"
+-
+-#. Translators: %s is the version number
+-#: ../simple-editor/GMenuSimpleEditor/main.py:44
+-#, python-format
+-msgid "Simple Menu Editor %s"
+-msgstr "កម្មវិធី​កែសម្រួល​ម៉ឺនុយ​សាមញ្ញ %s"
+-
+-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:97
+-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:124
+-msgid "Name"
+-msgstr "ឈ្មោះ"
+-
+-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:116
+-msgid "Show"
+-msgstr "បង្ហាញ"
+-
+-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:44
+-msgid ""
+-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
+-"environment"
+-msgstr ""
+-"រក​មិន​ឃើញ​ថត​ផ្ទះ ៖ មិន​ត្រូវ​បាន​កំណត់​នៅ​ក្នុង /etc/passwd "
+-"និង​គ្មាន​តម្លៃ​សម្រាប់ $HOME នៅ​ក្នុង​បរិស្ថាន​ទេ"
+-
++# translation of gnome-menus.master.po to Khmer

++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER

++# This file is distributed under the same license as the PACKAGE package.

++# Khoem Sokhem <khoemsokhem@khmeros.info>, 2012.

++# Morn Met <mornmet@khmeros.info>, 2012.

++msgid ""

++msgstr ""

++"Project-Id-Version: gnome-menus.master\n"

++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"

++"menus&keywords=I18N+L10N&component=general\n"

++"POT-Creation-Date: 2014-04-02 07:20+0000\n"

++"PO-Revision-Date: 2012-03-01 10:09+0700\n"

++"Last-Translator: Morn Met <mornmet@khmeros.info>\n"

++"Language-Team: Khmer <support@khmeros.info>\n"

++"Language: \n"

++"MIME-Version: 1.0\n"

++"Content-Type: text/plain; charset=UTF-8\n"

++"Content-Transfer-Encoding: 8bit\n"

++"Plural-Forms: nplurals=1; plural=0;\n"

++"X-Generator: WordForge 0.8 RC1\n"

++"X-Language: km-KH\n"

++

++#: ../desktop-directories/AudioVideo.directory.in.h:1

++msgid "Sound & Video"

++msgstr "សំឡេង និង​វីដេអូ"

++

++#: ../desktop-directories/AudioVideo.directory.in.h:2

++msgid "Multimedia menu"

++msgstr "ម៉ឺនុយ​ពហុមេឌៀ"

++

++#: ../desktop-directories/Development.directory.in.h:1

++msgid "Programming"

++msgstr "ការ​សរសេរ​កម្មវិធី"

++

++#: ../desktop-directories/Development.directory.in.h:2

++msgid "Tools for software development"

++msgstr "ឧបករណ៍​សម្រាប់​ការ​អភិវឌ្ឍ​កម្មវិធី"

++

++#: ../desktop-directories/Education.directory.in.h:1

++msgid "Education"

++msgstr "ការ​អប់រំ"

++

++#: ../desktop-directories/Game.directory.in.h:1

++msgid "Games"

++msgstr "ល្បែង"

++

++#: ../desktop-directories/Game.directory.in.h:2

++msgid "Games and amusements"

++msgstr "ល្បែង និង​ការ​កម្សាន្ត"

++

++#: ../desktop-directories/Graphics.directory.in.h:1

++msgid "Graphics"

++msgstr "ក្រាហ្វិក"

++

++#: ../desktop-directories/Graphics.directory.in.h:2

++msgid "Graphics applications"

++msgstr "កម្មវិធី​ក្រាហ្វិក"

++

++#: ../desktop-directories/Network.directory.in.h:1

++msgid "Internet"

++msgstr "អ៊ីនធឺណិត"

++

++#: ../desktop-directories/Network.directory.in.h:2

++msgid "Programs for Internet access such as web and email"

++msgstr "កម្មវិធី​សម្រាប់​ដំណើរការ​អ៊ីនធឺណិត​ដូចជា បណ្ដាញ និង​អ៊ីមែល"

++

++#: ../desktop-directories/Office.directory.in.h:1

++msgid "Office"

++msgstr "ការិយាល័យ"

++

++#: ../desktop-directories/Office.directory.in.h:2

++msgid "Office Applications"

++msgstr "កម្មវិធី​ការិយាល័យ"

++

++#: ../desktop-directories/System-Tools.directory.in.h:1

++msgid "System Tools"

++msgstr "ឧបករណ៍​ប្រព័ន្ធ"

++

++#: ../desktop-directories/System-Tools.directory.in.h:2

++msgid "System configuration and monitoring"

++msgstr "ការ​ត្រួតពិនិត្យ​ និង​ការ​កំណត់​រចនា​សម្ព័ន្ធ​ប្រព័ន្ធ"

++

++#: ../desktop-directories/Utility-Accessibility.directory.in.h:1

++msgid "Universal Access"

++msgstr "ការ​ចូល​ដំណើរការ​សកល"

++

++#: ../desktop-directories/Utility-Accessibility.directory.in.h:2

++msgid "Universal Access Settings"

++msgstr "ការ​កំណត់​ការ​ចូល​ដំណើរការ​សកល"

++

++#: ../desktop-directories/Utility.directory.in.h:1

++msgid "Accessories"

++msgstr "ប្រដាប់ប្រដា"

++

++#: ../desktop-directories/Utility.directory.in.h:2

++msgid "Desktop accessories"

++msgstr "ប្រដាប់ប្រដា​ផ្ទៃតុ"

++

++#: ../desktop-directories/X-GNOME-Menu-Applications.directory.in.h:1

++msgid "Applications"

++msgstr "កម្មវិធី"

++

++#: ../desktop-directories/X-GNOME-Other.directory.in.h:1

++msgid "Other"

++msgstr "ផ្សេងទៀត"

++

++#: ../desktop-directories/X-GNOME-Other.directory.in.h:2

++msgid "Applications that did not fit in other categories"

++msgstr "កម្មវិធី​ដែល​មិន​សម​នៅ​ក្នុង​ប្រភេទ​ផ្សេង​​ៗ​ទៀត"

++

++#: ../desktop-directories/X-GNOME-Sundry.directory.in.h:1

++msgid "Sundry"

++msgstr "ផ្សេងៗ"

++

++#: ../desktop-directories/X-GNOME-Utilities.directory.in.h:1

++msgid "Utilities"

++msgstr "ការ​ប្រើប្រាស់"

++

++#: ../desktop-directories/X-GNOME-Utilities.directory.in.h:2

++msgid "Small but useful GNOME tools"

++msgstr "តូច​ប៉ុន្តែ​ជា​កម្មវិធី GNOME ដ៏មាន​ប្រយោជន៍"

++

++#: ../desktop-directories/X-GNOME-WebApplications.directory.in.h:1

++#| msgid "Applications"

++msgid "Web Applications"

++msgstr "កម្មវិធី​បណ្ដាញ"

++

++#: ../desktop-directories/X-GNOME-WebApplications.directory.in.h:2

++msgid "Applications and sites saved from Web"

++msgstr "បាន​រក្សាទុក​កម្មវិធី និង​តំបន់បណ្ដាញ​ពី​បណ្ដាញ"

++

++#~ msgid "Hardware"

++#~ msgstr "ផ្នែក​រឹង"

++

++#~ msgid "Settings for several hardware devices"

++#~ msgstr "ការ​កំណត់​ឧបករណ៍​ផ្នែក​រឹង​មួយ​ចំនួន"

++

++#~ msgid "Personal"

++#~ msgstr "ផ្ទាល់ខ្លួន"

++

++#~ msgid "Personal settings"

++#~ msgstr "ការ​កំណត់​ផ្ទាល់ខ្លួន"

++

++#~ msgid "System"

++#~ msgstr "ប្រព័ន្ធ"

++

++#~ msgid "System settings"

++#~ msgstr "ការ​កំណត់​ប្រព័ន្ធ"

++

++#~ msgid "Menu Editor"

++#~ msgstr "កម្មវិធី​កែសម្រួល​ម៉ឺនុយ"

++

++#~ msgid "Edit Menus"

++#~ msgstr "កែសម្រួល​ម៉ឺនុយ"

++

++#~ msgid "_Applications:"

++#~ msgstr "កម្មវិធី ៖"

++

++#~ msgid "_Defaults"

++#~ msgstr "លំនាំដើម"

++

++#~ msgid "_Menus:"

++#~ msgstr "ម៉ឺនុយ ៖"

++

++#~ msgid "Simple Menu Editor %s"

++#~ msgstr "កម្មវិធី​កែសម្រួល​ម៉ឺនុយ​សាមញ្ញ %s"

++

++#~ msgid "Name"

++#~ msgstr "ឈ្មោះ"

++

++#~ msgid "Show"

++#~ msgstr "បង្ហាញ"

++

++#~ msgid ""

++#~ "Cannot find home directory: not set in /etc/passwd and no value for $HOME "

++#~ "in environment"

++#~ msgstr ""

++#~ "រក​មិន​ឃើញ​ថត​ផ្ទះ ៖ មិន​ត្រូវ​បាន​កំណត់​នៅ​ក្នុង /etc/passwd និង​គ្មាន​តម្លៃ​សម្រាប់ $HOME នៅ​ក្នុង​"

++#~ "បរិស្ថាន​ទេ"

+diff --git a/po/kn.po b/po/kn.po
+index 89045ea..fb69edf 100644
+--- a/po/kn.po
++++ b/po/kn.po
+@@ -1,7 +1,7 @@
+ # translation of gnome-menus.master.kn.po to Kannada
+ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+ # This file is distributed under the same license as the PACKAGE package.
+-#
++# 
+ # Shankar Prasad <svenkate@redhat.com>, 2007, 2008, 2009, 2010, 2012, 2013.
+ msgid ""
+ msgstr ""
+@@ -9,15 +9,15 @@ msgstr ""
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "menus&keywords=I18N+L10N&component=general\n"
+ "POT-Creation-Date: 2013-02-19 22:31+0000\n"
+-"PO-Revision-Date: 2013-03-18 16:02+0530\n"
++"PO-Revision-Date: 2013-03-18 06:32-0400\n"
+ "Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
+ "Language-Team: Kannada <kde-i18n-doc@kde.org>\n"
+-"Language: kn\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"X-Generator: Lokalize 1.5\n"
+-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
++"Language: kn\n"
++"Plural-Forms: nplurals=2; plural=(n != 1);\n"
++"X-Generator: Zanata 3.2.3\n"
+ 
+ #: ../desktop-directories/AudioVideo.directory.in.h:1
+ msgid "Sound & Video"
+@@ -126,125 +126,3 @@ msgstr "ಜಾಲ ಅನ್ವಯಗಳು"
+ #: ../desktop-directories/X-GNOME-WebApplications.directory.in.h:2
+ msgid "Applications and sites saved from Web"
+ msgstr "ಜಾಲದಿಂದ ಉಳಿಸಲಾದ ಅನ್ವಯಗಳು ಮತ್ತು ತಾಣಗಳು"
+-
+-#~ msgid "Hardware"
+-#~ msgstr "ಯಂತ್ರಾಂಶ"
+-
+-#~ msgid "Settings for several hardware devices"
+-#~ msgstr "ಹಲವಾರು ಯಂತ್ರಾಂಶ ಸಾಧನಗಳಿಗಾಗಿನ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "Personal"
+-#~ msgstr "ವೈಯಕ್ತಿಕ"
+-
+-#~ msgid "Personal settings"
+-#~ msgstr "ವೈಯಕ್ತಿಕ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "System"
+-#~ msgstr "ವ್ಯವಸ್ಥೆ"
+-
+-#~ msgid "System settings"
+-#~ msgstr "ವ್ಯವಸ್ಥೆಯ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "Menu Editor"
+-#~ msgstr "ಪರಿವಿಡಿ ಸಂಪಾದಕ"
+-
+-#~ msgid "Edit Menus"
+-#~ msgstr "ಪರಿವಿಡಿಗಳನ್ನು ಸಂಪಾದಿಸು"
+-
+-#~ msgid "_Defaults"
+-#~ msgstr "ಪೂರ್ವನಿಯೋಜಿತ (_D)"
+-
+-#~ msgid "_Menus:"
+-#~ msgstr "ಪರಿವಿಡಿಗಳು (_M):"
+-
+-#~ msgid "_Applications:"
+-#~ msgstr "ಅನ್ವಯಗಳು (_A):"
+-
+-#~ msgid "Simple Menu Editor %s"
+-#~ msgstr "ಸರಳ ಪರಿವಿಡಿ ಸಂಪಾದಕ %s"
+-
+-#~ msgid "Name"
+-#~ msgstr "ಹೆಸರು"
+-
+-#~ msgid "Show"
+-#~ msgstr "ತೋರಿಸು"
+-
+-#~ msgid ""
+-#~ "Cannot find home directory: not set in /etc/passwd and no value for $HOME "
+-#~ "in environment"
+-#~ msgstr ""
+-#~ "ನೆಲೆ ಕಡತಕೋಶವು ಕಂಡುಬಂದಿಲ್ಲ: /etc/passwd ನಲ್ಲಿ ಸಿದ್ಧಗೊಳಿಸಿಲ್ಲ ಹಾಗು ವಾತಾವರಣದಲ್ಲಿ "
+-#~ "$HOME ಗೆ ಯಾವುದೇ ಮೌಲ್ಯವಿಲ್ಲ"
+-
+-#~ msgid "Internet and Network"
+-#~ msgstr "ಅಂತರಜಾಲ ಹಾಗು ಜಾಲಬಂಧ"
+-
+-#~ msgid "Network-related settings"
+-#~ msgstr "ಜಾಲಬಂಧ-ಸಂಬಂಧಿತ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "Look and Feel"
+-#~ msgstr "ನೋಟ ಹಾಗು ಮಾಟ"
+-
+-#~ msgid "Settings controlling the desktop appearance and behavior"
+-#~ msgstr "ಗಣಕತೆರೆಯ ಸ್ವರೂಪ ಹಾಗು ವರ್ತನೆಯನ್ನು ನಿಯಂತ್ರಿಸುವ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "Administration"
+-#~ msgstr "ನಿರ್ವಹಣೆ"
+-
+-#~ msgid "Change system-wide settings (affects all users)"
+-#~ msgstr ""
+-#~ "ವ್ಯವಸ್ಥೆಯಾದ್ಯಂತದ ಸಿದ್ಧತೆಗಳನ್ನು ಬದಲಾಯಿಸಿ (ಎಲ್ಲಾ ಬಳಕೆದಾರರ ಮೇಲೂ ಪರಿಣಾಮಬೀರುತ್ತದೆ)"
+-
+-#~ msgid "Personal preferences"
+-#~ msgstr "ವೈಯಕ್ತಿಕ ಆದ್ಯತೆಗಳು"
+-
+-#~ msgid "Preferences"
+-#~ msgstr "ಆದ್ಯತೆಗಳು"
+-
+-#~ msgid "Personal preferences and administration settings"
+-#~ msgstr "ವೈಯಕ್ತಿಕ ಆದ್ಯತೆಗಳು ಹಾಗು ನಿರ್ವಹಣಾ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "Menu file"
+-#~ msgstr "ಮೆನು ಕಡತ"
+-
+-#~ msgid "MENU_FILE"
+-#~ msgstr "MENU_FILE"
+-
+-#~ msgid "Monitor for menu changes"
+-#~ msgstr "ಮೆನು ಬದಲಾವಣೆಗಳ ಪರಿವೀಕ್ಷಕ"
+-
+-#~ msgid "Include <Exclude>d entries"
+-#~ msgstr "<Exclude>ಆದಂತಹ ನಮೂದುಗಳನ್ನು ಅಡಕಗೊಳಿಸು"
+-
+-#~ msgid "Include NoDisplay=true entries"
+-#~ msgstr "NoDisplay=true ನಮೂದನ್ನು ಅಡಕಗೊಳಿಸು"
+-
+-#~ msgid "Invalid desktop file ID"
+-#~ msgstr "ಸಿಂಧುವಲ್ಲದ ಗಣಕತೆರೆ ಕಡತ ID"
+-
+-#~ msgid "[Invalid Filename]"
+-#~ msgstr "[ಸಿಂಧುವಲ್ಲದ ಕಡತಹೆಸರು]"
+-
+-#~ msgid " <excluded>"
+-#~ msgstr " <excluded>"
+-
+-#~ msgid ""
+-#~ "\n"
+-#~ "\n"
+-#~ "\n"
+-#~ "==== Menu changed, reloading ====\n"
+-#~ "\n"
+-#~ "\n"
+-#~ msgstr ""
+-#~ "\n"
+-#~ "\n"
+-#~ "\n"
+-#~ "==== ಮೆನು ಬದಲಾಯಿಸಲ್ಪಟ್ಟಿದೆ, ಪುನಃ ಲೋಡ್ ಆಗುತ್ತಿದೆ ====\n"
+-#~ "\n"
+-#~ "\n"
+-
+-#~ msgid "Menu tree is empty"
+-#~ msgstr "ಮೆನು ವೃಕ್ಷವು(tree) ಖಾಲಿ ಇದೆ"
+-
+-#~ msgid "- test GNOME's implementation of the Desktop Menu Specification"
+-#~ msgstr "- ಗಣಕತೆರೆ ಮೆನು ಸೂಚನೆಗಳ GNOME ನ ಅನ್ವಯಿಸುವಿಕೆಯನ್ನು ಪರೀಕ್ಷಿಸುತ್ತದೆ"
+diff --git a/po/ml.po b/po/ml.po
+index 3ab08af..bdee38d 100644
+--- a/po/ml.po
++++ b/po/ml.po
+@@ -5,14 +5,15 @@
+ # Ani Peter <peter.ani@gmail.com>, 2006.
+ # Praveen|പ്രവീണ്‍ A|എ <pravi.a@gmail.com>, 2007,2008.
+ # Ani Peter <apeter@redhat.com>, 2007, 2012, 2013.
++# Akhilan <akhilkrishnans@gmail.com, 2013
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-menus.master.ml\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "menus&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-03-18 10:33+0000\n"
+-"PO-Revision-Date: 2013-03-25 19:17+0530\n"
+-"Last-Translator: Ani Peter <peter.ani@gmail.com>\n"
++"POT-Creation-Date: 2013-10-23 14:43+0000\n"
++"PO-Revision-Date: 2013-11-03 14:28+0530\n"
++"Last-Translator: Akhilan <akhilkrishnans@gmail.com>\n"
+ "Language-Team: Malayalam <discuss@lists.smc.org.in>\n"
+ "Language: ml\n"
+ "MIME-Version: 1.0\n"
+@@ -27,7 +28,7 @@ msgstr "ശബ്ദവും ചലച്ചിത്രവും"
+ 
+ #: ../desktop-directories/AudioVideo.directory.in.h:2
+ msgid "Multimedia menu"
+-msgstr "മള്‍ട്ടീമീഡിയ മെനു"
++msgstr "മള്‍ട്ടീമീഡിയ ഐച്ഛികം"
+ 
+ #: ../desktop-directories/Development.directory.in.h:1
+ msgid "Programming"
+@@ -95,7 +96,7 @@ msgstr "ഉപകരണങ്ങള്‍"
+ 
+ #: ../desktop-directories/Utility.directory.in.h:2
+ msgid "Desktop accessories"
+-msgstr "പണിയിടോപകരണങ്ങള്‍"
++msgstr "പണിയിട ഉപകരണങ്ങള്‍"
+ 
+ #: ../desktop-directories/X-GNOME-Menu-Applications.directory.in.h:1
+ msgid "Applications"
+diff --git a/po/sv.po b/po/sv.po
+index 6b7970d..5be5a40 100644
+--- a/po/sv.po
++++ b/po/sv.po
+@@ -1,22 +1,25 @@
+ # Swedish messages for gnome-menus.
+-# Copyright (C) 2004, 2005, 2006, 2007, 2009, 2012 Free Software Foundation, Inc.
++# Copyright © 2004, 2005, 2006, 2007, 2009, 2012, 2014 Free Software Foundation, Inc.
+ # Christian Rose <menthos@menthos.com>, 2004, 2005, 2006.
+ # Daniel Nylander <po@danielnylander.se>, 2007, 2009, 2012.
++# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2014.
+ #
+ # $Id: sv.po,v 1.7 2006/01/08 20:42:48 menthos Exp $
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-menus\n"
+-"Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-09-02 11:58+0200\n"
+-"PO-Revision-Date: 2012-09-02 11:59+0100\n"
+-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
++"menus&keywords=I18N+L10N&component=general\n"
++"POT-Creation-Date: 2014-04-10 07:23+0000\n"
++"PO-Revision-Date: 2014-04-10 17:46+0100\n"
++"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
+ "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+ "Language: sv\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
++"X-Generator: Poedit 1.5.4\n"
+ 
+ #: ../desktop-directories/AudioVideo.directory.in.h:1
+ msgid "Sound & Video"
+@@ -54,14 +57,6 @@ msgstr "Grafik"
+ msgid "Graphics applications"
+ msgstr "Grafikprogram"
+ 
+-#: ../desktop-directories/Hardware.directory.in.h:1
+-msgid "Hardware"
+-msgstr "Hårdvara"
+-
+-#: ../desktop-directories/Hardware.directory.in.h:2
+-msgid "Settings for several hardware devices"
+-msgstr "Inställningar för ett flertal hårdvaruenheter"
+-
+ #: ../desktop-directories/Network.directory.in.h:1
+ msgid "Internet"
+ msgstr "Internet"
+@@ -78,23 +73,6 @@ msgstr "Kontor"
+ msgid "Office Applications"
+ msgstr "Kontorsprogram"
+ 
+-#. Translators: this is Personal as in "Personal settings"
+-#: ../desktop-directories/Personal.directory.in.h:2
+-msgid "Personal"
+-msgstr "Personligt"
+-
+-#: ../desktop-directories/Personal.directory.in.h:3
+-msgid "Personal settings"
+-msgstr "Personliga inställningar"
+-
+-#: ../desktop-directories/System.directory.in.h:1
+-msgid "System"
+-msgstr "System"
+-
+-#: ../desktop-directories/System.directory.in.h:2
+-msgid "System settings"
+-msgstr "Systeminställningar"
+-
+ #: ../desktop-directories/System-Tools.directory.in.h:1
+ msgid "System Tools"
+ msgstr "Systemverktyg"
+@@ -131,6 +109,18 @@ msgstr "Övrigt"
+ msgid "Applications that did not fit in other categories"
+ msgstr "Program som inte passar in i någon annan kategori"
+ 
++#: ../desktop-directories/X-GNOME-Sundry.directory.in.h:1
++msgid "Sundry"
++msgstr "Diverse"
++
++#: ../desktop-directories/X-GNOME-Utilities.directory.in.h:1
++msgid "Utilities"
++msgstr "Nyttoprogram"
++
++#: ../desktop-directories/X-GNOME-Utilities.directory.in.h:2
++msgid "Small but useful GNOME tools"
++msgstr "Små men praktiska GNOME-verktyg"
++
+ #: ../desktop-directories/X-GNOME-WebApplications.directory.in.h:1
+ msgid "Web Applications"
+ msgstr "Webbapplikationer"
+@@ -139,44 +129,54 @@ msgstr "Webbapplikationer"
+ msgid "Applications and sites saved from Web"
+ msgstr "Program och webbplatser sparade från webben"
+ 
+-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
+-msgid "Menu Editor"
+-msgstr "Menyredigerare"
++#~ msgid "Hardware"
++#~ msgstr "Hårdvara"
+ 
+-#: ../simple-editor/gmenu-simple-editor.ui.h:1
+-msgid "Edit Menus"
+-msgstr "Redigera menyer"
++#~ msgid "Settings for several hardware devices"
++#~ msgstr "Inställningar för ett flertal hårdvaruenheter"
+ 
+-#: ../simple-editor/gmenu-simple-editor.ui.h:2
+-msgid "_Defaults"
+-msgstr "_Standardalternativ"
++#~ msgid "Personal"
++#~ msgstr "Personligt"
+ 
+-#: ../simple-editor/gmenu-simple-editor.ui.h:3
+-msgid "_Menus:"
+-msgstr "_Menyer:"
++#~ msgid "Personal settings"
++#~ msgstr "Personliga inställningar"
++
++#~ msgid "System"
++#~ msgstr "System"
++
++#~ msgid "System settings"
++#~ msgstr "Systeminställningar"
++
++#~ msgid "Menu Editor"
++#~ msgstr "Menyredigerare"
++
++#~ msgid "Edit Menus"
++#~ msgstr "Redigera menyer"
+ 
+-#: ../simple-editor/gmenu-simple-editor.ui.h:4
+-msgid "_Applications:"
+-msgstr "_Program:"
++#~ msgid "_Defaults"
++#~ msgstr "_Standardalternativ"
+ 
+-#. Translators: %s is the version number
+-#: ../simple-editor/GMenuSimpleEditor/main.py:44
+-#, python-format
+-msgid "Simple Menu Editor %s"
+-msgstr "Enkel menyredigerare %s"
++#~ msgid "_Menus:"
++#~ msgstr "_Menyer:"
+ 
+-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:97
+-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:124
+-msgid "Name"
+-msgstr "Namn"
++#~ msgid "_Applications:"
++#~ msgstr "_Program:"
+ 
+-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:116
+-msgid "Show"
+-msgstr "Visa"
++#~ msgid "Simple Menu Editor %s"
++#~ msgstr "Enkel menyredigerare %s"
+ 
+-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:44
+-msgid "Cannot find home directory: not set in /etc/passwd and no value for $HOME in environment"
+-msgstr "Kan inte hitta hemkatalogen: inte angiven i /etc/passwd och inget värde för $HOME i miljön"
++#~ msgid "Name"
++#~ msgstr "Namn"
++
++#~ msgid "Show"
++#~ msgstr "Visa"
++
++#~ msgid ""
++#~ "Cannot find home directory: not set in /etc/passwd and no value for $HOME "
++#~ "in environment"
++#~ msgstr ""
++#~ "Kan inte hitta hemkatalogen: inte angiven i /etc/passwd och inget värde "
++#~ "för $HOME i miljön"
+ 
+ #~ msgid "Internet and Network"
+ #~ msgstr "Internet och nätverk"
+diff --git a/util/test-menu-spec.c b/util/test-menu-spec.c
+index c48509e..b2c3926 100644
+--- a/util/test-menu-spec.c
++++ b/util/test-menu-spec.c
+@@ -12,9 +12,7 @@
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #include <config.h>
+@@ -207,8 +205,6 @@ main (int argc, char **argv)
+   GMenuTreeFlags      flags;
+   GError             *error = NULL;
+ 
+-  g_type_init ();
+-
+ #if 0
+   /* See comment when defining _() at the top of this file. */
+   bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);