Update to 2.1.4.

Submitted by:	Pav Lucistnik <pav@oook.cz>
Approved by:	maintainer

8 files changed, 3584 insertions, 1219 deletions

diff --git a/graphics/gthumb2/Makefile b/graphics/gthumb2/Makefile
index 584e55a883a2..f7b94def60a9 100644
--- a/graphics/gthumb2/Makefile
+++ b/graphics/gthumb2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gthumb2
-PORTVERSION=	2.1.3
+PORTVERSION=	2.1.4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.1
diff --git a/graphics/gthumb2/distinfo b/graphics/gthumb2/distinfo
index 3e121d62b831..a1d1780d920f 100644
--- a/graphics/gthumb2/distinfo
+++ b/graphics/gthumb2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gthumb-2.1.3.tar.bz2) = 477e48c49ae46a3199738d745c22d468
+MD5 (gnome2/gthumb-2.1.4.tar.bz2) = 1075fbdb901b627da0ae9150ae745861
diff --git a/graphics/gthumb2/files/patch-po_ja.po b/graphics/gthumb2/files/patch-po_ja.po
index 83122b577dd8..2babd5983208 100644
--- a/graphics/gthumb2/files/patch-po_ja.po
+++ b/graphics/gthumb2/files/patch-po_ja.po
@@ -1,30 +1,24 @@
---- po/ja.po.orig	Fri Jul 25 00:22:20 2003
-+++ po/ja.po	Fri Jul 25 00:22:47 2003
-@@ -5,10 +5,11 @@
+--- 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-07-06 20:06+0200\n"
--"PO-Revision-Date: 2003-05-05 13:30+0900\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-07-10 23:44+0900\n"
-+"PO-Revision-Date: 2003-07-10 23:42+0900\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 <translation@gnome.gr.jp>\n"
-+"Language-Team: Japanese <gnome-translation@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"
-@@ -46,7 +47,7 @@
+-"Report-Msgid-Bugs-To: \n"
  
- #: components/image-viewer/GNOME_GThumb_Viewer.server.in.in.h:3
- msgid "View with GThumb"
--msgstr "GThumb で表示します"
-+msgstr "GThumb で表示"
- 
- #: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:1
- msgid "Flip"
-@@ -102,8 +103,7 @@
+ #: 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"
@@ -34,61 +28,180 @@
  
  #: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:15
  msgid "Start/Stop _Animation"
-@@ -215,13 +215,11 @@
- 
- #: libgthumb/comments.c:401
+@@ -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:403
+ #: libgthumb/comments.c:412
  msgid "Deleting old comments, wait please..."
 -msgstr ""
 -"古いコメントを削除しています。少々お待ち下さい..."
 +msgstr "古いコメントを削除しています。少々お待ち下さい..."
  
- #: libgthumb/comments.c:747
+ #: libgthumb/comments.c:756
  msgid "%d %B %Y"
-@@ -239,9 +237,7 @@
- #: libgthumb/dlg-save-image.c:97 src/commands-impl.c:312 src/dlg-convert.c:307
+ 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\" は既に存在しています。上書きしても宜しいですか？"
++msgstr "画像 \"%s\" は既に存在しています。上書きしてもよろしいですか？"
  
  #: libgthumb/dlg-save-image.c:154
  #, c-format
-@@ -271,82 +267,87 @@
- 
- #: libgthumb/gnome-print-font-dialog.c:114
- msgid "_Insert a new preview phrase."
--msgstr ""
-+msgstr "新しくプレビューする語句を入力して下さい(_I)。"
- 
- #: libgthumb/gnome-print-font-dialog.c:119
- msgid "Modify preview phrase..."
--msgstr ""
-+msgstr "プレビューする文の変更..."
- 
- #: libgthumb/gnome-print-font-dialog.c:173
--#, fuzzy
- msgid "Preview"
--msgstr "プレビュー(_P)"
-+msgstr "プレビュー"
- 
- #: libgthumb/gnome-print-font-dialog.c:186
- msgid "_Modify preview phrase..."
--msgstr ""
-+msgstr "プレビューする文の修正(_M)..."
- 
- #: libgthumb/gnome-print-font-dialog.c:244
+@@ -391,6 +378,18 @@
  msgid "Font Selection"
--msgstr ""
-+msgstr "フォントの選択"
-+
+ msgstr "フォントの選択"
+ 
 +#: libgthumb/gnome-print-font-picker.c:92
 +msgid "Sans Regular 12"
 +msgstr "Sans Regular 12"
@@ -100,103 +213,42 @@
 +#: libgthumb/gnome-print-font-picker.c:94
 +msgid "Pick a Font"
 +msgstr "フォントの取得"
- 
++
  #: libgthumb/gnome-print-font-picker.c:179
--#, fuzzy
  msgid "Title"
--msgstr "タイトル(_T):"
-+msgstr "タイトル"
- 
- #: libgthumb/gnome-print-font-picker.c:180
- msgid "The title of the selection dialog box"
--msgstr ""
-+msgstr "選択ダイアログのタイトルです"
- 
- #: libgthumb/gnome-print-font-picker.c:200
--#, fuzzy
- msgid "Font name"
--msgstr "ファイル名(_N)"
-+msgstr "フォント名"
- 
- #: libgthumb/gnome-print-font-picker.c:201
--#, fuzzy
- msgid "Name of the selected font"
--msgstr "選択したフォルダの名前を変更します"
-+msgstr "選択したフォントの名前です"
- 
- #: libgthumb/gnome-print-font-picker.c:209
--#, fuzzy
- msgid "Preview text"
--msgstr "プレビュー(_P)"
-+msgstr "テキストのプレビュー"
- 
- #: libgthumb/gnome-print-font-picker.c:210
- msgid "Preview text shown in the dialog"
--msgstr ""
-+msgstr "ダイアログの中にプレビュー表示するテキスト"
- 
- #: libgthumb/gnome-print-font-picker.c:218
- msgid "Use font in label"
--msgstr ""
-+msgstr "ラベルのフォントを使用する"
+ 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"
--msgstr ""
-+msgstr "ラベルのフォント・サイズ"
+@@ -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
--#, fuzzy
  msgid "Show size"
--msgstr "シャドー・イン"
-+msgstr "表示サイズ"
- 
- #: libgthumb/gnome-print-font-picker.c:239
- msgid "Show size in font info mode"
--msgstr ""
-+msgstr "フォント情報モードに表示するサイズです"
+@@ -468,14 +463,11 @@
  
- #: libgthumb/gnome-print-font-picker.c:1018
--#, fuzzy
- msgid "Font"
--msgstr "フォント(_F):"
-+msgstr "フォント"
- 
- #: libgthumb/gth-file-view-list.c:1376 src/gthumb-ui.xml.h:25
- #: src/gthumb_comments.glade.h:8
-@@ -358,25 +359,22 @@
- msgid "Name"
- msgstr "名前"
- 
--#: libgthumb/print-callbacks.c:919 libgthumb/print-callbacks.c:1499
-+#: libgthumb/print-callbacks.c:921 libgthumb/print-callbacks.c:1501
- #, c-format
- msgid "Print %s"
- msgstr "%s の印刷"
- 
--#: libgthumb/print-callbacks.c:922
-+#: libgthumb/print-callbacks.c:924
- msgid "Print Image"
- msgstr "画像の印刷"
- 
- #: libgthumb/thumb-cache.c:409
+ #: libgthumb/thumb-cache.c:487
  msgid "Deleting all thumbnails, wait please..."
 -msgstr ""
 -"全てのサムネイルを削除しています。少々お待ち下さい.."
 -"."
 +msgstr "全てのサムネイルを削除しています。少々お待ち下さい..."
  
- #: libgthumb/thumb-cache.c:411
+ #: libgthumb/thumb-cache.c:489
  msgid "Deleting old thumbnails, wait please..."
 -msgstr ""
 -"古いサムネイルを削除しています。少々お待ち下さい..."
@@ -204,18 +256,7 @@
  
  #: src/catalog-png-exporter.c:1327
  #, c-format
-@@ -401,9 +399,8 @@
- msgstr "HTML ページの保存: 目録"
- 
- #: src/catalog-web-exporter.c:1673
--#, fuzzy
- msgid "Saving images"
--msgstr "画像の読み込み中"
-+msgstr "画像の保存中"
- 
- #: src/catalog-web-exporter.c:1987
- msgid "Could not create a temporary folder"
-@@ -430,9 +427,8 @@
+@@ -528,9 +520,8 @@
  "The name \"%s\" is not valid because it contains the character \"/\". Please "
  "use a different name."
  msgstr ""
@@ -225,49 +266,47 @@
 +"名前 \"%s\" には \"/\" 文字が含まれているため使用できません。別の名前を入力し"
 +"て下さい。"
  
- #: src/commands-impl.c:319 src/dlg-convert.c:313
+ #: src/commands-impl.c:320 src/dlg-convert.c:314
  msgid "_Overwrite"
-@@ -450,23 +446,19 @@
- #: src/commands-impl.c:445
+@@ -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:453
--#, fuzzy
- msgid "Stop"
--msgstr "停止(_S)"
-+msgstr "停止"
- 
  #: src/commands-impl.c:454
--#, fuzzy
- msgid "Continue"
--msgstr "続行(_C)"
-+msgstr "続行"
+ msgid "Stop"
+@@ -561,22 +551,19 @@
  
- #: src/commands-impl.c:530
+ #: src/commands-impl.c:531
  msgid "The selected images will be moved to the Trash, are you sure?"
 -msgstr ""
 -"選択した画像をゴミ箱に移動します。宜しいですか？"
-+msgstr "選択した画像をゴミ箱に移動します。宜しいですか？"
++msgstr "選択した画像をゴミ箱に移動します。よろしいですか？"
  
- #: src/commands-impl.c:550
+ #: src/commands-impl.c:551
  msgid "The image will be moved to the Trash, are you sure?"
-@@ -478,9 +470,7 @@
+-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:827
+ #: src/commands-impl.c:828
  msgid "The selected images will be removed from the catalog, are you sure?"
 -msgstr ""
 -"選択した画像をカタログから削除します。宜しいですか�"
 -"�"
-+msgstr "選択した画像をカタログから削除します。宜しいですか？"
++msgstr "選択した画像をカタログから削除します。よろしいですか？"
  
- #: 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
-@@ -491,9 +481,7 @@
- #: src/commands-impl.c:1706
+ #: 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 ""
@@ -275,9 +314,9 @@
 -"は既に使用されています。別の名前を入力して下さい。"
 +msgstr "名前 \"%s\" は既に使用されています。別の名前を入力して下さい。"
  
- #: src/commands-impl.c:960
+ #: src/commands-impl.c:961
  msgid "New Folder"
-@@ -535,16 +523,11 @@
+@@ -631,20 +616,15 @@
  #, c-format
  msgid ""
  "\"%s\" cannot be moved to the Trash. Do you want to delete it permanently?"
