diff -Nru gnome-screenshot-3.4.0/configure gnome-screenshot-3.4.1/configure --- gnome-screenshot-3.4.0/configure 2012-03-26 14:06:41.000000000 +0000 +++ gnome-screenshot-3.4.1/configure 2012-04-16 18:27:00.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-screenshot 3.4.0. +# Generated by GNU Autoconf 2.68 for gnome-screenshot 3.4.1. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -557,8 +557,8 @@ # Identity of this package. PACKAGE_NAME='gnome-screenshot' PACKAGE_TARNAME='gnome-screenshot' -PACKAGE_VERSION='3.4.0' -PACKAGE_STRING='gnome-screenshot 3.4.0' +PACKAGE_VERSION='3.4.1' +PACKAGE_STRING='gnome-screenshot 3.4.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1333,7 +1333,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-screenshot 3.4.0 to adapt to many kinds of systems. +\`configure' configures gnome-screenshot 3.4.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1405,7 +1405,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-screenshot 3.4.0:";; + short | recursive ) echo "Configuration of gnome-screenshot 3.4.1:";; esac cat <<\_ACEOF @@ -1521,7 +1521,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-screenshot configure 3.4.0 +gnome-screenshot configure 3.4.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1924,7 +1924,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-screenshot $as_me 3.4.0, which was +It was created by gnome-screenshot $as_me 3.4.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2896,7 +2896,7 @@ # Define the identity of the package. PACKAGE='gnome-screenshot' - VERSION='3.4.0' + VERSION='3.4.1' cat >>confdefs.h <<_ACEOF @@ -9374,7 +9374,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-screenshot $as_me 3.4.0, which was +This file was extended by gnome-screenshot $as_me 3.4.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9440,7 +9440,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-screenshot config.status 3.4.0 +gnome-screenshot config.status 3.4.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru gnome-screenshot-3.4.0/configure.ac gnome-screenshot-3.4.1/configure.ac --- gnome-screenshot-3.4.0/configure.ac 2012-03-26 14:06:03.000000000 +0000 +++ gnome-screenshot-3.4.1/configure.ac 2012-04-16 18:26:04.000000000 +0000 @@ -1,6 +1,6 @@ dnl -*- mode: m4 -*- AC_PREREQ(2.63) -AC_INIT([gnome-screenshot],[3.4.0],[],[gnome-screenshot]) +AC_INIT([gnome-screenshot],[3.4.1],[],[gnome-screenshot]) AC_CONFIG_HEADERS(config.h) AC_CONFIG_MACRO_DIR([m4]) diff -Nru gnome-screenshot-3.4.0/debian/changelog gnome-screenshot-3.4.1/debian/changelog --- gnome-screenshot-3.4.0/debian/changelog 2012-03-27 09:13:23.000000000 +0000 +++ gnome-screenshot-3.4.1/debian/changelog 2012-04-16 19:37:05.000000000 +0000 @@ -1,3 +1,9 @@ +gnome-screenshot (3.4.1-0ubuntu1) precise-proposed; urgency=low + + * New upstream version + + -- Sebastien Bacher Mon, 16 Apr 2012 21:32:59 +0200 + gnome-screenshot (3.4.0-0ubuntu1) precise-proposed; urgency=low * New upstream release: diff -Nru gnome-screenshot-3.4.0/NEWS gnome-screenshot-3.4.1/NEWS --- gnome-screenshot-3.4.0/NEWS 2012-03-26 14:06:25.000000000 +0000 +++ gnome-screenshot-3.4.1/NEWS 2012-04-16 18:26:47.000000000 +0000 @@ -1,3 +1,9 @@ +GNOME Screenshot 3.4.1 - 16th April 2012 +======================================== + +- Fall back to $HOME when XDG_PICTURES_DIR fails +- Translation updates + GNOME Screenshot 3.4.0 - 26th March 2012 ======================================== diff -Nru gnome-screenshot-3.4.0/po/ar.po gnome-screenshot-3.4.1/po/ar.po --- gnome-screenshot-3.4.0/po/ar.po 2011-10-06 18:33:41.000000000 +0000 +++ gnome-screenshot-3.4.1/po/ar.po 2012-04-16 15:38:20.000000000 +0000 @@ -4,14 +4,14 @@ # Sayed Jaffer Al-Mosawi , 2002. # Abdulaziz Al-Arfaj , 2004. # Djihed Afifi , 2006. -# Khaled Hosny , 2006, 2007, 2008, 2010, 2011. +# Khaled Hosny , 2006, 2007, 2008, 2010, 2011, 2012. # Anas Afif Emad \n" "Language-Team: Arabic \n" "Language: ar\n" @@ -20,199 +20,215 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -"X-Generator: Virtaal 0.6.1\n" - -#: ../src/gnome-screenshot.c:143 -msgid "Error while saving screenshot" -msgstr "حدث خطأ أثناء حفظ لقطة الشاشة" - -#: ../src/gnome-screenshot.c:147 -#, c-format -msgid "" -"Impossible to save the screenshot to %s.\n" -" Error was %s.\n" -" Please choose another location and retry." -msgstr "" -"تعذر حفظ لقطة الشاشة في %s.\n" -" الخطأ كان %s.\n" -" الرجاء اختيار موقع آخر ثم إعادة المحاولة." - -#: ../src/gnome-screenshot.c:336 -msgid "Screenshot taken" -msgstr "أُخِذت لقطة الشاشة" - -#: ../src/gnome-screenshot.c:495 -msgid "Unable to take a screenshot of the current window" -msgstr "تعذّر أخذ لقطة للنافذة الحالية." - -#: ../src/gnome-screenshot.c:662 -#, fuzzy -msgid "Send the grab directly to the clipboard" -msgstr "اضبط نموذج الرسم البياني" - -#: ../src/gnome-screenshot.c:663 -msgid "Grab a window instead of the entire screen" -msgstr "خذ صورة النافذة بدلا من كل الشاشة" - -#: ../src/gnome-screenshot.c:664 -msgid "Grab an area of the screen instead of the entire screen" -msgstr "خذ صورة لمنطقة من الشاشة بدلا من الشاشة كلها" - -#: ../src/gnome-screenshot.c:665 -msgid "Include the window border with the screenshot" -msgstr "ضمّن حدّ النافذ مع لقطة الشاشة" - -#: ../src/gnome-screenshot.c:666 -msgid "Remove the window border from the screenshot" -msgstr "أزل حدّ النافذ من لقطة الشاشة" - -#: ../src/gnome-screenshot.c:667 -msgid "Take screenshot after specified delay [in seconds]" -msgstr "خذ لقطة الشّاشة بعد مدة معيّنة [بالثواني]" - -#. translators: this is the last part of the "grab after a -#. * delay of seconds". -#. -#: ../src/gnome-screenshot.c:667 ../src/screenshot-interactive-dialog.c:423 -msgid "seconds" -msgstr "ثوان" - -#: ../src/gnome-screenshot.c:668 -msgid "Effect to add to the border (shadow, border or none)" -msgstr "التأثير المضاف للحافة (ظل، حافة أو لاشيء)" - -#: ../src/gnome-screenshot.c:668 -msgid "effect" -msgstr "التأثير" - -#: ../src/gnome-screenshot.c:669 -msgid "Interactively set options" -msgstr "حدد الخيارات تفاعليا" - -#: ../src/gnome-screenshot.c:680 -msgid "Take a picture of the screen" -msgstr "خذ صورة للشّاشة" +"X-Generator: Virtaal 0.7.0\n" +"X-Project-Style: gnome\n" #: ../src/gnome-screenshot.desktop.in.h:1 -msgid "Save images of your desktop or individual windows" -msgstr "احفظ صور لسطح مكتبك أو للنوافذ المنفردة" +msgid "Screenshot" +msgstr "لقطة للشاشة" #: ../src/gnome-screenshot.desktop.in.h:2 -#, fuzzy -msgid "Screenshot" -msgstr "Screenshot.png" +msgid "Save images of your desktop or individual windows" +msgstr "احفظ صور لسطح مكتبك أو للنوافذ المنفردة" #: ../src/gnome-screenshot.desktop.in.h:3 -#, fuzzy -msgid "Take a screenshot of the current window" -msgstr "تعذّر أخذ لقطة للنافذة الحالية." +msgid "Take a screenshot of the whole screen" +msgstr "خذ لقطة لكل الشاشة" #: ../src/gnome-screenshot.desktop.in.h:4 -#, fuzzy -msgid "Take a screenshot of the whole screen" -msgstr "خذ صورة للشّاشة" +msgid "Take a screenshot of the current window" +msgstr "خذ لقطة للنافذة الحالية" #: ../src/gnome-screenshot.ui.h:1 -msgid "*" -msgstr "*" +msgid "Save Screenshot" +msgstr "احفظ لقطة الشاشة" #: ../src/gnome-screenshot.ui.h:2 msgid "C_opy to Clipboard" msgstr "ا_نسخ إلى الحافظة" #: ../src/gnome-screenshot.ui.h:3 -msgid "Save Screenshot" -msgstr "احفظ لقطة الشاشة" +msgid "_Name:" +msgstr "الا_سم:" #: ../src/gnome-screenshot.ui.h:4 msgid "Save in _folder:" msgstr "احفظ في ال_مجلد:" #: ../src/gnome-screenshot.ui.h:5 -msgid "_Name:" -msgstr "الا_سم:" +msgid "*" +msgstr "*" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:1 -msgid "Border Effect" -msgstr "تأثير الحد" +msgid "Window-specific screenshot (deprecated)" +msgstr "لقطة شاشة مختصّة بنافذة (مُبطل)" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:2 msgid "" -"Effect to add to the outside of a border. Possible values are \"shadow\", " -"\"none\", and \"border\"." -msgstr "" -"التأثير المضاف لخارج الحافة. القيم الممكنة هي \"shadow\"، \"none\"، و " -"\"border\"." - -#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:3 -msgid "" "Grab just the current window, rather than the whole desktop. This key has " "been deprecated and it is no longer in use." msgstr "" "التقط صورة النافذة الحالية فقط، بدلاً من سطح المكتب بأكمله. أُبطل هذا المفتاح " "ولم يعد نافذا." +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:3 +msgid "Screenshot delay" +msgstr "تأخير لقطة الشاشة" + #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:4 -msgid "Include Border" -msgstr "اشمل الحدود" +msgid "The number of seconds to wait before taking the screenshot." +msgstr "عدد الثواني المنتظرة قبل أخذ لقطة الشاشة." #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:5 -#, fuzzy -msgid "Include ICC Profile" -msgstr "اشمل الحدود" +msgid "Screenshot directory" +msgstr "دليل لقطات الشّاشة" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:6 -msgid "Include Pointer" -msgstr "اشمل الحدود" +msgid "The directory where the screenshots will be saved by default." +msgstr "الدليل الذي ستُحفظ فيه لقطات الشاشة مبدئيا." #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:7 #, fuzzy -msgid "Include the ICC profile of the target in the screenshot file" -msgstr "اشمل حدّ النافذ مع صورة الشاشة" +msgid "Last save directory" +msgstr "دليل لقطات الشّاشة" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:8 -msgid "Include the pointer in the screenshot" -msgstr "اشمل حدّ النافذ مع صورة الشاشة" +#, fuzzy +msgid "The last directory a screenshot was saved in interactive mode." +msgstr "الدليل الذي تم حفظ لقطات الشاشة الأخيرة فيه." #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:9 -msgid "Include the window manager border along with the screenshot" -msgstr "اشمل حدّ مدير النوافذ مع لقطة الشاشة" +msgid "Include Border" +msgstr "اشمل الحدود" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:10 -msgid "Screenshot delay" -msgstr "تأخير لقطة الشاشة" +msgid "Include the window manager border along with the screenshot" +msgstr "اشمل حدّ مدير النوافذ مع لقطة الشاشة" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:11 -msgid "Screenshot directory" -msgstr "دليل لقطات الشّاشة" +msgid "Include Pointer" +msgstr "اشمل الحدود" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:12 -msgid "The directory the last screenshot was saved in." -msgstr "الدليل الذي تم حفظ لقطات الشاشة الأخيرة فيه." +msgid "Include the pointer in the screenshot" +msgstr "اشمل حدّ النافذ مع صورة الشاشة" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:13 -msgid "The number of seconds to wait before taking the screenshot." -msgstr "عدد الثواني المنتظرة قبل أخذ لقطة الشاشة." +#, fuzzy +msgid "Include ICC Profile" +msgstr "اشمل الحدود" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:14 -msgid "Window-specific screenshot (deprecated)" -msgstr "لقطة شاشة مختصّة بنافذة (مُبطل)" +#, fuzzy +msgid "Include the ICC profile of the target in the screenshot file" +msgstr "اشمل حدّ النافذ مع صورة الشاشة" + +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:15 +msgid "Border Effect" +msgstr "تأثير الحد" + +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:16 +msgid "" +"Effect to add to the outside of a border. Possible values are \"shadow\", " +"\"none\", and \"border\"." +msgstr "" +"التأثير المضاف لخارج الحافة. القيم الممكنة هي \"shadow\"، \"none\"، و " +"\"border\"." -#: ../src/screenshot-config.c:78 +#: ../src/screenshot-application.c:147 +#, c-format +msgid "A file named \"%s\" already exists in \"%s\"" +msgstr "الملف الذي اسمه \"%s\" موجود مسبقًا في \"%s\"" + +#: ../src/screenshot-application.c:154 +msgid "Overwrite existing file?" +msgstr "أأكتب فوق الملف؟" + +#: ../src/screenshot-application.c:175 ../src/screenshot-application.c:183 +#: ../src/screenshot-application.c:340 ../src/screenshot-application.c:343 +#: ../src/screenshot-application.c:386 ../src/screenshot-application.c:389 +msgid "Unable to capture a screenshot" +msgstr "تعذّر أخذ لقطة شاشة" + +#: ../src/screenshot-application.c:176 +msgid "Error creating file. Please choose another location and retry." +msgstr "حدث عطل أثناء إنشاء الملف. رجاء اختر موقعا آخر ثم إعادة المحاولة." + +#: ../src/screenshot-application.c:341 +msgid "Error creating file" +msgstr "حدث عطل أثناء إنشاء الملف." + +#: ../src/screenshot-application.c:348 ../src/screenshot-application.c:417 +msgid "Screenshot taken" +msgstr "أُخِذت لقطة الشاشة" + +#: ../src/screenshot-application.c:387 +msgid "All possible methods failed" +msgstr "فشل كل الطرق الممكنة" + +#: ../src/screenshot-application.c:502 +msgid "Send the grab directly to the clipboard" +msgstr "أرسل اللقطة مباشرة إلى الحافظة" + +#: ../src/screenshot-application.c:503 +msgid "Grab a window instead of the entire screen" +msgstr "خذ صورة النافذة بدلا من كل الشاشة" + +#: ../src/screenshot-application.c:504 +msgid "Grab an area of the screen instead of the entire screen" +msgstr "خذ صورة لمنطقة من الشاشة بدلا من الشاشة كلها" + +#: ../src/screenshot-application.c:505 +msgid "Include the window border with the screenshot" +msgstr "ضمّن حدّ النافذ مع لقطة الشاشة" + +#: ../src/screenshot-application.c:506 +msgid "Remove the window border from the screenshot" +msgstr "أزل حدّ النافذ من لقطة الشاشة" + +#: ../src/screenshot-application.c:507 +msgid "Take screenshot after specified delay [in seconds]" +msgstr "خذ لقطة الشّاشة بعد مدة معيّنة [بالثواني]" + +#. translators: this is the last part of the "grab after a +#. * delay of seconds". +#. +#: ../src/screenshot-application.c:507 +#: ../src/screenshot-interactive-dialog.c:426 +msgid "seconds" +msgstr "ثوان" + +#: ../src/screenshot-application.c:508 +msgid "Effect to add to the border (shadow, border or none)" +msgstr "التأثير المضاف للحافة (ظل، حافة أو لاشيء)" + +#: ../src/screenshot-application.c:508 +msgid "effect" +msgstr "التأثير" + +#: ../src/screenshot-application.c:509 +msgid "Interactively set options" +msgstr "حدد الخيارات تفاعليا" + +#: ../src/screenshot-application.c:523 +msgid "Take a picture of the screen" +msgstr "خذ صورة للشّاشة" + +#: ../src/screenshot-config.c:54 #, c-format msgid "" "Conflicting options: --window and --area should not be used at the same " "time.\n" msgstr "خيارات متضاربة: لا يمكن ‪--window‬ و ‪--area‬ في نفس الوقت.\n" -#: ../src/screenshot-config.c:85 -#, fuzzy, c-format +#: ../src/screenshot-config.c:61 +#, c-format msgid "" "Conflicting options: --area and --delay should not be used at the same " "time.\n" -msgstr "خيارات متضاربة: لا يمكن ‪--window‬ و ‪--area‬ في نفس الوقت.\n" +msgstr "خيارات متضاربة: لا يمكن استخدام ‪--delay‬ و ‪--area‬ في نفس الوقت.\n" -#: ../src/screenshot-dialog.c:193 +#: ../src/screenshot-dialog.c:171 msgid "" "UI definition file for the screenshot program is missing.\n" "Please check your installation of gnome-utils" @@ -220,28 +236,28 @@ "ملف تعريف الواجهة الرسوميّة لبرنامج صورة الشاشة غير موجود.\n" "الرجاء التأكد من تنصيب أدوات جنوم" -#: ../src/screenshot-dialog.c:214 +#: ../src/screenshot-dialog.c:192 msgid "Select a folder" msgstr "اختر مجلّدا" -#: ../src/screenshot-dialog.c:323 +#: ../src/screenshot-dialog.c:301 msgid "Screenshot.png" msgstr "Screenshot.png" #. translators: this is the name of the file that gets made up #. * with the screenshot if the entire screen is taken -#: ../src/screenshot-filename-builder.c:119 -#, fuzzy, c-format -msgid "Screenshot at %s.png" -msgstr "Screenshot-%s.png" +#: ../src/screenshot-filename-builder.c:122 +#, c-format +msgid "Screenshot from %s.png" +msgstr "لقطة شاشة من %s.png" #. translators: this is the name of the file that gets #. * made up with the screenshot if the entire screen is #. * taken -#: ../src/screenshot-filename-builder.c:126 -#, fuzzy, c-format -msgid "Screenshot at %s - %d.png" -msgstr "Screenshot-%s-%d.png" +#: ../src/screenshot-filename-builder.c:129 +#, c-format +msgid "Screenshot from %s - %d.png" +msgstr "لقطة شاشة من %s - %d.png" #: ../src/screenshot-interactive-dialog.c:165 msgid "None" @@ -284,23 +300,26 @@ #. translators: this is the first part of the "grab after a #. * delay of seconds". #. -#: ../src/screenshot-interactive-dialog.c:403 +#: ../src/screenshot-interactive-dialog.c:406 msgid "Grab _after a delay of" msgstr "التقط _بعد مدة" -#: ../src/screenshot-interactive-dialog.c:441 -#: ../src/screenshot-interactive-dialog.c:449 +#: ../src/screenshot-interactive-dialog.c:444 +#: ../src/screenshot-interactive-dialog.c:452 msgid "Take Screenshot" msgstr "خذ لقطة للشاشة" -#: ../src/screenshot-interactive-dialog.c:450 +#: ../src/screenshot-interactive-dialog.c:453 msgid "Effects" msgstr "التأثيرات" -#: ../src/screenshot-interactive-dialog.c:455 +#: ../src/screenshot-interactive-dialog.c:458 msgid "Take _Screenshot" msgstr "خذ _لقطة للشاشة" -#: ../src/screenshot-utils.c:702 +#: ../src/screenshot-utils.c:724 msgid "Error loading the help page" msgstr "خطأ عند تحميل صفحة المساعدة" + +#~ msgid "Error while saving screenshot" +#~ msgstr "حدث خطأ أثناء حفظ لقطة الشاشة" diff -Nru gnome-screenshot-3.4.0/po/ca@valencia.po gnome-screenshot-3.4.1/po/ca@valencia.po --- gnome-screenshot-3.4.0/po/ca@valencia.po 2011-10-06 18:33:44.000000000 +0000 +++ gnome-screenshot-3.4.1/po/ca@valencia.po 2012-04-16 15:38:20.000000000 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: gnome-utils\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-06 14:33-0400\n" -"PO-Revision-Date: 2011-09-06 23:22+0200\n" +"POT-Creation-Date: 2012-03-27 22:34+0200\n" +"PO-Revision-Date: 2012-03-10 18:09+0100\n" "Last-Translator: Joan Duran \n" "Language-Team: Catalan \n" "Language: ca-XV\n" @@ -21,179 +21,198 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ../src/gnome-screenshot.c:143 -msgid "Error while saving screenshot" -msgstr "S'ha produït un error en alçar la captura de pantalla" - -#: ../src/gnome-screenshot.c:147 -#, c-format -msgid "" -"Impossible to save the screenshot to %s.\n" -" Error was %s.\n" -" Please choose another location and retry." -msgstr "" -"No s'ha pogut alçar la captura de pantalla a %s.\n" -" L'error ha sigut %s.\n" -" Trieu una altra ubicació o torneu-ho a intentar." - -#: ../src/gnome-screenshot.c:336 -msgid "Screenshot taken" -msgstr "S'ha obtingut la captura de pantalla" - -#: ../src/gnome-screenshot.c:495 -msgid "Unable to take a screenshot of the current window" -msgstr "No s'ha pogut fer la captura de la finestra actual" - -#: ../src/gnome-screenshot.c:662 -msgid "Send the grab directly to the clipboard" -msgstr "Envia la captura directament al porta-retalls" - -#: ../src/gnome-screenshot.c:663 -msgid "Grab a window instead of the entire screen" -msgstr "Captura una finestra en lloc de tota la pantalla" - -#: ../src/gnome-screenshot.c:664 -msgid "Grab an area of the screen instead of the entire screen" -msgstr "Captura una àrea de la pantalla en lloc de tota la pantalla" - -#: ../src/gnome-screenshot.c:665 -msgid "Include the window border with the screenshot" -msgstr "Inclou la vora de la finestra en la captura" - -#: ../src/gnome-screenshot.c:666 -msgid "Remove the window border from the screenshot" -msgstr "Suprimeix la vora de la finestra en la captura de pantalla" - -#: ../src/gnome-screenshot.c:667 -msgid "Take screenshot after specified delay [in seconds]" -msgstr "Fes la captura al cap de l'estona indicada [en segons]" - -#. translators: this is the last part of the "grab after a -#. * delay of seconds". -#. -#: ../src/gnome-screenshot.c:667 ../src/screenshot-interactive-dialog.c:423 -msgid "seconds" -msgstr "segons" - -#: ../src/gnome-screenshot.c:668 -msgid "Effect to add to the border (shadow, border or none)" -msgstr "Efecte que s'afegirà a la vora (ombra, vora, o sense)" - -#: ../src/gnome-screenshot.c:668 -msgid "effect" -msgstr "efecte" - -#: ../src/gnome-screenshot.c:669 -msgid "Interactively set options" -msgstr "Estableix opcions interactivament" - -#: ../src/gnome-screenshot.c:680 -msgid "Take a picture of the screen" -msgstr "Fa una fotografia de la pantalla" - #: ../src/gnome-screenshot.desktop.in.h:1 -msgid "Save images of your desktop or individual windows" -msgstr "Alça imatges del vostre escriptori o de finestres individuals" - -#: ../src/gnome-screenshot.desktop.in.h:2 msgid "Screenshot" msgstr "Captura" +#: ../src/gnome-screenshot.desktop.in.h:2 +msgid "Save images of your desktop or individual windows" +msgstr "Alça imatges del vostre escriptori o de finestres individuals" + #: ../src/gnome-screenshot.desktop.in.h:3 -#, fuzzy -msgid "Take a screenshot of the current window" -msgstr "No s'ha pogut fer la captura de la finestra actual" +msgid "Take a screenshot of the whole screen" +msgstr "Fes una fotografia de tota la pantalla" #: ../src/gnome-screenshot.desktop.in.h:4 -#, fuzzy -msgid "Take a screenshot of the whole screen" -msgstr "Fa una fotografia de la pantalla" +msgid "Take a screenshot of the current window" +msgstr "Fes una captura de la finestra actual" #: ../src/gnome-screenshot.ui.h:1 -msgid "*" -msgstr "*" +msgid "Save Screenshot" +msgstr "Alça la captura" #: ../src/gnome-screenshot.ui.h:2 msgid "C_opy to Clipboard" msgstr "C_opia-ho al porta-retalls" #: ../src/gnome-screenshot.ui.h:3 -msgid "Save Screenshot" -msgstr "Alça la captura" +msgid "_Name:" +msgstr "_Nom:" #: ../src/gnome-screenshot.ui.h:4 msgid "Save in _folder:" msgstr "Alça en una _carpeta:" #: ../src/gnome-screenshot.ui.h:5 -msgid "_Name:" -msgstr "_Nom:" +msgid "*" +msgstr "*" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:1 -msgid "Border Effect" -msgstr "Efecte de la vora" +msgid "Window-specific screenshot (deprecated)" +msgstr "Captura de pantalla específica de finestres (desconsellat)" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:2 msgid "" -"Effect to add to the outside of a border. Possible values are \"shadow\", " -"\"none\", and \"border\"." -msgstr "" -"Efecte que s'afegirà a fora de la vora. Els valors possibles són " -"«shadow» (ombra), «none» (cap), i «border» (vora)." - -#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:3 -msgid "" "Grab just the current window, rather than the whole desktop. This key has " "been deprecated and it is no longer in use." msgstr "" "Captura només la finestra actual, en lloc de tot l'escriptori. Esta clau " "està desconsellada i no s'utilitza." +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:3 +msgid "Screenshot delay" +msgstr "Retard de la captura de pantalla" + #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:4 -msgid "Include Border" -msgstr "Inclou la vora" +msgid "The number of seconds to wait before taking the screenshot." +msgstr "El número de segons a esperar abans de fer la captura de pantalla." #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:5 -msgid "Include ICC Profile" -msgstr "Inclou el perfil ICC" +msgid "Screenshot directory" +msgstr "Directori on alçar les captures de pantalla" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:6 -msgid "Include Pointer" -msgstr "Inclou el punter" +msgid "The directory where the screenshots will be saved by default." +msgstr "El directori on s'alçaran les captures de pantalla per defecte." #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:7 -msgid "Include the ICC profile of the target in the screenshot file" -msgstr "Inclou el perfil ICC de l'objectiu al fitxer de la captura de pantalla" +msgid "Last save directory" +msgstr "Darrer directori de desament" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:8 -msgid "Include the pointer in the screenshot" -msgstr "Inclou el punter a la captura de pantalla" +msgid "The last directory a screenshot was saved in interactive mode." +msgstr "" +"El darrer directori on es va alçar la darrera captura de pantalla en mode " +"interactiu." #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:9 -msgid "Include the window manager border along with the screenshot" -msgstr "Inclou la vora del gestor de finestres en la captura" +msgid "Include Border" +msgstr "Inclou la vora" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:10 -msgid "Screenshot delay" -msgstr "Retard de la captura de pantalla" +msgid "Include the window manager border along with the screenshot" +msgstr "Inclou la vora del gestor de finestres en la captura" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:11 -msgid "Screenshot directory" -msgstr "Directori on alçar les captures de pantalla" +msgid "Include Pointer" +msgstr "Inclou el punter" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:12 -msgid "The directory the last screenshot was saved in." -msgstr "El darrer directori on es va alçar la darrera captura de pantalla." +msgid "Include the pointer in the screenshot" +msgstr "Inclou el punter a la captura de pantalla" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:13 -msgid "The number of seconds to wait before taking the screenshot." -msgstr "El número de segons a esperar abans de fer la captura de pantalla." +msgid "Include ICC Profile" +msgstr "Inclou el perfil ICC" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:14 -msgid "Window-specific screenshot (deprecated)" -msgstr "Captura de pantalla específica de finestres (desconsellat)" +msgid "Include the ICC profile of the target in the screenshot file" +msgstr "Inclou el perfil ICC de l'objectiu al fitxer de la captura de pantalla" + +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:15 +msgid "Border Effect" +msgstr "Efecte de la vora" -#: ../src/screenshot-config.c:78 +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:16 +msgid "" +"Effect to add to the outside of a border. Possible values are \"shadow\", " +"\"none\", and \"border\"." +msgstr "" +"Efecte que s'afegirà a fora de la vora. Els valors possibles són " +"«shadow» (ombra), «none» (cap), i «border» (vora)." + +#: ../src/screenshot-application.c:147 +#, c-format +msgid "A file named \"%s\" already exists in \"%s\"" +msgstr "Ja existeix un fitxer anomenat «%s» a «%s»" + +#: ../src/screenshot-application.c:154 +msgid "Overwrite existing file?" +msgstr "Voleu sobreescriure el fitxer existent?" + +#: ../src/screenshot-application.c:175 ../src/screenshot-application.c:183 +#: ../src/screenshot-application.c:340 ../src/screenshot-application.c:343 +#: ../src/screenshot-application.c:386 ../src/screenshot-application.c:389 +msgid "Unable to capture a screenshot" +msgstr "No s'ha pogut fer la captura de pantalla" + +#: ../src/screenshot-application.c:176 +msgid "Error creating file. Please choose another location and retry." +msgstr "" +"S'ha produït un error en crear el fitxer. Hauríeu de seleccionar una altra " +"ubicació i tornar-ho a intentar." + +#: ../src/screenshot-application.c:341 +msgid "Error creating file" +msgstr "S'ha produït un error en crear el fitxer" + +#: ../src/screenshot-application.c:348 ../src/screenshot-application.c:417 +msgid "Screenshot taken" +msgstr "S'ha obtingut la captura de pantalla" + +#: ../src/screenshot-application.c:387 +msgid "All possible methods failed" +msgstr "Han fallat tots els mètodes possibles" + +#: ../src/screenshot-application.c:502 +msgid "Send the grab directly to the clipboard" +msgstr "Envia la captura directament al porta-retalls" + +#: ../src/screenshot-application.c:503 +msgid "Grab a window instead of the entire screen" +msgstr "Captura una finestra en lloc de tota la pantalla" + +#: ../src/screenshot-application.c:504 +msgid "Grab an area of the screen instead of the entire screen" +msgstr "Captura una àrea de la pantalla en lloc de tota la pantalla" + +#: ../src/screenshot-application.c:505 +msgid "Include the window border with the screenshot" +msgstr "Inclou la vora de la finestra en la captura" + +#: ../src/screenshot-application.c:506 +msgid "Remove the window border from the screenshot" +msgstr "Suprimeix la vora de la finestra en la captura de pantalla" + +#: ../src/screenshot-application.c:507 +msgid "Take screenshot after specified delay [in seconds]" +msgstr "Fes la captura al cap de l'estona indicada [en segons]" + +#. translators: this is the last part of the "grab after a +#. * delay of seconds". +#. +#: ../src/screenshot-application.c:507 +#: ../src/screenshot-interactive-dialog.c:426 +msgid "seconds" +msgstr "segons" + +#: ../src/screenshot-application.c:508 +msgid "Effect to add to the border (shadow, border or none)" +msgstr "Efecte que s'afegirà a la vora (ombra, vora, o sense)" + +#: ../src/screenshot-application.c:508 +msgid "effect" +msgstr "efecte" + +#: ../src/screenshot-application.c:509 +msgid "Interactively set options" +msgstr "Estableix opcions interactivament" + +#: ../src/screenshot-application.c:523 +msgid "Take a picture of the screen" +msgstr "Fa una fotografia de la pantalla" + +#: ../src/screenshot-config.c:54 #, c-format msgid "" "Conflicting options: --window and --area should not be used at the same " @@ -202,16 +221,16 @@ "Conflicte d'opcions: no es poden utilitzar al mateix temps --window i --" "area.\n" -#: ../src/screenshot-config.c:85 -#, fuzzy, c-format +#: ../src/screenshot-config.c:61 +#, c-format msgid "" "Conflicting options: --area and --delay should not be used at the same " "time.\n" msgstr "" -"Conflicte d'opcions: no es poden utilitzar al mateix temps --window i --" +"Conflicte d'opcions: no es poden utilitzar al mateix temps --delay i --" "area.\n" -#: ../src/screenshot-dialog.c:193 +#: ../src/screenshot-dialog.c:171 msgid "" "UI definition file for the screenshot program is missing.\n" "Please check your installation of gnome-utils" @@ -220,29 +239,29 @@ "captura de pantalles.\n" "Comproveu la instal·lació del gnome-utils" -#: ../src/screenshot-dialog.c:214 +#: ../src/screenshot-dialog.c:192 msgid "Select a folder" msgstr "Seleccioneu un directori" -#: ../src/screenshot-dialog.c:323 +#: ../src/screenshot-dialog.c:301 msgid "Screenshot.png" msgstr "Captura.png" -# Captura enlloc d'instantània per evitar problemes amb caràcters no ascii +# Captura en lloc d'instantània per evitar problemes amb caràcters no ascii #. translators: this is the name of the file that gets made up #. * with the screenshot if the entire screen is taken -#: ../src/screenshot-filename-builder.c:119 +#: ../src/screenshot-filename-builder.c:122 #, c-format -msgid "Screenshot at %s.png" -msgstr "Captura a %s.png" +msgid "Screenshot from %s.png" +msgstr "Captura de %s.png" #. translators: this is the name of the file that gets #. * made up with the screenshot if the entire screen is #. * taken -#: ../src/screenshot-filename-builder.c:126 +#: ../src/screenshot-filename-builder.c:129 #, c-format -msgid "Screenshot at %s - %d.png" -msgstr "Captura a %s - %d.png" +msgid "Screenshot from %s - %d.png" +msgstr "Captura de %s - %d.png" #: ../src/screenshot-interactive-dialog.c:165 msgid "None" @@ -285,23 +304,26 @@ #. translators: this is the first part of the "grab after a #. * delay of seconds". #. -#: ../src/screenshot-interactive-dialog.c:403 +#: ../src/screenshot-interactive-dialog.c:406 msgid "Grab _after a delay of" msgstr "Captura _al cap de" -#: ../src/screenshot-interactive-dialog.c:441 -#: ../src/screenshot-interactive-dialog.c:449 +#: ../src/screenshot-interactive-dialog.c:444 +#: ../src/screenshot-interactive-dialog.c:452 msgid "Take Screenshot" msgstr "Feu una captura de pantalla" -#: ../src/screenshot-interactive-dialog.c:450 +#: ../src/screenshot-interactive-dialog.c:453 msgid "Effects" msgstr "Efectes" -#: ../src/screenshot-interactive-dialog.c:455 +#: ../src/screenshot-interactive-dialog.c:458 msgid "Take _Screenshot" msgstr "Fes una _captura de pantalla" -#: ../src/screenshot-utils.c:702 +#: ../src/screenshot-utils.c:724 msgid "Error loading the help page" msgstr "S'ha produït un error en carregar la pàgina d'ajuda" + +#~ msgid "Error while saving screenshot" +#~ msgstr "S'ha produït un error en desar la captura de pantalla" diff -Nru gnome-screenshot-3.4.0/po/ja.po gnome-screenshot-3.4.1/po/ja.po --- gnome-screenshot-3.4.0/po/ja.po 2012-01-12 15:48:09.000000000 +0000 +++ gnome-screenshot-3.4.1/po/ja.po 2012-04-16 15:38:20.000000000 +0000 @@ -19,9 +19,9 @@ "Project-Id-Version: gnome-screenshot master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "screenshot&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-11-15 08:02+0000\n" -"PO-Revision-Date: 2012-01-03 23:44+0900\n" -"Last-Translator: Jiro Matsuzawa \n" +"POT-Creation-Date: 2012-03-30 10:02+0000\n" +"PO-Revision-Date: 2012-04-03 20:14+0900\n" +"Last-Translator: Kentaro KAZUHAMA \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,126 +29,48 @@ "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../src/gnome-screenshot.c:143 -msgid "Error while saving screenshot" -msgstr "スクリーンショットを保存する際にエラーが発生しました" - -#: ../src/gnome-screenshot.c:147 -#, c-format -msgid "" -"Impossible to save the screenshot to %s.\n" -" Error was %s.\n" -" Please choose another location and retry." -msgstr "" -"スクリーンショットを %s へ保存できません。\n" -" エラー: %s\n" -"別の場所を選択して、もう一度実行してみてください。" - -#: ../src/gnome-screenshot.c:336 -msgid "Screenshot taken" -msgstr "スクリーンショットを撮影しました" - -#: ../src/gnome-screenshot.c:495 -msgid "Unable to take a screenshot of the current window" -msgstr "ウィンドウのスクリーンショットを撮れません" - -#: ../src/gnome-screenshot.c:666 -msgid "Send the grab directly to the clipboard" -msgstr "取得したスクリーンショットをクリップボードへ直接送信する" - -#: ../src/gnome-screenshot.c:667 -msgid "Grab a window instead of the entire screen" -msgstr "画面全体ではなくウィンドウ単体を取得する" - -#: ../src/gnome-screenshot.c:668 -msgid "Grab an area of the screen instead of the entire screen" -msgstr "画面全体ではなく一部を取得する" - -#: ../src/gnome-screenshot.c:669 -msgid "Include the window border with the screenshot" -msgstr "スクリーンショットにウィンドウの境界を含める" - -#: ../src/gnome-screenshot.c:670 -msgid "Remove the window border from the screenshot" -msgstr "スクリーンショットからウィンドウの境界を取り除く" - -#: ../src/gnome-screenshot.c:671 -msgid "Take screenshot after specified delay [in seconds]" -msgstr "指定した時間を経過してからスクリーンショットを撮る [秒単位]" - -#. translators: this is the last part of the "grab after a -#. * delay of seconds". -#. -#: ../src/gnome-screenshot.c:671 ../src/screenshot-interactive-dialog.c:423 -msgid "seconds" -msgstr "秒" - -#: ../src/gnome-screenshot.c:672 -msgid "Effect to add to the border (shadow, border or none)" -msgstr "境界の縁に適用するエフェクトを指定する (shadow、border、または none)" - -#: ../src/gnome-screenshot.c:672 -msgid "effect" -msgstr "エフェクト" - -#: ../src/gnome-screenshot.c:673 -msgid "Interactively set options" -msgstr "設定ダイアログを表示する" - -#: ../src/gnome-screenshot.c:682 -msgid "Take a picture of the screen" -msgstr "画面のスクリーンショットを撮る" - #: ../src/gnome-screenshot.desktop.in.h:1 -msgid "Save images of your desktop or individual windows" -msgstr "デスクトップ全体またはウィンドウの画像を保存します" - -#: ../src/gnome-screenshot.desktop.in.h:2 msgid "Screenshot" msgstr "スクリーンショット" -#: ../src/gnome-screenshot.desktop.in.h:3 -msgid "Take a screenshot of the current window" -msgstr "現在のウィンドウのスクリーンショットを撮る" +#: ../src/gnome-screenshot.desktop.in.h:2 +msgid "Save images of your desktop or individual windows" +msgstr "デスクトップ全体またはウィンドウの画像を保存します" -#: ../src/gnome-screenshot.desktop.in.h:4 +#: ../src/gnome-screenshot.desktop.in.h:3 msgid "Take a screenshot of the whole screen" msgstr "画面全体のスクリーンショットを撮る" +#: ../src/gnome-screenshot.desktop.in.h:4 +msgid "Take a screenshot of the current window" +msgstr "現在のウィンドウのスクリーンショットを撮る" + #: ../src/gnome-screenshot.ui.h:1 -msgid "*" -msgstr "*" +msgid "Save Screenshot" +msgstr "スクリーンショットの保存" #: ../src/gnome-screenshot.ui.h:2 msgid "C_opy to Clipboard" msgstr "クリップボードにコピーする(_O)" #: ../src/gnome-screenshot.ui.h:3 -msgid "Save Screenshot" -msgstr "スクリーンショットの保存" +msgid "_Name:" +msgstr "名前(_N):" #: ../src/gnome-screenshot.ui.h:4 msgid "Save in _folder:" msgstr "保存するフォルダー(_F):" #: ../src/gnome-screenshot.ui.h:5 -msgid "_Name:" -msgstr "名前(_N):" +msgid "*" +msgstr "*" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:1 -msgid "Border Effect" -msgstr "追加するエフェクト" +msgid "Window-specific screenshot (deprecated)" +msgstr "【廃止】ウィンドウだけスクリーンショットを撮るかどうか" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:2 msgid "" -"Effect to add to the outside of a border. Possible values are \"shadow\", " -"\"none\", and \"border\"." -msgstr "" -"画像の境界の縁に適用するエフェクトです。選択可能な値: \"shadow\"、\"none\"、" -"\"border\"" - -#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:3 -msgid "" "Grab just the current window, rather than the whole desktop. This key has " "been deprecated and it is no longer in use." msgstr "" @@ -156,51 +78,147 @@ "はなく、現在フォーカスが当たっているウィンドウのスクリーンショットを撮りま" "す。" +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:3 +msgid "Screenshot delay" +msgstr "撮影までの待機時間" + #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:4 -msgid "Include Border" -msgstr "ウィンドウの境界を含める" +msgid "The number of seconds to wait before taking the screenshot." +msgstr "スクリーンショットを撮るまでに待機する時間 (単位は秒) です。" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:5 -msgid "Include ICC Profile" -msgstr "ICC プロファイルを含める" +msgid "Screenshot directory" +msgstr "スクリーンショットのフォルダー" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:6 -msgid "Include Pointer" -msgstr "マウスのポインターを含める" +msgid "The directory where the screenshots will be saved by default." +msgstr "デフォルトでスクリーンショットを保存するディレクトリーです。" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:7 -msgid "Include the ICC profile of the target in the screenshot file" -msgstr "スクリーンショットにターゲットの ICC プロファイルを含める" +msgid "Last save directory" +msgstr "最後に保存したディレクトリー" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:8 -msgid "Include the pointer in the screenshot" -msgstr "スクリーンショットにマウスのポインターを含める" +msgid "The last directory a screenshot was saved in interactive mode." +msgstr "" +"インタラクティブモードでスクリーンショットを保存したディレクトリーです。" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:9 -msgid "Include the window manager border along with the screenshot" -msgstr "スクリーンショットにウィンドウの境界を含める" +msgid "Include Border" +msgstr "ウィンドウの境界を含める" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:10 -msgid "Screenshot delay" -msgstr "撮影までの待機時間" +msgid "Include the window manager border along with the screenshot" +msgstr "スクリーンショットにウィンドウの境界を含める" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:11 -msgid "Screenshot directory" -msgstr "スクリーンショットのフォルダー" +msgid "Include Pointer" +msgstr "マウスのポインターを含める" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:12 -msgid "The directory the last screenshot was saved in." -msgstr "最後にスクリーンショットを保存したフォルダーです。" +msgid "Include the pointer in the screenshot" +msgstr "スクリーンショットにマウスのポインターを含める" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:13 -msgid "The number of seconds to wait before taking the screenshot." -msgstr "スクリーンショットを撮るまでに待機する時間 (単位は秒) です。" +msgid "Include ICC Profile" +msgstr "ICC プロファイルを含める" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:14 -msgid "Window-specific screenshot (deprecated)" -msgstr "【廃止】ウィンドウだけスクリーンショットを撮るかどうか" +msgid "Include the ICC profile of the target in the screenshot file" +msgstr "スクリーンショットにターゲットの ICC プロファイルを含める" + +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:15 +msgid "Border Effect" +msgstr "追加するエフェクト" + +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:16 +msgid "" +"Effect to add to the outside of a border. Possible values are \"shadow\", " +"\"none\", and \"border\"." +msgstr "" +"画像の境界の縁に適用するエフェクトです。選択可能な値: \"shadow\"、\"none\"、" +"\"border\"" -#: ../src/screenshot-config.c:78 +#: ../src/screenshot-application.c:147 +#, c-format +msgid "A file named \"%s\" already exists in \"%s\"" +msgstr "ファイル \"%s\" はすでに \"%s\" にあります" + +#: ../src/screenshot-application.c:154 +msgid "Overwrite existing file?" +msgstr "既存のファイルを上書きしますか?" + +#: ../src/screenshot-application.c:175 ../src/screenshot-application.c:183 +#: ../src/screenshot-application.c:340 ../src/screenshot-application.c:343 +#: ../src/screenshot-application.c:386 ../src/screenshot-application.c:389 +msgid "Unable to capture a screenshot" +msgstr "スクリーンショットを取得できません" + +#: ../src/screenshot-application.c:176 +msgid "Error creating file. Please choose another location and retry." +msgstr "ファイルの作成エラー。他の場所を選択するか、もう一度試してください。" + +#: ../src/screenshot-application.c:341 +msgid "Error creating file" +msgstr "ファイル作成エラー" + +#: ../src/screenshot-application.c:348 ../src/screenshot-application.c:417 +msgid "Screenshot taken" +msgstr "スクリーンショットを撮影しました" + +#: ../src/screenshot-application.c:387 +msgid "All possible methods failed" +msgstr "すべての方法で失敗しました" + +#: ../src/screenshot-application.c:502 +msgid "Send the grab directly to the clipboard" +msgstr "取得したスクリーンショットをクリップボードへ直接送信する" + +#: ../src/screenshot-application.c:503 +msgid "Grab a window instead of the entire screen" +msgstr "画面全体ではなくウィンドウ単体を取得する" + +#: ../src/screenshot-application.c:504 +msgid "Grab an area of the screen instead of the entire screen" +msgstr "画面全体ではなく一部を取得する" + +#: ../src/screenshot-application.c:505 +msgid "Include the window border with the screenshot" +msgstr "スクリーンショットにウィンドウの境界を含める" + +#: ../src/screenshot-application.c:506 +msgid "Remove the window border from the screenshot" +msgstr "スクリーンショットからウィンドウの境界を取り除く" + +#: ../src/screenshot-application.c:507 +msgid "Take screenshot after specified delay [in seconds]" +msgstr "指定した時間を経過してからスクリーンショットを撮る [秒単位]" + +#. translators: this is the last part of the "grab after a +#. * delay of seconds". +#. +#: ../src/screenshot-application.c:507 +#: ../src/screenshot-interactive-dialog.c:426 +msgid "seconds" +msgstr "秒" + +#: ../src/screenshot-application.c:508 +msgid "Effect to add to the border (shadow, border or none)" +msgstr "境界の縁に適用するエフェクトを指定する (shadow、border、または none)" + +#: ../src/screenshot-application.c:508 +msgid "effect" +msgstr "エフェクト" + +#: ../src/screenshot-application.c:509 +msgid "Interactively set options" +msgstr "設定ダイアログを表示する" + +#: ../src/screenshot-application.c:523 +msgid "Take a picture of the screen" +msgstr "画面のスクリーンショットを撮る" + +#: ../src/screenshot-config.c:54 #, c-format msgid "" "Conflicting options: --window and --area should not be used at the same " @@ -209,7 +227,7 @@ "オプションの競合: --window オプションと --area オプションは同時に指定できませ" "ん\n" -#: ../src/screenshot-config.c:85 +#: ../src/screenshot-config.c:61 #, c-format msgid "" "Conflicting options: --area and --delay should not be used at the same " @@ -236,18 +254,18 @@ #. translators: this is the name of the file that gets made up #. * with the screenshot if the entire screen is taken -#: ../src/screenshot-filename-builder.c:119 +#: ../src/screenshot-filename-builder.c:122 #, c-format -msgid "Screenshot at %s.png" -msgstr "Screenshot-%s.png" +msgid "Screenshot from %s.png" +msgstr "Screenshot_from_%s.png" #. translators: this is the name of the file that gets #. * made up with the screenshot if the entire screen is #. * taken -#: ../src/screenshot-filename-builder.c:126 +#: ../src/screenshot-filename-builder.c:129 #, c-format -msgid "Screenshot at %s - %d.png" -msgstr "Screenshot-%s-%d.png" +msgid "Screenshot from %s - %d.png" +msgstr "Screenshot_from_%s_%d.png" #: ../src/screenshot-interactive-dialog.c:165 msgid "None" @@ -290,23 +308,26 @@ #. translators: this is the first part of the "grab after a #. * delay of seconds". #. -#: ../src/screenshot-interactive-dialog.c:403 +#: ../src/screenshot-interactive-dialog.c:406 msgid "Grab _after a delay of" msgstr "取得するまでの待ち時間(_A): " -#: ../src/screenshot-interactive-dialog.c:441 -#: ../src/screenshot-interactive-dialog.c:449 +#: ../src/screenshot-interactive-dialog.c:444 +#: ../src/screenshot-interactive-dialog.c:452 msgid "Take Screenshot" msgstr "スクリーンショットの取得" -#: ../src/screenshot-interactive-dialog.c:450 +#: ../src/screenshot-interactive-dialog.c:453 msgid "Effects" msgstr "エフェクト" -#: ../src/screenshot-interactive-dialog.c:455 +#: ../src/screenshot-interactive-dialog.c:458 msgid "Take _Screenshot" msgstr "スクリーンショットの取得(_S)" -#: ../src/screenshot-utils.c:713 +#: ../src/screenshot-utils.c:724 msgid "Error loading the help page" msgstr "ヘルプを読み込む際にエラー" + +#~ msgid "Error while saving screenshot" +#~ msgstr "スクリーンショットを保存する際にエラーが発生しました" diff -Nru gnome-screenshot-3.4.0/po/ko.po gnome-screenshot-3.4.1/po/ko.po --- gnome-screenshot-3.4.0/po/ko.po 2012-03-19 15:02:08.000000000 +0000 +++ gnome-screenshot-3.4.1/po/ko.po 2012-04-16 15:38:20.000000000 +0000 @@ -2,22 +2,17 @@ # This file is distributed under the same license as the gnome-util package. # # update by Young-Ho, Cha , 2001 -# Changwoo Ryu , 1998, 2002-2006, 2007, 2008, 2009, 2010, 2011. # Seong-ho Cho , 2012. +# Changwoo Ryu , 1998, 2002-2012. # -# 새로 번역하시는 분은 아래 translator-credits에 추가하세요. -# -# 주의: -# - Baobab은 "바오밥"으로 음역 # msgid "" msgstr "" "Project-Id-Version: gnome-utils\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" -"screenshot&keywords=I18N+L10N&component=general\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-screenshot&keywords=I18N+L10N&component=general\n" "POT-Creation-Date: 2012-03-05 16:10+0000\n" -"PO-Revision-Date: 2012-03-06 06:22+0900\n" -"Last-Translator: Seong-ho Cho \n" +"PO-Revision-Date: 2012-03-30 19:01+0900\n" +"Last-Translator: Changwoo Ryu \n" "Language-Team: GNOME Korea \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -87,7 +82,7 @@ #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:6 msgid "The directory where the screenshots will be saved by default." -msgstr "기본으로 저장할 스크린샷의 디렉터리입니다." +msgstr "스크린샷을 저장할 디렉터리 기본값." #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:7 msgid "Last save directory" @@ -95,7 +90,7 @@ #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:8 msgid "The last directory a screenshot was saved in interactive mode." -msgstr "대화식 모드로 저장한 스크린샷의 최근 디렉터리입니다." +msgstr "대화식 모드로 저장한 스크린샷의 최근 디렉터리." #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:9 msgid "Include Border" @@ -103,7 +98,7 @@ #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:10 msgid "Include the window manager border along with the screenshot" -msgstr "화면을 잡을 때 창 관리자 테두리도 포함" +msgstr "화면을 잡을 때 창 관리자 테두리도 포함합니다" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:11 msgid "Include Pointer" @@ -129,18 +124,16 @@ msgid "" "Effect to add to the outside of a border. Possible values are \"shadow\", " "\"none\", and \"border\"." -msgstr "" -"테두리에 바깥 쪽에 넣을 효과. 쓸 수 있는 값은 \"shadow\", \"none\", \"border" -"\"입니다." +msgstr "테두리 바깥 쪽에 넣을 효과. 쓸 수 있는 값은 \"shadow\", \"none\", \"border\"." #: ../src/screenshot-application.c:147 #, c-format msgid "A file named \"%s\" already exists in \"%s\"" -msgstr "\"%s\" 파일이 \"%s\"에 이미 존재합니다" +msgstr "\"%s\" 파일이 \"%s\"에 이미 있습니다" #: ../src/screenshot-application.c:154 msgid "Overwrite existing file?" -msgstr "현재 파일을 덮어씁니까?" +msgstr "기존 파일을 덮어쓰시겠습니까?" #: ../src/screenshot-application.c:175 ../src/screenshot-application.c:183 #: ../src/screenshot-application.c:340 ../src/screenshot-application.c:343 @@ -240,24 +233,27 @@ msgid "Select a folder" msgstr "폴더 선택" +# 주의: 이건 파일 이름임 .png로 끝나야 함 #: ../src/screenshot-dialog.c:301 msgid "Screenshot.png" -msgstr "화면.png" +msgstr "스크린샷.png" +# 주의: 이건 파일 이름임 .png로 끝나야 함 #. translators: this is the name of the file that gets made up #. * with the screenshot if the entire screen is taken #: ../src/screenshot-filename-builder.c:122 #, c-format msgid "Screenshot from %s.png" -msgstr "%s.png 스크린샷" +msgstr "스크린샷, %s.png" +# 주의: 이건 파일 이름임 .png로 끝나야 함 #. translators: this is the name of the file that gets #. * made up with the screenshot if the entire screen is #. * taken #: ../src/screenshot-filename-builder.c:129 #, c-format msgid "Screenshot from %s - %d.png" -msgstr "%s - %d.png 스크린샷" +msgstr "스크린샷, %s - %d.png" #: ../src/screenshot-interactive-dialog.c:165 msgid "None" @@ -320,6 +316,3 @@ #: ../src/screenshot-utils.c:724 msgid "Error loading the help page" msgstr "도움말 페이지를 읽어들이는 데 오류" - -#~ msgid "Error while saving screenshot" -#~ msgstr "스크린샷을 저장하는 데 오류가 발생했습니다" diff -Nru gnome-screenshot-3.4.0/po/lv.po gnome-screenshot-3.4.1/po/lv.po --- gnome-screenshot-3.4.0/po/lv.po 2012-03-19 15:02:08.000000000 +0000 +++ gnome-screenshot-3.4.1/po/lv.po 2012-04-16 18:25:56.000000000 +0000 @@ -7,27 +7,27 @@ # Raivis Dejus , 2006, 2007, 2009. # Rūdolfs Mazurs , 2010, 2011. # Rudolfs , 2011. -# Rūdofls Mazurs , 2011. +# Rūdofls Mazurs , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: lv\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "screenshot&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-02-25 00:17+0000\n" -"PO-Revision-Date: 2012-03-11 12:37+0200\n" -"Last-Translator: Anita Reitere \n" -"Language-Team: Latviešu \n" -"Language: lv\n" +"POT-Creation-Date: 2012-04-10 18:19+0000\n" +"PO-Revision-Date: 2012-04-15 20:08+0300\n" +"Last-Translator: Rūdolfs Mazurs \n" +"Language-Team: Latvian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: lv\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " "2);\n" -"X-Generator: Lokalize 1.1\n" +"X-Generator: Lokalize 1.2\n" #: ../src/gnome-screenshot.desktop.in.h:1 msgid "Screenshot" -msgstr "Ekrānuzņēmums" +msgstr "Ekrānattēls" #: ../src/gnome-screenshot.desktop.in.h:2 msgid "Save images of your desktop or individual windows" @@ -43,7 +43,7 @@ #: ../src/gnome-screenshot.ui.h:1 msgid "Save Screenshot" -msgstr "Saglabāt ekrānuzņēmumu" +msgstr "Saglabāt ekrānattēlu" #: ../src/gnome-screenshot.ui.h:2 msgid "C_opy to Clipboard" @@ -64,7 +64,7 @@ #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:1 msgid "Window-specific screenshot (deprecated)" -msgstr "Konkrēta loga ekrānuzņēmums (novecojis)" +msgstr "Konkrēta loga ekrānattēls (novecojis)" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:2 msgid "" @@ -76,30 +76,27 @@ #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:3 msgid "Screenshot delay" -msgstr "Ekrānuzņēmuma aizture" +msgstr "Ekrānattēla aizture" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:4 msgid "The number of seconds to wait before taking the screenshot." -msgstr "Sekunžu skaits, ko nogaidīt pirms ekrānuzņēmuma uzņemšanas." +msgstr "Sekunžu skaits, ko nogaidīt pirms ekrānattēla uzņemšanas." #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:5 msgid "Screenshot directory" -msgstr "Ekrānuzņēmuma mape" +msgstr "Ekrānattēla mape" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:6 -#| msgid "The directory the last screenshot was saved in." msgid "The directory where the screenshots will be saved by default." -msgstr "Mape, kurā ekrānuzņēmumi tiks saglabāti pēc noklusējuma." +msgstr "Mape, kurā ekrānattēli tiks saglabāti pēc noklusējuma." #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:7 -#| msgid "Screenshot directory" msgid "Last save directory" msgstr "Iepriekš izmantotā mape" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:8 -#| msgid "The directory the last screenshot was saved in." msgid "The last directory a screenshot was saved in interactive mode." -msgstr "Mape, kurā tika saglabāts pēdējais ekrānuzņēmums interaktīvā režīmā." +msgstr "Mape, kurā tika saglabāts pēdējais ekrānattēls interaktīvā režīmā." #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:9 msgid "Include Border" @@ -107,7 +104,7 @@ #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:10 msgid "Include the window manager border along with the screenshot" -msgstr "Iekļaut logu pārvaldītāja rāmi ekrānuzņēmumā" +msgstr "Iekļaut logu pārvaldītāja rāmi ekrānattēlā" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:11 msgid "Include Pointer" @@ -115,7 +112,7 @@ #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:12 msgid "Include the pointer in the screenshot" -msgstr "Iekļaut kursoru ekrānuzņēmumā" +msgstr "Iekļaut kursoru ekrānattēlā" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:13 msgid "Include ICC Profile" @@ -123,7 +120,7 @@ #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:14 msgid "Include the ICC profile of the target in the screenshot file" -msgstr "Iekļaut mērķa ICC profilu ekrānuzņēmuma failā" +msgstr "Iekļaut mērķa ICC profilu ekrānattēla failā" #: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:15 msgid "Border Effect" @@ -134,8 +131,8 @@ "Effect to add to the outside of a border. Possible values are \"shadow\", " "\"none\", and \"border\"." msgstr "" -"Rāmja ārpusē pievienojamais efekts. Iespējamās vērtības ir \"shadow\", \"none\", " -"un \"border\"." +"Rāmja ārpusē pievienojamais efekts. Iespējamās vērtības ir \"shadow\", \"none" +"\", un \"border\"." #: ../src/screenshot-application.c:147 #, c-format @@ -147,78 +144,73 @@ msgstr "Vai aizvietot jau esošo failu?" #: ../src/screenshot-application.c:175 ../src/screenshot-application.c:183 -#: ../src/screenshot-application.c:342 ../src/screenshot-application.c:345 -#: ../src/screenshot-application.c:388 ../src/screenshot-application.c:391 -#| msgid "Unable to take a screenshot of the current window" +#: ../src/screenshot-application.c:340 ../src/screenshot-application.c:343 +#: ../src/screenshot-application.c:386 ../src/screenshot-application.c:389 msgid "Unable to capture a screenshot" -msgstr "Neizdevās iegūt ekrānuzņēmumu" +msgstr "Neizdevās iegūt ekrānattēlu" #: ../src/screenshot-application.c:176 -#| msgid "" -#| "Impossible to save the screenshot to %s.\n" -#| " Error was %s.\n" -#| " Please choose another location and retry." msgid "Error creating file. Please choose another location and retry." msgstr "" "Neizdevās izveidot failu. Lūdzu, izvēlieties citu vietu un mēģiniet vēlreiz." -#: ../src/screenshot-application.c:343 +#: ../src/screenshot-application.c:341 msgid "Error creating file" msgstr "Kļūda, veidojot failu" -#: ../src/screenshot-application.c:350 ../src/screenshot-application.c:419 +#: ../src/screenshot-application.c:348 ../src/screenshot-application.c:417 msgid "Screenshot taken" -msgstr "Ekrānuzņēmums uzņemts" +msgstr "Ekrānattēls uzņemts" -#: ../src/screenshot-application.c:389 +#: ../src/screenshot-application.c:387 msgid "All possible methods failed" msgstr "Visas iespējamās metodes izmēģinātas nesekmīgi" -#: ../src/screenshot-application.c:504 +#: ../src/screenshot-application.c:502 msgid "Send the grab directly to the clipboard" msgstr "Sūtīt notverto tieši uz starpliktuvi" -#: ../src/screenshot-application.c:505 +#: ../src/screenshot-application.c:503 msgid "Grab a window instead of the entire screen" msgstr "Uzņemt logu nevis visu ekrānu" -#: ../src/screenshot-application.c:506 +#: ../src/screenshot-application.c:504 msgid "Grab an area of the screen instead of the entire screen" msgstr "Uzņemt daļu no loga visa ekrāna vietā" -#: ../src/screenshot-application.c:507 +#: ../src/screenshot-application.c:505 msgid "Include the window border with the screenshot" -msgstr "Iekļaut loga rāmi ekrānuzņēmumā" +msgstr "Iekļaut loga rāmi ekrānattēlā" -#: ../src/screenshot-application.c:508 +#: ../src/screenshot-application.c:506 msgid "Remove the window border from the screenshot" -msgstr "Aizvākt loga rāmi no ekrānuzņēmuma" +msgstr "Aizvākt loga rāmi no ekrānattēla" -#: ../src/screenshot-application.c:509 +#: ../src/screenshot-application.c:507 msgid "Take screenshot after specified delay [in seconds]" -msgstr "Uzņemt ekrānuzņēmumu ar norādīto aizturi [sekundēs]" +msgstr "Uzņemt ekrānattēlu ar norādīto aizturi [sekundēs]" #. translators: this is the last part of the "grab after a #. * delay of seconds". #. -#: ../src/screenshot-application.c:509 +#: ../src/screenshot-application.c:507 #: ../src/screenshot-interactive-dialog.c:426 msgid "seconds" msgstr "sekundes" -#: ../src/screenshot-application.c:510 +#: ../src/screenshot-application.c:508 msgid "Effect to add to the border (shadow, border or none)" msgstr "Efekti, ko pievienot rāmim (ēna, rāmis, nekas)" -#: ../src/screenshot-application.c:510 +#: ../src/screenshot-application.c:508 msgid "effect" msgstr "efekts" -#: ../src/screenshot-application.c:511 +#: ../src/screenshot-application.c:509 msgid "Interactively set options" msgstr "Interaktivitātes iestatīšanas iespējas" -#: ../src/screenshot-application.c:525 +#: ../src/screenshot-application.c:523 msgid "Take a picture of the screen" msgstr "Uzņemt ekrāna attēlu" @@ -227,21 +219,23 @@ msgid "" "Conflicting options: --window and --area should not be used at the same " "time.\n" -msgstr "Konfigurācijas opcijas --window un --area nevajadzētu lietot vienlaicīgi.\n" +msgstr "" +"Konfigurācijas opcijas --window un --area nevajadzētu lietot vienlaicīgi.\n" #: ../src/screenshot-config.c:61 -#, c-format, c-format +#, c-format msgid "" "Conflicting options: --area and --delay should not be used at the same " "time.\n" -msgstr "Konfigurācijas opcijas --area un --delay nevajadzētu lietot vienlaicīgi.\n" +msgstr "" +"Konfigurācijas opcijas --area un --delay nevajadzētu lietot vienlaicīgi.\n" #: ../src/screenshot-dialog.c:171 msgid "" "UI definition file for the screenshot program is missing.\n" "Please check your installation of gnome-utils" msgstr "" -"UI definīciju fails ekrānuzņēmumu programmai nav atrodams.\n" +"UI definīciju fails ekrānattēlu programmai nav atrodams.\n" "Lūdzu, pārbaudiet gnome-utils instalāciju" #: ../src/screenshot-dialog.c:192 @@ -250,24 +244,22 @@ #: ../src/screenshot-dialog.c:301 msgid "Screenshot.png" -msgstr "Ekrānuzņēmums.png" +msgstr "Ekrānattēls.png" #. translators: this is the name of the file that gets made up #. * with the screenshot if the entire screen is taken #: ../src/screenshot-filename-builder.c:122 -#, c-format, c-format -#| msgid "Screenshot at %s.png" +#, c-format msgid "Screenshot from %s.png" -msgstr "Ekrānuzņēmums no %s.png" +msgstr "Ekrānattēls %s.png" #. translators: this is the name of the file that gets #. * made up with the screenshot if the entire screen is #. * taken #: ../src/screenshot-filename-builder.c:129 -#, c-format, c-format -#| msgid "Screenshot at %s - %d.png" +#, c-format msgid "Screenshot from %s - %d.png" -msgstr "Ekrānuzņēmums no %s – %d.png" +msgstr "Ekrānattēls %s – %d.png" #: ../src/screenshot-interactive-dialog.c:165 msgid "None" @@ -318,7 +310,7 @@ #: ../src/screenshot-interactive-dialog.c:444 #: ../src/screenshot-interactive-dialog.c:452 msgid "Take Screenshot" -msgstr "Uzņemt ekrānuzņēmumu" +msgstr "Uzņemt ekrānattēlu" #: ../src/screenshot-interactive-dialog.c:453 msgid "Effects" @@ -326,10 +318,10 @@ #: ../src/screenshot-interactive-dialog.c:458 msgid "Take _Screenshot" -msgstr "Uzņemt _ekrānuzņēmumu" +msgstr "Uzņemt _ekrānattēlu" # mini-utils/gless/gless.c:548 -#: ../src/screenshot-utils.c:723 +#: ../src/screenshot-utils.c:724 msgid "Error loading the help page" msgstr "Kļūda, ielādējot palīdzības lapu" diff -Nru gnome-screenshot-3.4.0/src/screenshot-filename-builder.c gnome-screenshot-3.4.1/src/screenshot-filename-builder.c --- gnome-screenshot-3.4.0/src/screenshot-filename-builder.c 2012-03-26 14:05:35.000000000 +0000 +++ gnome-screenshot-3.4.1/src/screenshot-filename-builder.c 2012-04-16 18:25:49.000000000 +0000 @@ -30,6 +30,7 @@ { TEST_SAVED_DIR = 0, TEST_DEFAULT, + TEST_FALLBACK, NUM_TESTS } TestType; @@ -73,6 +74,16 @@ } static gchar * +get_fallback_screenshot_dir (void) +{ + gchar *shot_dir; + + shot_dir = g_strconcat ("file://", g_get_home_dir (), NULL); + + return shot_dir; +} + +static gchar * get_default_screenshot_dir (void) { gchar *shot_dir; @@ -150,6 +161,22 @@ } static gboolean +prepare_next_cycle (AsyncExistenceJob *job) +{ + gboolean res = FALSE; + + if (job->type != (NUM_TESTS - 1)) + { + (job->type)++; + job->iteration = 0; + + res = TRUE; + } + + return res; +} + +static gboolean try_check_file (GIOSchedulerJob *io_job, GCancellable *cancellable, gpointer data) @@ -201,8 +228,13 @@ if (!g_file_query_exists (parent, NULL)) { - (job->type)++; - job->iteration = 0; + if (!prepare_next_cycle (job)) + { + retval = NULL; + + g_object_unref (parent); + goto out; + } g_object_unref (file); g_object_unref (parent); @@ -222,20 +254,18 @@ * accessible. */ g_free (uri); - if (job->type == TEST_DEFAULT) - { - retval = NULL; - goto out; - } - else - { - (job->type)++; - job->iteration = 0; + if (prepare_next_cycle (job)) + { g_error_free (error); g_object_unref (file); goto retry; } + else + { + retval = NULL; + goto out; + } } } @@ -265,8 +295,9 @@ job = g_slice_new0 (AsyncExistenceJob); - job->base_uris[0] = sanitize_save_directory (screenshot_config->save_dir); - job->base_uris[1] = get_default_screenshot_dir (); + job->base_uris[TEST_SAVED_DIR] = sanitize_save_directory (screenshot_config->save_dir); + job->base_uris[TEST_DEFAULT] = get_default_screenshot_dir (); + job->base_uris[TEST_FALLBACK] = get_fallback_screenshot_dir (); job->iteration = 0; job->type = TEST_SAVED_DIR;