Hello community, here is the log from the commit of package gnome-tweak-tool for openSUSE:Factory checked in at Mon May 2 14:31:34 CEST 2011.
-------- --- GNOME/gnome-tweak-tool/gnome-tweak-tool.changes 2011-04-26 22:49:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-tweak-tool/gnome-tweak-tool.changes 2011-04-28 13:16:46.000000000 +0200 @@ -1,0 +2,30 @@ +Thu Apr 28 11:14:54 UTC 2011 - [email protected] + +- Update to version 3.0.3: + + bgo#648087: autostart nautilus at login if it is configured to + show desktop icons. + + bgo#648735: improved robustness for missing theme/icon + directories. + + Fix shell theme installation for themes found in the wild. + + Improve shell theme selection. + +------------------------------------------------------------------- +Wed Apr 27 11:57:28 UTC 2011 - [email protected] + +- Update to version 3.0.2: + + Really tweak window theme - both the fallback and the shell + metacity/mutter theme. + + Fix attribution of data/welcome.png +- Changes from version 3.0.1: + + Fix localization + + Tweak window theme + + Tweak week date in calendar + + Tweak cursor themes + + Support user installed themes in $HOME + + Remove org.gnome.desktop.background draw-backgroud tweak, it + should never be false +- Drop gnome-tweak-tool-3.0.0-fix-localization.patch: fixed + usptream. +- Remove now unneeded calls to autoreconf and intltoolize. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-tweak-tool-3.0.0-fix-localization.patch gnome-tweak-tool-3.0.0.tar.bz2 New: ---- gnome-tweak-tool-3.0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-tweak-tool.spec ++++++ --- /var/tmp/diff_new_pack.XCcJRN/_old 2011-05-02 14:30:23.000000000 +0200 +++ /var/tmp/diff_new_pack.XCcJRN/_new 2011-05-02 14:30:23.000000000 +0200 @@ -19,15 +19,13 @@ Name: gnome-tweak-tool -Version: 3.0.0 +Version: 3.0.3 Release: 1 License: GPLv3+ Summary: A tool to customize advanced GNOME 3 options Group: System/GUI/GNOME Url: http://live.gnome.org/GnomeTweakTool Source0: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM gnome-tweak-tool-3.0.0-fix-localization.patch [email protected] -- Enable application translations -Patch0: gnome-tweak-tool-3.0.0-fix-localization.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: pkgconfig(gconf-2.0) @@ -51,11 +49,8 @@ %lang_package %prep %setup -q -%patch0 -p1 %build -autoreconf -f -i -intltoolize --force %configure make %{?_smp_mflags} ++++++ gnome-tweak-tool-3.0.0.tar.bz2 -> gnome-tweak-tool-3.0.3.tar.bz2 ++++++ ++++ 8988 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/AUTHORS new/gnome-tweak-tool-3.0.3/AUTHORS --- old/gnome-tweak-tool-3.0.0/AUTHORS 2011-03-22 09:35:08.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/AUTHORS 2011-04-26 23:49:46.000000000 +0200 @@ -1 +1,6 @@ John Stowers <[email protected]> + +---- + +data/welcome.png was created by Sofie van Schadewijk + (Creative Commons Attribution 3.0 Unported license) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/NEWS new/gnome-tweak-tool-3.0.3/NEWS --- old/gnome-tweak-tool-3.0.0/NEWS 2011-03-29 23:19:23.000000000 +0200 +++ new/gnome-tweak-tool-3.0.3/NEWS 2011-04-27 14:03:55.000000000 +0200 @@ -1,3 +1,25 @@ +3.0.3 + * Autostart nautilus at login if it is configured to show + desktop icons (bug 648087) + * Improved robustness for missing theme/icon + directories (bug 648735) + * Fix shell theme installation for themes found in the wild + * Improve shell theme selection + +3.0.2 + * Really tweak window theme - both the fallback and the + shell metacity/mutter theme + * Fix attribution of data/welcome.png + +3.0.1 + * Fix localization + * Tweak window theme + * Tweak week date in calendar (Emmanuele Bassi) + * Tweak cursor themes (Andrea Fagiani) + * Support user installed themes in $HOME (Andrea Fagiani) + * Remove org.gnome.desktop.background draw-backgroud tweak, it + should never be false + 3.0.0 * First stable release * Enable icon theme selection diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/configure.ac new/gnome-tweak-tool-3.0.3/configure.ac --- old/gnome-tweak-tool-3.0.0/configure.ac 2011-03-30 22:16:38.000000000 +0200 +++ new/gnome-tweak-tool-3.0.3/configure.ac 2011-04-26 23:57:24.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([gnome-tweak-tool], [3.0.0], [[email protected]]) +AC_INIT([gnome-tweak-tool], [3.0.3], [[email protected]]) AM_INIT_AUTOMAKE([foreign]) @@ -19,6 +19,9 @@ IT_PROG_INTLTOOL([0.40.0]) AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.17]) +GETTEXT_PACKAGE=gnome-tweak-tool +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name]) AS_AC_EXPAND(DATADIR, "${datadir}") AS_AC_EXPAND(PKGDATADIR, "${datadir}/${PACKAGE}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/gnome-tweak-tool new/gnome-tweak-tool-3.0.3/gnome-tweak-tool --- old/gnome-tweak-tool-3.0.0/gnome-tweak-tool 2011-03-30 00:46:54.000000000 +0200 +++ new/gnome-tweak-tool-3.0.3/gnome-tweak-tool 2011-04-27 10:34:40.000000000 +0200 @@ -15,6 +15,7 @@ import os.path import optparse +import logging import gi gi.require_version("Gtk", "3.0") @@ -78,5 +79,7 @@ gtweak.PKG_DATA_DIR = PKG_DATA_DIR gtweak.ENABLE_TEST = options.test + logging.basicConfig(format="%(levelname)-8s: %(message)s", level=logging.INFO) + MainWindow() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/gtweak/defs.py new/gnome-tweak-tool-3.0.3/gtweak/defs.py --- old/gnome-tweak-tool-3.0.0/gtweak/defs.py 2011-04-01 12:20:12.000000000 +0200 +++ new/gnome-tweak-tool-3.0.3/gtweak/defs.py 2011-04-27 21:52:53.000000000 +0200 @@ -1,5 +1,5 @@ DATA_DIR = "/usr/local/share" PKG_DATA_DIR = "/usr/local/share/gnome-tweak-tool" GSETTINGS_SCHEMA_DIR = "/usr/local/share/glib-2.0/schemas" -TWEAK_DIR = "/usr/local/lib/python2.6/dist-packages/gtweak/tweaks" -VERSION = "3.0.0" +TWEAK_DIR = "/usr/local/lib/python2.7/dist-packages/gtweak/tweaks" +VERSION = "3.0.3" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/gtweak/gconf.py new/gnome-tweak-tool-3.0.3/gtweak/gconf.py --- old/gnome-tweak-tool-3.0.0/gtweak/gconf.py 2011-03-24 21:57:50.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/gtweak/gconf.py 2011-04-27 10:31:33.000000000 +0200 @@ -16,6 +16,7 @@ # along with gnome-tweak-tool. If not, see <http://www.gnu.org/licenses/>. import subprocess +import logging from gi.repository import GConf @@ -40,7 +41,7 @@ else: self._cmd_cache[command] = "ERROR: %s" % stderr.strip() - print "Caching gconf: %s (%s)" % (self, command) + logging.info("Caching gconf: %s (%s)" % (self, command)) return self._cmd_cache[command] def schema_get_summary(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/gtweak/gsettings.py new/gnome-tweak-tool-3.0.3/gtweak/gsettings.py --- old/gnome-tweak-tool-3.0.0/gtweak/gsettings.py 2011-03-24 21:56:59.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/gtweak/gsettings.py 2011-04-27 10:34:07.000000000 +0200 @@ -15,6 +15,7 @@ # You should have received a copy of the GNU General Public License # along with gnome-tweak-tool. If not, see <http://www.gnu.org/licenses/>. +import logging import os.path import xml.dom.minidom @@ -44,8 +45,7 @@ "summary" : key.getElementsByTagName("summary")[0].childNodes[0].data, "description" : key.getElementsByTagName("description")[0].childNodes[0].data} except: - import traceback - traceback.print_exc() + logging.critical("Error parsing schema", exc_info=True) def __repr__(self): return "<gtweak.gsettings._GSettingsSchema: %s>" % self._schema_name @@ -57,7 +57,7 @@ Gio.Settings.__init__(self, schema_name) if schema_name not in _SCHEMA_CACHE: _SCHEMA_CACHE[schema_name] = _GSettingsSchema(schema_name, **options) - print "Caching gsettings: %s" % _SCHEMA_CACHE[schema_name] + logging.info("Caching gsettings: %s" % _SCHEMA_CACHE[schema_name]) self._schema = _SCHEMA_CACHE[schema_name] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/gtweak/gshellwrapper.py new/gnome-tweak-tool-3.0.3/gtweak/gshellwrapper.py --- old/gnome-tweak-tool-3.0.0/gtweak/gshellwrapper.py 2011-03-24 21:57:04.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/gtweak/gshellwrapper.py 2011-04-27 13:03:00.000000000 +0200 @@ -54,6 +54,9 @@ out = self._proxy.execute_js('const ExtensionSystem = imports.ui.extensionSystem; ExtensionSystem.extensionMeta') return json.loads(out) + def get_version(self): + return json.loads(self._proxy.execute_js('const Config = imports.misc.config; Config.PACKAGE_VERSION')) + if __name__ == "__main__": s = GnomeShell() print s.list_extensions() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/gtweak/tweaks/tweak_interface.py new/gnome-tweak-tool-3.0.3/gtweak/tweaks/tweak_interface.py --- old/gnome-tweak-tool-3.0.0/gtweak/tweaks/tweak_interface.py 2011-04-01 12:10:44.000000000 +0200 +++ new/gnome-tweak-tool-3.0.3/gtweak/tweaks/tweak_interface.py 2011-04-27 10:10:42.000000000 +0200 @@ -20,34 +20,59 @@ from gi.repository import Gtk import gtweak +from gtweak.utils import walk_directories from gtweak.tweakmodel import TweakGroup from gtweak.widgets import GSettingsSwitchTweak, GSettingsComboTweak, build_horizontal_sizegroup -class ThemeSwitcher(GSettingsComboTweak): - """ Only shows themes that have variations for gtk+-3 and gtk+-2 """ +class GtkThemeSwitcher(GSettingsComboTweak): def __init__(self, **options): - valid_themes = [] - themedir = os.path.join(gtweak.DATA_DIR, "themes") - for t in os.listdir(themedir): - if os.path.exists(os.path.join(themedir, t, "gtk-2.0")) and \ - os.path.exists(os.path.join(themedir, t, "gtk-3.0")): - valid_themes.append(t) - GSettingsComboTweak.__init__(self, "org.gnome.desktop.interface", "gtk-theme", - [(t, t) for t in valid_themes], + [(t, t) for t in self._get_valid_themes()], **options) + def _get_valid_themes(self): + """ Only shows themes that have variations for gtk+-3 and gtk+-2 """ + dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), + os.path.join(os.path.expanduser("~"), ".themes")) + valid = walk_directories(dirs, lambda d: + os.path.exists(os.path.join(d, "gtk-2.0")) and \ + os.path.exists(os.path.join(d, "gtk-3.0"))) + return valid + class IconThemeSwitcher(GSettingsComboTweak): def __init__(self, **options): - iconthemedir = os.path.join(gtweak.DATA_DIR, "icons") GSettingsComboTweak.__init__(self, "org.gnome.desktop.interface", "icon-theme", - [(t, t) for t in os.listdir(iconthemedir)], + [(t, t) for t in self._get_valid_icon_themes()], **options) + def _get_valid_icon_themes(self): + dirs = ( os.path.join(gtweak.DATA_DIR, "icons"), + os.path.join(os.path.expanduser("~"), ".icons")) + valid = walk_directories(dirs, lambda d: + os.path.isdir(d) and \ + not os.path.exists(os.path.join(d, "cursors"))) + return valid + +class CursorThemeSwitcher(GSettingsComboTweak): + def __init__(self, **options): + GSettingsComboTweak.__init__(self, + "org.gnome.desktop.interface", + "cursor-theme", + [(t, t) for t in self._get_valid_cursor_themes()], + **options) + + def _get_valid_cursor_themes(self): + dirs = ( os.path.join(gtweak.DATA_DIR, "icons"), + os.path.join(os.path.expanduser("~"), ".icons")) + valid = walk_directories(dirs, lambda d: + os.path.isdir(d) and \ + os.path.exists(os.path.join(d, "cursors"))) + return valid + sg = build_horizontal_sizegroup() TWEAK_GROUPS = ( @@ -55,6 +80,7 @@ "Interface", GSettingsSwitchTweak("org.gnome.desktop.interface", "menus-have-icons"), GSettingsSwitchTweak("org.gnome.desktop.interface", "buttons-have-icons"), - ThemeSwitcher(size_group=sg), - IconThemeSwitcher(size_group=sg)), + GtkThemeSwitcher(size_group=sg), + IconThemeSwitcher(size_group=sg), + CursorThemeSwitcher(size_group=sg)), ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/gtweak/tweaks/tweak_nautilus.py new/gnome-tweak-tool-3.0.3/gtweak/tweaks/tweak_nautilus.py --- old/gnome-tweak-tool-3.0.0/gtweak/tweaks/tweak_nautilus.py 2011-03-24 21:57:35.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/gtweak/tweaks/tweak_nautilus.py 2011-04-27 10:10:41.000000000 +0200 @@ -17,12 +17,29 @@ from gi.repository import Gtk +import gtweak +from gtweak.utils import AutostartManager from gtweak.tweakmodel import TweakGroup from gtweak.widgets import GSettingsSwitchTweak +class DesktopIconTweak(GSettingsSwitchTweak): + def __init__(self, **options): + GSettingsSwitchTweak.__init__(self, + "org.gnome.desktop.background", + "show-desktop-icons", + **options) + + #when the user enables nautilus to draw the desktop icons, set nautilus + #to autostart + self.nautilus = AutostartManager(gtweak.DATA_DIR, "nautilus.desktop", "nautilus -n") + self.settings.connect('changed::'+self.key_name, self._on_setting_changed) + + def _on_setting_changed(self, setting, key): + self.nautilus.update_start_at_login( + self.settings.get_boolean(key)) + TWEAK_GROUPS = ( TweakGroup( "File Manager", - GSettingsSwitchTweak("org.gnome.desktop.background", "show-desktop-icons"), - GSettingsSwitchTweak("org.gnome.desktop.background", "draw-background")), + DesktopIconTweak()), ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/gtweak/tweaks/tweak_shell.py new/gnome-tweak-tool-3.0.3/gtweak/tweaks/tweak_shell.py --- old/gnome-tweak-tool-3.0.0/gtweak/tweaks/tweak_shell.py 2011-03-24 21:57:38.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/gtweak/tweaks/tweak_shell.py 2011-04-27 14:03:20.000000000 +0200 @@ -19,14 +19,16 @@ import shutil import zipfile import tempfile +import logging from gi.repository import Gtk from gi.repository import GLib +from gtweak.utils import walk_directories from gtweak.gsettings import GSettingsSetting from gtweak.gshellwrapper import GnomeShell from gtweak.tweakmodel import Tweak, TweakGroup -from gtweak.widgets import GConfComboTweak, GSettingsComboEnumTweak, GSettingsSwitchTweak, build_label_beside_widget, build_horizontal_sizegroup +from gtweak.widgets import GConfComboTweak, GSettingsComboEnumTweak, GSettingsSwitchTweak, build_label_beside_widget, build_horizontal_sizegroup, build_combo_box_text class ShowWindowButtons(GConfComboTweak): def __init__(self, **options): @@ -50,7 +52,7 @@ #self.set_width_chars(15) self.set_local_only(True) -class ThemeInstaller(Tweak): +class ShellThemeTweak(Tweak): THEME_EXT_NAME = "[email protected]" THEME_GSETTINGS_SCHEMA = "org.gnome.shell.extensions.user-theme" @@ -68,12 +70,16 @@ error = "Shell not running" try: extensions = self._shell.list_extensions() - if ThemeInstaller.THEME_EXT_NAME in extensions and extensions[ThemeInstaller.THEME_EXT_NAME]["state"] == 1: + if ShellThemeTweak.THEME_EXT_NAME in extensions and extensions[ShellThemeTweak.THEME_EXT_NAME]["state"] == 1: #check the correct gsettings key is present try: - self._settings = GSettingsSetting(ThemeInstaller.THEME_GSETTINGS_SCHEMA) - name = self._settings.get_value(ThemeInstaller.THEME_GSETTINGS_NAME) - print "!!!!", name + self._settings = GSettingsSetting(ShellThemeTweak.THEME_GSETTINGS_SCHEMA) + name = self._settings.get_value(ShellThemeTweak.THEME_GSETTINGS_NAME) + + #assume the usertheme version is that version of the shell which + #it most supports (this is a poor assumption) + self._usertheme_extension_version = max(extensions[ShellThemeTweak.THEME_EXT_NAME]["shell-version"]) + error = None except: error = "User Theme extension schema missing" @@ -91,9 +97,21 @@ self.widget_for_size_group = info else: hb = Gtk.HBox() - b = Gtk.Button.new_from_stock(Gtk.STOCK_REVERT_TO_SAVED) - b.connect("clicked", self._on_revert) - hb.pack_start(b, False, False, 5) + + #build a combo box with all the valid theme options + valid = walk_directories( (ShellThemeTweak.THEME_DIR,), lambda d: + os.path.exists(os.path.join(d, "gnome-shell")) and \ + os.path.exists(os.path.join(d, "gnome-shell", "gnome-shell.css"))) + #manually add Adwiata to represent the default + #valid.append( ("Adwiata", "") ) + + cb = build_combo_box_text( + self._settings.get_string(ShellThemeTweak.THEME_GSETTINGS_NAME), + ("", "Adwiata"), + *[(v,v) for v in valid]) + cb.connect('changed', self._on_combo_changed) + hb.pack_start(cb, False, False, 5) + self.combo = cb chooser = _ThemeZipChooser() chooser.connect("file-set", self._on_file_set) @@ -102,54 +120,74 @@ self.widget = build_label_beside_widget(self.name, hb) self.widget_for_size_group = chooser - def _extract_theme_zip(self, z, theme_name): + def _extract_theme_zip(self, z, theme_name, theme_members_path): tmp = tempfile.mkdtemp() - dest = os.path.join(ThemeInstaller.THEME_DIR, theme_name, "gnome-shell") + dest = os.path.join(ShellThemeTweak.THEME_DIR, theme_name, "gnome-shell") + + logging.info("Extracting theme %s to %s" % (theme_name, tmp)) + try: if os.path.exists(dest): shutil.rmtree(dest) z.extractall(tmp) - shutil.copytree(os.path.join(tmp, "theme"), dest) - self._settings.set_value(ThemeInstaller.THEME_GSETTINGS_NAME, theme_name) + shutil.copytree(os.path.join(tmp, theme_members_path), dest) + return theme_name except OSError: self.notify_error("Error installing theme") - - def _shell_reload_theme(self): - #reloading the theme works OK, however there are some problems with reloading images. - #https://bugzilla.gnome.org/show_bug.cgi?id=644125 - #however, smashing the whole shell just to change themes is pretty extreme. So we - #just let the user-theme extension pick up the change by itself - # - #self._shell.reload_theme() - #self.notify_action_required( - # "The shell must be restarted to apply the theme", - # "Restart", - # lambda: self._shell.restart()) - pass + return None def _on_file_set(self, chooser): f = chooser.get_filename() with zipfile.ZipFile(f, 'r') as z: try: - #check this looks like a valid theme - info = z.getinfo('theme/gnome-shell.css') - #the theme name is the filename, for the moment - self._extract_theme_zip( - z, - os.path.splitext(os.path.basename(f))[0]) - self._shell_reload_theme() - except KeyError: + fragment = () + for n in z.namelist(): + if n.endswith("gnome-shell.css"): + fragment = n.split("/")[0:-1] + break + + if not fragment: + raise Exception("Could not find gnome-shell.css") + + #old style themes name was taken from the zip name + if fragment[0] == "theme" and len(fragment) == 1: + theme_name = os.path.basename(f) + else: + theme_name = fragment[0] + theme_members_path = "/".join(fragment) + + installed_name = self._extract_theme_zip( + z, + theme_name, + theme_members_path) + if installed_name: + print self.combo.get_model().append( (installed_name, installed_name) ) + + except: #does not look like a valid theme self.notify_error("Invalid theme file") #set button back to default state chooser.unselect_all() - def _on_revert(self, btn): - self._settings.set_value(ThemeInstaller.THEME_GSETTINGS_NAME, "") - self._shell_reload_theme() - + def _on_combo_changed(self, combo): + val = combo.get_model().get_value(combo.get_active_iter(), 0) + self._settings.set_value(ShellThemeTweak.THEME_GSETTINGS_NAME, val) + #reloading the theme is not really necessary, the user-theme should pick + #pick up the change. + # + #however there are some problems with reloading images. + #https://bugzilla.gnome.org/show_bug.cgi?id=644125 + # + #resetting to the default theme is also fucked + #https://bugzilla.gnome.org/show_bug.cgi?id=647386 + if not val: + if self._usertheme_extension_version < "3.0.2": + self.notify_action_required( + "The shell must be restarted to apply the theme", + "Restart", + lambda: self._shell.restart()) sg = build_horizontal_sizegroup() @@ -157,8 +195,9 @@ TweakGroup( "Shell", GSettingsSwitchTweak("org.gnome.shell.clock", "show-date", schema_filename="org.gnome.shell.gschema.xml"), + GSettingsSwitchTweak("org.gnome.shell.calendar", "show-weekdate", schema_filename="org.gnome.shell.gschema.xml"), ShowWindowButtons(size_group=sg), - ThemeInstaller(size_group=sg), + ShellThemeTweak(size_group=sg), GSettingsComboEnumTweak("org.gnome.settings-daemon.plugins.power", "lid-close-battery-action", size_group=sg), GSettingsComboEnumTweak("org.gnome.settings-daemon.plugins.power", "lid-close-ac-action", size_group=sg)), ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/gtweak/tweaks/tweak_windows.py new/gnome-tweak-tool-3.0.3/gtweak/tweaks/tweak_windows.py --- old/gnome-tweak-tool-3.0.0/gtweak/tweaks/tweak_windows.py 2011-03-24 21:57:45.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/gtweak/tweaks/tweak_windows.py 2011-04-27 10:10:42.000000000 +0200 @@ -15,8 +15,13 @@ # You should have received a copy of the GNU General Public License # along with gnome-tweak-tool. If not, see <http://www.gnu.org/licenses/>. +import os.path + +import gtweak +from gtweak.utils import walk_directories from gtweak.tweakmodel import TweakGroup from gtweak.widgets import GConfComboTweak, build_horizontal_sizegroup +from gtweak.gconf import GConfSetting class ActionClickTitlebarTweak(GConfComboTweak): def __init__(self, key_name, **options): @@ -31,11 +36,39 @@ [(o, o.replace("_"," ").title()) for o in schema_options], **options) +class WindowThemeSwitcher(GConfComboTweak): + def __init__(self, **options): + GConfComboTweak.__init__(self, + "/desktop/gnome/shell/windows/theme", + str, + [(t, t) for t in self._get_valid_themes()], + **options) + + #also need to change the fallback (metacity) window theme + self.gconf_metacity = GConfSetting("/apps/metacity/general/theme", str) + + def _get_valid_themes(self): + dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), + os.path.join(os.path.expanduser("~"), ".themes")) + valid = walk_directories(dirs, lambda d: + os.path.exists(os.path.join(d, "metacity-1"))) + return valid + + def _on_combo_changed(self, combo): + #its probbably not too nice to dupe this function here, but i'm lazy + #and the real cause is the hidious gconf/shell/metacity override business + _iter = combo.get_active_iter() + if _iter: + value = combo.get_model().get_value(_iter, 0) + self.gconf.set_value(value) + self.gconf_metacity.set_value(value) + sg = build_horizontal_sizegroup() TWEAK_GROUPS = ( TweakGroup( "Windows", + WindowThemeSwitcher(size_group=sg), ActionClickTitlebarTweak("/apps/metacity/general/action_double_click_titlebar", size_group=sg), ActionClickTitlebarTweak("/apps/metacity/general/action_middle_click_titlebar", size_group=sg), ActionClickTitlebarTweak("/apps/metacity/general/action_right_click_titlebar", size_group=sg)), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/gtweak/utils.py new/gnome-tweak-tool-3.0.3/gtweak/utils.py --- old/gnome-tweak-tool-3.0.0/gtweak/utils.py 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/gtweak/utils.py 2011-04-27 10:24:25.000000000 +0200 @@ -0,0 +1,81 @@ +# This file is part of gnome-tweak-tool. +# +# Copyright (c) 2011 John Stowers +# +# gnome-tweak-tool is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# gnome-tweak-tool is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with gnome-tweak-tool. If not, see <http://www.gnu.org/licenses/>. + +import os.path +import logging + +from gi.repository import GLib + +def walk_directories(dirs, filter_func): + valid = [] + try: + for thdir in dirs: + if os.path.isdir(thdir): + for t in os.listdir(thdir): + if filter_func(os.path.join(thdir, t)): + valid.append(t) + except: + logging.critical("Error parsing directories", exc_info=True) + return valid + +class AutostartManager: + def __init__(self, DATA_DIR, desktop_filename, exec_cmd="", extra_exec_args=""): + self._desktop_filename = desktop_filename + self._desktop_file = os.path.join(DATA_DIR, "applications", desktop_filename) + self._autostart_file = os.path.join( + GLib.get_user_config_dir(), "autostart", desktop_filename) + self._exec_cmd = exec_cmd + self._extra_exec_args = " %s\n" % extra_exec_args + + def is_start_at_login_enabled(self): + if os.path.exists(self._autostart_file): + #if it contains X-GNOME-Autostart-enabled=false then it has + #has been disabled by the user in the session applet, otherwise + #it is enabled + return open(self._autostart_file).read().find("X-GNOME-Autostart-enabled=false") == -1 + else: + return False + + def update_start_at_login(self, update): + logging.debug("Updating autostart %s -> %s" % (self._desktop_filename, update)) + + if os.path.exists(self._autostart_file): + logging.info("Removing autostart %s" % self._autostart_file) + os.remove(self._autostart_file) + + if update: + if not os.path.exists(self._desktop_file): + logging.critical("Could not find desktop file: %s" % self._desktop_file) + return + + logging.info("Adding autostart %s" % self._autostart_file) + #copy the original file to the new file, but add the extra exec args + old = open(self._desktop_file, "r") + new = open(self._autostart_file, "w") + + for l in old.readlines(): + if l.startswith("Exec="): + if self._exec_cmd: + new.write("Exec=%s\n" % self._exec_cmd) + else: + new.write(l[0:-1]) + new.write(self._extra_exec_args) + else: + new.write(l) + + old.close() + new.close() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/gtweak/widgets.py new/gnome-tweak-tool-3.0.3/gtweak/widgets.py --- old/gnome-tweak-tool-3.0.0/gtweak/widgets.py 2011-03-24 21:57:23.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/gtweak/widgets.py 2011-04-27 13:19:08.000000000 +0200 @@ -31,6 +31,10 @@ return hbox def build_combo_box_text(selected, *values): + """ + builds a GtkComboBox and model containing the supplied values. + @values: a list of 2-tuples (value, name) + """ store = Gtk.ListStore(str, str) selected_iter = None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/po/ChangeLog new/gnome-tweak-tool-3.0.3/po/ChangeLog --- old/gnome-tweak-tool-3.0.0/po/ChangeLog 2011-03-30 22:15:34.000000000 +0200 +++ new/gnome-tweak-tool-3.0.3/po/ChangeLog 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -2011-03-31 gettextize <[email protected]> - - * Makefile.in.in: Upgrade to gettext-0.18.1. - * Rules-quot: Upgrade to gettext-0.18.1. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/po/LINGUAS new/gnome-tweak-tool-3.0.3/po/LINGUAS --- old/gnome-tweak-tool-3.0.0/po/LINGUAS 2011-04-01 12:10:44.000000000 +0200 +++ new/gnome-tweak-tool-3.0.3/po/LINGUAS 2011-04-27 10:10:41.000000000 +0200 @@ -1,3 +1,14 @@ cs +da +de +es +ja +lv nb +pl pt +pt_BR +sl +sv +vi +zh_CN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/po/da.po new/gnome-tweak-tool-3.0.3/po/da.po --- old/gnome-tweak-tool-3.0.0/po/da.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/da.po 2011-04-26 23:06:12.000000000 +0200 @@ -0,0 +1,34 @@ +# Danish translation for gnome-tweak-tool. +# Copyright (C) 2011 gnome-tweak-tool's COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-tweak-tool package. +# Kris Thomsen <[email protected]>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-tweak-tool master\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-04-06 22:31+0200\n" +"PO-Revision-Date: 2011-04-02 14:28+0000\n" +"Last-Translator: Kris Thomsen <[email protected]>\n" +"Language-Team: Danish <[email protected]>\n" +"Language: da\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "Tilpasningsværktøj" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "tilpasninger" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "velkommen" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "Tilpas avancerede indstillinger" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/po/de.po new/gnome-tweak-tool-3.0.3/po/de.po --- old/gnome-tweak-tool-3.0.0/po/de.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/de.po 2011-04-26 23:06:12.000000000 +0200 @@ -0,0 +1,35 @@ +# German translation for gnome-tweak-tool. +# Copyright (C) 2011 gnome-tweak-tool's COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-tweak-tool package. +# +# Christian Kirbach <[email protected]>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-tweak-tool master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"tweak-tool&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-04-05 12:30+0000\n" +"PO-Revision-Date: 2011-04-06 16:14+0100\n" +"Last-Translator: Christian Kirbach <[email protected]>\n" +"Language-Team: German <[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" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "Optimierungs-Werkzeug" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "Optimierungen" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "Willkommen" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "Erweiterte Einstellungen optimieren" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/po/es.po new/gnome-tweak-tool-3.0.3/po/es.po --- old/gnome-tweak-tool-3.0.0/po/es.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/es.po 2011-04-26 23:06:12.000000000 +0200 @@ -0,0 +1,34 @@ +# Spanish translation for gnome-tweak-tool. +# Copyright (C) 2011 gnome-tweak-tool's COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-tweak-tool package. +# Jorge González <[email protected]>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-tweak-tool master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"tweak-tool&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-04-23 15:21+0000\n" +"PO-Revision-Date: 2011-04-24 11:11+0200\n" +"Last-Translator: Jorge González <[email protected]>\n" +"Language-Team: Español <[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" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "Herramienta de retoques" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "retoques" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "bienvenido" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "Ajustes de retoques avanzados" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/po/ja.po new/gnome-tweak-tool-3.0.3/po/ja.po --- old/gnome-tweak-tool-3.0.0/po/ja.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/ja.po 2011-04-26 23:06:12.000000000 +0200 @@ -0,0 +1,33 @@ +# gnome-tweak-tool ja.po. +# Copyright (C) 2011 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-tweak-tool package. +# Takeshi AIHANA <[email protected]>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-tweak-tool master\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-04-02 20:20+0900\n" +"PO-Revision-Date: 2011-04-02 20:19+0900\n" +"Last-Translator: Takeshi AIHANA <[email protected]>\n" +"Language-Team: Japanese <[email protected]>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "カスタマイズ・ツール" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "tweaks" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "welcome" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "高度な設定のカスタマイズ" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/po/lv.po new/gnome-tweak-tool-3.0.3/po/lv.po --- old/gnome-tweak-tool-3.0.0/po/lv.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/lv.po 2011-04-26 23:06:12.000000000 +0200 @@ -0,0 +1,36 @@ +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Rūdofls Mazurs <[email protected]>, 2011. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." +"cgi?product=gnome-tweak-tool&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-04-12 19:55+0000\n" +"PO-Revision-Date: 2011-04-18 20:57+0300\n" +"Last-Translator: Rūdofls Mazurs <[email protected]>\n" +"Language-Team: Latvian <[email protected]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.1\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " +"2);\n" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "Piedares rīks" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "piedares" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "laipni lūdzam" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "Piedares paplašinātie iestatījumi" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/po/pl.po new/gnome-tweak-tool-3.0.3/po/pl.po --- old/gnome-tweak-tool-3.0.0/po/pl.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/pl.po 2011-04-26 23:06:12.000000000 +0200 @@ -0,0 +1,38 @@ +# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +# Aviary.pl +# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz +# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: +# [email protected] +# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +msgid "" +msgstr "" +"Project-Id-Version: gnome-tweak-tool\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-04-04 08:21+0200\n" +"PO-Revision-Date: 2011-04-04 08:22+0200\n" +"Last-Translator: Piotr Drąg <[email protected]>\n" +"Language-Team: Polish <[email protected]>\n" +"Language: pl\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==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" +"X-Poedit-Language: Polish\n" +"X-Poedit-Country: Poland\n" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "Narzędzie dostrajania" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "dostrajanie" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "witamy" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "Dostrajanie zaawansowanych ustawień" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/po/pt_BR.po new/gnome-tweak-tool-3.0.3/po/pt_BR.po --- old/gnome-tweak-tool-3.0.0/po/pt_BR.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/pt_BR.po 2011-04-26 23:06:12.000000000 +0200 @@ -0,0 +1,34 @@ +# Brazilian Portuguese translation for gnome-tweak-tool. +# Copyright (C) 2011 gnome-tweak-tool's COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-tweak-tool package. +# Rodrigo Padula <[email protected]>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-tweak-tool master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"tweak-tool&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-04-04 11:34+0000\n" +"PO-Revision-Date: 2011-04-05 02:37-0300\n" +"Last-Translator: Rodrigo Padula de Oliveira <[email protected]>\n" +"Language-Team: Brazilian Portuguese <[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" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "Ferramenta de Ajuste" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "ajustes" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "bem-vindo" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "Ajuste avançado de configurações" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/po/sl.po new/gnome-tweak-tool-3.0.3/po/sl.po --- old/gnome-tweak-tool-3.0.0/po/sl.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/sl.po 2011-04-26 23:06:12.000000000 +0200 @@ -0,0 +1,39 @@ +# Slovenian translation for gnome-tweak-tool. +# Copyright (C) 2011 gnome-tweak-tool's COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-tweak-tool package. +# +# Matej Urbančič <[email protected]>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-tweak-tool master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"tweak-tool&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-31 23:48+0000\n" +"PO-Revision-Date: 2011-03-31 23:48+0000\n" +"Last-Translator: Matej Urbančič <[email protected]>\n" +"Language-Team: Slovenian GNOME Translation Team <[email protected]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: \n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n" +"X-Poedit-Language: Slovenian\n" +"X-Poedit-Country: SLOVENIA\n" +"X-Poedit-SourceCharset: utf-8\n" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "Orodje za prilagajanje" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "prilagoditve" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "dobrodošli" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "Napredne nastavitve prilagajanja" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/po/sv.po new/gnome-tweak-tool-3.0.3/po/sv.po --- old/gnome-tweak-tool-3.0.0/po/sv.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/sv.po 2011-04-26 23:06:12.000000000 +0200 @@ -0,0 +1,34 @@ +# Swedish translation for gnome-tweak-tool. +# Copyright (C) 2011 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-tweak-tool package. +# Daniel Nylander <[email protected]>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-tweak-tool\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-04-02 16:26+0200\n" +"PO-Revision-Date: 2011-04-02 16:28+0100\n" +"Last-Translator: Daniel Nylander <[email protected]>\n" +"Language-Team: Swedish <[email protected]>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "Justeringsverktyg" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "justeringar" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "välkommen" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "Justera avancerade inställningar" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/po/vi.po new/gnome-tweak-tool-3.0.3/po/vi.po --- old/gnome-tweak-tool-3.0.0/po/vi.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/vi.po 2011-04-26 23:06:12.000000000 +0200 @@ -0,0 +1,34 @@ +# Vietnamese translation for gnome-tweak-tool. +# Copyright (C) 2011 gnome-tweak-tool's COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-tweak-tool package. +# Lê Trường An <[email protected]>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-tweak-tool master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-tweak-tool&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-04-10 08:05+0000\n" +"PO-Revision-Date: 2011-04-12 08:53+0700\n" +"Last-Translator: Lê Trường An <[email protected]>\n" +"Language-Team: Vietnamese <[email protected]>\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" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "Công cụ tinh chỉnh" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "tinh chỉnh" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "chào mừng" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "Tinh chỉnh các thiết lập nâng cao" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/po/zh_CN.po new/gnome-tweak-tool-3.0.3/po/zh_CN.po --- old/gnome-tweak-tool-3.0.0/po/zh_CN.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/zh_CN.po 2011-04-11 12:41:17.000000000 +0200 @@ -0,0 +1,33 @@ +# Chinese (China) translation for gnome-tweak-tool. +# Copyright (C) 2011 gnome-tweak-tool's COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-tweak-tool package. +# Yinghua_Wang <[email protected]>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-tweak-tool master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"tweak-tool&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-04-04 06:22+0000\n" +"PO-Revision-Date: 2011-04-04 18:25+0800\n" +"Last-Translator: Yinghua Wang <[email protected]>\n" +"Language-Team: Chinese (China) <[email protected]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "优化工具" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "优化" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "欢迎" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "优化高级设置" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