@@ -287,39 +326,57 @@
 -"�しますか？"
 +msgstr "\"%s\" をゴミ箱に移動することはできません。これを完全に削除しますか？"
  
- #: src/commands-impl.c:1217
+ #: 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 "選択したフォルダをゴミ箱に移動します。宜しいですか？"
++msgstr "選択したフォルダをゴミ箱に移動します。よろしいですか？"
  
- #: src/commands-impl.c:1219 src/dlg-file-utils.c:274
+ #: src/commands-impl.c:1226 src/dlg-file-utils.c:280
  msgid "_Move"
-@@ -594,8 +577,7 @@
- #: src/commands-impl.c:1717
+@@ -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:1781
+ #: src/commands-impl.c:1788
  msgid "The selected library will be removed, are you sure?"
-@@ -616,9 +598,9 @@
- msgid "translator_credits"
- msgstr "Takeshi AIHANA <aihana@gnome.gr.jp>"
- 
--#: src/commands-impl.c:2812 src/gthumb-window.c:812 src/gthumb-window.c:4859
-+#: 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:122
-+#: src/main.c:124
- msgid "gThumb"
- msgstr "gThumb"
- 
-@@ -637,9 +619,7 @@
- #: src/dlg-categories.c:197
+-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 ""
@@ -327,9 +384,9 @@
 -"は既に存在します。別の名前を入力して下さい。"
 +msgstr "カテゴリ \"%s\" は既に存在します。別の名前を入力して下さい。"
  
- #: src/dlg-convert.c:158
+ #: src/dlg-convert.c:159
  #, c-format
-@@ -650,9 +630,7 @@
+@@ -759,9 +735,7 @@
  #, c-format
  msgid ""
  "An image named \"%s\" is already present. Please specify a different name."
@@ -338,15 +395,15 @@
 -"は既に存在しています。別の名前を入力して下さい。"
 +msgstr "画像 \"%s\" は既に存在しています。別の名前を入力して下さい。"
  
- #: src/dlg-convert.c:312 src/gthumb_convert.glade.h:17
+ #: src/dlg-convert.c:313 src/gthumb_convert.glade.h:17
  msgid "Skip"
-@@ -680,14 +658,11 @@
+@@ -785,14 +759,11 @@
  
  #: src/dlg-duplicates.c:755
  msgid "Checked images will be moved to the Trash, are you sure?"
 -msgstr ""
 -"選択した画像をゴミ箱に移動します。宜しいですか？"
-+msgstr "選択した画像をゴミ箱に移動します。宜しいですか？"
++msgstr "選択した画像をゴミ箱に移動します。よろしいですか？"
  
  #: src/dlg-file-utils.c:87
  msgid "The destination folder does not exist. Do you want to create it?"
@@ -357,7 +414,7 @@
  
  #: src/dlg-file-utils.c:103
  #, c-format
-@@ -698,9 +673,7 @@
+@@ -803,9 +774,7 @@
  #, c-format
  msgid ""
  "You don't have the right permissions to create images in the folder \"%s\""
@@ -368,7 +425,7 @@
  
  #: src/dlg-file-utils.c:200
  msgid "Could not delete the images:"
-@@ -710,9 +683,7 @@
+@@ -815,9 +784,7 @@
  msgid ""
  "The images cannot be moved to the Trash. Do you want to delete them "
  "permanently?"
@@ -377,9 +434,9 @@
 -"�消去しますか？"
 +msgstr "画像をゴミ箱に移動することができません。画像を完全に消去しますか？"
  
- #: src/dlg-file-utils.c:751 src/dlg-file-utils.c:852
+ #: src/dlg-file-utils.c:757 src/dlg-file-utils.c:858
  msgid "You didn't enter the new name"
-@@ -723,9 +694,7 @@
+@@ -828,9 +795,7 @@
  msgid ""
  "The name \"%s\" is already used in this folder. Please use a different name."
  msgstr ""
@@ -388,40 +445,34 @@
 -"�て下さい。"
 +"名前 \"%s\" は既にこのフォルダで使用しています。別の名前を入力して下さい。"
  
- #: src/dlg-file-utils.c:1003
+ #: src/dlg-file-utils.c:1009
  msgid "Could not rename the image:"
-@@ -795,11 +764,11 @@
- msgid "Information on Channel"
- msgstr "チャンネルの情報"
- 
--#: src/dlg-image-prop.c:900 src/gthumb-window.c:5308
-+#: src/dlg-image-prop.c:900 src/gthumb-window.c:5326
- msgid "Field"
+@@ -901,9 +866,8 @@
  msgstr "フィールド"
  
--#: src/dlg-image-prop.c:910 src/gthumb-window.c:5318 src/gthumb.glade.h:25
-+#: src/dlg-image-prop.c:910 src/gthumb-window.c:5336 src/gthumb.glade.h:25
- msgid "Value"
- msgstr "数値"
- 
-@@ -864,7 +833,7 @@
- msgid "Image Info"
- msgstr "画像の情報"
+ #: src/dlg-image-prop.c:910 src/gthumb-window.c:5355
+-#, fuzzy
+ msgid "Value "
+-msgstr "数値"
++msgstr "数値 "
  
--#: src/fullscreen.c:818 src/gthumb-window.c:4252
-+#: src/fullscreen.c:818 src/gthumb-window.c:4270
- msgid "Back"
- msgstr "戻る"
+ #: src/dlg-image-prop.c:991
+ #, c-format
+@@ -912,11 +876,11 @@
  
-@@ -921,7 +890,6 @@
- msgstr "色合いと彩度を調整します"
+ #: src/dlg-maintenance.c:71
+ msgid "All comments will be removed, are you sure?"
+-msgstr "全てのコメントを削除します。宜しいですか？"
++msgstr "全てのコメントを削除します。よろしいですか？"
  
- #: src/gthumb-ui.xml.h:10
--#, fuzzy
- msgid "Apply threshold"
- msgstr "しきい値を適用します"
+ #: src/dlg-maintenance.c:102
+ msgid "All thumbnails will be deleted, are you sure?"
+-msgstr "全てのサムネイルを削除します。宜しいですか？"
++msgstr "全てのサムネイルを削除します。よろしいですか？"
  
-@@ -1192,8 +1160,7 @@
+ #: 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"
@@ -431,7 +482,7 @@
  
  #: src/gthumb-ui.xml.h:80
  msgid "Open selected images with an application"
-@@ -1203,9 +1170,7 @@
+@@ -1304,9 +1267,7 @@
  msgid ""
  "Open the selected folder with the Nautilus file\n"
  "\t     manager"
@@ -442,7 +493,7 @@
  
  #: src/gthumb-ui.xml.h:83
  msgid "Open this image with an application"
-@@ -1385,20 +1350,15 @@
+@@ -1486,20 +1447,15 @@
  
  #: src/gthumb-ui.xml.h:132
  msgid "Set the image as desktop background (scaled keeping aspect ratio)"
@@ -466,7 +517,7 @@
  
  #: src/gthumb-ui.xml.h:135
  msgid "Show information about gThumb"
-@@ -1506,8 +1466,7 @@
+@@ -1607,8 +1563,7 @@
  
  #: src/gthumb-ui.xml.h:163
  msgid "View or hide the statusbar of this window"
@@ -476,117 +527,135 @@
  
  #: src/gthumb-ui.xml.h:164
  msgid "View or hide the toolbar of this window"
-@@ -1913,36 +1872,36 @@
- msgid "%d selected (%s)"
- msgstr "%d つ選択 (%s)"
- 
--#: src/gthumb-window.c:3360
-+#: src/gthumb-window.c:3378
- msgid "Dragged Images"
- msgstr "画像のドラッグ"
- 
--#: src/gthumb-window.c:3556
-+#: src/gthumb-window.c:3574
- msgid "Could not move the items:"
- msgstr "アイテムを移動することができませんでした:"
- 
--#: src/gthumb-window.c:5189
-+#: src/gthumb-window.c:5207
- msgid "Image comment"
- msgstr "画像のコメント"
- 
--#: src/gthumb-window.c:5203
-+#: src/gthumb-window.c:5221
- msgid "Image data"
- msgstr "画像のデータ"
- 
--#: src/gthumb-window.c:5217
-+#: src/gthumb-window.c:5235
- msgid "Image preview"
- msgstr "画像のプレビュー"
- 
--#: src/gthumb-window.c:6449
-+#: src/gthumb-window.c:6467
- #, c-format
- msgid "Cannot load folder \"%s\": %s\n"
- msgstr "フォルダ \"%s\" が読めませんでした: %s\n"
+@@ -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-window.c:6718
-+#: src/gthumb-window.c:6736
- msgid "The specified catalog does not exist."
- msgstr "指定したカタログは存在しません。"
+ #: src/gthumb.schemas.in.h:2
+ msgid "Possible values are: 1, 2, 3, 4."
+-msgstr ""
++msgstr "設定可能な値: 1, 2, 3, 4"
  
--#: src/gthumb-window.c:8064
-+#: src/gthumb-window.c:8082
- msgid "Wait please..."
- msgstr "しばらくお待ち下さい..."
+ #: 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"
  
-@@ -2102,30 +2061,26 @@
- msgstr "新しいカテゴリを生成します"
+ #: src/gthumb.schemas.in.h:4
+ msgid "Possible values are: ascending, descending."
+-msgstr ""
++msgstr "設定可能な値: ascending, descending"
  
- #: src/gthumb_comments.glade.h:10
--#, fuzzy
- msgid "Current date"
--msgstr "今日(_U)"
-+msgstr "今日"
+ #: src/gthumb.schemas.in.h:5
+ msgid "Possible values are: forward, backward."
+-msgstr ""
++msgstr "設定可能な値: forward, backward"
  
- #: src/gthumb_comments.glade.h:11 src/gthumb_tools.glade.h:25
- msgid "Image c_reation date"
- msgstr "画像の生成日(_R)"
+ #: src/gthumb.schemas.in.h:6
+ msgid "Possible values are: high, low."
+-msgstr ""
++msgstr "設定可能な値: high, low"
  
- #: src/gthumb_comments.glade.h:12
--#, fuzzy
- msgid "Image creation date"
--msgstr "画像の生成日(_R)"
-+msgstr "画像の生成日"
+ #: src/gthumb.schemas.in.h:7
+ msgid "Possible values are: image, data, comment."
+-msgstr ""
++msgstr "設定可能な値: image, data, comment"
  
- #: src/gthumb_comments.glade.h:13
--#, fuzzy
- msgid "No date"
--msgstr "画像ではありません"
-+msgstr "日付がありません"
+ #: src/gthumb.schemas.in.h:8
+ msgid "Possible values are: jpeg, png, tga, tiff."
+-msgstr ""
++msgstr "設定可能な値: jpeg, png, tga, tiff"
  
