Hello community, here is the log from the commit of package mozo for openSUSE:Factory checked in at 2016-08-26 23:17:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mozo (Old) and /work/SRC/openSUSE:Factory/.mozo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozo" Changes: -------- --- /work/SRC/openSUSE:Factory/mozo/mozo.changes 2016-05-17 17:14:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mozo.new/mozo.changes 2016-08-26 23:17:41.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Aug 24 22:50:28 UTC 2016 - [email protected] + +- Update to version 1.14.1: + * Fix a crash and erasing of the menu file when processing + non-ASCII characters. + * Fix a crash on invalid XML file. + * Always encode with UTF-8 before writing the XML file. + * Update translations. + +------------------------------------------------------------------- Old: ---- mozo-1.14.0.tar.xz New: ---- mozo-1.14.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozo.spec ++++++ --- /var/tmp/diff_new_pack.02qQJZ/_old 2016-08-26 23:17:43.000000000 +0200 +++ /var/tmp/diff_new_pack.02qQJZ/_new 2016-08-26 23:17:43.000000000 +0200 @@ -18,7 +18,7 @@ %define _version 1.14 Name: mozo -Version: 1.14.0 +Version: 1.14.1 Release: 0 Summary: MATE Desktop menu editor License: LGPL-2.1+ @@ -31,7 +31,7 @@ BuildRequires: gobject-introspection-devel BuildRequires: hicolor-icon-theme BuildRequires: mate-common >= %{_version} -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(libmate-menu) >= %{_version} BuildRequires: pkgconfig(pygobject-3.0) ++++++ mozo-1.14.0.tar.xz -> mozo-1.14.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/ChangeLog new/mozo-1.14.1/ChangeLog --- old/mozo-1.14.0/ChangeLog 2016-04-07 22:14:31.000000000 +0200 +++ new/mozo-1.14.1/ChangeLog 2016-08-24 23:29:30.000000000 +0200 @@ -1,3 +1,96 @@ +commit b76530c1c2cd566cbdb838d075e2e1fa72205d9c +Author: monsta <[email protected]> +Date: Thu Aug 25 00:28:20 2016 +0300 + + release 1.14.1 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit ad4ed20050df63c291867d47cf98b622e2b42c2b +Author: monsta <[email protected]> +Date: Thu Jul 7 14:51:33 2016 +0300 + + po: drop languages not present on Transifex + + po/LINGUAS | 5 ---- + po/[email protected] | 82 ------------------------------------------------------ + po/bem.po | 80 ----------------------------------------------------- + po/[email protected] | 82 ------------------------------------------------------ + po/io.po | 83 ------------------------------------------------------- + po/[email protected] | 81 ----------------------------------------------------- + 6 files changed, 413 deletions(-) + +commit 53abf27d2d992222727ae463cd3a3f09d89b5e9b +Author: monsta <[email protected]> +Date: Tue Jun 21 17:55:01 2016 +0300 + + po: actually add a new language from Transifex + + po/LINGUAS | 1 + + 1 file changed, 1 insertion(+) + +commit 1b5584aab80264db3540ccf00242a4c301fa2323 +Author: Stefano Facchini <[email protected]> +Date: Mon Aug 26 18:34:35 2013 +0200 + + quit on delete event + + https://bugzilla.gnome.org/show_bug.cgi?id=706821 + + Mozo/MainWindow.py | 3 +++ + data/mozo.ui | 1 + + 2 files changed, 4 insertions(+) + +commit 5f116eb7aac88f1c308c12e57bfcc203ab44f309 +Author: Alexei Sorokin <[email protected]> +Date: Mon Aug 22 23:57:21 2016 +0300 + + fix minidom related crashes (#29) + + Mozo/MenuEditor.py | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit 1c253ed41ff1f6f36173707d89070d36054db9f0 +Author: Alexei Sorokin <[email protected]> +Date: Mon Aug 22 23:56:13 2016 +0300 + + encode with utf-8 before writing XML + + based on: + https://github.com/GNOME/alacarte/commit/f7835d7 + https://github.com/GNOME/alacarte/commit/0d7f351 + https://github.com/GNOME/alacarte/commit/23f0318 + + Mozo/MainWindow.py | 7 ++++--- + Mozo/MenuEditor.py | 47 +++++++++++++++++++++++++++++++++-------------- + 2 files changed, 37 insertions(+), 17 deletions(-) + +commit cc776e061996e9b803cb08638d615e05df1efcb8 +Author: Jasper St. Pierre <[email protected]> +Date: Fri Jun 1 01:30:55 2012 -0400 + + MenuEditor: be resilient to bad XML + + https://bugzilla.gnome.org/show_bug.cgi?id=654167 + + Mozo/MenuEditor.py | 36 ++++++++++++++++++++---------------- + 1 file changed, 20 insertions(+), 16 deletions(-) + +commit 6c6595ddd7460a47771ac68ebb45a5c60022001b +Author: raveit65 <[email protected]> +Date: Tue Jun 7 23:21:17 2016 +0200 + + sync with Transiflex + + po/es.po | 2 +- + po/es_CL.po | 2 +- + po/hi.po | 2 +- + po/pms.po | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + po/uz.po | 35 +++++++++++++------------- + 5 files changed, 104 insertions(+), 20 deletions(-) + commit e814c9e7482e1f616cae42d9b145c5796608e871 Author: monsta <[email protected]> Date: Thu Apr 7 17:12:15 2016 +0300 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/Makefile.in new/mozo-1.14.1/Makefile.in --- old/mozo-1.14.0/Makefile.in 2016-04-07 22:14:19.000000000 +0200 +++ new/mozo-1.14.1/Makefile.in 2016-08-24 23:29:27.000000000 +0200 @@ -188,7 +188,7 @@ DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \ COPYING ChangeLog INSTALL NEWS README compile install-sh \ - missing + missing py-compile DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -356,6 +356,7 @@ psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/Mozo/MainWindow.py new/mozo-1.14.1/Mozo/MainWindow.py --- old/mozo-1.14.0/Mozo/MainWindow.py 2016-03-23 22:28:53.000000000 +0100 +++ new/mozo-1.14.1/Mozo/MainWindow.py 2016-08-24 23:15:48.000000000 +0200 @@ -22,9 +22,11 @@ gi.require_version('Gdk', '3.0') from gi.repository import GLib, Gio from gi.repository import Gtk, Gdk, GdkPixbuf -import cgi, os +import cgi +import os import gettext import subprocess +import shutil import urllib try: from Mozo import config @@ -295,6 +297,9 @@ return False return True + def on_delete_event(self, widget, event): + self.quit() + def on_new_menu_button_clicked(self, button): menu_tree = self.tree.get_object('menu_tree') menus, iter = menu_tree.get_selection().get_selected() @@ -382,8 +387,7 @@ file_type = 'Menu' if not os.path.isfile(file_path): - data = open(item.get_desktop_file_path()).read() - open(file_path, 'w').write(data) + shutil.copy(item.get_desktop_file_path(), file_path) self.editor._MenuEditor__addUndo([(file_type, os.path.split(file_path)[1]),]) else: self.editor._MenuEditor__addUndo([item,]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/Mozo/Makefile.in new/mozo-1.14.1/Mozo/Makefile.in --- old/mozo-1.14.0/Mozo/Makefile.in 2016-04-07 22:14:19.000000000 +0200 +++ new/mozo-1.14.1/Mozo/Makefile.in 2016-08-24 23:29:27.000000000 +0200 @@ -275,6 +275,7 @@ psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/Mozo/MenuEditor.py new/mozo-1.14.1/Mozo/MenuEditor.py --- old/mozo-1.14.0/Mozo/MenuEditor.py 2016-03-05 13:57:48.000000000 +0100 +++ new/mozo-1.14.1/Mozo/MenuEditor.py 2016-08-24 23:15:48.000000000 +0200 @@ -16,7 +16,12 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -import os, re, xml.dom.minidom, locale +import codecs +import os +import re +import xml.dom.minidom +import xml.parsers.expat +import locale import matemenu from Mozo import util @@ -42,10 +47,10 @@ self.applications.tree.sort_key = matemenu.SORT_DISPLAY_NAME self.applications.visible_tree.sort_key = matemenu.SORT_DISPLAY_NAME self.applications.path = os.path.join(util.getUserMenuPath(), self.applications.tree.get_menu_file()) - if not os.path.isfile(self.applications.path): - self.applications.dom = xml.dom.minidom.parseString(util.getUserMenuXml(self.applications.tree)) - else: + try: self.applications.dom = xml.dom.minidom.parse(self.applications.path) + except (IOError, xml.parsers.expat.ExpatError): + self.applications.dom = xml.dom.minidom.parseString(util.getUserMenuXml(self.applications.tree)) self.__remove_whilespace_nodes(self.applications.dom) self.settings = Menu() @@ -54,19 +59,19 @@ self.settings.tree.sort_key = matemenu.SORT_DISPLAY_NAME self.settings.visible_tree.sort_key = matemenu.SORT_DISPLAY_NAME self.settings.path = os.path.join(util.getUserMenuPath(), self.settings.tree.get_menu_file()) - if not os.path.isfile(self.settings.path): - self.settings.dom = xml.dom.minidom.parseString(util.getUserMenuXml(self.settings.tree)) - else: + try: self.settings.dom = xml.dom.minidom.parse(self.settings.path) + except (IOError, xml.parsers.expat.ExpatError): + self.settings.dom = xml.dom.minidom.parseString(util.getUserMenuXml(self.settings.tree)) self.__remove_whilespace_nodes(self.settings.dom) self.save(True) def save(self, from_loading=False): for menu in ('applications', 'settings'): - fd = open(getattr(self, menu).path, 'w') - fd.write(re.sub("\n[\s]*([^\n<]*)\n[\s]*</", "\\1</", getattr(self, menu).dom.toprettyxml().replace('<?xml version="1.0" ?>\n', ''))) - fd.close() + xml = getattr(self, menu).dom.toprettyxml().replace('<?xml version="1.0" ?>\n', '') + with codecs.open(getattr(self, menu).path, 'w', 'utf-8') as f: + f.write(re.sub("\n[\s]*([^\n<]*)\n[\s]*</", "\\1</", xml)) if not from_loading: self.__loadMenus() @@ -94,10 +99,10 @@ except OSError: pass #reload DOM for each menu - if not os.path.isfile(menu.path): - menu.dom = xml.dom.minidom.parseString(util.getUserMenuXml(menu.tree)) - else: + try: menu.dom = xml.dom.minidom.parse(menu.path) + except (IOError, xml.parsers.expat.ExpatError): + menu.dom = xml.dom.minidom.parseString(util.getUserMenuXml(menu.tree)) self.__remove_whilespace_nodes(menu.dom) #reset undo/redo, no way to recover from this self.__undo, self.__redo = [], [] @@ -119,19 +124,29 @@ for file_path in files: new_path = file_path.rsplit('.', 1)[0] redo_path = util.getUniqueRedoFile(new_path) - data = open(new_path).read() - open(redo_path, 'w').write(data) - data = open(file_path).read() - open(new_path, 'w').write(data) + + f_file_path = codecs.open(new_path, 'r', 'utf-8') + f_new_path = codecs.open(new_path, 'rw', 'utf-8') + f_redo_path = codecs.open(redo_path, 'rw', 'utf-8') + + data = f_new_path.read() + f_redo_path.write(data) + data = f_file_path.read() + f_new_path.write(data) + + f_file_path.close() + f_new_path.close() + f_redo_path.close() + os.unlink(file_path) redo.append(redo_path) - #reload DOM to make changes stick + # reload DOM to make changes stick for name in ('applications', 'settings'): menu = getattr(self, name) - if not os.path.isfile(menu.path): - menu.dom = xml.dom.minidom.parseString(util.getUserMenuXml(menu.tree)) - else: + try: menu.dom = xml.dom.minidom.parse(menu.path) + except (IOError, xml.parsers.expat.ExpatError): + menu.dom = xml.dom.minidom.parseString(util.getUserMenuXml(menu.tree)) self.__remove_whilespace_nodes(menu.dom) self.__redo.append(redo) @@ -143,19 +158,25 @@ for file_path in files: new_path = file_path.rsplit('.', 1)[0] undo_path = util.getUniqueUndoFile(new_path) - data = open(new_path).read() - open(undo_path, 'w').write(data) - data = open(file_path).read() - open(new_path, 'w').write(data) + f_file_path = codecs.open(new_path, 'r', 'utf-8') + f_new_path = codecs.open(new_path, 'rw', 'utf-8') + f_undo_path = codecs.open(undo_path, 'rw', 'utf-8') + data = f_new_path.read() + f_undo_path.write(data) + data = f_file_path.read() + f_new_path.write(data) os.unlink(file_path) undo.append(undo_path) + f_file_path.close() + f_new_path.close() + f_undo_path.close() #reload DOM to make changes stick for name in ('applications', 'settings'): menu = getattr(self, name) - if not os.path.isfile(menu.path): - menu.dom = xml.dom.minidom.parseString(util.getUserMenuXml(menu.tree)) - else: + try: menu.dom = xml.dom.minidom.parse(menu.path) + except (IOError, xml.parsers.expat.ExpatError): + menu.dom = xml.dom.minidom.parseString(util.getUserMenuXml(menu.tree)) self.__remove_whilespace_nodes(menu.dom) self.__undo.append(undo) @@ -424,9 +445,11 @@ file_path = item.get_desktop_file_path() else: continue - data = open(file_path).read() + with codecs.open(file_path, 'r', 'utf-8') as f: + data = f.read() undo_path = util.getUniqueUndoFile(file_path) - open(undo_path, 'w').write(data) + with codecs.open(undo_path, 'w', 'utf-8') as f: + f.write(data) self.__undo[-1].append(undo_path) def __getMenu(self, item): @@ -513,11 +536,19 @@ return found def __addXmlMenuElement(self, element, name, dom): + if isinstance(name, bytes): + name = name.decode('utf-8') + node = dom.createElement('Menu') self.__addXmlTextElement(node, 'Name', name, dom) return element.appendChild(node) def __addXmlTextElement(self, element, name, text, dom): + if isinstance(name, bytes): + name = name.decode('utf-8') + if isinstance(text, bytes): + text = text.decode('utf-8') + for temp in element.childNodes: if temp.nodeName == name: if temp.childNodes[0].nodeValue == text: @@ -528,6 +559,9 @@ return element.appendChild(node) def __addXmlFilename(self, element, dom, filename, type = 'Include'): + if isinstance(filename, bytes): + filename = filename.decode('utf-8') + # remove old filenames for node in self.__getXmlNodesByName(['Include', 'Exclude'], element): if node.childNodes[0].nodeName == 'Filename' and node.childNodes[0].childNodes[0].nodeValue == filename: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/NEWS new/mozo-1.14.1/NEWS --- old/mozo-1.14.0/NEWS 2016-04-07 13:49:51.000000000 +0200 +++ new/mozo-1.14.1/NEWS 2016-08-24 23:23:34.000000000 +0200 @@ -1,3 +1,11 @@ +1.14.1 + + * Fix crash and erasing of menu file when processing + non-ASCII character + * Fix crash on invalid XML file + * Always encode with UTF-8 before writing XML file + * Translations update + 1.14.0 * Move to GTK+3 and GObject Introspection, drop old diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/aclocal.m4 new/mozo-1.14.1/aclocal.m4 --- old/mozo-1.14.0/aclocal.m4 2016-04-07 22:14:17.000000000 +0200 +++ new/mozo-1.14.1/aclocal.m4 2016-08-24 23:29:25.000000000 +0200 @@ -681,7 +681,7 @@ ]) dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29) +dnl serial 11 (pkg-config-0.29.1) dnl dnl Copyright © 2004 Scott James Remnant <[email protected]>. dnl Copyright © 2012-2015 Dan Nicholson <[email protected]> @@ -723,7 +723,7 @@ dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29]) +[m4_define([PKG_MACROS_VERSION], [0.29.1]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/configure new/mozo-1.14.1/configure --- old/mozo-1.14.0/configure 2016-04-07 22:14:18.000000000 +0200 +++ new/mozo-1.14.1/configure 2016-08-24 23:29:26.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for mozo 1.14.0. +# Generated by GNU Autoconf 2.69 for mozo 1.14.1. # # Report bugs to <http://www.mate-desktop.org>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='mozo' PACKAGE_TARNAME='mozo' -PACKAGE_VERSION='1.14.0' -PACKAGE_STRING='mozo 1.14.0' +PACKAGE_VERSION='1.14.1' +PACKAGE_STRING='mozo 1.14.1' PACKAGE_BUGREPORT='http://www.mate-desktop.org' PACKAGE_URL='' @@ -761,6 +761,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -841,6 +842,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1093,6 +1095,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1230,7 +1241,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1343,7 +1354,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures mozo 1.14.0 to adapt to many kinds of systems. +\`configure' configures mozo 1.14.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1383,6 +1394,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1409,7 +1421,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mozo 1.14.0:";; + short | recursive ) echo "Configuration of mozo 1.14.1:";; esac cat <<\_ACEOF @@ -1512,7 +1524,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mozo configure 1.14.0 +mozo configure 1.14.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1881,7 +1893,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mozo $as_me 1.14.0, which was +It was created by mozo $as_me 1.14.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2747,7 +2759,7 @@ # Define the identity of the package. PACKAGE='mozo' - VERSION='1.14.0' + VERSION='1.14.1' cat >>confdefs.h <<_ACEOF @@ -6536,7 +6548,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mozo $as_me 1.14.0, which was +This file was extended by mozo $as_me 1.14.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6602,7 +6614,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -mozo config.status 1.14.0 +mozo config.status 1.14.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/configure.ac new/mozo-1.14.1/configure.ac --- old/mozo-1.14.0/configure.ac 2016-04-07 13:49:13.000000000 +0200 +++ new/mozo-1.14.1/configure.ac 2016-08-24 23:18:44.000000000 +0200 @@ -1,7 +1,7 @@ dnl -*- Mode: autoconf -*- dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.53) -AC_INIT(mozo, 1.14.0, http://www.mate-desktop.org) +AC_INIT(mozo, 1.14.1, http://www.mate-desktop.org) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AC_CONFIG_SRCDIR(mozo.in) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/data/Makefile.in new/mozo-1.14.1/data/Makefile.in --- old/mozo-1.14.0/data/Makefile.in 2016-04-07 22:14:19.000000000 +0200 +++ new/mozo-1.14.1/data/Makefile.in 2016-08-24 23:29:27.000000000 +0200 @@ -337,6 +337,7 @@ psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/data/icons/Makefile.in new/mozo-1.14.1/data/icons/Makefile.in --- old/mozo-1.14.0/data/icons/Makefile.in 2016-04-07 22:14:19.000000000 +0200 +++ new/mozo-1.14.1/data/icons/Makefile.in 2016-08-24 23:29:27.000000000 +0200 @@ -245,6 +245,7 @@ psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/data/mozo.ui new/mozo-1.14.1/data/mozo.ui --- old/mozo-1.14.0/data/mozo.ui 2016-04-07 13:41:32.000000000 +0200 +++ new/mozo-1.14.1/data/mozo.ui 2016-08-24 23:15:48.000000000 +0200 @@ -51,6 +51,7 @@ <property name="window_position">center</property> <property name="type_hint">normal</property> <signal name="close" handler="on_close_button_clicked" swapped="no"/> + <signal name="delete-event" handler="on_delete_event" swapped="no"/> <signal name="destroy" handler="on_close_button_clicked" swapped="no"/> <signal name="style-updated" handler="on_style_updated" swapped="no"/> <child internal-child="vbox"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/install-sh new/mozo-1.14.1/install-sh --- old/mozo-1.14.0/install-sh 2016-04-07 22:14:19.000000000 +0200 +++ new/mozo-1.14.1/install-sh 2016-08-24 23:29:27.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2013-12-25.23; # UTC +scriptversion=2014-09-12.12; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -324,34 +324,41 @@ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) + # $RANDOM is not portable (e.g. dash); use it when possible to + # lower collision chance tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + # As "mkdir -p" follows symlinks and we work in /tmp possibly; so + # create the $tmpdir first (and fail if unsuccessful) to make sure + # that nobody tries to guess the $tmpdir name. if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 then if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` case $ls_ld_tmpdir in d????-?r-*) different_mode=700;; d????-?--*) different_mode=755;; *) false;; esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" } } then posix_mkdir=: fi - rmdir "$tmpdir/d" "$tmpdir" + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" else # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null fi trap '' 0;; esac;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/po/LINGUAS new/mozo-1.14.1/po/LINGUAS --- old/mozo-1.14.0/po/LINGUAS 2016-04-07 22:13:43.000000000 +0200 +++ new/mozo-1.14.1/po/LINGUAS 2016-08-24 23:16:30.000000000 +0200 @@ -7,8 +7,6 @@ as ast be -be@latin -bem bg bn bn_IN @@ -26,7 +24,6 @@ en_AU en_CA en_GB -en@shaw eo es es_AR @@ -51,7 +48,6 @@ hu hy id -io is it ja @@ -79,6 +75,7 @@ or pa pl +pms ps pt pt_BR @@ -97,7 +94,6 @@ tr ug uk -uz@cyrillic uz vi zh_CN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/po/[email protected] new/mozo-1.14.1/po/[email protected] --- old/mozo-1.14.0/po/[email protected] 2016-03-04 17:09:05.000000000 +0100 +++ new/mozo-1.14.1/po/[email protected] 1970-01-01 01:00:00.000000000 +0100 @@ -1,82 +0,0 @@ -# Biełaruski pierakład Mozo. -# Copyright (C) 2007 Free Software Foundation. -# This file is distributed under the same license as the Mozo package. -# Ihar Hračyška <[email protected]>, 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: Mozo\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-03-10 02:26+0200\n" -"PO-Revision-Date: 2007-03-09 18:58+0100\n" -"Last-Translator: Alaksandar Navicki <[email protected]>\n" -"Language-Team: Belarusian Latin <[email protected]>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: ../Mozo/MainWindow.py:167 -msgid "Name" -msgstr "Nazva" - -#: ../Mozo/MainWindow.py:183 -msgid "Show" -msgstr "Pakažy" - -#: ../Mozo/MainWindow.py:191 -msgid "Item" -msgstr "Element" - -#: ../mozo.desktop.in.in.h:1 -msgid "Change which applications are shown on the main menu" -msgstr "Źmiani śpis aplikacyj, pakazanych u hałoŭnym menu" - -#: ../mozo.desktop.in.in.h:2 ../mozo.glade.h:2 -msgid "Main Menu" -msgstr "Hałoŭnaje menu" - -#: ../mozo.glade.h:1 -msgid "It_ems:" -msgstr "_Elementy:" - -#: ../mozo.glade.h:3 -msgid "Move Down" -msgstr "Pasuń nižej" - -#: ../mozo.glade.h:4 -msgid "Move Up" -msgstr "Pasuń vyšej" - -#: ../mozo.glade.h:5 -msgid "Ne_w Item" -msgstr "_Novy element" - -#: ../mozo.glade.h:6 -msgid "New _Separator" -msgstr "Novy _separatar" - -#: ../mozo.glade.h:7 -msgid "Restore the default menu layout" -msgstr "Viarni zmoŭčany vyhlad menu" - -#: ../mozo.glade.h:8 -msgid "Revert Changes?" -msgstr "Anulavać źmieny?" - -#: ../mozo.glade.h:9 -msgid "Revert all menus to original settings?" -msgstr "Viarnuć zmoŭčanyja nałady dla ŭsich menu?" - -#: ../mozo.glade.h:10 -msgid "_Menus:" -msgstr "_Menu:" - -#: ../mozo.glade.h:11 -msgid "_New Menu" -msgstr "_Novaje menu" - -#: ../mozo.glade.h:12 -msgid "_Revert to Original" -msgstr "_Viarni zmoŭčanyja nałady" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/po/bem.po new/mozo-1.14.1/po/bem.po --- old/mozo-1.14.0/po/bem.po 2016-03-04 17:09:05.000000000 +0100 +++ new/mozo-1.14.1/po/bem.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,80 +0,0 @@ -# Bemba translation of mozo. -# Copyright (C) 2009, listed translators -# This file is distributed under the same license as the mozo package. -# Katongo Musaluke <[email protected]>, 2009. -# -msgid "" -msgstr "" -"Project-Id-Version: mozo HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-04 12:17+0200\n" -"PO-Revision-Date: 2009-03-18 16:10+0100\n" -"Last-Translator: Katongo Musaluke <[email protected]>\n" -"Language-Team: Bemba Team <[email protected]>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../Mozo/MainWindow.py:168 -msgid "Name" -msgstr "Ishina" - -#: ../Mozo/MainWindow.py:184 -msgid "Show" -msgstr "Ukulanga" - -#: ../Mozo/MainWindow.py:192 -msgid "Item" -msgstr "Ichintu" - -#: ../data/mozo.desktop.in.in.h:1 -msgid "Change which applications are shown on the main menu" -msgstr "Ukuchinja ama applications ya kulanga mu menu ikalamba" - -#: ../data/mozo.desktop.in.in.h:2 ../data/mozo.glade.h:2 -msgid "Main Menu" -msgstr "Menu Ikalamba" - -#: ../data/mozo.glade.h:1 -msgid "It_ems:" -msgstr "If_intu" - -#: ../data/mozo.glade.h:3 -msgid "Move Down" -msgstr "Ukuya Panshi" - -#: ../data/mozo.glade.h:4 -msgid "Move Up" -msgstr "Ukuya Pamulu" - -#: ../data/mozo.glade.h:5 -msgid "Ne_w Item" -msgstr "Ichintu Cha Ne_w" - -#: ../data/mozo.glade.h:6 -msgid "New _Separator" -msgstr "_Separator Ya New" - -#: ../data/mozo.glade.h:7 -msgid "Restore the default menu layout" -msgstr "Bushe tubwekeshemo menu kuli filya yalemoneka pakwamba" - -#: ../data/mozo.glade.h:8 -msgid "Revert Changes?" -msgstr "Bushe Tukanse ifya Chinja?" - -#: ../data/mozo.glade.h:9 -msgid "Revert all menus to original settings?" -msgstr "Bushe Tubwekeshemo ama menu yonse kufyo yali pakwamba?" - -#: ../data/mozo.glade.h:10 -msgid "_Menus:" -msgstr "Ama _Menu" - -#: ../data/mozo.glade.h:11 -msgid "_New Menu" -msgstr "Menu ya _New" - -#: ../data/mozo.glade.h:12 -msgid "_Revert to Original" -msgstr "_Ukubwekesha kufyo yali pakwamba" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/po/[email protected] new/mozo-1.14.1/po/[email protected] --- old/mozo-1.14.0/po/[email protected] 2016-03-04 17:09:05.000000000 +0100 +++ new/mozo-1.14.1/po/[email protected] 1970-01-01 01:00:00.000000000 +0100 @@ -1,82 +0,0 @@ -# Shavian translation.. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Thomas Thurman <[email protected]>, 2009. -# -msgid "" -msgstr "" -"Project-Id-Version: mozo\n" -"Report-Msgid-Bugs-To: http://bugzilla.mate.org/enter_bug.cgi?product=mozo&component=general\n"; -"POT-Creation-Date: 2009-09-23 18:39+0000\n" -"PO-Revision-Date: 2010-05-12 18:35 -0400\n" -"Last-Translator: Thomas Thurman <[email protected]>\n" -"Language-Team: Shavian <[email protected]>\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" - -#: ../Mozo/MainWindow.py:164 -msgid "Name" -msgstr "𐑯𐑱𐑥" - -#: ../Mozo/MainWindow.py:180 -msgid "Show" -msgstr "𐑖𐑴" - -#: ../Mozo/MainWindow.py:188 -msgid "Item" -msgstr "𐑲𐑑𐑩𐑥" - -#: ../data/mozo.desktop.in.in.h:1 -msgid "Change which applications are shown on the main menu" -msgstr "𐑗𐑱𐑯𐑡 𐑢𐑦𐑗 𐑩𐑐𐑤𐑦𐑒𐑱𐑕𐑩𐑯𐑟 𐑸 𐑖𐑴𐑯 𐑪𐑯 𐑞 𐑥𐑱𐑯 𐑥𐑧𐑯𐑿" - -#: ../data/mozo.desktop.in.in.h:2 ../data/mozo.ui.h:2 -msgid "Main Menu" -msgstr "𐑥𐑱𐑯 𐑥𐑧𐑯𐑿" - -#: ../data/mozo.ui.h:1 -msgid "It_ems:" -msgstr "𐑲𐑑_𐑩𐑥𐑟:" - -#: ../data/mozo.ui.h:3 -msgid "Move Down" -msgstr "𐑥𐑵𐑝 𐑛𐑬𐑯" - -#: ../data/mozo.ui.h:4 -msgid "Move Up" -msgstr "𐑥𐑵𐑝 𐑳𐑐" - -#: ../data/mozo.ui.h:5 -msgid "Ne_w Item" -msgstr "𐑯_𐑿 𐑲𐑑𐑩𐑥" - -#: ../data/mozo.ui.h:6 -msgid "New _Separator" -msgstr "𐑯𐑿 _𐑕𐑧𐑐𐑼𐑱𐑑𐑼" - -#: ../data/mozo.ui.h:7 -msgid "Restore the default menu layout" -msgstr "𐑮𐑩𐑕𐑑𐑹 𐑞 𐑛𐑦𐑓𐑷𐑤𐑑 𐑥𐑧𐑯𐑿 𐑤𐑱𐑬𐑑" - -#: ../data/mozo.ui.h:8 -msgid "Revert Changes?" -msgstr "𐑮𐑦𐑝𐑻𐑑 𐑗𐑱𐑯𐑡𐑩𐑟?" - -#: ../data/mozo.ui.h:9 -msgid "Revert all menus to original settings?" -msgstr "𐑮𐑦𐑝𐑻𐑑 𐑷𐑤 𐑥𐑧𐑯𐑿𐑟 𐑑 𐑩𐑮𐑦𐑡𐑩𐑯𐑩𐑤 𐑕𐑧𐑑𐑦𐑙𐑟?" - -#: ../data/mozo.ui.h:10 -msgid "_Menus:" -msgstr "_𐑥𐑧𐑯𐑿𐑟:" - -#: ../data/mozo.ui.h:11 -msgid "_New Menu" -msgstr "_𐑯𐑿 𐑥𐑧𐑯𐑿" - -#: ../data/mozo.ui.h:12 -msgid "_Revert to Original" -msgstr "_𐑮𐑦𐑝𐑻𐑑 𐑑 𐑩𐑮𐑦𐑡𐑩𐑯𐑩𐑤" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/po/es.po new/mozo-1.14.1/po/es.po --- old/mozo-1.14.0/po/es.po 2016-04-07 13:42:24.000000000 +0200 +++ new/mozo-1.14.1/po/es.po 2016-06-21 16:53:43.000000000 +0200 @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Adolfo Jayme Barrientos, 2014 +# Fitoschido, 2014 # Emiliano Fascetti, 2015 # Francisco Javier F. Serrador <[email protected]>, 2006 # Jorge González <[email protected]>, 2007 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/po/es_CL.po new/mozo-1.14.1/po/es_CL.po --- old/mozo-1.14.0/po/es_CL.po 2016-04-07 13:42:26.000000000 +0200 +++ new/mozo-1.14.1/po/es_CL.po 2016-06-21 16:53:43.000000000 +0200 @@ -4,7 +4,7 @@ # # Translators: # David Ríos <[email protected]>, 2014 -# Pablo Roberto Francisco Lezaeta Reyes <[email protected]>, 2012 +# Pablo Roberto “Jristz” Lezaeta Reyes <[email protected]>, 2012 msgid "" msgstr "" "Project-Id-Version: MATE Desktop Environment\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/po/hi.po new/mozo-1.14.1/po/hi.po --- old/mozo-1.14.0/po/hi.po 2016-04-07 13:42:21.000000000 +0200 +++ new/mozo-1.14.1/po/hi.po 2016-06-21 16:53:43.000000000 +0200 @@ -4,7 +4,7 @@ # # Translators: # Rajesh Ranjan <[email protected]>, 2009 -# Rajesh Ranjan <[email protected]>, 2006 +# Rajesh Ranjan <[email protected]>, 2006 msgid "" msgstr "" "Project-Id-Version: MATE Desktop Environment\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/po/io.po new/mozo-1.14.1/po/io.po --- old/mozo-1.14.0/po/io.po 2016-03-04 17:09:05.000000000 +0100 +++ new/mozo-1.14.1/po/io.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,83 +0,0 @@ -# Ido gtk+ po-properties file. -# Copyright (C) 2007 -# This file is distributed under the same license as the gtk+ package. -# Michael Terry <[email protected]>, 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: alacart 0.11.4\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-18 19:38-0400\n" -"PO-Revision-Date: 2007-09-18 22:45-0500\n" -"Last-Translator: Michael Terry <[email protected]>\n" -"Language-Team: Ido <[email protected]>\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" - -#: ../Mozo/MainWindow.py:167 -msgid "Name" -msgstr "Nomo" - -#: ../Mozo/MainWindow.py:183 -msgid "Show" -msgstr "Montrez" - -#: ../Mozo/MainWindow.py:191 -msgid "Item" -msgstr "Elemento" - -#: ../mozo.desktop.in.in.h:1 -msgid "Change which applications are shown on the main menu" -msgstr "Chanjez quin programi montresas en la precipua menuo" - -#: ../mozo.desktop.in.in.h:2 -#: ../mozo.glade.h:2 -msgid "Main Menu" -msgstr "Precipua Menuo" - -#: ../mozo.glade.h:1 -msgid "It_ems:" -msgstr "_Elementi:" - -#: ../mozo.glade.h:3 -msgid "Move Down" -msgstr "Movigez Adinfre" - -#: ../mozo.glade.h:4 -msgid "Move Up" -msgstr "Movigez Adsupre" - -#: ../mozo.glade.h:5 -msgid "Ne_w Item" -msgstr "No_va Elemento" - -#: ../mozo.glade.h:6 -msgid "New _Separator" -msgstr "Nova _Separilo" - -#: ../mozo.glade.h:7 -msgid "Restore the default menu layout" -msgstr "Restaurez la originala menuala traso" - -#: ../mozo.glade.h:8 -msgid "Revert Changes?" -msgstr "Ka Reversionez Chanji?" - -#: ../mozo.glade.h:9 -msgid "Revert all menus to original settings?" -msgstr "Ka reversionez omna menui ad originala situesi?" - -#: ../mozo.glade.h:10 -msgid "_Menus:" -msgstr "_Menui:" - -#: ../mozo.glade.h:11 -msgid "_New Menu" -msgstr "_Nova Menuo" - -#: ../mozo.glade.h:12 -msgid "_Revert to Original" -msgstr "_Reversionez ad Originalajo" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/po/pms.po new/mozo-1.14.1/po/pms.po --- old/mozo-1.14.0/po/pms.po 1970-01-01 01:00:00.000000000 +0100 +++ new/mozo-1.14.1/po/pms.po 2016-06-21 16:53:43.000000000 +0200 @@ -0,0 +1,83 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Randy Ichinose <[email protected]>, 2016 +msgid "" +msgstr "" +"Project-Id-Version: MATE Desktop Environment\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-03-27 23:17+0300\n" +"PO-Revision-Date: 2016-05-13 11:04+0000\n" +"Last-Translator: Randy Ichinose <[email protected]>\n" +"Language-Team: Piemontese (http://www.transifex.com/mate/MATE/language/pms/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pms\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../Mozo/MainWindow.py:174 +msgid "Name" +msgstr "Nòm" + +#: ../Mozo/MainWindow.py:190 +msgid "Show" +msgstr "" + +#: ../Mozo/MainWindow.py:198 +msgid "Item" +msgstr "Oget" + +#: ../data/mozo.desktop.in.in.h:1 ../data/mozo.ui.h:2 +msgid "Main Menu" +msgstr "" + +#: ../data/mozo.desktop.in.in.h:2 +msgid "Change which applications are shown on the main menu" +msgstr "" + +#: ../data/mozo.ui.h:1 +msgid "_Revert to Original" +msgstr "" + +#: ../data/mozo.ui.h:3 +msgid "Restore the default menu layout" +msgstr "" + +#: ../data/mozo.ui.h:4 +msgid "_Menus:" +msgstr "" + +#: ../data/mozo.ui.h:5 +msgid "It_ems:" +msgstr "" + +#: ../data/mozo.ui.h:6 +msgid "_New Menu" +msgstr "" + +#: ../data/mozo.ui.h:7 +msgid "Ne_w Item" +msgstr "" + +#: ../data/mozo.ui.h:8 +msgid "New _Separator" +msgstr "" + +#: ../data/mozo.ui.h:9 +msgid "Move Up" +msgstr "" + +#: ../data/mozo.ui.h:10 +msgid "Move Down" +msgstr "" + +#: ../data/mozo.ui.h:11 +msgid "Revert Changes?" +msgstr "" + +#: ../data/mozo.ui.h:12 +msgid "Revert all menus to original settings?" +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/po/uz.po new/mozo-1.14.1/po/uz.po --- old/mozo-1.14.0/po/uz.po 2016-04-07 13:42:22.000000000 +0200 +++ new/mozo-1.14.1/po/uz.po 2016-06-21 16:53:43.000000000 +0200 @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# muzaffar habibullayev <[email protected]>, 2016 msgid "" msgstr "" "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-27 23:17+0300\n" -"PO-Revision-Date: 2012-03-14 13:27+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2016-04-15 13:07+0000\n" +"Last-Translator: muzaffar habibullayev <[email protected]>\n" "Language-Team: Uzbek (http://www.transifex.com/mate/MATE/language/uz/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,60 +24,60 @@ #: ../Mozo/MainWindow.py:190 msgid "Show" -msgstr "" +msgstr "Ko'rsatish" #: ../Mozo/MainWindow.py:198 msgid "Item" -msgstr "" +msgstr "Narsa" #: ../data/mozo.desktop.in.in.h:1 ../data/mozo.ui.h:2 msgid "Main Menu" -msgstr "" +msgstr "Asosiy Menyu" #: ../data/mozo.desktop.in.in.h:2 msgid "Change which applications are shown on the main menu" -msgstr "" +msgstr "Asosiy Menyuda ko'rinuvchi dasturlarni o'zgartirish" #: ../data/mozo.ui.h:1 msgid "_Revert to Original" -msgstr "" +msgstr "Asliga _Qaytarish" #: ../data/mozo.ui.h:3 msgid "Restore the default menu layout" -msgstr "" +msgstr "Standart Menyuni tiklash" #: ../data/mozo.ui.h:4 msgid "_Menus:" -msgstr "" +msgstr "_Menyular:" #: ../data/mozo.ui.h:5 msgid "It_ems:" -msgstr "" +msgstr "Na_rsalar:" #: ../data/mozo.ui.h:6 msgid "_New Menu" -msgstr "" +msgstr "_Yangi Menyu" #: ../data/mozo.ui.h:7 msgid "Ne_w Item" -msgstr "" +msgstr "Ya_ngi Narsa" #: ../data/mozo.ui.h:8 msgid "New _Separator" -msgstr "" +msgstr "Yangi _Ajratuvchi" #: ../data/mozo.ui.h:9 msgid "Move Up" -msgstr "" +msgstr "Yuqoriga koʻtarish" #: ../data/mozo.ui.h:10 msgid "Move Down" -msgstr "" +msgstr "Pastga Tushirish" #: ../data/mozo.ui.h:11 msgid "Revert Changes?" -msgstr "" +msgstr "O'zgarishlar qaytarilsinmi?" #: ../data/mozo.ui.h:12 msgid "Revert all menus to original settings?" -msgstr "" +msgstr "Barcha menyular asliga qaytarilsinmi?" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mozo-1.14.0/po/[email protected] new/mozo-1.14.1/po/[email protected] --- old/mozo-1.14.0/po/[email protected] 2016-03-04 17:09:05.000000000 +0100 +++ new/mozo-1.14.1/po/[email protected] 1970-01-01 01:00:00.000000000 +0100 @@ -1,81 +0,0 @@ -# translation of mozo.HEAD.po to Uzbek -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Nurali Abdurahmonov <[email protected]>, 2007. -msgid "" -msgstr "" -"Project-Id-Version: mozo.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-05 19:51+0200\n" -"PO-Revision-Date: 2007-09-05 12:50+0500\n" -"Last-Translator: Nurali Abdurahmonov <[email protected]>\n" -"Language-Team: Uzbek\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" - -#: ../Mozo/MainWindow.py:167 -msgid "Name" -msgstr "Номи" - -#: ../Mozo/MainWindow.py:183 -msgid "Show" -msgstr "Кўрсатиш" - -#: ../Mozo/MainWindow.py:191 -msgid "Item" -msgstr "Элемент" - -#: ../mozo.desktop.in.in.h:1 -msgid "Change which applications are shown on the main menu" -msgstr "Асосий менюда кўрсатиладиган дастурларни ўзгартириш" - -#: ../mozo.desktop.in.in.h:2 ../mozo.glade.h:2 -msgid "Main Menu" -msgstr "Асосий меню" - -#: ../mozo.glade.h:1 -msgid "It_ems:" -msgstr "Эл_ементлар:" - -#: ../mozo.glade.h:3 -msgid "Move Down" -msgstr "Пастга" - -#: ../mozo.glade.h:4 -msgid "Move Up" -msgstr "Юқорига" - -#: ../mozo.glade.h:5 -msgid "Ne_w Item" -msgstr "Янг_и элемент" - -#: ../mozo.glade.h:6 -msgid "New _Separator" -msgstr "Янги _ажратувчи" - -#: ../mozo.glade.h:7 -msgid "Restore the default menu layout" -msgstr "Менюнинг илк кўринишига қайтариш" - -#: ../mozo.glade.h:8 -msgid "Revert Changes?" -msgstr "Ўзгаришлар бекор қилинсинми?" - -#: ../mozo.glade.h:9 -msgid "Revert all menus to original settings?" -msgstr "Ҳамма менюлар асл мосламаларига қайтарилсинми?" - -#: ../mozo.glade.h:10 -msgid "_Menus:" -msgstr "_Менюлар:" - -#: ../mozo.glade.h:11 -msgid "_New Menu" -msgstr "_Янги меню" - -#: ../mozo.glade.h:12 -msgid "_Revert to Original" -msgstr "_Асл ҳолатига қайтариш"
