Update to 2.1.6, and assign maintainership to submitter.

PR:		57343
Submitted by:	Pav Lucistnik <pav@oook.cz>
Approved by:	Maxime Romano <verbophobe@jewcrew.org> (previous maintainer)

7 files changed, 18 insertions, 4667 deletions

diff --git a/graphics/gthumb2/Makefile b/graphics/gthumb2/Makefile
index 50b59ab96d50..c957d1ceb0fc 100644
--- a/graphics/gthumb2/Makefile
+++ b/graphics/gthumb2/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	gthumb2
-PORTVERSION=	2.1.4
-PORTREVISION=	1
+PORTVERSION=	2.1.6
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.1
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
-MAINTAINER=	verbophobe@jewcrew.org
+MAINTAINER=	pav@oook.cz
 COMMENT=	An image viewer and browser for the GNOME 2 environment
 
 USE_BZIP2=	yes
diff --git a/graphics/gthumb2/distinfo b/graphics/gthumb2/distinfo
index a1d1780d920f..50d347824d6e 100644
--- a/graphics/gthumb2/distinfo
+++ b/graphics/gthumb2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gthumb-2.1.4.tar.bz2) = 1075fbdb901b627da0ae9150ae745861
+MD5 (gnome2/gthumb-2.1.6.tar.bz2) = 7edd153e01bff1c7464dc1a549d24819
diff --git a/graphics/gthumb2/files/patch-po_ja.po b/graphics/gthumb2/files/patch-po_ja.po
deleted file mode 100644
index 2babd5983208..000000000000
--- a/graphics/gthumb2/files/patch-po_ja.po
+++ /dev/null
@@ -1,768 +0,0 @@
---- po/ja.po	Sat Aug  9 18:35:49 2003
-+++ /home/pav/cvs/gnome/gthumb/po/ja.po	Sun Aug 10 05:20:31 2003
-@@ -5,14 +5,14 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: gthumb HEAD\n"
--"POT-Creation-Date: 2003-08-09 18:35+0200\n"
--"PO-Revision-Date: 2003-07-10 23:42+0900\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2003-08-10 12:21+0900\n"
-+"PO-Revision-Date: 2003-08-10 12:16+0900\n"
- "Last-Translator: Takeshi Aihana <aihana@gnome.gr.jp>\n"
- "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"Report-Msgid-Bugs-To: \n"
- 
- #: components/catalog-view/GNOME_GThumb_CatalogView.server.in.in.h:1
- msgid "Catalog"
-@@ -103,8 +103,7 @@
- #: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:14
- #: src/gthumb-ui.xml.h:143
- msgid "Start or stop current animation"
--msgstr ""
--"現在表示中のアニメーションの開始/停止を切り替えます"
-+msgstr "現在表示中のアニメーションの開始/停止を切り替えます"
- 
- #: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:15
- msgid "Start/Stop _Animation"
-@@ -182,103 +181,94 @@
- msgid "%d x %d pixels"
- msgstr "ピクセル数 %d x %d"
- 
-+#: data/albumthemes/Clean/image.xml.in.h:1
- #: data/albumthemes/Classic/image.xml.in.h:2
- #: data/albumthemes/ClassicClips/image.xml.in.h:2
--#: data/albumthemes/Clean/image.xml.in.h:1
- #: data/albumthemes/NeatRound/image.xml.in.h:2
- #: data/albumthemes/NeatSquare/image.xml.in.h:2
--#, fuzzy
- msgid "Aperture value"
--msgstr "アパーチャの値(_A)"
-+msgstr "アパーチャの値"
- 
-+#: data/albumthemes/Clean/image.xml.in.h:2
- #: data/albumthemes/Classic/image.xml.in.h:3
- #: data/albumthemes/ClassicClips/image.xml.in.h:3
--#: data/albumthemes/Clean/image.xml.in.h:2
- #: data/albumthemes/NeatRound/image.xml.in.h:3
- #: data/albumthemes/NeatSquare/image.xml.in.h:3 src/dlg-image-prop.c:851
- #: src/gthumb-window.c:446
- msgid "Bytes"
- msgstr "サイズ"
- 
-+#: data/albumthemes/Clean/image.xml.in.h:3
- #: data/albumthemes/Classic/image.xml.in.h:4
- #: data/albumthemes/ClassicClips/image.xml.in.h:4
--#: data/albumthemes/Clean/image.xml.in.h:3
- #: data/albumthemes/NeatRound/image.xml.in.h:4
- #: data/albumthemes/NeatSquare/image.xml.in.h:4
--#, fuzzy
- msgid "Camera model"
--msgstr "カメラの型式(_R)"
-+msgstr "カメラの型式"
- 
-+#: data/albumthemes/Clean/image.xml.in.h:4
- #: data/albumthemes/Classic/image.xml.in.h:5
- #: data/albumthemes/ClassicClips/image.xml.in.h:5
--#: data/albumthemes/Clean/image.xml.in.h:4
- #: data/albumthemes/NeatRound/image.xml.in.h:5
- #: data/albumthemes/NeatSquare/image.xml.in.h:5
--#, fuzzy
- msgid "Date"
--msgstr "日付(_D):"
-+msgstr "日付"
- 
-+#: data/albumthemes/Clean/image.xml.in.h:5
- #: data/albumthemes/Classic/image.xml.in.h:6
- #: data/albumthemes/ClassicClips/image.xml.in.h:6
--#: data/albumthemes/Clean/image.xml.in.h:5
- #: data/albumthemes/NeatRound/image.xml.in.h:6
- #: data/albumthemes/NeatSquare/image.xml.in.h:6
--#, fuzzy
- msgid "Dimensions"
--msgstr "画像の寸法(_E)"
-+msgstr "画像の寸法"
- 
-+#: data/albumthemes/Clean/image.xml.in.h:6
- #: data/albumthemes/Classic/image.xml.in.h:7
- #: data/albumthemes/ClassicClips/image.xml.in.h:7
--#: data/albumthemes/Clean/image.xml.in.h:6
- #: data/albumthemes/NeatRound/image.xml.in.h:7
- #: data/albumthemes/NeatSquare/image.xml.in.h:7
--#, fuzzy
- msgid "Exposure mode"
--msgstr "露出モード(_X)"
-+msgstr "露出モード"
- 
-+#: data/albumthemes/Clean/image.xml.in.h:7
- #: data/albumthemes/Classic/image.xml.in.h:8
- #: data/albumthemes/ClassicClips/image.xml.in.h:8
--#: data/albumthemes/Clean/image.xml.in.h:7
- #: data/albumthemes/NeatRound/image.xml.in.h:8
- #: data/albumthemes/NeatSquare/image.xml.in.h:8
--#, fuzzy
- msgid "Exposure time"
--msgstr "露出時間(_T)"
-+msgstr "露出時間"
- 
-+#: data/albumthemes/Clean/image.xml.in.h:8
- #: data/albumthemes/Classic/image.xml.in.h:9
- #: data/albumthemes/ClassicClips/image.xml.in.h:9
--#: data/albumthemes/Clean/image.xml.in.h:8
- #: data/albumthemes/NeatRound/image.xml.in.h:9
- #: data/albumthemes/NeatSquare/image.xml.in.h:9
--#, fuzzy
- msgid "Flash"
--msgstr "フラッシュ(_F)"
-+msgstr "フラッシュ"
- 
-+#: data/albumthemes/Clean/image.xml.in.h:9
- #: data/albumthemes/Classic/image.xml.in.h:10
- #: data/albumthemes/ClassicClips/image.xml.in.h:10
--#: data/albumthemes/Clean/image.xml.in.h:9
- #: data/albumthemes/NeatRound/image.xml.in.h:10
- #: data/albumthemes/NeatSquare/image.xml.in.h:10
--#, fuzzy
- msgid "Focal length"
--msgstr "フォーカスの長さ(_L)"
-+msgstr "フォーカスの長さ"
- 
-+#: data/albumthemes/Clean/image.xml.in.h:10
- #: data/albumthemes/Classic/image.xml.in.h:11
- #: data/albumthemes/ClassicClips/image.xml.in.h:11
--#: data/albumthemes/Clean/image.xml.in.h:10
- #: data/albumthemes/NeatRound/image.xml.in.h:11
- #: data/albumthemes/NeatSquare/image.xml.in.h:11 src/dlg-duplicates.c:265
- msgid "Image"
- msgstr "画像"
- 
-+#: data/albumthemes/Clean/image.xml.in.h:11
- #: data/albumthemes/Classic/image.xml.in.h:12
- #: data/albumthemes/ClassicClips/image.xml.in.h:12
--#: data/albumthemes/Clean/image.xml.in.h:11
- #: data/albumthemes/NeatRound/image.xml.in.h:12
- #: data/albumthemes/NeatSquare/image.xml.in.h:12
--#, fuzzy
- msgid "Shutter speed"
--msgstr "シャッター速度(_S)"
-+msgstr "シャッター速度"
- 
- #: data/albumthemes/Clean/image.xml.in.h:12 src/gthumb_edit.glade.h:33
- #: src/gthumb_web_exporter.glade.h:53
-@@ -290,7 +280,7 @@
- #: data/albumthemes/NeatRound/image.xml.in.h:1
- #: data/albumthemes/NeatSquare/image.xml.in.h:1
- msgid "(click on the image to view it at original size)"
--msgstr ""
-+msgstr "(画像をクリックするとオリジナルサイズで表示します)"
- 
- #: gthumb.desktop.in.h:1
- msgid "View and organize your images"
-@@ -326,20 +316,19 @@
- 
- #: libgthumb/comments.c:410
- msgid "Deleting all comments, wait please..."
--msgstr ""
--"全てのコメントを削除しています。少々お待ち下さい..."
-+msgstr "全てのコメントを削除しています。少々お待ち下さい..."
- 
- #: libgthumb/comments.c:412
- msgid "Deleting old comments, wait please..."
--msgstr ""
--"古いコメントを削除しています。少々お待ち下さい..."
-+msgstr "古いコメントを削除しています。少々お待ち下さい..."
- 
- #: libgthumb/comments.c:756
- msgid "%d %B %Y"
- msgstr "%Y年 %B %d日"
- 
--#: libgthumb/comments.c:758 src/dlg-duplicates.c:551 src/dlg-image-prop.c:676
--#: src/fullscreen.c:225 src/gthumb-window.c:414
-+#: libgthumb/comments.c:758 src/catalog-web-exporter.c:53
-+#: src/dlg-duplicates.c:551 src/dlg-image-prop.c:676 src/fullscreen.c:225
-+#: src/gthumb-window.c:414
- msgid "%d %B %Y, %H:%M"
- msgstr "%Y年 %B %d日 %H:%M"
- 
-@@ -350,9 +339,7 @@
- #: libgthumb/dlg-save-image.c:97 src/commands-impl.c:313 src/dlg-convert.c:308
- #, c-format
- msgid "An image named \"%s\" is already present. Do you want to overwrite it?"
--msgstr ""
--"画像 \"%s\" "
--"は既に存在しています。上書きしても宜しいですか？"
-+msgstr "画像 \"%s\" は既に存在しています。上書きしてもよろしいですか？"
- 
- #: libgthumb/dlg-save-image.c:154
- #, c-format
-@@ -391,6 +378,18 @@
- msgid "Font Selection"
- msgstr "フォントの選択"
- 
-+#: libgthumb/gnome-print-font-picker.c:92
-+msgid "Sans Regular 12"
-+msgstr "Sans Regular 12"
-+
-+#: libgthumb/gnome-print-font-picker.c:93
-+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-+msgstr "いろはにほへと 零壱弐三四伍 AaBbCcDdEe"
-+
-+#: libgthumb/gnome-print-font-picker.c:94
-+msgid "Pick a Font"
-+msgstr "フォントの取得"
-+
- #: libgthumb/gnome-print-font-picker.c:179
- msgid "Title"
- msgstr "タイトル"
-@@ -421,9 +420,7 @@
- 
- #: libgthumb/gnome-print-font-picker.c:219
- msgid "Use font in the label in font info mode"
--msgstr ""
--"フォント情報モードにあるラベルのフォントを使用しま�"
--"�"
-+msgstr "フォント情報モードにあるラベルのフォントを使用します"
- 
- #: libgthumb/gnome-print-font-picker.c:227
- msgid "Font size for label"
-@@ -431,9 +428,7 @@
- 
- #: libgthumb/gnome-print-font-picker.c:228
- msgid "Font size for label in font info mode"
--msgstr ""
--"フォント情報モードにあるラベルのフォント・サイズで�"
--"�"
-+msgstr "フォント情報モードにあるラベルのフォント・サイズです"
- 
- #: libgthumb/gnome-print-font-picker.c:238
- msgid "Show size"
-@@ -468,14 +463,11 @@
- 
- #: libgthumb/thumb-cache.c:487
- msgid "Deleting all thumbnails, wait please..."
--msgstr ""
--"全てのサムネイルを削除しています。少々お待ち下さい.."
--"."
-+msgstr "全てのサムネイルを削除しています。少々お待ち下さい..."
- 
- #: libgthumb/thumb-cache.c:489
- msgid "Deleting old thumbnails, wait please..."
--msgstr ""
--"古いサムネイルを削除しています。少々お待ち下さい..."
-+msgstr "古いサムネイルを削除しています。少々お待ち下さい..."
- 
- #: src/catalog-png-exporter.c:1327
- #, c-format
-@@ -528,9 +520,8 @@
- "The name \"%s\" is not valid because it contains the character \"/\". Please "
- "use a different name."
- msgstr ""
--"名前 \"%s\" には \"/\" "
--"文字が含まれているため使用できません。別の名前を入�"
--"�して下さい。"
-+"名前 \"%s\" には \"/\" 文字が含まれているため使用できません。別の名前を入力し"
-+"て下さい。"
- 
- #: src/commands-impl.c:320 src/dlg-convert.c:314
- msgid "_Overwrite"
-@@ -548,8 +539,7 @@
- #: src/commands-impl.c:446
- #, c-format
- msgid "Could not duplicate the image \"%s\": %s"
--msgstr ""
--"画像 \"%s\" の複製を作成することができませんでした: %s"
-+msgstr "画像 \"%s\" の複製を作成することができませんでした: %s"
- 
- #: src/commands-impl.c:454
- msgid "Stop"
-@@ -561,22 +551,19 @@
- 
- #: src/commands-impl.c:531
- msgid "The selected images will be moved to the Trash, are you sure?"
--msgstr ""
--"選択した画像をゴミ箱に移動します。宜しいですか？"
-+msgstr "選択した画像をゴミ箱に移動します。よろしいですか？"
- 
- #: src/commands-impl.c:551
- msgid "The image will be moved to the Trash, are you sure?"
--msgstr "画像をゴミ箱に移動します。宜しいですか？"
-+msgstr "画像をゴミ箱に移動します。よろしいですか？"
- 
- #: src/commands-impl.c:786
- msgid "The image will be removed from the catalog, are you sure?"
--msgstr "画像をカタログから削除します。宜しいですか？"
-+msgstr "画像をカタログから削除します。よろしいですか？"
- 
- #: src/commands-impl.c:828
- msgid "The selected images will be removed from the catalog, are you sure?"
--msgstr ""
--"選択した画像をカタログから削除します。宜しいですか�"
--"�"
-+msgstr "選択した画像をカタログから削除します。よろしいですか？"
- 
- #: src/commands-impl.c:904 src/dlg-catalog.c:83 src/dlg-catalog.c:124
- #: src/dlg-categories.c:200 src/dlg-file-utils.c:89
-@@ -587,9 +574,7 @@
- #: src/commands-impl.c:1713
- #, c-format
- msgid "The name \"%s\" is already used. Please use a different name."
--msgstr ""
--"名前 \"%s\" "
--"は既に使用されています。別の名前を入力して下さい。"
-+msgstr "名前 \"%s\" は既に使用されています。別の名前を入力して下さい。"
- 
- #: src/commands-impl.c:961
- msgid "New Folder"
-@@ -631,20 +616,15 @@
- #, c-format
- msgid ""
- "\"%s\" cannot be moved to the Trash. Do you want to delete it permanently?"
--msgstr ""
--"\"%s\" "
--"をゴミ箱に移動することはできません。これを完全に削�"
--"�しますか？"
-+msgstr "\"%s\" をゴミ箱に移動することはできません。これを完全に削除しますか？"
- 
- #: src/commands-impl.c:1191 src/dlg-file-utils.c:226
- msgid "_Do not display this message again"
--msgstr ""
-+msgstr "次回からこのメッセージを表示しない(_D)"
- 
- #: src/commands-impl.c:1224
- msgid "The selected folder will be moved to the Trash, are you sure?"
--msgstr ""
--"選択したフォルダをゴミ箱に移動します。宜しいですか�"
--"�"
-+msgstr "選択したフォルダをゴミ箱に移動します。よろしいですか？"
- 
- #: src/commands-impl.c:1226 src/dlg-file-utils.c:280
- msgid "_Move"
-@@ -694,16 +674,15 @@
- #: src/commands-impl.c:1724
- #, c-format
- msgid "Could not create the catalog \"%s\": %s"
--msgstr ""
--"カタログ \"%s\" を生成することができませんでした: %s"
-+msgstr "カタログ \"%s\" を生成することができませんでした: %s"
- 
- #: src/commands-impl.c:1788
- msgid "The selected library will be removed, are you sure?"
--msgstr "選択したライブラリを削除します。宜しいですか？"
-+msgstr "選択したライブラリを削除します。よろしいですか？"
- 
- #: src/commands-impl.c:1790
- msgid "The selected catalog will be removed, are you sure?"
--msgstr "選択したカタログを削除します。宜しいですか？"
-+msgstr "選択したカタログを削除します。よろしいですか？"
- 
- #: src/commands-impl.c:2759 src/dlg-categories.c:337 src/dlg-comment.c:327
- #: src/dlg-jpegtran.c:631 src/dlg-maintenance.c:273 src/dlg-preferences.c:175
-@@ -734,21 +713,18 @@
- msgstr "カテゴリ名を入力して下さい: "
- 
- #: src/dlg-categories.c:207
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "The name \"%s\" is not valid because it contains the character \",\". Please "
- "use a different name."
- msgstr ""
--"名前 \"%s\" には \"/\" "
--"文字が含まれているため使用できません。別の名前を入�"
--"�して下さい。"
-+"名前 \"%s\" に \",\" 文字が含まれているため使用できません。別の名前を入力して"
-+"下さい。"
- 
- #: src/dlg-categories.c:212
- #, c-format
- msgid "The category \"%s\" is already present. Please use a different name."
--msgstr ""
--"カテゴリ \"%s\" "
--"は既に存在します。別の名前を入力して下さい。"
-+msgstr "カテゴリ \"%s\" は既に存在します。別の名前を入力して下さい。"
- 
- #: src/dlg-convert.c:159
- #, c-format
-@@ -759,9 +735,7 @@
- #, c-format
- msgid ""
- "An image named \"%s\" is already present. Please specify a different name."
--msgstr ""
--"画像 \"%s\" "
--"は既に存在しています。別の名前を入力して下さい。"
-+msgstr "画像 \"%s\" は既に存在しています。別の名前を入力して下さい。"
- 
- #: src/dlg-convert.c:313 src/gthumb_convert.glade.h:17
- msgid "Skip"
-@@ -785,14 +759,11 @@
- 
- #: src/dlg-duplicates.c:755
- msgid "Checked images will be moved to the Trash, are you sure?"
--msgstr ""
--"選択した画像をゴミ箱に移動します。宜しいですか？"
-+msgstr "選択した画像をゴミ箱に移動します。よろしいですか？"
- 
- #: src/dlg-file-utils.c:87
- msgid "The destination folder does not exist. Do you want to create it?"
--msgstr ""
--"送り先のフォルダが存在しません。そのフォルダを作成�"
--"�ますか？"
-+msgstr "送り先のフォルダが存在しません。そのフォルダを作成しますか？"
- 
- #: src/dlg-file-utils.c:103
- #, c-format
-@@ -803,9 +774,7 @@
- #, c-format
- msgid ""
- "You don't have the right permissions to create images in the folder \"%s\""
--msgstr ""
--"フォルダ \"%s\" "
--"の中に画像を生成するための権限がありません。"
-+msgstr "フォルダ \"%s\" の中に画像を生成するための権限がありません。"
- 
- #: src/dlg-file-utils.c:200
- msgid "Could not delete the images:"
-@@ -815,9 +784,7 @@
- msgid ""
- "The images cannot be moved to the Trash. Do you want to delete them "
- "permanently?"
--msgstr ""
--"画像をゴミ箱に移動することができません。画像を完全�"
--"�消去しますか？"
-+msgstr "画像をゴミ箱に移動することができません。画像を完全に消去しますか？"
- 
- #: src/dlg-file-utils.c:757 src/dlg-file-utils.c:858
- msgid "You didn't enter the new name"
-@@ -828,9 +795,7 @@
- msgid ""
- "The name \"%s\" is already used in this folder. Please use a different name."
- msgstr ""
--"名前 \"%s\" "
--"は既にこのフォルダで使用しています。別の名前を入力�"
--"�て下さい。"
-+"名前 \"%s\" は既にこのフォルダで使用しています。別の名前を入力して下さい。"
- 
- #: src/dlg-file-utils.c:1009
- msgid "Could not rename the image:"
-@@ -901,9 +866,8 @@
- msgstr "フィールド"
- 
- #: src/dlg-image-prop.c:910 src/gthumb-window.c:5355
--#, fuzzy
- msgid "Value "
--msgstr "数値"
-+msgstr "数値 "
- 
- #: src/dlg-image-prop.c:991
- #, c-format
-@@ -912,11 +876,11 @@
- 
- #: src/dlg-maintenance.c:71
- msgid "All comments will be removed, are you sure?"
--msgstr "全てのコメントを削除します。宜しいですか？"
-+msgstr "全てのコメントを削除します。よろしいですか？"
- 
- #: src/dlg-maintenance.c:102
- msgid "All thumbnails will be deleted, are you sure?"
--msgstr "全てのサムネイルを削除します。宜しいですか？"
-+msgstr "全てのサムネイルを削除します。よろしいですか？"
- 
- #: src/dlg-maintenance.c:163 src/dlg-maintenance.c:233
- msgid "Specify the backup file"
-@@ -1293,8 +1257,7 @@
- 
- #: src/gthumb-ui.xml.h:79
- msgid "Open current folder with the Nautilus file manager"
--msgstr ""
--"このフォルダを Nautilus ファイル・マネージャで開きます"
-+msgstr "このフォルダを Nautilus ファイル・マネージャで開きます"
- 
- #: src/gthumb-ui.xml.h:80
- msgid "Open selected images with an application"
-@@ -1304,9 +1267,7 @@
- msgid ""
- "Open the selected folder with the Nautilus file\n"
- "\t     manager"
--msgstr ""
--"Nautilus "
--"ファイル・マネージャで指定したフォルダを開きます"
-+msgstr "Nautilus ファイル・マネージャで指定したフォルダを開きます"
- 
- #: src/gthumb-ui.xml.h:83
- msgid "Open this image with an application"
-@@ -1486,20 +1447,15 @@
- 
- #: src/gthumb-ui.xml.h:132
- msgid "Set the image as desktop background (scaled keeping aspect ratio)"
--msgstr ""
--"デスクトップの背景に画像をセットします(画面サイズの�"
--"��横比に合わせる)"
-+msgstr "デスクトップの背景に画像をセットします(画面サイズの縦横比に合わせる)"
- 
- #: src/gthumb-ui.xml.h:133
- msgid "Set the image as desktop background (stretched)"
--msgstr ""
--"デスクトップの背景に画像をセットします(画面サイズに�"
--"��き伸ばす)"
-+msgstr "デスクトップの背景に画像をセットします(画面サイズに引き伸ばす)"
- 
- #: src/gthumb-ui.xml.h:134
- msgid "Set the image as desktop background (tiled)"
--msgstr ""
--"デスクトップの背景に画像をセットします(タイル状)"
-+msgstr "デスクトップの背景に画像をセットします(タイル状)"
- 
- #: src/gthumb-ui.xml.h:135
- msgid "Show information about gThumb"
-@@ -1607,8 +1563,7 @@
- 
- #: src/gthumb-ui.xml.h:163
- msgid "View or hide the statusbar of this window"
--msgstr ""
--"このウィンドウのステータスバーの表示を ON/OFF します"
-+msgstr "このウィンドウのステータスバーの表示を ON/OFF します"
- 
- #: src/gthumb-ui.xml.h:164
- msgid "View or hide the toolbar of this window"
-@@ -2191,101 +2146,105 @@
- "Images over this size (in bytes) will not be thumbnailed. Use 0 if you want "
- "to generate thumbnails for all images."
- msgstr ""
-+"このサイズ (バイト単位) より大きい画像はサムネイル表示されません。全ての画像"
-+"をサムネイル表示する場合は 0 を指定して下さい。"
- 
- #: src/gthumb.schemas.in.h:2
- msgid "Possible values are: 1, 2, 3, 4."
--msgstr ""
-+msgstr "設定可能な値: 1, 2, 3, 4"
- 
- #: src/gthumb.schemas.in.h:3
- msgid "Possible values are: actual_size, fit, keep_prev, fit_if_larger."
--msgstr ""
-+msgstr "設定可能な値: actual_size, fit, keep_prev, fit_if_larger"
- 
- #: src/gthumb.schemas.in.h:4
- msgid "Possible values are: ascending, descending."
--msgstr ""
-+msgstr "設定可能な値: ascending, descending"
- 
- #: src/gthumb.schemas.in.h:5
- msgid "Possible values are: forward, backward."
--msgstr ""
-+msgstr "設定可能な値: forward, backward"
- 
- #: src/gthumb.schemas.in.h:6
- msgid "Possible values are: high, low."
--msgstr ""
-+msgstr "設定可能な値: high, low"
- 
- #: src/gthumb.schemas.in.h:7
- msgid "Possible values are: image, data, comment."
--msgstr ""
-+msgstr "設定可能な値: image, data, comment"
- 
- #: src/gthumb.schemas.in.h:8
- msgid "Possible values are: jpeg, png, tga, tiff."
--msgstr ""
-+msgstr "設定可能な値: jpeg, png, tga, tiff"
- 
- #: src/gthumb.schemas.in.h:9
- msgid "Possible values are: light, midtone, dark."
--msgstr ""
-+msgstr "設定可能な値: light, midtone, dark"
- 
- #: src/gthumb.schemas.in.h:10
- msgid "Possible values are: list, thumbnails."
--msgstr ""
-+msgstr "設定可能な値: list, thumbnails"
- 
- #: src/gthumb.schemas.in.h:11
- msgid "Possible values are: mm, in."
--msgstr ""
-+msgstr "設定可能な値: mm, in"
- 
- #: src/gthumb.schemas.in.h:12
- msgid "Possible values are: name, path, size, time."
--msgstr ""
-+msgstr "設定可能な値: name, path, size, time"
- 
- #: src/gthumb.schemas.in.h:13
- msgid "Possible values are: name, size, time."
--msgstr ""
-+msgstr "設定可能な値: name, size, time"
- 
- #: src/gthumb.schemas.in.h:14
- msgid "Possible values are: nautilus, single, double."
--msgstr ""
-+msgstr "設定可能な値: nautilus, single, double"
- 
- #: src/gthumb.schemas.in.h:15
- msgid "Possible values are: none, deflate, jpeg."
--msgstr ""
-+msgstr "設定可能な値: none, deflate, jpeg"
- 
- #: src/gthumb.schemas.in.h:16
- msgid "Possible values are: none, name, path, size, time."
--msgstr ""
-+msgstr "設定可能な値: none, name, path, size, time"
- 
- #: src/gthumb.schemas.in.h:17
- msgid ""
- "Possible values are: none, simple, simple_with_shadow, shadow, slide, "
- "shadow_in, shadow_out."
- msgstr ""
-+"設定可能な値: none, simple, simple_with_shadow, shadow, slide, shadow_in, "
-+"shadow_out"
- 
- #: src/gthumb.schemas.in.h:18
- msgid "Possible values are: pixels, percentage."
--msgstr ""
-+msgstr "設定可能な値: pixels, percentage"
- 
- #: src/gthumb.schemas.in.h:19
- msgid "Possible values are: png, jpeg."
--msgstr ""
-+msgstr "設定可能な値: png, jpeg"
- 
- #: src/gthumb.schemas.in.h:20
- msgid "Possible values are: skip, rename, ask, overwrite."
--msgstr ""
-+msgstr "設定可能な値: skip, rename, ask, overwrite"
- 
- #: src/gthumb.schemas.in.h:21
- msgid "Possible values are: small, medium, large."
--msgstr ""
-+msgstr "設定可能な値: small, medium, large"
- 
- #: src/gthumb.schemas.in.h:22
- msgid ""
- "Possible values are: system, text_below, text_beside, text_only, icons_only."
--msgstr ""
-+msgstr "設定可能な値: system, text_below, text_beside, text_only, icons_only"
- 
- #: src/gthumb.schemas.in.h:23
- msgid "Possible values are: white, black, checked, none."
--msgstr ""
-+msgstr "設定可能な値: white, black, checked, none"
- 
- #: src/gthumb.schemas.in.h:24
- msgid "Whether to always use a black background."
--msgstr ""
-+msgstr "常に背景を黒色にするかどうかを設定します。"
- 
- #: src/gthumb_comments.glade.h:3 src/gthumb_search.glade.h:5
- msgid "A_vailable categories:"
-@@ -2821,8 +2780,7 @@
- 
- #: src/gthumb_png_exporter.glade.h:56
- msgid "Use #'s to specify positions used by numeric enumerator."
--msgstr ""
--"文字 # はそれぞれ桁数に応じて数値で置き換わります。"
-+msgstr "文字 # はそれぞれ桁数に応じて数値で置き換わります。"
- 
- #: src/gthumb_png_exporter.glade.h:58
- #, no-c-format
-@@ -2830,8 +2788,8 @@
- "Use %p  to insert the page number, and %n to insert the total number of "
- "pages."
- msgstr ""
--"ページ番号を挿入する場合は %p "
--"を、総ページ数を挿入する場合は %n を使用して下さい。"
-+"ページ番号を挿入する場合は %p を、総ページ数を挿入する場合は %n を使用して下"
-+"さい。"
- 
- #: src/gthumb_png_exporter.glade.h:59
- msgid "Wi_dth:"
-@@ -3019,9 +2977,7 @@
- 
- #: src/gthumb_preferences.glade.h:35
- msgid "Fit to window if larger"
--msgstr ""
--"画像がウィンドウのサイズよりも大きい場合はウィンド�"
--"�にフィットさせる"
-+msgstr "画像がウィンドウのサイズよりも大きい場合はウィンドウにフィットさせる"
- 
- #: src/gthumb_preferences.glade.h:36
- msgid "Follow Nautilus behaviour"
-@@ -3037,8 +2993,7 @@
- 
- #: src/gthumb_preferences.glade.h:39
- msgid "Go to last _visited folder or catalog"
--msgstr ""
--"最後に訪れたフォルダまたはカタログにジャンプする(_V)"
-+msgstr "最後に訪れたフォルダまたはカタログにジャンプする(_V)"
- 
- #: src/gthumb_preferences.glade.h:40
- msgid "Go to this _folder:"
-@@ -3315,9 +3270,7 @@
- 
- #: src/gthumb_tools.glade.h:6
- msgid "<b>Specify a template to use for renaming images</b>"
--msgstr ""
--"<b>画像の名前変更に使用するテンプレートを指定して下�"
--"�い。</b>"
-+msgstr "<b>画像の名前変更に使用するテンプレートを指定して下さい。</b>"
- 
- #: src/gthumb_tools.glade.h:7
- msgid "<b>Thumbnails</b>"
-@@ -3433,9 +3386,7 @@
- 
- #: src/gthumb_tools.glade.h:39
- msgid "Search terminated, no duplicates found."
--msgstr ""
--"検索が終了しました。重複したものは見つかりませんで�"
--"�た。"
-+msgstr "検索が終了しました。重複したものは見つかりませんでした。"
- 
- #: src/gthumb_tools.glade.h:43
- msgid ""
-@@ -3443,11 +3394,9 @@
- "original filename. Use ? to insert the image date. Use ! to insert the image "
- "size"
- msgstr ""
--"文字 # "
--"はそれぞれの桁に応じた数値に置き換わります。文字 * "
--"はオリジナルのファイル名に置き換わります。文字 ? "
--"は日付に置き換わります。文字 ! "
--"は画像サイズに置き換わります。"
-+"文字 # はそれぞれの桁に応じた数値に置き換わります。文字 * はオリジナルのファ"
-+"イル名に置き換わります。文字 ? は日付に置き換わります。文字 ! は画像サイズに"
-+"置き換わります。"
- 
- #: src/gthumb_tools.glade.h:46
- msgid "_Sort original list:"
-@@ -3552,7 +3501,7 @@
- #: src/gthumb_web_exporter.glade.h:35
- #, no-c-format
- msgid "Use %d  to insert current date"
--msgstr ""
-+msgstr "現在の日付を挿入するのに %d を使う"
- 
- #: src/gthumb_web_exporter.glade.h:36
- msgid "Web Album"
-@@ -3665,22 +3614,3 @@
- #: src/main.c:311 src/main.c:393
- msgid "Command Line"
- msgstr "コマンドライン"
--
--#~ msgid ""
--#~ "GConf error:\n"
--#~ "  %s"
--#~ msgstr ""
--#~ "GConf エラー:\n"
--#~ "  %s"
--
--#~ msgid "Sans Regular 12"
--#~ msgstr "Sans Regular 12"
--
--#~ msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
--#~ msgstr "いろはにほへと 零壱弐三四伍 AaBbCcDdEe"
--
--#~ msgid "Pick a Font"
--#~ msgstr "フォントの取得"
--
--#~ msgid "_Title:"
--#~ msgstr "タイトル(_T):"
diff --git a/graphics/gthumb2/files/patch-po_pl.po b/graphics/gthumb2/files/patch-po_pl.po
deleted file mode 100644
index 46706ace5540..000000000000
--- a/graphics/gthumb2/files/patch-po_pl.po
+++ /dev/null
@@ -1,1193 +0,0 @@
---- po/pl.po	Sat Aug  9 18:36:03 2003
-+++ /home/pav/cvs/gnome/gthumb/po/pl.po	Mon Jul 14 08:28:46 2003
-@@ -9,7 +9,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: gthumb\n"
--"POT-Creation-Date: 2003-08-09 18:35+0200\n"
-+"POT-Creation-Date: 2003-07-14 08:26+0200\n"
- "PO-Revision-Date: 2003-06-28 09:52--100\n"
- "Last-Translator: Gnome PL Team <translators@gnome.pl>\n"
- "Language-Team: Polish <pl@li.org>\n"
-@@ -174,121 +174,16 @@
- msgid "_Zoom Quality"
- msgstr ""
- 
--#: components/image-viewer/viewer-stream.c:90 src/dlg-file-utils.c:523
-+#: components/image-viewer/viewer-stream.c:90 src/dlg-file-utils.c:517
- msgid "%d %b %Y, %H:%M"
- msgstr "%d %b %Y, %H:%M"
- 
- #: components/image-viewer/viewer-stream.c:98 src/catalog-png-exporter.c:806
--#: src/dlg-image-prop.c:656 src/fullscreen.c:218 src/gthumb-window.c:417
-+#: src/dlg-image-prop.c:656 src/fullscreen.c:218 src/gthumb-window.c:414
- #, c-format
- msgid "%d x %d pixels"
- msgstr "%d x %d pikseli"
- 
--#: data/albumthemes/Classic/image.xml.in.h:2
--#: data/albumthemes/ClassicClips/image.xml.in.h:2
--#: data/albumthemes/Clean/image.xml.in.h:1
--#: data/albumthemes/NeatRound/image.xml.in.h:2
--#: data/albumthemes/NeatSquare/image.xml.in.h:2
--msgid "Aperture value"
--msgstr ""
--
--#: data/albumthemes/Classic/image.xml.in.h:3
--#: data/albumthemes/ClassicClips/image.xml.in.h:3
--#: data/albumthemes/Clean/image.xml.in.h:2
--#: data/albumthemes/NeatRound/image.xml.in.h:3
--#: data/albumthemes/NeatSquare/image.xml.in.h:3 src/dlg-image-prop.c:851
--#: src/gthumb-window.c:446
--msgid "Bytes"
--msgstr "Bajtów"
--
--#: data/albumthemes/Classic/image.xml.in.h:4
--#: data/albumthemes/ClassicClips/image.xml.in.h:4
--#: data/albumthemes/Clean/image.xml.in.h:3
--#: data/albumthemes/NeatRound/image.xml.in.h:4
--#: data/albumthemes/NeatSquare/image.xml.in.h:4
--msgid "Camera model"
--msgstr ""
--
--#: data/albumthemes/Classic/image.xml.in.h:5
--#: data/albumthemes/ClassicClips/image.xml.in.h:5
--#: data/albumthemes/Clean/image.xml.in.h:4
--#: data/albumthemes/NeatRound/image.xml.in.h:5
--#: data/albumthemes/NeatSquare/image.xml.in.h:5
--#, fuzzy
--msgid "Date"
--msgstr "_Data:"
--
--#: data/albumthemes/Classic/image.xml.in.h:6
--#: data/albumthemes/ClassicClips/image.xml.in.h:6
--#: data/albumthemes/Clean/image.xml.in.h:5
--#: data/albumthemes/NeatRound/image.xml.in.h:6
--#: data/albumthemes/NeatSquare/image.xml.in.h:6
--#, fuzzy
--msgid "Dimensions"
--msgstr "R_ozmiary obrazu"
--
--#: data/albumthemes/Classic/image.xml.in.h:7
--#: data/albumthemes/ClassicClips/image.xml.in.h:7
--#: data/albumthemes/Clean/image.xml.in.h:6
--#: data/albumthemes/NeatRound/image.xml.in.h:7
--#: data/albumthemes/NeatSquare/image.xml.in.h:7
--msgid "Exposure mode"
--msgstr ""
--
--#: data/albumthemes/Classic/image.xml.in.h:8
--#: data/albumthemes/ClassicClips/image.xml.in.h:8
--#: data/albumthemes/Clean/image.xml.in.h:7
--#: data/albumthemes/NeatRound/image.xml.in.h:8
--#: data/albumthemes/NeatSquare/image.xml.in.h:8
--msgid "Exposure time"
--msgstr ""
--
--#: data/albumthemes/Classic/image.xml.in.h:9
--#: data/albumthemes/ClassicClips/image.xml.in.h:9
--#: data/albumthemes/Clean/image.xml.in.h:8
--#: data/albumthemes/NeatRound/image.xml.in.h:9
--#: data/albumthemes/NeatSquare/image.xml.in.h:9
--#, fuzzy
--msgid "Flash"
--msgstr "_Nazwy plików"
--
--#: data/albumthemes/Classic/image.xml.in.h:10
--#: data/albumthemes/ClassicClips/image.xml.in.h:10
--#: data/albumthemes/Clean/image.xml.in.h:9
--#: data/albumthemes/NeatRound/image.xml.in.h:10
--#: data/albumthemes/NeatSquare/image.xml.in.h:10
--msgid "Focal length"
--msgstr ""
--
--#: data/albumthemes/Classic/image.xml.in.h:11
--#: data/albumthemes/ClassicClips/image.xml.in.h:11
--#: data/albumthemes/Clean/image.xml.in.h:10
--#: data/albumthemes/NeatRound/image.xml.in.h:11
--#: data/albumthemes/NeatSquare/image.xml.in.h:11 src/dlg-duplicates.c:265
--msgid "Image"
--msgstr "Obraz"
--
--#: data/albumthemes/Classic/image.xml.in.h:12
--#: data/albumthemes/ClassicClips/image.xml.in.h:12
--#: data/albumthemes/Clean/image.xml.in.h:11
--#: data/albumthemes/NeatRound/image.xml.in.h:12
--#: data/albumthemes/NeatSquare/image.xml.in.h:12
--msgid "Shutter speed"
--msgstr ""
--
--# albo pikseli
--#: data/albumthemes/Clean/image.xml.in.h:12 src/gthumb_edit.glade.h:33
--#: src/gthumb_web_exporter.glade.h:53
--msgid "pixels"
--msgstr "piksele"
--
--#: data/albumthemes/Classic/image.xml.in.h:1
--#: data/albumthemes/ClassicClips/image.xml.in.h:1
--#: data/albumthemes/NeatRound/image.xml.in.h:1
--#: data/albumthemes/NeatSquare/image.xml.in.h:1
--msgid "(click on the image to view it at original size)"
--msgstr ""
--
- #: gthumb.desktop.in.h:1
- msgid "View and organize your images"
- msgstr "Widok i organizacja obrazów"
-@@ -321,28 +216,28 @@
- msgid "Cannot save catalog \"%s\": %s"
- msgstr "Nie można zapisać katalogu \"%s\": %s"
- 
--#: libgthumb/comments.c:410
-+#: libgthumb/comments.c:401
- msgid "Deleting all comments, wait please..."
- msgstr "Usuwanie wszystkich komentarzy, poczekaj chwilę..."
- 
--#: libgthumb/comments.c:412
-+#: libgthumb/comments.c:403
- msgid "Deleting old comments, wait please..."
- msgstr "Usuwanie starych komentarzy, poczekaj chwilę..."
- 
--#: libgthumb/comments.c:756
-+#: libgthumb/comments.c:747
- msgid "%d %B %Y"
- msgstr "%d %B %Y"
- 
--#: libgthumb/comments.c:758 src/dlg-duplicates.c:551 src/dlg-image-prop.c:676
--#: src/fullscreen.c:225 src/gthumb-window.c:414
-+#: libgthumb/comments.c:749 src/dlg-duplicates.c:551 src/dlg-image-prop.c:676
-+#: src/fullscreen.c:225 src/gthumb-window.c:411
- msgid "%d %B %Y, %H:%M"
- msgstr "%d %B %Y, %H:%M"
- 
--#: libgthumb/comments.c:768
-+#: libgthumb/comments.c:759
- msgid "(No Comment)"
- msgstr "(Brak komentarza)"
- 
--#: libgthumb/dlg-save-image.c:97 src/commands-impl.c:313 src/dlg-convert.c:308
-+#: libgthumb/dlg-save-image.c:97 src/commands-impl.c:312 src/dlg-convert.c:307
- #, c-format
- msgid "An image named \"%s\" is already present. Do you want to overwrite it?"
- msgstr "Obraz o nazwie \"%s\" jest już obecny. Czy chcesz go nadpisać?"
-@@ -365,6 +260,15 @@
- msgid "Image type:"
- msgstr "Typ obrazu:"
- 
-+#: libgthumb/gconf-utils.c:98
-+#, c-format
-+msgid ""
-+"GConf error:\n"
-+"  %s"
-+msgstr ""
-+"Błąd programu GConf:\n"
-+"  %s"
-+
- #: libgthumb/gnome-print-font-dialog.c:114
- msgid "_Insert a new preview phrase."
- msgstr "_Wstaw nową frazę podglądu."
-@@ -385,6 +289,18 @@
- msgid "Font Selection"
- msgstr "Wybór czcionki"
- 
-+#: libgthumb/gnome-print-font-picker.c:92
-+msgid "Sans Regular 12"
-+msgstr "Sans Regular 12"
-+
-+#: libgthumb/gnome-print-font-picker.c:93
-+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-+msgstr "AaĄąBbCcĆćDdEeĘęFfGgHhIiJjKkLlŁłMmNnŃńOoÓóPpRrSsŚśTtUuWwYyZzŹźŻż"
-+
-+#: libgthumb/gnome-print-font-picker.c:94
-+msgid "Pick a Font"
-+msgstr ""
-+
- #: libgthumb/gnome-print-font-picker.c:179
- msgid "Title"
- msgstr "Tytuł"
-@@ -444,24 +360,24 @@
- msgstr "Komentarz"
- 
- #: libgthumb/gth-file-view-list.c:1383 src/dlg-duplicates.c:372
--#: src/dlg-image-prop.c:836 src/gthumb-window.c:432
-+#: src/dlg-image-prop.c:836 src/gthumb-window.c:429
- msgid "Name"
- msgstr "Nazwa"
- 
--#: libgthumb/print-callbacks.c:925 libgthumb/print-callbacks.c:1504
-+#: libgthumb/print-callbacks.c:921 libgthumb/print-callbacks.c:1501
- #, c-format
- msgid "Print %s"
- msgstr "Wydruk %s"
- 
--#: libgthumb/print-callbacks.c:928
-+#: libgthumb/print-callbacks.c:924
- msgid "Print Image"
- msgstr "Wydrukuj obraz"
- 
--#: libgthumb/thumb-cache.c:487
-+#: libgthumb/thumb-cache.c:409
- msgid "Deleting all thumbnails, wait please..."
- msgstr "Usuwanie wszystkich miniaturek, poczekaj chwilę..."
- 
--#: libgthumb/thumb-cache.c:489
-+#: libgthumb/thumb-cache.c:411
- msgid "Deleting old thumbnails, wait please..."
- msgstr "Usuwanie starych miniaturek, poczekaj chwilę..."
- 
-@@ -475,230 +391,225 @@
- msgid "Creating image: %s.%s"
- msgstr "Tworzenie obrazu: %s.%s"
- 
--#: src/catalog-web-exporter.c:1615
-+#: src/catalog-web-exporter.c:1444
- msgid "Saving thumbnails"
- msgstr "Zapisywanie miniaturek"
- 
--#: src/catalog-web-exporter.c:1681
-+#: src/catalog-web-exporter.c:1512
- msgid "Saving HTML pages: Images"
- msgstr "Zapisywanie stron HTML: Obrazy"
- 
--#: src/catalog-web-exporter.c:1756
-+#: src/catalog-web-exporter.c:1589
- msgid "Saving HTML pages: Indexes"
- msgstr "Zapisywanie stron HTML: Indeksy"
- 
--#: src/catalog-web-exporter.c:1899 src/catalog-web-exporter.c:2034
-+#: src/catalog-web-exporter.c:1673
- msgid "Saving images"
- msgstr "Zapisywanie obrazów"
- 
--#: src/catalog-web-exporter.c:2243
-+#: src/catalog-web-exporter.c:1987
- msgid "Could not create a temporary folder"
- msgstr "Nie można utworzyć folderu tymczasowego"
- 
- #. Load thumbnails.
--#: src/catalog-web-exporter.c:2280
-+#: src/catalog-web-exporter.c:2026
- msgid "Loading images"
- msgstr "Wczytywanie obrazów"
- 
--#: src/commands-impl.c:275 src/commands-impl.c:1011 src/commands-impl.c:1579
-+#: src/commands-impl.c:274 src/commands-impl.c:1010 src/commands-impl.c:1572
- msgid "Enter the new name: "
- msgstr "Podaj nową nazwę: "
- 
--#: src/commands-impl.c:279 src/commands-impl.c:1015 src/commands-impl.c:1583
-+#: src/commands-impl.c:278 src/commands-impl.c:1014 src/commands-impl.c:1576
- #: src/gthumb-ui.xml.h:237 src/gthumb_tools.glade.h:45
- msgid "_Rename"
- msgstr "_Zmień nazwę"
- 
--#: src/commands-impl.c:293 src/commands-impl.c:917 src/commands-impl.c:1029
--#: src/commands-impl.c:1599 src/commands-impl.c:1694
-+#: src/commands-impl.c:292 src/commands-impl.c:916 src/commands-impl.c:1028
-+#: src/commands-impl.c:1592 src/commands-impl.c:1687
- #, c-format
- msgid ""
- "The name \"%s\" is not valid because it contains the character \"/\". Please "
- "use a different name."
- msgstr ""
--"Nazwa \"%s\" nie jest poprawna ponieważ zawiera znak \"/\". Użyj innej "
--"nazwy."
-+"Nazwa \"%s\" nie jest poprawna ponieważ zawiera znak \"/\". Użyj innej nazwy."
- 
--#: src/commands-impl.c:320 src/dlg-convert.c:314
-+#: src/commands-impl.c:319 src/dlg-convert.c:313
- msgid "_Overwrite"
- msgstr "_Nadpisz"
- 
--#: src/commands-impl.c:340 src/commands-impl.c:355
-+#: src/commands-impl.c:339 src/commands-impl.c:354
- #, c-format
- msgid "Could not rename the image \"%s\": %s"
- msgstr "Nie można zmienić nazwy obrazu \"%s\": %s"
- 
--#: src/commands-impl.c:342 src/commands-impl.c:1051 src/commands-impl.c:1357
-+#: src/commands-impl.c:341 src/commands-impl.c:1050 src/commands-impl.c:1350
- msgid "source and destination are the same"
- msgstr "źródło i cel są takie same"
- 
--#: src/commands-impl.c:446
-+#: src/commands-impl.c:445
- #, c-format
- msgid "Could not duplicate the image \"%s\": %s"
- msgstr "Nie można zduplikować obrazu \"%s\": %s"
- 
--#: src/commands-impl.c:454
-+#: src/commands-impl.c:453
- msgid "Stop"
- msgstr ""
- 
--#: src/commands-impl.c:455
-+#: src/commands-impl.c:454
- #, fuzzy
- msgid "Continue"
- msgstr "_Kontynuuj"
- 
--#: src/commands-impl.c:531
-+#: src/commands-impl.c:530
- msgid "The selected images will be moved to the Trash, are you sure?"
- msgstr "Czy na pewno chcesz przenieść zaznaczone obrazy do kosza?"
- 
--#: src/commands-impl.c:551
-+#: src/commands-impl.c:550
- msgid "The image will be moved to the Trash, are you sure?"
- msgstr "Czy na pewno chcesz przenieść obraz do kosza?"
- 
--#: src/commands-impl.c:786
-+#: src/commands-impl.c:785
- msgid "The image will be removed from the catalog, are you sure?"
- msgstr "Czy na pewno chcesz usunąć obraz z katalogu?"
- 
--#: src/commands-impl.c:828
-+#: src/commands-impl.c:827
- msgid "The selected images will be removed from the catalog, are you sure?"
- msgstr "Czy na pewno chcesz usunąć zaznaczone obrazy z katalogu?"
- 
--#: src/commands-impl.c:904 src/dlg-catalog.c:83 src/dlg-catalog.c:124
--#: src/dlg-categories.c:200 src/dlg-file-utils.c:89
-+#: src/commands-impl.c:903 src/dlg-catalog.c:83 src/dlg-catalog.c:124
-+#: src/dlg-categories.c:190 src/dlg-file-utils.c:89
- msgid "C_reate"
- msgstr "Ut_wórz"
- 
--#: src/commands-impl.c:933 src/commands-impl.c:1059 src/commands-impl.c:1621
--#: src/commands-impl.c:1713
-+#: src/commands-impl.c:932 src/commands-impl.c:1058 src/commands-impl.c:1614
-+#: src/commands-impl.c:1706
- #, c-format
- msgid "The name \"%s\" is already used. Please use a different name."
- msgstr "Nazwa \"%s\" jest już wykorzystywana. Użyj innej nazwy."
- 
--#: src/commands-impl.c:961
-+#: src/commands-impl.c:960
- msgid "New Folder"
- msgstr "Nowy folder"
- 
--#: src/commands-impl.c:962
-+#: src/commands-impl.c:961
- msgid "Enter the folder name: "
- msgstr "Podaj nazwę folderu: "
- 
--#: src/commands-impl.c:963
-+#: src/commands-impl.c:962
- #, c-format
- msgid "Could not create the folder \"%s\": %s"
- msgstr "Nie można utworzyć folderu \"%s\": %s"
- 
--#: src/commands-impl.c:974
-+#: src/commands-impl.c:973
- msgid "New Library"
- msgstr "Nowa biblioteka"
- 
--#: src/commands-impl.c:975 src/dlg-catalog.c:120
-+#: src/commands-impl.c:974 src/dlg-catalog.c:120
- msgid "Enter the library name: "
- msgstr "Podaj nazwę biblioteki: "
- 
--#: src/commands-impl.c:976
-+#: src/commands-impl.c:975
- #, c-format
- msgid "Could not create the library \"%s\": %s"
- msgstr "Nie można utworzyć biblioteki \"%s\": %s"
- 
--#: src/commands-impl.c:1049 src/commands-impl.c:1086
-+#: src/commands-impl.c:1048 src/commands-impl.c:1085
- #, c-format
- msgid "Could not rename the folder \"%s\": %s"
- msgstr "Nie można zmienić nazwy folderu \"%s\": %s"
- 
--#: src/commands-impl.c:1152
-+#: src/commands-impl.c:1151
- #, c-format
- msgid "Could not delete the folder \"%s\": %s"
- msgstr "Nie można usunąć folderu \"%s\": %s"
- 
--#: src/commands-impl.c:1183
-+#: src/commands-impl.c:1180
- #, c-format
- msgid ""
- "\"%s\" cannot be moved to the Trash. Do you want to delete it permanently?"
--msgstr ""
--"Nie można przenieść \"%s\" do kosza. Czy chcesz usunąć plik na stałe?"
--
--#: src/commands-impl.c:1191 src/dlg-file-utils.c:226
--msgid "_Do not display this message again"
--msgstr ""
-+msgstr "Nie można przenieść \"%s\" do kosza. Czy chcesz usunąć plik na stałe?"
- 
--#: src/commands-impl.c:1224
-+#: src/commands-impl.c:1217
- msgid "The selected folder will be moved to the Trash, are you sure?"
- msgstr "Czy na pewno chcesz przenieść zaznaczony folder do kosza?"
- 
--#: src/commands-impl.c:1226 src/dlg-file-utils.c:280
-+#: src/commands-impl.c:1219 src/dlg-file-utils.c:274
- msgid "_Move"
- msgstr "_Przenieś"
- 
--#: src/commands-impl.c:1292 src/commands-impl.c:1347
-+#: src/commands-impl.c:1285 src/commands-impl.c:1340
- #, c-format
- msgid "Could not copy the folder \"%s\": %s"
- msgstr "Nie można skopiować folderu \"%s\": %s"
- 
--#: src/commands-impl.c:1347 src/dlg-file-utils.c:2425
--#: src/dlg-file-utils.c:2427
-+#: src/commands-impl.c:1340 src/dlg-file-utils.c:2297
-+#: src/dlg-file-utils.c:2299
- #, c-format
- msgid "Could not move the folder \"%s\": %s"
- msgstr "Nie można przenieść folderu \"%s\": %s"
- 
--#: src/commands-impl.c:1368
-+#: src/commands-impl.c:1361
- msgid "source contains destination"
- msgstr "źródło zawiera cel"
- 
--#: src/commands-impl.c:1379
-+#: src/commands-impl.c:1372
- msgid "a folder with that name is already present."
- msgstr "folder o podanej nazwie już istnieje."
- 
--#: src/commands-impl.c:1460 src/dlg-file-utils.c:366 src/dlg-file-utils.c:455
-+#: src/commands-impl.c:1453 src/dlg-file-utils.c:360 src/dlg-file-utils.c:449
- msgid "Choose the destination folder"
- msgstr "Wybierz folder docelowy"
- 
--#: src/commands-impl.c:1632
-+#: src/commands-impl.c:1625
- #, c-format
- msgid "Could not rename the library \"%s\": %s"
- msgstr "Nie można zmienić nazwy biblioteki \"%s\": %s"
- 
--#: src/commands-impl.c:1632
-+#: src/commands-impl.c:1625
- #, c-format
- msgid "Could not rename the catalog \"%s\": %s"
- msgstr "Nie można zmienić nazwy katalogu \"%s\": %s"
- 
--#: src/commands-impl.c:1678 src/dlg-catalog.c:79
-+#: src/commands-impl.c:1671 src/dlg-catalog.c:79
- msgid "Enter the catalog name: "
- msgstr "Podaj nazwę katalogu: "
- 
--#: src/commands-impl.c:1679
-+#: src/commands-impl.c:1672
- msgid "New Catalog"
- msgstr "Nowy katalog"
- 
--#: src/commands-impl.c:1724
-+#: src/commands-impl.c:1717
- #, c-format
- msgid "Could not create the catalog \"%s\": %s"
- msgstr "Nie można utworzyć katalogu \"%s\": %s"
- 
--#: src/commands-impl.c:1788
-+#: src/commands-impl.c:1781
- msgid "The selected library will be removed, are you sure?"
- msgstr "Czy na pewno chcesz usunąć zaznaczoną bibliotekę?"
- 
--#: src/commands-impl.c:1790
-+#: src/commands-impl.c:1783
- msgid "The selected catalog will be removed, are you sure?"
- msgstr "Czy na pewno chcesz usunąć zaznaczony katalog?"
- 
--#: src/commands-impl.c:2759 src/dlg-categories.c:337 src/dlg-comment.c:327
--#: src/dlg-jpegtran.c:631 src/dlg-maintenance.c:273 src/dlg-preferences.c:175
-+#: src/commands-impl.c:2752 src/dlg-categories.c:321 src/dlg-comment.c:327
-+#: src/dlg-jpegtran.c:631 src/dlg-maintenance.c:273 src/dlg-preferences.c:174
- #: src/dlg-search.c:450
- #, c-format
- msgid "Could not display help: %s"
- msgstr "Nie można wyświetlić pomocy: %s"
- 
--#: src/commands-impl.c:2810
-+#: src/commands-impl.c:2803
- msgid "translator_credits"
- msgstr "GNOME PL Team <translators@gnome.pl>"
- 
--#: src/commands-impl.c:2819 src/gthumb-window.c:816 src/gthumb-window.c:4896
-+#: src/commands-impl.c:2812 src/gthumb-window.c:812 src/gthumb-window.c:4877
-+#: src/gthumb_png_exporter.glade.h:75 src/gthumb_web_exporter.glade.h:49
- #: src/main.c:124
- msgid "gThumb"
- msgstr "gThumb"
- 
--#: src/commands-impl.c:2822
-+#: src/commands-impl.c:2815
- msgid "An image viewer and browser for GNOME."
- msgstr "Przeglądarka obrazów dla środowiska GNOME."
- 
-@@ -706,39 +617,34 @@
- msgid "Move Catalog to..."
- msgstr "Przeniesienie katalogu do..."
- 
--#: src/dlg-categories.c:196
-+#: src/dlg-categories.c:186
- msgid "Enter the new category name"
- msgstr "Wprowadź nazwę nowej kategorii"
- 
--#: src/dlg-categories.c:207
--#, fuzzy, c-format
--msgid ""
--"The name \"%s\" is not valid because it contains the character \",\". Please "
--"use a different name."
--msgstr ""
--"Nazwa \"%s\" nie jest poprawna ponieważ zawiera znak \"/\". Użyj innej "
--"nazwy."
--
--#: src/dlg-categories.c:212
-+#: src/dlg-categories.c:197
- #, c-format
- msgid "The category \"%s\" is already present. Please use a different name."
- msgstr "Kategoria \"%s\" już istnieje. Użyj innej nazwy."
- 
--#: src/dlg-convert.c:159
-+#: src/dlg-convert.c:158
- #, c-format
- msgid "Converting image: %s"
- msgstr "Konwertowanie obrazu: %s"
- 
--#: src/dlg-convert.c:182
-+#: src/dlg-convert.c:181
- #, c-format
- msgid ""
- "An image named \"%s\" is already present. Please specify a different name."
- msgstr "Obraz o nazwie \"%s\" już istnieje. Wybierz inną nazwę."
- 
--#: src/dlg-convert.c:313 src/gthumb_convert.glade.h:17
-+#: src/dlg-convert.c:312 src/gthumb_convert.glade.h:17
- msgid "Skip"
- msgstr "Pomiń"
- 
-+#: src/dlg-duplicates.c:265
-+msgid "Image"
-+msgstr "Obraz"
-+
- #: src/dlg-duplicates.c:279 src/dlg-duplicates.c:650
- msgid "Duplicates"
- msgstr "Duplikaty"
-@@ -778,73 +684,72 @@
- msgid "Could not delete the images:"
- msgstr "Nie można usunąć obrazów:"
- 
--#: src/dlg-file-utils.c:223
-+#: src/dlg-file-utils.c:220
- msgid ""
- "The images cannot be moved to the Trash. Do you want to delete them "
- "permanently?"
--msgstr ""
--"Nie można przenieść obrazów do kosza. Czy chcesz je na stałe usunąć?"
-+msgstr "Nie można przenieść obrazów do kosza. Czy chcesz je na stałe usunąć?"
- 
--#: src/dlg-file-utils.c:757 src/dlg-file-utils.c:858
-+#: src/dlg-file-utils.c:751 src/dlg-file-utils.c:852
- msgid "You didn't enter the new name"
- msgstr "Nie podano nowej nazwy"
- 
--#: src/dlg-file-utils.c:769 src/dlg-file-utils.c:870
-+#: src/dlg-file-utils.c:763 src/dlg-file-utils.c:864
- #, c-format
- msgid ""
- "The name \"%s\" is already used in this folder. Please use a different name."
- msgstr ""
- "Nazwa \"%s\" jest aktualnie używana w tym folderze. Wybierz inną nazwę."
- 
--#: src/dlg-file-utils.c:1009
-+#: src/dlg-file-utils.c:1003
- msgid "Could not rename the image:"
- msgstr "Nie można zmienić nazwy obrazu:"
- 
--#: src/dlg-file-utils.c:1011
-+#: src/dlg-file-utils.c:1005
- msgid "Could not rename the following images:"
- msgstr "Nie można zmienić nazwy poniższych obrazów:"
- 
--#: src/dlg-file-utils.c:1145
-+#: src/dlg-file-utils.c:1138
- msgid "Could not move the image:"
- msgstr "Nie można przenieść obrazu:"
- 
--#: src/dlg-file-utils.c:1147
-+#: src/dlg-file-utils.c:1140
- msgid "Could not copy the image:"
- msgstr "Nie można skopiować obrazu:"
- 
--#: src/dlg-file-utils.c:1171 src/dlg-file-utils.c:2448
-+#: src/dlg-file-utils.c:1164 src/dlg-file-utils.c:2320
- msgid "_Abort"
- msgstr "_Przerwij"
- 
--#: src/dlg-file-utils.c:1172 src/dlg-file-utils.c:2449
-+#: src/dlg-file-utils.c:1165 src/dlg-file-utils.c:2321
- msgid "_Continue"
- msgstr "_Kontynuuj"
- 
--#: src/dlg-file-utils.c:1345
-+#: src/dlg-file-utils.c:1337
- #, c-format
- msgid "Copying file %d of %d"
- msgstr "Kopiowanie pliku %d z %d"
- 
--#: src/dlg-file-utils.c:1770 src/dlg-file-utils.c:1997
-+#: src/dlg-file-utils.c:1720 src/dlg-file-utils.c:1906
- msgid "Collecting images info"
- msgstr "Zbieranie informacji o obrazach"
- 
--#: src/dlg-file-utils.c:1773 src/dlg-file-utils.c:2010
-+#: src/dlg-file-utils.c:1723 src/dlg-file-utils.c:1919
- #, c-format
- msgid "Deleting file %ld of %ld"
- msgstr "Usuwanie %ld pliku z %ld"
- 
--#: src/dlg-file-utils.c:2000
-+#: src/dlg-file-utils.c:1909
- #, c-format
- msgid "Copying file %ld of %ld"
- msgstr "Kopiowanie %ld pliku z %ld"
- 
--#: src/dlg-file-utils.c:2005
-+#: src/dlg-file-utils.c:1914
- #, c-format
- msgid "Moving file %ld of %ld"
- msgstr "Przenoszenie %ld pliku z %ld"
- 
--#: src/dlg-image-prop.c:841 src/gthumb-window.c:439
-+#: src/dlg-image-prop.c:841 src/gthumb-window.c:436
- msgid "Size"
- msgstr "Rozmiar"
- 
-@@ -852,7 +757,11 @@
- msgid "Type"
- msgstr "Rodzaj"
- 
--#: src/dlg-image-prop.c:861 src/gthumb-window.c:453
-+#: src/dlg-image-prop.c:851 src/gthumb-window.c:443
-+msgid "Bytes"
-+msgstr "Bajtów"
-+
-+#: src/dlg-image-prop.c:861 src/gthumb-window.c:450
- msgid "Modified"
- msgstr "Zmodyfikowano"
- 
-@@ -860,13 +769,12 @@
- msgid "Information on Channel"
- msgstr "Informacja o kanale"
- 
--#: src/dlg-image-prop.c:900 src/gthumb-window.c:5345
-+#: src/dlg-image-prop.c:900 src/gthumb-window.c:5326
- msgid "Field"
- msgstr "Pole"
- 
--#: src/dlg-image-prop.c:910 src/gthumb-window.c:5355
--#, fuzzy
--msgid "Value "
-+#: src/dlg-image-prop.c:910 src/gthumb-window.c:5336 src/gthumb.glade.h:25
-+msgid "Value"
- msgstr "Wartość"
- 
- #: src/dlg-image-prop.c:991
-@@ -886,15 +794,15 @@
- msgid "Specify the backup file"
- msgstr "Wskazanie pliku zapasowego"
- 
--#: src/dlg-png-exporter.c:1004
-+#: src/dlg-png-exporter.c:997
- msgid "Image Caption"
- msgstr "Opis obrazu"
- 
--#: src/dlg-png-exporter.c:1057
-+#: src/dlg-png-exporter.c:1050
- msgid "Header"
- msgstr "Nagłówek"
- 
--#: src/dlg-png-exporter.c:1070 src/dlg-png-exporter.c:1076
-+#: src/dlg-png-exporter.c:1063 src/dlg-png-exporter.c:1069
- msgid "Footer"
- msgstr "Stopka"
- 
-@@ -918,7 +826,7 @@
- msgid "Folder"
- msgstr "Folder"
- 
--#: src/dlg-web-exporter.c:658
-+#: src/dlg-web-exporter.c:649
- msgid "Select Album Theme"
- msgstr "Wybór motywu albumu"
- 
-@@ -930,7 +838,7 @@
- msgid "Image Info"
- msgstr "Informacje o obrazie"
- 
--#: src/fullscreen.c:818 src/gthumb-window.c:4303
-+#: src/fullscreen.c:818 src/gthumb-window.c:4270
- msgid "Back"
- msgstr "Wstecz"
- 
-@@ -1950,68 +1858,68 @@
- msgid "by _Time"
- msgstr "według _czasu"
- 
--#: src/gthumb-window.c:696
-+#: src/gthumb-window.c:692
- msgid "[Press 'c' to add a comment]"
- msgstr "[Naciśnij \"c\" aby dodać komentarz]"
- 
--#: src/gthumb-window.c:770 src/gthumb-window.c:793
-+#: src/gthumb-window.c:766 src/gthumb-window.c:789
- msgid "[modified]"
- msgstr "[zmodyfikowano]"
- 
--#: src/gthumb-window.c:877
-+#: src/gthumb-window.c:873
- msgid "No image"
- msgstr "Brak obrazów"
- 
--#: src/gthumb-window.c:879
-+#: src/gthumb-window.c:875
- #, c-format
- msgid "1 image (%s)"
- msgstr "1 obraz (%s)"
- 
--#: src/gthumb-window.c:882
-+#: src/gthumb-window.c:878
- #, c-format
- msgid "%d images (%s)"
- msgstr "%d obrazów (%s)"
- 
--#: src/gthumb-window.c:889
-+#: src/gthumb-window.c:885
- #, c-format
- msgid "1 selected (%s)"
- msgstr ""
- 
--#: src/gthumb-window.c:892
-+#: src/gthumb-window.c:888
- #, c-format
- msgid "%d selected (%s)"
- msgstr ""
- 
--#: src/gthumb-window.c:3383
-+#: src/gthumb-window.c:3378
- msgid "Dragged Images"
- msgstr "Przeciągnięte obrazy"
- 
--#: src/gthumb-window.c:3582
-+#: src/gthumb-window.c:3574
- msgid "Could not move the items:"
- msgstr "Nie można przenieść elementów:"
- 
--#: src/gthumb-window.c:5226
-+#: src/gthumb-window.c:5207
- msgid "Image comment"
- msgstr "Komentarz do obrazu"
- 
--#: src/gthumb-window.c:5240
-+#: src/gthumb-window.c:5221
- msgid "Image data"
- msgstr "Dane obrazu"
- 
--#: src/gthumb-window.c:5254
-+#: src/gthumb-window.c:5235
- msgid "Image preview"
- msgstr "Podgląd obrazu"
- 
--#: src/gthumb-window.c:6500
-+#: src/gthumb-window.c:6467
- #, c-format
- msgid "Cannot load folder \"%s\": %s\n"
- msgstr "Nie można wczytać foldera \"%s\": %s\n"
- 
--#: src/gthumb-window.c:6769
-+#: src/gthumb-window.c:6736
- msgid "The specified catalog does not exist."
- msgstr "Wybrany katalog nie istnieje."
- 
--#: src/gthumb-window.c:8139
-+#: src/gthumb-window.c:8082
- msgid "Wait please..."
- msgstr "Proszę czekać..."
- 
-@@ -2114,10 +2022,6 @@
- msgid "Red"
- msgstr "Czerwony"
- 
--#: src/gthumb.glade.h:25
--msgid "Value"
--msgstr "Wartość"
--
- #: src/gthumb.glade.h:26
- msgid "_Application:"
- msgstr "_Aplikacja:"
-@@ -2154,107 +2058,6 @@
- msgid "_Save the new image as:"
- msgstr "_Zapisz nowy obraz jako:"
- 
--#: src/gthumb.schemas.in.h:1
--msgid ""
--"Images over this size (in bytes) will not be thumbnailed. Use 0 if you want "
--"to generate thumbnails for all images."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:2
--msgid "Possible values are: 1, 2, 3, 4."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:3
--msgid "Possible values are: actual_size, fit, keep_prev, fit_if_larger."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:4
--msgid "Possible values are: ascending, descending."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:5
--msgid "Possible values are: forward, backward."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:6
--msgid "Possible values are: high, low."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:7
--msgid "Possible values are: image, data, comment."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:8
--msgid "Possible values are: jpeg, png, tga, tiff."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:9
--msgid "Possible values are: light, midtone, dark."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:10
--msgid "Possible values are: list, thumbnails."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:11
--msgid "Possible values are: mm, in."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:12
--msgid "Possible values are: name, path, size, time."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:13
--msgid "Possible values are: name, size, time."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:14
--msgid "Possible values are: nautilus, single, double."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:15
--msgid "Possible values are: none, deflate, jpeg."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:16
--msgid "Possible values are: none, name, path, size, time."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:17
--msgid ""
--"Possible values are: none, simple, simple_with_shadow, shadow, slide, "
--"shadow_in, shadow_out."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:18
--msgid "Possible values are: pixels, percentage."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:19
--msgid "Possible values are: png, jpeg."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:20
--msgid "Possible values are: skip, rename, ask, overwrite."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:21
--msgid "Possible values are: small, medium, large."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:22
--msgid ""
--"Possible values are: system, text_below, text_beside, text_only, icons_only."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:23
--msgid "Possible values are: white, black, checked, none."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:24
--msgid "Whether to always use a black background."
--msgstr ""
--
- #: src/gthumb_comments.glade.h:3 src/gthumb_search.glade.h:5
- msgid "A_vailable categories:"
- msgstr "Dostęp_ne kategorie:"
-@@ -2585,6 +2388,11 @@
- msgid "_Yellow-Blue:"
- msgstr ""
- 
-+# albo pikseli
-+#: src/gthumb_edit.glade.h:33 src/gthumb_web_exporter.glade.h:51
-+msgid "pixels"
-+msgstr "piksele"
-+
- #: src/gthumb_png_exporter.glade.h:4
- msgid "112"
- msgstr "112"
-@@ -2685,11 +2493,11 @@
- msgid "Create _HTML image map"
- msgstr "Utwórz mapę _HTML obrazu"
- 
--#: src/gthumb_png_exporter.glade.h:29 src/gthumb_web_exporter.glade.h:22
-+#: src/gthumb_png_exporter.glade.h:29
- msgid "F_ooter:"
- msgstr "St_opka:"
- 
--#: src/gthumb_png_exporter.glade.h:30 src/gthumb_web_exporter.glade.h:23
-+#: src/gthumb_png_exporter.glade.h:30 src/gthumb_web_exporter.glade.h:22
- msgid "File _name"
- msgstr "_Nazwa pliku"
- 
-@@ -2697,7 +2505,7 @@
- msgid "File pa_th"
- msgstr "Ścieżka p_liku"
- 
--#: src/gthumb_png_exporter.glade.h:32 src/gthumb_web_exporter.glade.h:24
-+#: src/gthumb_png_exporter.glade.h:32 src/gthumb_web_exporter.glade.h:23
- msgid "File si_ze"
- msgstr "Ro_zmiar pliku"
- 
-@@ -2709,7 +2517,7 @@
- msgid "Frame co_lor:"
- msgstr "Kol_or ramki:"
- 
--#: src/gthumb_png_exporter.glade.h:35 src/gthumb_web_exporter.glade.h:26
-+#: src/gthumb_png_exporter.glade.h:35
- msgid "H_eader:"
- msgstr "Nagłó_wek"
- 
-@@ -2721,7 +2529,7 @@
- msgid "Hei_ght:"
- msgstr "Wyso_kość:"
- 
--#: src/gthumb_png_exporter.glade.h:38 src/gthumb_web_exporter.glade.h:28
-+#: src/gthumb_png_exporter.glade.h:38 src/gthumb_web_exporter.glade.h:26
- msgid "Image dim_ensions"
- msgstr "R_ozmiary obrazu"
- 
-@@ -2741,7 +2549,7 @@
- msgid "Pi_xels"
- msgstr "Pi_ksele"
- 
--#: src/gthumb_png_exporter.glade.h:43 src/gthumb_web_exporter.glade.h:30
-+#: src/gthumb_png_exporter.glade.h:43 src/gthumb_web_exporter.glade.h:28
- msgid "Re_verse order"
- msgstr ""
- 
-@@ -2796,8 +2604,7 @@
- 
- #: src/gthumb_png_exporter.glade.h:56
- msgid "Use #'s to specify positions used by numeric enumerator."
--msgstr ""
--"Użyj znaków # do określenia pozycji wykorzystywanych przez numerator."
-+msgstr "Użyj znaków # do określenia pozycji wykorzystywanych przez numerator."
- 
- #: src/gthumb_png_exporter.glade.h:58
- #, no-c-format
-@@ -2832,7 +2639,7 @@
- msgid "_Image size:"
- msgstr ""
- 
--#: src/gthumb_png_exporter.glade.h:67 src/gthumb_web_exporter.glade.h:45
-+#: src/gthumb_png_exporter.glade.h:67 src/gthumb_web_exporter.glade.h:41
- msgid "_Rows:"
- msgstr "_Wiersze:"
- 
-@@ -2844,15 +2651,15 @@
- msgid "_Template:"
- msgstr "_Szablon:"
- 
--#: src/gthumb_png_exporter.glade.h:71 src/gthumb_web_exporter.glade.h:49
-+#: src/gthumb_png_exporter.glade.h:71 src/gthumb_web_exporter.glade.h:46
- msgid "by name"
- msgstr "według nazwy"
- 
--#: src/gthumb_png_exporter.glade.h:72 src/gthumb_web_exporter.glade.h:50
-+#: src/gthumb_png_exporter.glade.h:72 src/gthumb_web_exporter.glade.h:47
- msgid "by path"
- msgstr "według ścieżki"
- 
--#: src/gthumb_png_exporter.glade.h:73 src/gthumb_web_exporter.glade.h:51
-+#: src/gthumb_png_exporter.glade.h:73 src/gthumb_web_exporter.glade.h:48
- msgid "by size"
- msgstr "według rozmiaru"
- 
-@@ -2860,11 +2667,11 @@
- msgid "by time"
- msgstr "według czasu"
- 
--#: src/gthumb_png_exporter.glade.h:75
-+#: src/gthumb_png_exporter.glade.h:76
- msgid "jpeg"
- msgstr "jpeg"
- 
--#: src/gthumb_png_exporter.glade.h:76
-+#: src/gthumb_png_exporter.glade.h:77
- msgid "png"
- msgstr "png"
- 
-@@ -3415,9 +3222,9 @@
- "original filename. Use ? to insert the image date. Use ! to insert the image "
- "size"
- msgstr ""
--"Użyj znaków # do określenia pozycji wykorzystywanych przez numerator. "
--"Użyj * do wprowadzenia oryginalnej nazwy pliku. Użyj ? do wprowadzenia "
--"daty obrazu. Użyj znaku ! do wprowadzenia rozmiaru obrazu."
-+"Użyj znaków # do określenia pozycji wykorzystywanych przez numerator. Użyj * "
-+"do wprowadzenia oryginalnej nazwy pliku. Użyj ? do wprowadzenia daty obrazu. "
-+"Użyj znaku ! do wprowadzenia rozmiaru obrazu."
- 
- #: src/gthumb_tools.glade.h:46
- msgid "_Sort original list:"
-@@ -3498,88 +3305,87 @@
- msgid "Exposure _time"
- msgstr ""
- 
--#: src/gthumb_web_exporter.glade.h:25
-+#: src/gthumb_web_exporter.glade.h:24
- msgid "Focal _length"
- msgstr ""
- 
--#: src/gthumb_web_exporter.glade.h:27
-+#: src/gthumb_web_exporter.glade.h:25
- #, fuzzy
- msgid "I_mage Caption..."
- msgstr "Opis obrazu"
- 
--#: src/gthumb_web_exporter.glade.h:29
-+#: src/gthumb_web_exporter.glade.h:27
- msgid "Inde_x file:"
- msgstr "Plik inde_ksu:"
- 
--#: src/gthumb_web_exporter.glade.h:31
-+#: src/gthumb_web_exporter.glade.h:29
- #, fuzzy
- msgid "Resi_ze images if larger than:"
- msgstr "Odwrócenie kolejności obrazów"
- 
--#: src/gthumb_web_exporter.glade.h:32
-+#: src/gthumb_web_exporter.glade.h:30
- msgid "Sor_t:"
- msgstr ""
- 
--#: src/gthumb_web_exporter.glade.h:33
-+#: src/gthumb_web_exporter.glade.h:31
- msgid "Th_eme:"
- msgstr "Mo_tyw:"
- 
--#: src/gthumb_web_exporter.glade.h:35
--#, no-c-format
--msgid "Use %d  to insert current date"
--msgstr ""
--
--#: src/gthumb_web_exporter.glade.h:36
-+#: src/gthumb_web_exporter.glade.h:32
- msgid "Web Album"
- msgstr "Album WWW"
- 
--#: src/gthumb_web_exporter.glade.h:37
-+#: src/gthumb_web_exporter.glade.h:33
- msgid "Web Album Theme"
- msgstr "Motyw albumu WWW"
- 
--#: src/gthumb_web_exporter.glade.h:38
-+#: src/gthumb_web_exporter.glade.h:34
- msgid "_Aperture value"
- msgstr ""
- 
--#: src/gthumb_web_exporter.glade.h:39
-+#: src/gthumb_web_exporter.glade.h:35
- msgid "_Copy images to destination"
- msgstr "_Skopiuj obrazy do katalogu docelowego"
- 
--#: src/gthumb_web_exporter.glade.h:40
-+#: src/gthumb_web_exporter.glade.h:36
- msgid "_Date and Time"
- msgstr ""
- 
--#: src/gthumb_web_exporter.glade.h:41
-+#: src/gthumb_web_exporter.glade.h:37
- msgid "_Destination:"
- msgstr "_Przeznaczenie:"
- 
--#: src/gthumb_web_exporter.glade.h:42
-+#: src/gthumb_web_exporter.glade.h:38
- #, fuzzy
- msgid "_Flash"
- msgstr "_Nazwy plików"
- 
--#: src/gthumb_web_exporter.glade.h:43
-+#: src/gthumb_web_exporter.glade.h:39
- msgid "_Go to Theme Folder"
- msgstr "_Przejdź do folderu z motywem"
- 
--#: src/gthumb_web_exporter.glade.h:44
-+#: src/gthumb_web_exporter.glade.h:40
- msgid "_Install Theme..."
- msgstr "Za_instaluj motyw..."
- 
--#: src/gthumb_web_exporter.glade.h:46
-+#: src/gthumb_web_exporter.glade.h:42
- msgid "_Shutter speed"
- msgstr ""
- 
--#: src/gthumb_web_exporter.glade.h:47
-+#: src/gthumb_web_exporter.glade.h:43
- #, fuzzy
- msgid "_Thumbnail Caption..."
- msgstr "_Miniatury"
- 
--#: src/gthumb_web_exporter.glade.h:48
-+#: src/gthumb_web_exporter.glade.h:44
-+msgid "_Title:"
-+msgstr "_Tytuł:"
-+
-+#: src/gthumb_web_exporter.glade.h:45
- msgid "by modified time"
- msgstr "według czasu modyfikacji"
- 
--#: src/gthumb_web_exporter.glade.h:52
-+#: src/gthumb_web_exporter.glade.h:50
- msgid "index.html"
- msgstr "index.html"
- 
-@@ -3642,21 +3448,3 @@
- #: src/main.c:311 src/main.c:393
- msgid "Command Line"
- msgstr "Wiersz poleceń"
--
--#~ msgid ""
--#~ "GConf error:\n"
--#~ "  %s"
--#~ msgstr ""
--#~ "Błąd programu GConf:\n"
--#~ "  %s"
--
--#~ msgid "Sans Regular 12"
--#~ msgstr "Sans Regular 12"
--
--#~ msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
--#~ msgstr ""
--#~ "AaĄąBbCcĆćDdEeĘęFfGgHhIiJjKkLlŁłMmNnŃńOoÓóPpRrSsŚśTtUuWwYyZzŹ�"
--#~ "�Żż"
--
--#~ msgid "_Title:"
--#~ msgstr "_Tytuł:"
diff --git a/graphics/gthumb2/files/patch-po_ru.po b/graphics/gthumb2/files/patch-po_ru.po
deleted file mode 100644
index 87837ae124e1..000000000000
--- a/graphics/gthumb2/files/patch-po_ru.po
+++ /dev/null
@@ -1,1352 +0,0 @@
---- po/ru.po	Sat Aug  9 18:36:08 2003
-+++ /home/pav/cvs/gnome/gthumb/po/ru.po	Wed Jan  1 04:20:29 1997
-@@ -6,7 +6,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: gthumb\n"
--"POT-Creation-Date: 2003-08-09 18:35+0200\n"
-+"POT-Creation-Date: 2003-07-06 20:06+0200\n"
- "PO-Revision-Date: 2003-07-09 05:05+0400\n"
- "Last-Translator: Вячеслав Диконов <slava@altlinux.ru>\n"
- "Language-Team: russian <ru@li.org>\n"
-@@ -103,9 +103,7 @@
- #: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:14
- #: src/gthumb-ui.xml.h:143
- msgid "Start or stop current animation"
--msgstr ""
--"Начать/прекратить показ текущего "
--"мультфильма"
-+msgstr "Начать/прекратить показ текущего мультфильма"
- 
- #: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:15
- msgid "Start/Stop _Animation"
-@@ -173,126 +171,16 @@
- msgid "_Zoom Quality"
- msgstr "Качество мас_штабирования"
- 
--#: components/image-viewer/viewer-stream.c:90 src/dlg-file-utils.c:523
-+#: components/image-viewer/viewer-stream.c:90 src/dlg-file-utils.c:517
- msgid "%d %b %Y, %H:%M"
- msgstr "%d %b %Y, %H:%M"
- 
- #: components/image-viewer/viewer-stream.c:98 src/catalog-png-exporter.c:806
--#: src/dlg-image-prop.c:656 src/fullscreen.c:218 src/gthumb-window.c:417
-+#: src/dlg-image-prop.c:656 src/fullscreen.c:218 src/gthumb-window.c:414
- #, c-format
- msgid "%d x %d pixels"
- msgstr "%d x %d пикселей"
- 
--#: data/albumthemes/Classic/image.xml.in.h:2
--#: data/albumthemes/ClassicClips/image.xml.in.h:2
--#: data/albumthemes/Clean/image.xml.in.h:1
--#: data/albumthemes/NeatRound/image.xml.in.h:2
--#: data/albumthemes/NeatSquare/image.xml.in.h:2
--#, fuzzy
--msgid "Aperture value"
--msgstr "_Просвет диафрагмы"
--
--#: data/albumthemes/Classic/image.xml.in.h:3
--#: data/albumthemes/ClassicClips/image.xml.in.h:3
--#: data/albumthemes/Clean/image.xml.in.h:2
--#: data/albumthemes/NeatRound/image.xml.in.h:3
--#: data/albumthemes/NeatSquare/image.xml.in.h:3 src/dlg-image-prop.c:851
--#: src/gthumb-window.c:446
--msgid "Bytes"
--msgstr "Байт"
--
--#: data/albumthemes/Classic/image.xml.in.h:4
--#: data/albumthemes/ClassicClips/image.xml.in.h:4
--#: data/albumthemes/Clean/image.xml.in.h:3
--#: data/albumthemes/NeatRound/image.xml.in.h:4
--#: data/albumthemes/NeatSquare/image.xml.in.h:4
--#, fuzzy
--msgid "Camera model"
--msgstr "_Модель фотоаппарата"
--
--#: data/albumthemes/Classic/image.xml.in.h:5
--#: data/albumthemes/ClassicClips/image.xml.in.h:5
--#: data/albumthemes/Clean/image.xml.in.h:4
--#: data/albumthemes/NeatRound/image.xml.in.h:5
--#: data/albumthemes/NeatSquare/image.xml.in.h:5
--#, fuzzy
--msgid "Date"
--msgstr "_Дата:"
--
--#: data/albumthemes/Classic/image.xml.in.h:6
--#: data/albumthemes/ClassicClips/image.xml.in.h:6
--#: data/albumthemes/Clean/image.xml.in.h:5
--#: data/albumthemes/NeatRound/image.xml.in.h:6
--#: data/albumthemes/NeatSquare/image.xml.in.h:6
--#, fuzzy
--msgid "Dimensions"
--msgstr "Размеры изобра_жения"
--
--#: data/albumthemes/Classic/image.xml.in.h:7
--#: data/albumthemes/ClassicClips/image.xml.in.h:7
--#: data/albumthemes/Clean/image.xml.in.h:6
--#: data/albumthemes/NeatRound/image.xml.in.h:7
--#: data/albumthemes/NeatSquare/image.xml.in.h:7
--#, fuzzy
--msgid "Exposure mode"
--msgstr "_Режим экспозиции"
--
--#: data/albumthemes/Classic/image.xml.in.h:8
--#: data/albumthemes/ClassicClips/image.xml.in.h:8
--#: data/albumthemes/Clean/image.xml.in.h:7
--#: data/albumthemes/NeatRound/image.xml.in.h:8
--#: data/albumthemes/NeatSquare/image.xml.in.h:8
--#, fuzzy
--msgid "Exposure time"
--msgstr "_Экспозиция"
--
--#: data/albumthemes/Classic/image.xml.in.h:9
--#: data/albumthemes/ClassicClips/image.xml.in.h:9
--#: data/albumthemes/Clean/image.xml.in.h:8
--#: data/albumthemes/NeatRound/image.xml.in.h:9
--#: data/albumthemes/NeatSquare/image.xml.in.h:9
--#, fuzzy
--msgid "Flash"
--msgstr "_Вспышка"
--
--#: data/albumthemes/Classic/image.xml.in.h:10
--#: data/albumthemes/ClassicClips/image.xml.in.h:10
--#: data/albumthemes/Clean/image.xml.in.h:9
--#: data/albumthemes/NeatRound/image.xml.in.h:10
--#: data/albumthemes/NeatSquare/image.xml.in.h:10
--#, fuzzy
--msgid "Focal length"
--msgstr "Ф_окусное расстояние"
--
--#: data/albumthemes/Classic/image.xml.in.h:11
--#: data/albumthemes/ClassicClips/image.xml.in.h:11
--#: data/albumthemes/Clean/image.xml.in.h:10
--#: data/albumthemes/NeatRound/image.xml.in.h:11
--#: data/albumthemes/NeatSquare/image.xml.in.h:11 src/dlg-duplicates.c:265
--msgid "Image"
--msgstr "Изображение"
--
--#: data/albumthemes/Classic/image.xml.in.h:12
--#: data/albumthemes/ClassicClips/image.xml.in.h:12
--#: data/albumthemes/Clean/image.xml.in.h:11
--#: data/albumthemes/NeatRound/image.xml.in.h:12
--#: data/albumthemes/NeatSquare/image.xml.in.h:12
--#, fuzzy
--msgid "Shutter speed"
--msgstr "_Скорость затвора"
--
--#: data/albumthemes/Clean/image.xml.in.h:12 src/gthumb_edit.glade.h:33
--#: src/gthumb_web_exporter.glade.h:53
--msgid "pixels"
--msgstr "в пикселях"
--
--#: data/albumthemes/Classic/image.xml.in.h:1
--#: data/albumthemes/ClassicClips/image.xml.in.h:1
--#: data/albumthemes/NeatRound/image.xml.in.h:1
--#: data/albumthemes/NeatSquare/image.xml.in.h:1
--msgid "(click on the image to view it at original size)"
--msgstr ""
--
- #: gthumb.desktop.in.h:1
- msgid "View and organize your images"
- msgstr ""
-@@ -326,32 +214,32 @@
- msgid "Cannot save catalog \"%s\": %s"
- msgstr "Невозможно сохранить альбом \"%s\" : %s"
- 
--#: libgthumb/comments.c:410
-+#: libgthumb/comments.c:401
- msgid "Deleting all comments, wait please..."
- msgstr ""
- "Удаляются комментарии, подождите "
- "пожалуйста..."
- 
--#: libgthumb/comments.c:412
-+#: libgthumb/comments.c:403
- msgid "Deleting old comments, wait please..."
- msgstr ""
- "Удаляются старые комментарии, подождите "
- "пожалуйста..."
- 
--#: libgthumb/comments.c:756
-+#: libgthumb/comments.c:747
- msgid "%d %B %Y"
- msgstr "%d %B %Y"
- 
--#: libgthumb/comments.c:758 src/dlg-duplicates.c:551 src/dlg-image-prop.c:676
--#: src/fullscreen.c:225 src/gthumb-window.c:414
-+#: libgthumb/comments.c:749 src/dlg-duplicates.c:551 src/dlg-image-prop.c:676
-+#: src/fullscreen.c:225 src/gthumb-window.c:411
- msgid "%d %B %Y, %H:%M"
- msgstr "%d %B %Y, %H:%M"
- 
--#: libgthumb/comments.c:768
-+#: libgthumb/comments.c:759
- msgid "(No Comment)"
- msgstr "(Без комментариев)"
- 
--#: libgthumb/dlg-save-image.c:97 src/commands-impl.c:313 src/dlg-convert.c:308
-+#: libgthumb/dlg-save-image.c:97 src/commands-impl.c:312 src/dlg-convert.c:307
- #, c-format
- msgid "An image named \"%s\" is already present. Do you want to overwrite it?"
- msgstr ""
-@@ -375,6 +263,15 @@
- msgid "Image type:"
- msgstr "Формат изображения:"
- 
-+#: libgthumb/gconf-utils.c:98
-+#, c-format
-+msgid ""
-+"GConf error:\n"
-+"  %s"
-+msgstr ""
-+"Ошибка GConf:\n"
-+"  %s"
-+
- #: libgthumb/gnome-print-font-dialog.c:114
- msgid "_Insert a new preview phrase."
- msgstr "_Введите новый текст"
-@@ -425,9 +322,7 @@
- 
- #: libgthumb/gnome-print-font-picker.c:219
- msgid "Use font in the label in font info mode"
--msgstr ""
--"Использовать шрифт для надписи в режиме "
--"просмотра сведений о шрифте"
-+msgstr "Использовать шрифт для надписи в режиме просмотра сведений о шрифте"
- 
- #: libgthumb/gnome-print-font-picker.c:227
- msgid "Font size for label"
-@@ -435,9 +330,7 @@
- 
- #: libgthumb/gnome-print-font-picker.c:228
- msgid "Font size for label in font info mode"
--msgstr ""
--"Размер шрифта надписи в режиме просмотра "
--"сведений о шрифте"
-+msgstr "Размер шрифта надписи в режиме просмотра сведений о шрифте"
- 
- #: libgthumb/gnome-print-font-picker.c:238
- msgid "Show size"
-@@ -445,9 +338,7 @@
- 
- #: libgthumb/gnome-print-font-picker.c:239
- msgid "Show size in font info mode"
--msgstr ""
--"Показывать размер в режиме просмотра "
--"сведений о шрифте"
-+msgstr "Показывать размер в режиме просмотра сведений о шрифте"
- 
- #: libgthumb/gnome-print-font-picker.c:1018
- msgid "Font"
-@@ -459,26 +350,26 @@
- msgstr "Комментарий"
- 
- #: libgthumb/gth-file-view-list.c:1383 src/dlg-duplicates.c:372
--#: src/dlg-image-prop.c:836 src/gthumb-window.c:432
-+#: src/dlg-image-prop.c:836 src/gthumb-window.c:429
- msgid "Name"
- msgstr "Имя"
- 
--#: libgthumb/print-callbacks.c:925 libgthumb/print-callbacks.c:1504
-+#: libgthumb/print-callbacks.c:919 libgthumb/print-callbacks.c:1499
- #, c-format
- msgid "Print %s"
- msgstr "Печать %s"
- 
--#: libgthumb/print-callbacks.c:928
-+#: libgthumb/print-callbacks.c:922
- msgid "Print Image"
- msgstr "Печать изображения"
- 
--#: libgthumb/thumb-cache.c:487
-+#: libgthumb/thumb-cache.c:409
- msgid "Deleting all thumbnails, wait please..."
- msgstr ""
- "Удаляются миниатюры, подождите "
- "пожалуйста..."
- 
--#: libgthumb/thumb-cache.c:489
-+#: libgthumb/thumb-cache.c:411
- msgid "Deleting old thumbnails, wait please..."
- msgstr ""
- "Удаляются старые миниатюры, подождите "
-@@ -494,157 +385,157 @@
- msgid "Creating image: %s.%s"
- msgstr "Создаётся изображение: %s.%s"
- 
--#: src/catalog-web-exporter.c:1615
-+#: src/catalog-web-exporter.c:1444
- msgid "Saving thumbnails"
- msgstr "Сохранение миниатюр"
- 
--#: src/catalog-web-exporter.c:1681
-+#: src/catalog-web-exporter.c:1512
- msgid "Saving HTML pages: Images"
- msgstr "Сохранение HTML страниц: Изображения"
- 
--#: src/catalog-web-exporter.c:1756
-+#: src/catalog-web-exporter.c:1589
- msgid "Saving HTML pages: Indexes"
- msgstr "Сохранение HTML страниц: Индексы"
- 
--#: src/catalog-web-exporter.c:1899 src/catalog-web-exporter.c:2034
-+#: src/catalog-web-exporter.c:1673
- msgid "Saving images"
- msgstr "Сохранение изображений"
- 
--#: src/catalog-web-exporter.c:2243
-+#: src/catalog-web-exporter.c:1987
- msgid "Could not create a temporary folder"
- msgstr "Невозможно создать временный каталог"
- 
- #. Load thumbnails.
--#: src/catalog-web-exporter.c:2280
-+#: src/catalog-web-exporter.c:2026
- msgid "Loading images"
- msgstr "Загрузка изображений"
- 
--#: src/commands-impl.c:275 src/commands-impl.c:1011 src/commands-impl.c:1579
-+#: src/commands-impl.c:274 src/commands-impl.c:1010 src/commands-impl.c:1572
- msgid "Enter the new name: "
- msgstr "Введите новое имя: "
- 
--#: src/commands-impl.c:279 src/commands-impl.c:1015 src/commands-impl.c:1583
-+#: src/commands-impl.c:278 src/commands-impl.c:1014 src/commands-impl.c:1576
- #: src/gthumb-ui.xml.h:237 src/gthumb_tools.glade.h:45
- msgid "_Rename"
- msgstr "Пере_именовать"
- 
--#: src/commands-impl.c:293 src/commands-impl.c:917 src/commands-impl.c:1029
--#: src/commands-impl.c:1599 src/commands-impl.c:1694
-+#: src/commands-impl.c:292 src/commands-impl.c:916 src/commands-impl.c:1028
-+#: src/commands-impl.c:1592 src/commands-impl.c:1687
- #, c-format
- msgid ""
- "The name \"%s\" is not valid because it contains the character \"/\". Please "
- "use a different name."
- msgstr ""
- "Имя файла \"%s\" недопустимо, поскольку "
--"содержит символ \"/\". Введите, пожалуйста, "
--"другое имя."
-+"содержит символ \"/\". Введите, "
-+"пожалуйста, другое имя."
- 
--#: src/commands-impl.c:320 src/dlg-convert.c:314
-+#: src/commands-impl.c:319 src/dlg-convert.c:313
- msgid "_Overwrite"
- msgstr "_Перезаписать"
- 
--#: src/commands-impl.c:340 src/commands-impl.c:355
-+#: src/commands-impl.c:339 src/commands-impl.c:354
- #, c-format
- msgid "Could not rename the image \"%s\": %s"
- msgstr ""
- "Невозможно переименовать изображение "
- "\"%s\" : %s"
- 
--#: src/commands-impl.c:342 src/commands-impl.c:1051 src/commands-impl.c:1357
-+#: src/commands-impl.c:341 src/commands-impl.c:1050 src/commands-impl.c:1350
- msgid "source and destination are the same"
- msgstr ""
- "Адреса источника и назначения совпадают"
- 
--#: src/commands-impl.c:446
-+#: src/commands-impl.c:445
- #, c-format
- msgid "Could not duplicate the image \"%s\": %s"
- msgstr ""
- "Невозможно сделать копию изображения \"%s\" "
- ": %s"
- 
--#: src/commands-impl.c:454
-+#: src/commands-impl.c:453
- msgid "Stop"
- msgstr "Остановить"
- 
--#: src/commands-impl.c:455
-+#: src/commands-impl.c:454
- msgid "Continue"
- msgstr "Продолжить"
- 
--#: src/commands-impl.c:531
-+#: src/commands-impl.c:530
- msgid "The selected images will be moved to the Trash, are you sure?"
- msgstr ""
- "Выбранные изображения будут отправлены в "
- "корзину. Продолжить?"
- 
--#: src/commands-impl.c:551
-+#: src/commands-impl.c:550
- msgid "The image will be moved to the Trash, are you sure?"
- msgstr ""
- "Изображение будет отправлено в корзину. "
- "Продолжить?"
- 
--#: src/commands-impl.c:786
-+#: src/commands-impl.c:785
- msgid "The image will be removed from the catalog, are you sure?"
- msgstr ""
- "Изображение будет удалено из альбома. "
- "Продолжить?"
- 
--#: src/commands-impl.c:828
-+#: src/commands-impl.c:827
- msgid "The selected images will be removed from the catalog, are you sure?"
- msgstr ""
- "Выбранные изображения будут удалены из "
- "альбома. Продолжить?"
- 
--#: src/commands-impl.c:904 src/dlg-catalog.c:83 src/dlg-catalog.c:124
--#: src/dlg-categories.c:200 src/dlg-file-utils.c:89
-+#: src/commands-impl.c:903 src/dlg-catalog.c:83 src/dlg-catalog.c:124
-+#: src/dlg-categories.c:190 src/dlg-file-utils.c:89
- msgid "C_reate"
- msgstr "_Создать"
- 
--#: src/commands-impl.c:933 src/commands-impl.c:1059 src/commands-impl.c:1621
--#: src/commands-impl.c:1713
-+#: src/commands-impl.c:932 src/commands-impl.c:1058 src/commands-impl.c:1614
-+#: src/commands-impl.c:1706
- #, c-format
- msgid "The name \"%s\" is already used. Please use a different name."
- msgstr ""
- "Имя \"%s\" уже используется в данном "
- "каталоге. Введите, пожалуйста, другое имя."
- 
--#: src/commands-impl.c:961
-+#: src/commands-impl.c:960
- msgid "New Folder"
- msgstr "Новый каталог"
- 
--#: src/commands-impl.c:962
-+#: src/commands-impl.c:961
- msgid "Enter the folder name: "
- msgstr "Введите имя каталога: "
- 
--#: src/commands-impl.c:963
-+#: src/commands-impl.c:962
- #, c-format
- msgid "Could not create the folder \"%s\": %s"
- msgstr "Невозможно создать каталог \"%s\" : %s"
- 
--#: src/commands-impl.c:974
-+#: src/commands-impl.c:973
- msgid "New Library"
- msgstr "Новая коллекция"
- 
--#: src/commands-impl.c:975 src/dlg-catalog.c:120
-+#: src/commands-impl.c:974 src/dlg-catalog.c:120
- msgid "Enter the library name: "
- msgstr "Введите имя коллекции: "
- 
--#: src/commands-impl.c:976
-+#: src/commands-impl.c:975
- #, c-format
- msgid "Could not create the library \"%s\": %s"
- msgstr "Невозможно создать коллекцию \"%s\" : %s"
- 
--#: src/commands-impl.c:1049 src/commands-impl.c:1086
-+#: src/commands-impl.c:1048 src/commands-impl.c:1085
- #, c-format
- msgid "Could not rename the folder \"%s\": %s"
- msgstr ""
- "Невозможно переименовать каталог \"%s\" : %s"
- 
--#: src/commands-impl.c:1152
-+#: src/commands-impl.c:1151
- #, c-format
- msgid "Could not delete the folder \"%s\": %s"
- msgstr "Невозможно удалить каталог \"%s\" : %s"
- 
--#: src/commands-impl.c:1183
-+#: src/commands-impl.c:1180
- #, c-format
- msgid ""
- "\"%s\" cannot be moved to the Trash. Do you want to delete it permanently?"
-@@ -652,85 +543,81 @@
- "Невозможно переместить \"%s\" в корзину. "
- "Удалить совсем?"
- 
--#: src/commands-impl.c:1191 src/dlg-file-utils.c:226
--msgid "_Do not display this message again"
--msgstr ""
--
--#: src/commands-impl.c:1224
-+#: src/commands-impl.c:1217
- msgid "The selected folder will be moved to the Trash, are you sure?"
- msgstr ""
- "Выбранный каталог будет перемещён в "
- "мусорную корзину. Продолжить?"
- 
--#: src/commands-impl.c:1226 src/dlg-file-utils.c:280
-+#: src/commands-impl.c:1219 src/dlg-file-utils.c:274
- msgid "_Move"
- msgstr "_Переместить"
- 
--#: src/commands-impl.c:1292 src/commands-impl.c:1347
-+#: src/commands-impl.c:1285 src/commands-impl.c:1340
- #, c-format
- msgid "Could not copy the folder \"%s\": %s"
- msgstr "Невозможно скопировать каталог \"%s\" : %s"
- 
--#: src/commands-impl.c:1347 src/dlg-file-utils.c:2425
--#: src/dlg-file-utils.c:2427
-+#: src/commands-impl.c:1340 src/dlg-file-utils.c:2297
-+#: src/dlg-file-utils.c:2299
- #, c-format
- msgid "Could not move the folder \"%s\": %s"
- msgstr "Невозможно переместить каталог \"%s\" : %s"
- 
--#: src/commands-impl.c:1368
-+#: src/commands-impl.c:1361
- msgid "source contains destination"
- msgstr ""
- "адрес источника содержит адрес "
- "назначения"
- 
--#: src/commands-impl.c:1379
-+#: src/commands-impl.c:1372
- msgid "a folder with that name is already present."
- msgstr "каталог с таким именем уже существует."
- 
--#: src/commands-impl.c:1460 src/dlg-file-utils.c:366 src/dlg-file-utils.c:455
-+#: src/commands-impl.c:1453 src/dlg-file-utils.c:360 src/dlg-file-utils.c:449
- msgid "Choose the destination folder"
- msgstr "Выберите каталог назначения"
- 
--#: src/commands-impl.c:1632
-+#: src/commands-impl.c:1625
- #, c-format
- msgid "Could not rename the library \"%s\": %s"
- msgstr ""
- "Невозможно переименовать коллекцию \"%s\" : "
- "%s"
- 
--#: src/commands-impl.c:1632
-+#: src/commands-impl.c:1625
- #, c-format
- msgid "Could not rename the catalog \"%s\": %s"
- msgstr ""
- "Невозможно переименовать альбом \"%s\" : %s"
- 
--#: src/commands-impl.c:1678 src/dlg-catalog.c:79
-+#: src/commands-impl.c:1671 src/dlg-catalog.c:79
- msgid "Enter the catalog name: "
- msgstr "Введите имя альбома:"
- 
--#: src/commands-impl.c:1679
-+#: src/commands-impl.c:1672
- msgid "New Catalog"
- msgstr "Новый альбом"
- 
--#: src/commands-impl.c:1724
-+#: src/commands-impl.c:1717
- #, c-format
- msgid "Could not create the catalog \"%s\": %s"
- msgstr "Невозможно создать альбом \"%s\" : %s"
- 
--#: src/commands-impl.c:1788
-+#: src/commands-impl.c:1781
- msgid "The selected library will be removed, are you sure?"
- msgstr ""
- "Выбранная коллекция будет удалена. "
- "Продолжить?"
- 
--#: src/commands-impl.c:1790
-+#: src/commands-impl.c:1783
- msgid "The selected catalog will be removed, are you sure?"
- msgstr ""
- "Выбранный альбом будет удалён. "
- "Продолжить?"
- 
--#: src/commands-impl.c:2759 src/dlg-categories.c:337 src/dlg-comment.c:327
--#: src/dlg-jpegtran.c:631 src/dlg-maintenance.c:273 src/dlg-preferences.c:175
-+#: src/commands-impl.c:2752 src/dlg-categories.c:321 src/dlg-comment.c:327
-+#: src/dlg-jpegtran.c:631 src/dlg-maintenance.c:273 src/dlg-preferences.c:174
- #: src/dlg-search.c:450
- #, c-format
- msgid "Could not display help: %s"
-@@ -738,18 +625,19 @@
- "Невозможно показать руководство "
- "пользователя: %s"
- 
--#: src/commands-impl.c:2810
-+#: src/commands-impl.c:2803
- msgid "translator_credits"
- msgstr ""
- "Диконов Вячеслав <slava@altlinux.ru>\n"
- "Сергей Воложанин <svo@asplinux.ru>"
- 
--#: src/commands-impl.c:2819 src/gthumb-window.c:816 src/gthumb-window.c:4896
--#: src/main.c:124
-+#: src/commands-impl.c:2812 src/gthumb-window.c:812 src/gthumb-window.c:4859
-+#: src/gthumb_png_exporter.glade.h:75 src/gthumb_web_exporter.glade.h:49
-+#: src/main.c:122
- msgid "gThumb"
- msgstr "gThumb"
- 
--#: src/commands-impl.c:2822
-+#: src/commands-impl.c:2815
- msgid "An image viewer and browser for GNOME."
- msgstr ""
- "Просмотрщик изображений и фотоальбом для "
-@@ -759,33 +647,23 @@
- msgid "Move Catalog to..."
- msgstr "Переместить альбом"
- 
--#: src/dlg-categories.c:196
-+#: src/dlg-categories.c:186
- msgid "Enter the new category name"
- msgstr "Введите имя новой категории:"
- 
--#: src/dlg-categories.c:207
--#, fuzzy, c-format
--msgid ""
--"The name \"%s\" is not valid because it contains the character \",\". Please "
--"use a different name."
--msgstr ""
--"Имя файла \"%s\" недопустимо, поскольку "
--"содержит символ \"/\". Введите, пожалуйста, "
--"другое имя."
--
--#: src/dlg-categories.c:212
-+#: src/dlg-categories.c:197
- #, c-format
- msgid "The category \"%s\" is already present. Please use a different name."
- msgstr ""
- "Категория \"%s\" уже существует. Введите, "
- "пожалуйста, другое имя."
- 
--#: src/dlg-convert.c:159
-+#: src/dlg-convert.c:158
- #, c-format
- msgid "Converting image: %s"
- msgstr "Преобразование изображения: %s"
- 
--#: src/dlg-convert.c:182
-+#: src/dlg-convert.c:181
- #, c-format
- msgid ""
- "An image named \"%s\" is already present. Please specify a different name."
-@@ -793,10 +671,14 @@
- "Имя \"%s\" уже используется в данном "
- "каталоге. Введите, пожалуйста, другое имя."
- 
--#: src/dlg-convert.c:313 src/gthumb_convert.glade.h:17
-+#: src/dlg-convert.c:312 src/gthumb_convert.glade.h:17
- msgid "Skip"
- msgstr "пропускать"
- 
-+#: src/dlg-duplicates.c:265
-+msgid "Image"
-+msgstr "Изображение"
-+
- #: src/dlg-duplicates.c:279 src/dlg-duplicates.c:650
- msgid "Duplicates"
- msgstr "Число копий"
-@@ -843,7 +725,7 @@
- msgid "Could not delete the images:"
- msgstr "Невозможно удалить файлы:"
- 
--#: src/dlg-file-utils.c:223
-+#: src/dlg-file-utils.c:220
- msgid ""
- "The images cannot be moved to the Trash. Do you want to delete them "
- "permanently?"
-@@ -851,11 +733,11 @@
- "Невозможно переместить удаляемые файлы в "
- "корзину. Удалить их совсем?"
- 
--#: src/dlg-file-utils.c:757 src/dlg-file-utils.c:858
-+#: src/dlg-file-utils.c:751 src/dlg-file-utils.c:852
- msgid "You didn't enter the new name"
- msgstr "Новое имя не задано"
- 
--#: src/dlg-file-utils.c:769 src/dlg-file-utils.c:870
-+#: src/dlg-file-utils.c:763 src/dlg-file-utils.c:864
- #, c-format
- msgid ""
- "The name \"%s\" is already used in this folder. Please use a different name."
-@@ -863,57 +745,57 @@
- "Имя \"%s\" уже используется в данном "
- "каталоге. Введите, пожалуйста, другое имя."
- 
--#: src/dlg-file-utils.c:1009
-+#: src/dlg-file-utils.c:1003
- msgid "Could not rename the image:"
- msgstr "Невозможно переименовать файл: "
- 
--#: src/dlg-file-utils.c:1011
-+#: src/dlg-file-utils.c:1005
- msgid "Could not rename the following images:"
- msgstr ""
- "Невозможно переименовать следующие "
- "файлы: "
- 
--#: src/dlg-file-utils.c:1145
-+#: src/dlg-file-utils.c:1138
- msgid "Could not move the image:"
- msgstr "Невозможно переместить файл: "
- 
--#: src/dlg-file-utils.c:1147
-+#: src/dlg-file-utils.c:1140
- msgid "Could not copy the image:"
- msgstr "Невозможно скопировать файл:"
- 
--#: src/dlg-file-utils.c:1171 src/dlg-file-utils.c:2448
-+#: src/dlg-file-utils.c:1164 src/dlg-file-utils.c:2320
- msgid "_Abort"
- msgstr "Пре_рвать"
- 
--#: src/dlg-file-utils.c:1172 src/dlg-file-utils.c:2449
-+#: src/dlg-file-utils.c:1165 src/dlg-file-utils.c:2321
- msgid "_Continue"
- msgstr "Про_должить"
- 
--#: src/dlg-file-utils.c:1345
-+#: src/dlg-file-utils.c:1337
- #, c-format
- msgid "Copying file %d of %d"
- msgstr "Копируется файл %d из %d."
- 
--#: src/dlg-file-utils.c:1770 src/dlg-file-utils.c:1997
-+#: src/dlg-file-utils.c:1720 src/dlg-file-utils.c:1906
- msgid "Collecting images info"
- msgstr "Сбор данных об изображениях"
- 
--#: src/dlg-file-utils.c:1773 src/dlg-file-utils.c:2010
-+#: src/dlg-file-utils.c:1723 src/dlg-file-utils.c:1919
- #, c-format
- msgid "Deleting file %ld of %ld"
- msgstr "Удаляется файл %ld из %ld"
- 
--#: src/dlg-file-utils.c:2000
-+#: src/dlg-file-utils.c:1909
- #, c-format
- msgid "Copying file %ld of %ld"
- msgstr "Копируется файл %ld из %ld"
- 
--#: src/dlg-file-utils.c:2005
-+#: src/dlg-file-utils.c:1914
- #, c-format
- msgid "Moving file %ld of %ld"
- msgstr "Перемещается файл %ld из %ld"
- 
--#: src/dlg-image-prop.c:841 src/gthumb-window.c:439
-+#: src/dlg-image-prop.c:841 src/gthumb-window.c:436
- msgid "Size"
- msgstr "Размер"
- 
-@@ -921,7 +803,11 @@
- msgid "Type"
- msgstr "Тип"
- 
--#: src/dlg-image-prop.c:861 src/gthumb-window.c:453
-+#: src/dlg-image-prop.c:851 src/gthumb-window.c:443
-+msgid "Bytes"
-+msgstr "Байт"
-+
-+#: src/dlg-image-prop.c:861 src/gthumb-window.c:450
- msgid "Modified"
- msgstr "Дата изменения"
- 
-@@ -929,13 +815,12 @@
- msgid "Information on Channel"
- msgstr "Канал"
- 
--#: src/dlg-image-prop.c:900 src/gthumb-window.c:5345
-+#: src/dlg-image-prop.c:900 src/gthumb-window.c:5308
- msgid "Field"
- msgstr "Поле"
- 
--#: src/dlg-image-prop.c:910 src/gthumb-window.c:5355
--#, fuzzy
--msgid "Value "
-+#: src/dlg-image-prop.c:910 src/gthumb-window.c:5318 src/gthumb.glade.h:25
-+msgid "Value"
- msgstr "Значение"
- 
- #: src/dlg-image-prop.c:991
-@@ -958,15 +843,15 @@
- msgid "Specify the backup file"
- msgstr "Укажите файл страховочной копии"
- 
--#: src/dlg-png-exporter.c:1004
-+#: src/dlg-png-exporter.c:997
- msgid "Image Caption"
- msgstr "Подпись"
- 
--#: src/dlg-png-exporter.c:1057
-+#: src/dlg-png-exporter.c:1050
- msgid "Header"
- msgstr "Верхний колонтитул"
- 
--#: src/dlg-png-exporter.c:1070 src/dlg-png-exporter.c:1076
-+#: src/dlg-png-exporter.c:1063 src/dlg-png-exporter.c:1069
- msgid "Footer"
- msgstr "Нижний колонтитул"
- 
-@@ -990,7 +875,7 @@
- msgid "Folder"
- msgstr "Каталог"
- 
--#: src/dlg-web-exporter.c:658
-+#: src/dlg-web-exporter.c:649
- msgid "Select Album Theme"
- msgstr "Выбрать стиль оформления альбома"
- 
-@@ -1002,7 +887,7 @@
- msgid "Image Info"
- msgstr "Информация об изображении"
- 
--#: src/fullscreen.c:818 src/gthumb-window.c:4303
-+#: src/fullscreen.c:818 src/gthumb-window.c:4252
- msgid "Back"
- msgstr "Назад"
- 
-@@ -1931,8 +1816,7 @@
- 
- #: src/gthumb-ui.xml.h:219
- msgid "_Image Preview"
--msgstr ""
--"Предварительный _просмотр изображения"
-+msgstr "Предварительный _просмотр изображения"
- 
- #: src/gthumb-ui.xml.h:220
- msgid "_Keyboard Shortcuts"
-@@ -2098,69 +1982,69 @@
- msgid "by _Time"
- msgstr "по _времени "
- 
--#: src/gthumb-window.c:696
-+#: src/gthumb-window.c:692
- msgid "[Press 'c' to add a comment]"
- msgstr ""
- "[Нажмите \"c\", чтобы добавить комментарий]"
- 
--#: src/gthumb-window.c:770 src/gthumb-window.c:793
-+#: src/gthumb-window.c:766 src/gthumb-window.c:789
- msgid "[modified]"
- msgstr "[изменён]"
- 
--#: src/gthumb-window.c:877
-+#: src/gthumb-window.c:873
- msgid "No image"
- msgstr "Изображений нет"
- 
--#: src/gthumb-window.c:879
-+#: src/gthumb-window.c:875
- #, c-format
- msgid "1 image (%s)"
- msgstr "1 изображение (%s)"
- 
--#: src/gthumb-window.c:882
-+#: src/gthumb-window.c:878
- #, c-format
- msgid "%d images (%s)"
- msgstr "%d изображений (%s)"
- 
--#: src/gthumb-window.c:889
-+#: src/gthumb-window.c:885
- #, c-format
- msgid "1 selected (%s)"
- msgstr "1 выбрано (%s)"
- 
--#: src/gthumb-window.c:892
-+#: src/gthumb-window.c:888
- #, c-format
- msgid "%d selected (%s)"
- msgstr "%d выбрано (%s)"
- 
--#: src/gthumb-window.c:3383
-+#: src/gthumb-window.c:3360
- msgid "Dragged Images"
- msgstr "Перетаскиваемые изображения"
- 
--#: src/gthumb-window.c:3582
-+#: src/gthumb-window.c:3556
- msgid "Could not move the items:"
- msgstr "Невозможно переместить:"
- 
--#: src/gthumb-window.c:5226
-+#: src/gthumb-window.c:5189
- msgid "Image comment"
- msgstr "Комментарий к изображению"
- 
--#: src/gthumb-window.c:5240
-+#: src/gthumb-window.c:5203
- msgid "Image data"
- msgstr "Данные изображения"
- 
--#: src/gthumb-window.c:5254
-+#: src/gthumb-window.c:5217
- msgid "Image preview"
- msgstr "Предварительный _показ изображеия"
- 
--#: src/gthumb-window.c:6500
-+#: src/gthumb-window.c:6449
- #, c-format
- msgid "Cannot load folder \"%s\": %s\n"
- msgstr "Невозможно прочитать каталог \"%s\" : %s\n"
- 
--#: src/gthumb-window.c:6769
-+#: src/gthumb-window.c:6718
- msgid "The specified catalog does not exist."
- msgstr "Указанный альбом не существует."
- 
--#: src/gthumb-window.c:8139
-+#: src/gthumb-window.c:8064
- msgid "Wait please..."
- msgstr "Пожалуйста, подождите..."
- 
-@@ -2264,10 +2148,6 @@
- msgid "Red"
- msgstr "красный"
- 
--#: src/gthumb.glade.h:25
--msgid "Value"
--msgstr "Значение"
--
- #: src/gthumb.glade.h:26
- msgid "_Application:"
- msgstr "_Приложение:"
-@@ -2304,107 +2184,6 @@
- msgid "_Save the new image as:"
- msgstr "_Сохранить новое изображение как:"
- 
--#: src/gthumb.schemas.in.h:1
--msgid ""
--"Images over this size (in bytes) will not be thumbnailed. Use 0 if you want "
--"to generate thumbnails for all images."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:2
--msgid "Possible values are: 1, 2, 3, 4."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:3
--msgid "Possible values are: actual_size, fit, keep_prev, fit_if_larger."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:4
--msgid "Possible values are: ascending, descending."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:5
--msgid "Possible values are: forward, backward."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:6
--msgid "Possible values are: high, low."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:7
--msgid "Possible values are: image, data, comment."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:8
--msgid "Possible values are: jpeg, png, tga, tiff."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:9
--msgid "Possible values are: light, midtone, dark."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:10
--msgid "Possible values are: list, thumbnails."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:11
--msgid "Possible values are: mm, in."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:12
--msgid "Possible values are: name, path, size, time."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:13
--msgid "Possible values are: name, size, time."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:14
--msgid "Possible values are: nautilus, single, double."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:15
--msgid "Possible values are: none, deflate, jpeg."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:16
--msgid "Possible values are: none, name, path, size, time."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:17
--msgid ""
--"Possible values are: none, simple, simple_with_shadow, shadow, slide, "
--"shadow_in, shadow_out."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:18
--msgid "Possible values are: pixels, percentage."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:19
--msgid "Possible values are: png, jpeg."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:20
--msgid "Possible values are: skip, rename, ask, overwrite."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:21
--msgid "Possible values are: small, medium, large."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:22
--msgid ""
--"Possible values are: system, text_below, text_beside, text_only, icons_only."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:23
--msgid "Possible values are: white, black, checked, none."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:24
--msgid "Whether to always use a black background."
--msgstr ""
--
- #: src/gthumb_comments.glade.h:3 src/gthumb_search.glade.h:5
- msgid "A_vailable categories:"
- msgstr "_Доступные категории"
-@@ -2731,6 +2510,10 @@
- msgid "_Yellow-Blue:"
- msgstr "Жёлтый - Синий:"
- 
-+#: src/gthumb_edit.glade.h:33 src/gthumb_web_exporter.glade.h:51
-+msgid "pixels"
-+msgstr "в пикселях"
-+
- #: src/gthumb_png_exporter.glade.h:4
- msgid "112"
- msgstr "112"
-@@ -2831,11 +2614,11 @@
- msgid "Create _HTML image map"
- msgstr "Создать _HTML карту изображения"
- 
--#: src/gthumb_png_exporter.glade.h:29 src/gthumb_web_exporter.glade.h:22
-+#: src/gthumb_png_exporter.glade.h:29
- msgid "F_ooter:"
- msgstr "Ни_жний колонтитул:"
- 
--#: src/gthumb_png_exporter.glade.h:30 src/gthumb_web_exporter.glade.h:23
-+#: src/gthumb_png_exporter.glade.h:30 src/gthumb_web_exporter.glade.h:22
- msgid "File _name"
- msgstr "_Имя файла"
- 
-@@ -2843,7 +2626,7 @@
- msgid "File pa_th"
- msgstr "_Каталог"
- 
--#: src/gthumb_png_exporter.glade.h:32 src/gthumb_web_exporter.glade.h:24
-+#: src/gthumb_png_exporter.glade.h:32 src/gthumb_web_exporter.glade.h:23
- msgid "File si_ze"
- msgstr "Размер _файла"
- 
-@@ -2855,7 +2638,7 @@
- msgid "Frame co_lor:"
- msgstr "_Цвет обрамления:"
- 
--#: src/gthumb_png_exporter.glade.h:35 src/gthumb_web_exporter.glade.h:26
-+#: src/gthumb_png_exporter.glade.h:35
- msgid "H_eader:"
- msgstr "_Верхний колонтитул:"
- 
-@@ -2867,7 +2650,7 @@
- msgid "Hei_ght:"
- msgstr "_Высота:"
- 
--#: src/gthumb_png_exporter.glade.h:38 src/gthumb_web_exporter.glade.h:28
-+#: src/gthumb_png_exporter.glade.h:38 src/gthumb_web_exporter.glade.h:26
- msgid "Image dim_ensions"
- msgstr "Размеры изобра_жения"
- 
-@@ -2887,7 +2670,7 @@
- msgid "Pi_xels"
- msgstr "в _пикселях"
- 
--#: src/gthumb_png_exporter.glade.h:43 src/gthumb_web_exporter.glade.h:30
-+#: src/gthumb_png_exporter.glade.h:43 src/gthumb_web_exporter.glade.h:28
- msgid "Re_verse order"
- msgstr "В _обратном порядке"
- 
-@@ -2979,7 +2762,7 @@
- msgid "_Image size:"
- msgstr "Размер ми_ниатюр:"
- 
--#: src/gthumb_png_exporter.glade.h:67 src/gthumb_web_exporter.glade.h:45
-+#: src/gthumb_png_exporter.glade.h:67 src/gthumb_web_exporter.glade.h:41
- msgid "_Rows:"
- msgstr "_Рядов:"
- 
-@@ -2991,15 +2774,15 @@
- msgid "_Template:"
- msgstr "_Шаблон:"
- 
--#: src/gthumb_png_exporter.glade.h:71 src/gthumb_web_exporter.glade.h:49
-+#: src/gthumb_png_exporter.glade.h:71 src/gthumb_web_exporter.glade.h:46
- msgid "by name"
- msgstr "по имени"
- 
--#: src/gthumb_png_exporter.glade.h:72 src/gthumb_web_exporter.glade.h:50
-+#: src/gthumb_png_exporter.glade.h:72 src/gthumb_web_exporter.glade.h:47
- msgid "by path"
- msgstr "по каталогу"
- 
--#: src/gthumb_png_exporter.glade.h:73 src/gthumb_web_exporter.glade.h:51
-+#: src/gthumb_png_exporter.glade.h:73 src/gthumb_web_exporter.glade.h:48
- msgid "by size"
- msgstr "по размеру"
- 
-@@ -3007,11 +2790,11 @@
- msgid "by time"
- msgstr "по времени"
- 
--#: src/gthumb_png_exporter.glade.h:75
-+#: src/gthumb_png_exporter.glade.h:76
- msgid "jpeg"
- msgstr "jpeg"
- 
--#: src/gthumb_png_exporter.glade.h:76
-+#: src/gthumb_png_exporter.glade.h:77
- msgid "png"
- msgstr "png"
- 
-@@ -3588,10 +3371,10 @@
- "original filename. Use ? to insert the image date. Use ! to insert the image "
- "size"
- msgstr ""
--"Символами # обозначается место для "
--"порядкового номера. Символ * заменяется "
--"на исходное имя файла. Символ ? обозначает "
--"место для вставки даты, а символ ! размера."
-+"Символами # обозначается место для порядкового номера. Символ * заменяется "
-+"на исходное имя файла. Символ ? обозначает место для вставки даты, а символ "
-+"! размера."
-+
- 
- #: src/gthumb_tools.glade.h:46
- msgid "_Sort original list:"
-@@ -3643,8 +3426,7 @@
- 
- #: src/gthumb_web_exporter.glade.h:13
- msgid "<b>Photo data</b>"
--msgstr ""
--"<b>Технические сведения о фотоснимках</b>"
-+msgstr "<b>Технические сведения о фотоснимках</b>"
- 
- #: src/gthumb_web_exporter.glade.h:14
- msgid "<b>Saving</b>"
-@@ -3670,161 +3452,145 @@
- msgid "Exposure _time"
- msgstr "_Экспозиция"
- 
--#: src/gthumb_web_exporter.glade.h:25
-+#: src/gthumb_web_exporter.glade.h:24
- msgid "Focal _length"
- msgstr "Ф_окусное расстояние"
- 
--#: src/gthumb_web_exporter.glade.h:27
-+#: src/gthumb_web_exporter.glade.h:25
- msgid "I_mage Caption..."
- msgstr "Подпись к изобра_жению"
- 
--#: src/gthumb_web_exporter.glade.h:29
-+#: src/gthumb_web_exporter.glade.h:27
- msgid "Inde_x file:"
- msgstr "Файл _индекса:"
- 
--#: src/gthumb_web_exporter.glade.h:31
-+#: src/gthumb_web_exporter.glade.h:29
- msgid "Resi_ze images if larger than:"
--msgstr ""
--"Мас_штабировать если размер превышает:"
-+msgstr "Мас_штабировать если размер превышает:"
- 
--#: src/gthumb_web_exporter.glade.h:32
-+#: src/gthumb_web_exporter.glade.h:30
- msgid "Sor_t:"
- msgstr "_Сортировать:"
- 
--#: src/gthumb_web_exporter.glade.h:33
-+#: src/gthumb_web_exporter.glade.h:31
- msgid "Th_eme:"
- msgstr "С_тиль:"
- 
--#: src/gthumb_web_exporter.glade.h:35
--#, no-c-format
--msgid "Use %d  to insert current date"
--msgstr ""
--
--#: src/gthumb_web_exporter.glade.h:36
-+#: src/gthumb_web_exporter.glade.h:32
- msgid "Web Album"
- msgstr "Интернет-альбом"
- 
--#: src/gthumb_web_exporter.glade.h:37
-+#: src/gthumb_web_exporter.glade.h:33
- msgid "Web Album Theme"
- msgstr "Стиль оформления интернет-альбома"
- 
--#: src/gthumb_web_exporter.glade.h:38
-+#: src/gthumb_web_exporter.glade.h:34
- msgid "_Aperture value"
- msgstr "_Просвет диафрагмы"
- 
--#: src/gthumb_web_exporter.glade.h:39
-+#: src/gthumb_web_exporter.glade.h:35
- msgid "_Copy images to destination"
--msgstr ""
--"_Копировать изображения в каталог "
--"назначения"
-+msgstr "_Копировать изображения в каталог назначения"
- 
--#: src/gthumb_web_exporter.glade.h:40
-+#: src/gthumb_web_exporter.glade.h:36
- msgid "_Date and Time"
- msgstr "_Дата и время"
- 
--#: src/gthumb_web_exporter.glade.h:41
-+#: src/gthumb_web_exporter.glade.h:37
- msgid "_Destination:"
- msgstr "_Каталог:"
- 
--#: src/gthumb_web_exporter.glade.h:42
-+#: src/gthumb_web_exporter.glade.h:38
- msgid "_Flash"
- msgstr "_Вспышка"
- 
--#: src/gthumb_web_exporter.glade.h:43
-+#: src/gthumb_web_exporter.glade.h:39
- msgid "_Go to Theme Folder"
- msgstr "_Каталог стилей"
- 
--#: src/gthumb_web_exporter.glade.h:44
-+#: src/gthumb_web_exporter.glade.h:40
- msgid "_Install Theme..."
- msgstr "_Добавить стиль"
- 
--#: src/gthumb_web_exporter.glade.h:46
-+#: src/gthumb_web_exporter.glade.h:42
- msgid "_Shutter speed"
- msgstr "_Скорость затвора"
- 
--#: src/gthumb_web_exporter.glade.h:47
-+#: src/gthumb_web_exporter.glade.h:43
- msgid "_Thumbnail Caption..."
- msgstr "Подпись миниат_юры"
- 
--#: src/gthumb_web_exporter.glade.h:48
-+#: src/gthumb_web_exporter.glade.h:44
-+msgid "_Title:"
-+msgstr "_Заголовок:"
-+
-+#: src/gthumb_web_exporter.glade.h:45
- msgid "by modified time"
- msgstr "по времени"
- 
--#: src/gthumb_web_exporter.glade.h:52
-+#: src/gthumb_web_exporter.glade.h:50
- msgid "index.html"
- msgstr "index.html"
- 
--#: src/main.c:80
-+#: src/main.c:78
- msgid "Start in fullscreen mode"
- msgstr "Начинать в полноэкранном режиме"
- 
--#: src/main.c:84
-+#: src/main.c:82
- msgid "Automatically start a slideshow"
- msgstr "Автоматически начинать показ слайдов"
- 
--#: src/main.c:163
-+#: src/main.c:161
- msgid "Holidays"
- msgstr "Праздники"
- 
--#: src/main.c:164
-+#: src/main.c:162
- msgid "Temporary"
- msgstr "Временное"
- 
--#: src/main.c:165
-+#: src/main.c:163
- msgid "Screenshots"
- msgstr "Снимки экрана"
- 
--#: src/main.c:166
-+#: src/main.c:164
- msgid "Science"
- msgstr "Наука"
- 
--#: src/main.c:167
-+#: src/main.c:165
- msgid "Favourite"
- msgstr "Любимое"
- 
--#: src/main.c:168
-+#: src/main.c:166
- msgid "Important"
- msgstr "Важное"
- 
--#: src/main.c:169
-+#: src/main.c:167
- msgid "GNOME"
- msgstr "Рабочая среда GNOME"
- 
--#: src/main.c:170
-+#: src/main.c:168
- msgid "Games"
- msgstr "Игры"
- 
--#: src/main.c:171
-+#: src/main.c:169
- msgid "Party"
- msgstr "Вечеринка"
- 
--#: src/main.c:172
-+#: src/main.c:170
- msgid "Birthday"
- msgstr "День рождения"
- 
--#: src/main.c:173
-+#: src/main.c:171
- msgid "Astronomy"
- msgstr "Астрономия"
- 
--#: src/main.c:174
-+#: src/main.c:172
- msgid "Family"
- msgstr "Семья"
- 
--#: src/main.c:311 src/main.c:393
-+#: src/main.c:308 src/main.c:374
- msgid "Command Line"
- msgstr "Командная строка"
- 
--#~ msgid ""
--#~ "GConf error:\n"
--#~ "  %s"
--#~ msgstr ""
--#~ "Ошибка GConf:\n"
--#~ "  %s"
--
--#~ msgid "_Title:"
--#~ msgstr "_Заголовок:"
--
- #~ msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
--#~ msgstr ""
--#~ "АаБбВвГгДдЕеЁёЖжЗзИиЙйКкЛлМмНнОоПпРрСс�"
--#~ "�тУуФфХхЦцЧчШшЩщЪъЫыЬьЭэЮюЯя"
-+#~ msgstr "АаБбВвГгДдЕеЁёЖжЗзИиЙйКкЛлМмНнОоПпРрСсТтУуФфХхЦцЧчШшЩщЪъЫыЬьЭэЮюЯя"
-\ No newline at end of file
diff --git a/graphics/gthumb2/files/patch-po_zh_TW.po b/graphics/gthumb2/files/patch-po_zh_TW.po
deleted file mode 100644
index dcda196a0132..000000000000
--- a/graphics/gthumb2/files/patch-po_zh_TW.po
+++ /dev/null
@@ -1,1340 +0,0 @@
---- po/zh_TW.po	Sat Aug  9 18:36:18 2003
-+++ /home/pav/cvs/gnome/gthumb/po/zh_TW.po	Thu Jun 12 02:48:08 2003
-@@ -5,7 +5,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: gthumb 2.1.2\n"
--"POT-Creation-Date: 2003-08-09 18:35+0200\n"
-+"POT-Creation-Date: 2003-06-12 07:14+0800\n"
- "PO-Revision-Date: 2003-06-12 08:46+0800\n"
- "Last-Translator: Abel Cheung <maddog@linux.org.hk>\n"
- "Language-Team: Chinese (traditioanl) <zh-l10n@linux.org.tw>\n"
-@@ -170,119 +170,16 @@
- msgid "_Zoom Quality"
- msgstr "縮放品質(_Z)"
- 
--#: components/image-viewer/viewer-stream.c:90 src/dlg-file-utils.c:523
-+#: components/image-viewer/viewer-stream.c:90 src/dlg-file-utils.c:516
- msgid "%d %b %Y, %H:%M"
- msgstr "%x %H:%M"
- 
- #: components/image-viewer/viewer-stream.c:98 src/catalog-png-exporter.c:806
--#: src/dlg-image-prop.c:656 src/fullscreen.c:218 src/gthumb-window.c:417
-+#: src/dlg-image-prop.c:656 src/fullscreen.c:237 src/gthumb-window.c:409
- #, c-format
- msgid "%d x %d pixels"
- msgstr "%d×%d 像素"
- 
--#: data/albumthemes/Classic/image.xml.in.h:2
--#: data/albumthemes/ClassicClips/image.xml.in.h:2
--#: data/albumthemes/Clean/image.xml.in.h:1
--#: data/albumthemes/NeatRound/image.xml.in.h:2
--#: data/albumthemes/NeatSquare/image.xml.in.h:2
--msgid "Aperture value"
--msgstr ""
--
--#: data/albumthemes/Classic/image.xml.in.h:3
--#: data/albumthemes/ClassicClips/image.xml.in.h:3
--#: data/albumthemes/Clean/image.xml.in.h:2
--#: data/albumthemes/NeatRound/image.xml.in.h:3
--#: data/albumthemes/NeatSquare/image.xml.in.h:3 src/dlg-image-prop.c:851
--#: src/gthumb-window.c:446
--msgid "Bytes"
--msgstr "位元組"
--
--#: data/albumthemes/Classic/image.xml.in.h:4
--#: data/albumthemes/ClassicClips/image.xml.in.h:4
--#: data/albumthemes/Clean/image.xml.in.h:3
--#: data/albumthemes/NeatRound/image.xml.in.h:4
--#: data/albumthemes/NeatSquare/image.xml.in.h:4
--msgid "Camera model"
--msgstr ""
--
--#: data/albumthemes/Classic/image.xml.in.h:5
--#: data/albumthemes/ClassicClips/image.xml.in.h:5
--#: data/albumthemes/Clean/image.xml.in.h:4
--#: data/albumthemes/NeatRound/image.xml.in.h:5
--#: data/albumthemes/NeatSquare/image.xml.in.h:5
--#, fuzzy
--msgid "Date"
--msgstr "日期(_D)："
--
--#: data/albumthemes/Classic/image.xml.in.h:6
--#: data/albumthemes/ClassicClips/image.xml.in.h:6
--#: data/albumthemes/Clean/image.xml.in.h:5
--#: data/albumthemes/NeatRound/image.xml.in.h:6
--#: data/albumthemes/NeatSquare/image.xml.in.h:6
--#, fuzzy
--msgid "Dimensions"
--msgstr "圖像尺寸"
--
--#: data/albumthemes/Classic/image.xml.in.h:7
--#: data/albumthemes/ClassicClips/image.xml.in.h:7
--#: data/albumthemes/Clean/image.xml.in.h:6
--#: data/albumthemes/NeatRound/image.xml.in.h:7
--#: data/albumthemes/NeatSquare/image.xml.in.h:7
--msgid "Exposure mode"
--msgstr ""
--
--#: data/albumthemes/Classic/image.xml.in.h:8
--#: data/albumthemes/ClassicClips/image.xml.in.h:8
--#: data/albumthemes/Clean/image.xml.in.h:7
--#: data/albumthemes/NeatRound/image.xml.in.h:8
--#: data/albumthemes/NeatSquare/image.xml.in.h:8
--msgid "Exposure time"
--msgstr ""
--
--#: data/albumthemes/Classic/image.xml.in.h:9
--#: data/albumthemes/ClassicClips/image.xml.in.h:9
--#: data/albumthemes/Clean/image.xml.in.h:8
--#: data/albumthemes/NeatRound/image.xml.in.h:9
--#: data/albumthemes/NeatSquare/image.xml.in.h:9
--msgid "Flash"
--msgstr ""
--
--#: data/albumthemes/Classic/image.xml.in.h:10
--#: data/albumthemes/ClassicClips/image.xml.in.h:10
--#: data/albumthemes/Clean/image.xml.in.h:9
--#: data/albumthemes/NeatRound/image.xml.in.h:10
--#: data/albumthemes/NeatSquare/image.xml.in.h:10
--msgid "Focal length"
--msgstr ""
--
--#: data/albumthemes/Classic/image.xml.in.h:11
--#: data/albumthemes/ClassicClips/image.xml.in.h:11
--#: data/albumthemes/Clean/image.xml.in.h:10
--#: data/albumthemes/NeatRound/image.xml.in.h:11
--#: data/albumthemes/NeatSquare/image.xml.in.h:11 src/dlg-duplicates.c:265
--msgid "Image"
--msgstr "圖像"
--
--#: data/albumthemes/Classic/image.xml.in.h:12
--#: data/albumthemes/ClassicClips/image.xml.in.h:12
--#: data/albumthemes/Clean/image.xml.in.h:11
--#: data/albumthemes/NeatRound/image.xml.in.h:12
--#: data/albumthemes/NeatSquare/image.xml.in.h:12
--msgid "Shutter speed"
--msgstr ""
--
--#: data/albumthemes/Clean/image.xml.in.h:12 src/gthumb_edit.glade.h:33
--#: src/gthumb_web_exporter.glade.h:53
--msgid "pixels"
--msgstr "像素"
--
--#: data/albumthemes/Classic/image.xml.in.h:1
--#: data/albumthemes/ClassicClips/image.xml.in.h:1
--#: data/albumthemes/NeatRound/image.xml.in.h:1
--#: data/albumthemes/NeatSquare/image.xml.in.h:1
--msgid "(click on the image to view it at original size)"
--msgstr ""
--
- #: gthumb.desktop.in.h:1
- msgid "View and organize your images"
- msgstr "瀏覽及管理圖像"
-@@ -315,28 +212,28 @@
- msgid "Cannot save catalog \"%s\": %s"
- msgstr "無法儲存圖像集“%s”：%s"
- 
--#: libgthumb/comments.c:410
-+#: libgthumb/comments.c:401
- msgid "Deleting all comments, wait please..."
- msgstr "正在刪除所有備註，請稍等..."
- 
--#: libgthumb/comments.c:412
-+#: libgthumb/comments.c:403
- msgid "Deleting old comments, wait please..."
- msgstr "正在刪除舊的備註，請稍等..."
- 
--#: libgthumb/comments.c:756
-+#: libgthumb/comments.c:746
- msgid "%d %B %Y"
- msgstr "%x"
- 
--#: libgthumb/comments.c:758 src/dlg-duplicates.c:551 src/dlg-image-prop.c:676
--#: src/fullscreen.c:225 src/gthumb-window.c:414
-+#: libgthumb/comments.c:748 src/dlg-duplicates.c:551 src/dlg-image-prop.c:676
-+#: src/fullscreen.c:244 src/gthumb-window.c:406
- msgid "%d %B %Y, %H:%M"
- msgstr "%x %H:%M"
- 
--#: libgthumb/comments.c:768
-+#: libgthumb/comments.c:758
- msgid "(No Comment)"
- msgstr "(沒有任何備註)"
- 
--#: libgthumb/dlg-save-image.c:97 src/commands-impl.c:313 src/dlg-convert.c:308
-+#: libgthumb/dlg-save-image.c:97 src/commands-impl.c:312 src/dlg-convert.c:307
- #, c-format
- msgid "An image named \"%s\" is already present. Do you want to overwrite it?"
- msgstr "名稱為“%s”的圖像己經存在。是否覆寫？"
-@@ -358,6 +255,15 @@
- msgid "Image type:"
- msgstr "圖像類型："
- 
-+#: libgthumb/gconf-utils.c:98
-+#, c-format
-+msgid ""
-+"GConf error:\n"
-+"  %s"
-+msgstr ""
-+"GConf 錯誤：\n"
-+"  %s"
-+
- #: libgthumb/gnome-print-font-dialog.c:114
- msgid "_Insert a new preview phrase."
- msgstr "加入新的預覽文字字句(_I)"
-@@ -378,6 +284,18 @@
- msgid "Font Selection"
- msgstr "字型選擇"
- 
-+#: libgthumb/gnome-print-font-picker.c:92
-+msgid "Sans Regular 12"
-+msgstr "AR PL KaitiM Big5 12"
-+
-+#: libgthumb/gnome-print-font-picker.c:93
-+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-+msgstr "The following is Chinese: '中文測試'"
-+
-+#: libgthumb/gnome-print-font-picker.c:94
-+msgid "Pick a Font"
-+msgstr "選取字型"
-+
- #: libgthumb/gnome-print-font-picker.c:179
- msgid "Title"
- msgstr "標題"
-@@ -408,8 +326,7 @@
- 
- #: libgthumb/gnome-print-font-picker.c:219
- msgid "Use font in the label in font info mode"
--msgstr ""
--"在字型資訊模式中，字型本身的形狀反映在字型名稱內"
-+msgstr "在字型資訊模式中，字型本身的形狀反映在字型名稱內"
- 
- #: libgthumb/gnome-print-font-picker.c:227
- msgid "Font size for label"
-@@ -437,24 +354,31 @@
- msgstr "備註"
- 
- #: libgthumb/gth-file-view-list.c:1383 src/dlg-duplicates.c:372
--#: src/dlg-image-prop.c:836 src/gthumb-window.c:432
-+#: src/dlg-image-prop.c:836 src/gthumb-window.c:424
- msgid "Name"
- msgstr "名稱"
- 
--#: libgthumb/print-callbacks.c:925 libgthumb/print-callbacks.c:1504
-+#: libgthumb/gtk-utils.c:128 libgthumb/gtk-utils.c:214
-+#: libgthumb/gtk-utils.c:317 src/commands-impl.c:2812 src/gthumb-window.c:808
-+#: src/gthumb-window.c:4843 src/gthumb_png_exporter.glade.h:75
-+#: src/gthumb_web_exporter.glade.h:32 src/main.c:122
-+msgid "gThumb"
-+msgstr "gThumb"
-+
-+#: libgthumb/print-callbacks.c:917 libgthumb/print-callbacks.c:1497
- #, c-format
- msgid "Print %s"
- msgstr "列印 %s"
- 
--#: libgthumb/print-callbacks.c:928
-+#: libgthumb/print-callbacks.c:920
- msgid "Print Image"
- msgstr "列印圖像"
- 
--#: libgthumb/thumb-cache.c:487
-+#: libgthumb/thumb-cache.c:409
- msgid "Deleting all thumbnails, wait please..."
- msgstr "正在刪除所有縮圖，請稍等..."
- 
--#: libgthumb/thumb-cache.c:489
-+#: libgthumb/thumb-cache.c:411
- msgid "Deleting old thumbnails, wait please..."
- msgstr "正在刪除舊的縮圖，請稍等..."
- 
-@@ -468,228 +392,217 @@
- msgid "Creating image: %s.%s"
- msgstr "正在製作圖像：%s.%s"
- 
--#: src/catalog-web-exporter.c:1615
-+#: src/catalog-web-exporter.c:1153
- msgid "Saving thumbnails"
- msgstr "儲存縮圖"
- 
--#: src/catalog-web-exporter.c:1681
-+#: src/catalog-web-exporter.c:1221
- msgid "Saving HTML pages: Images"
- msgstr "儲存 HTML 頁面：圖像"
- 
--#: src/catalog-web-exporter.c:1756
-+#: src/catalog-web-exporter.c:1298
- msgid "Saving HTML pages: Indexes"
- msgstr "儲存 HTML 頁面：索引"
- 
--#: src/catalog-web-exporter.c:1899 src/catalog-web-exporter.c:2034
-+#: src/catalog-web-exporter.c:1382
- msgid "Saving images"
- msgstr "正在儲存圖像"
- 
--#: src/catalog-web-exporter.c:2243
-+#: src/catalog-web-exporter.c:1696
- msgid "Could not create a temporary folder"
- msgstr "無法建立暫存資料夾"
- 
- #. Load thumbnails.
--#: src/catalog-web-exporter.c:2280
-+#: src/catalog-web-exporter.c:1735
- msgid "Loading images"
- msgstr "圖像載入中"
- 
--#: src/commands-impl.c:275 src/commands-impl.c:1011 src/commands-impl.c:1579
-+#: src/commands-impl.c:274 src/commands-impl.c:1010 src/commands-impl.c:1572
- msgid "Enter the new name: "
- msgstr "請輸入新的名稱："
- 
--#: src/commands-impl.c:279 src/commands-impl.c:1015 src/commands-impl.c:1583
-+#: src/commands-impl.c:278 src/commands-impl.c:1014 src/commands-impl.c:1576
- #: src/gthumb-ui.xml.h:237 src/gthumb_tools.glade.h:45
- msgid "_Rename"
- msgstr "重新命名(_R)"
- 
--#: src/commands-impl.c:293 src/commands-impl.c:917 src/commands-impl.c:1029
--#: src/commands-impl.c:1599 src/commands-impl.c:1694
-+#: src/commands-impl.c:292 src/commands-impl.c:916 src/commands-impl.c:1028
-+#: src/commands-impl.c:1592 src/commands-impl.c:1687
- #, c-format
- msgid ""
- "The name \"%s\" is not valid because it contains the character \"/\". Please "
- "use a different name."
--msgstr ""
--"名稱“%s”無效，因為它含有“/”字元。請使用另一個名�"
--"�。"
-+msgstr "名稱“%s”無效，因為它含有“/”字元。請使用另一個名稱。"
- 
--#: src/commands-impl.c:320 src/dlg-convert.c:314
-+#: src/commands-impl.c:319 src/dlg-convert.c:313
- msgid "_Overwrite"
- msgstr "覆寫(_O)"
- 
--#: src/commands-impl.c:340 src/commands-impl.c:355
-+#: src/commands-impl.c:339 src/commands-impl.c:354
- #, c-format
- msgid "Could not rename the image \"%s\": %s"
- msgstr "無法更改圖像“%s”的名稱：%s"
- 
--#: src/commands-impl.c:342 src/commands-impl.c:1051 src/commands-impl.c:1357
-+#: src/commands-impl.c:341 src/commands-impl.c:1050 src/commands-impl.c:1350
- msgid "source and destination are the same"
- msgstr "來源地和目的地一樣"
- 
--#: src/commands-impl.c:446
-+#: src/commands-impl.c:445
- #, c-format
- msgid "Could not duplicate the image \"%s\": %s"
- msgstr "無法複製圖像“%s”：%s"
- 
--#: src/commands-impl.c:454
-+#: src/commands-impl.c:453
- msgid "Stop"
- msgstr "停止"
- 
--#: src/commands-impl.c:455
-+#: src/commands-impl.c:454
- msgid "Continue"
- msgstr "繼續"
- 
--#: src/commands-impl.c:531
-+#: src/commands-impl.c:530
- msgid "The selected images will be moved to the Trash, are you sure?"
- msgstr "選定的圖像將會被丟進垃圾桶，是否確定？"
- 
--#: src/commands-impl.c:551
-+#: src/commands-impl.c:550
- msgid "The image will be moved to the Trash, are you sure?"
- msgstr "該圖像將會被丟進垃圾桶，是否確定？"
- 
--#: src/commands-impl.c:786
-+#: src/commands-impl.c:785
- msgid "The image will be removed from the catalog, are you sure?"
- msgstr "將會從圖像集中移除該圖像，是否確定？"
- 
--#: src/commands-impl.c:828
-+#: src/commands-impl.c:827
- msgid "The selected images will be removed from the catalog, are you sure?"
- msgstr "選定的圖像將會從圖像集中移除，是否確定？"
- 
--#: src/commands-impl.c:904 src/dlg-catalog.c:83 src/dlg-catalog.c:124
--#: src/dlg-categories.c:200 src/dlg-file-utils.c:89
-+#: src/commands-impl.c:903 src/dlg-catalog.c:83 src/dlg-catalog.c:124
-+#: src/dlg-categories.c:190 src/dlg-file-utils.c:89
- msgid "C_reate"
- msgstr "建立(_R)"
- 
--#: src/commands-impl.c:933 src/commands-impl.c:1059 src/commands-impl.c:1621
--#: src/commands-impl.c:1713
-+#: src/commands-impl.c:932 src/commands-impl.c:1058 src/commands-impl.c:1614
-+#: src/commands-impl.c:1706
- #, c-format
- msgid "The name \"%s\" is already used. Please use a different name."
- msgstr "名稱“%s”已經在使用中。請使用另一個名稱。"
- 
--#: src/commands-impl.c:961
-+#: src/commands-impl.c:960
- msgid "New Folder"
- msgstr "新增資料夾"
- 
--#: src/commands-impl.c:962
-+#: src/commands-impl.c:961
- msgid "Enter the folder name: "
- msgstr "請輸入資料夾的名稱："
- 
--#: src/commands-impl.c:963
-+#: src/commands-impl.c:962
- #, c-format
- msgid "Could not create the folder \"%s\": %s"
- msgstr "無法建立資料夾“%s”：%s"
- 
--#: src/commands-impl.c:974
-+#: src/commands-impl.c:973
- msgid "New Library"
- msgstr "新增圖庫"
- 
--#: src/commands-impl.c:975 src/dlg-catalog.c:120
-+#: src/commands-impl.c:974 src/dlg-catalog.c:120
- msgid "Enter the library name: "
- msgstr "請輸入圖庫的名稱："
- 
--#: src/commands-impl.c:976
-+#: src/commands-impl.c:975
- #, c-format
- msgid "Could not create the library \"%s\": %s"
- msgstr "無法建立圖庫“%s”：%s"
- 
--#: src/commands-impl.c:1049 src/commands-impl.c:1086
-+#: src/commands-impl.c:1048 src/commands-impl.c:1085
- #, c-format
- msgid "Could not rename the folder \"%s\": %s"
- msgstr "無法更改資料夾“%s”的名稱：%s"
- 
--#: src/commands-impl.c:1152
-+#: src/commands-impl.c:1151
- #, c-format
- msgid "Could not delete the folder \"%s\": %s"
- msgstr "無法刪除資料夾“%s”：%s"
- 
--#: src/commands-impl.c:1183
-+#: src/commands-impl.c:1180
- #, c-format
- msgid ""
- "\"%s\" cannot be moved to the Trash. Do you want to delete it permanently?"
- msgstr "“%s”無法丟進垃圾桶。是否永遠刪除該圖像？"
- 
--#: src/commands-impl.c:1191 src/dlg-file-utils.c:226
--msgid "_Do not display this message again"
--msgstr ""
--
--#: src/commands-impl.c:1224
-+#: src/commands-impl.c:1217
- msgid "The selected folder will be moved to the Trash, are you sure?"
- msgstr "選定的資料夾將會被丟進垃圾桶，是否確定？"
- 
--#: src/commands-impl.c:1226 src/dlg-file-utils.c:280
-+#: src/commands-impl.c:1219 src/dlg-file-utils.c:273
- msgid "_Move"
- msgstr "移動(_M)"
- 
--#: src/commands-impl.c:1292 src/commands-impl.c:1347
-+#: src/commands-impl.c:1285 src/commands-impl.c:1340
- #, c-format
- msgid "Could not copy the folder \"%s\": %s"
- msgstr "無法複製資料夾“%s”：%s"
- 
--#: src/commands-impl.c:1347 src/dlg-file-utils.c:2425
--#: src/dlg-file-utils.c:2427
-+#: src/commands-impl.c:1340 src/dlg-file-utils.c:2295
-+#: src/dlg-file-utils.c:2297
- #, c-format
- msgid "Could not move the folder \"%s\": %s"
- msgstr "無法移動資料夾“%s”：%s"
- 
--#: src/commands-impl.c:1368
-+#: src/commands-impl.c:1361
- msgid "source contains destination"
- msgstr "目的地在來源目錄之下"
- 
--#: src/commands-impl.c:1379
-+#: src/commands-impl.c:1372
- msgid "a folder with that name is already present."
- msgstr "該名稱的資料夾已經存在。"
- 
--#: src/commands-impl.c:1460 src/dlg-file-utils.c:366 src/dlg-file-utils.c:455
-+#: src/commands-impl.c:1453 src/dlg-file-utils.c:359 src/dlg-file-utils.c:448
- msgid "Choose the destination folder"
- msgstr "請選擇目的地資料夾"
- 
--#: src/commands-impl.c:1632
-+#: src/commands-impl.c:1625
- #, c-format
- msgid "Could not rename the library \"%s\": %s"
- msgstr "無法更改圖庫“%s”的名稱：%s"
- 
--#: src/commands-impl.c:1632
-+#: src/commands-impl.c:1625
- #, c-format
- msgid "Could not rename the catalog \"%s\": %s"
- msgstr "無法更改圖像集“%s”的名稱：%s"
- 
--#: src/commands-impl.c:1678 src/dlg-catalog.c:79
-+#: src/commands-impl.c:1671 src/dlg-catalog.c:79
- msgid "Enter the catalog name: "
- msgstr "請輸入圖像集的名稱："
- 
--#: src/commands-impl.c:1679
-+#: src/commands-impl.c:1672
- msgid "New Catalog"
- msgstr "新的圖像集"
- 
--#: src/commands-impl.c:1724
-+#: src/commands-impl.c:1717
- #, c-format
- msgid "Could not create the catalog \"%s\": %s"
- msgstr "無法建立圖像集“%s”：%s"
- 
--#: src/commands-impl.c:1788
-+#: src/commands-impl.c:1781
- msgid "The selected library will be removed, are you sure?"
- msgstr "將會移除選定的圖庫，是否確定？"
- 
--#: src/commands-impl.c:1790
-+#: src/commands-impl.c:1783
- msgid "The selected catalog will be removed, are you sure?"
- msgstr "將會移除選定的圖像集，是否確定？"
- 
--#: src/commands-impl.c:2759 src/dlg-categories.c:337 src/dlg-comment.c:327
--#: src/dlg-jpegtran.c:631 src/dlg-maintenance.c:273 src/dlg-preferences.c:175
-+#: src/commands-impl.c:2752 src/dlg-categories.c:321 src/dlg-comment.c:327
-+#: src/dlg-jpegtran.c:631 src/dlg-maintenance.c:273 src/dlg-preferences.c:174
- #: src/dlg-search.c:450
- #, c-format
- msgid "Could not display help: %s"
- msgstr "無法顯示說明文件：%s"
- 
--#: src/commands-impl.c:2810
-+#: src/commands-impl.c:2803
- msgid "translator_credits"
- msgstr "Abel Cheung <maddog@linux.org.hk>, 2002"
- 
--#: src/commands-impl.c:2819 src/gthumb-window.c:816 src/gthumb-window.c:4896
--#: src/main.c:124
--msgid "gThumb"
--msgstr "gThumb"
--
--#: src/commands-impl.c:2822
-+#: src/commands-impl.c:2815
- msgid "An image viewer and browser for GNOME."
- msgstr "適合在 GNOME 環境下使用的圖像瀏覽器。"
- 
-@@ -697,39 +610,34 @@
- msgid "Move Catalog to..."
- msgstr "將圖像集移至..."
- 
--#: src/dlg-categories.c:196
-+#: src/dlg-categories.c:186
- msgid "Enter the new category name"
- msgstr "請輸入新的類別名稱"
- 
--#: src/dlg-categories.c:207
--#, fuzzy, c-format
--msgid ""
--"The name \"%s\" is not valid because it contains the character \",\". Please "
--"use a different name."
--msgstr ""
--"名稱“%s”無效，因為它含有“/”字元。請使用另一個名�"
--"�。"
--
--#: src/dlg-categories.c:212
-+#: src/dlg-categories.c:197
- #, c-format
- msgid "The category \"%s\" is already present. Please use a different name."
- msgstr "類別“%s”已經存在。請使用另一個名稱。"
- 
--#: src/dlg-convert.c:159
-+#: src/dlg-convert.c:158
- #, c-format
- msgid "Converting image: %s"
- msgstr "正在轉換圖像：%s"
- 
--#: src/dlg-convert.c:182
-+#: src/dlg-convert.c:181
- #, c-format
- msgid ""
- "An image named \"%s\" is already present. Please specify a different name."
- msgstr "名稱為“%s”的圖像已經存在。請使用另一個名稱。"
- 
--#: src/dlg-convert.c:313 src/gthumb_convert.glade.h:17
-+#: src/dlg-convert.c:312 src/gthumb_convert.glade.h:17
- msgid "Skip"
- msgstr "略過"
- 
-+#: src/dlg-duplicates.c:265
-+msgid "Image"
-+msgstr "圖像"
-+
- #: src/dlg-duplicates.c:279 src/dlg-duplicates.c:650
- msgid "Duplicates"
- msgstr "重複數目"
-@@ -765,77 +673,75 @@
- "You don't have the right permissions to create images in the folder \"%s\""
- msgstr "沒有足夠的權限，無法在資料夾“%s”中產生圖像"
- 
--#: src/dlg-file-utils.c:200
-+#: src/dlg-file-utils.c:199
- msgid "Could not delete the images:"
- msgstr "無法刪除檔案："
- 
--#: src/dlg-file-utils.c:223
-+#: src/dlg-file-utils.c:219
- msgid ""
- "The images cannot be moved to the Trash. Do you want to delete them "
- "permanently?"
- msgstr "無法將圖像丟進垃圾桶。是否永遠刪除圖像？"
- 
--#: src/dlg-file-utils.c:757 src/dlg-file-utils.c:858
-+#: src/dlg-file-utils.c:750 src/dlg-file-utils.c:851
- msgid "You didn't enter the new name"
- msgstr "並未輸入新的名稱"
- 
--#: src/dlg-file-utils.c:769 src/dlg-file-utils.c:870
-+#: src/dlg-file-utils.c:762 src/dlg-file-utils.c:863
- #, c-format
- msgid ""
- "The name \"%s\" is already used in this folder. Please use a different name."
--msgstr ""
--"本資料夾中已經有檔案的名稱是“%s”。請使用另一個名稱"
--"。"
-+msgstr "本資料夾中已經有檔案的名稱是“%s”。請使用另一個名稱。"
- 
--#: src/dlg-file-utils.c:1009
-+#: src/dlg-file-utils.c:1002
- msgid "Could not rename the image:"
- msgstr "無法更改圖像名稱："
- 
--#: src/dlg-file-utils.c:1011
-+#: src/dlg-file-utils.c:1004
- msgid "Could not rename the following images:"
- msgstr "無法更改以下的圖像的名稱："
- 
--#: src/dlg-file-utils.c:1145
-+#: src/dlg-file-utils.c:1137
- msgid "Could not move the image:"
- msgstr "無法移動圖像："
- 
--#: src/dlg-file-utils.c:1147
-+#: src/dlg-file-utils.c:1139
- msgid "Could not copy the image:"
- msgstr "無法複製檔案："
- 
--#: src/dlg-file-utils.c:1171 src/dlg-file-utils.c:2448
-+#: src/dlg-file-utils.c:1162 src/dlg-file-utils.c:2317
- msgid "_Abort"
- msgstr "中止(_A)"
- 
--#: src/dlg-file-utils.c:1172 src/dlg-file-utils.c:2449
-+#: src/dlg-file-utils.c:1163 src/dlg-file-utils.c:2318
- msgid "_Continue"
- msgstr "繼續(_C)"
- 
--#: src/dlg-file-utils.c:1345
-+#: src/dlg-file-utils.c:1335
- #, c-format
- msgid "Copying file %d of %d"
- msgstr "正在複製第 %d 個檔案 (總共 %d 個)"
- 
--#: src/dlg-file-utils.c:1770 src/dlg-file-utils.c:1997
-+#: src/dlg-file-utils.c:1718 src/dlg-file-utils.c:1904
- msgid "Collecting images info"
- msgstr "正在收集圖像資訊"
- 
--#: src/dlg-file-utils.c:1773 src/dlg-file-utils.c:2010
-+#: src/dlg-file-utils.c:1721 src/dlg-file-utils.c:1917
- #, c-format
- msgid "Deleting file %ld of %ld"
- msgstr "正在刪除第 %ld 個檔案 (總共 %ld 個)"
- 
--#: src/dlg-file-utils.c:2000
-+#: src/dlg-file-utils.c:1907
- #, c-format
- msgid "Copying file %ld of %ld"
- msgstr "正在複製第 %ld 個檔案 (總共 %ld 個)"
- 
--#: src/dlg-file-utils.c:2005
-+#: src/dlg-file-utils.c:1912
- #, c-format
- msgid "Moving file %ld of %ld"
- msgstr "正在移動第 %ld 個檔案 (總共 %ld 個)"
- 
--#: src/dlg-image-prop.c:841 src/gthumb-window.c:439
-+#: src/dlg-image-prop.c:841 src/gthumb-window.c:431
- msgid "Size"
- msgstr "尺寸"
- 
-@@ -843,7 +749,11 @@
- msgid "Type"
- msgstr "類型"
- 
--#: src/dlg-image-prop.c:861 src/gthumb-window.c:453
-+#: src/dlg-image-prop.c:851 src/gthumb-window.c:438
-+msgid "Bytes"
-+msgstr "位元組"
-+
-+#: src/dlg-image-prop.c:861 src/gthumb-window.c:445
- msgid "Modified"
- msgstr "最後修改時間"
- 
-@@ -851,13 +761,12 @@
- msgid "Information on Channel"
- msgstr "請選取色版"
- 
--#: src/dlg-image-prop.c:900 src/gthumb-window.c:5345
-+#: src/dlg-image-prop.c:900 src/gthumb-window.c:5292
- msgid "Field"
- msgstr "欄位"
- 
--#: src/dlg-image-prop.c:910 src/gthumb-window.c:5355
--#, fuzzy
--msgid "Value "
-+#: src/dlg-image-prop.c:910 src/gthumb-window.c:5302 src/gthumb.glade.h:25
-+msgid "Value"
- msgstr "亮度"
- 
- #: src/dlg-image-prop.c:991
-@@ -877,15 +786,15 @@
- msgid "Specify the backup file"
- msgstr "指定備份檔"
- 
--#: src/dlg-png-exporter.c:1004
-+#: src/dlg-png-exporter.c:997
- msgid "Image Caption"
- msgstr "圖像標題"
- 
--#: src/dlg-png-exporter.c:1057
-+#: src/dlg-png-exporter.c:1050
- msgid "Header"
- msgstr "頁首"
- 
--#: src/dlg-png-exporter.c:1070 src/dlg-png-exporter.c:1076
-+#: src/dlg-png-exporter.c:1063 src/dlg-png-exporter.c:1069
- msgid "Footer"
- msgstr "頁尾"
- 
-@@ -909,23 +818,23 @@
- msgid "Folder"
- msgstr "資料夾"
- 
--#: src/dlg-web-exporter.c:658
-+#: src/dlg-web-exporter.c:661
- msgid "Select Album Theme"
- msgstr "選取相片簿佈景主題"
- 
--#: src/fullscreen.c:782 src/gthumb-ui.xml.h:113
-+#: src/fullscreen.c:804 src/gthumb-ui.xml.h:113
- msgid "Restore Normal View"
- msgstr "還原為正常顯示模式"
- 
--#: src/fullscreen.c:800
-+#: src/fullscreen.c:822
- msgid "Image Info"
- msgstr "圖像資訊"
- 
--#: src/fullscreen.c:818 src/gthumb-window.c:4303
-+#: src/fullscreen.c:840 src/gthumb-window.c:4255
- msgid "Back"
- msgstr "上一頁"
- 
--#: src/fullscreen.c:836 src/gthumb-ui.xml.h:52
-+#: src/fullscreen.c:858 src/gthumb-ui.xml.h:52
- msgid "Forward"
- msgstr "下一頁"
- 
-@@ -978,7 +887,7 @@
- msgstr "調整色相及彩度"
- 
- #: src/gthumb-ui.xml.h:10
--msgid "Apply threshold"
-+msgid "Aply threshold"
- msgstr ""
- 
- #: src/gthumb-ui.xml.h:11
-@@ -1928,68 +1837,68 @@
- msgid "by _Time"
- msgstr "根據時間(_T)"
- 
--#: src/gthumb-window.c:696
-+#: src/gthumb-window.c:687
- msgid "[Press 'c' to add a comment]"
- msgstr "[請按‘c’加上備註]"
- 
--#: src/gthumb-window.c:770 src/gthumb-window.c:793
-+#: src/gthumb-window.c:762 src/gthumb-window.c:785
- msgid "[modified]"
- msgstr "[最後修改時間]"
- 
--#: src/gthumb-window.c:877
-+#: src/gthumb-window.c:869
- msgid "No image"
- msgstr "沒有任何圖像"
- 
--#: src/gthumb-window.c:879
-+#: src/gthumb-window.c:871
- #, c-format
- msgid "1 image (%s)"
- msgstr "1 幅圖像 (%s)"
- 
--#: src/gthumb-window.c:882
-+#: src/gthumb-window.c:874
- #, c-format
- msgid "%d images (%s)"
- msgstr "%d 幅圖像 (%s)"
- 
--#: src/gthumb-window.c:889
-+#: src/gthumb-window.c:881
- #, c-format
- msgid "1 selected (%s)"
- msgstr "選取了 1 幅 (%s)"
- 
--#: src/gthumb-window.c:892
-+#: src/gthumb-window.c:884
- #, c-format
- msgid "%d selected (%s)"
- msgstr "選取了 %d 幅 (%s)"
- 
--#: src/gthumb-window.c:3383
-+#: src/gthumb-window.c:3363
- msgid "Dragged Images"
- msgstr "拖曳的圖像"
- 
--#: src/gthumb-window.c:3582
-+#: src/gthumb-window.c:3559
- msgid "Could not move the items:"
- msgstr "無法移動以下的項目："
- 
--#: src/gthumb-window.c:5226
-+#: src/gthumb-window.c:5172
- msgid "Image comment"
- msgstr "圖像備註"
- 
--#: src/gthumb-window.c:5240
-+#: src/gthumb-window.c:5186
- msgid "Image data"
- msgstr "圖像資料"
- 
--#: src/gthumb-window.c:5254
-+#: src/gthumb-window.c:5200
- msgid "Image preview"
- msgstr "圖像預覽"
- 
--#: src/gthumb-window.c:6500
-+#: src/gthumb-window.c:6458
- #, c-format
- msgid "Cannot load folder \"%s\": %s\n"
- msgstr "無法載入資料夾“%s”：%s\n"
- 
--#: src/gthumb-window.c:6769
-+#: src/gthumb-window.c:6727
- msgid "The specified catalog does not exist."
- msgstr "指定的圖像集不存在。"
- 
--#: src/gthumb-window.c:8139
-+#: src/gthumb-window.c:8073
- msgid "Wait please..."
- msgstr "請稍等..."
- 
-@@ -2092,10 +2001,6 @@
- msgid "Red"
- msgstr "紅"
- 
--#: src/gthumb.glade.h:25
--msgid "Value"
--msgstr "亮度"
--
- #: src/gthumb.glade.h:26
- msgid "_Application:"
- msgstr "應用程式(_A)："
-@@ -2132,107 +2037,6 @@
- msgid "_Save the new image as:"
- msgstr "將新的圖像儲存為(_S)："
- 
--#: src/gthumb.schemas.in.h:1
--msgid ""
--"Images over this size (in bytes) will not be thumbnailed. Use 0 if you want "
--"to generate thumbnails for all images."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:2
--msgid "Possible values are: 1, 2, 3, 4."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:3
--msgid "Possible values are: actual_size, fit, keep_prev, fit_if_larger."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:4
--msgid "Possible values are: ascending, descending."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:5
--msgid "Possible values are: forward, backward."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:6
--msgid "Possible values are: high, low."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:7
--msgid "Possible values are: image, data, comment."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:8
--msgid "Possible values are: jpeg, png, tga, tiff."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:9
--msgid "Possible values are: light, midtone, dark."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:10
--msgid "Possible values are: list, thumbnails."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:11
--msgid "Possible values are: mm, in."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:12
--msgid "Possible values are: name, path, size, time."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:13
--msgid "Possible values are: name, size, time."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:14
--msgid "Possible values are: nautilus, single, double."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:15
--msgid "Possible values are: none, deflate, jpeg."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:16
--msgid "Possible values are: none, name, path, size, time."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:17
--msgid ""
--"Possible values are: none, simple, simple_with_shadow, shadow, slide, "
--"shadow_in, shadow_out."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:18
--msgid "Possible values are: pixels, percentage."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:19
--msgid "Possible values are: png, jpeg."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:20
--msgid "Possible values are: skip, rename, ask, overwrite."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:21
--msgid "Possible values are: small, medium, large."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:22
--msgid ""
--"Possible values are: system, text_below, text_beside, text_only, icons_only."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:23
--msgid "Possible values are: white, black, checked, none."
--msgstr ""
--
--#: src/gthumb.schemas.in.h:24
--msgid "Whether to always use a black background."
--msgstr ""
--
- #: src/gthumb_comments.glade.h:3 src/gthumb_search.glade.h:5
- msgid "A_vailable categories:"
- msgstr "可供選擇的類別(_V)："
-@@ -2556,6 +2360,10 @@
- msgid "_Yellow-Blue:"
- msgstr "黃色－藍色(_Y)："
- 
-+#: src/gthumb_edit.glade.h:33 src/gthumb_web_exporter.glade.h:34
-+msgid "pixels"
-+msgstr "像素"
-+
- #: src/gthumb_png_exporter.glade.h:4
- msgid "112"
- msgstr "112"
-@@ -2636,11 +2444,11 @@
- msgid "Choose destination folder"
- msgstr "建立目的地資料夾"
- 
--#: src/gthumb_png_exporter.glade.h:24 src/gthumb_web_exporter.glade.h:18
-+#: src/gthumb_png_exporter.glade.h:24
- msgid "Co_mment"
- msgstr "備註(_M)"
- 
--#: src/gthumb_png_exporter.glade.h:25 src/gthumb_web_exporter.glade.h:19
-+#: src/gthumb_png_exporter.glade.h:25 src/gthumb_web_exporter.glade.h:14
- msgid "Col_umns:"
- msgstr "列數(_U)："
- 
-@@ -2656,11 +2464,11 @@
- msgid "Create _HTML image map"
- msgstr "製作 _HTML image map"
- 
--#: src/gthumb_png_exporter.glade.h:29 src/gthumb_web_exporter.glade.h:22
-+#: src/gthumb_png_exporter.glade.h:29
- msgid "F_ooter:"
- msgstr "頁尾(_O)："
- 
--#: src/gthumb_png_exporter.glade.h:30 src/gthumb_web_exporter.glade.h:23
-+#: src/gthumb_png_exporter.glade.h:30
- msgid "File _name"
- msgstr "檔案名稱(_N)"
- 
-@@ -2668,7 +2476,7 @@
- msgid "File pa_th"
- msgstr "檔案路徑(_T)"
- 
--#: src/gthumb_png_exporter.glade.h:32 src/gthumb_web_exporter.glade.h:24
-+#: src/gthumb_png_exporter.glade.h:32
- msgid "File si_ze"
- msgstr "檔案大小(_Z)"
- 
-@@ -2680,7 +2488,7 @@
- msgid "Frame co_lor:"
- msgstr "邊框顏色(_L)："
- 
--#: src/gthumb_png_exporter.glade.h:35 src/gthumb_web_exporter.glade.h:26
-+#: src/gthumb_png_exporter.glade.h:35
- msgid "H_eader:"
- msgstr "頁首(_E)："
- 
-@@ -2692,7 +2500,7 @@
- msgid "Hei_ght:"
- msgstr "高度(_G)："
- 
--#: src/gthumb_png_exporter.glade.h:38 src/gthumb_web_exporter.glade.h:28
-+#: src/gthumb_png_exporter.glade.h:38
- msgid "Image dim_ensions"
- msgstr "圖像尺寸(_E)"
- 
-@@ -2712,7 +2520,7 @@
- msgid "Pi_xels"
- msgstr "像素(_X)"
- 
--#: src/gthumb_png_exporter.glade.h:43 src/gthumb_web_exporter.glade.h:30
-+#: src/gthumb_png_exporter.glade.h:43 src/gthumb_web_exporter.glade.h:16
- msgid "Re_verse order"
- msgstr "相反次序排列(_V)"
- 
-@@ -2800,7 +2608,7 @@
- msgid "_Image size:"
- msgstr "圖像尺寸(_I)："
- 
--#: src/gthumb_png_exporter.glade.h:67 src/gthumb_web_exporter.glade.h:45
-+#: src/gthumb_png_exporter.glade.h:67 src/gthumb_web_exporter.glade.h:26
- msgid "_Rows:"
- msgstr "行數(_R)："
- 
-@@ -2812,15 +2620,15 @@
- msgid "_Template:"
- msgstr "樣式(_T)："
- 
--#: src/gthumb_png_exporter.glade.h:71 src/gthumb_web_exporter.glade.h:49
-+#: src/gthumb_png_exporter.glade.h:71 src/gthumb_web_exporter.glade.h:29
- msgid "by name"
- msgstr "根據名稱"
- 
--#: src/gthumb_png_exporter.glade.h:72 src/gthumb_web_exporter.glade.h:50
-+#: src/gthumb_png_exporter.glade.h:72 src/gthumb_web_exporter.glade.h:30
- msgid "by path"
- msgstr "根據路徑"
- 
--#: src/gthumb_png_exporter.glade.h:73 src/gthumb_web_exporter.glade.h:51
-+#: src/gthumb_png_exporter.glade.h:73 src/gthumb_web_exporter.glade.h:31
- msgid "by size"
- msgstr "根據大小"
- 
-@@ -2828,11 +2636,11 @@
- msgid "by time"
- msgstr "根據時間"
- 
--#: src/gthumb_png_exporter.glade.h:75
-+#: src/gthumb_png_exporter.glade.h:76
- msgid "jpeg"
- msgstr "jpeg"
- 
--#: src/gthumb_png_exporter.glade.h:76
-+#: src/gthumb_png_exporter.glade.h:77
- msgid "png"
- msgstr "png"
- 
-@@ -3378,8 +3186,8 @@
- "original filename. Use ? to insert the image date. Use ! to insert the image "
- "size"
- msgstr ""
--"# 表示數字的位置。* 表示原來的檔案名稱。? "
--"表示圖像檔的日期。! 表示圖像的尺寸。"
-+"# 表示數字的位置。* 表示原來的檔案名稱。? 表示圖像檔的日期。! 表示圖像的尺"
-+"寸。"
- 
- #: src/gthumb_tools.glade.h:46
- msgid "_Sort original list:"
-@@ -3426,203 +3234,125 @@
- msgstr "<b>索引圖排列</b>"
- 
- #: src/gthumb_web_exporter.glade.h:12
--#, fuzzy
--msgid "<b>Personalize theme</b>"
--msgstr "<b>頁面大小</b>"
--
--#: src/gthumb_web_exporter.glade.h:13
--#, fuzzy
--msgid "<b>Photo data</b>"
--msgstr "<b>頁尾</b>"
--
--#: src/gthumb_web_exporter.glade.h:14
- msgid "<b>Saving</b>"
- msgstr "<b>儲存</b>"
- 
--#: src/gthumb_web_exporter.glade.h:15
-+#: src/gthumb_web_exporter.glade.h:13
- msgid "<b>Theme</b>"
- msgstr "<b>佈景主題</b>"
- 
--#: src/gthumb_web_exporter.glade.h:16
--msgid "Came_ra Model"
--msgstr ""
--
--#: src/gthumb_web_exporter.glade.h:17
--#, fuzzy
--msgid "Caption"
--msgstr "圖像標題"
--
--#: src/gthumb_web_exporter.glade.h:20
--msgid "E_xposure mode"
--msgstr ""
--
--#: src/gthumb_web_exporter.glade.h:21
--msgid "Exposure _time"
--msgstr ""
--
--#: src/gthumb_web_exporter.glade.h:25
--msgid "Focal _length"
--msgstr ""
--
--#: src/gthumb_web_exporter.glade.h:27
--#, fuzzy
--msgid "I_mage Caption..."
--msgstr "圖像標題"
--
--#: src/gthumb_web_exporter.glade.h:29
-+#: src/gthumb_web_exporter.glade.h:15
- msgid "Inde_x file:"
- msgstr "索引檔(_X)："
- 
--#: src/gthumb_web_exporter.glade.h:31
-+#: src/gthumb_web_exporter.glade.h:17
- msgid "Resi_ze images if larger than:"
- msgstr "圖像如果大於這個尺寸會重新調整尺寸(_Z)："
- 
--#: src/gthumb_web_exporter.glade.h:32
-+#: src/gthumb_web_exporter.glade.h:18
- msgid "Sor_t:"
- msgstr "排序(_T)："
- 
--#: src/gthumb_web_exporter.glade.h:33
-+#: src/gthumb_web_exporter.glade.h:19
- msgid "Th_eme:"
- msgstr "佈景主題(_E)："
- 
--#: src/gthumb_web_exporter.glade.h:35
--#, no-c-format
--msgid "Use %d  to insert current date"
--msgstr ""
--
--#: src/gthumb_web_exporter.glade.h:36
-+#: src/gthumb_web_exporter.glade.h:20
- msgid "Web Album"
- msgstr "網頁相片簿"
- 
--#: src/gthumb_web_exporter.glade.h:37
-+#: src/gthumb_web_exporter.glade.h:21
- msgid "Web Album Theme"
- msgstr "網頁相片簿佈景"
- 
--#: src/gthumb_web_exporter.glade.h:38
--msgid "_Aperture value"
--msgstr ""
--
--#: src/gthumb_web_exporter.glade.h:39
-+#: src/gthumb_web_exporter.glade.h:22
- msgid "_Copy images to destination"
- msgstr "將圖像複製至目的地(_C)"
- 
--#: src/gthumb_web_exporter.glade.h:40
--msgid "_Date and Time"
--msgstr ""
--
--#: src/gthumb_web_exporter.glade.h:41
-+#: src/gthumb_web_exporter.glade.h:23
- msgid "_Destination:"
- msgstr "目的地(_D)："
- 
--#: src/gthumb_web_exporter.glade.h:42
--#, fuzzy
--msgid "_Flash"
--msgstr "檔案名稱(_F)"
--
--#: src/gthumb_web_exporter.glade.h:43
-+#: src/gthumb_web_exporter.glade.h:24
- msgid "_Go to Theme Folder"
- msgstr "前往佈景主題資料夾(_G)"
- 
--#: src/gthumb_web_exporter.glade.h:44
-+#: src/gthumb_web_exporter.glade.h:25
- msgid "_Install Theme..."
- msgstr "安裝佈景主題(_I)..."
- 
--#: src/gthumb_web_exporter.glade.h:46
--msgid "_Shutter speed"
--msgstr ""
--
--#: src/gthumb_web_exporter.glade.h:47
--#, fuzzy
--msgid "_Thumbnail Caption..."
--msgstr "縮圖(_T)"
-+#: src/gthumb_web_exporter.glade.h:27
-+msgid "_Title:"
-+msgstr "標題(_T)："
- 
--#: src/gthumb_web_exporter.glade.h:48
-+#: src/gthumb_web_exporter.glade.h:28
- msgid "by modified time"
- msgstr "根據修改時間"
- 
--#: src/gthumb_web_exporter.glade.h:52
-+#: src/gthumb_web_exporter.glade.h:33
- msgid "index.html"
- msgstr "index.html"
- 
--#: src/main.c:80
-+#: src/main.c:78
- msgid "Start in fullscreen mode"
- msgstr "以全螢幕模式開始"
- 
--#: src/main.c:84
-+#: src/main.c:82
- msgid "Automatically start a slideshow"
- msgstr "自動啟動投影片模式"
- 
--#: src/main.c:163
-+#: src/main.c:161
- msgid "Holidays"
- msgstr "假期"
- 
--#: src/main.c:164
-+#: src/main.c:162
- msgid "Temporary"
- msgstr "暫存"
- 
--#: src/main.c:165
-+#: src/main.c:163
- msgid "Screenshots"
- msgstr "螢幕快照"
- 
--#: src/main.c:166
-+#: src/main.c:164
- msgid "Science"
- msgstr "科學"
- 
--#: src/main.c:167
-+#: src/main.c:165
- msgid "Favourite"
- msgstr "喜愛"
- 
--#: src/main.c:168
-+#: src/main.c:166
- msgid "Important"
- msgstr "重要"
- 
--#: src/main.c:169
-+#: src/main.c:167
- msgid "GNOME"
- msgstr "GNOME"
- 
--#: src/main.c:170
-+#: src/main.c:168
- msgid "Games"
- msgstr "遊戲"
- 
--#: src/main.c:171
-+#: src/main.c:169
- msgid "Party"
- msgstr "派對"
- 
--#: src/main.c:172
-+#: src/main.c:170
- msgid "Birthday"
- msgstr "生日"
- 
--#: src/main.c:173
-+#: src/main.c:171
- msgid "Astronomy"
- msgstr "天文"
- 
--#: src/main.c:174
-+#: src/main.c:172
- msgid "Family"
- msgstr "全家褔"
- 
--#: src/main.c:311 src/main.c:393
-+#: src/main.c:308 src/main.c:374
- msgid "Command Line"
- msgstr "指令列"
- 
--#~ msgid ""
--#~ "GConf error:\n"
--#~ "  %s"
--#~ msgstr ""
--#~ "GConf 錯誤：\n"
--#~ "  %s"
--
--#~ msgid "Sans Regular 12"
--#~ msgstr "AR PL KaitiM Big5 12"
--
--#~ msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
--#~ msgstr "The following is Chinese: '中文測試'"
--
--#~ msgid "Pick a Font"
--#~ msgstr "選取字型"
--
--#~ msgid "_Title:"
--#~ msgstr "標題(_T)："
--
- #~ msgid "A_3 (297 x 420 mm)"
- #~ msgstr "A_3 (297×420 毫米)"
- 
-@@ -3649,6 +3379,9 @@
- 
- #~ msgid "Could not open file %s"
- #~ msgstr "無法開啟檔案 %s"
-+
-+#~ msgid "Image Dimensions"
-+#~ msgstr "圖像尺寸"
- 
- #~ msgid "File Size"
- #~ msgstr "檔案大小"
diff --git a/graphics/gthumb2/pkg-plist b/graphics/gthumb2/pkg-plist
index f6661c61c002..1b0612fe5f8e 100644
--- a/graphics/gthumb2/pkg-plist
+++ b/graphics/gthumb2/pkg-plist
@@ -57,6 +57,19 @@ share/gnome/applications/gthumb.desktop
 share/gnome/gnome-2.0/ui/GNOME_GThumb_CatalogView.xml
 share/gnome/gnome-2.0/ui/GNOME_GThumb_Viewer.xml
 share/gnome/gnome-2.0/ui/gthumb-ui.xml