- #: src/gthumb_comments.glade.h:14 src/gthumb_tools.glade.h:32
- msgid "P_hoto digitalization date (From EXIF data)"
- msgstr "デジタル写真の日付 (EXIFのデータ)"
+ #: src/gthumb.schemas.in.h:9
+ msgid "Possible values are: light, midtone, dark."
+-msgstr ""
++msgstr "設定可能な値: light, midtone, dark"
  
- #: src/gthumb_comments.glade.h:15
--#, fuzzy
- msgid "Photo digitalization date (From EXIF data)"
- msgstr "デジタル写真の日付 (EXIFのデータ)"
+ #: src/gthumb.schemas.in.h:10
+ msgid "Possible values are: list, thumbnails."
+-msgstr ""
++msgstr "設定可能な値: list, thumbnails"
  
-@@ -2142,9 +2097,8 @@
- msgstr "次の日付(_F):"
+ #: src/gthumb.schemas.in.h:11
+ msgid "Possible values are: mm, in."
+-msgstr ""
++msgstr "設定可能な値: mm, in"
  
- #: src/gthumb_comments.glade.h:19
--#, fuzzy
- msgid "The following date"
--msgstr "次の日付(_F):"
-+msgstr "次の日付"
+ #: src/gthumb.schemas.in.h:12
+ msgid "Possible values are: name, path, size, time."
+-msgstr ""
++msgstr "設定可能な値: name, path, size, time"
  
- #: src/gthumb_comments.glade.h:20 src/gthumb_search.glade.h:24
- msgid "_Date:"
-@@ -2159,9 +2113,8 @@
- msgstr "新規(_N)"
+ #: src/gthumb.schemas.in.h:13
+ msgid "Possible values are: name, size, time."
+-msgstr ""
++msgstr "設定可能な値: name, size, time"
  
- #: src/gthumb_comments.glade.h:23
--#, fuzzy
- msgid "_No date"
--msgstr "回転(_R)"
-+msgstr "日付なし(_N)"
+ #: 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_comments.glade.h:24 src/gthumb_search.glade.h:27
- msgid "_Place:"
-@@ -2496,7 +2449,7 @@
+ #: src/gthumb.schemas.in.h:23
+ msgid "Possible values are: white, black, checked, none."
+-msgstr ""
++msgstr "設定可能な値: white, black, checked, none"
  
- #: src/gthumb_png_exporter.glade.h:24 src/gthumb_web_exporter.glade.h:18
- msgid "Co_mment"
--msgstr "コメントを付ける(_M)"
-+msgstr "コメント(_M)"
+ #: src/gthumb.schemas.in.h:24
+ msgid "Whether to always use a black background."
+-msgstr ""
++msgstr "常に背景を黒色にするかどうかを設定します。"
  
- #: src/gthumb_png_exporter.glade.h:25 src/gthumb_web_exporter.glade.h:19
- msgid "Col_umns:"
-@@ -2625,8 +2578,7 @@
+ #: 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."
@@ -596,7 +665,7 @@
  
  #: src/gthumb_png_exporter.glade.h:58
  #, no-c-format
-@@ -2634,8 +2586,8 @@
+@@ -2830,8 +2788,8 @@
  "Use %p  to insert the page number, and %n to insert the total number of "
  "pages."
  msgstr ""
@@ -607,7 +676,7 @@
  
  #: src/gthumb_png_exporter.glade.h:59
  msgid "Wi_dth:"
-@@ -2823,9 +2775,7 @@
+@@ -3019,9 +2977,7 @@
  
  #: src/gthumb_preferences.glade.h:35
  msgid "Fit to window if larger"
@@ -618,7 +687,7 @@
  
  #: src/gthumb_preferences.glade.h:36
  msgid "Follow Nautilus behaviour"
-@@ -2841,8 +2791,7 @@
+@@ -3037,8 +2993,7 @@
  
  #: src/gthumb_preferences.glade.h:39
  msgid "Go to last _visited folder or catalog"
@@ -628,87 +697,7 @@
  
  #: src/gthumb_preferences.glade.h:40
  msgid "Go to this _folder:"
-@@ -2949,9 +2898,8 @@
- msgstr "秒"
- 
- #: src/gthumb_print.glade.h:4
--#, fuzzy
- msgid "<b>Image</b>"
--msgstr "<b>画像の種類</b>"
-+msgstr "<b>画像</b>"
- 
- #: src/gthumb_print.glade.h:5
- msgid "<b>Orientation</b>"
-@@ -2966,26 +2914,25 @@
- "<i>Drag the image to move\n"
- "it in the page.</i>"
- msgstr ""
--"<i>画像の位置を\n"
--"変更する場合は\n"
-+"<i>印刷位置を\n"
-+"調整する場合は画像を\n"
- "ドラッグして下さい。</i>"
- 
- #: src/gthumb_print.glade.h:9
- msgid "A_4"
--msgstr ""
-+msgstr "A4 版(_4)"
- 
- #: src/gthumb_print.glade.h:10
- msgid "C_ustom:"
--msgstr ""
-+msgstr "カスタマイズ(_U):"
- 
- #: src/gthumb_print.glade.h:11
- msgid "Center _on Page"
- msgstr "ページの中心に配置する(_O)"
- 
- #: src/gthumb_print.glade.h:12
--#, fuzzy
- msgid "Comment _font:"
--msgstr "コメント(_M):"
-+msgstr "コメントのフォント(_F):"
- 
- #: src/gthumb_print.glade.h:13
- msgid "I_nclude comment"
-@@ -2993,7 +2940,7 @@
- 
- #: src/gthumb_print.glade.h:14
- msgid "Inches"
--msgstr ""
-+msgstr "インチ"
- 
- #: src/gthumb_print.glade.h:15
- msgid "Lan_dscape"
-@@ -3005,7 +2952,7 @@
- 
- #: src/gthumb_print.glade.h:17
- msgid "Millimeters"
--msgstr ""
-+msgstr "ミリ"
- 
- #: src/gthumb_print.glade.h:18
- msgid "P_ortrait"
-@@ -3017,15 +2964,15 @@
- 
- #: src/gthumb_print.glade.h:21
- msgid "US E_xecutive"
--msgstr ""
-+msgstr "US エグゼクティブ(_X)"
- 
- #: src/gthumb_print.glade.h:22
- msgid "US L_egal"
--msgstr ""
-+msgstr "US リーガル(_E)"
- 
- #: src/gthumb_print.glade.h:23
- msgid "US _Letter"
--msgstr ""
-+msgstr "US レター(_L)"
- 
- #: src/gthumb_print.glade.h:25
- msgid "_Scale:"
-@@ -3121,9 +3068,7 @@
+@@ -3315,9 +3270,7 @@
  
  #: src/gthumb_tools.glade.h:6
  msgid "<b>Specify a template to use for renaming images</b>"
@@ -719,7 +708,7 @@
  
  #: src/gthumb_tools.glade.h:7
  msgid "<b>Thumbnails</b>"
-@@ -3239,9 +3184,7 @@
+@@ -3433,9 +3386,7 @@
  
  #: src/gthumb_tools.glade.h:39
  msgid "Search terminated, no duplicates found."
@@ -730,7 +719,7 @@
  
  #: src/gthumb_tools.glade.h:43
  msgid ""
-@@ -3249,11 +3192,9 @@
+@@ -3443,11 +3394,9 @@
  "original filename. Use ? to insert the image date. Use ! to insert the image "
  "size"
  msgstr ""
@@ -745,246 +734,35 @@
  
  #: src/gthumb_tools.glade.h:46
  msgid "_Sort original list:"
-@@ -3272,29 +3213,24 @@
- msgstr "サイズ順"
- 
- #: src/gthumb_web_exporter.glade.h:5
--#, fuzzy
- msgid "1024 x 768"
--msgstr "128 x 128"
-+msgstr "1024 x 768"
- 
- #: src/gthumb_web_exporter.glade.h:6
--#, fuzzy
- msgid "1280 x 960"
--msgstr "128 x 128"
-+msgstr "1280 x 960"
- 
- #: src/gthumb_web_exporter.glade.h:7
--#, fuzzy
- msgid "320 x 200"
--msgstr "200 x 200"
-+msgstr "320 x 200"
- 
- #: src/gthumb_web_exporter.glade.h:8
--#, fuzzy
- msgid "640 x 480"
--msgstr "48 x 48"
-+msgstr "640 x 480"
- 
- #: src/gthumb_web_exporter.glade.h:9
--#, fuzzy
- msgid "800 x 600"
--msgstr "200 x 200"
-+msgstr "800 x 600"
- 
- #: src/gthumb_web_exporter.glade.h:10
- msgid "<b>Album</b>"
-@@ -3305,14 +3241,12 @@
- msgstr "<b>目録のレイアウト</b>"
- 
- #: src/gthumb_web_exporter.glade.h:12
--#, fuzzy
- msgid "<b>Personalize theme</b>"
--msgstr "<b>ページのサイズ</b>"
-+msgstr "<b>個人専用のテーマ</b>"
- 
- #: src/gthumb_web_exporter.glade.h:13
--#, fuzzy
- msgid "<b>Photo data</b>"
--msgstr "<b>フッタ</b>"
-+msgstr "<b>写真のデータ</b>"
- 
- #: src/gthumb_web_exporter.glade.h:14
- msgid "<b>Saving</b>"
-@@ -3324,43 +3258,39 @@
- 
- #: src/gthumb_web_exporter.glade.h:16
- msgid "Came_ra Model"
--msgstr ""
-+msgstr "カメラの型式(_R)"
- 
- #: src/gthumb_web_exporter.glade.h:17
--#, fuzzy
- msgid "Caption"
--msgstr "画像の説明"
-+msgstr "表題"
- 
- #: src/gthumb_web_exporter.glade.h:20
- msgid "E_xposure mode"
--msgstr ""
-+msgstr "露出モード(_X)"
- 
- #: src/gthumb_web_exporter.glade.h:21
- msgid "Exposure _time"
--msgstr ""
-+msgstr "露出時間(_T)"
- 
- #: src/gthumb_web_exporter.glade.h:24
- msgid "Focal _length"
--msgstr ""
-+msgstr "フォーカスの長さ(_L)"
- 
- #: src/gthumb_web_exporter.glade.h:25
--#, fuzzy
- msgid "I_mage Caption..."
--msgstr "画像の説明"
-+msgstr "画像の表題(_M)..."
- 
- #: src/gthumb_web_exporter.glade.h:27
- msgid "Inde_x file:"
- msgstr "目録ファイル(_X):"
- 
- #: src/gthumb_web_exporter.glade.h:29
--#, fuzzy
- msgid "Resi_ze images if larger than:"
--msgstr "画像の順番を逆順にします"
-+msgstr "次よりも大きい場合に画像サイズを変更する(_Z):"
- 
- #: src/gthumb_web_exporter.glade.h:30
--#, fuzzy
- msgid "Sor_t:"
--msgstr "並び替え"
-+msgstr "並び替え(_T):"
- 
- #: src/gthumb_web_exporter.glade.h:31
- msgid "Th_eme:"
-@@ -3376,7 +3306,7 @@
- 
- #: src/gthumb_web_exporter.glade.h:34
- msgid "_Aperture value"
--msgstr ""
-+msgstr "アパーチャの値(_A)"
- 
+@@ -3552,7 +3501,7 @@
  #: src/gthumb_web_exporter.glade.h:35
