diff -Nru gsettings-desktop-schemas-3.1.91/aclocal.m4 gsettings-desktop-schemas-3.1.92/aclocal.m4
--- gsettings-desktop-schemas-3.1.91/aclocal.m4 2011-09-05 17:03:15.000000000 +0000
+++ gsettings-desktop-schemas-3.1.92/aclocal.m4 2011-09-19 12:37:14.000000000 +0000
@@ -1077,8 +1077,7 @@
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@@ -1124,8 +1123,7 @@
pkg_cv_[]$1="$$1"
elif test -n "$PKG_CONFIG"; then
PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes ],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
[pkg_failed=yes])
else
pkg_failed=untried
@@ -1173,9 +1171,9 @@
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -1188,7 +1186,7 @@
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-_PKG_TEXT])[]dnl
+_PKG_TEXT])
])
elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
@@ -1199,7 +1197,7 @@
_PKG_TEXT
-To get pkg-config, see .])[]dnl
+To get pkg-config, see .])
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
diff -Nru gsettings-desktop-schemas-3.1.91/configure gsettings-desktop-schemas-3.1.92/configure
--- gsettings-desktop-schemas-3.1.91/configure 2011-09-05 17:03:15.000000000 +0000
+++ gsettings-desktop-schemas-3.1.92/configure 2011-09-19 12:37:15.000000000 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for gsettings-desktop-schemas 3.1.91.
+# Generated by GNU Autoconf 2.68 for gsettings-desktop-schemas 3.1.92.
#
# Report bugs to .
#
@@ -561,8 +561,8 @@
# Identity of this package.
PACKAGE_NAME='gsettings-desktop-schemas'
PACKAGE_TARNAME='gsettings-desktop-schemas'
-PACKAGE_VERSION='3.1.91'
-PACKAGE_STRING='gsettings-desktop-schemas 3.1.91'
+PACKAGE_VERSION='3.1.92'
+PACKAGE_STRING='gsettings-desktop-schemas 3.1.92'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas'
PACKAGE_URL=''
@@ -1305,7 +1305,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 gsettings-desktop-schemas 3.1.91 to adapt to many kinds of systems.
+\`configure' configures gsettings-desktop-schemas 3.1.92 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1372,7 +1372,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gsettings-desktop-schemas 3.1.91:";;
+ short | recursive ) echo "Configuration of gsettings-desktop-schemas 3.1.92:";;
esac
cat <<\_ACEOF
@@ -1382,7 +1382,7 @@
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-silent-rules less verbose build output (undo: `make V=1')
--disable-silent-rules verbose build output (undo: `make V=0')
- --enable-maintainer-mode enable make rules and dependencies not useful
+ --disable-maintainer-mode disable make rules and dependencies not useful
(and sometimes confusing) to the casual installer
--disable-schemas-compile
Disable regeneration of gschemas.compiled on install
@@ -1471,7 +1471,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gsettings-desktop-schemas configure 3.1.91
+gsettings-desktop-schemas configure 3.1.92
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1840,7 +1840,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gsettings-desktop-schemas $as_me 3.1.91, which was
+It was created by gsettings-desktop-schemas $as_me 3.1.92, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2656,7 +2656,7 @@
# Define the identity of the package.
PACKAGE='gsettings-desktop-schemas'
- VERSION='3.1.91'
+ VERSION='3.1.92'
cat >>confdefs.h <<_ACEOF
@@ -2711,13 +2711,13 @@
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to disable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then :
enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
else
- USE_MAINTAINER_MODE=no
+ USE_MAINTAINER_MODE=yes
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
@@ -2822,7 +2822,6 @@
-
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -6259,7 +6258,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gsettings-desktop-schemas $as_me 3.1.91, which was
+This file was extended by gsettings-desktop-schemas $as_me 3.1.92, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6316,7 +6315,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gsettings-desktop-schemas config.status 3.1.91
+gsettings-desktop-schemas config.status 3.1.92
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -Nru gsettings-desktop-schemas-3.1.91/configure.ac gsettings-desktop-schemas-3.1.92/configure.ac
--- gsettings-desktop-schemas-3.1.91/configure.ac 2011-09-05 17:02:28.000000000 +0000
+++ gsettings-desktop-schemas-3.1.92/configure.ac 2011-09-19 11:07:29.000000000 +0000
@@ -1,12 +1,12 @@
AC_PREREQ(2.53)
-AC_INIT([gsettings-desktop-schemas], [3.1.91],
+AC_INIT([gsettings-desktop-schemas], [3.1.92],
[http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas])
AC_CONFIG_SRCDIR(schemas/org.gnome.desktop.default-applications.gschema.xml.in.in)
AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_MACRO_DIR([m4])
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE([enable])
AC_PROG_SED
diff -Nru gsettings-desktop-schemas-3.1.91/debian/changelog gsettings-desktop-schemas-3.1.92/debian/changelog
--- gsettings-desktop-schemas-3.1.91/debian/changelog 2011-09-06 09:11:32.000000000 +0000
+++ gsettings-desktop-schemas-3.1.92/debian/changelog 2011-09-19 13:22:49.000000000 +0000
@@ -1,3 +1,12 @@
+gsettings-desktop-schemas (3.1.92-0ubuntu1) oneiric; urgency=low
+
+ * New upstream version
+ - Don't migrate the icon-theme from GConf
+ * debian/patches/dont_reset_themes.patch:
+ - don't skip the themes migration we don't want to drop those settings
+
+ -- Sebastien Bacher Mon, 19 Sep 2011 15:05:52 +0200
+
gsettings-desktop-schemas (3.1.91-0ubuntu1) oneiric; urgency=low
* New upstream release.
diff -Nru gsettings-desktop-schemas-3.1.91/debian/patches/dont_reset_themes.patch gsettings-desktop-schemas-3.1.92/debian/patches/dont_reset_themes.patch
--- gsettings-desktop-schemas-3.1.91/debian/patches/dont_reset_themes.patch 1970-01-01 00:00:00.000000000 +0000
+++ gsettings-desktop-schemas-3.1.92/debian/patches/dont_reset_themes.patch 2011-09-19 13:20:34.000000000 +0000
@@ -0,0 +1,32 @@
+Index: gsettings-desktop-schemas-3.1.92/schemas/gsettings-desktop-schemas.convert
+===================================================================
+--- gsettings-desktop-schemas-3.1.92.orig/schemas/gsettings-desktop-schemas.convert 2011-09-19 15:19:45.427701474 +0200
++++ gsettings-desktop-schemas-3.1.92/schemas/gsettings-desktop-schemas.convert 2011-09-19 15:20:14.367702574 +0200
+@@ -42,13 +42,11 @@
+ # https://bugzilla.gnome.org/show_bug.cgi?id=634639
+ # cursor-blink = /desktop/gnome/interface/cursor_blink
+ cursor-blink-time = /desktop/gnome/interface/cursor_blink_time
+-# Disabled as we want users to use the new theme by default
+-#icon-theme = /desktop/gnome/interface/icon_theme
+-#gtk-theme = /desktop/gnome/interface/gtk_theme
+-#cursor-theme = /desktop/gnome/peripherals/mouse/cursor_theme
++icon-theme = /desktop/gnome/interface/icon_theme
++gtk-theme = /desktop/gnome/interface/gtk_theme
++cursor-theme = /desktop/gnome/peripherals/mouse/cursor_theme
+ gtk-key-theme = /desktop/gnome/interface/gtk_key_theme
+-# Disabled as we want users to use the new theme by default
+-#font-name = /desktop/gnome/interface/font_name
++font-name = /desktop/gnome/interface/font_name
+ gtk-im-preedit-style = /desktop/gnome/interface/gtk-im-preedit-style
+ gtk-im-status-style = /desktop/gnome/interface/gtk-im-status-style
+ gtk-im-module = /desktop/gnome/interface/gtk-im-module
+@@ -59,8 +57,7 @@
+ show-unicode-menu = /desktop/gnome/interface/show_unicode_menu
+ cursor-size = /desktop/gnome/peripherals/mouse/cursor_size
+ gtk-color-palette = /desktop/gnome/gtk-color-palette
+-# Disabled as we want users to use the default new theme colors
+-#gtk-color-scheme = /desktop/gnome/interface/gtk_color_scheme
++gtk-color-scheme = /desktop/gnome/interface/gtk_color_scheme
+
+ # From org.gnome.desktop.lockdown.gschema.xml
+ [org.gnome.desktop.lockdown]
diff -Nru gsettings-desktop-schemas-3.1.91/debian/patches/series gsettings-desktop-schemas-3.1.92/debian/patches/series
--- gsettings-desktop-schemas-3.1.91/debian/patches/series 2011-09-06 09:10:25.000000000 +0000
+++ gsettings-desktop-schemas-3.1.92/debian/patches/series 2011-09-19 13:23:02.000000000 +0000
@@ -1,2 +1,3 @@
01_migrate_background.patch
+dont_reset_themes.patch
diff -Nru gsettings-desktop-schemas-3.1.91/NEWS gsettings-desktop-schemas-3.1.92/NEWS
--- gsettings-desktop-schemas-3.1.91/NEWS 2011-09-05 17:02:16.000000000 +0000
+++ gsettings-desktop-schemas-3.1.92/NEWS 2011-09-19 12:36:52.000000000 +0000
@@ -1,3 +1,10 @@
+Major changes in 3.1.92
+=======================
+
+* Enable maintainer mode by default
+* Don't migrate the icon-theme from GConf
+* Updated translations
+
Major changes in 3.1.91
=======================
diff -Nru gsettings-desktop-schemas-3.1.91/po/cs.po gsettings-desktop-schemas-3.1.92/po/cs.po
--- gsettings-desktop-schemas-3.1.91/po/cs.po 2011-07-24 12:32:54.000000000 +0000
+++ gsettings-desktop-schemas-3.1.92/po/cs.po 2011-09-19 11:07:29.000000000 +0000
@@ -9,8 +9,8 @@
"Project-Id-Version: gsettings-desktop-schemas master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=gsettings-desktop-schemas&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-06-22 15:04+0000\n"
-"PO-Revision-Date: 2011-07-10 09:56+0200\n"
+"POT-Creation-Date: 2011-09-02 18:18+0000\n"
+"PO-Revision-Date: 2011-09-11 11:44+0200\n"
"Last-Translator: Marek Černocký \n"
"Language-Team: Czech \n"
"MIME-Version: 1.0\n"
@@ -217,9 +217,6 @@
msgstr "Barva nitkového kříže"
#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:3
-#| msgid ""
-#| "Determines the length of the vertical and horizontal lines that make up "
-#| "the crosshairs."
msgid ""
"Determines the length in pixels of the vertical and horizontal lines that "
"make up the crosshairs."
@@ -284,7 +281,6 @@
"v lupě."
#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:10
-#| msgid "Length of the crosshairs"
msgid "Length of the crosshairs in pixels"
msgstr "Délka nitkového kříže v pixelech"
@@ -335,7 +331,6 @@
"dvojnásobnou velikost."
#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:20
-#| msgid "Thickness of the crosshairs"
msgid "Thickness of the crosshairs in pixels"
msgstr "Tloušťka nitkového kříže v pixelech"
@@ -348,8 +343,6 @@
"přesouvat se s ním."
#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:22
-#| msgid ""
-#| "Width of the vertical and horizontal lines that make up the crosshairs."
msgid ""
"Width in pixels of the vertical and horizontal lines that make up the "
"crosshairs."
@@ -692,73 +685,81 @@
msgstr "Motiv ikon pro použití v panelu, aplikaci Nautilus atd."
#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:24
+msgid "If true, display date in the clock, in addition to time."
+msgstr "Když je zapnuto, zobrazuje se na hodinách kromě času i datum."
+
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:25
+msgid "If true, display seconds in the clock."
+msgstr "Když je zapnuto, zobrazují se na hodinách sekundy."
+
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:26
msgid "Keyboard shortcut to open the menu bars."
msgstr "Klávesová zkratka pro otevírání lišt nabídek."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:25
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:27
msgid "Length of the cursor blink cycle, in milliseconds."
msgstr "Délka cyklu blikání kurzoru, v milisekundách"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:26
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:28
msgid "List of symbolic names and color equivalents"
msgstr "Seznam symbolických názvů a ekvivalentů barev"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:27
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:29
msgid "Menubar Detachable"
msgstr "Odpojitelná lišta nabídek"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:28
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:30
msgid "Menubar accelerator"
msgstr "Klávesová zkratka lišty nabídek"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:29
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:31
msgid "Menus Have Icons"
msgstr "Nabídky mají ikony"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:30
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:32
msgid "Menus Have Tearoff"
msgstr "Nabídky mají úchyt"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:31
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:33
msgid "Monospace font"
msgstr "Písmo s pevnou šířkou"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:32
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:34
msgid ""
"Name of a monospaced (fixed-width) font for use in locations like terminals."
msgstr ""
"Název písma s pevnou šířkou (monospaced) pro použití v místech jako jsou "
"terminály."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:33
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:35
msgid "Name of the GTK+ input method Preedit Style used by gtk+."
msgstr "Název přípravného stylu vstupní metody GTK+ použitého gtk+."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:34
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:36
msgid "Name of the GTK+ input method Status Style used by gtk+."
msgstr "Název stavového stylu vstupní metody GTK+ použitého gtk+."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:35
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:37
msgid "Name of the default font used by gtk+."
msgstr "Název výchozího písma použitého gtk+."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:36
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:38
msgid "Name of the default font used for reading documents."
msgstr "Název výchozího písma použitého pro čtení dokumentů."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:37
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:39
msgid "Name of the input method module used by GTK+."
msgstr "Název modulu vstupní metody použitého GTK+."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:38
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:40
msgid "Only show mnemonics on when the Alt key is pressed"
msgstr "Zobrazovat mnemotechnické klávesy jen při zmáčknutí Alt"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:39
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:41
msgid "Palette used in the color selector"
msgstr "Paleta použitá ve výběru barvy"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:40
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:42
msgid ""
"Palette used in the color selector as defined by the 'gtk-color-palette' "
"setting"
@@ -766,40 +767,44 @@
"Paleta použitá ve výběru barvy, tak jak je definována v nastavení „gtk-color-"
"palette“."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:41
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:43
+msgid "Show date in clock"
+msgstr "Zobrazovat na hodinách datum"
+
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:44
msgid "Show the 'Input Methods' menu"
msgstr "Zobrazovat nabídku „Vstupní metody“"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:42
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:45
msgid "Show the 'Unicode Control Character' menu"
msgstr "Zobrazovat nabídku „Vložit řídící znak Unikódu“"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:43
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:46
msgid "Size of icons in toolbars, either \"small\" or \"large\"."
msgstr ""
"Velikost ikon v lištách nástrojů, buďto „small“ (malé) nebo „large“ (velké)"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:44
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:47
msgid "Size of the cursor used as cursor theme."
msgstr "Velikost kurzoru použitého jako motiv kurzoru."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:45
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:48
msgid "Text scaling factor"
msgstr "Faktor škálování textu"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:46
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:49
msgid "Time after which the cursor stops blinking, in seconds."
msgstr "Čas, po kterém přestane kurzor blikat, v milisekundách."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:47
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:50
msgid "Timeout before click repeat"
msgstr "Časový limit, než se začne kliknutí opakovat"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:48
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:51
msgid "Timeout between click repeats"
msgstr "Časový limit mezi opakováním kliknutí"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:49
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:52
msgid ""
"Timeout in milliseconds before a click starts repeating (on spinner buttons "
"for example)."
@@ -807,7 +812,7 @@
"Časový limit v milisekundách, než se začne kliknutí opakovat (například u "
"tlačítka číselníku)."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:50
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:53
msgid ""
"Timeout in milliseconds between repeated clicks when a button is left "
"pressed."
@@ -815,19 +820,19 @@
"Časový limit v milisekundách mezi opakováním kliknutí, když je zmáčknuto "
"levým tlačítkem."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:51
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:54
msgid "Toolbar Detachable"
msgstr "Odpojitelná lišta nástrojů"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:52
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:55
msgid "Toolbar Icon Size"
msgstr "Velikost ikon v liště nástrojů"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:53
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:56
msgid "Toolbar Style"
msgstr "Styl lišty nástrojů"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:54
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:57
msgid ""
"Toolbar Style. Valid values are \"both\", \"both-horiz\", \"icons\", and "
"\"text\"."
@@ -835,7 +840,7 @@
"Styl lišty nástrojů. Platné hodnoty jsou „both“ (ikony i text), „both-"
"horiz“ (ikony i text vodorovně), „icons“ (jen ikony) a „text“ (jen text)."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:55
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:58
msgid ""
"Whether animations should be displayed. Note: This is a global key, it "
"changes the behaviour of the window manager, the panel etc."
@@ -843,19 +848,19 @@
"Zda se mají zobrazovat animace. Poznámka: Jedná se o globální klíč, jeho "
"změna ovlivní chování okenního správce, panelu atd."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:56
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:59
msgid "Whether buttons may display an icon in addition to the button text."
msgstr "Zda tlačítka mohou navíc vedle textu zobrazovat ikonu."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:57
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:60
msgid "Whether menus may display an icon next to a menu entry."
msgstr "Zda mohou nabídky vedle položek zobrazovat ikonu."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:58
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:61
msgid "Whether menus should have a tearoff."
msgstr "Zda by nabídky měli mít položky pro odpojení."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:59
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:62
msgid ""
"Whether mnemonics should be automatically shown and hidden when the user "
"presses the Alt key."
@@ -863,11 +868,16 @@
"Zda se mají mnemotechnické klávesy automaticky zobrazovat a skrývat podle "
"toho, jak uživatel mačká klávesu Alt."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:60
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:63
msgid "Whether the clock displays in 24h or 12h format"
msgstr "Zda hodiny zobrazovat ve 24hodinovém nebo 12hodinovém formátu."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:61
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:64
+#| msgid "Whether the cursor should blink."
+msgid "Whether the clock shows seconds"
+msgstr "Zda by měly hodiny zobrazovat sekundy"
+
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:65
msgid ""
"Whether the context menus of entries and text views should offer to change "
"the input method."
@@ -875,7 +885,7 @@
"Zda by měla kontextová nabídka vstupů a zobrazení textu nabízet změnu "
"vstupní metody."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:62
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:66
msgid ""
"Whether the context menus of entries and text views should offer to insert "
"control characters."
@@ -883,19 +893,19 @@
"Zda by měla kontextová nabídka vstupů a zobrazení textu nabízet vložení "
"řídících znaků."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:63
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:67
msgid "Whether the cursor should blink."
msgstr "Zda by měl kurzor blikat."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:64
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:68
msgid "Whether the user can detach menubars and move them around."
msgstr "Zda uživatel může odpojit lištu nabídek a posouvat si ji dokola."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:65
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:69
msgid "Whether the user can detach toolbars and move them around."
msgstr "Zda uživatel může odpojit lištu nástrojů a posouvat si ji dokola."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:66
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:70
msgid ""
"Whether the user can dynamically type a new accelerator when positioned over "
"an active menuitem."
@@ -903,7 +913,7 @@
"Zda uživatel může dynamicky zapisovat novou klávesovou zkratku přes aktivní "
"položku nabídky."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:67
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:71
msgid "Whether toolkits should load accessibility related modules."
msgstr "Zda by sady nástrojů měly načíst moduly vztahující se ke zpřístupnění."
@@ -1177,18 +1187,11 @@
"efekt pouze pokud je klíč „logout_enable“ nastaven na ZAPNUTO."
#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:17
-#| msgid ""
-#| "The number of minutes after screensaver activation before locking the "
-#| "screen."
msgid ""
"The number of seconds after screensaver activation before locking the screen."
msgstr "Počet sekund od aktivace šetřiče obrazovky po zamknutí obrazovky."
#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:18
-#| msgid ""
-#| "The number of minutes after the screensaver activation before a logout "
-#| "option will appear in the unlock dialog. This key has effect only if the "
-#| "\"logout_enable\" key is set to TRUE."
msgid ""
"The number of seconds after the screensaver activation before a logout "
"option will appear in the unlock dialog. This key has effect only if the "
@@ -1207,8 +1210,6 @@
msgstr "Čas do možnosti odhlášení"
#: ../schemas/org.gnome.desktop.session.gschema.xml.in.in.h:1
-#| msgid ""
-#| "The number of minutes of inactivity before the session is considered idle."
msgid ""
"The number of seconds of inactivity before the session is considered idle."
msgstr "Počet sekund neaktivity, po kterých je sezení považováno za nečinné."
@@ -1304,96 +1305,117 @@
msgstr "Adresa URL automatického nastavení proxy"
#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:3
-msgid "Enables the proxy settings when accessing HTTP over the Internet."
-msgstr "Zapíná nastavení proxy při přístupu k HTTP přes Internet."
-
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:4
msgid "FTP proxy host name"
msgstr "Název počítače s proxy FTP"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:5
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:4
msgid "FTP proxy port"
msgstr "Port proxy FTP"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:6
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:5
msgid "HTTP proxy host name"
msgstr "Název počítače s proxy HTTP"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:7
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:6
msgid "HTTP proxy password"
msgstr "Heslo k proxy HTTP"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:8
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:7
msgid "HTTP proxy port"
msgstr "Port proxy HTTP"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:9
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:8
msgid "HTTP proxy username"
msgstr "Uživatelské jméno k proxy HTTP"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:10
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:9
+#| msgid ""
+#| "If true, then connections to the proxy server require authentication. The "
+#| "username/password combo is defined by \"/system/proxy/http/authentication-"
+#| "user\" and \"/system/proxy/http/authentication-password\"."
msgid ""
"If true, then connections to the proxy server require authentication. The "
"username/password combo is defined by \"/system/proxy/http/authentication-"
-"user\" and \"/system/proxy/http/authentication-password\"."
+"user\" and \"/system/proxy/http/authentication-password\". This applies only "
+"to the http proxy; when using a separate https proxy, there is currently no "
+"way to specify that it should use authentication."
msgstr ""
"Pokud je zapnuto, připojení k serveru proxy vyžaduje autentizaci. Kombinace "
"uživatelské jméno/heslo je dána klíči „/system/proxy/http/authentication-"
-"user“ a „/system/proxy/http/authentication-password“."
+"user“ a „/system/proxy/http/authentication-password“. Použije se pouze pro "
+"proxy HTTP. Jestliže používáte samostatně proxy HTTPS, není k dispozici "
+"žádný způsob, jak určit, že se má používat autentizace."
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:11
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:10
msgid "Non-proxy hosts"
msgstr "Počítače mimo proxy"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:12
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:11
msgid "Password to pass as authentication when doing HTTP proxying."
msgstr "Heslo, které se má předat při autentizaci spojení proxy HTTP."
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:13
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:12
msgid "Proxy configuration mode"
msgstr "Režim nastavení proxy"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:14
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:13
msgid "SOCKS proxy host name"
msgstr "Název počítače s proxy SOCKS"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:15
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:14
msgid "SOCKS proxy port"
msgstr "Port proxy SOCKS"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:16
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:15
msgid "Secure HTTP proxy host name"
msgstr "Název počítače s proxy Secure HTTP"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:17
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:16
msgid "Secure HTTP proxy port"
msgstr "Port proxy Secure HTTP"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:18
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:17
msgid ""
"Select the proxy configuration mode. Supported values are \"none\", \"manual"
-"\", \"auto\"."
-msgstr ""
-"Vybírá režim nastavení proxy. Podporované hodnoty jsou „none“ (žádný), "
-"„manual“ (ruční) a „auto“ (automatický)."
+"\", \"auto\". If this is \"none\", then proxies are not used. If it is \"auto"
+"\", the autoconfiguration URL described by the \"autoconfig-url\" key is "
+"used. If it is \"manual\", then the proxies described by \"/system/proxy/http"
+"\", \"/system/proxy/https\", \"/system/proxy/ftp\" and \"/system/proxy/socks"
+"\" will be used. Each of the 4 proxy types is enabled if its \"host\" key is "
+"non-empty and its \"port\" key is non-0. If an http proxy is configured, but "
+"an https proxy is not, then the http proxy is also used for https. If a "
+"SOCKS proxy is configured, it is used for all protocols, except that the "
+"http, https, and ftp proxy settings override it for those protocols only."
+msgstr ""
+"Výběr režimu nastavení proxy. Podporované hodnoty jsou „none“, „manual“, "
+"„auto“. Při nastavení „none“ se nebude proxy používat. Při nastavení „auto“ "
+"se použije automatické nastavení popsané na adrese URL uvedené v klíči "
+"„autoconfig-url“. Při nastavení „manual“ se použijí proxy uvedené v „/system/"
+"proxy/http“, „/system/proxy/https“, „/system/proxy/ftp“ a „/system/proxy/"
+"socks“. Každý z těchto 4 typů proxy se zapne, pokud je klíč „host“ neprázdný "
+"a klíč „port“ nenulový. Jestliže je nastavena proxy HTTP a proxy HTTPS ne, "
+"použije se proxy HTTP i pro HTTPS. Pokud je nastavena proxy SOCKS, použije "
+"se pro všechny protokoly, vyjma proxy HTTP, HTTPS a FTP, které si nastavení "
+"přepíšou."
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:19
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:18
msgid "The machine name to proxy FTP through."
msgstr "Název počítače poskytujícího proxy FTP."
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:20
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:19
msgid "The machine name to proxy HTTP through."
msgstr "Název počítače poskytujícího proxy HTTP."
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:21
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:20
msgid "The machine name to proxy secure HTTP through."
msgstr "Název počítače poskytujícího proxy Secure HTTP."
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:22
-msgid "The machine name to proxy socks through."
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:21
+#| msgid "The machine name to proxy FTP through."
+msgid "The machine name to use as a SOCKS proxy."
msgstr "Název počítače poskytujícího proxy SOCKS."
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:23
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:22
msgid ""
"The port on the machine defined by \"/system/proxy/ftp/host\" that you proxy "
"through."
@@ -1401,7 +1423,7 @@
"Port na počítači poskytujícím proxy a definovaném v klíči „/system/proxy/ftp/"
"host“."
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:24
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:23
msgid ""
"The port on the machine defined by \"/system/proxy/http/host\" that you "
"proxy through."
@@ -1409,7 +1431,7 @@
"Port na počítači poskytujícím proxy a definovaném v klíči „/system/proxy/"
"http/host“."
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:25
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:24
msgid ""
"The port on the machine defined by \"/system/proxy/https/host\" that you "
"proxy through."
@@ -1417,7 +1439,7 @@
"Port na počítači poskytujícím proxy a definovaném v klíči „/system/proxy/"
"https/host“."
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:26
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:25
msgid ""
"The port on the machine defined by \"/system/proxy/socks/host\" that you "
"proxy through."
@@ -1425,7 +1447,7 @@
"Port na počítači poskytujícím proxy a definovaném v klíči „/system/proxy/"
"socks/host“."
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:27
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:26
msgid ""
"This key contains a list of hosts which are connected to directly, rather "
"than via the proxy (if it is active). The values can be hostnames, domains "
@@ -1437,24 +1459,31 @@
"(i s použitím úvodních divokých znaků typu *.domena.cz), adresy IP počítačů "
"(IPv4 i IPv6) a síťové adresy s maskou (jako 192.168.0.0/24)."
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:27
+msgid "This key is not used, and should not be read or modified."
+msgstr "Klíč není používán a neměl by být čten nebo měněn."
+
#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:28
-msgid "URL that provides proxy configuration values."
-msgstr "Adresa URL, která poskytuje hodnoty pro nastavení proxy."
+msgid ""
+"This key is not used; HTTP proxying is enabled when the host key is non-"
+"empty and the port is non-0."
+msgstr ""
+"Tento klíč není používán. Používání proxy HTTP je zapnuto, pokud klíč „host“ "
+"není prázdný a klíč „port“ je nenulový."
#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:29
-msgid "Use HTTP proxy"
-msgstr "Použít proxy HTTP"
+msgid ""
+"URL that provides proxy configuration values. When mode is \"auto\", this "
+"URL is used to look up proxy information for all protocols."
+msgstr ""
+"Adresa URL, která poskytuje hodnoty nastavení proxy. Pokud je režim „auto“, "
+"použije se tato adresa k vyhledání informací proxy pro všechny protokoly."
#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:30
-msgid "Use same proxy for all protocols"
-msgstr "Použít stejnou proxy pro všechny protokoly"
+msgid "Unused; ignore"
+msgstr "Nepoužíváno, ignorovat"
#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:31
msgid "User name to pass as authentication when doing HTTP proxying."
msgstr ""
"Uživatelské jméno, které se má předat při autentizaci spojení proxy HTTP."
-
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:32
-msgid "Whether to use the same proxy for all protocols or not."
-msgstr "Zda použít stejnou proxy pro všechny protokoly nebo ne."
-
diff -Nru gsettings-desktop-schemas-3.1.91/po/es.po gsettings-desktop-schemas-3.1.92/po/es.po
--- gsettings-desktop-schemas-3.1.91/po/es.po 2011-09-05 16:47:52.000000000 +0000
+++ gsettings-desktop-schemas-3.1.92/po/es.po 2011-09-19 11:07:29.000000000 +0000
@@ -10,8 +10,8 @@
"Project-Id-Version: gsettings-desktop-schemas.po.master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=gsettings-desktop-schemas&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-09-02 18:18+0000\n"
-"PO-Revision-Date: 2011-09-04 12:25+0200\n"
+"POT-Creation-Date: 2011-09-04 10:27+0000\n"
+"PO-Revision-Date: 2011-09-18 19:07+0200\n"
"Last-Translator: Daniel Mustieles \n"
"Language-Team: Español \n"
"MIME-Version: 1.0\n"
@@ -904,7 +904,6 @@
msgstr "Indica si el reloj se muestra en formato de 12h o de 24h"
#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:64
-#| msgid "Whether the cursor should blink."
msgid "Whether the clock shows seconds"
msgstr "Indica si el reloj muestra los segundos"
@@ -1387,7 +1386,6 @@
msgstr "Usuario del proxy HTTP"
#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:9
-#, fuzzy
#| msgid ""
#| "If true, then connections to the proxy server require authentication. The "
#| "username/password combo is defined by \"/system/proxy/http/authentication-"
@@ -1401,7 +1399,9 @@
msgstr ""
"Si es cierto, las conexiones al servidor proxy requieren autenticación. La "
"combinación usuario/contraseña se define en «/system/proxy/http/"
-"authentication-user» y «/system/proxy/http/authentication-password»."
+"authentication-user» y «/system/proxy/http/authentication-password». Esto "
+"sólo se aplica en el proxy HTTP; cuando se usa un proxy HTTPS aparte, no hay "
+"manera de especificar que debe usar autenticación"
#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:10
msgid "Non-proxy hosts"
@@ -1458,7 +1458,6 @@
msgstr "El nombre de la máquina por la que se hace proxy HTTP seguro."
#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:21
-#| msgid "The machine name to proxy FTP through."
msgid "The machine name to use as a SOCKS proxy."
msgstr "La máquina que usar como proxy SOCKS."
diff -Nru gsettings-desktop-schemas-3.1.91/po/sl.po gsettings-desktop-schemas-3.1.92/po/sl.po
--- gsettings-desktop-schemas-3.1.91/po/sl.po 2011-07-24 12:32:54.000000000 +0000
+++ gsettings-desktop-schemas-3.1.92/po/sl.po 2011-09-19 11:07:29.000000000 +0000
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the gsettings-desktop-schemas package.
#
# Andrej Žnidaršič , 2011.
+# Martin Srebotnjak , 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: gsettings-desktop-schemas master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-06-23 16:56+0000\n"
-"PO-Revision-Date: 2011-06-26 20:16+0100\n"
-"Last-Translator: Matej Urbančič \n"
+"POT-Creation-Date: 2011-09-02 18:18+0000\n"
+"PO-Revision-Date: 2011-09-12 20:36+0100\n"
+"Last-Translator: Martin Srebotnjak \n"
"Language-Team: Slovenian GNOME Translation Team \n"
"Language: \n"
"MIME-Version: 1.0\n"
@@ -574,178 +575,195 @@
msgstr "Tema ikon, ki naj se uporabi za pult, nautilus, itd."
#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:24
+msgid "If true, display date in the clock, in addition to time."
+msgstr "Izbrana možnost omogoči prikaz datuma poleg časa."
+
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:25
+msgid "If true, display seconds in the clock."
+msgstr "Izbrana možnost omogoči na uri prikaz sekund."
+
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:26
msgid "Keyboard shortcut to open the menu bars."
msgstr "Tipkovna bližnjica za odpiranje menijske vrstice."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:25
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:27
msgid "Length of the cursor blink cycle, in milliseconds."
msgstr "Dolžina cikla utripanja kazalca v milisekundah."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:26
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:28
msgid "List of symbolic names and color equivalents"
msgstr "Seznam simbolnih imen in enakovrednih barv"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:27
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:29
msgid "Menubar Detachable"
msgstr "Menijsko vrstico je mogoče odpeti"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:28
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:30
msgid "Menubar accelerator"
msgstr "Pospeševalnik menijske vrstice"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:29
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:31
msgid "Menus Have Icons"
msgstr "Meniji imajo ikone"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:30
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:32
msgid "Menus Have Tearoff"
msgstr "Menije je mogoče odpeti"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:31
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:33
msgid "Monospace font"
msgstr "Monospace pisava"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:32
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:34
msgid "Name of a monospaced (fixed-width) font for use in locations like terminals."
msgstr "Ime monospace pisave (stalne širine) za uporabo v terminalu."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:33
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:35
msgid "Name of the GTK+ input method Preedit Style used by gtk+."
msgstr "Ime vhodne metode GTK+ predvpisnega sloga, uporabljeno s strani gtk+."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:34
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:36
msgid "Name of the GTK+ input method Status Style used by gtk+."
msgstr "Ime vhodne metode GTK+ sloga stanja, uporabljeno s strani gtk+."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:35
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:37
msgid "Name of the default font used by gtk+."
msgstr "Ime privzete pisave, uporabljeno s strani gtk+."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:36
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:38
msgid "Name of the default font used for reading documents."
msgstr "Ime privzete pisave za branje dokumentov."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:37
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:39
msgid "Name of the input method module used by GTK+."
msgstr "Ime vnosnega načina, ki ga uporablja GTK+."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:38
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:40
msgid "Only show mnemonics on when the Alt key is pressed"
msgstr "Pokaži mnemoniko le, ko je pritisnjena tipka Alt"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:39
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:41
msgid "Palette used in the color selector"
msgstr "Paleta, ki naj se uporabi v izbirniku barv"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:40
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:42
msgid "Palette used in the color selector as defined by the 'gtk-color-palette' setting"
msgstr "Paleta, ki se uporablja v izbirniku barv, kot ga določa nastavitev 'gtk-collor-palette'"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:41
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:43
+msgid "Show date in clock"
+msgstr "Na uri pokaži datum"
+
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:44
msgid "Show the 'Input Methods' menu"
msgstr "Pokaži meni 'Vnosni načini'"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:42
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:45
msgid "Show the 'Unicode Control Character' menu"
msgstr "Pokaži meni 'Nadzorni znak Unicode'"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:43
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:46
msgid "Size of icons in toolbars, either \"small\" or \"large\"."
msgstr "Velikost ikon v orodni vrstici, vrednosti \"majhne\" ali \"velike\"."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:44
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:47
msgid "Size of the cursor used as cursor theme."
msgstr "Velikost kazalke, ki jo določa tem kazalke."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:45
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:48
msgid "Text scaling factor"
msgstr "Faktor povečave besedila"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:46
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:49
msgid "Time after which the cursor stops blinking, in seconds."
msgstr "Čas po katerem kazalec preneha utripati v milisekundah"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:47
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:50
msgid "Timeout before click repeat"
msgstr "Časovni zamik pred ponovitvijo klika"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:48
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:51
msgid "Timeout between click repeats"
msgstr "Zakasnitev med ponovitvami klikov"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:49
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:52
msgid "Timeout in milliseconds before a click starts repeating (on spinner buttons for example)."
msgstr "Zakasnitev v milisekundah preden se klik začne ponavljati (na primer na vrtilnih gumbih)."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:50
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:53
msgid "Timeout in milliseconds between repeated clicks when a button is left pressed."
msgstr "Zakasnitev v milisekundah med ponovljenimi kliki preden je pritisnjen levi gumb."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:51
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:54
msgid "Toolbar Detachable"
msgstr "Odstranljiva orodna vrstica"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:52
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:55
msgid "Toolbar Icon Size"
msgstr "Velikost ikon orodne vrstice"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:53
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:56
msgid "Toolbar Style"
msgstr "Slog orodne vrstice"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:54
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:57
msgid "Toolbar Style. Valid values are \"both\", \"both-horiz\", \"icons\", and \"text\"."
msgstr "Slog orodne vrstice. Mogoče vrednosti so \"both\", \"both_horiz\", \"icons\" in \"text\"."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:55
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:58
msgid "Whether animations should be displayed. Note: This is a global key, it changes the behaviour of the window manager, the panel etc."
msgstr "Ali naj bodo prikazane animacije. Opomba: To je splošen ključ, saj spremeni vedenje upravljalnika oken, pulta, itd."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:56
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:59
msgid "Whether buttons may display an icon in addition to the button text."
msgstr "Ali naj bo na gumbu ob besedilu gumba še ikona."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:57
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:60
msgid "Whether menus may display an icon next to a menu entry."
msgstr "Ali naj meniji kažejo ikono ob predmetu menija."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:58
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:61
msgid "Whether menus should have a tearoff."
msgstr "Ali naj imajo meniji mesto za odpenjanje."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:59
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:62
msgid "Whether mnemonics should be automatically shown and hidden when the user presses the Alt key."
msgstr "Ali naj bodo pospeševalne tipke samodejno prikazane in skrite, kadar uporabnik pritisne tipko Alt."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:60
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:63
msgid "Whether the clock displays in 24h or 12h format"
msgstr "Ali ura prikazuje 24 ali 12-urno obliko"
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:61
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:64
+#| msgid "Whether the cursor should blink."
+msgid "Whether the clock shows seconds"
+msgstr "Ali naj ura prikazuje sekunde"
+
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:65
msgid "Whether the context menus of entries and text views should offer to change the input method."
msgstr "Ali naj vsebinski meni vnosov in pogledi besedila omogočajo možnost spreminjanja vnosnega načina."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:62
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:66
msgid "Whether the context menus of entries and text views should offer to insert control characters."
msgstr "Ali naj vsebinski meni vnosov in besedila omogoči vstavljanje nadzornih znakov."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:63
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:67
msgid "Whether the cursor should blink."
msgstr "Ali naj kazalka utripa."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:64
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:68
msgid "Whether the user can detach menubars and move them around."
msgstr "Ali lahko uporabnik odpne menijske vrstice in jih premika okoli."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:65
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:69
msgid "Whether the user can detach toolbars and move them around."
msgstr "Ali lahko uporabnik odpne orodne vrstice in jih premika okoli."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:66
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:70
msgid "Whether the user can dynamically type a new accelerator when positioned over an active menuitem."
msgstr "Ali lahko uporabnik dejavno vpiše nov pospeševalnik, ko se nahaja nad dejavnim predmetom menija."
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:67
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:71
msgid "Whether toolkits should load accessibility related modules."
msgstr "Ali naj imajo zbirke orodij naložijo module povezane z dostopnostjo."
@@ -1014,222 +1032,122 @@
msgstr "URL za samodejno nastavitev posredniškega strežnika"
#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:3
-msgid "Enables the proxy settings when accessing HTTP over the Internet."
-msgstr "Omogoči nastavitve posredniškega strežnika za dostop do HTTP preko interneta."
-
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:4
msgid "FTP proxy host name"
msgstr "Ime gostitelja FTP posredniškega strežnika"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:5
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:4
msgid "FTP proxy port"
msgstr "Vrata FTP posredniškega strežnika"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:6
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:5
msgid "HTTP proxy host name"
msgstr "Ime gostitelja posredniškega strežnika HTTP"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:7
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:6
msgid "HTTP proxy password"
msgstr "Geslo posredniškega strežnika HTTP"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:8
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:7
msgid "HTTP proxy port"
msgstr "Vrata posredniškega strežnika HTTP"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:9
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:8
msgid "HTTP proxy username"
msgstr "Uporabniško ime HTTP posredniškega strežnika"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:10
-msgid "If true, then connections to the proxy server require authentication. The username/password combo is defined by \"/system/proxy/http/authentication-user\" and \"/system/proxy/http/authentication-password\"."
-msgstr "Možnost določa zahtevo za overitev povezave na posredniškemu strežniku. Spustno polje za uporabniško ime in geslo določata \"/system/http_proxy/authentication_user\" in \"/system/http_proxy/authentication_password\"."
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:9
+#| msgid ""
+#| "If true, then connections to the proxy server require authentication. The "
+#| "username/password combo is defined by \"/system/proxy/http/authentication-"
+#| "user\" and \"/system/proxy/http/authentication-password\"."
+msgid "If true, then connections to the proxy server require authentication. The username/password combo is defined by \"/system/proxy/http/authentication-user\" and \"/system/proxy/http/authentication-password\". This applies only to the http proxy; when using a separate https proxy, there is currently no way to specify that it should use authentication."
+msgstr "Možnost določa zahtevo za overitev povezave na posredniškemu strežniku. Spustno polje za uporabniško ime in geslo določata \"/system/http_proxy/authentication_user\" in \"/system/http_proxy/authentication_password\". To velja le za posredniške strežnike za http; če uporabljate ločen posredniški strežnik za https, trenutno ni mogoče določiti, da naj uporablja overjanje."
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:11
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:10
msgid "Non-proxy hosts"
msgstr "Gostitelji brez posredniškega strežnika"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:12
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:11
msgid "Password to pass as authentication when doing HTTP proxying."
msgstr "Geslo za overitev posredniškega strežnika HTTP."
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:13
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:12
msgid "Proxy configuration mode"
msgstr "Način nastavitev posredniškega strežnika"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:14
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:13
msgid "SOCKS proxy host name"
msgstr "Ime gostitelja posredniškega strežnika SOCKS"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:15
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:14
msgid "SOCKS proxy port"
msgstr "Vrata posredniškega strežnika SOCKS"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:16
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:15
msgid "Secure HTTP proxy host name"
msgstr "Ime gostitelja varnega posredniškega strežnika HTTP"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:17
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:16
msgid "Secure HTTP proxy port"
msgstr "Vrata varnega posredniškega strežnika HTTP"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:18
-msgid "Select the proxy configuration mode. Supported values are \"none\", \"manual\", \"auto\"."
-msgstr "Izberite način nastavitev posredniškega strežnika. Podprte vrednosti so \"brez\", \"ročno\", \"samodejno\"."
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:17
+msgid "Select the proxy configuration mode. Supported values are \"none\", \"manual\", \"auto\". If this is \"none\", then proxies are not used. If it is \"auto\", the autoconfiguration URL described by the \"autoconfig-url\" key is used. If it is \"manual\", then the proxies described by \"/system/proxy/http\", \"/system/proxy/https\", \"/system/proxy/ftp\" and \"/system/proxy/socks\" will be used. Each of the 4 proxy types is enabled if its \"host\" key is non-empty and its \"port\" key is non-0. If an http proxy is configured, but an https proxy is not, then the http proxy is also used for https. If a SOCKS proxy is configured, it is used for all protocols, except that the http, https, and ftp proxy settings override it for those protocols only."
+msgstr "Izberite način prilagajanja posredovalnega strežnika. Podprte vrednosti so \"brez\", \"ročno\", \"samodejno\". Če izberete \"brez\", posredovalni strežniki niso v rabi. Če izberete \"samodejno\", je uporabljen samoprilagoditveni URL, določen s ključem \"autoconfig-url\". Če izberete \"ročno\", se uporabijo posredovalni strežniki, določeni z \"/system/proxy/http\", \"/system/proxy/https\", \"/system/proxy/ftp\" in \"/system/proxy/socks\". Vsaka izmed štirih vrst posredovalnih strežnikov je omogočena, če njen ključ \"gostitelj\" ni prazen in so njena \"vrata\" pozitivno celo število. Če je posredovalni strežnik za http določen, ne pa tudi za https, bo tisti za http uporabljen tudi za https. Če je posredovalni strežnik za SOCKS nastavljen, se uporablja za vse protokole, le da ga preglasijo nastavitve posredovalnih strežnikov za http, https in ftp za svoje protokole."
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:19
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:18
msgid "The machine name to proxy FTP through."
msgstr "Ime računalnika FTP posredniškega strežnika."
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:20
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:19
msgid "The machine name to proxy HTTP through."
msgstr "Ime računalnika posredniškega strežnika HTTP."
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:21
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:20
msgid "The machine name to proxy secure HTTP through."
msgstr "Ime računalnika varnega posredniškega strežnika HTTP."
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:22
-msgid "The machine name to proxy socks through."
-msgstr "Ime računalnika posredniškega strežnika SOCKS."
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:21
+#| msgid "The machine name to proxy FTP through."
+msgid "The machine name to use as a SOCKS proxy."
+msgstr "Ime računalnika, uporabljeno za posredniški strežnik SOCKS"
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:23
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:22
msgid "The port on the machine defined by \"/system/proxy/ftp/host\" that you proxy through."
msgstr "Vrata računalnika, ki jih določa \"/system/proxy/ftp_host\" posredniškega strežnika."
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:24
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:23
msgid "The port on the machine defined by \"/system/proxy/http/host\" that you proxy through."
msgstr "Vrata računalnika, ki jih določa \"/system/http_proxy/host\" posredniškega strežnika."
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:25
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:24
msgid "The port on the machine defined by \"/system/proxy/https/host\" that you proxy through."
msgstr "Vrata računalnika, ki jih določa \"/system/http_proxy/host\" posredniškega strežnika."
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:26
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:25
msgid "The port on the machine defined by \"/system/proxy/socks/host\" that you proxy through."
msgstr "Vrata računalnika, ki jih določa \"/system/proxy/socks_host\" posredniškega strežnika."
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:27
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:26
msgid "This key contains a list of hosts which are connected to directly, rather than via the proxy (if it is active). The values can be hostnames, domains (using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
msgstr "Ta ključ vsebuje seznam gostiteljev, s katerimi se vzpostavi neposredna povezava in preko posredniškega strežnika (če je dejaven). Vrednosti so lahko imena gostiteljev, domene (z nadomestnimi znaki kot je *.foo.com), naslovi IP gostitelja (tako IPv4 kot tudi IPv6) in omrežni naslovi z omrežno masko (npr. 192.168.0.0/24)."
+#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:27
+msgid "This key is not used, and should not be read or modified."
+msgstr "Ta ključ ni uporabljen, zato ga ni dovoljeno brati in spreminjati."
+
#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:28
-msgid "URL that provides proxy configuration values."
-msgstr "URL z vrednostmi nastavitev posrednišk strežnika."
+msgid "This key is not used; HTTP proxying is enabled when the host key is non-empty and the port is non-0."
+msgstr "Ta ključ ni uporabljen; posredovalni strežnik za HTTP je omogočen, ko je ključ gostitelja neničeln in vrata določa pozitivno število"
#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:29
-msgid "Use HTTP proxy"
-msgstr "Uporabi HTTP posredniški strežnik"
+msgid "URL that provides proxy configuration values. When mode is \"auto\", this URL is used to look up proxy information for all protocols."
+msgstr "Naslov URL, ki zagotavlja vrednosti nastavitve posredniškega strežnika. Ko je način \"samodejen\", ta naslov služi za pregled podatkov posredovalnega strežnika za vse protokole."
#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:30
-msgid "Use same proxy for all protocols"
-msgstr "Uporabi isti posredniški strežnik za vse protokole"
+msgid "Unused; ignore"
+msgstr "Neuporabljeno; prezri"
#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:31
msgid "User name to pass as authentication when doing HTTP proxying."
-msgstr "Uporabniško ime za overitev na HTTP posredniškem strežniku."
-
-#: ../schemas/org.gnome.system.proxy.gschema.xml.in.in.h:32
-msgid "Whether to use the same proxy for all protocols or not."
-msgstr "Ali naj se za vse protokole uporabi enak posredniški strežnik."
-
-#~ msgid "File to use for the background image."
-#~ msgstr "Datoteka, ki naj se uporabi kot slika ozadja."
-
-#~ msgid "Picture Filename"
-#~ msgstr "Ime slike"
-
-#~ msgid "Screensaver theme selection mode"
-#~ msgstr "Način izbire teme ohranjevalnika zaslona"
-
-#~ msgid "Screensaver themes"
-#~ msgstr "Teme ohranjevalnika zaslona"
-
-#~ msgid "The number of minutes to run before changing the screensaver theme."
-#~ msgstr "Število minut pred zamenjavo teme ohranjevalnika zaslona."
-
-#~ msgid ""
-#~ "The number of seconds of inactivity before signalling to power "
-#~ "management. This key is set and maintained by the session power "
-#~ "management agent."
-#~ msgstr ""
-#~ "Število sekund nedejavnosti pred zagonom upravljalnika porabe. Ključ "
-#~ "nadzira in upravlja agent upravljanja porabe seje."
-
-#~ msgid ""
-#~ "The selection mode used by screensaver. May be \"blank-only\" to enable "
-#~ "the screensaver without using any theme on activation, \"single\" to "
-#~ "enable screensaver using only one theme on activation (specified in "
-#~ "\"themes\" key), and \"random\" to enable the screensaver using a random "
-#~ "theme on activation."
-#~ msgstr ""
-#~ "Način izbire, ki ga uporablja ohranjevalnik zaslona. Lahko je \"blank-only"
-#~ "\", ki omogoči ohranjevalnik zaslona brez uporabe katerekoli teme ob "
-#~ "vključitvi, \"single\", ki uporablja le eno temo ob vključitvi (določeno "
-#~ "v ključu \"themes\") ali \"random\", ki omogoči ohranjevalnik zaslona z "
-#~ "uporabo naključne teme ob vključitvi."
-
-#~ msgid ""
-#~ "This key specifies the list of themes to be used by the screensaver. It's "
-#~ "ignored when \"mode\" key is \"blank-only\", should provide the theme "
-#~ "name when \"mode\" is \"single\", and should provide a list of themes "
-#~ "when \"mode\" is \"random\"."
-#~ msgstr ""
-#~ "Ta ključ določa seznam tem, ki jih uporablja ohranjevalnik zaslona. Ključ "
-#~ "je prezrt, ko je ključ \"mode\" nastavljen na \"blank-only\", vsebuje ime "
-#~ "teme, ko je ključ \"mode\" nastavljen na \"single\" in vsebuje seznam "
-#~ "tem, ko je ključ \"mode\" nastavljen na \"random\"."
-
-#~ msgid "Time before power management baseline"
-#~ msgstr "Čas pred izhodiščem upravljanja porabe"
-
-#~ msgid "Time before theme change"
-#~ msgstr "Čas pred spremembo teme"
-
-#~ msgid "Show or hide the magnifier"
-#~ msgstr "Pokaži ali skrij povečevalo"
-
-#~ msgid "Show or hide the magnifier and all of its zoom regions."
-#~ msgstr "Pokaži ali skrij povečalo in vsa njegova področja približanja."
-
-#~ msgid ""
-#~ "GNOME to start preferred Mobility assistive technology application during "
-#~ "login."
-#~ msgstr "Zagon GNOME Mobility pomožne tehnologije med prijavo."
-
-#~ msgid ""
-#~ "GNOME to start preferred Visual assistive technology application during "
-#~ "login."
-#~ msgstr "Zagon GNOME pomožne tehnologije predočenja med prijavo."
-
-#~ msgid "Preferred Mobility assistive technology application"
-#~ msgstr "Zagon Mobility programov pomožnih tehnologij"
-
-#~ msgid ""
-#~ "Preferred Mobility assistive technology application to be used for login, "
-#~ "menu, or command line."
-#~ msgstr ""
-#~ "Prednostni program pomožnih Mobility tehnologij za prijavo, meni ali "
-#~ "ukazno vrstico."
-
-#~ msgid "Preferred Visual assistive technology application"
-#~ msgstr "Prednostni program pomožnih tehnologij predočenja"
-
-#~ msgid ""
-#~ "Preferred Visual assistive technology application be used for login, "
-#~ "menu, or command line."
-#~ msgstr ""
-#~ "Prednostni program pomožnih tehnologij predočenja za prijavo, meni ali "
-#~ "ukazno vrstico."
-
-#~ msgid "Start preferred Mobility assistive technology application"
-#~ msgstr "Zagon prednostnih Mobility programov pomožnih tehnologij"
-
-#~ msgid "Start preferred Visual assistive technology application"
-#~ msgstr "Zaženi prednostne programe pomožnih tehnologij"
-
-#~ msgid "Use Custom Font"
-#~ msgstr "Uporabi pisavo po meri"
-
-#~ msgid "Whether to use a custom font in gtk+ applications."
-#~ msgstr "Ali naj se v programih gtk+ uporabi pisava po meri."
+msgstr "Uporabniško ime za overitev na HTTP posredniškem strežniku."
\ No newline at end of file
diff -Nru gsettings-desktop-schemas-3.1.91/schemas/gsettings-desktop-schemas.convert gsettings-desktop-schemas-3.1.92/schemas/gsettings-desktop-schemas.convert
--- gsettings-desktop-schemas-3.1.91/schemas/gsettings-desktop-schemas.convert 2011-06-01 14:38:37.000000000 +0000
+++ gsettings-desktop-schemas-3.1.92/schemas/gsettings-desktop-schemas.convert 2011-09-19 11:07:29.000000000 +0000
@@ -43,8 +43,8 @@
# https://bugzilla.gnome.org/show_bug.cgi?id=634639
# cursor-blink = /desktop/gnome/interface/cursor_blink
cursor-blink-time = /desktop/gnome/interface/cursor_blink_time
-icon-theme = /desktop/gnome/interface/icon_theme
# Disabled as we want users to use the new theme by default
+#icon-theme = /desktop/gnome/interface/icon_theme
#gtk-theme = /desktop/gnome/interface/gtk_theme
#cursor-theme = /desktop/gnome/peripherals/mouse/cursor_theme
gtk-key-theme = /desktop/gnome/interface/gtk_key_theme