diff -Nru gnome-desktop3-3.4.0/ChangeLog gnome-desktop3-3.4.1/ChangeLog --- gnome-desktop3-3.4.0/ChangeLog 2012-03-26 09:04:33.000000000 +0000 +++ gnome-desktop3-3.4.1/ChangeLog 2012-04-16 11:43:35.000000000 +0000 @@ -1,5 +1,21 @@ # Generated by Makefile. Do not edit. +commit 595b0b38864c707709821eb84a71080a46d2e4b5 +Author: Sandeep Sheshrao Shedmake +Date: Wed Mar 28 14:39:21 2012 +0530 + + Updated Marathi Translations + +M po/mr.po + +commit a31fe80cbb4b4af5ea9e3adfdf35973962c77b31 +Author: Vincent Untz +Date: Mon Mar 26 11:03:11 2012 +0200 + + release: post-release bump to 3.4.1 + +M configure.ac + commit a64ec87e3b8c65ab1decd56ace90d99a4d8298ae Author: Vincent Untz Date: Mon Mar 26 10:43:27 2012 +0200 diff -Nru gnome-desktop3-3.4.0/configure gnome-desktop3-3.4.1/configure --- gnome-desktop3-3.4.0/configure 2012-03-26 09:04:23.000000000 +0000 +++ gnome-desktop3-3.4.1/configure 2012-04-16 11:42:35.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for gnome-desktop 3.4.0. +# Generated by GNU Autoconf 2.68 for gnome-desktop 3.4.1. # # Report bugs to . # @@ -710,8 +710,8 @@ # Identity of this package. PACKAGE_NAME='gnome-desktop' PACKAGE_TARNAME='gnome-desktop' -PACKAGE_VERSION='3.4.0' -PACKAGE_STRING='gnome-desktop 3.4.0' +PACKAGE_VERSION='3.4.1' +PACKAGE_STRING='gnome-desktop 3.4.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop' PACKAGE_URL='' @@ -1571,7 +1571,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 gnome-desktop 3.4.0 to adapt to many kinds of systems. +\`configure' configures gnome-desktop 3.4.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1645,7 +1645,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-desktop 3.4.0:";; + short | recursive ) echo "Configuration of gnome-desktop 3.4.1:";; esac cat <<\_ACEOF @@ -1787,7 +1787,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-desktop configure 3.4.0 +gnome-desktop configure 3.4.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2156,7 +2156,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnome-desktop $as_me 3.4.0, which was +It was created by gnome-desktop $as_me 3.4.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2973,7 +2973,7 @@ # Define the identity of the package. PACKAGE='gnome-desktop' - VERSION='3.4.0' + VERSION='3.4.1' cat >>confdefs.h <<_ACEOF @@ -12355,7 +12355,7 @@ GNOME_PLATFORM=3 GNOME_MINOR=4 -GNOME_MICRO=0 +GNOME_MICRO=1 GNOME_DISTRIBUTOR="GNOME.Org" GNOME_DATE=`date +"%Y-%m-%d"` @@ -15948,7 +15948,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-desktop $as_me 3.4.0, which was +This file was extended by gnome-desktop $as_me 3.4.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16014,7 +16014,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gnome-desktop config.status 3.4.0 +gnome-desktop config.status 3.4.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru gnome-desktop3-3.4.0/configure.ac gnome-desktop3-3.4.1/configure.ac --- gnome-desktop3-3.4.0/configure.ac 2012-03-26 09:03:56.000000000 +0000 +++ gnome-desktop3-3.4.1/configure.ac 2012-04-16 11:41:19.000000000 +0000 @@ -1,6 +1,6 @@ m4_define(gnome_platform, 3) m4_define(gnome_minor, 4) -m4_define(gnome_micro, 0) +m4_define(gnome_micro, 1) dnl gnome_sub is an optional sub-version which will not be advertised to the user dnl It allows to release a 2.30.1.1 which is just a better 2.30.1 dnl Leave empty if not needed diff -Nru gnome-desktop3-3.4.0/debian/changelog gnome-desktop3-3.4.1/debian/changelog --- gnome-desktop3-3.4.0/debian/changelog 2012-03-26 10:35:34.000000000 +0000 +++ gnome-desktop3-3.4.1/debian/changelog 2012-04-16 12:17:40.000000000 +0000 @@ -1,3 +1,36 @@ +gnome-desktop3 (3.4.1-0ubuntu1) precise-proposed; urgency=low + + * New upstream release: + - Translation updates. + + -- Martin Pitt Mon, 16 Apr 2012 14:11:14 +0200 + +gnome-desktop3 (3.4.0-0ubuntu4) precise; urgency=low + + * debian/patches/04_compute_average_color.patch: + - compute the avergage color in gnome-desktop itself, not in unity to fix + some races (LP: #963140) + + -- Didier Roche Fri, 06 Apr 2012 16:38:09 +0200 + +gnome-desktop3 (3.4.0-0ubuntu3) precise; urgency=low + + * debian/patches/tweak_color_computation.patch: + - tweak the color computation to the unity launcher side, thanks gord + + -- Sebastien Bacher Thu, 05 Apr 2012 17:59:41 +0200 + +gnome-desktop3 (3.4.0-0ubuntu2) precise; urgency=low + + * 02_refuse_to_break_GL_compositors.patch: Add DEP-3 patch header. + * Add 03_default_display_is_internal.patch: Treat a display named "default" + as internal. This happens with the proprietary NVidia driver which does + not do proper XRandR. We cannot detect external vs. internal display + there, so err on the side of "internal" to make suspend on lid close work. + Thanks to James M. Leddy for the initial patch! (LP: #949296) + + -- Martin Pitt Thu, 29 Mar 2012 17:49:37 +0200 + gnome-desktop3 (3.4.0-0ubuntu1) precise-proposed; urgency=low * New upstream version diff -Nru gnome-desktop3-3.4.0/debian/control gnome-desktop3-3.4.1/debian/control --- gnome-desktop3-3.4.0/debian/control 2012-03-26 10:39:13.000000000 +0000 +++ gnome-desktop3-3.4.1/debian/control 2012-04-16 12:17:43.000000000 +0000 @@ -8,7 +8,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Josselin Mouette -Uploaders: Debian GNOME Maintainers , Michael Biebl , Sjoerd Simons +Uploaders: Debian GNOME Maintainers Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-desktop3 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-desktop3 Standards-Version: 3.9.2 diff -Nru gnome-desktop3-3.4.0/debian/patches/02_refuse_to_break_GL_compositors.patch gnome-desktop3-3.4.1/debian/patches/02_refuse_to_break_GL_compositors.patch --- gnome-desktop3-3.4.0/debian/patches/02_refuse_to_break_GL_compositors.patch 2012-03-26 10:36:01.000000000 +0000 +++ gnome-desktop3-3.4.1/debian/patches/02_refuse_to_break_GL_compositors.patch 2012-03-28 08:15:23.000000000 +0000 @@ -1,3 +1,6 @@ +Description: Check whether Unity is running and if so refuse to configure a multi-head setup larger than GL_MAX_TEXTURE_SIZE. Works around breakage when using Unity on such a setup, which is as much as we can do at this point. +Bug-Ubuntu: https://launchpad.net/bugs/824099 + === modified file 'libgnome-desktop/gnome-rr-config.c' Index: gnome-desktop3-3.4.0/libgnome-desktop/gnome-rr-config.c =================================================================== diff -Nru gnome-desktop3-3.4.0/debian/patches/03_default_display_is_internal.patch gnome-desktop3-3.4.1/debian/patches/03_default_display_is_internal.patch --- gnome-desktop3-3.4.0/debian/patches/03_default_display_is_internal.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-desktop3-3.4.1/debian/patches/03_default_display_is_internal.patch 2012-03-28 08:20:56.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Treat a display named "default" as internal. This happens with the + proprietary NVidia driver which does not do proper XRandR. We cannot detect + external vs. internal display there, so err on the side of "internal" to make + suspend on lid close work. +Bug-Ubuntu: https://launchpad.net/bugs/949296 +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=672030 + +Index: gnome-desktop3/libgnome-desktop/gnome-rr.c +=================================================================== +--- gnome-desktop3.orig/libgnome-desktop/gnome-rr.c 2012-03-28 10:11:06.352796000 +0200 ++++ gnome-desktop3/libgnome-desktop/gnome-rr.c 2012-03-28 10:18:13.834581617 +0200 +@@ -1906,6 +1906,7 @@ + strstr (output->name, "LVDS") || + strstr (output->name, "Lvds") || + strstr (output->name, "LCD") || /* ... but fglrx uses "LCD" in some versions. Shoot me now, kthxbye. */ ++ strstr (output->name, "default") || /* nVidia does not do XRandR properly, can't detect internal/external */ + strstr (output->name, "eDP") || /* eDP is for internal laptop panel connections */ + strstr (output->name, "DFP"))) /* DFP is also an internal laptop display */ + return TRUE; diff -Nru gnome-desktop3-3.4.0/debian/patches/04_compute_average_color.patch gnome-desktop3-3.4.1/debian/patches/04_compute_average_color.patch --- gnome-desktop3-3.4.0/debian/patches/04_compute_average_color.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-desktop3-3.4.1/debian/patches/04_compute_average_color.patch 2012-04-06 15:55:06.000000000 +0000 @@ -0,0 +1,170 @@ +=== modified file 'libgnome-desktop/gnome-bg.c' +--- old/libgnome-desktop/gnome-bg.c 2012-03-19 16:01:59 +0000 ++++ new/libgnome-desktop/gnome-bg.c 2012-04-06 15:37:02 +0000 +@@ -59,6 +59,19 @@ + in the slideshow is less than 60 seconds away */ + #define KEEP_EXPENSIVE_CACHE_SECS 60 + ++#define QUAD_MAX_LEVEL_OF_RECURSION 16 ++#define QUAD_MIN_LEVEL_OF_RECURSION 2 ++ ++/* We're weighting the left side of the screen higher than ++ the right because the launcher and dash are on that side ++ of the screen. */ ++#define QUAD_CORNER_WEIGHT_NW 3 ++#define QUAD_CORNER_WEIGHT_NE 1 ++#define QUAD_CORNER_WEIGHT_SE 1 ++#define QUAD_CORNER_WEIGHT_SW 3 ++#define QUAD_CORNER_WEIGHT_CENTER 2 ++#define QUAD_CORNER_WEIGHT_TOTAL (QUAD_CORNER_WEIGHT_NW + QUAD_CORNER_WEIGHT_NE + QUAD_CORNER_WEIGHT_SE + QUAD_CORNER_WEIGHT_SW + QUAD_CORNER_WEIGHT_CENTER) ++ + typedef struct _SlideShow SlideShow; + typedef struct _Slide Slide; + +@@ -2359,10 +2372,137 @@ + } + + /* Pixbuf utilities */ ++G_INLINE_FUNC GdkRGBA ++get_pixbuf_sample (guchar *pixels, ++ gint rowstride, ++ gint channels, ++ gint x, ++ gint y) ++{ ++ GdkRGBA sample; ++ gdouble dd = 0xFF; ++ guchar *p = pixels + ((y * rowstride) + (x * channels)); ++ ++ sample.red = *p++ / dd; ++ sample.green = *p++ / dd; ++ sample.blue = *p++ / dd; ++ sample.alpha = 1.0f; ++ ++ return sample; ++} ++ ++G_INLINE_FUNC gboolean ++is_color_different (const GdkRGBA color_a, ++ const GdkRGBA color_b) ++{ ++ GdkRGBA diff; ++ ++ diff.red = color_a.red - color_b.red; ++ diff.green = color_a.green - color_b.green; ++ diff.blue = color_a.blue - color_b.blue; ++ diff.alpha = 1.0f; ++ ++ if (fabs (diff.red) > 0.15 || ++ fabs (diff.green) > 0.15 || ++ fabs (diff.blue) > 0.15) ++ return TRUE; ++ ++ return FALSE; ++} ++ ++static GdkRGBA ++get_quad_average (gint x, ++ gint y, ++ gint width, ++ gint height, ++ gint level_of_recursion, ++ guchar *pixels, ++ gint rowstride, ++ gint channels) ++{ ++ // samples four corners ++ // c1-----c2 ++ // | | ++ // c3-----c4 ++ ++ GdkRGBA average; ++ GdkRGBA corner1 = get_pixbuf_sample (pixels, rowstride, channels, x , y ); ++ GdkRGBA corner2 = get_pixbuf_sample (pixels, rowstride, channels, x + width, y ); ++ GdkRGBA corner3 = get_pixbuf_sample (pixels, rowstride, channels, x , y + height); ++ GdkRGBA corner4 = get_pixbuf_sample (pixels, rowstride, channels, x + width, y + height); ++ GdkRGBA centre = get_pixbuf_sample (pixels, rowstride, channels, x + (width / 2), y + (height / 2)); ++ ++ /* If we're over the max we want to just take the average and be happy ++ with that value */ ++ if (level_of_recursion < QUAD_MAX_LEVEL_OF_RECURSION) { ++ /* Otherwise we want to look at each value and check it's distance ++ from the center color and take the average if they're far apart. */ ++ ++ /* corner 1 */ ++ if (level_of_recursion < QUAD_MIN_LEVEL_OF_RECURSION || ++ is_color_different(corner1, centre)) { ++ corner1 = get_quad_average (x, y, width/2, height/2, level_of_recursion + 1, pixels, rowstride, channels); ++ } ++ ++ /* corner 2 */ ++ if (level_of_recursion < QUAD_MIN_LEVEL_OF_RECURSION || ++ is_color_different(corner2, centre)) { ++ corner2 = get_quad_average (x + width/2, y, width/2, height/2, level_of_recursion + 1, pixels, rowstride, channels); ++ } ++ ++ /* corner 3 */ ++ if (level_of_recursion < QUAD_MIN_LEVEL_OF_RECURSION || ++ is_color_different(corner3, centre)) { ++ corner3 = get_quad_average (x, y + height/2, width/2, height/2, level_of_recursion + 1, pixels, rowstride, channels); ++ } ++ ++ /* corner 4 */ ++ if (level_of_recursion < QUAD_MIN_LEVEL_OF_RECURSION || ++ is_color_different(corner4, centre)) { ++ corner4 = get_quad_average (x + width/2, y + height/2, width/2, height/2, level_of_recursion + 1, pixels, rowstride, channels); ++ } ++ } ++ ++ average.red = ((corner1.red * QUAD_CORNER_WEIGHT_NW) + ++ (corner3.red * QUAD_CORNER_WEIGHT_SW) + ++ (centre.red * QUAD_CORNER_WEIGHT_CENTER) + ++ (corner2.red * QUAD_CORNER_WEIGHT_NE) + ++ (corner4.red * QUAD_CORNER_WEIGHT_SE)) ++ / QUAD_CORNER_WEIGHT_TOTAL; ++ average.green = ((corner1.green * QUAD_CORNER_WEIGHT_NW) + ++ (corner3.green * QUAD_CORNER_WEIGHT_SW) + ++ (centre.green * QUAD_CORNER_WEIGHT_CENTER) + ++ (corner2.green * QUAD_CORNER_WEIGHT_NE) + ++ (corner4.green * QUAD_CORNER_WEIGHT_SE)) ++ / QUAD_CORNER_WEIGHT_TOTAL; ++ average.blue = ((corner1.blue * QUAD_CORNER_WEIGHT_NW) + ++ (corner3.blue * QUAD_CORNER_WEIGHT_SW) + ++ (centre.blue * QUAD_CORNER_WEIGHT_CENTER) + ++ (corner2.blue * QUAD_CORNER_WEIGHT_NE) + ++ (corner4.blue * QUAD_CORNER_WEIGHT_SE)) ++ / QUAD_CORNER_WEIGHT_TOTAL; ++ average.alpha = 1.0f; ++ ++ return average; ++} ++ + static void + pixbuf_average_value (GdkPixbuf *pixbuf, + GdkRGBA *result) + { ++ GdkRGBA average; ++ average = get_quad_average (0, 0, ++ gdk_pixbuf_get_width (pixbuf) - 1, gdk_pixbuf_get_height (pixbuf) - 1, ++ 1, ++ gdk_pixbuf_get_pixels (pixbuf), ++ gdk_pixbuf_get_rowstride (pixbuf), ++ gdk_pixbuf_get_n_channels (pixbuf)); ++ result->red = average.red; ++ result->green = average.green; ++ result->blue = average.blue; ++ result->alpha = average.alpha; ++ ++#if 0 + guint64 a_total, r_total, g_total, b_total; + guint row, column; + int row_stride; +@@ -2422,6 +2562,7 @@ + result->red = r_total / dd; + result->green = g_total / dd; + result->blue = b_total / dd; ++#endif + } + + static GdkPixbuf * + diff -Nru gnome-desktop3-3.4.0/debian/patches/series gnome-desktop3-3.4.1/debian/patches/series --- gnome-desktop3-3.4.0/debian/patches/series 2012-03-26 10:34:36.000000000 +0000 +++ gnome-desktop3-3.4.1/debian/patches/series 2012-04-06 14:37:21.000000000 +0000 @@ -1 +1,4 @@ 02_refuse_to_break_GL_compositors.patch +03_default_display_is_internal.patch +tweak_color_computation.patch +04_compute_average_color.patch diff -Nru gnome-desktop3-3.4.0/debian/patches/tweak_color_computation.patch gnome-desktop3-3.4.1/debian/patches/tweak_color_computation.patch --- gnome-desktop3-3.4.0/debian/patches/tweak_color_computation.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-desktop3-3.4.1/debian/patches/tweak_color_computation.patch 2012-04-05 15:59:02.000000000 +0000 @@ -0,0 +1,23 @@ +# Description: tweak color computation looking to the unity launcher side +# UbuntuSpecific: tweak for unity, nothing upstream uses the color computation +# yet anyway so it's not an issue +--- gnome-desktop3-3.4.0.orig/libgnome-desktop/gnome-bg.c ++++ gnome-desktop3-3.4.0/libgnome-desktop/gnome-bg.c +@@ -2386,7 +2386,7 @@ pixbuf_average_value (GdkPixbuf *pixbuf, + if (gdk_pixbuf_get_has_alpha (pixbuf)) { + for (row = 0; row < height; row++) { + p = pixels + (row * row_stride); +- for (column = 0; column < width; column++) { ++ for (column = 0; column < width / 2; column++) { + r = *p++; + g = *p++; + b = *p++; +@@ -2403,7 +2403,7 @@ pixbuf_average_value (GdkPixbuf *pixbuf, + } else { + for (row = 0; row < height; row++) { + p = pixels + (row * row_stride); +- for (column = 0; column < width; column++) { ++ for (column = 0; column < width / 2; column++) { + r = *p++; + g = *p++; + b = *p++; diff -Nru gnome-desktop3-3.4.0/NEWS gnome-desktop3-3.4.1/NEWS --- gnome-desktop3-3.4.0/NEWS 2012-03-26 08:54:49.000000000 +0000 +++ gnome-desktop3-3.4.1/NEWS 2012-04-16 11:42:05.000000000 +0000 @@ -1,4 +1,12 @@ ============= +Version 3.4.1 +============= + + Translators + + * Sandeep Shedmake (mr) + +============= Version 3.4.0 ============= diff -Nru gnome-desktop3-3.4.0/po/mr.po gnome-desktop3-3.4.1/po/mr.po --- gnome-desktop3-3.4.0/po/mr.po 2011-09-05 06:54:41.000000000 +0000 +++ gnome-desktop3-3.4.1/po/mr.po 2012-04-16 11:41:19.000000000 +0000 @@ -4,255 +4,58 @@ # Swapnil Hajare , 2003. # Rahul Bhalerao , 2006. # Sandeep Shedmake , 2008, 2009. -# Sandeep Shedmake , 2009, 2010. +# Sandeep Shedmake , 2009, 2010, 2012. msgid "" msgstr "" "Project-Id-Version: mr\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" -"desktop&component=general\n" -"POT-Creation-Date: 2010-03-03 23:35+0000\n" -"PO-Revision-Date: 2010-04-13 11:47+0530\n" +"desktop&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-03-26 09:10+0000\n" +"PO-Revision-Date: 2012-03-28 14:36+0530\n" "Last-Translator: Sandeep Shedmake \n" "Language-Team: Marathi \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" +"Language: mr\n" -#: ../gnome-about/gnome-about.desktop.in.in.h:1 -#: ../gnome-about/gnome-about.in:60 -msgid "About GNOME" -msgstr "GNOME विषयी" - -#: ../gnome-about/gnome-about.desktop.in.in.h:2 -msgid "Learn more about GNOME" -msgstr "GNOME विषयी अधिक शिका" - -#: ../gnome-about/gnome-about.in:61 -msgid "News" -msgstr "बातम्या" - -#: ../gnome-about/gnome-about.in:62 -msgid "GNOME Library" -msgstr "GNOME लायब्ररी" - -#: ../gnome-about/gnome-about.in:63 -msgid "Friends of GNOME" -msgstr "GNOME ची मित्रमंडळी" - -#: ../gnome-about/gnome-about.in:64 -msgid "Contact" -msgstr "संपर्क" - -#: ../gnome-about/gnome-about.in:68 -msgid "The Mysterious GEGL" -msgstr "गुढरम्य GEGL" - -#: ../gnome-about/gnome-about.in:69 -msgid "The Squeaky Rubber GNOME" -msgstr "स्वीकी रब्बर GNOME" - -#: ../gnome-about/gnome-about.in:70 -msgid "Wanda The GNOME Fish" -msgstr "वान्डा : GNOME मासळी" - -#: ../gnome-about/gnome-about.in:567 -msgid "_Open URL" -msgstr "URL उघडा (_O)" - -#: ../gnome-about/gnome-about.in:574 -msgid "_Copy URL" -msgstr "URL चे प्रत बनवा (_C)" - -#: ../gnome-about/gnome-about.in:826 -msgid "About the GNOME Desktop" -msgstr "GNOME कार्यस्थळा विषयी " - -#: ../gnome-about/gnome-about.in:859 -msgid "%(name)s: %(value)s" -msgstr "%(name)s: %(value)s" - -#: ../gnome-about/gnome-about.in:873 -msgid "Welcome to the GNOME Desktop" -msgstr "GNOME कार्यस्थळात स्वागत आहे" - -#: ../gnome-about/gnome-about.in:890 -msgid "Brought to you by:" -msgstr "तुमच्यापर्यंत आणले आहे यांनी:" - -#: ../gnome-about/gnome-about.in:914 -msgid "%(name)s: %(value)s" -msgstr "%(name)s: %(value)s" - -#: ../gnome-about/gnome-about.in:975 -msgid "Version" -msgstr "आवृत्ती" - -#: ../gnome-about/gnome-about.in:977 -msgid "Distributor" -msgstr "वितरक" - -#: ../gnome-about/gnome-about.in:979 -msgid "Build Date" -msgstr "बांधणी दिनांक" - -#: ../gnome-about/gnome-about.in:1024 -msgid "Display information on this GNOME version" -msgstr "GNOME आवृत्तीवर माहिती दर्शवा" - -#: ../gnome-version.xml.in.in.h:1 -msgid "" -"GNOME also includes a complete development platform for applications " -"programmers, allowing the creation of powerful and complex applications." -msgstr "" -"GNOME मध्ये अनुप्रयोग कार्यक्रमकांसाठी संपूर्ण विकास मंचाचा समावेश होतो, ज्यामुळे शक्तिशाली " -"आणि संकीर्ण अनुप्रयोग निर्माण करता येतात." - -#: ../gnome-version.xml.in.in.h:2 -msgid "" -"GNOME includes most of what you see on your computer, including the file " -"manager, web browser, menus, and many applications." -msgstr "" -"GNOME मध्ये तुम्ही तुमच्या संगणकावरील दृश्य अशा बहुतांश बाबींचा समावेश होतो, जसे फाइल " -"व्यवस्थापक, वेब ब्राउझर, मेनू, आणि अनेक अनुप्रयोग." - -#. NOTE TO AUTHORS: Do not put anything in the following paragraphs that -#. will be substituted by the configure script. Otherwise you will break -#. the translations. -#: ../gnome-version.xml.in.in.h:6 -msgid "" -"GNOME is a Free, usable, stable, accessible desktop environment for the Unix-" -"like family of operating systems." -msgstr "" -"GNOME मुक्त, वापरण्यायोग्य, स्थिर, मिळवण्याजोगे Unix सारख्या कार्यकारी प्रणालींसाठी " -"कार्यस्थळ पर्यावरण आहे." - -#: ../gnome-version.xml.in.in.h:7 -msgid "" -"GNOME's focus on usability and accessibility, regular release cycle, and " -"strong corporate backing make it unique among Free Software desktops." -msgstr "" -"GNOME चा उपयुक्तता आणि उपलब्धतेवर जोर, नियमित प्रकाशन चक्र, आणि मजबूत व्यापारी समर्थन " -"हे त्यास मुक्त सॉफ्टवेअर डेस्कटॉप्समध्ये अद्वितीय बनवते." - -#: ../gnome-version.xml.in.in.h:8 -msgid "" -"GNOME's greatest strength is our strong community. Virtually anyone, with or " -"without coding skills, can contribute to making GNOME better." -msgstr "" -"GNOME ची सर्वात मोठी शक्ती आहे आमचा सशक्त समाज. जवळजवळ कोणीही, कोडिंगचे नैपुण्य असो " -"वा नसो, GNOME च्या सुधारणेस हातभार लावू शकतो." - -#: ../gnome-version.xml.in.in.h:9 -msgid "" -"Hundreds of people have contributed code to GNOME since it was started in " -"1997; many more have contributed in other important ways, including " -"translations, documentation, and quality assurance." -msgstr "" -"१९९७ मध्ये सुरू झाल्यापासून आजवर शेकडो लोकांनी GNOME साठी कोडचे योगदान केले आहे; इतर " -"अनेकांनी निरनिराळ्या महत्वाच्या मार्गांनी योगदान केले आहे, ज्यात अनुवाद, दस्तऐवजीकरण, आणि " -"दर्जा हमी यांचा समावेश होतो." - -#: ../libgnome-desktop/display-name.c:262 -msgid "Laptop" -msgstr "लॅपटॉप" - -#: ../libgnome-desktop/display-name.c:270 +#. Translators: "Unknown" here is used to identify a monitor for which +#. * we don't know the vendor. When a vendor is known, the name of the +#. * vendor is used. +#: ../libgnome-desktop/display-name.c:67 +#| msgid "Unknown" +msgctxt "Monitor vendor" msgid "Unknown" msgstr "अपरिचीत" -#: ../libgnome-desktop/gnome-desktop-item.c:220 -#, c-format -msgid "Error reading file '%s': %s" -msgstr "'%1s' फाइल वाचताना त्रुटि : %2s" - -#: ../libgnome-desktop/gnome-desktop-item.c:288 -#, c-format -msgid "Error rewinding file '%s': %s" -msgstr "'%1s' फाइलच्या रिवाइंडिंगमध्ये त्रुटि : %2s" - -# libgnome-desktop/gnome-desktop-item.c:334 -# libgnome-desktop/gnome-desktop-item.c:3026 -#: ../libgnome-desktop/gnome-desktop-item.c:377 -#: ../libgnome-desktop/gnome-desktop-item.c:3519 -msgid "No name" -msgstr "कोणतेही नाव नाही" - -#: ../libgnome-desktop/gnome-desktop-item.c:604 -#, c-format -msgid "File '%s' is not a regular file or directory." -msgstr "फाइल '%s' सामान्य फाइल किंवा डायरेक्ट्री नाही आहे." - -# libgnome-desktop/gnome-desktop-item.c:3307 -#: ../libgnome-desktop/gnome-desktop-item.c:788 -#, c-format -msgid "Error cannot find file id '%s'" -msgstr "फाइल आइडी '%s' सापडला नाही" - -#: ../libgnome-desktop/gnome-desktop-item.c:834 -#, c-format -msgid "No filename to save to" -msgstr "संचयीत करण्यासाठी कोणतेही फाइल-नाव दिले गेले नाही" - -#: ../libgnome-desktop/gnome-desktop-item.c:1819 -#, c-format -msgid "Starting %s" -msgstr "%s सुरु करत आहे" - -#: ../libgnome-desktop/gnome-desktop-item.c:2055 -#, c-format -msgid "No URL to launch" -msgstr "कोणताही URL उपलब्ध नाही" - -#: ../libgnome-desktop/gnome-desktop-item.c:2071 -#, c-format -msgid "Not a launchable item" -msgstr "चालवण्यायोग्य प्रोग्राम उपलब्ध नाही" - -# libgnome-desktop/gnome-desktop-item.c:1565 -#: ../libgnome-desktop/gnome-desktop-item.c:2081 -#, c-format -msgid "No command (Exec) to launch" -msgstr "चालवण्यायोग्य आदेश (Exec) उपलब्ध नाही" - -# libgnome-desktop/gnome-desktop-item.c:1578 -#: ../libgnome-desktop/gnome-desktop-item.c:2094 -#, c-format -msgid "Bad command (Exec) to launch" -msgstr "चालवण्यायोग्य आदेश(प्रोग्राम) खराब आहे" - -# libgnome-desktop/gnome-desktop-item.c:3083 -#: ../libgnome-desktop/gnome-desktop-item.c:3575 -#, c-format -msgid "Unknown encoding of: %s" -msgstr "%s ची अज्ञात एनकोडिंग" - -#: ../libgnome-desktop/gnome-desktop-utils.c:133 +#: ../libgnome-desktop/gnome-desktop-utils.c:134 msgid "Cannot find a terminal, using xterm, even if it may not work" msgstr "टर्मिनल आढळले नाही, xterm चा वापर करत आहे, जरी ते कार्य करत नसेल" -#: ../libgnome-desktop/gnome-rr.c:405 +#. Translators: a CRTC is a CRT Controller (this is X terminology). +#: ../libgnome-desktop/gnome-rr.c:451 #, c-format msgid "could not get the screen resources (CRTCs, outputs, modes)" msgstr "पडदा स्त्रोत (CRTCs, आऊटपुट, पद्धती) प्राप्त करणे अशक्य" -#: ../libgnome-desktop/gnome-rr.c:425 +#: ../libgnome-desktop/gnome-rr.c:471 #, c-format msgid "unhandled X error while getting the range of screen sizes" msgstr "पडदा आकाराचे क्षेत्र प्राप्त करतेवेळी न हाताळलेली X त्रुटी आढळली" -#: ../libgnome-desktop/gnome-rr.c:431 +#: ../libgnome-desktop/gnome-rr.c:477 #, c-format msgid "could not get the range of screen sizes" msgstr "पडदा आकारचे क्षेत्र प्राप्त करू शकले नाही" -#: ../libgnome-desktop/gnome-rr.c:657 +#: ../libgnome-desktop/gnome-rr.c:768 #, c-format msgid "RANDR extension is not present" msgstr "RANDR वाढ आढळले नाही" -#: ../libgnome-desktop/gnome-rr.c:923 +#: ../libgnome-desktop/gnome-rr.c:1569 #, c-format msgid "could not get information about output %d" msgstr "आउटपुट %d विषयी माहिती प्राप्त करण्यास अशक्य" @@ -260,94 +63,306 @@ #. Translators: the "position", "size", and "maximum" #. * words here are not keywords; please translate them #. * as usual. A CRTC is a CRT Controller (this is X terminology) -#: ../libgnome-desktop/gnome-rr.c:1261 +#: ../libgnome-desktop/gnome-rr.c:2128 #, c-format msgid "" -"requested position/size for CRTC %d is outside the allowed limit: position=" -"(%d, %d), size=(%d, %d), maximum=(%d, %d)" +"requested position/size for CRTC %d is outside the allowed limit: position=(%" +"d, %d), size=(%d, %d), maximum=(%d, %d)" msgstr "" -"CRTC %d करीता विनंतीकृत ठिकाण/आकार स्वीकार्य मर्यादा पलीकडे आहे: position(%d, %d), " +"CRTC %d करीता विनंतीकृत ठिकाण/आकार स्वीकार्य मर्यादा पलीकडे आहे: position(%d, " +"%d), " "size=(%d, %d), maximum=(%d, %d)" -#: ../libgnome-desktop/gnome-rr.c:1297 +#: ../libgnome-desktop/gnome-rr.c:2164 #, c-format msgid "could not set the configuration for CRTC %d" msgstr "CRTC %d करीता संयोजना निश्चित करू शकले नाही" -#: ../libgnome-desktop/gnome-rr.c:1409 +#: ../libgnome-desktop/gnome-rr.c:2309 #, c-format msgid "could not get information about CRTC %d" msgstr "CRTC %d विषयी माहिती प्राप्त करणे शक्य नाही" -#: ../libgnome-desktop/gnome-rr-config.c:1159 +#: ../libgnome-desktop/gnome-rr-config.c:553 +msgid "Laptop" +msgstr "लॅपटॉप" + +#: ../libgnome-desktop/gnome-rr-config.c:708 #, c-format msgid "" "none of the saved display configurations matched the active configuration" msgstr "साठवलेले प्रदर्शन संयोजना पैकी सक्रीय संयोजनाशी जुळू शकले नाही" +#: ../libgnome-desktop/gnome-rr-config.c:1477 +#, c-format +msgid "CRTC %d cannot drive output %s" +msgstr "CRTC %d आऊटपुट %s ला ड्राइव्ह करणे अशक्य" + +#: ../libgnome-desktop/gnome-rr-config.c:1484 +#, c-format +msgid "output %s does not support mode %dx%d@%dHz" +msgstr "आऊटपुट %s मोड %dx%d@%dHz करीता समर्थन पुरवत नाही" + +#: ../libgnome-desktop/gnome-rr-config.c:1495 +#, c-format +msgid "CRTC %d does not support rotation=%s" +msgstr "CRTC %d rotation=%s करीता समर्थन पुरवत नाही" + +#: ../libgnome-desktop/gnome-rr-config.c:1509 +#, c-format +msgid "" +"output %s does not have the same parameters as another cloned output:\n" +"existing mode = %d, new mode = %d\n" +"existing coordinates = (%d, %d), new coordinates = (%d, %d)\n" +"existing rotation = %s, new rotation = %s" +msgstr "" +"आऊटपुट %s कडे घटके इतर क्लोन आऊटपुट सारखे नाही:\n" +"existing mode = %d, new mode = %d\n" +"existing coordinates = (%d, %d), new coordinates = (%d, %d)\n" +"existing rotation = %s, new rotation = %s" + +#: ../libgnome-desktop/gnome-rr-config.c:1524 +#, c-format +msgid "cannot clone to output %s" +msgstr "आऊटपुट %s करीता क्लोन करणे अशक्य" + +#: ../libgnome-desktop/gnome-rr-config.c:1693 +#, c-format +msgid "Trying modes for CRTC %d\n" +msgstr "CRTC %d करीता मोडस् वापरून पहात आहे\n" + +#: ../libgnome-desktop/gnome-rr-config.c:1717 +#, c-format +msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n" +msgstr "" +"CRTC %d: मोड %dx%d@%dHz वापरून पाहत आहे, %dx%d@%dHz (पास %d) येथील आऊटपुटसह\n" + +#: ../libgnome-desktop/gnome-rr-config.c:1764 +#, c-format +msgid "" +"could not assign CRTCs to outputs:\n" +"%s" +msgstr "" +"CRTC करीता आऊटपुट लागू करणे अशक्य:\n" +"%s" + +#: ../libgnome-desktop/gnome-rr-config.c:1768 +#, c-format +msgid "" +"none of the selected modes were compatible with the possible modes:\n" +"%s" +msgstr "" +"संभाव्य मोडस्सह:\n" +"%s कोणतेहि निवडलेले मोडस् सहत्व नाही" + #. Translators: the "requested", "minimum", and #. * "maximum" words here are not keywords; please #. * translate them as usual. -#: ../libgnome-desktop/gnome-rr-config.c:1686 +#: ../libgnome-desktop/gnome-rr-config.c:1850 #, c-format msgid "" "required virtual size does not fit available size: requested=(%d, %d), " "minimum=(%d, %d), maximum=(%d, %d)" msgstr "" -"आवश्यक आभासी आकार उपलब्ध आकारात घट्ट बसत नाही: requested=(%d, %d), minimum=(%d, " +"आवश्यक आभासी आकार उपलब्ध आकारात घट्ट बसत नाही: requested=(%d, %d), minimum=(%" +"d, " "%d), maximum=(%d, %d)" -#: ../libgnome-desktop/gnome-rr-config.c:1700 -#, c-format -msgid "could not find a suitable configuration of screens" -msgstr "योग्य पडद्याची संयोजना आढळले नाही" - #. Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name() #. Translators: this is the feature where what you see on your laptop's #. * screen is the same as your external monitor. Here, "Mirror" is being #. * used as an adjective, not as a verb. For example, the Spanish #. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas". #. -#: ../libgnome-desktop/gnome-rr-labeler.c:210 +#: ../libgnome-desktop/gnome-rr-labeler.c:312 msgid "Mirror Screens" msgstr "मीरर सक्रीन्स्" #. Translators: This is the time format with date used #. in 24-hour mode. -#: ../js/ui/dateMenu.js:164 +#: ../libgnome-desktop/gnome-wall-clock.c:195 msgid "%a %b %e, %R:%S" msgstr "%a %b %e, %R:%S" -#: ../js/ui/dateMenu.js:165 +#: ../libgnome-desktop/gnome-wall-clock.c:196 msgid "%a %b %e, %R" msgstr "%a %b %e, %R" #. Translators: This is the time format without date used #. in 24-hour mode. -#: ../js/ui/dateMenu.js:169 +#: ../libgnome-desktop/gnome-wall-clock.c:200 msgid "%a %R:%S" msgstr "%a %R:%S" -#: ../js/ui/dateMenu.js:170 +#: ../libgnome-desktop/gnome-wall-clock.c:201 msgid "%a %R" msgstr "%a %R" #. Translators: This is a time format with date used #. for AM/PM. -#: ../js/ui/dateMenu.js:177 +#: ../libgnome-desktop/gnome-wall-clock.c:206 msgid "%a %b %e, %l:%M:%S %p" msgstr "%a %b %e, %l:%M:%S %p" -#: ../js/ui/dateMenu.js:178 +#: ../libgnome-desktop/gnome-wall-clock.c:207 msgid "%a %b %e, %l:%M %p" msgstr "%a %b %e, %l:%M %p" #. Translators: This is a time format without date used #. for AM/PM. -#: ../js/ui/dateMenu.js:182 +#: ../libgnome-desktop/gnome-wall-clock.c:211 msgid "%a %l:%M:%S %p" msgstr "%a %l:%M:%S %p" -#: ../js/ui/dateMenu.js:183 +#: ../libgnome-desktop/gnome-wall-clock.c:212 msgid "%a %l:%M %p" msgstr "%a %l:%M %p" + +#~ msgid "About GNOME" +#~ msgstr "GNOME विषयी" + +#~ msgid "Learn more about GNOME" +#~ msgstr "GNOME विषयी अधिक शिका" + +#~ msgid "News" +#~ msgstr "बातम्या" + +#~ msgid "GNOME Library" +#~ msgstr "GNOME लायब्ररी" + +#~ msgid "Friends of GNOME" +#~ msgstr "GNOME ची मित्रमंडळी" + +#~ msgid "Contact" +#~ msgstr "संपर्क" + +#~ msgid "The Mysterious GEGL" +#~ msgstr "गुढरम्य GEGL" + +#~ msgid "The Squeaky Rubber GNOME" +#~ msgstr "स्वीकी रब्बर GNOME" + +#~ msgid "Wanda The GNOME Fish" +#~ msgstr "वान्डा : GNOME मासळी" + +#~ msgid "_Open URL" +#~ msgstr "URL उघडा (_O)" + +#~ msgid "_Copy URL" +#~ msgstr "URL चे प्रत बनवा (_C)" + +#~ msgid "About the GNOME Desktop" +#~ msgstr "GNOME कार्यस्थळा विषयी " + +#~ msgid "%(name)s: %(value)s" +#~ msgstr "%(name)s: %(value)s" + +#~ msgid "Welcome to the GNOME Desktop" +#~ msgstr "GNOME कार्यस्थळात स्वागत आहे" + +#~ msgid "Brought to you by:" +#~ msgstr "तुमच्यापर्यंत आणले आहे यांनी:" + +#~ msgid "%(name)s: %(value)s" +#~ msgstr "%(name)s: %(value)s" + +#~ msgid "Version" +#~ msgstr "आवृत्ती" + +#~ msgid "Distributor" +#~ msgstr "वितरक" + +#~ msgid "Build Date" +#~ msgstr "बांधणी दिनांक" + +#~ msgid "Display information on this GNOME version" +#~ msgstr "GNOME आवृत्तीवर माहिती दर्शवा" + +#~ msgid "" +#~ "GNOME also includes a complete development platform for applications " +#~ "programmers, allowing the creation of powerful and complex applications." +#~ msgstr "" +#~ "GNOME मध्ये अनुप्रयोग कार्यक्रमकांसाठी संपूर्ण विकास मंचाचा समावेश होतो, ज्यामुळे " +#~ "शक्तिशाली आणि संकीर्ण अनुप्रयोग निर्माण करता येतात." + +#~ msgid "" +#~ "GNOME includes most of what you see on your computer, including the file " +#~ "manager, web browser, menus, and many applications." +#~ msgstr "" +#~ "GNOME मध्ये तुम्ही तुमच्या संगणकावरील दृश्य अशा बहुतांश बाबींचा समावेश होतो, जसे फाइल " +#~ "व्यवस्थापक, वेब ब्राउझर, मेनू, आणि अनेक अनुप्रयोग." + +#~ msgid "" +#~ "GNOME is a Free, usable, stable, accessible desktop environment for the " +#~ "Unix-like family of operating systems." +#~ msgstr "" +#~ "GNOME मुक्त, वापरण्यायोग्य, स्थिर, मिळवण्याजोगे Unix सारख्या कार्यकारी प्रणालींसाठी " +#~ "कार्यस्थळ पर्यावरण आहे." + +#~ msgid "" +#~ "GNOME's focus on usability and accessibility, regular release cycle, and " +#~ "strong corporate backing make it unique among Free Software desktops." +#~ msgstr "" +#~ "GNOME चा उपयुक्तता आणि उपलब्धतेवर जोर, नियमित प्रकाशन चक्र, आणि मजबूत व्यापारी " +#~ "समर्थन हे त्यास मुक्त सॉफ्टवेअर डेस्कटॉप्समध्ये अद्वितीय बनवते." + +#~ msgid "" +#~ "GNOME's greatest strength is our strong community. Virtually anyone, with " +#~ "or without coding skills, can contribute to making GNOME better." +#~ msgstr "" +#~ "GNOME ची सर्वात मोठी शक्ती आहे आमचा सशक्त समाज. जवळजवळ कोणीही, कोडिंगचे नैपुण्य " +#~ "असो वा नसो, GNOME च्या सुधारणेस हातभार लावू शकतो." + +#~ msgid "" +#~ "Hundreds of people have contributed code to GNOME since it was started in " +#~ "1997; many more have contributed in other important ways, including " +#~ "translations, documentation, and quality assurance." +#~ msgstr "" +#~ "1997 मध्ये सुरू झाल्यापासून आजवर शेकडो लोकांनी GNOME साठी कोडचे योगदान केले आहे; इतर " +#~ "अनेकांनी निरनिराळ्या महत्वाच्या मार्गांनी योगदान केले आहे, ज्यात अनुवाद, दस्तऐवजीकरण, " +#~ "आणि दर्जा हमी यांचा समावेश होतो." + +#~ msgid "Error reading file '%s': %s" +#~ msgstr "'%1s' फाइल वाचताना त्रुटि : %2s" + +#~ msgid "Error rewinding file '%s': %s" +#~ msgstr "'%1s' फाइलच्या रिवाइंडिंगमध्ये त्रुटि : %2s" + +# libgnome-desktop/gnome-desktop-item.c:334 +# libgnome-desktop/gnome-desktop-item.c:3026 +#~ msgid "No name" +#~ msgstr "कोणतेही नाव नाही" + +#~ msgid "File '%s' is not a regular file or directory." +#~ msgstr "फाइल '%s' सामान्य फाइल किंवा डायरेक्ट्री नाही आहे." + +# libgnome-desktop/gnome-desktop-item.c:3307 +#~ msgid "Error cannot find file id '%s'" +#~ msgstr "फाइल आइडी '%s' सापडला नाही" + +#~ msgid "No filename to save to" +#~ msgstr "संचयीत करण्यासाठी कोणतेही फाइल-नाव दिले गेले नाही" + +#~ msgid "Starting %s" +#~ msgstr "%s सुरु करत आहे" + +#~ msgid "No URL to launch" +#~ msgstr "कोणताही URL उपलब्ध नाही" + +#~ msgid "Not a launchable item" +#~ msgstr "चालवण्यायोग्य प्रोग्राम उपलब्ध नाही" + +# libgnome-desktop/gnome-desktop-item.c:1565 +#~ msgid "No command (Exec) to launch" +#~ msgstr "चालवण्यायोग्य आदेश (Exec) उपलब्ध नाही" + +# libgnome-desktop/gnome-desktop-item.c:1578 +#~ msgid "Bad command (Exec) to launch" +#~ msgstr "चालवण्यायोग्य आदेश(प्रोग्राम) खराब आहे" + +# libgnome-desktop/gnome-desktop-item.c:3083 +#~ msgid "Unknown encoding of: %s" +#~ msgstr "%s ची अज्ञात एनकोडिंग" + +#~ msgid "could not find a suitable configuration of screens" +#~ msgstr "योग्य पडद्याची संयोजना आढळले नाही"