- msgid "_Copy images to destination"
-@@ -3384,16 +3314,15 @@
- 
- #: src/gthumb_web_exporter.glade.h:36
- msgid "_Date and Time"
--msgstr ""
-+msgstr "日付と時刻(_D)"
- 
- #: src/gthumb_web_exporter.glade.h:37
- msgid "_Destination:"
- msgstr "格納場所(_D):"
- 
- #: src/gthumb_web_exporter.glade.h:38
--#, fuzzy
- msgid "_Flash"
--msgstr "ファイル名(_F)"
-+msgstr "フラッシュ(_F)"
- 
- #: src/gthumb_web_exporter.glade.h:39
- msgid "_Go to Theme Folder"
-@@ -3405,12 +3334,11 @@
- 
- #: src/gthumb_web_exporter.glade.h:42
- msgid "_Shutter speed"
+ #, no-c-format
+ msgid "Use %d  to insert current date"
 -msgstr ""
-+msgstr "シャッター速度(_S)"
++msgstr "現在の日付を挿入するのに %d を使う"
  
- #: src/gthumb_web_exporter.glade.h:43
--#, fuzzy
- msgid "_Thumbnail Caption..."
--msgstr "サムネイル(_T)"
-+msgstr "サムネイルの表題(_T)..."
- 
- #: src/gthumb_web_exporter.glade.h:44
- msgid "_Title:"
-@@ -3424,80 +3352,62 @@
- msgid "index.html"
- msgstr "index.html"
- 
--#: src/main.c:78
-+#: src/main.c:80
- msgid "Start in fullscreen mode"
- msgstr "全画面モードで起動します"
- 
--#: src/main.c:82
-+#: src/main.c:84
- msgid "Automatically start a slideshow"
- msgstr "自動的にスライドショーを起動する"
- 
--#: src/main.c:161
-+#: src/main.c:163
- msgid "Holidays"
- msgstr "祭日"
- 
--#: src/main.c:162
-+#: src/main.c:164
- msgid "Temporary"
- msgstr "作業用"
- 
--#: src/main.c:163
-+#: src/main.c:165
- msgid "Screenshots"
- msgstr "スクリーンショット"
- 
--#: src/main.c:164
-+#: src/main.c:166
- msgid "Science"
- msgstr "科学"
- 
--#: src/main.c:165
-+#: src/main.c:167
- msgid "Favourite"
- msgstr "お気に入り"
- 
--#: src/main.c:166
-+#: src/main.c:168
- msgid "Important"
- msgstr "重要"
- 
--#: src/main.c:167
-+#: src/main.c:169
- msgid "GNOME"
- msgstr "GNOME"
- 
--#: src/main.c:168
-+#: src/main.c:170
- msgid "Games"
- msgstr "ゲーム"
- 
--#: src/main.c:169
-+#: src/main.c:171
- msgid "Party"
- msgstr "パーティ"
- 
--#: src/main.c:170
-+#: src/main.c:172
- msgid "Birthday"
- msgstr "誕生日"
- 
--#: src/main.c:171
-+#: src/main.c:173
- msgid "Astronomy"
- msgstr "天文学"
- 
--#: src/main.c:172
-+#: src/main.c:174
- msgid "Family"
- msgstr "家族"
- 
--#: src/main.c:308 src/main.c:374
-+#: src/main.c:311 src/main.c:393
+ #: 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 "A_3 (297 x 420 mm)"
--#~ msgstr "A3 版 [297 x 420 mm](_3)"
--
--#~ msgid "A_4 (210 x 297 mm)"
--#~ msgstr "A4 版 [210 x 297 mm](_4)"
+-#~ msgid ""
+-#~ "GConf error:\n"
+-#~ "  %s"
+-#~ msgstr ""
+-#~ "GConf エラー:\n"
+-#~ "  %s"
 -
--#~ msgid "A_5 (148 x 210 mm)"
--#~ msgstr "A5 版 [148 x 210 mm](_5)"
+-#~ msgid "Sans Regular 12"
+-#~ msgstr "Sans Regular 12"
 -
--#~ msgid "E_xecutive (190 x 254 mm)"
--#~ msgstr "エグゼクティブ (190 x 254 mm)(_X)"
+-#~ msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+-#~ msgstr "いろはにほへと 零壱弐三四伍 AaBbCcDdEe"
 -
--#~ msgid "L_egal (216 x 356 mm)"
--#~ msgstr "リーガル (216 x 356 mm)(_E)"
+-#~ msgid "Pick a Font"
+-#~ msgstr "フォントの取得"
 -
--#~ msgid "_Letter (216 x 279 mm)"
--#~ msgstr "レター (216 x 279 mm)(_L)"
+-#~ msgid "_Title:"
+-#~ msgstr "タイトル(_T):"
diff --git a/graphics/gthumb2/files/patch-po_pl.po b/graphics/gthumb2/files/patch-po_pl.po
new file mode 100644
index 000000000000..46706ace5540
--- /dev/null
+++ b/graphics/gthumb2/files/patch-po_pl.po
@@ -0,0 +1,1193 @@
+--- 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
index ca4b00bb7221..87837ae124e1 100644
--- a/graphics/gthumb2/files/patch-po_ru.po
+++ b/graphics/gthumb2/files/patch-po_ru.po
@@ -1,22 +1,14 @@
---- po/ru.po.orig	Fri Jul 25 00:22:28 2003
-+++ po/ru.po	Fri Jul 25 00:22:50 2003
-@@ -1,13 +1,13 @@
--# translation of gthumb-2.0.1-ru.po to russian
-+# translation of gthumb-2.1.3-ru.po to Russian
- # Copyright (C) YEOCAR Free Software Foundation, Inc.
-+# Диконов Вячеслав (Vyacheslav Dikonov) <sdiconov@mail.ru>, 2003
- # Sergey Volozhanin <svo@asplinux.ru>, 2002
--# Диконов Вячеслав (Vyacheslav Dikonov) <sdiconov@mail.ru>, 2002
- # Yuri N. Sedunov <aris@altlinux.ru>, 2003
+--- 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-07-06 20:06+0200\n"
--"PO-Revision-Date: 2003-06-29 05:05+0400\n"
-+"PO-Revision-Date: 2003-07-09 05:05+0400\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"
- "MIME-Version: 1.0\n"
 @@ -103,9 +103,7 @@
  #: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:14
  #: src/gthumb-ui.xml.h:143
@@ -28,411 +20,1115 @@
  
  #: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:15
  msgid "Start/Stop _Animation"
-@@ -276,11 +274,11 @@
- 
- #: libgthumb/gnome-print-font-dialog.c:114
- msgid "_Insert a new preview phrase."
--msgstr ""
-+msgstr "_Введите новый текст"
- 
- #: libgthumb/gnome-print-font-dialog.c:119
- msgid "Modify preview phrase..."
--msgstr ""
-+msgstr "Изменить тестовую строку"
- 
- #: libgthumb/gnome-print-font-dialog.c:173
- msgid "Preview"
-@@ -288,7 +286,7 @@
- 
- #: libgthumb/gnome-print-font-dialog.c:186
- msgid "_Modify preview phrase..."
--msgstr ""
-+msgstr "_Изменить тестовую строку"
- 
- #: libgthumb/gnome-print-font-dialog.c:244
- msgid "Font Selection"
-@@ -300,7 +298,7 @@
- 
- #: libgthumb/gnome-print-font-picker.c:180
- msgid "The title of the selection dialog box"
+@@ -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 ""
-+msgstr "Заголовок окна выбора шрифта"
- 
- #: libgthumb/gnome-print-font-picker.c:200
- msgid "Font name"
-@@ -312,39 +310,39 @@
- 
- #: libgthumb/gnome-print-font-picker.c:209
- msgid "Preview text"
--msgstr "Предварительный просмотр текста"
-+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/gnome-print-font-picker.c:210
- msgid "Preview text shown in the dialog"
--msgstr ""
-+msgstr "Тестовая строка в окне выбора шрифта"
+-#: libgthumb/comments.c:410
++#: libgthumb/comments.c:401
+ msgid "Deleting all comments, wait please..."
+ msgstr ""
+ "Удаляются комментарии, подождите "
+ "пожалуйста..."
  
- #: libgthumb/gnome-print-font-picker.c:218
- msgid "Use font in label"
--msgstr "Использовать шрифт на метках"
-+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"
--msgstr "Размер шрифта для меток"
-+msgstr "Размер шрифта надписи"
+@@ -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"
--msgstr "Показать размер"
-+msgstr "Показывать размер"
+@@ -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"
--msgstr "_Шрифт"
-+msgstr "Шрифт"
+@@ -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/gth-file-view-list.c:1376 src/gthumb-ui.xml.h:25
- #: src/gthumb_comments.glade.h:8
-@@ -428,8 +426,8 @@
+-#: 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\" не является допустимым, так "
--"как содержит символ \"/\". Введите, "
-+"Имя файла \"%s\" недопустимо, поскольку "
+ "Имя файла \"%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:319 src/dlg-convert.c:313
-@@ -457,11 +455,11 @@
+-#: 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:453
+-#: src/commands-impl.c:454
++#: src/commands-impl.c:453
  msgid "Stop"
--msgstr "_Остановить"
-+msgstr "Остановить"
+ msgstr "Остановить"
  
- #: src/commands-impl.c:454
+-#: src/commands-impl.c:455
++#: src/commands-impl.c:454
  msgid "Continue"
--msgstr "Про_должить"
-+msgstr "Продолжить"
+ msgstr "Продолжить"
  
- #: src/commands-impl.c:530
+-#: src/commands-impl.c:531
++#: src/commands-impl.c:530
  msgid "The selected images will be moved to the Trash, are you sure?"
-@@ -519,7 +517,7 @@
+ msgstr ""
+ "Выбранные изображения будут отправлены в "
+ "корзину. Продолжить?"
  
- #: src/commands-impl.c:974 src/dlg-catalog.c:120
- msgid "Enter the library name: "
--msgstr "Введите имя коллекции:"
-+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:975
+-#: 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
-@@ -630,8 +628,8 @@
- #: src/commands-impl.c:2803
- msgid "translator_credits"
+ msgid "The name \"%s\" is already used. Please use a different name."
  msgstr ""