+share/gnome/gthumb/albumthemes/BlueStripes/background.png
+share/gnome/gthumb/albumthemes/BlueStripes/back.png
+share/gnome/gthumb/albumthemes/BlueStripes/bottom.png
+share/gnome/gthumb/albumthemes/BlueStripes/image.gthtml
+share/gnome/gthumb/albumthemes/BlueStripes/index.gthtml
+share/gnome/gthumb/albumthemes/BlueStripes/left.png
+share/gnome/gthumb/albumthemes/BlueStripes/next.png
+share/gnome/gthumb/albumthemes/BlueStripes/prev.png
+share/gnome/gthumb/albumthemes/BlueStripes/right.png
+share/gnome/gthumb/albumthemes/BlueStripes/thumbnail.gthtml
+share/gnome/gthumb/albumthemes/BlueStripes/top.png
+share/gnome/gthumb/albumthemes/BlueStripes/transparent.png
+share/gnome/gthumb/albumthemes/BlueStripes/white-dot.png
 share/gnome/gthumb/albumthemes/Classic/1.gif
 share/gnome/gthumb/albumthemes/Classic/back.png
 share/gnome/gthumb/albumthemes/Classic/background.gif
@@ -118,15 +131,6 @@ share/gnome/gthumb/albumthemes/NeatSquare/prev.png
 share/gnome/gthumb/albumthemes/NeatSquare/right.png
 share/gnome/gthumb/albumthemes/NeatSquare/thumbnail.gthtml
 share/gnome/gthumb/albumthemes/NeatSquare/top.png