--"Сергей Воложанин <svo@asplinux.ru>\n"
--"Диконов Вячеслав <slava@altlinux.ru>"
-+"Диконов Вячеслав <slava@altlinux.ru>\n"
-+"Сергей Воложанин <svo@asplinux.ru>"
+ "Имя \"%s\" уже используется в данном "
+ "каталоге. Введите, пожалуйста, другое имя."
  
- #: 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
-@@ -811,7 +809,7 @@
+-#: src/commands-impl.c:961
++#: src/commands-impl.c:960
+ msgid "New Folder"
+ msgstr "Новый каталог"
  
- #: src/dlg-image-prop.c:861 src/gthumb-window.c:450
- msgid "Modified"
--msgstr ""
-+msgstr "Дата изменения"
+-#: src/commands-impl.c:962
++#: src/commands-impl.c:961
+ msgid "Enter the folder name: "
+ msgstr "Введите имя каталога: "
  
- #: src/dlg-image-prop.c:866
- msgid "Information on Channel"
-@@ -823,7 +821,7 @@
+-#: src/commands-impl.c:963
++#: src/commands-impl.c:962
+ #, c-format
+ msgid "Could not create the folder \"%s\": %s"
+ msgstr "Невозможно создать каталог \"%s\" : %s"
  
- #: src/dlg-image-prop.c:910 src/gthumb-window.c:5318 src/gthumb.glade.h:25
- msgid "Value"
--msgstr "яркость"
-+msgstr "Значение"
+-#: src/commands-impl.c:974
++#: src/commands-impl.c:973
+ msgid "New Library"
+ msgstr "Новая коллекция"
  
- #: src/dlg-image-prop.c:991
+-#: 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
-@@ -879,7 +877,7 @@
+ msgid "Could not create the library \"%s\": %s"
+ msgstr "Невозможно создать коллекцию \"%s\" : %s"
  
- #: src/dlg-web-exporter.c:649
- msgid "Select Album Theme"
--msgstr "Выбрать тему альбома"
-+msgstr "Выбрать стиль оформления альбома"
+-#: 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/fullscreen.c:782 src/gthumb-ui.xml.h:113
- msgid "Restore Normal View"
-@@ -950,9 +948,8 @@
- "цвета"
+-#: src/commands-impl.c:1152
++#: src/commands-impl.c:1151
+ #, c-format
+ msgid "Could not delete the folder \"%s\": %s"
+ msgstr "Невозможно удалить каталог \"%s\" : %s"
  
- #: src/gthumb-ui.xml.h:10
--#, fuzzy
- msgid "Apply threshold"
--msgstr "Порог"
-+msgstr "Применить порог"
+-#: 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/gthumb-ui.xml.h:11
- msgid "Assign categories to selected images"
-@@ -1053,7 +1050,7 @@
+-#: 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/gthumb-ui.xml.h:34
- msgid "Create _Web Album"
--msgstr "Создать альбом для Веб"
-+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/gthumb-ui.xml.h:35
- msgid "Create a new catalog"
-@@ -1113,7 +1110,7 @@
+-#: 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/gthumb-ui.xml.h:49
- msgid "Find images"
--msgstr "_Поиск изображений"
-+msgstr "Поиск изображений"
+-#: 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/gthumb-ui.xml.h:50
- msgid "Fit"
-@@ -1163,7 +1160,7 @@
+-#: src/commands-impl.c:1368
++#: src/commands-impl.c:1361
+ msgid "source contains destination"
+ msgstr ""
+ "адрес источника содержит адрес "
+ "назначения"
  
- #: src/gthumb-ui.xml.h:61
- msgid "Image _Comment"
--msgstr "Комментарий к изображению"
-+msgstr "Ко_мментарий к изображению"
+-#: src/commands-impl.c:1379
++#: src/commands-impl.c:1372
+ msgid "a folder with that name is already present."
+ msgstr "каталог с таким именем уже существует."
  
- #: src/gthumb-ui.xml.h:62
- msgid "In"
-@@ -1477,7 +1474,7 @@
+-#: 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/gthumb-ui.xml.h:136
- msgid "Show/_Hide"
--msgstr "Показать/Скрыть"
-+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/gthumb-ui.xml.h:137 src/gthumb_preferences.glade.h:51
- msgid "Slide Show"
-@@ -1703,7 +1700,7 @@
+-#: src/commands-impl.c:1632
++#: src/commands-impl.c:1625
+ #, c-format
+ msgid "Could not rename the catalog \"%s\": %s"
+ msgstr ""
+ "Невозможно переименовать альбом \"%s\" : %s"
  
- #: src/gthumb-ui.xml.h:186
- msgid "_Adjust Color Levels"
--msgstr "Автоматическая цветоко_ррекция"
-+msgstr "_Цветокоррекция"
+-#: 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/gthumb-ui.xml.h:187
- msgid "_Back"
-@@ -1759,7 +1756,7 @@
+-#: src/commands-impl.c:1679
++#: src/commands-impl.c:1672
+ msgid "New Catalog"
+ msgstr "Новый альбом"
  
- #: src/gthumb-ui.xml.h:202
- msgid "_Edit Bookmarks"
--msgstr "_Редактировать закладки..."
-+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/gthumb-ui.xml.h:203 src/gthumb_search.glade.h:25
- msgid "_Edit Search"
-@@ -1767,7 +1764,7 @@
+-#: src/commands-impl.c:1788
++#: src/commands-impl.c:1781
+ msgid "The selected library will be removed, are you sure?"
+ msgstr ""
+ "Выбранная коллекция будет удалена. "
+ "Продолжить?"
  
- #: src/gthumb-ui.xml.h:204
- msgid "_Equalize"
--msgstr ""
-+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/gthumb-ui.xml.h:205
- msgid "_File"
-@@ -1819,7 +1816,7 @@
+-#: 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/gthumb-ui.xml.h:219
- msgid "_Image Preview"
--msgstr "Предварительный просмотр изображения"
-+msgstr "Предварительный _просмотр изображения"
+-#: src/dlg-convert.c:159
++#: src/dlg-convert.c:158
+ #, c-format
+ msgid "Converting image: %s"
+ msgstr "Преобразование изображения: %s"
  
- #: src/gthumb-ui.xml.h:220
- msgid "_Keyboard Shortcuts"
-@@ -1935,11 +1932,11 @@
+-#: 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/gthumb-ui.xml.h:251
- msgid "_Stretch Contrast"
--msgstr "Растянуть контраст"
-+msgstr "_Растянуть контраст"
+-#: 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/gthumb-ui.xml.h:252
- msgid "_Threshold"
--msgstr "Порог"
-+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/gthumb-ui.xml.h:253 src/gthumb_preferences.glade.h:64
- msgid "_Thumbnails"
-@@ -2141,7 +2138,7 @@
+-#: src/dlg-file-utils.c:2000
++#: src/dlg-file-utils.c:1909
+ #, c-format
+ msgid "Copying file %ld of %ld"
+ msgstr "Копируется файл %ld из %ld"
  
- #: src/gthumb.glade.h:22
- msgid "Photo _Data (EXIF)"
--msgstr "_Дополнительные сведения (EXIF)"
-+msgstr "_Данные EXIF"
+-#: 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 "Дата изменения"
  
- #: src/gthumb.glade.h:23
- msgid "R_ecent applications:"
-@@ -2181,7 +2178,7 @@
+@@ -929,13 +815,12 @@
+ msgid "Information on Channel"
+ msgstr "Канал"
  
- #: src/gthumb.glade.h:34
- msgid "_Remove"
--msgstr "Удалить"
-+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/gthumb.glade.h:35
- msgid "_Save the new image as:"
-@@ -2209,7 +2206,7 @@
- 
- #: src/gthumb_comments.glade.h:10
- msgid "Current date"
--msgstr "_Сегодняшняя дата"
-+msgstr "Сегодняшняя дата"
- 
- #: src/gthumb_comments.glade.h:11 src/gthumb_tools.glade.h:25
- msgid "Image c_reation date"
-@@ -2231,7 +2228,7 @@
- #: src/gthumb_comments.glade.h:15
- msgid "Photo digitalization date (From EXIF data)"
- msgstr ""
--"Дата оцифровки _фотографии (Из данных EXIF)"
-+"Дата оцифровки фотографии (Из данных EXIF)"
- 
- #: src/gthumb_comments.glade.h:16
- msgid "Remove selected category"
-@@ -2244,7 +2241,7 @@
- 
- #: src/gthumb_comments.glade.h:18 src/gthumb_tools.glade.h:42
- msgid "The _following date:"
--msgstr "_Указанная:"
-+msgstr "_Произвольная:"
- 
- #: src/gthumb_comments.glade.h:19
- msgid "The following date"
-@@ -2260,11 +2257,11 @@
- 
- #: src/gthumb_comments.glade.h:22
- msgid "_New"
--msgstr "Создать"
-+msgstr "_Создать"
- 
- #: src/gthumb_comments.glade.h:23
- msgid "_No date"
--msgstr "Без даты"
-+msgstr "_Без даты"
- 
- #: src/gthumb_comments.glade.h:24 src/gthumb_search.glade.h:27
- msgid "_Place:"
-@@ -2515,7 +2512,7 @@
- 
- #: src/gthumb_edit.glade.h:33 src/gthumb_web_exporter.glade.h:51
- msgid "pixels"
--msgstr "в _пикселях"
-+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/gthumb_png_exporter.glade.h:4
- msgid "112"
-@@ -2871,7 +2868,7 @@
+ #: src/dlg-image-prop.c:991
+@@ -958,15 +843,15 @@
+ msgid "Specify the backup file"
+ msgstr "Укажите файл страховочной копии"
  
- #: src/gthumb_preferences.glade.h:21
- msgid "<b>Zoom quality</b>"
--msgstr "<b>Качество мас_штабирования</b>"
-+msgstr "<b>Качество масштабирования</b>"
+-#: src/dlg-png-exporter.c:1004
++#: src/dlg-png-exporter.c:997
+ msgid "Image Caption"
+ msgstr "Подпись"
  
- #: src/gthumb_preferences.glade.h:22
- msgid "Activate items with a double click"
-@@ -3088,7 +3085,7 @@
+-#: src/dlg-png-exporter.c:1057
++#: src/dlg-png-exporter.c:1050
+ msgid "Header"
+ msgstr "Верхний колонтитул"
  
- #: src/gthumb_print.glade.h:10
- msgid "C_ustom:"
--msgstr "Другой:"
-+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 "Нижний колонтитул"
  
- #: src/gthumb_print.glade.h:11
- msgid "Center _on Page"
-@@ -3096,11 +3093,11 @@
+@@ -990,7 +875,7 @@
+ msgid "Folder"
+ msgstr "Каталог"
  
- #: src/gthumb_print.glade.h:12
- msgid "Comment _font:"
--msgstr "Шрифт комментарий:"
-+msgstr "_Шрифт комментария:"
+-#: src/dlg-web-exporter.c:658
++#: src/dlg-web-exporter.c:649
+ msgid "Select Album Theme"
+ msgstr "Выбрать стиль оформления альбома"
  
- #: src/gthumb_print.glade.h:13
- msgid "I_nclude comment"
--msgstr "Включить комментарий"
-+msgstr "_Включить комментарии"
+@@ -1002,7 +887,7 @@
+ msgid "Image Info"
+ msgstr "Информация об изображении"
  
- #: src/gthumb_print.glade.h:14
- msgid "Inches"
-@@ -3108,7 +3105,7 @@
+-#: src/fullscreen.c:818 src/gthumb-window.c:4303
++#: src/fullscreen.c:818 src/gthumb-window.c:4252
+ msgid "Back"
+ msgstr "Назад"
  
- #: src/gthumb_print.glade.h:15
- msgid "Lan_dscape"
--msgstr "Альбом"
-+msgstr "_Альбомная"
+@@ -1931,8 +1816,7 @@
  
- #: src/gthumb_print.glade.h:16
- msgid "Layout"
-@@ -3120,11 +3117,11 @@
+ #: src/gthumb-ui.xml.h:219
+ msgid "_Image Preview"
+-msgstr ""
+-"Предварительный _просмотр изображения"
++msgstr "Предварительный _просмотр изображения"
  
- #: src/gthumb_print.glade.h:18
- msgid "P_ortrait"
--msgstr "Портрет"
-+msgstr "_Портретная"
+ #: src/gthumb-ui.xml.h:220
+ msgid "_Keyboard Shortcuts"
+@@ -2098,69 +1982,69 @@
+ msgid "by _Time"
+ msgstr "по _времени "
  
- #: src/gthumb_print.glade.h:19
- msgid "Paper Details"
--msgstr ""
-+msgstr "Лист"
+-#: src/gthumb-window.c:696
++#: src/gthumb-window.c:692
+ msgid "[Press 'c' to add a comment]"
+ msgstr ""
+ "[Нажмите \"c\", чтобы добавить комментарий]"
  
- #: src/gthumb_print.glade.h:21
- msgid "US E_xecutive"
-@@ -3192,15 +3189,15 @@
+-#: 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_search.glade.h:17
- msgid "Match a_ll selected categories"
--msgstr ""
-+msgstr "Вс_е выбранные категории"
+-#: src/gthumb-window.c:877
++#: src/gthumb-window.c:873
+ msgid "No image"
+ msgstr "Изображений нет"
  
- #: src/gthumb_search.glade.h:18
- msgid "Match a_ny selected category"
--msgstr ""
-+msgstr "_Любая из выбранных категорий"
+-#: src/gthumb-window.c:879
++#: src/gthumb-window.c:875
+ #, c-format
+ msgid "1 image (%s)"
+ msgstr "1 изображение (%s)"
  
- #: src/gthumb_search.glade.h:19
- msgid "New _Search..."
--msgstr "_Новый поиск..."
-+msgstr "_Новый поиск"
+-#: src/gthumb-window.c:882
++#: src/gthumb-window.c:878
+ #, c-format
+ msgid "%d images (%s)"
+ msgstr "%d изображений (%s)"
  
- #: src/gthumb_search.glade.h:20
- msgid "No images found"
-@@ -3340,7 +3337,7 @@
+-#: src/gthumb-window.c:889
++#: src/gthumb-window.c:885
+ #, c-format
+ msgid "1 selected (%s)"
+ msgstr "1 выбрано (%s)"
  
- #: src/gthumb_tools.glade.h:34
- msgid "Rename Series"
--msgstr "Переименовать _группу файлов"
-+msgstr "Переименовать группу файлов"
+-#: 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_tools.glade.h:35
- msgid "Restore Comments From a Backup File"
-@@ -3374,6 +3371,10 @@
+-#: 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 ""
+-"Символами # обозначается место для "
+-"порядкового номера. Символ * заменяется "
+-"на исходное имя файла. Символ ? обозначает "
+-"место для вставки даты, а символ ! размера."
 +"Символами # обозначается место для порядкового номера. Символ * заменяется "
 +"на исходное имя файла. Символ ? обозначает место для вставки даты, а символ "
 +"! размера."
@@ -440,181 +1136,217 @@
  
  #: src/gthumb_tools.glade.h:46
  msgid "_Sort original list:"
-@@ -3381,7 +3382,7 @@
- 
- #: src/gthumb_tools.glade.h:49
- msgid "by Modification date"
--msgstr "по времени изменения"
-+msgstr "по времени"
- 
- #: src/gthumb_tools.glade.h:50
- msgid "by Name"
-@@ -3417,17 +3418,15 @@
- 
- #: src/gthumb_web_exporter.glade.h:11
- msgid "<b>Index Layout</b>"
--msgstr ""
-+msgstr "<b>Раскладка</b>"
- 
- #: src/gthumb_web_exporter.glade.h:12
--#, fuzzy
- msgid "<b>Personalize theme</b>"
--msgstr "<b>Размер страницы</b>"
-+msgstr "<b>Настройка оформления</b>"
+@@ -3643,8 +3426,7 @@
  
  #: src/gthumb_web_exporter.glade.h:13
--#, fuzzy
  msgid "<b>Photo data</b>"
--msgstr "<b>Нижний колонтитул</b>"
+-msgstr ""
+-"<b>Технические сведения о фотоснимках</b>"
 +msgstr "<b>Технические сведения о фотоснимках</b>"
  
  #: src/gthumb_web_exporter.glade.h:14
  msgid "<b>Saving</b>"
-@@ -3435,103 +3434,99 @@
- 
- #: src/gthumb_web_exporter.glade.h:15
- msgid "<b>Theme</b>"
--msgstr "<b>Тема</b>"
-+msgstr "<b>Стиль</b>"
- 
- #: src/gthumb_web_exporter.glade.h:16
- msgid "Came_ra Model"
--msgstr ""
-+msgstr "_Модель фотоаппарата"
- 
- #: src/gthumb_web_exporter.glade.h:17
--#, fuzzy
- msgid "Caption"
- msgstr "Подпись"
- 
- #: src/gthumb_web_exporter.glade.h:20
- msgid "E_xposure mode"
--msgstr ""
-+msgstr "_Режим экспозиции"
- 
- #: src/gthumb_web_exporter.glade.h:21
+@@ -3670,161 +3452,145 @@
  msgid "Exposure _time"
--msgstr ""
-+msgstr "_Экспозиция"
+ msgstr "_Экспозиция"
  
- #: src/gthumb_web_exporter.glade.h:24
+-#: src/gthumb_web_exporter.glade.h:25
++#: src/gthumb_web_exporter.glade.h:24
  msgid "Focal _length"
--msgstr ""
-+msgstr "Ф_окусное расстояние"
+ msgstr "Ф_окусное расстояние"
  
- #: src/gthumb_web_exporter.glade.h:25
--#, fuzzy
+-#: src/gthumb_web_exporter.glade.h:27
++#: src/gthumb_web_exporter.glade.h:25
  msgid "I_mage Caption..."
--msgstr "Подпись"
-+msgstr "Подпись к изобра_жению"
+ msgstr "Подпись к изобра_жению"
  
- #: src/gthumb_web_exporter.glade.h:27
+-#: src/gthumb_web_exporter.glade.h:29
++#: src/gthumb_web_exporter.glade.h:27
  msgid "Inde_x file:"
--msgstr "Файл индекса:"
-+msgstr "Файл _индекса:"
+ msgstr "Файл _индекса:"
  
- #: src/gthumb_web_exporter.glade.h:29
+-#: 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:30
+-#: src/gthumb_web_exporter.glade.h:32
++#: src/gthumb_web_exporter.glade.h:30
  msgid "Sor_t:"
--msgstr "Сортировать:"
-+msgstr "_Сортировать:"
+ msgstr "_Сортировать:"
  
- #: src/gthumb_web_exporter.glade.h:31
+-#: src/gthumb_web_exporter.glade.h:33
++#: src/gthumb_web_exporter.glade.h:31
  msgid "Th_eme:"
--msgstr "Тема:"
-+msgstr "С_тиль:"
+ msgstr "С_тиль:"
  
- #: src/gthumb_web_exporter.glade.h:32
- msgid "Web Album"
+-#: src/gthumb_web_exporter.glade.h:35
+-#, no-c-format
+-msgid "Use %d  to insert current date"
 -msgstr ""
-+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:33
+-#: src/gthumb_web_exporter.glade.h:37
++#: src/gthumb_web_exporter.glade.h:33
  msgid "Web Album Theme"
--msgstr ""
-+msgstr "Стиль оформления интернет-альбома"
+ msgstr "Стиль оформления интернет-альбома"
  
- #: src/gthumb_web_exporter.glade.h:34
+-#: src/gthumb_web_exporter.glade.h:38
++#: src/gthumb_web_exporter.glade.h:34
  msgid "_Aperture value"
--msgstr ""
-+msgstr "_Просвет диафрагмы"
+ msgstr "_Просвет диафрагмы"
  
- #: src/gthumb_web_exporter.glade.h:35
+-#: 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:36
+-#: src/gthumb_web_exporter.glade.h:40
++#: src/gthumb_web_exporter.glade.h:36
  msgid "_Date and Time"
--msgstr ""
-+msgstr "_Дата и время"
+ msgstr "_Дата и время"
  
- #: src/gthumb_web_exporter.glade.h:37
+-#: src/gthumb_web_exporter.glade.h:41
++#: src/gthumb_web_exporter.glade.h:37
  msgid "_Destination:"
--msgstr ""
-+msgstr "_Каталог:"
+ msgstr "_Каталог:"
  
- #: src/gthumb_web_exporter.glade.h:38
--#, fuzzy
+-#: src/gthumb_web_exporter.glade.h:42
++#: src/gthumb_web_exporter.glade.h:38
  msgid "_Flash"
--msgstr "Имена файлов"
-+msgstr "_Вспышка"
+ msgstr "_Вспышка"
  
- #: src/gthumb_web_exporter.glade.h:39
+-#: src/gthumb_web_exporter.glade.h:43
++#: src/gthumb_web_exporter.glade.h:39
  msgid "_Go to Theme Folder"
--msgstr "Перей_ти в каталог тем"
-+msgstr "_Каталог стилей"
+ msgstr "_Каталог стилей"
  
- #: src/gthumb_web_exporter.glade.h:40
+-#: src/gthumb_web_exporter.glade.h:44
++#: src/gthumb_web_exporter.glade.h:40
  msgid "_Install Theme..."
--msgstr "Установить тему..."
-+msgstr "_Добавить стиль"
+ msgstr "_Добавить стиль"
  
- #: src/gthumb_web_exporter.glade.h:42
+-#: src/gthumb_web_exporter.glade.h:46
++#: src/gthumb_web_exporter.glade.h:42
  msgid "_Shutter speed"