-share/gnome/gthumb/albumthemes/Simple/1.gif
-share/gnome/gthumb/albumthemes/Simple/first.gif
-share/gnome/gthumb/albumthemes/Simple/image.gthtml
-share/gnome/gthumb/albumthemes/Simple/index.gthtml
-share/gnome/gthumb/albumthemes/Simple/last.gif
-share/gnome/gthumb/albumthemes/Simple/next.gif
-share/gnome/gthumb/albumthemes/Simple/prev.gif
-share/gnome/gthumb/albumthemes/Simple/thumbnail.gthtml
-share/gnome/gthumb/albumthemes/Simple/up.gif
 share/gnome/gthumb/glade/gthumb.glade
 share/gnome/gthumb/glade/gthumb_comments.glade
 share/gnome/gthumb/glade/gthumb_convert.glade
@@ -183,18 +187,19 @@ share/locale/sr/LC_MESSAGES/gthumb.mo
 share/locale/sr@Latn/LC_MESSAGES/gthumb.mo
 share/locale/sv/LC_MESSAGES/gthumb.mo
 share/locale/uk/LC_MESSAGES/gthumb.mo
+share/locale/zn_CN/LC_MESSAGES/gthumb.mo
 share/locale/zh_TW/LC_MESSAGES/gthumb.mo
 @dirrm share/gnome/help/gthumb/C/figures
 @dirrm share/gnome/help/gthumb/C
 @dirrm share/gnome/help/gthumb
 @dirrm share/gnome/gthumb/icons
 @dirrm share/gnome/gthumb/glade
-@dirrm share/gnome/gthumb/albumthemes/Simple
 @dirrm share/gnome/gthumb/albumthemes/NeatSquare
 @dirrm share/gnome/gthumb/albumthemes/NeatRound
 @dirrm share/gnome/gthumb/albumthemes/Clean
 @dirrm share/gnome/gthumb/albumthemes/ClassicClips
 @dirrm share/gnome/gthumb/albumthemes/Classic
+@dirrm share/gnome/gthumb/albumthemes/BlueStripes
 @dirrm share/gnome/gthumb/albumthemes
 @dirrm share/gnome/gthumb
 @dirrm lib/gthumb/modules