--msgstr ""
-+msgstr "_Скорость затвора"
+ msgstr "_Скорость затвора"
  
- #: src/gthumb_web_exporter.glade.h:43
--#, fuzzy
+-#: src/gthumb_web_exporter.glade.h:47
++#: src/gthumb_web_exporter.glade.h:43
  msgid "_Thumbnail Caption..."
--msgstr "Миниат_юры"
-+msgstr "Подпись миниат_юры"
+ msgstr "Подпись миниат_юры"
  
- #: src/gthumb_web_exporter.glade.h:44
- msgid "_Title:"
--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
++
++#: src/gthumb_web_exporter.glade.h:45
  msgid "by modified time"
--msgstr ""
-+msgstr "по времени"
+ msgstr "по времени"
  
- #: src/gthumb_web_exporter.glade.h:50
+-#: src/gthumb_web_exporter.glade.h:52
++#: src/gthumb_web_exporter.glade.h:50
  msgid "index.html"
-@@ -3571,7 +3566,7 @@
- 
- #: src/main.c:167
+ 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"
-+msgstr "Рабочая среда GNOME"
+ msgstr "Рабочая среда GNOME"
  
- #: src/main.c:168
+-#: src/main.c:170
++#: src/main.c:168
  msgid "Games"
-@@ -3598,9 +3593,4 @@
+ 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 "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+-#~ msgid ""
+-#~ "GConf error:\n"
+-#~ "  %s"
 -#~ msgstr ""
--#~ "АаБбВвГгДдЕеЖжЗзИиЙйКкЛлМмНнОоПпРрСсТт�"
--#~ "�уФфХх0123456789"
+-#~ "Ошибка GConf:\n"
+-#~ "  %s"
 -
--#~ msgid "Pick a Font"
--#~ msgstr "Выбрать шрифт"
+-#~ 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
index 7e91ca040e2a..dcda196a0132 100644
--- a/graphics/gthumb2/files/patch-po_zh_TW.po
+++ b/graphics/gthumb2/files/patch-po_zh_TW.po
@@ -1,51 +1,189 @@
---- po/zh_TW.po.orig	Fri Jul 25 00:22:38 2003
-+++ po/zh_TW.po	Fri Jul 25 00:22:55 2003
+--- 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-07-06 20:06+0200\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,12 +170,12 @@
+@@ -170,119 +170,16 @@
  msgid "_Zoom Quality"
  msgstr "縮放品質(_Z)"
  
--#: components/image-viewer/viewer-stream.c:90 src/dlg-file-utils.c:517
+-#: 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:414
+-#: 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 像素"
-@@ -220,16 +220,16 @@
+ 
+-#: 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:747
+-#: libgthumb/comments.c:756
 +#: libgthumb/comments.c:746
  msgid "%d %B %Y"
  msgstr "%x"
  
--#: libgthumb/comments.c:749 src/dlg-duplicates.c:551 src/dlg-image-prop.c:676
--#: src/fullscreen.c:225 src/gthumb-window.c:411
+-#: 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:759
+-#: libgthumb/comments.c:768
 +#: libgthumb/comments.c:758
  msgid "(No Comment)"
  msgstr "(沒有任何備註)"
  
-@@ -284,6 +284,18 @@
+-#: 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 "字型選擇"
  
@@ -64,7 +202,7 @@
  #: libgthumb/gnome-print-font-picker.c:179
  msgid "Title"
  msgstr "標題"
-@@ -314,8 +326,7 @@
+@@ -408,8 +326,7 @@
  
  #: libgthumb/gnome-print-font-picker.c:219
  msgid "Use font in the label in font info mode"
@@ -74,16 +212,16 @@
  
  #: libgthumb/gnome-print-font-picker.c:227
  msgid "Font size for label"
-@@ -343,16 +354,23 @@
+@@ -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:429
+-#: 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:919 libgthumb/print-callbacks.c:1499
+-#: 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
@@ -96,47 +234,72 @@
  msgid "Print %s"
  msgstr "列印 %s"
  
--#: libgthumb/print-callbacks.c:922
+-#: libgthumb/print-callbacks.c:928
 +#: libgthumb/print-callbacks.c:920
  msgid "Print Image"
  msgstr "列印圖像"
  
-@@ -374,28 +392,28 @@
+-#: 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:1444
+-#: src/catalog-web-exporter.c:1615
 +#: src/catalog-web-exporter.c:1153
  msgid "Saving thumbnails"
  msgstr "儲存縮圖"
  
--#: src/catalog-web-exporter.c:1512
+-#: src/catalog-web-exporter.c:1681
 +#: src/catalog-web-exporter.c:1221
  msgid "Saving HTML pages: Images"
  msgstr "儲存 HTML 頁面：圖像"
  
--#: src/catalog-web-exporter.c:1589
+-#: src/catalog-web-exporter.c:1756
 +#: src/catalog-web-exporter.c:1298
  msgid "Saving HTML pages: Indexes"
  msgstr "儲存 HTML 頁面：索引"
  
--#: src/catalog-web-exporter.c:1673
+-#: 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:1987
+-#: 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:2026
+-#: src/catalog-web-exporter.c:2280
 +#: src/catalog-web-exporter.c:1735
  msgid "Loading images"
  msgstr "圖像載入中"
  
-@@ -414,9 +432,7 @@
+-#: 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."
@@ -145,51 +308,279 @@
 -"�。"
 +msgstr "名稱“%s”無效，因為它含有“/”字元。請使用另一個名稱。"
  
- #: src/commands-impl.c:319 src/dlg-convert.c:313
+-#: src/commands-impl.c:320 src/dlg-convert.c:314
++#: src/commands-impl.c:319 src/dlg-convert.c:313
  msgid "_Overwrite"
-@@ -517,7 +533,7 @@
+ 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:1219 src/dlg-file-utils.c:274
+-#: 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)"
  
-@@ -526,8 +542,8 @@
+-#: 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:1340 src/dlg-file-utils.c:2297
--#: src/dlg-file-utils.c:2299
+-#: 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"
-@@ -540,7 +556,7 @@
+ 
+-#: 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:1453 src/dlg-file-utils.c:360 src/dlg-file-utils.c:449
+-#: 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 "請選擇目的地資料夾"
  
-@@ -586,12 +602,6 @@
+-#: 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: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
+-#: 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:2815
+-#: src/commands-impl.c:2822
++#: src/commands-impl.c:2815
  msgid "An image viewer and browser for GNOME."
  msgstr "適合在 GNOME 環境下使用的圖像瀏覽器。"
-@@ -663,77 +673,75 @@
+ 
+@@ -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”中產生圖像"
  
@@ -198,19 +589,19 @@
  msgid "Could not delete the images:"
  msgstr "無法刪除檔案："
  
--#: src/dlg-file-utils.c:220
+-#: 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:751 src/dlg-file-utils.c:852
+-#: 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:763 src/dlg-file-utils.c:864
+-#: 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 ""
@@ -220,103 +611,124 @@
 -"。"
 +msgstr "本資料夾中已經有檔案的名稱是“%s”。請使用另一個名稱。"
  
--#: src/dlg-file-utils.c:1003
+-#: src/dlg-file-utils.c:1009
 +#: src/dlg-file-utils.c:1002
  msgid "Could not rename the image:"
  msgstr "無法更改圖像名稱："
  
--#: src/dlg-file-utils.c:1005
+-#: 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:1138
+-#: src/dlg-file-utils.c:1145
 +#: src/dlg-file-utils.c:1137
  msgid "Could not move the image:"
  msgstr "無法移動圖像："
  
--#: src/dlg-file-utils.c:1140
+-#: src/dlg-file-utils.c:1147
 +#: src/dlg-file-utils.c:1139
  msgid "Could not copy the image:"
  msgstr "無法複製檔案："
  
--#: src/dlg-file-utils.c:1164 src/dlg-file-utils.c:2320
+-#: 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:1165 src/dlg-file-utils.c:2321
+-#: 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:1337
+-#: 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:1720 src/dlg-file-utils.c:1906
+-#: 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:1723 src/dlg-file-utils.c:1919
+-#: 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:1909
+-#: 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:1914
+-#: 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:436
+-#: 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 "尺寸"
  
-@@ -741,11 +749,11 @@
+@@ -843,7 +749,11 @@
  msgid "Type"
  msgstr "類型"
  
--#: src/dlg-image-prop.c:851 src/gthumb-window.c:443
+-#: 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:450
++msgid "Bytes"
++msgstr "位元組"
++
 +#: src/dlg-image-prop.c:861 src/gthumb-window.c:445
  msgid "Modified"
  msgstr "最後修改時間"
  
-@@ -753,11 +761,11 @@
+@@ -851,13 +761,12 @@
  msgid "Information on Channel"
  msgstr "請選取色版"
  
--#: src/dlg-image-prop.c:900 src/gthumb-window.c:5308
+-#: 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:5318 src/gthumb.glade.h:25
+-#: 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"
++msgid "Value"
  msgstr "亮度"
  
-@@ -810,23 +818,23 @@
+ #: 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:649
+-#: src/dlg-web-exporter.c:658
 +#: src/dlg-web-exporter.c:661
  msgid "Select Album Theme"
  msgstr "選取相片簿佈景主題"
@@ -331,7 +743,7 @@
  msgid "Image Info"
  msgstr "圖像資訊"
  
--#: src/fullscreen.c:818 src/gthumb-window.c:4252
+-#: src/fullscreen.c:818 src/gthumb-window.c:4303
 +#: src/fullscreen.c:840 src/gthumb-window.c:4255
  msgid "Back"
  msgstr "上一頁"
@@ -341,7 +753,7 @@
  msgid "Forward"
  msgstr "下一頁"
  
-@@ -879,7 +887,7 @@
+@@ -978,7 +887,7 @@
  msgstr "調整色相及彩度"
  
  #: src/gthumb-ui.xml.h:10
@@ -350,100 +762,221 @@
  msgstr ""
  
  #: src/gthumb-ui.xml.h:11
-@@ -1829,68 +1837,68 @@
+@@ -1928,68 +1837,68 @@
  msgid "by _Time"
  msgstr "根據時間(_T)"
  
--#: src/gthumb-window.c:692
+-#: src/gthumb-window.c:696
 +#: src/gthumb-window.c:687
  msgid "[Press 'c' to add a comment]"
  msgstr "[請按‘c’加上備註]"
  
--#: src/gthumb-window.c:766 src/gthumb-window.c:789
+-#: 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:873
+-#: src/gthumb-window.c:877
 +#: src/gthumb-window.c:869
  msgid "No image"
  msgstr "沒有任何圖像"
  
--#: src/gthumb-window.c:875
+-#: src/gthumb-window.c:879
 +#: src/gthumb-window.c:871
  #, c-format
  msgid "1 image (%s)"
  msgstr "1 幅圖像 (%s)"
  
--#: src/gthumb-window.c:878
+-#: src/gthumb-window.c:882
 +#: src/gthumb-window.c:874
  #, c-format
  msgid "%d images (%s)"
  msgstr "%d 幅圖像 (%s)"
  
--#: src/gthumb-window.c:885
+-#: src/gthumb-window.c:889
 +#: src/gthumb-window.c:881
  #, c-format
  msgid "1 selected (%s)"
  msgstr "選取了 1 幅 (%s)"
  
--#: src/gthumb-window.c:888
+-#: src/gthumb-window.c:892
 +#: src/gthumb-window.c:884
  #, c-format
  msgid "%d selected (%s)"
  msgstr "選取了 %d 幅 (%s)"
  
--#: src/gthumb-window.c:3360
+-#: src/gthumb-window.c:3383
 +#: src/gthumb-window.c:3363
  msgid "Dragged Images"
  msgstr "拖曳的圖像"
  
--#: src/gthumb-window.c:3556
+-#: src/gthumb-window.c:3582
 +#: src/gthumb-window.c:3559
  msgid "Could not move the items:"
  msgstr "無法移動以下的項目："
  
--#: src/gthumb-window.c:5189
+-#: src/gthumb-window.c:5226
 +#: src/gthumb-window.c:5172
  msgid "Image comment"
  msgstr "圖像備註"
  
--#: src/gthumb-window.c:5203
+-#: src/gthumb-window.c:5240
 +#: src/gthumb-window.c:5186
  msgid "Image data"
  msgstr "圖像資料"
  
--#: src/gthumb-window.c:5217
+-#: src/gthumb-window.c:5254
 +#: src/gthumb-window.c:5200
  msgid "Image preview"
  msgstr "圖像預覽"
  
--#: src/gthumb-window.c:6449
+-#: 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:6718
+-#: src/gthumb-window.c:6769
 +#: src/gthumb-window.c:6727
  msgid "The specified catalog does not exist."
  msgstr "指定的圖像集不存在。"
  
--#: src/gthumb-window.c:8064
+-#: src/gthumb-window.c:8139
 +#: src/gthumb-window.c:8073
  msgid "Wait please..."
  msgstr "請稍等..."
  
-@@ -2352,7 +2360,7 @@
+@@ -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:51
 +#: src/gthumb_edit.glade.h:33 src/gthumb_web_exporter.glade.h:34
- msgid "pixels"
- msgstr "像素"
- 
-@@ -2436,11 +2444,11 @@
++msgid "pixels"
++msgstr "像素"
++
+ #: src/gthumb_png_exporter.glade.h:4
+ msgid "112"
+ msgstr "112"
+@@ -2636,11 +2444,11 @@
  msgid "Choose destination folder"
  msgstr "建立目的地資料夾"
  
@@ -457,71 +990,99 @@
  msgid "Col_umns:"
  msgstr "列數(_U)："
  
-@@ -2460,7 +2468,7 @@
+@@ -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:22
+-#: 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)"
  
-@@ -2468,7 +2476,7 @@
+@@ -2668,7 +2476,7 @@
  msgid "File pa_th"
  msgstr "檔案路徑(_T)"
  
--#: src/gthumb_png_exporter.glade.h:32 src/gthumb_web_exporter.glade.h:23
+-#: 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)"
  
-@@ -2492,7 +2500,7 @@
+@@ -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:26
+-#: 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)"
  
-@@ -2512,7 +2520,7 @@
+@@ -2712,7 +2520,7 @@
  msgid "Pi_xels"
  msgstr "像素(_X)"
  
--#: src/gthumb_png_exporter.glade.h:43 src/gthumb_web_exporter.glade.h:28
+-#: 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)"
  
-@@ -2600,7 +2608,7 @@
+@@ -2800,7 +2608,7 @@
  msgid "_Image size:"
  msgstr "圖像尺寸(_I)："
  
--#: src/gthumb_png_exporter.glade.h:67 src/gthumb_web_exporter.glade.h:41
+-#: 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)："
  
-@@ -2612,15 +2620,15 @@
+@@ -2812,15 +2620,15 @@
  msgid "_Template:"
  msgstr "樣式(_T)："
  
--#: src/gthumb_png_exporter.glade.h:71 src/gthumb_web_exporter.glade.h:46
+-#: 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:47
+-#: 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:48
+-#: 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 "根據大小"
  
-@@ -3178,8 +3186,8 @@
+@@ -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 ""
@@ -532,7 +1093,7 @@
  
  #: src/gthumb_tools.glade.h:46
  msgid "_Sort original list:"
-@@ -3226,120 +3234,62 @@
+@@ -3426,203 +3234,125 @@
  msgstr "<b>索引圖排列</b>"
  
  #: src/gthumb_web_exporter.glade.h:12
@@ -571,106 +1132,186 @@
 -msgid "Exposure _time"
 -msgstr ""
 -
--#: src/gthumb_web_exporter.glade.h:24
+-#: src/gthumb_web_exporter.glade.h:25
 -msgid "Focal _length"
 -msgstr ""
 -
--#: src/gthumb_web_exporter.glade.h:25
+-#: src/gthumb_web_exporter.glade.h:27
 -#, fuzzy
 -msgid "I_mage Caption..."
 -msgstr "圖像標題"
 -
--#: src/gthumb_web_exporter.glade.h:27
+-#: 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:29
+-#: 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:30
+-#: 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:31
+-#: 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:32
+-#: 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:33
+-#: 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:34
+-#: src/gthumb_web_exporter.glade.h:38
 -msgid "_Aperture value"
 -msgstr ""
 -
--#: src/gthumb_web_exporter.glade.h:35
+-#: 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:36
+-#: src/gthumb_web_exporter.glade.h:40
 -msgid "_Date and Time"
 -msgstr ""
 -
--#: src/gthumb_web_exporter.glade.h:37
+-#: src/gthumb_web_exporter.glade.h:41
 +#: src/gthumb_web_exporter.glade.h:23
  msgid "_Destination:"
  msgstr "目的地(_D)："
  
--#: src/gthumb_web_exporter.glade.h:38
+-#: src/gthumb_web_exporter.glade.h:42
 -#, fuzzy
 -msgid "_Flash"
 -msgstr "檔案名稱(_F)"
 -
--#: src/gthumb_web_exporter.glade.h:39
+-#: 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:40
+-#: 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:42
+-#: src/gthumb_web_exporter.glade.h:46
 -msgid "_Shutter speed"
 -msgstr ""
 -
--#: src/gthumb_web_exporter.glade.h:43
+-#: src/gthumb_web_exporter.glade.h:47
 -#, fuzzy
 -msgid "_Thumbnail Caption..."
 -msgstr "縮圖(_T)"
--
--#: src/gthumb_web_exporter.glade.h:44
 +#: src/gthumb_web_exporter.glade.h:27
- msgid "_Title:"
- msgstr "標題(_T)："
++msgid "_Title:"
++msgstr "標題(_T)："
  
--#: src/gthumb_web_exporter.glade.h:45
+-#: 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:50
+-#: src/gthumb_web_exporter.glade.h:52
 +#: src/gthumb_web_exporter.glade.h:33
  msgid "index.html"
  msgstr "index.html"
  
-@@ -3402,15 +3352,6 @@
- #: src/main.c:308 src/main.c:374
+-#: 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"
@@ -680,6 +1321,20 @@
 -
 -#~ 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/files/patch-src_gthumb-window.c b/graphics/gthumb2/files/patch-src_gthumb-window.c
deleted file mode 100644
index c089fe90d3ee..000000000000
--- a/graphics/gthumb2/files/patch-src_gthumb-window.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gthumb-window.c.orig	Tue Nov 12 15:06:10 2002
-+++ src/gthumb-window.c	Tue Nov 12 15:06:26 2002
-@@ -5162,7 +5162,7 @@
- 
- 	bonobo_window_set_contents (BONOBO_WINDOW (window->app), paned1);
- 
--	gtk_widget_destroy (window->main_pane);
-+	window->main_pane = NULL;
- 
- 	gtk_widget_show (paned1);
- 	gtk_widget_show (paned2);
diff --git a/graphics/gthumb2/pkg-plist b/graphics/gthumb2/pkg-plist
index d37e3d3a2ce2..43bf1b6d0926 100644
--- a/graphics/gthumb2/pkg-plist
+++ b/graphics/gthumb2/pkg-plist
@@ -4,6 +4,7 @@ etc/gconf/gconf.xml.defaults/apps/gthumb/browser/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/convert_format/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/jpeg_saver/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/messages/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/print/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/rename_series/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/scale_image/%gconf.xml
@@ -24,6 +25,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/browser/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/convert_format/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/jpeg_saver/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/messages/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/print/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/rename_series/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/scale_image/%gconf.xml
@@ -79,6 +81,19 @@ share/gnome/gthumb/albumthemes/ClassicClips/prev.png
 share/gnome/gthumb/albumthemes/ClassicClips/right.png
 share/gnome/gthumb/albumthemes/ClassicClips/thumbnail.gthtml
 share/gnome/gthumb/albumthemes/ClassicClips/top.png
+share/gnome/gthumb/albumthemes/Clean/1.gif
+share/gnome/gthumb/albumthemes/Clean/back.gif
+share/gnome/gthumb/albumthemes/Clean/background.gif
+share/gnome/gthumb/albumthemes/Clean/bot.png
+share/gnome/gthumb/albumthemes/Clean/image.gthtml
+share/gnome/gthumb/albumthemes/Clean/index.gthtml
+share/gnome/gthumb/albumthemes/Clean/left.png
+share/gnome/gthumb/albumthemes/Clean/left_arrow.png
+share/gnome/gthumb/albumthemes/Clean/right.png
+share/gnome/gthumb/albumthemes/Clean/right_arrow.png
+share/gnome/gthumb/albumthemes/Clean/thumbnail.gthtml
+share/gnome/gthumb/albumthemes/Clean/top.png
+share/gnome/gthumb/albumthemes/Clean/up_arrow.png
 share/gnome/gthumb/albumthemes/NeatRound/1.gif
 share/gnome/gthumb/albumthemes/NeatRound/back.png
 share/gnome/gthumb/albumthemes/NeatRound/background.gif
@@ -177,6 +192,7 @@ share/locale/zh_TW/LC_MESSAGES/gthumb.mo
 @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
@@ -198,6 +214,7 @@ share/locale/zh_TW/LC_MESSAGES/gthumb.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/scale_image
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/rename_series
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/print
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/messages
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/jpeg_saver
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/convert_format
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs
@@ -218,6 +235,7 @@ share/locale/zh_TW/LC_MESSAGES/gthumb.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/scale_image
 @dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/rename_series
 @dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/print
+@dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/messages
 @dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/jpeg_saver
 @dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/convert_format
 @dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs