2.7.3GTK_2_7_3

80 files changed, 11820 insertions, 10570 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 9ebf1e1d5d..868405ebad 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.7.3 ===
+	
 2005-07-15  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
 	* es.po: Updated Spanish trasnslation
diff --git a/po/af.po b/po/af.po
index 3aa12665e2..77023dba89 100644
--- a/po/af.po
+++ b/po/af.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.6-branch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-03-30 17:02+0200\n"
 "Last-Translator: Zuza Software Foundation <info@translate.org.za>\n"
 "Language-Team: Afrikaans <translate-discuss-af@lists.sourceforge.net>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Kon nie lêer '%s': %s open nie"
@@ -29,7 +29,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Beeldlêer '%s' bevat geen data"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1280,20 +1280,20 @@ msgstr "Wiel"
 msgid "Color Selection"
 msgstr "Kleurseleksie"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Selekteer _Alles"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Toevoer _Metodes"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Voer Unicode-beheer karakter in"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Ongeldige lêernaam: %s"
@@ -1303,12 +1303,12 @@ msgstr "Ongeldige lêernaam: %s"
 msgid "Select A File"
 msgstr "Skrap Lêer"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Tuis"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Werkarea"
@@ -1322,273 +1322,289 @@ msgstr "geen"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr ""
 "Kon nie inligting aangaande %s bekom nie:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 #, fuzzy
 msgid "Could not add a bookmark"
 msgstr ""
 "Kon nie 'n boekmerk byvoeg vir %s nie:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 #, fuzzy
 msgid "Could not remove bookmark"
 msgstr ""
 "Kon nie boekmerk verwyder vir %s nie:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Ongeldige lêernaam: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 "Kon nie inligting aangaande %s bekom nie:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, fuzzy, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Kon nie 'n boekmerk byvoeg vir %s nie want dit is 'n ongeldige padnaam."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Verwyder"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Hernoem"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Vouer"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Voeg by"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Verwyder"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "Kon nie vouer %s skep nie:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "Kon nie 'n boekmerk byvoeg vir %s nie want dit is 'n ongeldige padnaam."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "Open Ligging"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Lêers"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Naam"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Grootte"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Aangepas"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "Skep _Vouer"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Naam:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Blaai vir ander vouers"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Stoor in _vouer:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Skep in _vouer:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 #, fuzzy
 msgid "Cannot change to folder because it is not local"
 msgstr ""
 "Kan nie verander na die vouer deur jou gespesifiseer nie,aangesien dit 'n "
 "ongeldige pad is."
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "kortpad %s bestaan nie"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Hernoem"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "Kon nie vouer %s skep nie:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Tik naam van nuwe vouer"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d greep"
 msgstr[1] "%d grepe"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Vandag"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Gister"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Skep in _vouer:"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 #, fuzzy
 msgid "The folder you specified is an invalid path."
 msgstr ""
 "Kan nie verander na die vouer deur jou gespesifiseer nie, aangesien dit 'n "
 "ongeldige pad is."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, fuzzy, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 "Kon nie 'n lêernaam bou van '%s' en '%s' nie:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "Kon nie vouer %s skep nie:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Open Ligging"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "Open Ligging"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Ligging:"
 
@@ -1791,7 +1807,8 @@ msgid "This file system does not support mounting"
 msgstr "Hierdie lêersisteem ondersteun nie montering nie"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Lêersisteem"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1892,7 +1909,7 @@ msgstr "_Gamma waarde"
 msgid "Error loading icon: %s"
 msgstr "Fout met laai van ikoon: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1905,7 +1922,7 @@ msgstr ""
 "Jy kan 'n kopie by:\n"
 " kry\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Ikoon '%s' nie aanwesig in tema nie"
@@ -1993,7 +2010,7 @@ msgstr "(onbekend)"
 msgid "clear"
 msgstr "helder"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Selekteer Alles"
 
@@ -2429,43 +2446,43 @@ msgstr "Zoem _In"
 msgid "Zoom _Out"
 msgstr "Zoem _Out"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM _Links-na-regs merk"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM _Regs-na-Links merk"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Links-na-regs  _inbedding"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Regs-na-links i_nbedding"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Links-na-regs _oorheers"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Regs-na-links oo_rheers"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Pop rigting formattering"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _Zero wydte spasie"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Zero wydte _samesmelter"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Zero wydte _nie-samesmelter"
 
@@ -2548,7 +2565,7 @@ msgstr "Viëtnamees (VIQR)"
 msgid "X Input Method"
 msgstr "X-toevoer Metode"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Kon nie inligting bekom vir lêer '%s' nie: %s"
diff --git a/po/am.po b/po/am.po
index f2c9f5d8c2..e95d26fb4e 100644
--- a/po/am.po
+++ b/po/am.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2003-01-14 11:02+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
 "Language-Team: Amharic <locales@geez.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr ""
@@ -28,7 +28,7 @@ msgid "Image file '%s' contains no data"
 msgstr ""
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1222,21 +1222,21 @@ msgstr "የፊደል ቅርጽ ምርጫ"
 msgid "Color Selection"
 msgstr "የፊደል ቅርጽ ምርጫ"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 #, fuzzy
 msgid "Select _All"
 msgstr "ሁሉንም ምረጡ"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "ዘገባ የማስትገባት ዘዴዎች (_M)"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr ""
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr ""
@@ -1246,13 +1246,13 @@ msgstr ""
 msgid "Select A File"
 msgstr "ፋይል አጥፉ"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 #, fuzzy
 msgid "Home"
 msgstr "መጀመሪያ (_H)"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr ""
@@ -1266,254 +1266,270 @@ msgstr "ምንም"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "የፋይል ስም"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "የአሁኑን ቀለም"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "አስወግድ (_R)"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "እንደገና _ሰይም"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 #, fuzzy
 msgid "Folder"
 msgstr "ዶሴዎች"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "ጨምር (_A)"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "አስወግድ (_R)"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "የአሁኑን ቀለም"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "_ምርጫ፦ "
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "ፋይሎች"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 #, fuzzy
 msgid "Name"
 msgstr "የቀለሙ _ስም፦"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "መጠን"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 #, fuzzy
 msgid "Modified"
 msgstr "የአሠራሩ ዘዴ"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "አዲስ ዶሴ"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 #, fuzzy
 msgid "_Name:"
 msgstr "የቀለሙ _ስም፦"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 #, fuzzy
 msgid "Save in _folder:"
 msgstr "አዲስ ዶሴ"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 #, fuzzy
 msgid "Create in _folder:"
 msgstr "አዲስ ዶሴ"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "እንደገና _ሰይም"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr "የአሁኑን ቀለም"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 #, fuzzy
 msgid "Unknown"
 msgstr "(ያልታወቀ)"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 #, fuzzy
 msgid "Today"
 msgstr "አዛምድ"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "አዲስ ዶሴ"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr "የአሁኑን ቀለም"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "_ምርጫ፦ "
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 #, fuzzy
 msgid "_Location:"
 msgstr "_ምርጫ፦ "
@@ -1702,7 +1718,7 @@ msgstr ""
 
 #: gtk/gtkfilesystemunix.c:639
 #, fuzzy
-msgid "Filesystem"
+msgid "File System"
 msgstr "ፋይሎች"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1803,7 +1819,7 @@ msgstr "የ_ጋማ ዕሴት"
 msgid "Error loading icon: %s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1812,7 +1828,7 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr ""
@@ -1901,7 +1917,7 @@ msgstr "(ያልታወቀ)"
 msgid "clear"
 msgstr "ሰርዝ"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "ሁሉንም ምረጡ"
 
@@ -2338,43 +2354,43 @@ msgstr "ከቅርበት ዕይታ (_I)"
 msgid "Zoom _Out"
 msgstr "ከርቀት ዕይታ (_O)"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr ""
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr ""
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr ""
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr ""
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr ""
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr ""
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr ""
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr ""
 
@@ -2456,7 +2472,7 @@ msgstr "ቪትናምኛ (VIQR)"
 msgid "X Input Method"
 msgstr "የX ዘገባ የማስትገባት ዘዴ"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 249db1366c..aa2f0baaa2 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-08-30 19:23+0300\n"
 "Last-Translator: Ayman Hourieh <aymanh@gmail.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "فشل فتح الملف '%s': %s"
@@ -31,7 +31,7 @@ msgid "Image file '%s' contains no data"
 msgstr "لا·يحتوي·ملف الصورة '%s' على بيانات"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1265,20 +1265,20 @@ msgstr "عجلة اللّون"
 msgid "Color Selection"
 msgstr "اللون المنقى"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "اختيار ال_كلّ"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "طرق ال_إدخال"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "إ_دراج رمز تحكم يونيكود"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "اسم ملف غير سليم: %s"
@@ -1288,12 +1288,12 @@ msgstr "اسم ملف غير سليم: %s"
 msgid "Select A File"
 msgstr "حذف ملف"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "الدليل المنزلي"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "المكتب"
@@ -1307,200 +1307,216 @@ msgstr "لا شيء"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr ""
 "لم أستطع سحب معلومات حول %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 #, fuzzy
 msgid "Could not add a bookmark"
 msgstr ""
 "لم أستطع إضافة علامة موقع لـ %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 #, fuzzy
 msgid "Could not remove bookmark"
 msgstr ""
 "لم أستطع حذف علامة الموقع لـ %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "اسم ملف غير سليم: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 "لم أستطع سحب معلومات حول %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, fuzzy, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "لم أستطع إضافة علامة موقع لـ %s لانه اسم مسار غير صحيح."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_حذف"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_إعادة تسمية"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "اختصارات"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "دليل"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "إ_ضافة"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_حذف"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "لم أستطع إنتقاء %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "لم أستطع إضافة علامة موقع لـ %s لانه اسم مسار غير صحيح."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "اختصارات"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "فتح الموقع"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "عرض الملفات ال_مخفيّة."
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "ملفات"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "الإ_سم"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "الحجم"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "مغيَّر"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "إنشاء _دليل"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "الإ_سم:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_تصفّح لأدلّة أخرى"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "حفظ في ال_دليل:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "إنشاء في ال _دليل:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 #, fuzzy
 msgid "Cannot change to folder because it is not local"
 msgstr "لا يمكن التحويل إلى الدليل لأنه غير محلي."
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "الاختصار %s غير موجود"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_إعادة تسمية"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "لم أستطع إنتقاء %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "اسم نوع الدليل الجديد"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
@@ -1509,66 +1525,66 @@ msgstr[1] "%d ًبايتا"
 msgstr[2] "%d ًبايتا"
 msgstr[3] "%d ًبايتا"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f كـ"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f م"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f غ"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "مجهول"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "اليوم"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "البارحة"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "إنشاء في ال _دليل:"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 #, fuzzy
 msgid "The folder you specified is an invalid path."
 msgstr "لا أستطيع تغيير الدليل الذي حدّدته لأنّه مسار غير سليم."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, fuzzy, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 "لم أستطع بناء اسم الملف من '%s' و '%s':\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "لم أستطع إنتقاء %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "فتح الموقع"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "حفظ في مكان"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "ال_موقع:"
 
@@ -1766,7 +1782,8 @@ msgid "This file system does not support mounting"
 msgstr "نظام الملفات هذا لا يدعم التجهيز"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "نظام الملفات"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1868,7 +1885,7 @@ msgstr "قيمة _جاما"
 msgid "Error loading icon: %s"
 msgstr "خطأ عند تحميل الأيقونة: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1881,7 +1898,7 @@ msgstr ""
 "يمكنك تلقي نسخة من:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "الأيقونة '%s' غير موجودة في التّيمة"
@@ -1969,7 +1986,7 @@ msgstr "(مجهول)"
 msgid "clear"
 msgstr "مسح"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "إنتقاء الكلّ"
 
@@ -2405,43 +2422,43 @@ msgstr "_تكبير"
 msgid "Zoom _Out"
 msgstr "ت_صغير"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM علامة يسار-_لليمين"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM علامة ي_مين-لليسار"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE _ثبات يسار-لليمين"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE ث_بات يمين-لليسار"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO _تجاهل يسار-لليمين"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO ت_جاهل يمين-لليسار"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _تهيئة توجيهيّة منبثقة"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS مسافة _صفرية للعرض"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ _واصل عرضي صفري"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ _غير واصل صفري للعرض "
 
@@ -2524,7 +2541,7 @@ msgstr "الفيتنامية (VIQR)"
 msgid "X Input Method"
 msgstr "طريقة الإدخال X"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "لم أستطع تلقي معلومات عن الملف '%s': %s"
diff --git a/po/az.po b/po/az.po
index 7ed09e437f..2de2c439ab 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-04-17 22:41+0300\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "'%s' faylı açıla bilmədi: %s"
@@ -30,7 +30,7 @@ msgid "Image file '%s' contains no data"
 msgstr "'%s' rəsm faylı heç bir mə'lumat daxil etmir"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1281,20 +1281,20 @@ msgstr "Rəng Çərxi"
 msgid "Color Selection"
 msgstr "Rəng Seçkisi"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "_Hamısını Seç"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Giriş _Metodları"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Yunikod İdarə Hərfi Daxil Et"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Hökmsüz fayl adı: %s"
@@ -1304,12 +1304,12 @@ msgstr "Hökmsüz fayl adı: %s"
 msgid "Select A File"
 msgstr "Faylı Sil"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Ev"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Masa Üstü"
@@ -1323,265 +1323,281 @@ msgstr "heç biri"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr ""
 "%s haqqında mə'lumat alına bilmədi:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 #, fuzzy
 msgid "Could not add a bookmark"
 msgstr ""
 "%s nişanlara əlavə edilə bilmədi:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 #, fuzzy
 msgid "Could not remove bookmark"
 msgstr ""
 "%s nişanı silinə bilmədi:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Hökmsüz fayl adı: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 "%s haqqında mə'lumat alına bilmədi:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, fuzzy, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "%s hökmsüz cığır adı olduğu üçün nişanlara əlavə edilə bilmədi."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Sil"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Yenidən Adlandır"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Qovluq"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "Ə_lavə Et"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Sil"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "%s seçilə bilmədi:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "%s hökmsüz cığır adı olduğu üçün nişanlara əlavə edilə bilmədi."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "Mövqe Aç"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "_Gizli Faylları Göstər"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Fayllar"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Ad"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Böyüklük"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Təkmilləşdirmə tarixi"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "_Qovluq Yarat"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Ad:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Digər qovluqları gəz"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "_Qovluğa qeyd et:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "_Qovluqda yarat:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 #, fuzzy
 msgid "Cannot change to folder because it is not local"
 msgstr "Qovluq yerli olmadığına görə açıla bilmədi."
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "%s qısa yolu mövcud deyil"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Yenidən Adlandır"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "%s seçilə bilmədi:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Yeni qovluğun adını yazın"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d bayt"
 msgstr[1] "%d bayt"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Namə'lum"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Bugün"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Dünən"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "_Qovluqda yarat:"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 #, fuzzy
 msgid "The folder you specified is an invalid path."
 msgstr "Bildirdiyiniz qovluq hökmsüz cığırda olduğuna görə açıla bilmədi."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, fuzzy, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 "'%s' və '%s'-dan fayl adı yaradıla bilmədi:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "%s seçilə bilmədi:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Mövqe Aç"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Mövqeyə Qeyd Et"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Mövqe:"
 
@@ -1780,7 +1796,8 @@ msgid "This file system does not support mounting"
 msgstr "Bu fayl sistemi bağlama əməliyyatını dəstəkləmir"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Fayl Sistemi"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1883,7 +1900,7 @@ msgstr "_Qamma qiyməti"
 msgid "Error loading icon: %s"
 msgstr "Timsal yükləmə xətası: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1896,7 +1913,7 @@ msgstr ""
 "Örtüyü bu ünvandan tə'min edə bilərsiniz:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Örtükdə '%s' timsalı mövcud deyil"
@@ -1984,7 +2001,7 @@ msgstr "(namə'lum)"
 msgid "clear"
 msgstr "təmizlə"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Hamısını Seç"
 
@@ -2419,43 +2436,43 @@ msgstr "_Yaxınlaşdır"
 msgid "Zoom _Out"
 msgstr "_Uzaqlaşdır"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM _Soldan sağa nişan"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM _Sağdan sola nişan"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Soldan sağa _geydirmə"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Sağdan sola g_eydirmə"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Soldan sağa _rədd etmə"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Sağdan sola rə_dd etmə"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Pop istiqaməti əsaslı şəkilləndirmə"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _Sıfır en sahəsi"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Sıfır en _birləşdirici"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Sıfır en birləşdirici _olmayan"
 
@@ -2538,7 +2555,7 @@ msgstr "Vyetnamca (VIQR)"
 msgid "X Input Method"
 msgstr "X Giriş Yöntəmi"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "'%s' faylının mə'lumatı alına bilmədi: %s"
diff --git a/po/az_IR.po b/po/az_IR.po
index b19d629c8a..71d7f6eddd 100644
--- a/po/az_IR.po
+++ b/po/az_IR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ gtk-2-4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-09-27 14:58+0330\n"
 "Last-Translator: Amir Hedayaty <amir@bamdad.org>\n"
 "Language-Team: Iranian Azerbaijani <az-ir@lists.sharif.edu>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr ""
@@ -28,7 +28,7 @@ msgid "Image file '%s' contains no data"
 msgstr ""
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1216,20 +1216,20 @@ msgstr ""
 msgid "Color Selection"
 msgstr ""
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr ""
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr ""
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr ""
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr ""
@@ -1238,12 +1238,12 @@ msgstr ""
 msgid "Select A File"
 msgstr ""
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr ""
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr ""
@@ -1256,237 +1256,252 @@ msgstr ""
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 msgid "Could not select file"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr ""
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+msgid "_Replace"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr ""
 
@@ -1672,7 +1687,7 @@ msgid "This file system does not support mounting"
 msgstr ""
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+msgid "File System"
 msgstr ""
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1773,7 +1788,7 @@ msgstr ""
 msgid "Error loading icon: %s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1782,7 +1797,7 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr ""
@@ -1870,7 +1885,7 @@ msgstr ""
 msgid "clear"
 msgstr ""
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr ""
 
@@ -2296,43 +2311,43 @@ msgstr ""
 msgid "Zoom _Out"
 msgstr ""
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr ""
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr ""
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr ""
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr ""
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr ""
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr ""
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr ""
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr ""
 
@@ -2414,7 +2429,7 @@ msgstr ""
 msgid "X Input Method"
 msgstr ""
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr ""
diff --git a/po/be.po b/po/be.po
index 6540709dbe..f526e0167d 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2003-03-31 07:40+0300\n"
 "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "X-Generator: KBabel 0.9.6\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Немагчыма адкрыць файл \"%s\": %s"
@@ -27,7 +27,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Файл з відарысам \"%s\" ня ўтрымлівае даньняў."
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1295,22 +1295,22 @@ msgstr "Пракрутка"
 msgid "Color Selection"
 msgstr "Выбар шрыфта"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 #, fuzzy
 msgid "Select _All"
 msgstr "Адзначыць усё"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Мэтады _ўводу"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 #, fuzzy
 msgid "_Insert Unicode Control Character"
 msgstr "Уставіць кіруючы знак Unicode"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, fuzzy, c-format
 msgid "Invalid filename: %s"
 msgstr "Нерэчаісны XBM файл"
@@ -1320,13 +1320,13 @@ msgstr "Нерэчаісны XBM файл"
 msgid "Select A File"
 msgstr "Зьнішчыць файл"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 #, fuzzy
 msgid "Home"
 msgstr "Да _хаты"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr ""
@@ -1340,261 +1340,277 @@ msgstr "няма"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr "Немагчыма распазнаць фармат файла з малюнкам \"%s\"."
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Нерэчаісны XBM файл"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Немагчыма распазнаць фармат файла з малюнкам \"%s\"."
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "Прыбраць"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Перайменаваць"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 #, fuzzy
 msgid "Folder"
 msgstr "Каталёгі"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "Дадаць"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "Прыбраць"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "Памылка стварэньня каталёгу \"%s\": %s\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "_Выбар: "
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Файлы"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 #, fuzzy
 msgid "Name"
 msgstr "Назва _колеру:"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Памер"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 #, fuzzy
 msgid "Modified"
 msgstr "Рэжым"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "Стварыць тэчку"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 #, fuzzy
 msgid "_Name:"
 msgstr "Назва _колеру:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 #, fuzzy
 msgid "Save in _folder:"
 msgstr "Стварыць тэчку"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 #, fuzzy
 msgid "Create in _folder:"
 msgstr "Стварыць тэчку"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Перайменаваць"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "Памылка стварэньня каталёгу \"%s\": %s\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 #, fuzzy
 msgid "Unknown"
 msgstr "(невядомы)"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 #, fuzzy
 msgid "Today"
 msgstr "Мадальнае"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Стварыць тэчку"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "Памылка стварэньня каталёгу \"%s\": %s\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "_Выбар: "
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 #, fuzzy
 msgid "_Location:"
 msgstr "_Выбар: "
@@ -1796,7 +1812,7 @@ msgstr ""
 
 #: gtk/gtkfilesystemunix.c:639
 #, fuzzy
-msgid "Filesystem"
+msgid "File System"
 msgstr "Файлы"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1897,7 +1913,7 @@ msgstr "Гама значэньне"
 msgid "Error loading icon: %s"
 msgstr "Памылка загрузкі значкі: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1906,7 +1922,7 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr ""
@@ -1996,7 +2012,7 @@ msgstr "(невядомы)"
 msgid "clear"
 msgstr "ачысьціць"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Адзначыць усё"
 
@@ -2433,43 +2449,43 @@ msgstr "Маштаб _+"
 msgid "Zoom _Out"
 msgstr "Маштаб _-"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM - вылучэньне зьлева направа"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM - вылучэньне зправа налева"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE устаўка зьлева направа"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE устаўка зправа налева"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO перазапіс зьлева направа"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO перазапіс зправа налева"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF Разьмеркаваньне па вэртыкалі"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS Нулявы прагал"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Нулявы аб'яднальнік"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Нулявы разьяднальнік"
 
@@ -2552,7 +2568,7 @@ msgstr "Ветнамская (VIQR)"
 msgid "X Input Method"
 msgstr "X мэтад уводу (X Input Method)"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, fuzzy, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Немагчыма распазнаць фармат файла з малюнкам \"%s\"."
diff --git a/po/bg.po b/po/bg.po
index 90a0a8aa47..7859ec982a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gtk+ 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-05-15 13:24+0300\n"
 "Last-Translator: Vladimir Petkov <vpetkov@i-space.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Неуспех при отваряне на файла \"%s\": %s"
@@ -30,7 +30,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Графичният файл \"%s\" не съдържа данни"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1260,20 +1260,20 @@ msgstr "Цветна палитра"
 msgid "Color Selection"
 msgstr "Избор на цвят"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Избиране на _всичко"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Методи за вход"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Вмъкване на уникод контролен символ"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Невалидно име на файла: %s"
@@ -1282,12 +1282,12 @@ msgstr "Невалидно име на файла: %s"
 msgid "Select A File"
 msgstr "Избор на файл"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Домашна папка"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Работно Място"
@@ -1300,240 +1300,256 @@ msgstr "(без)"
 msgid "Other..."
 msgstr "Друго..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Информацията за файла не може да бъде получена"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Не може да бъде добавена отметка"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Не може да бъде премахната отметка"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Папката не може да бъде създадена"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Невалидно име на файл"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Съдържанието на папката не може да бъде показано"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Информацията за \"%s\" не може да бъде получена: %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Добавяне на папката \"%s\" към отметките"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Добавяне на текущата папка към отметките"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Добавяне на избраните папки към отметките"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Премахване на отметката \"%s\""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Не може да се добави отметка за \"%s\", понеже това е невалидно име на път."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Премахване"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Преименуване..."
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Бързи клавиши"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Папка"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Добавяне"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Добавяне на избраната папка към отметките"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Премахване"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Изтриване на избраната отметка"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Не може да бъде избран елемента"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "Не може да се добави отметка за \"%s\", понеже това е невалидно име на път."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "_Добавяне към отметките"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Отваряне на _местоположение"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Показване на _скритите файлове"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Файлове"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Име"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Размер"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Променян на"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Избор на видовете файлове, които се показват"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Създаване на _папка"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Име:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Отваряне на други папки"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Запазване в п_апка"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Създаване в _папка:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Не може да е тази папка, защото тя не е локална"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Бързият клавиш %s не съществува"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Преименуване"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Не може да се монтира \"%s\""
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Напишете името на новата папка"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d байт"
 msgstr[1] "%d байта"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f К"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f М"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f Г"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Неизвестен"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Днес"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Вчера"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Не може да се смени текущата папка"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Посочената папка е невалиден път."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Не може да се създаде име на файл от \"%s\" и \"%s\""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Не може да бъде избран елемента"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Отваряне на местоположение"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Запазване в"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Местоположение"
 
@@ -1737,7 +1753,8 @@ msgid "This file system does not support mounting"
 msgstr "Тази файлова система не поддържа монтиране"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Файлова система"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1840,7 +1857,7 @@ msgstr "_Гама стойност"
 msgid "Error loading icon: %s"
 msgstr "Грешка при зареждането на икона: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1853,7 +1870,7 @@ msgstr ""
 "You·can·get·a·copy·from:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Иконата \"%s\" не е част от темата"
@@ -1941,7 +1958,7 @@ msgstr "(неизвестен)"
 msgid "clear"
 msgstr "чист"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Избиране на всичко"
 
@@ -2368,43 +2385,43 @@ msgstr "Увеличаване"
 msgid "Zoom _Out"
 msgstr "Намаляване"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM Маркер за _ляво-дясно"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM Маркер за _дясно-ляво"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE ляво-дясно _вмъкване"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE дясно-ляво в_мъкване"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO ляво-дясно _изключване"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO дясно-ляво и_зключване"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Връщане на предишната посока"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _Интервал с нулева ширина"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ _Свръзка с нулева ширина"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ _Развръзка с нулева ширина"
 
@@ -2486,7 +2503,7 @@ msgstr "Виетнамска (VIQR)"
 msgid "X Input Method"
 msgstr "Метод за въвеждане към X"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Не може да бъде взета информация за файла '%s': %s"
diff --git a/po/bn.po b/po/bn.po
index 9f9fcf748d..80d0a6ba26 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+.gtk-2-2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-03-17 21:00+0600\n"
 "Last-Translator: Progga <progga@BengaLinux.Org>\n"
 "Language-Team: Bangla <gnome-translation@BengaLinux.Org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr " '%s' ফাইলটি খোলা যায় নি: %s"
@@ -28,7 +28,7 @@ msgid "Image file '%s' contains no data"
 msgstr " '%s' নামক ছবির ফাইলে কোন তথ্য নেই"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1279,20 +1279,20 @@ msgstr "চাকা"
 msgid "Color Selection"
 msgstr "রং নির্বাচন"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "সব কিছু চিহ্নিত করো (_ন)"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "ইনপুট পদ্ধতি (_প)"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "ইউনিকোড কন্ট্রোল ক্যারেকটার ঢোকাও (_ঢ)"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "ফাইলের নাম বেঠিক: %s"
@@ -1302,12 +1302,12 @@ msgstr "ফাইলের নাম বেঠিক: %s"
 msgid "Select A File"
 msgstr "ফাইল মুছে ফেলো"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "ব্যক্তিগত ফোল্ডার"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "ডেস্কটপ"
@@ -1321,112 +1321,112 @@ msgstr "একটিও নয়"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr ""
 "%s সম্পর্কে তথ্য জানা যায় নি:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 #, fuzzy
 msgid "Could not add a bookmark"
 msgstr ""
 "%s-এর জন্য বুকমার্ক যোগ করা যায় নি:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 #, fuzzy
 msgid "Could not remove bookmark"
 msgstr ""
 "%s-এর বুকমার্ক অপসারণ করা যায় নি:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "ফাইলের নাম বেঠিক: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 "%s সম্পর্কে তথ্য জানা যায় নি:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
 # FIXME
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, fuzzy, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "%s কোন নির্ভূল পাথ (Path) না হওয়ায় এর জন্য বুকমার্ক যোগ করা যায় নি।"
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "অপসারণ (_অ)"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "নাম পরিবর্তন (_প)"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "ফোল্ডার"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "যোগ (_য)"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "অপসারণ (_অ)"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
@@ -1434,159 +1434,175 @@ msgstr ""
 "%s"
 
 # FIXME
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "%s কোন নির্ভূল পাথ (Path) না হওয়ায় এর জন্য বুকমার্ক যোগ করা যায় নি।"
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "এই অবস্থান খোলো"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "ফাইল"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "নাম"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "আকার"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "পরিবর্তিত"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "ফোল্ডার তৈরি করো (_ত)"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "নাম (_ন):"
 
 # FIXME
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "অন্যান্য ফোল্ডারের জন্য ব্রাউজ করো (_ব)"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "এই ফোল্ডারে সংরক্ষণ করো (_ফ):"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "এই ফোল্ডারে তৈরি করো (_ল):"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 #, fuzzy
 msgid "Cannot change to folder because it is not local"
 msgstr ""
 "যে ফোল্ডারটি উল্লেখ করেছেন তার পাথ (Path) বেঠিক হওয়ায় তাতে প্রবেশ করা যায় নি।"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "%s শর্টকাটের অস্তিত্ব নেই"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "নাম পরিবর্তন (_প)"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "%s-কে বাছাই করা যায় নি:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "নতুন ফোল্ডারের নাম লিখুন"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d বাইট"
 msgstr[1] "%d বাইট"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f কিলোবাইট"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f মেগাবাইট"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f গিগাবাইট"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "অজ্ঞাত"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "আজ"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "গতকাল"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "এই ফোল্ডারে তৈরি করো (_ল):"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 #, fuzzy
 msgid "The folder you specified is an invalid path."
 msgstr ""
 "যে ফোল্ডারটি উল্লেখ করেছেন তার পাথ (Path) বেঠিক হওয়ায় তাতে প্রবেশ করা যায় নি।"
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, fuzzy, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 "%s' এবং '%s' থেকে ফাইলের নাম তৈরি করা যায় নি:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "%s-কে বাছাই করা যায় নি:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "এই অবস্থান খোলো"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "এই অবস্থান খোলো"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "অবস্থান (_অ):"
 
@@ -1786,7 +1802,8 @@ msgid "This file system does not support mounting"
 msgstr "এই ফাইল-সিস্টেম মাউন্ট করার প্রক্রিয়া সমর্থ করে না"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "ফাইল-সিস্টেম"
 
 # FIXME
@@ -1888,7 +1905,7 @@ msgstr "গামার মান (_গ)"
 msgid "Error loading icon: %s"
 msgstr "আইকন লোড করার সময় সমস্যা হয়েছে: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1901,7 +1918,7 @@ msgstr ""
 "থিমের একটি কপি পাবেন এখানে:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "থিমের মধ্যে আইকন '%s' নেই"
@@ -1991,7 +2008,7 @@ msgstr "(অজ্ঞাত)"
 msgid "clear"
 msgstr "পরিষ্কার"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "সব কিছু চিহ্নিত করো"
 
@@ -2429,43 +2446,43 @@ msgstr "বড় করো (_ব)"
 msgid "Zoom _Out"
 msgstr "ছোট করো (_ছ)"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "এলআরএম বাম-থেকে-ডান নির্দেশক চিহ্ন (_ব)"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "আরএলএম ডান-থেকে-বাম নির্দেশক চিহ্ন (_ড)"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "এলআরই বাম-থেকে-ডান সন্নিবেশন (_স)"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "আরএলই ডান-থেকে-বাম সন্নিবেশন (_ন)"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "এলআরও বাম-থেকে-ডান অগ্রাহ্যকরণ (_অ)"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "আরএলও ডান-থেকে-বাম অগ্রাহ্যকরণ (_গ)"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "পিডিএফ পপ ডিরেক্সনাল ফরম্যাটিং (_প)"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS শূন্য প্রস্থ ফাঁক (_ফ)"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ শূন্য প্রস্থ সংযোজক (_স)"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ শূন্য প্রস্থ অসংযোজক (_অ)"
 
@@ -2550,7 +2567,7 @@ msgid "X Input Method"
 msgstr "এক্স ইনপুট পদ্ধতি"
 
 # FIXME
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "'%s' ফাইল সম্পর্কে তথ্য এই পাওয়া যায় নি: %s"
diff --git a/po/br.po b/po/br.po
index 331a48527f..7a20779856 100644
--- a/po/br.po
+++ b/po/br.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-08-03 00:53+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: br <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Fazi en ur zigeriñ « %s »: %s"
@@ -25,7 +25,7 @@ msgid "Image file '%s' contains no data"
 msgstr ""
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1219,20 +1219,20 @@ msgstr "Rodel al liv"
 msgid "Color Selection"
 msgstr ""
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Diuz an &Holl"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr ""
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr ""
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Anv ar restr direizh : %s"
@@ -1242,12 +1242,12 @@ msgstr "Anv ar restr direizh : %s"
 msgid "Select A File"
 msgstr "Distruj Restr"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Kêr"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Burev"
@@ -1261,246 +1261,262 @@ msgstr "hini ebet"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Anv ar restr direizh : %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 "Ne m'eus ket krouet ar _renkell : %s\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Lemel"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Adenvel"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Berradennoù"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Renkell"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Ouzhpennañ"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Lemel"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Ne m'eus ket gallet kavout ar hent"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "_Ouzhpennañ er Berradennoù"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "Digeriñ ul lec'hiadur"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Restroù"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Anv"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Ment"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr " Kemmet"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Krouiñ ar _renkell"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Anv :"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Enrollañ e _renkell :"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Krouiñ en ur renkell :"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "N'eus ket ur berradenn %s"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Adenvel"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr "Ne m'eus ket gallet kavout ar hent"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, fuzzy, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d okted"
 msgstr[1] "%d okted"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Dianav"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Hiziv"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Dec'h"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Krouiñ en ur renkell :"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Digeriñ ul lec'hiadur"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Enrollañ e Lec'hiadur"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Lec'hiadur :"
 
@@ -1686,7 +1702,8 @@ msgid "This file system does not support mounting"
 msgstr ""
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Reizhiad-restr"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1787,7 +1804,7 @@ msgstr ""
 msgid "Error loading icon: %s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1796,7 +1813,7 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr ""
@@ -1884,7 +1901,7 @@ msgstr "(dianav)"
 msgid "clear"
 msgstr "goullonderiñ"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Diuz an Holl"
 
@@ -2322,43 +2339,43 @@ msgstr "_Tostoc'h"
 msgid "Zoom _Out"
 msgstr "_Pelloc'h"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr ""
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr ""
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr ""
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr ""
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr ""
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr ""
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr ""
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr ""
 
@@ -2440,7 +2457,7 @@ msgstr "Yezh ar Viet-Nam (VIQR)"
 msgid "X Input Method"
 msgstr ""
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr ""
diff --git a/po/bs.po b/po/bs.po
index 8beb493dd2..728e5a8deb 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+.gtk-2-4.bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-07-31 01:30+0200\n"
 "Last-Translator: Kenan Hadžiavdić <kenan@bgnett.no>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Nisam uspio otvoriti datoteku '%s': %s"
@@ -32,7 +32,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Grafička datoteka '%s' ne sadrži podatke"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1287,20 +1287,20 @@ msgstr "Točak sa bojama"
 msgid "Color Selection"
 msgstr "Izbor boje"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Izaberi _sve"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Metode unosa"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Ubaci kontrolni unicode znak"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Nevažeće ime datoteke: %s"
@@ -1310,12 +1310,12 @@ msgstr "Nevažeće ime datoteke: %s"
 msgid "Select A File"
 msgstr "Izbriši datoteku"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Početak"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Desktop"
@@ -1329,200 +1329,216 @@ msgstr "ništa"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr ""
 "Nisam mogao dobaviti informacije o %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 #, fuzzy
 msgid "Could not add a bookmark"
 msgstr ""
 "Nisam mogao dodati zabilješku za %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 #, fuzzy
 msgid "Could not remove bookmark"
 msgstr ""
 "Nisam mogao ukloniti zabilješku za %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Nevažeće ime datoteke: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 "Nisam mogao dobaviti informacije o %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, fuzzy, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "Nisam mogao dodati tabilješku za %s zato što je nevažeća putanja."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Ukloni"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Preimenuj"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Kratice"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Direktorij"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "Nisam mogao izabrati %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "Nisam mogao dodati tabilješku za %s zato što je nevažeća putanja."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "Kratice"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "Otvori lokaciju"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Pokaži _skrivene datoteke"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Datoteke"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Ime"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Veličina"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Promijenjeno"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Napravi _direktorij"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Potraži u drugim direktorijima"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Snimi u _direktorij:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Napravi u _direktoriju:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 #, fuzzy
 msgid "Cannot change to folder because it is not local"
 msgstr "Ne mogu ući u direktorij zato što nije lokalni"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "kratica %s ne postoji"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Preimenuj"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "Nisam mogao izabrati %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Ukucajte ime novog direktorija"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
@@ -1530,66 +1546,66 @@ msgstr[0] "%d bajt"
 msgstr[1] "%d bajta"
 msgstr[2] "%d bajtova"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Nepoznat"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Danas"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Jučer"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Napravi u _direktoriju:"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 #, fuzzy
 msgid "The folder you specified is an invalid path."
 msgstr "Ne mogu ući u direktorij koji ste naveli jer je putanja nevažeća."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, fuzzy, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 "Nisam mogao napraviti ime datoteke od '%s' i '%s':\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "Nisam mogao izabrati %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Otvori lokaciju"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Snimi na lokaciji"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Lokacija:"
 
@@ -1791,7 +1807,8 @@ msgid "This file system does not support mounting"
 msgstr "Ovaj datotečni sistem ne podržava montiranje"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Datotečni sistem"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1894,7 +1911,7 @@ msgstr "_Gama vrijednost"
 msgid "Error loading icon: %s"
 msgstr "Greška tokom učitavanja ikone: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1907,7 +1924,7 @@ msgstr ""
 "Možete dobaviti kopiju sa:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Nema ikone '%s' u temi"
@@ -1995,7 +2012,7 @@ msgstr "(nepoznato)"
 msgid "clear"
 msgstr "očisti"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Izaberi sve"
 
@@ -2431,43 +2448,43 @@ msgstr "_Uvećaj"
 msgid "Zoom _Out"
 msgstr "_Umanji"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM Oznaka od _lijevo prema desno"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM Oznaka od _desno prema lijevo"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE _Ubacivanje od lijeva prema desno"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Ubacivanje od _desna prema lijevo"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO _Prelaženje od lijeva prema desno"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Pre_laženje od desna prema lijevo"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Otvori usmjereno formatiranje"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _Razmak nula širine"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ _Povlaka nula širine"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ _Ne-povlaka nula širine"
 
@@ -2550,7 +2567,7 @@ msgstr "Vijetnamski (VIQR)"
 msgid "X Input Method"
 msgstr "X ulazna metoda"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Nisam mogao dobaviti informacije za datoteku '%s': %s"
diff --git a/po/ca.po b/po/ca.po
index e618f5c3b4..db59e7b5c2 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.6.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-04-11 03:03+0200\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "No s'ha pogut obrir el fitxer «%s»: «%s»"
@@ -30,7 +30,7 @@ msgid "Image file '%s' contains no data"
 msgstr "El fitxer gràfic «%s» no conté dades"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1267,20 +1267,20 @@ msgstr "Roda de colors"
 msgid "Color Selection"
 msgstr "Selecció de color"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Seleccion_a-ho tot"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Mètodes d'entrada"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Insereix caràcters de control Unicode"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "El nom del fitxer no és vàlid: %s"
@@ -1289,12 +1289,12 @@ msgstr "El nom del fitxer no és vàlid: %s"
 msgid "Select A File"
 msgstr "Seleccioneu un fitxer"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Inici"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Escriptori"
@@ -1307,242 +1307,258 @@ msgstr "(Cap)"
 msgid "Other..."
 msgstr "Altre..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "No s'ha pogut obtenir informació sobre el fitxer"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "No s'ha pogut afegir una adreça d'interès"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "No s'ha pogut suprimir l'adreça d'interès"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "No s'ha pogut crear la carpeta"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "El nom del fitxer és invàlid"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "No s'ha pogut mostrar el contingut de la carpeta"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "No s'ha pogut obtenir informació sobre «%s»: %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Afegeix la carpeta «%s» a les adreces d'interès"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Afegeix la carpeta actual a les adreces d'interès"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Afegeix les carpetes seleccionades a les adreces d'interès"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Suprimeix l'adreça d'interès «%s»"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "No s'ha pogut afegir una adreça d'interès per a «%s» perquè és un nom de "
 "camí invàlid."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Suprimeix"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Canvia el nom..."
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Dreceres"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Carpeta"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Afegeix"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Afegeix la carpeta seleccionada a les adreces d'interès"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Suprimeix"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Suprimeix les adreces d'interès seleccionades"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "No s'ha pogut seleccionar l'element"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "No s'ha pogut afegir una adreça d'interès per a «%s» perquè és un nom de "
 "camí invàlid."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "_Afegeix a les adreces d'interès"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Obre una _ubicació"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Mostra els fitxers _ocults"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Fitxers"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Nom"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Mida"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Modificat"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Seleccioneu quins tipus de fitxers es mostren"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Crea una ca_rpeta"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Nom:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "Na_vega per unes altres carpetes"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "De_sa en la carpeta:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Crea en la _carpeta:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "No es pot canviar a la carpeta perquè no és local"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "La drecera %s no existeix"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Canvia el nom"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "No s'ha pogut muntar %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Nom del tipus de la nova carpeta"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d octet"
 msgstr[1] "%d octets"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f KB"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f MB"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f GB"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Avui"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Ahir"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "No es pot canviar de carpeta"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "La carpeta que heu especificat és un camí invàlid."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "No s'ha pogut construir el nom del fitxer des de «%s» i «%s»"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "No s'ha pogut seleccionar l'element"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Obre una ubicació"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Desa en una ubicació"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Ubicació:"
 
@@ -1747,7 +1763,8 @@ msgid "This file system does not support mounting"
 msgstr "Aquest sistema de fitxers no permet ser muntat"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Sistema de fitxers"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1850,7 +1867,7 @@ msgstr "Valor de la _gamma"
 msgid "Error loading icon: %s"
 msgstr "S'ha produït un error en carregar la icona: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1863,7 +1880,7 @@ msgstr ""
 "Podeu obtenir-ne una còpia de:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "La icona «%s» no es troba al tema"
@@ -1951,7 +1968,7 @@ msgstr "(desconegut)"
 msgid "clear"
 msgstr "neteja"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Selecciona-ho tot"
 
@@ -2385,43 +2402,43 @@ msgstr "_Amplia"
 msgid "Zoom _Out"
 msgstr "_Redueix"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "Marca _esquerra-a-dreta LRM"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "Marca _dreta-a-esquerra RLM"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "_Incrustació esquerra-a-dreta LRE"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "I_ncrustació dreta-a-esquerra RLE"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "_Substitució esquerra-a-dreta LRO"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "S_ubstitució dreta-a-esquerra RLO"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "_Format direccional pop PDF"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "Espai d'amplada _zero ZWS"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "En_samblador d'amplada zero ZWJ"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "_No-ensamblador d'amplada zero ZWNJ"
 
@@ -2505,7 +2522,7 @@ msgstr "Vietnamita (VIQR)"
 msgid "X Input Method"
 msgstr "Mètode d'entrada d'X"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "No s'ha pogut obtenir informació per al fitxer «%s»: %s"
diff --git a/po/cs.po b/po/cs.po
index 0e07fe98dc..54ac5a7a85 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-13 14:27+0000\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-07-14 10:48+0200\n"
 "Last-Translator: Miloslav Trmac <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -21,19 +21,19 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:153 ../gdk-pixbuf/gdk-pixbuf-io.c:838
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1089 ../tests/testfilechooser.c:218
+#: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Nemohu otevřít soubor '%s': %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:166 ../gdk-pixbuf/gdk-pixbuf-io.c:850
+#: gdk-pixbuf/gdk-pixbuf-animation.c:166 gdk-pixbuf/gdk-pixbuf-io.c:850
 #, c-format
 msgid "Image file '%s' contains no data"
 msgstr "Soubor obrázku '%s' neobsahuje data"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:208 ../gdk-pixbuf/gdk-pixbuf-io.c:887
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1130 ../tests/testfilechooser.c:263
+#: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -41,7 +41,7 @@ msgstr ""
 "Nemohu načíst obrázek '%s': důvod není znám, pravděpodobně poškozený soubor "
 "obrázku"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:241
+#: gdk-pixbuf/gdk-pixbuf-animation.c:241
 #, c-format
 msgid ""
 "Failed to load animation '%s': reason not known, probably a corrupt "
@@ -50,12 +50,12 @@ msgstr ""
 "Nemohu načíst animaci '%s': důvod není znám, pravděpodobně poškozený soubor "
 "animace"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:444
+#: gdk-pixbuf/gdk-pixbuf-io.c:444
 #, c-format
 msgid "Unable to load image-loading module: %s: %s"
 msgstr "Nemohu načíst modul pro čtení obrázků: %s: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:459
+#: gdk-pixbuf/gdk-pixbuf-io.c:459
 #, c-format
 msgid ""
 "Image-loading module %s does not export the proper interface; perhaps it's "
@@ -64,53 +64,53 @@ msgstr ""
 "Modul pro čtení obrázků %s neexportuje správné rozhraní; možná je z jiné "
 "verze GTK?"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:628 ../gdk-pixbuf/gdk-pixbuf-io.c:680
+#: gdk-pixbuf/gdk-pixbuf-io.c:628 gdk-pixbuf/gdk-pixbuf-io.c:680
 #, c-format
 msgid "Image type '%s' is not supported"
 msgstr "Typ obrázku '%s' není podporován"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:720
+#: gdk-pixbuf/gdk-pixbuf-io.c:720
 #, c-format
 msgid "Couldn't recognize the image file format for file '%s'"
 msgstr "Nemohu rozpoznat formát souboru obrázku u souboru '%s'"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:728
+#: gdk-pixbuf/gdk-pixbuf-io.c:728
 msgid "Unrecognized image file format"
 msgstr "Nerozpoznaný formát souboru obrázku"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:896
+#: gdk-pixbuf/gdk-pixbuf-io.c:896
 #, c-format
 msgid "Failed to load image '%s': %s"
 msgstr "Nemohu načíst obrázek '%s': %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1357
+#: gdk-pixbuf/gdk-pixbuf-io.c:1357
 #, c-format
 msgid "Error writing to image file: %s"
 msgstr "Chyba při zápisu do souboru obrázku: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1403 ../gdk-pixbuf/gdk-pixbuf-io.c:1532
+#: gdk-pixbuf/gdk-pixbuf-io.c:1403 gdk-pixbuf/gdk-pixbuf-io.c:1532
 #, c-format
 msgid "This build of gdk-pixbuf does not support saving the image format: %s"
 msgstr "Toto sestavení gdk-pixbuf nepodporuje ukládání obrázku ve formátu: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1437
+#: gdk-pixbuf/gdk-pixbuf-io.c:1437
 msgid "Insufficient memory to save image to callback"
 msgstr "Nedostatek paměti pro uložení obrázku pro callback"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1449
+#: gdk-pixbuf/gdk-pixbuf-io.c:1449
 msgid "Failed to open temporary file"
 msgstr "Nemohu otevřít dočasný soubor"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1474
+#: gdk-pixbuf/gdk-pixbuf-io.c:1474
 msgid "Failed to read from temporary file"
 msgstr "Nemohu číst z dočasného souboru"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1708
+#: gdk-pixbuf/gdk-pixbuf-io.c:1708
 #, c-format
 msgid "Failed to open '%s' for writing: %s"
 msgstr "Nemohu otevřít '%s' pro zápis: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1732
+#: gdk-pixbuf/gdk-pixbuf-io.c:1732
 #, c-format
 msgid ""
 "Failed to close '%s' while writing image, all data may not have been saved: %"
@@ -119,16 +119,16 @@ msgstr ""
 "Nemohu se zavřít '%s' během zápisu obrázku, možná nejsou uložena všechna "
 "data: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1952 ../gdk-pixbuf/gdk-pixbuf-io.c:2002
+#: gdk-pixbuf/gdk-pixbuf-io.c:1952 gdk-pixbuf/gdk-pixbuf-io.c:2002
 msgid "Insufficient memory to save image into a buffer"
 msgstr "Nedostatek paměti pro uložení obrázku do bufferu"
 
-#: ../gdk-pixbuf/gdk-pixbuf-loader.c:383
+#: gdk-pixbuf/gdk-pixbuf-loader.c:383
 #, c-format
 msgid "Incremental loading of image type '%s' is not supported"
 msgstr "Postupné načítání obrázku typu '%s' není podporováno"
 
-#: ../gdk-pixbuf/gdk-pixbuf-loader.c:411 ../gdk-pixbuf/gdk-pixbuf-loader.c:513
+#: gdk-pixbuf/gdk-pixbuf-loader.c:411 gdk-pixbuf/gdk-pixbuf-loader.c:513
 #, c-format
 msgid ""
 "Internal error: Image loader module '%s' failed to begin loading an image, "
@@ -137,19 +137,19 @@ msgstr ""
 "Interní chyba: Modulu pro načítání obrázku '%s' nezačal načítat obrázek, ale "
 "pro toto selhání neudal důvod"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:147
+#: gdk-pixbuf/gdk-pixdata.c:147
 msgid "Image header corrupt"
 msgstr "Hlavička obrázku je poškozena"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:152
+#: gdk-pixbuf/gdk-pixdata.c:152
 msgid "Image format unknown"
 msgstr "Neznámý formát obrázku"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:157 ../gdk-pixbuf/gdk-pixdata.c:487
+#: gdk-pixbuf/gdk-pixdata.c:157 gdk-pixbuf/gdk-pixdata.c:487
 msgid "Image pixel data corrupt"
 msgstr "Data pixelů obrázku jsou poškozena"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:431
+#: gdk-pixbuf/gdk-pixdata.c:431
 #, c-format
 msgid "failed to allocate image buffer of %u byte"
 msgid_plural "failed to allocate image buffer of %u bytes"
@@ -157,117 +157,113 @@ msgstr[0] "nemohu alokovat paměť pro obrázek o velikosti %u bajt"
 msgstr[1] "nemohu alokovat paměť pro obrázek o velikosti %u bajty"
 msgstr[2] "nemohu alokovat paměť pro obrázek o velikosti %u bajtů"
 
-#: ../gdk-pixbuf/io-ani.c:244
+#: gdk-pixbuf/io-ani.c:244
 msgid "Unexpected icon chunk in animation"
 msgstr "Neočekávaný kus ikona v animaci"
 
-#: ../gdk-pixbuf/io-ani.c:337
+#: gdk-pixbuf/io-ani.c:337
 msgid "Unsupported animation type"
 msgstr "Nepodporovaný typ animace"
 
-#: ../gdk-pixbuf/io-ani.c:348 ../gdk-pixbuf/io-ani.c:538
+#: gdk-pixbuf/io-ani.c:348 gdk-pixbuf/io-ani.c:538
 msgid "Invalid header in animation"
 msgstr "Neplatná hlavička v animaci"
 
-#: ../gdk-pixbuf/io-ani.c:358 ../gdk-pixbuf/io-ani.c:382
-#: ../gdk-pixbuf/io-ani.c:441 ../gdk-pixbuf/io-ani.c:460
-#: ../gdk-pixbuf/io-ani.c:511 ../gdk-pixbuf/io-ani.c:583
+#: gdk-pixbuf/io-ani.c:358 gdk-pixbuf/io-ani.c:382 gdk-pixbuf/io-ani.c:441
+#: gdk-pixbuf/io-ani.c:460 gdk-pixbuf/io-ani.c:511 gdk-pixbuf/io-ani.c:583
 msgid "Not enough memory to load animation"
 msgstr "Nedostatek paměti pro načtení animace"
 
-#: ../gdk-pixbuf/io-ani.c:400 ../gdk-pixbuf/io-ani.c:417
-#: ../gdk-pixbuf/io-ani.c:428
+#: gdk-pixbuf/io-ani.c:400 gdk-pixbuf/io-ani.c:417 gdk-pixbuf/io-ani.c:428
 msgid "Malformed chunk in animation"
 msgstr "Špatně vytvořený kus v animaci"
 
-#: ../gdk-pixbuf/io-ani.c:676
+#: gdk-pixbuf/io-ani.c:676
 msgid "The ANI image format"
 msgstr "Formát obrázku ANI"
 
-#: ../gdk-pixbuf/io-bmp.c:228 ../gdk-pixbuf/io-bmp.c:306
-#: ../gdk-pixbuf/io-bmp.c:338 ../gdk-pixbuf/io-bmp.c:361
-#: ../gdk-pixbuf/io-bmp.c:442
+#: gdk-pixbuf/io-bmp.c:228 gdk-pixbuf/io-bmp.c:306 gdk-pixbuf/io-bmp.c:338
+#: gdk-pixbuf/io-bmp.c:361 gdk-pixbuf/io-bmp.c:442
 msgid "BMP image has bogus header data"
 msgstr "Obrázek formátu BMP má neplatná data v hlavičce"
 
-#: ../gdk-pixbuf/io-bmp.c:239 ../gdk-pixbuf/io-bmp.c:401
+#: gdk-pixbuf/io-bmp.c:239 gdk-pixbuf/io-bmp.c:401
 msgid "Not enough memory to load bitmap image"
 msgstr "Nedostatek paměti pro načtení bitmapového obrázku"
 
-#: ../gdk-pixbuf/io-bmp.c:287
+#: gdk-pixbuf/io-bmp.c:287
 msgid "BMP image has unsupported header size"
 msgstr "Obrázek BMP má nepodporovanou velikost hlavičky"
 
-#: ../gdk-pixbuf/io-bmp.c:325
+#: gdk-pixbuf/io-bmp.c:325
 msgid "Topdown BMP images cannot be compressed"
 msgstr "Obrázky BMP shora dolů nelze komprimovat"
 
-#: ../gdk-pixbuf/io-bmp.c:1203
+#: gdk-pixbuf/io-bmp.c:1203
 msgid "Couldn't allocate memory for saving BMP file"
 msgstr "Nemohu alokovat paměť pro uložení souboru BMP"
 
-#: ../gdk-pixbuf/io-bmp.c:1244
+#: gdk-pixbuf/io-bmp.c:1244
 msgid "Couldn't write to BMP file"
 msgstr "Nemohu zapisovat do souboru BMP"
 
-#: ../gdk-pixbuf/io-bmp.c:1293
+#: gdk-pixbuf/io-bmp.c:1293
 msgid "The BMP image format"
 msgstr "Formát obrázku BMP"
 
-#: ../gdk-pixbuf/io-gif.c:220
+#: gdk-pixbuf/io-gif.c:220
 #, c-format
 msgid "Failure reading GIF: %s"
 msgstr "Chyba při čtení GIF: %s"
 
-#: ../gdk-pixbuf/io-gif.c:492 ../gdk-pixbuf/io-gif.c:1463
-#: ../gdk-pixbuf/io-gif.c:1624
+#: gdk-pixbuf/io-gif.c:492 gdk-pixbuf/io-gif.c:1463 gdk-pixbuf/io-gif.c:1624
 msgid "GIF file was missing some data (perhaps it was truncated somehow?)"
 msgstr "V souboru GIF chybí některá data (možná byl nějak uříznut?)"
 
-#: ../gdk-pixbuf/io-gif.c:501
+#: gdk-pixbuf/io-gif.c:501
 #, c-format
 msgid "Internal error in the GIF loader (%s)"
 msgstr "Interní chyba v načítači GIF (%s)"
 
-#: ../gdk-pixbuf/io-gif.c:575
+#: gdk-pixbuf/io-gif.c:575
 msgid "Stack overflow"
 msgstr "Přetečení zásobníku"
 
-#: ../gdk-pixbuf/io-gif.c:635
+#: gdk-pixbuf/io-gif.c:635
 msgid "GIF image loader cannot understand this image."
 msgstr "Načítač obrázků GIF nerozumí tomuto obrázku."
 
-#: ../gdk-pixbuf/io-gif.c:664
+#: gdk-pixbuf/io-gif.c:664
 msgid "Bad code encountered"
 msgstr "Nalezen chybný kód"
 
-#: ../gdk-pixbuf/io-gif.c:674
+#: gdk-pixbuf/io-gif.c:674
 msgid "Circular table entry in GIF file"
 msgstr "Cyklická položka tabulky v souboru GIF"
 
-#: ../gdk-pixbuf/io-gif.c:862 ../gdk-pixbuf/io-gif.c:1451
-#: ../gdk-pixbuf/io-gif.c:1497 ../gdk-pixbuf/io-gif.c:1612
+#: gdk-pixbuf/io-gif.c:862 gdk-pixbuf/io-gif.c:1451 gdk-pixbuf/io-gif.c:1497
+#: gdk-pixbuf/io-gif.c:1612
 msgid "Not enough memory to load GIF file"
 msgstr "Nedostatek paměti pro načtení obrázku ve formátu GIF"
 
-#: ../gdk-pixbuf/io-gif.c:947
+#: gdk-pixbuf/io-gif.c:947
 msgid "Not enough memory to composite a frame in GIF file"
 msgstr "Nedostatek paměti pro složení políčka v souboru GIF"
 
-#: ../gdk-pixbuf/io-gif.c:1116
+#: gdk-pixbuf/io-gif.c:1116
 msgid "GIF image is corrupt (incorrect LZW compression)"
 msgstr "Obrázek GIF je poškozen (chybná komprese LZW)"
 
-#: ../gdk-pixbuf/io-gif.c:1166
+#: gdk-pixbuf/io-gif.c:1166
 msgid "File does not appear to be a GIF file"
 msgstr "Soubor nevypadá jako soubor GIF"
 
-#: ../gdk-pixbuf/io-gif.c:1178
+#: gdk-pixbuf/io-gif.c:1178
 #, c-format
 msgid "Version %s of the GIF file format is not supported"
 msgstr "Verze %s formátu souborů GIF není podporována"
 
-#: ../gdk-pixbuf/io-gif.c:1287
+#: gdk-pixbuf/io-gif.c:1287
 msgid ""
 "GIF image has no global colormap, and a frame inside it has no local "
 "colormap."
@@ -275,67 +271,66 @@ msgstr ""
 "Obrázek GIF neobsahuje globální mapu barev a políčko v něm neobsahuje "
 "lokální mapu."
 
-#: ../gdk-pixbuf/io-gif.c:1519
+#: gdk-pixbuf/io-gif.c:1519
 msgid "GIF image was truncated or incomplete."
 msgstr "Obrázek GIF byl zkrácen nebo není úplný."
 
-#: ../gdk-pixbuf/io-gif.c:1671
+#: gdk-pixbuf/io-gif.c:1671
 msgid "The GIF image format"
 msgstr "Formát obrázku GIF"
 
-#: ../gdk-pixbuf/io-ico.c:219 ../gdk-pixbuf/io-ico.c:271
-#: ../gdk-pixbuf/io-ico.c:340 ../gdk-pixbuf/io-ico.c:403
-#: ../gdk-pixbuf/io-ico.c:433
+#: gdk-pixbuf/io-ico.c:219 gdk-pixbuf/io-ico.c:271 gdk-pixbuf/io-ico.c:340
+#: gdk-pixbuf/io-ico.c:403 gdk-pixbuf/io-ico.c:433
 msgid "Not enough memory to load icon"
 msgstr "Nedostatek paměti pro načtení ikony"
 
-#: ../gdk-pixbuf/io-ico.c:256 ../gdk-pixbuf/io-ico.c:330
+#: gdk-pixbuf/io-ico.c:256 gdk-pixbuf/io-ico.c:330
 msgid "Invalid header in icon"
 msgstr "Neplatná hlavička ikony"
 
-#: ../gdk-pixbuf/io-ico.c:293
+#: gdk-pixbuf/io-ico.c:293
 msgid "Icon has zero width"
 msgstr "Ikona má nulovou šířku"
 
-#: ../gdk-pixbuf/io-ico.c:303
+#: gdk-pixbuf/io-ico.c:303
 msgid "Icon has zero height"
 msgstr "Ikona má nulovou výšku"
 
-#: ../gdk-pixbuf/io-ico.c:355
+#: gdk-pixbuf/io-ico.c:355
 msgid "Compressed icons are not supported"
 msgstr "Komprimované ikony nejsou podporovány"
 
-#: ../gdk-pixbuf/io-ico.c:388
+#: gdk-pixbuf/io-ico.c:388
 msgid "Unsupported icon type"
 msgstr "Nepodporovaný typ ikony"
 
-#: ../gdk-pixbuf/io-ico.c:482
+#: gdk-pixbuf/io-ico.c:482
 msgid "Not enough memory to load ICO file"
 msgstr "Nedostatek paměti pro načtení souboru ICO"
 
-#: ../gdk-pixbuf/io-ico.c:947
+#: gdk-pixbuf/io-ico.c:947
 msgid "Image too large to be saved as ICO"
 msgstr "Obrázek je příliš velký, aby mohl být uložen jako ICO"
 
-#: ../gdk-pixbuf/io-ico.c:958
+#: gdk-pixbuf/io-ico.c:958
 msgid "Cursor hotspot outside image"
 msgstr "Aktivní bod kurzoru mimo obrázek"
 
-#: ../gdk-pixbuf/io-ico.c:981
+#: gdk-pixbuf/io-ico.c:981
 #, c-format
 msgid "Unsupported depth for ICO file: %d"
 msgstr "Nepodporovaná hloubka souboru ICO: %d"
 
-#: ../gdk-pixbuf/io-ico.c:1210
+#: gdk-pixbuf/io-ico.c:1210
 msgid "The ICO image format"
 msgstr "Formát obrázku ICO"
 
-#: ../gdk-pixbuf/io-jpeg.c:114
+#: gdk-pixbuf/io-jpeg.c:114
 #, c-format
 msgid "Error interpreting JPEG image file (%s)"
 msgstr "Chyba při interpretaci souboru obrázku JPEG (%s)"
 
-#: ../gdk-pixbuf/io-jpeg.c:349
+#: gdk-pixbuf/io-jpeg.c:349
 msgid ""
 "Insufficient memory to load image, try exiting some applications to free "
 "memory"
@@ -343,17 +338,17 @@ msgstr ""
 "Nedostatek paměti pro načtení obrázku, zkuste uvolnit paměť ukončením "
 "několika aplikací"
 
-#: ../gdk-pixbuf/io-jpeg.c:383 ../gdk-pixbuf/io-jpeg.c:749
+#: gdk-pixbuf/io-jpeg.c:383 gdk-pixbuf/io-jpeg.c:749
 #, c-format
 msgid "Unsupported JPEG color space (%s)"
 msgstr "Nepodporovaný prostor barev JPEG (%s)"
 
-#: ../gdk-pixbuf/io-jpeg.c:481 ../gdk-pixbuf/io-jpeg.c:678
-#: ../gdk-pixbuf/io-jpeg.c:943 ../gdk-pixbuf/io-jpeg.c:952
+#: gdk-pixbuf/io-jpeg.c:481 gdk-pixbuf/io-jpeg.c:678 gdk-pixbuf/io-jpeg.c:943
+#: gdk-pixbuf/io-jpeg.c:952
 msgid "Couldn't allocate memory for loading JPEG file"
 msgstr "Nemohu alokovat paměť pro načtení souboru JPEG"
 
-#: ../gdk-pixbuf/io-jpeg.c:894
+#: gdk-pixbuf/io-jpeg.c:894
 #, c-format
 msgid ""
 "JPEG quality must be a value between 0 and 100; value '%s' could not be "
@@ -362,93 +357,93 @@ msgstr ""
 "Kvalita JPEG musí být hodnota mezi 0 a 100; hodnotu '%s' nebylo možné "
 "zpracovat."
 
-#: ../gdk-pixbuf/io-jpeg.c:909
+#: gdk-pixbuf/io-jpeg.c:909
 #, c-format
 msgid ""
 "JPEG quality must be a value between 0 and 100; value '%d' is not allowed."
 msgstr ""
 "Kvalita JPEG musí být hodnota mezi 0 a 100; hodnota '%d' není povolena."
 
-#: ../gdk-pixbuf/io-jpeg.c:1071
+#: gdk-pixbuf/io-jpeg.c:1071
 msgid "The JPEG image format"
 msgstr "Formát obrázku JPEG"
 
-#: ../gdk-pixbuf/io-pcx.c:191
+#: gdk-pixbuf/io-pcx.c:191
 msgid "Couldn't allocate memory for header"
 msgstr "Nemohu alokovat paměť pro hlavičku"
 
-#: ../gdk-pixbuf/io-pcx.c:206 ../gdk-pixbuf/io-pcx.c:566
+#: gdk-pixbuf/io-pcx.c:206 gdk-pixbuf/io-pcx.c:566
 msgid "Couldn't allocate memory for context buffer"
 msgstr "Nemohu alokovat paměť pro vyrovnávací paměť kontextu"
 
-#: ../gdk-pixbuf/io-pcx.c:607
+#: gdk-pixbuf/io-pcx.c:607
 msgid "Image has invalid width and/or height"
 msgstr "Obrázek má nulovou šířku a/nebo výšku"
 
-#: ../gdk-pixbuf/io-pcx.c:619 ../gdk-pixbuf/io-pcx.c:680
+#: gdk-pixbuf/io-pcx.c:619 gdk-pixbuf/io-pcx.c:680
 msgid "Image has unsupported bpp"
 msgstr "Obrázek má nepodporované bpp"
 
-#: ../gdk-pixbuf/io-pcx.c:624 ../gdk-pixbuf/io-pcx.c:632
+#: gdk-pixbuf/io-pcx.c:624 gdk-pixbuf/io-pcx.c:632
 #, c-format
 msgid "Image has unsupported number of %d-bit planes"
 msgstr "Obrázek má nepodporovaný počet %d-bitových rovin"
 
-#: ../gdk-pixbuf/io-pcx.c:648
+#: gdk-pixbuf/io-pcx.c:648
 msgid "Couldn't create new pixbuf"
 msgstr "Nemohu vytvořit nový pixbuf"
 
-#: ../gdk-pixbuf/io-pcx.c:656
+#: gdk-pixbuf/io-pcx.c:656
 msgid "Couldn't allocate memory for line data"
 msgstr "Nemohu alokovat paměť pro data řádků"
 
-#: ../gdk-pixbuf/io-pcx.c:663
+#: gdk-pixbuf/io-pcx.c:663
 msgid "Couldn't allocate memory for paletted data"
 msgstr "Nemohu alokovat paměť pro data palety"
 
-#: ../gdk-pixbuf/io-pcx.c:710
+#: gdk-pixbuf/io-pcx.c:710
 msgid "Didn't get all lines of PCX image"
 msgstr "Nedostal jsem všechny řádky obrázku PCX"
 
-#: ../gdk-pixbuf/io-pcx.c:717
+#: gdk-pixbuf/io-pcx.c:717
 msgid "No palette found at end of PCX data"
 msgstr "Na konci dat PCX nenalezena paleta"
 
-#: ../gdk-pixbuf/io-pcx.c:758
+#: gdk-pixbuf/io-pcx.c:758
 msgid "The PCX image format"
 msgstr "Formát obrázku PCX"
 
-#: ../gdk-pixbuf/io-png.c:55
+#: gdk-pixbuf/io-png.c:55
 msgid "Bits per channel of PNG image is invalid."
 msgstr "Počet bitů na kanál obrázku PNG není platný."
 
-#: ../gdk-pixbuf/io-png.c:136
+#: gdk-pixbuf/io-png.c:136
 msgid "Transformed PNG has zero width or height."
 msgstr "Transformovaný obrázek PNG má nulovou výšku nebo šířku."
 
-#: ../gdk-pixbuf/io-png.c:144
+#: gdk-pixbuf/io-png.c:144
 msgid "Bits per channel of transformed PNG is not 8."
 msgstr "Počet bitů na kanál transformovaného obrázku PNG není 8."
 
-#: ../gdk-pixbuf/io-png.c:153
+#: gdk-pixbuf/io-png.c:153
 msgid "Transformed PNG not RGB or RGBA."
 msgstr "Transformovaný obrázek PNG není RGB nebo RGBA."
 
-#: ../gdk-pixbuf/io-png.c:162
+#: gdk-pixbuf/io-png.c:162
 msgid "Transformed PNG has unsupported number of channels, must be 3 or 4."
 msgstr ""
 "Transformovaný obrázek PNG má nepodporovaný počet kanálů, musí být 3 nebo 4."
 
-#: ../gdk-pixbuf/io-png.c:183
+#: gdk-pixbuf/io-png.c:183
 #, c-format
 msgid "Fatal error in PNG image file: %s"
 msgstr "Fatální chyba v souboru obrázku PNG: %s"
 
-#: ../gdk-pixbuf/io-png.c:301
+#: gdk-pixbuf/io-png.c:301
 msgid "Insufficient memory to load PNG file"
 msgstr "Nedostatek paměti pro načtení souboru PNG"
 
-#: ../gdk-pixbuf/io-png.c:618
+#: gdk-pixbuf/io-png.c:618
 #, c-format
 msgid ""
 "Insufficient memory to store a %ld by %ld image; try exiting some "
@@ -457,25 +452,25 @@ msgstr ""
 "Nedostatek paměti pro uložení obrázku %ld krát %ld; zkuste uvolnit paměť "
 "ukončením několika aplikací"
 
-#: ../gdk-pixbuf/io-png.c:669
+#: gdk-pixbuf/io-png.c:669
 msgid "Fatal error reading PNG image file"
 msgstr "Fatální chyba při čtení souboru obrázku PNG"
 
-#: ../gdk-pixbuf/io-png.c:718
+#: gdk-pixbuf/io-png.c:718
 #, c-format
 msgid "Fatal error reading PNG image file: %s"
 msgstr "Fatální chyba při čtení souboru obrázku PNG: %s"
 
-#: ../gdk-pixbuf/io-png.c:810
+#: gdk-pixbuf/io-png.c:810
 msgid ""
 "Keys for PNG text chunks must have at least 1 and at most 79 characters."
 msgstr "Klíče pro kusy PNG text musí mít alespoň 1 a nejvýše 79 znaků."
 
-#: ../gdk-pixbuf/io-png.c:818
+#: gdk-pixbuf/io-png.c:818
 msgid "Keys for PNG text chunks must be ASCII characters."
 msgstr "Klíče pro kusy PNG text musí být znaky ASCII."
 
-#: ../gdk-pixbuf/io-png.c:831
+#: gdk-pixbuf/io-png.c:831
 #, c-format
 msgid ""
 "PNG compression level must be a value between 0 and 9; value '%s' could not "
@@ -484,7 +479,7 @@ msgstr ""
 "Úroveň komprese PNG musí být hodnota mezi 0 a 9; hodnotu '%s' nebylo možné "
 "zpracovat."
 
-#: ../gdk-pixbuf/io-png.c:843
+#: gdk-pixbuf/io-png.c:843
 #, c-format
 msgid ""
 "PNG compression level must be a value between 0 and 9; value '%d' is not "
@@ -492,327 +487,324 @@ msgid ""
 msgstr ""
 "Úroveň komprese PNG musí být hodnota mezi 0 a 9; hodnota '%d' není povolena."
 
-#: ../gdk-pixbuf/io-png.c:883
+#: gdk-pixbuf/io-png.c:883
 #, c-format
 msgid "Value for PNG text chunk %s cannot be converted to ISO-8859-1 encoding."
 msgstr "Hodnotu pro kus PNG text %s nelze převést do kódování ISO-8859-1."
 
-#: ../gdk-pixbuf/io-png.c:1026
+#: gdk-pixbuf/io-png.c:1026
 msgid "The PNG image format"
 msgstr "Formát obrázku PNG"
 
-#: ../gdk-pixbuf/io-pnm.c:252
+#: gdk-pixbuf/io-pnm.c:252
 msgid "PNM loader expected to find an integer, but didn't"
 msgstr "Načítač PNM očekával celé číslo, ale nenašel ho"
 
-#: ../gdk-pixbuf/io-pnm.c:284
+#: gdk-pixbuf/io-pnm.c:284
 msgid "PNM file has an incorrect initial byte"
 msgstr "Soubor PNM obsahuje nesprávný počáteční bajt"
 
-#: ../gdk-pixbuf/io-pnm.c:314
+#: gdk-pixbuf/io-pnm.c:314
 msgid "PNM file is not in a recognized PNM subformat"
 msgstr "Soubor PNM není v rozpoznaném podformátu PNM"
 
-#: ../gdk-pixbuf/io-pnm.c:339
+#: gdk-pixbuf/io-pnm.c:339
 msgid "PNM file has an image width of 0"
 msgstr "Soubor PNM má šířku obrázku 0"
 
-#: ../gdk-pixbuf/io-pnm.c:360
+#: gdk-pixbuf/io-pnm.c:360
 msgid "PNM file has an image height of 0"
 msgstr "Soubor PNM má výšku obrázku 0"
 
-#: ../gdk-pixbuf/io-pnm.c:383
+#: gdk-pixbuf/io-pnm.c:383
 msgid "Maximum color value in PNM file is 0"
 msgstr "Maximální hodnota barvy v souboru PNM je 0"
 
-#: ../gdk-pixbuf/io-pnm.c:391
+#: gdk-pixbuf/io-pnm.c:391
 msgid "Maximum color value in PNM file is too large"
 msgstr "Maximální hodnota barvy v souboru PNM je příliš vysoká"
 
-#: ../gdk-pixbuf/io-pnm.c:399
+#: gdk-pixbuf/io-pnm.c:399
 msgid "Cannot handle PNM files with maximum color values greater than 255"
 msgstr ""
 "Neumím zpracovávat soubory PNM s maximální hodnotou barvy větší než 255"
 
-#: ../gdk-pixbuf/io-pnm.c:438 ../gdk-pixbuf/io-pnm.c:466
-#: ../gdk-pixbuf/io-pnm.c:498
+#: gdk-pixbuf/io-pnm.c:438 gdk-pixbuf/io-pnm.c:466 gdk-pixbuf/io-pnm.c:498
 msgid "Raw PNM image type is invalid"
 msgstr "Typ obrázku raw PNM není platný"
 
-#: ../gdk-pixbuf/io-pnm.c:562 ../gdk-pixbuf/io-pnm.c:604
+#: gdk-pixbuf/io-pnm.c:562 gdk-pixbuf/io-pnm.c:604
 msgid "PNM image format is invalid"
 msgstr "Formát obrázku PNM není platný"
 
-#: ../gdk-pixbuf/io-pnm.c:663
+#: gdk-pixbuf/io-pnm.c:663
 msgid "PNM image loader does not support this PNM subformat"
 msgstr "Načítač obrázků PNM nepodporuje tento podformát PNM"
 
-#: ../gdk-pixbuf/io-pnm.c:718
+#: gdk-pixbuf/io-pnm.c:718
 msgid "Premature end-of-file encountered"
 msgstr "Nalezen předčasný konec souboru"
 
-#: ../gdk-pixbuf/io-pnm.c:750 ../gdk-pixbuf/io-pnm.c:981
+#: gdk-pixbuf/io-pnm.c:750 gdk-pixbuf/io-pnm.c:981
 msgid "Raw PNM formats require exactly one whitespace before sample data"
 msgstr "Formáty raw PNM vyžadují přesně jednu mezeru před daty vzorků"
 
-#: ../gdk-pixbuf/io-pnm.c:777
+#: gdk-pixbuf/io-pnm.c:777
 msgid "Cannot allocate memory for loading PNM image"
 msgstr "Nemohu alokovat paměť pro načtení obrázku PNM"
 
-#: ../gdk-pixbuf/io-pnm.c:827
+#: gdk-pixbuf/io-pnm.c:827
 msgid "Insufficient memory to load PNM context struct"
 msgstr "Nedostatek paměti pro načtení struktury kontextu PNM"
 
-#: ../gdk-pixbuf/io-pnm.c:878
+#: gdk-pixbuf/io-pnm.c:878
 msgid "Unexpected end of PNM image data"
 msgstr "Neočekávaný konec dat obrázku PNM"
 
-#: ../gdk-pixbuf/io-pnm.c:1010
+#: gdk-pixbuf/io-pnm.c:1010
 msgid "Insufficient memory to load PNM file"
 msgstr "Nedostatek paměti pro načtení souboru PNM"
 
-#: ../gdk-pixbuf/io-pnm.c:1089
+#: gdk-pixbuf/io-pnm.c:1089
 msgid "The PNM/PBM/PGM/PPM image format family"
 msgstr "Rodina formátů obrázků PNM/PBM/PGM/PPM"
 
-#: ../gdk-pixbuf/io-ras.c:126
+#: gdk-pixbuf/io-ras.c:126
 msgid "RAS image has bogus header data"
 msgstr "Obrázek RAS má neplatná data v hlavičce"
 
-#: ../gdk-pixbuf/io-ras.c:148
+#: gdk-pixbuf/io-ras.c:148
 msgid "RAS image has unknown type"
 msgstr "Obrázek RAS má neznámý typ"
 
-#: ../gdk-pixbuf/io-ras.c:156
+#: gdk-pixbuf/io-ras.c:156
 msgid "unsupported RAS image variation"
 msgstr "nepodporovaná variace obrázku RAS"
 
-#: ../gdk-pixbuf/io-ras.c:171 ../gdk-pixbuf/io-ras.c:200
+#: gdk-pixbuf/io-ras.c:171 gdk-pixbuf/io-ras.c:200
 msgid "Not enough memory to load RAS image"
 msgstr "Nedostatek paměti pro načtení obrázku RAS"
 
-#: ../gdk-pixbuf/io-ras.c:543
+#: gdk-pixbuf/io-ras.c:543
 msgid "The Sun raster image format"
 msgstr "Formát obrázku Sun raster"
 
-#: ../gdk-pixbuf/io-tga.c:154
+#: gdk-pixbuf/io-tga.c:154
 msgid "Cannot allocate memory for IOBuffer struct"
 msgstr "Nemohu alokovat paměť pro strukturu IOBuffer"
 
-#: ../gdk-pixbuf/io-tga.c:173
+#: gdk-pixbuf/io-tga.c:173
 msgid "Cannot allocate memory for IOBuffer data"
 msgstr "Nemohu alokovat paměť pro data IOBuffer"
 
-#: ../gdk-pixbuf/io-tga.c:184
+#: gdk-pixbuf/io-tga.c:184
 msgid "Cannot realloc IOBuffer data"
 msgstr "Nemohu realloc data IOBuffer"
 
-#: ../gdk-pixbuf/io-tga.c:214
+#: gdk-pixbuf/io-tga.c:214
 msgid "Cannot allocate temporary IOBuffer data"
 msgstr "Nemohu alokovat dočasná data pro IOBuffer"
 
-#: ../gdk-pixbuf/io-tga.c:348
+#: gdk-pixbuf/io-tga.c:348
 msgid "Cannot allocate new pixbuf"
 msgstr "Nemohu alokovat nový pixbuf"
 
-#: ../gdk-pixbuf/io-tga.c:689
+#: gdk-pixbuf/io-tga.c:689
 msgid "Cannot allocate colormap structure"
 msgstr "Nemohu alokovat strukturu pro mapu barev"
 
-#: ../gdk-pixbuf/io-tga.c:696
+#: gdk-pixbuf/io-tga.c:696
 msgid "Cannot allocate colormap entries"
 msgstr "Nemohu alokovat položky mapy barev"
 
-#: ../gdk-pixbuf/io-tga.c:718
+#: gdk-pixbuf/io-tga.c:718
 msgid "Unexpected bitdepth for colormap entries"
 msgstr "Neočekávaná bitová hloubka pro položky mapy barev"
 
-#: ../gdk-pixbuf/io-tga.c:736
+#: gdk-pixbuf/io-tga.c:736
 msgid "Cannot allocate TGA header memory"
 msgstr "Nemohu alokovat paměť pro hlavičku TGA"
 
-#: ../gdk-pixbuf/io-tga.c:769
+#: gdk-pixbuf/io-tga.c:769
 msgid "TGA image has invalid dimensions"
 msgstr "Obrázek TGA má neplatné rozměry"
 
-#: ../gdk-pixbuf/io-tga.c:775 ../gdk-pixbuf/io-tga.c:784
-#: ../gdk-pixbuf/io-tga.c:794 ../gdk-pixbuf/io-tga.c:804
-#: ../gdk-pixbuf/io-tga.c:811
+#: gdk-pixbuf/io-tga.c:775 gdk-pixbuf/io-tga.c:784 gdk-pixbuf/io-tga.c:794
+#: gdk-pixbuf/io-tga.c:804 gdk-pixbuf/io-tga.c:811
 msgid "TGA image type not supported"
 msgstr "Typ obrázku TGA není podporován"
 
-#: ../gdk-pixbuf/io-tga.c:858
+#: gdk-pixbuf/io-tga.c:858
 msgid "Cannot allocate memory for TGA context struct"
 msgstr "Nemohu alokovat paměť pro strukturu kontextu TGA"
 
-#: ../gdk-pixbuf/io-tga.c:923
+#: gdk-pixbuf/io-tga.c:923
 msgid "Excess data in file"
 msgstr "V souboru jsou data navíc"
 
-#: ../gdk-pixbuf/io-tga.c:992
+#: gdk-pixbuf/io-tga.c:992
 msgid "The Targa image format"
 msgstr "Formát obrázku Targa"
 
-#: ../gdk-pixbuf/io-tiff.c:173
+#: gdk-pixbuf/io-tiff.c:173
 msgid "Could not get image width (bad TIFF file)"
 msgstr "Nemohu získat šířku obrázku (špatný soubor TIFF)"
 
-#: ../gdk-pixbuf/io-tiff.c:180
+#: gdk-pixbuf/io-tiff.c:180
 msgid "Could not get image height (bad TIFF file)"
 msgstr "Nemohu získat výšku obrázku (špatný soubor TIFF)"
 
-#: ../gdk-pixbuf/io-tiff.c:188
+#: gdk-pixbuf/io-tiff.c:188
 msgid "Width or height of TIFF image is zero"
 msgstr "Výška nebo šířka obrázku TIFF je 0"
 
-#: ../gdk-pixbuf/io-tiff.c:197 ../gdk-pixbuf/io-tiff.c:206
+#: gdk-pixbuf/io-tiff.c:197 gdk-pixbuf/io-tiff.c:206
 msgid "Dimensions of TIFF image too large"
 msgstr "Rozměry obrázku TIFF jsou příliš velké"
 
-#: ../gdk-pixbuf/io-tiff.c:225 ../gdk-pixbuf/io-tiff.c:237
-#: ../gdk-pixbuf/io-tiff.c:286 ../gdk-pixbuf/io-tiff.c:572
+#: gdk-pixbuf/io-tiff.c:225 gdk-pixbuf/io-tiff.c:237 gdk-pixbuf/io-tiff.c:286
+#: gdk-pixbuf/io-tiff.c:572
 msgid "Insufficient memory to open TIFF file"
 msgstr "Nedostatek paměti pro otevření souboru TIFF"
 
-#: ../gdk-pixbuf/io-tiff.c:251 ../gdk-pixbuf/io-tiff.c:294
+#: gdk-pixbuf/io-tiff.c:251 gdk-pixbuf/io-tiff.c:294
 msgid "Failed to load RGB data from TIFF file"
 msgstr "Nemohu načíst data RGB ze souboru TIFF"
 
-#: ../gdk-pixbuf/io-tiff.c:361
+#: gdk-pixbuf/io-tiff.c:361
 msgid "Failed to open TIFF image"
 msgstr "Nemohu otevřít obrázek TIFF"
 
-#: ../gdk-pixbuf/io-tiff.c:373
+#: gdk-pixbuf/io-tiff.c:373
 msgid "TIFFClose operation failed"
 msgstr "Operace TIFFClose selhala"
 
-#: ../gdk-pixbuf/io-tiff.c:504 ../gdk-pixbuf/io-tiff.c:517
+#: gdk-pixbuf/io-tiff.c:504 gdk-pixbuf/io-tiff.c:517
 msgid "Failed to load TIFF image"
 msgstr "Nemohu načíst obrázek TIFF"
 
-#: ../gdk-pixbuf/io-tiff.c:610
+#: gdk-pixbuf/io-tiff.c:610
 msgid "The TIFF image format"
 msgstr "Formát obrázku TIFF"
 
-#: ../gdk-pixbuf/io-wbmp.c:246
+#: gdk-pixbuf/io-wbmp.c:246
 msgid "Image has zero width"
 msgstr "Obrázek má nulovou šířku"
 
-#: ../gdk-pixbuf/io-wbmp.c:264
+#: gdk-pixbuf/io-wbmp.c:264
 msgid "Image has zero height"
 msgstr "Obrázek má nulovou výšku"
 
-#: ../gdk-pixbuf/io-wbmp.c:275
+#: gdk-pixbuf/io-wbmp.c:275
 msgid "Not enough memory to load image"
 msgstr "Nedostatek paměti pro načtení obrázku"
 
-#: ../gdk-pixbuf/io-wbmp.c:334
+#: gdk-pixbuf/io-wbmp.c:334
 msgid "Couldn't save the rest"
 msgstr "Nemohu uložit zbytek"
 
-#: ../gdk-pixbuf/io-wbmp.c:368
+#: gdk-pixbuf/io-wbmp.c:368
 msgid "The WBMP image format"
 msgstr "Formát obrázku WBMP"
 
-#: ../gdk-pixbuf/io-xbm.c:287
+#: gdk-pixbuf/io-xbm.c:287
 msgid "Invalid XBM file"
 msgstr "Neplatný soubor XBM"
 
-#: ../gdk-pixbuf/io-xbm.c:297
+#: gdk-pixbuf/io-xbm.c:297
 msgid "Insufficient memory to load XBM image file"
 msgstr "Nedostatek paměti pro načtení souboru obrázku XBM"
 
-#: ../gdk-pixbuf/io-xbm.c:441
+#: gdk-pixbuf/io-xbm.c:441
 msgid "Failed to write to temporary file when loading XBM image"
 msgstr "Nemohu psát do dočasného souboru při načítání obrázku XBM"
 
-#: ../gdk-pixbuf/io-xbm.c:476
+#: gdk-pixbuf/io-xbm.c:476
 msgid "The XBM image format"
 msgstr "Formát obrázku XBM"
 
-#: ../gdk-pixbuf/io-xpm.c:467
+#: gdk-pixbuf/io-xpm.c:467
 msgid "No XPM header found"
 msgstr "Nebyla nalezena hlavička XPM"
 
-#: ../gdk-pixbuf/io-xpm.c:476
+#: gdk-pixbuf/io-xpm.c:476
 msgid "Invalid XPM header"
 msgstr "Neplatná hlavička XPM"
 
-#: ../gdk-pixbuf/io-xpm.c:484
+#: gdk-pixbuf/io-xpm.c:484
 msgid "XPM file has image width <= 0"
 msgstr "Soubor XPM má šířku obrázku <= 0"
 
-#: ../gdk-pixbuf/io-xpm.c:492
+#: gdk-pixbuf/io-xpm.c:492
 msgid "XPM file has image height <= 0"
 msgstr "Soubor XPM má výšku obrázku <= 0"
 
-#: ../gdk-pixbuf/io-xpm.c:500
+#: gdk-pixbuf/io-xpm.c:500
 msgid "XPM has invalid number of chars per pixel"
 msgstr "XPM obsahuje neplatný počet znaků na pixel"
 
-#: ../gdk-pixbuf/io-xpm.c:507
+#: gdk-pixbuf/io-xpm.c:507
 msgid "XPM file has invalid number of colors"
 msgstr "Soubor XPM má neplatný počet barev"
 
-#: ../gdk-pixbuf/io-xpm.c:519 ../gdk-pixbuf/io-xpm.c:528
-#: ../gdk-pixbuf/io-xpm.c:580
+#: gdk-pixbuf/io-xpm.c:519 gdk-pixbuf/io-xpm.c:528 gdk-pixbuf/io-xpm.c:580
 msgid "Cannot allocate memory for loading XPM image"
 msgstr "Nemohu alokovat paměť pro načtení obrázku XPM"
 
-#: ../gdk-pixbuf/io-xpm.c:542
+#: gdk-pixbuf/io-xpm.c:542
 msgid "Cannot read XPM colormap"
 msgstr "Nemohu načíst mapu barev XPM"
 
-#: ../gdk-pixbuf/io-xpm.c:771
+#: gdk-pixbuf/io-xpm.c:771
 msgid "Failed to write to temporary file when loading XPM image"
 msgstr "Nemohu psát do dočasného souboru při načítání obrázku XPM"
 
-#: ../gdk-pixbuf/io-xpm.c:806
+#: gdk-pixbuf/io-xpm.c:806
 msgid "The XPM image format"
 msgstr "Formát obrázku XPM"
 
 #. Description of --class=CLASS in --help output
-#: ../gdk/gdk.c:115
+#: gdk/gdk.c:115
 msgid "Program class as used by the window manager"
 msgstr "Třída programu používaná správcem oken"
 
 #. Placeholder in --class=CLASS in --help output
-#: ../gdk/gdk.c:116
+#: gdk/gdk.c:116
 msgid "CLASS"
 msgstr "TŘÍDA"
 
 #. Description of --name=NAME in --help output
-#: ../gdk/gdk.c:118
+#: gdk/gdk.c:118
 msgid "Program name as used by the window manager"
 msgstr "Název programu používaný správcem oken"
 
 #. Placeholder in --name=NAME in --help output
-#: ../gdk/gdk.c:119
+#: gdk/gdk.c:119
 msgid "NAME"
 msgstr "NÁZEV"
 
 #. Description of --display=DISPLAY in --help output
-#: ../gdk/gdk.c:121
+#: gdk/gdk.c:121
 msgid "X display to use"
 msgstr "Displej X, který používat"
 
 #. Placeholder in --display=DISPLAY in --help output
-#: ../gdk/gdk.c:122
+#: gdk/gdk.c:122
 msgid "DISPLAY"
 msgstr "DISPLEJ"
 
 #. Description of --screen=SCREEN in --help output
-#: ../gdk/gdk.c:124
+#: gdk/gdk.c:124
 msgid "X screen to use"
 msgstr "Obrazovka X, kterou používat"
 
 #. Placeholder in --screen=SCREEN in --help output
-#: ../gdk/gdk.c:125
+#: gdk/gdk.c:125
 msgid "SCREEN"
 msgstr "OBRAZOVKA"
 
 #. Description of --gdk-debug=FLAGS in --help output
-#: ../gdk/gdk.c:128
+#: gdk/gdk.c:128
 msgid "Gdk debugging flags to set"
 msgstr "Ladicí příznaky Gdk, které nastavit"
 
@@ -820,222 +812,222 @@ msgstr "Ladicí příznaky Gdk, které nastavit"
 #. Placeholder in --gdk-no-debug=FLAGS in --help output
 #. Placeholder in --gtk-debug=FLAGS in --help output
 #. Placeholder in --gtk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:129 ../gdk/gdk.c:132 ../gtk/gtkmain.c:405 ../gtk/gtkmain.c:408
+#: gdk/gdk.c:129 gdk/gdk.c:132 gtk/gtkmain.c:405 gtk/gtkmain.c:408
 msgid "FLAGS"
 msgstr "PŘÍZNAKY"
 
 #. Description of --gdk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:131
+#: gdk/gdk.c:131
 msgid "Gdk debugging flags to unset"
 msgstr "Ladicí příznaky Gdk, jejichž nastavení zrušit"
 
-#: ../gdk/keyname-table.h:3940
+#: gdk/keyname-table.h:3940
 msgid "keyboard label|BackSpace"
 msgstr "Backspace"
 
-#: ../gdk/keyname-table.h:3941
+#: gdk/keyname-table.h:3941
 msgid "keyboard label|Tab"
 msgstr "Tab"
 
-#: ../gdk/keyname-table.h:3942
+#: gdk/keyname-table.h:3942
 msgid "keyboard label|Return"
 msgstr "Enter"
 
-#: ../gdk/keyname-table.h:3943
+#: gdk/keyname-table.h:3943
 msgid "keyboard label|Pause"
 msgstr "Pause"
 
-#: ../gdk/keyname-table.h:3944
+#: gdk/keyname-table.h:3944
 msgid "keyboard label|Scroll_Lock"
 msgstr "Scroll_Lock"
 
-#: ../gdk/keyname-table.h:3945
+#: gdk/keyname-table.h:3945
 msgid "keyboard label|Sys_Req"
 msgstr "Sys_Rq"
 
-#: ../gdk/keyname-table.h:3946
+#: gdk/keyname-table.h:3946
 msgid "keyboard label|Escape"
 msgstr "Escape"
 
-#: ../gdk/keyname-table.h:3947
+#: gdk/keyname-table.h:3947
 msgid "keyboard label|Multi_key"
 msgstr "Multi_key"
 
-#: ../gdk/keyname-table.h:3948
+#: gdk/keyname-table.h:3948
 msgid "keyboard label|Home"
 msgstr "Home"
 
-#: ../gdk/keyname-table.h:3949
+#: gdk/keyname-table.h:3949
 msgid "keyboard label|Page_Up"
 msgstr "Page_Up"
 
-#: ../gdk/keyname-table.h:3950
+#: gdk/keyname-table.h:3950
 msgid "keyboard label|Page_Down"
 msgstr "Page_Down"
 
-#: ../gdk/keyname-table.h:3951
+#: gdk/keyname-table.h:3951
 msgid "keyboard label|End"
 msgstr "End"
 
-#: ../gdk/keyname-table.h:3952
+#: gdk/keyname-table.h:3952
 msgid "keyboard label|Begin"
 msgstr "Begin"
 
-#: ../gdk/keyname-table.h:3953
+#: gdk/keyname-table.h:3953
 msgid "keyboard label|Print"
 msgstr "Print"
 
-#: ../gdk/keyname-table.h:3954
+#: gdk/keyname-table.h:3954
 msgid "keyboard label|Insert"
 msgstr "Insert"
 
-#: ../gdk/keyname-table.h:3955
+#: gdk/keyname-table.h:3955
 msgid "keyboard label|Num_Lock"
 msgstr "Num_Lock"
 
-#: ../gdk/keyname-table.h:3956
+#: gdk/keyname-table.h:3956
 msgid "keyboard label|KP_Space"
 msgstr "KP_Mezerník"
 
-#: ../gdk/keyname-table.h:3957
+#: gdk/keyname-table.h:3957
 msgid "keyboard label|KP_Tab"
 msgstr "KP_Tab"
 
-#: ../gdk/keyname-table.h:3958
+#: gdk/keyname-table.h:3958
 msgid "keyboard label|KP_Enter"
 msgstr "KP_Enter"
 
-#: ../gdk/keyname-table.h:3959
+#: gdk/keyname-table.h:3959
 msgid "keyboard label|KP_Home"
 msgstr "KP_Home"
 
-#: ../gdk/keyname-table.h:3960
+#: gdk/keyname-table.h:3960
 msgid "keyboard label|KP_Left"
 msgstr "KP_Doleva"
 
-#: ../gdk/keyname-table.h:3961
+#: gdk/keyname-table.h:3961
 msgid "keyboard label|KP_Up"
 msgstr "KP_Nahoru"
 
-#: ../gdk/keyname-table.h:3962
+#: gdk/keyname-table.h:3962
 msgid "keyboard label|KP_Right"
 msgstr "KP_Doprava"
 
-#: ../gdk/keyname-table.h:3963
+#: gdk/keyname-table.h:3963
 msgid "keyboard label|KP_Down"
 msgstr "KP_Dolů"
 
-#: ../gdk/keyname-table.h:3964
+#: gdk/keyname-table.h:3964
 msgid "keyboard label|KP_Page_Up"
 msgstr "KP_Page_Up"
 
-#: ../gdk/keyname-table.h:3965
+#: gdk/keyname-table.h:3965
 msgid "keyboard label|KP_Prior"
 msgstr "KP_Prior"
 
-#: ../gdk/keyname-table.h:3966
+#: gdk/keyname-table.h:3966
 msgid "keyboard label|KP_Page_Down"
 msgstr "KP_Page_Down"
 
-#: ../gdk/keyname-table.h:3967
+#: gdk/keyname-table.h:3967
 msgid "keyboard label|KP_Next"
 msgstr "KP_Next"
 
-#: ../gdk/keyname-table.h:3968
+#: gdk/keyname-table.h:3968
 msgid "keyboard label|KP_End"
 msgstr "KP_End"
 
-#: ../gdk/keyname-table.h:3969
+#: gdk/keyname-table.h:3969
 msgid "keyboard label|KP_Begin"
 msgstr "KP_Begin"
 
-#: ../gdk/keyname-table.h:3970
+#: gdk/keyname-table.h:3970
 msgid "keyboard label|KP_Insert"
 msgstr "KP_Insert"
 
-#: ../gdk/keyname-table.h:3971
+#: gdk/keyname-table.h:3971
 msgid "keyboard label|KP_Delete"
 msgstr "KP_Delete"
 
-#: ../gdk/keyname-table.h:3972
+#: gdk/keyname-table.h:3972
 msgid "keyboard label|Delete"
 msgstr "Delete"
 
 #. Description of --sync in --help output
-#: ../gdk/win32/gdkmain-win32.c:60
+#: gdk/win32/gdkmain-win32.c:60
 msgid "Don't batch GDI requests"
 msgstr "Nedávkovat požadavky GDI"
 
 #. Description of --no-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:62
+#: gdk/win32/gdkmain-win32.c:62
 msgid "Don't use the Wintab API for tablet support"
 msgstr "Nepoužívat API Wintab pro podporu tabletů"
 
 #. Description of --ignore-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:64
+#: gdk/win32/gdkmain-win32.c:64
 msgid "Same as --no-wintab"
 msgstr "Totéž jako --no-wintab"
 
 #. Description of --use-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:66
+#: gdk/win32/gdkmain-win32.c:66
 msgid "Do use the Wintab API [default]"
 msgstr "Používat API Wintab [implicitní]"
 
 #. Description of --max-colors=COLORS in --help output
-#: ../gdk/win32/gdkmain-win32.c:68
+#: gdk/win32/gdkmain-win32.c:68
 msgid "Size of the palette in 8 bit mode"
 msgstr "Velikost palety v osmibitovém režimu"
 
 #. Placeholder in --max-colors=COLORS in --help output
-#: ../gdk/win32/gdkmain-win32.c:69
+#: gdk/win32/gdkmain-win32.c:69
 msgid "COLORS"
 msgstr "BARVY"
 
 #. Description of --sync in --help output
-#: ../gdk/x11/gdkmain-x11.c:92
+#: gdk/x11/gdkmain-x11.c:92
 msgid "Make X calls synchronous"
 msgstr "Volat X synchronně"
 
-#: ../gtk/gtkaboutdialog.c:273 ../gtk/gtkaboutdialog.c:2103
+#: gtk/gtkaboutdialog.c:273 gtk/gtkaboutdialog.c:2103
 msgid "License"
 msgstr "Licence"
 
-#: ../gtk/gtkaboutdialog.c:274
+#: gtk/gtkaboutdialog.c:274
 msgid "The license of the program"
 msgstr "Licence programu"
 
 #. Add the credits button
-#: ../gtk/gtkaboutdialog.c:509
+#: gtk/gtkaboutdialog.c:509
 msgid "C_redits"
 msgstr "_Kredity"
 
 #. Add the license button
-#: ../gtk/gtkaboutdialog.c:519
+#: gtk/gtkaboutdialog.c:519
 msgid "_License"
 msgstr "_Licence"
 
-#: ../gtk/gtkaboutdialog.c:756
+#: gtk/gtkaboutdialog.c:756
 #, c-format
 msgid "About %s"
 msgstr "O %s"
 
-#: ../gtk/gtkaboutdialog.c:2031
+#: gtk/gtkaboutdialog.c:2031
 msgid "Credits"
 msgstr "Kredity"
 
-#: ../gtk/gtkaboutdialog.c:2057
+#: gtk/gtkaboutdialog.c:2057
 msgid "Written by"
 msgstr "Napsali"
 
-#: ../gtk/gtkaboutdialog.c:2060
+#: gtk/gtkaboutdialog.c:2060
 msgid "Documented by"
 msgstr "Zdokumentovali"
 
-#: ../gtk/gtkaboutdialog.c:2072
+#: gtk/gtkaboutdialog.c:2072
 msgid "Translated by"
 msgstr "Přeložili"
 
-#: ../gtk/gtkaboutdialog.c:2076
+#: gtk/gtkaboutdialog.c:2076
 msgid "Artwork by"
 msgstr "Grafika"
 
@@ -1045,7 +1037,7 @@ msgstr "Grafika"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:121
+#: gtk/gtkaccellabel.c:121
 msgid "keyboard label|Shift"
 msgstr "Shift"
 
@@ -1055,7 +1047,7 @@ msgstr "Shift"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:128
+#: gtk/gtkaccellabel.c:128
 msgid "keyboard label|Ctrl"
 msgstr "Ctrl"
 
@@ -1065,17 +1057,17 @@ msgstr "Ctrl"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:135
+#: gtk/gtkaccellabel.c:135
 msgid "keyboard label|Alt"
 msgstr "Alt"
 
 #. do not translate the part before the |
-#: ../gtk/gtkaccellabel.c:577
+#: gtk/gtkaccellabel.c:577
 msgid "keyboard label|Space"
 msgstr "Mezerník"
 
 #. do not translate the part before the |
-#: ../gtk/gtkaccellabel.c:581
+#: gtk/gtkaccellabel.c:581
 msgid "keyboard label|Backslash"
 msgstr "Obrácené lomítko"
 
@@ -1088,7 +1080,7 @@ msgstr "Obrácené lomítko"
 #. * so if you have a default text direction of RTL and YM, then
 #. * the year will appear on the right.
 #.
-#: ../gtk/gtkcalendar.c:647
+#: gtk/gtkcalendar.c:647
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
@@ -1096,7 +1088,7 @@ msgstr "calendar:MY"
 #. * first day of the week to calendar:week_start:1 if you want Monday
 #. * to be the first day of the week, and so on.
 #.
-#: ../gtk/gtkcalendar.c:661
+#: gtk/gtkcalendar.c:661
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:1"
 
@@ -1108,7 +1100,7 @@ msgstr "calendar:week_start:1"
 #. *
 #. * If you don't understand this, leave it as "2000"
 #.
-#: ../gtk/gtkcalendar.c:1549
+#: gtk/gtkcalendar.c:1549
 msgid "year measurement template|2000"
 msgstr "2000"
 
@@ -1123,25 +1115,25 @@ msgstr "2000"
 #. * Don't include the prefix "calendar year format|" in the
 #. * translation. "%Y" is appropriate for most locales.
 #.
-#: ../gtk/gtkcalendar.c:1826
+#: gtk/gtkcalendar.c:1826
 msgid "calendar year format|%Y"
 msgstr "%Y"
 
 #. do not translate the part before the |
-#: ../gtk/gtkcellrendererprogress.c:237 ../gtk/gtkcellrendererprogress.c:295
+#: gtk/gtkcellrendererprogress.c:237 gtk/gtkcellrendererprogress.c:295
 #, c-format
 msgid "progress bar label|%d %%"
 msgstr "progress bar label|%d %%"
 
-#: ../gtk/gtkcolorbutton.c:221 ../gtk/gtkcolorbutton.c:576
+#: gtk/gtkcolorbutton.c:221 gtk/gtkcolorbutton.c:576
 msgid "Pick a Color"
 msgstr "Vyberte barvu"
 
-#: ../gtk/gtkcolorbutton.c:467
+#: gtk/gtkcolorbutton.c:467
 msgid "Received invalid color data\n"
 msgstr "Přijata neplatná data barvy\n"
 
-#: ../gtk/gtkcolorsel.c:565
+#: gtk/gtkcolorsel.c:565
 msgid ""
 "The previously-selected color, for comparison to the color you're selecting "
 "now. You can drag this color to a palette entry, or select this color as "
@@ -1151,7 +1143,7 @@ msgstr ""
 "barvu můžete přetáhnout do položky palety nebo vybrat jako aktuální "
 "přetažením na ukazatel druhé barvy."
 
-#: ../gtk/gtkcolorsel.c:570
+#: gtk/gtkcolorsel.c:570
 msgid ""
 "The color you've chosen. You can drag this color to a palette entry to save "
 "it for use in the future."
@@ -1159,11 +1151,11 @@ msgstr ""
 "Barva, kterou jste vybrali. Tuto barvu můžete přetáhnout do položky palety a "
 "tím ji uložit pro budoucí použití."
 
-#: ../gtk/gtkcolorsel.c:961
+#: gtk/gtkcolorsel.c:961
 msgid "_Save color here"
 msgstr "_Uložit barvu zde"
 
-#: ../gtk/gtkcolorsel.c:1166
+#: gtk/gtkcolorsel.c:1166
 msgid ""
 "Click this palette entry to make it the current color. To change this entry, "
 "drag a color swatch here or right-click it and select \"Save color here.\""
@@ -1172,7 +1164,7 @@ msgstr ""
 "palety změnit, přetáhněte na její místo jinou barvu, nebo klikněte pravým "
 "tlačítkem myši a vyberte \"Uložit barvu zde\"."
 
-#: ../gtk/gtkcolorsel.c:1953
+#: gtk/gtkcolorsel.c:1953
 msgid ""
 "Select the color you want from the outer ring. Select the darkness or "
 "lightness of that color using the inner triangle."
@@ -1180,73 +1172,73 @@ msgstr ""
 "Vyberte požadovanou barvu z vnějšího kruhu. Tmavost nebo světlost barvy "
 "vyberte pomocí vnitřního trojúhelníku."
 
-#: ../gtk/gtkcolorsel.c:1978
+#: gtk/gtkcolorsel.c:1978
 msgid ""
 "Click the eyedropper, then click a color anywhere on your screen to select "
 "that color."
 msgstr "Klikněte na kapátko, pak vyberte barvu kliknutím kdekoli na obrazovce."
 
-#: ../gtk/gtkcolorsel.c:1987
+#: gtk/gtkcolorsel.c:1987
 msgid "_Hue:"
 msgstr "_Odstín:"
 
-#: ../gtk/gtkcolorsel.c:1988
+#: gtk/gtkcolorsel.c:1988
 msgid "Position on the color wheel."
 msgstr "Pozice na barevném kotouči."
 
-#: ../gtk/gtkcolorsel.c:1990
+#: gtk/gtkcolorsel.c:1990
 msgid "_Saturation:"
 msgstr "_Sytost:"
 
-#: ../gtk/gtkcolorsel.c:1991
+#: gtk/gtkcolorsel.c:1991
 msgid "\"Deepness\" of the color."
 msgstr "\"Hloubka\" barvy."
 
-#: ../gtk/gtkcolorsel.c:1992
+#: gtk/gtkcolorsel.c:1992
 msgid "_Value:"
 msgstr "_Hodnota:"
 
-#: ../gtk/gtkcolorsel.c:1993
+#: gtk/gtkcolorsel.c:1993
 msgid "Brightness of the color."
 msgstr "Jas barvy."
 
-#: ../gtk/gtkcolorsel.c:1994
+#: gtk/gtkcolorsel.c:1994
 msgid "_Red:"
 msgstr "Če_rvená:"
 
-#: ../gtk/gtkcolorsel.c:1995
+#: gtk/gtkcolorsel.c:1995
 msgid "Amount of red light in the color."
 msgstr "Množství červeného světla v barvě."
 
-#: ../gtk/gtkcolorsel.c:1996
+#: gtk/gtkcolorsel.c:1996
 msgid "_Green:"
 msgstr "_Zelená:"
 
-#: ../gtk/gtkcolorsel.c:1997
+#: gtk/gtkcolorsel.c:1997
 msgid "Amount of green light in the color."
 msgstr "Množství zeleného světla v barvě."
 
-#: ../gtk/gtkcolorsel.c:1998
+#: gtk/gtkcolorsel.c:1998
 msgid "_Blue:"
 msgstr "_Modrá:"
 
-#: ../gtk/gtkcolorsel.c:1999
+#: gtk/gtkcolorsel.c:1999
 msgid "Amount of blue light in the color."
 msgstr "Množství modrého světla v barvě."
 
-#: ../gtk/gtkcolorsel.c:2002
+#: gtk/gtkcolorsel.c:2002
 msgid "_Opacity:"
 msgstr "Stup_eň krytí:"
 
-#: ../gtk/gtkcolorsel.c:2010 ../gtk/gtkcolorsel.c:2021
+#: gtk/gtkcolorsel.c:2010 gtk/gtkcolorsel.c:2021
 msgid "Transparency of the color."
 msgstr "Průhlednost barvy."
 
-#: ../gtk/gtkcolorsel.c:2028
+#: gtk/gtkcolorsel.c:2028
 msgid "Color _Name:"
 msgstr "_Název barvy: "
 
-#: ../gtk/gtkcolorsel.c:2043
+#: gtk/gtkcolorsel.c:2043
 msgid ""
 "You can enter an HTML-style hexadecimal color value, or simply a color name "
 "such as 'orange' in this entry."
@@ -1254,75 +1246,75 @@ msgstr ""
 "Můžete sem zadat hexadecimální hodnotu barvy ve stylu HTML nebo prostě název "
 "barvy, například 'orange'."
 
-#: ../gtk/gtkcolorsel.c:2062
+#: gtk/gtkcolorsel.c:2062
 msgid "_Palette"
 msgstr "_Paleta"
 
-#: ../gtk/gtkcolorsel.c:2094
+#: gtk/gtkcolorsel.c:2094
 msgid "Color Wheel"
 msgstr "Barevné kolo"
 
-#: ../gtk/gtkcolorseldialog.c:123
+#: gtk/gtkcolorseldialog.c:123
 msgid "Color Selection"
 msgstr "Výběr barvy"
 
-#: ../gtk/gtkentry.c:4552 ../gtk/gtktextview.c:7125
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Vybrat _vše"
 
-#: ../gtk/gtkentry.c:4562 ../gtk/gtktextview.c:7135
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Vstupní _metody"
 
-#: ../gtk/gtkentry.c:4573 ../gtk/gtktextview.c:7146
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Vložit řídící znak Unicode"
 
-#: ../gtk/gtkfilechooser.c:1588 ../gtk/gtkfilechooser.c:1632
-#: ../gtk/gtkfilechooser.c:1707 ../gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Neplatný název souboru: %s"
 
-#: ../gtk/gtkfilechooserbutton.c:67
+#: gtk/gtkfilechooserbutton.c:67
 msgid "Select A File"
 msgstr "Zvolte soubor"
 
-#: ../gtk/gtkfilechooserbutton.c:68 ../gtk/gtkfilechooserdefault.c:1316
-#: ../gtk/gtkpathbar.c:1020
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
+#: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Domov"
 
-#: ../gtk/gtkfilechooserbutton.c:69 ../gtk/gtkfilechooserdefault.c:1343
-#: ../gtk/gtkpathbar.c:1022
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
+#: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Pracovní plocha"
 
-#: ../gtk/gtkfilechooserbutton.c:70
+#: gtk/gtkfilechooserbutton.c:70
 msgid "(None)"
 msgstr "(Žádný)"
 
-#: ../gtk/gtkfilechooserbutton.c:1523
+#: gtk/gtkfilechooserbutton.c:1523
 msgid "Other..."
 msgstr "Jiné..."
 
-#: ../gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Nemohu získat informace o souboru"
 
-#: ../gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Nemohu přidat záložku"
 
-#: ../gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Nemohu odstranit záložku"
 
-#: ../gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Adresář nelze vytvořit"
 
-#: ../gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1330,156 +1322,172 @@ msgstr ""
 "Adresář nelze vytvořit, protože již existuje soubor se stejným názvem. "
 "Zkuste pro adresář použít jiný název nebo nejdřív přejmenovat soubor."
 
-#: ../gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Neplatný název souboru"
 
-#: ../gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Obsah adresáře nelze zobrazit"
 
-#: ../gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Nemohu získat informace o '%s': %s"
 
-#: ../gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Přidat adresář '%s' mezi záložky"
 
-#: ../gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Přidat aktuální adresář mezi záložky"
 
-#: ../gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Přidat zovlené adresáře mezi záložky"
 
-#: ../gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Odstranit záložku '%s'"
 
-#: ../gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "Nemohu přidat záložku pro '%s', protože je to neplatný název cesty."
 
-#: ../gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Odstranit"
 
-#: ../gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Přejmenovat..."
 
-#: ../gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Zkratky"
 
-#: ../gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Adresář"
 
-#: ../gtk/gtkfilechooserdefault.c:3193 ../gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Přidat"
 
-#: ../gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Přidat zvolený adresář mezi záložky"
 
-#: ../gtk/gtkfilechooserdefault.c:3205 ../gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Odstranit"
 
-#: ../gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Odstranit zvolenou záložku"
 
-#: ../gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 msgid "Could not select file"
 msgstr "Nemohu vybrat soubor"
 
-#: ../gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "Nemohu vybrat soubor '%s', protože je to neplatný název cesty."
 
-#: ../gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "_Přidat mezi záložky"
 
-#: ../gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Otevřít _umístění"
 
-#: ../gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Zobrazovat _skryté soubory"
 
-#: ../gtk/gtkfilechooserdefault.c:3586 ../gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Soubory"
 
-#: ../gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Název"
 
-#: ../gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Velikost"
 
-#: ../gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Změněn"
 
-#: ../gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Vyberte, které typy souborů zobrazovat"
 
 #. Create Folder
-#: ../gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Vytvořit _adresář"
 
 #. Name entry
-#: ../gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Název:"
 
-#: ../gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Procházet jiné adresáře"
 
-#: ../gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Uložit do _adresáře:"
 
-#: ../gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Vytvořit v _adresáři:"
 
-#: ../gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Nemohu přejít do adresáře, protože není místní"
 
-#: ../gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Zkratka %s neexistuje"
 
-#: ../gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "Pře_jmenovat"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Nemohu připojit %s"
 
-#: ../gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Napište název nového adresáře"
 
-#: ../gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
@@ -1487,80 +1495,80 @@ msgstr[0] "%d bajt"
 msgstr[1] "%d bajty"
 msgstr[2] "%d bajtů"
 
-#: ../gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: ../gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: ../gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: ../gtk/gtkfilechooserdefault.c:6604 ../gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Neznámé"
 
-#: ../gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Dnes"
 
-#: ../gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Včera"
 
-#: ../gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Nemohu změnit adresář"
 
-#: ../gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Určený adresář je neplatná cesta."
 
-#: ../gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Nemohu sestavit název souboru z '%s' a '%s'"
 
-#: ../gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Nemohu vybrat položku"
 
-#: ../gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Otevřít umístění"
 
-#: ../gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Uložit do umístění"
 
-#: ../gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Umístění:"
 
-#: ../gtk/gtkfilesel.c:727
+#: gtk/gtkfilesel.c:727
 msgid "Folders"
 msgstr "Adresáře"
 
-#: ../gtk/gtkfilesel.c:731
+#: gtk/gtkfilesel.c:731
 msgid "Fol_ders"
 msgstr "_Adresáře"
 
-#: ../gtk/gtkfilesel.c:767
+#: gtk/gtkfilesel.c:767
 msgid "_Files"
 msgstr "_Soubory"
 
-#: ../gtk/gtkfilesel.c:855 ../gtk/gtkfilesel.c:2242
+#: gtk/gtkfilesel.c:855 gtk/gtkfilesel.c:2242
 #, c-format
 msgid "Folder unreadable: %s"
 msgstr "Adresář nečitelný: %s"
 
-#: ../gtk/gtkfilesel.c:984
+#: gtk/gtkfilesel.c:984
 #, c-format
 msgid ""
 "The file \"%s\" resides on another machine (called %s) and may not be "
@@ -1571,19 +1579,19 @@ msgstr ""
 "pro tento program.\n"
 "Opravdu jej chcete vybrat?"
 
-#: ../gtk/gtkfilesel.c:1114
+#: gtk/gtkfilesel.c:1114
 msgid "_New Folder"
 msgstr "_Nový adresář"
 
-#: ../gtk/gtkfilesel.c:1125
+#: gtk/gtkfilesel.c:1125
 msgid "De_lete File"
 msgstr "_Odstranit soubor"
 
-#: ../gtk/gtkfilesel.c:1136
+#: gtk/gtkfilesel.c:1136
 msgid "_Rename File"
 msgstr "_Přejmenovat soubor"
 
-#: ../gtk/gtkfilesel.c:1438
+#: gtk/gtkfilesel.c:1438
 #, c-format
 msgid ""
 "The folder name \"%s\" contains symbols that are not allowed in filenames"
@@ -1591,7 +1599,7 @@ msgstr ""
 "Název adresáře \"%s\" obsahuje znaky, které nejsou v názvech souborů "
 "povoleny."
 
-#: ../gtk/gtkfilesel.c:1440
+#: gtk/gtkfilesel.c:1440
 #, c-format
 msgid ""
 "Error creating folder \"%s\": %s\n"
@@ -1600,34 +1608,34 @@ msgstr ""
 "Chyba při vytváření adresáře \"%s\": %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1441 ../gtk/gtkfilesel.c:1677
+#: gtk/gtkfilesel.c:1441 gtk/gtkfilesel.c:1677
 msgid "You probably used symbols not allowed in filenames."
 msgstr "Pravděpodobně jste použili znaky nepovolené v názvech souborů."
 
-#: ../gtk/gtkfilesel.c:1449
+#: gtk/gtkfilesel.c:1449
 #, c-format
 msgid "Error creating folder \"%s\": %s\n"
 msgstr "Chyba při vytváření adresáře \"%s\": %s\n"
 
-#: ../gtk/gtkfilesel.c:1483
+#: gtk/gtkfilesel.c:1483
 msgid "New Folder"
 msgstr "Nový adresář"
 
-#: ../gtk/gtkfilesel.c:1498
+#: gtk/gtkfilesel.c:1498
 msgid "_Folder name:"
 msgstr "Název _adresáře:"
 
-#: ../gtk/gtkfilesel.c:1522
+#: gtk/gtkfilesel.c:1522
 msgid "C_reate"
 msgstr "_Vytvořit"
 
-#: ../gtk/gtkfilesel.c:1565
+#: gtk/gtkfilesel.c:1565
 #, c-format
 msgid "The filename \"%s\" contains symbols that are not allowed in filenames"
 msgstr ""
 "Název souboru \"%s\" obsahuje znaky, které nejsou v názvech souborů povoleny"
 
-#: ../gtk/gtkfilesel.c:1568
+#: gtk/gtkfilesel.c:1568
 #, c-format
 msgid ""
 "Error deleting file \"%s\": %s\n"
@@ -1636,31 +1644,31 @@ msgstr ""
 "Chyba při odstraňování souboru \"%s\": %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1570 ../gtk/gtkfilesel.c:1691
+#: gtk/gtkfilesel.c:1570 gtk/gtkfilesel.c:1691
 msgid "It probably contains symbols not allowed in filenames."
 msgstr "Pravděpodobně obsahuje znaky nepovolené v názvech souborů."
 
-#: ../gtk/gtkfilesel.c:1579
+#: gtk/gtkfilesel.c:1579
 #, c-format
 msgid "Error deleting file \"%s\": %s"
 msgstr "Chyba při odstraňování souboru \"%s\": %s"
 
-#: ../gtk/gtkfilesel.c:1622
+#: gtk/gtkfilesel.c:1622
 #, c-format
 msgid "Really delete file \"%s\"?"
 msgstr "Opravdu odstranit soubor \"%s\"?"
 
-#: ../gtk/gtkfilesel.c:1627
+#: gtk/gtkfilesel.c:1627
 msgid "Delete File"
 msgstr "Odstranit soubor"
 
-#: ../gtk/gtkfilesel.c:1673 ../gtk/gtkfilesel.c:1687
+#: gtk/gtkfilesel.c:1673 gtk/gtkfilesel.c:1687
 #, c-format
 msgid "The file name \"%s\" contains symbols that are not allowed in filenames"
 msgstr ""
 "Název souboru \"%s\" obsahuje znaky, které nejsou povoleny v názvech souborů."
 
-#: ../gtk/gtkfilesel.c:1675
+#: gtk/gtkfilesel.c:1675
 #, c-format
 msgid ""
 "Error renaming file to \"%s\": %s\n"
@@ -1669,7 +1677,7 @@ msgstr ""
 "Chyba při přejmenovávání souboru na \"%s\": %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1689
+#: gtk/gtkfilesel.c:1689
 #, c-format
 msgid ""
 "Error renaming file \"%s\": %s\n"
@@ -1678,29 +1686,29 @@ msgstr ""
 "Chyba při přejmenovávání souboru \"%s\": %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1699
+#: gtk/gtkfilesel.c:1699
 #, c-format
 msgid "Error renaming file \"%s\" to \"%s\": %s"
 msgstr "Chyba při přejmenovávání souboru \"%s\" na \"%s\": %s"
 
-#: ../gtk/gtkfilesel.c:1746
+#: gtk/gtkfilesel.c:1746
 msgid "Rename File"
 msgstr "Přejmenovat soubor"
 
-#: ../gtk/gtkfilesel.c:1761
+#: gtk/gtkfilesel.c:1761
 #, c-format
 msgid "Rename file \"%s\" to:"
 msgstr "Přejmenovat soubor \"%s\" na:"
 
-#: ../gtk/gtkfilesel.c:1790
+#: gtk/gtkfilesel.c:1790
 msgid "_Rename"
 msgstr "Pře_jmenovat"
 
-#: ../gtk/gtkfilesel.c:2222
+#: gtk/gtkfilesel.c:2222
 msgid "_Selection: "
 msgstr "_Výběr: "
 
-#: ../gtk/gtkfilesel.c:3147
+#: gtk/gtkfilesel.c:3147
 #, c-format
 msgid ""
 "The filename \"%s\" couldn't be converted to UTF-8. (try setting the "
@@ -1709,48 +1717,48 @@ msgstr ""
 "Název souboru \"%s\" nemohl být převeden do UTF-8. (zkuste nastavit "
 "proměnnou prostředí G_FILENAME_ENCODING): %s"
 
-#: ../gtk/gtkfilesel.c:3150
+#: gtk/gtkfilesel.c:3150
 msgid "Invalid UTF-8"
 msgstr "Neplatné UTF-8"
 
-#: ../gtk/gtkfilesel.c:4027
+#: gtk/gtkfilesel.c:4027
 msgid "Name too long"
 msgstr "Název příliš dlouhý"
 
-#: ../gtk/gtkfilesel.c:4029
+#: gtk/gtkfilesel.c:4029
 msgid "Couldn't convert filename"
 msgstr "Nemohu převést název souboru"
 
-#: ../gtk/gtkfilesystemmodel.c:1267
+#: gtk/gtkfilesystemmodel.c:1267
 msgid "(Empty)"
 msgstr "(Prázdný)"
 
-#: ../gtk/gtkfilesystemunix.c:476 ../gtk/gtkfilesystemunix.c:682
-#: ../gtk/gtkfilesystemunix.c:1858 ../gtk/gtkfilesystemwin32.c:482
-#: ../gtk/gtkfilesystemwin32.c:495 ../gtk/gtkfilesystemwin32.c:1487
+#: gtk/gtkfilesystemunix.c:476 gtk/gtkfilesystemunix.c:682
+#: gtk/gtkfilesystemunix.c:1858 gtk/gtkfilesystemwin32.c:482
+#: gtk/gtkfilesystemwin32.c:495 gtk/gtkfilesystemwin32.c:1487
 #, c-format
 msgid "Error getting information for '%s': %s"
 msgstr "Chyba při získávání informací o '%s': %s"
 
-#: ../gtk/gtkfilesystemunix.c:551 ../gtk/gtkfilesystemwin32.c:537
+#: gtk/gtkfilesystemunix.c:551 gtk/gtkfilesystemwin32.c:537
 #, c-format
 msgid "Error creating directory '%s': %s"
 msgstr "Chyba při vytváření adresáře '%s': %s"
 
-#: ../gtk/gtkfilesystemunix.c:631 ../gtk/gtkfilesystemwin32.c:597
+#: gtk/gtkfilesystemunix.c:631 gtk/gtkfilesystemwin32.c:597
 msgid "This file system does not support mounting"
 msgstr "Tento systém souborů nepodporuje připojování"
 
-#: ../gtk/gtkfilesystemunix.c:639
+#: gtk/gtkfilesystemunix.c:639
 msgid "File System"
 msgstr "Systém souborů"
 
-#: ../gtk/gtkfilesystemunix.c:796
+#: gtk/gtkfilesystemunix.c:796
 #, c-format
 msgid "Could not get a stock icon for %s"
 msgstr "Nemohu získat standardní ikonu pro %s"
 
-#: ../gtk/gtkfilesystemunix.c:891
+#: gtk/gtkfilesystemunix.c:891
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"%s\". "
@@ -1759,93 +1767,93 @@ msgstr ""
 "Název \"%s\" není platný, protože obsahuje znak \"%s\". Použijte prosím jiný "
 "název."
 
-#: ../gtk/gtkfilesystemunix.c:1463 ../gtk/gtkfilesystemwin32.c:1032
+#: gtk/gtkfilesystemunix.c:1463 gtk/gtkfilesystemwin32.c:1032
 #, c-format
 msgid "Bookmark saving failed: %s"
 msgstr "Ukládání záložek selhalo: %s"
 
-#: ../gtk/gtkfilesystemunix.c:1518
+#: gtk/gtkfilesystemunix.c:1518
 #, c-format
 msgid "'%s' already exists in the bookmarks list"
 msgstr "'%s' již v seznamu záložek existuje"
 
-#: ../gtk/gtkfilesystemunix.c:1590
+#: gtk/gtkfilesystemunix.c:1590
 #, c-format
 msgid "'%s' does not exist in the bookmarks list"
 msgstr "'%s' neexistuje v seznamu záložek"
 
-#: ../gtk/gtkfilesystemunix.c:1818
+#: gtk/gtkfilesystemunix.c:1818
 #, c-format
 msgid "Error getting information for '/': %s"
 msgstr "Chyba při získávání informací o '/': %s"
 
-#: ../gtk/gtkfilesystemwin32.c:611
+#: gtk/gtkfilesystemwin32.c:611
 #, c-format
 msgid "Network Drive (%s)"
 msgstr "Síťový disk (%s)"
 
-#: ../gtk/gtkfilesystemwin32.c:650
+#: gtk/gtkfilesystemwin32.c:650
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../gtk/gtkfontbutton.c:179 ../gtk/gtkfontbutton.c:292
+#: gtk/gtkfontbutton.c:179 gtk/gtkfontbutton.c:292
 msgid "Pick a Font"
 msgstr "Vyberte písmo"
 
 #. Initialize fields
-#: ../gtk/gtkfontbutton.c:286
+#: gtk/gtkfontbutton.c:286
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: ../gtk/gtkfontbutton.c:804
+#: gtk/gtkfontbutton.c:804
 msgid "Font"
 msgstr "Písmo"
 
 #. This is the default text shown in the preview entry, though the user
 #. can set it. Remember that some fonts only have capital letters.
-#: ../gtk/gtkfontsel.c:74
+#: gtk/gtkfontsel.c:74
 msgid "abcdefghijk ABCDEFGHIJK"
 msgstr "přikrášlený žluťoučký kůň PŘIKRÁŠLENÝ ŽLUŤOUČKÝ KŮŇ"
 
-#: ../gtk/gtkfontsel.c:361
+#: gtk/gtkfontsel.c:361
 msgid "_Family:"
 msgstr "_Rodina:"
 
-#: ../gtk/gtkfontsel.c:367
+#: gtk/gtkfontsel.c:367
 msgid "_Style:"
 msgstr "_Styl:"
 
-#: ../gtk/gtkfontsel.c:373
+#: gtk/gtkfontsel.c:373
 msgid "Si_ze:"
 msgstr "_Velikost:"
 
 #. create the text entry widget
-#: ../gtk/gtkfontsel.c:549
+#: gtk/gtkfontsel.c:549
 msgid "_Preview:"
 msgstr "_Náhled:"
 
-#: ../gtk/gtkfontsel.c:1383
+#: gtk/gtkfontsel.c:1383
 msgid "Font Selection"
 msgstr "Výběr písma"
 
-#: ../gtk/gtkgamma.c:401
+#: gtk/gtkgamma.c:401
 msgid "Gamma"
 msgstr "Gama"
 
-#: ../gtk/gtkgamma.c:411
+#: gtk/gtkgamma.c:411
 msgid "_Gamma value"
 msgstr "Hodnota _gama"
 
 #. Remove this icon source so we don't keep trying to
 #. * load it.
 #.
-#: ../gtk/gtkiconfactory.c:1656
+#: gtk/gtkiconfactory.c:1656
 #, c-format
 msgid "Error loading icon: %s"
 msgstr "Chyba při načítání ikony: %s"
 
-#: ../gtk/gtkicontheme.c:1239
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1858,120 +1866,120 @@ msgstr ""
 "Můžete ji získat z:\n"
 "\t%s"
 
-#: ../gtk/gtkicontheme.c:1304
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Ikona '%s' není obsažena v tématu"
 
-#: ../gtk/gtkimmodule.c:427
+#: gtk/gtkimmodule.c:427
 msgid "Default"
 msgstr "Implicitní"
 
-#: ../gtk/gtkinputdialog.c:235
+#: gtk/gtkinputdialog.c:235
 msgid "Input"
 msgstr "Vstup"
 
-#: ../gtk/gtkinputdialog.c:244
+#: gtk/gtkinputdialog.c:244
 msgid "No extended input devices"
 msgstr "Nejsou rozšířená vstupní zařízení"
 
-#: ../gtk/gtkinputdialog.c:256
+#: gtk/gtkinputdialog.c:256
 msgid "_Device:"
 msgstr "_Zařízení:"
 
-#: ../gtk/gtkinputdialog.c:273
+#: gtk/gtkinputdialog.c:273
 msgid "Disabled"
 msgstr "Vypnuto"
 
-#: ../gtk/gtkinputdialog.c:280
+#: gtk/gtkinputdialog.c:280
 msgid "Screen"
 msgstr "Obrazovka"
 
-#: ../gtk/gtkinputdialog.c:287
+#: gtk/gtkinputdialog.c:287
 msgid "Window"
 msgstr "Okno"
 
-#: ../gtk/gtkinputdialog.c:294
+#: gtk/gtkinputdialog.c:294
 msgid "_Mode: "
 msgstr "_Režim: "
 
 #. The axis listbox
-#: ../gtk/gtkinputdialog.c:325
+#: gtk/gtkinputdialog.c:325
 msgid "_Axes"
 msgstr "_Osy"
 
 #. Keys listbox
-#: ../gtk/gtkinputdialog.c:342
+#: gtk/gtkinputdialog.c:342
 msgid "_Keys"
 msgstr "_Klávesy"
 
-#: ../gtk/gtkinputdialog.c:562
+#: gtk/gtkinputdialog.c:562
 msgid "X"
 msgstr "X"
 
-#: ../gtk/gtkinputdialog.c:563
+#: gtk/gtkinputdialog.c:563
 msgid "Y"
 msgstr "Y"
 
-#: ../gtk/gtkinputdialog.c:564
+#: gtk/gtkinputdialog.c:564
 msgid "Pressure"
 msgstr "Tlak"
 
-#: ../gtk/gtkinputdialog.c:565
+#: gtk/gtkinputdialog.c:565
 msgid "X Tilt"
 msgstr "Sklon X"
 
-#: ../gtk/gtkinputdialog.c:566
+#: gtk/gtkinputdialog.c:566
 msgid "Y Tilt"
 msgstr "Sklon Y"
 
-#: ../gtk/gtkinputdialog.c:567
+#: gtk/gtkinputdialog.c:567
 msgid "Wheel"
 msgstr "Kolečko"
 
-#: ../gtk/gtkinputdialog.c:607
+#: gtk/gtkinputdialog.c:607
 msgid "none"
 msgstr "žádný"
 
-#: ../gtk/gtkinputdialog.c:643 ../gtk/gtkinputdialog.c:679
+#: gtk/gtkinputdialog.c:643 gtk/gtkinputdialog.c:679
 msgid "(disabled)"
 msgstr "(vypnuto)"
 
-#: ../gtk/gtkinputdialog.c:672
+#: gtk/gtkinputdialog.c:672
 msgid "(unknown)"
 msgstr "(neznámá)"
 
 #. and clear button
-#: ../gtk/gtkinputdialog.c:759
+#: gtk/gtkinputdialog.c:759
 msgid "clear"
 msgstr "vyčistit"
 
-#: ../gtk/gtklabel.c:3985
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Vybrat vše"
 
 #. Description of --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:398
+#: gtk/gtkmain.c:398
 msgid "Load additional GTK+ modules"
 msgstr "Načíst přídavné moduly GTK+"
 
 #. Placeholder in --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:399
+#: gtk/gtkmain.c:399
 msgid "MODULES"
 msgstr "MODULY"
 
 #. Description of --g-fatal-warnings in --help output
-#: ../gtk/gtkmain.c:401
+#: gtk/gtkmain.c:401
 msgid "Make all warnings fatal"
 msgstr "Učinit všechna varování fatální"
 
 #. Description of --gtk-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:404
+#: gtk/gtkmain.c:404
 msgid "GTK+ debugging flags to set"
 msgstr "Ladicí příznaky GTK+, které nastavit"
 
 #. Description of --gtk-no-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:407
+#: gtk/gtkmain.c:407
 msgid "GTK+ debugging flags to unset"
 msgstr "Ladicí příznaky GTK+, jejichž nastavení zrušit"
 
@@ -1980,517 +1988,517 @@ msgstr "Ladicí příznaky GTK+, jejichž nastavení zrušit"
 #. * Do *not* translate it to "predefinito:LTR", if it
 #. * it isn't default:LTR or default:RTL it will not work
 #.
-#: ../gtk/gtkmain.c:476
+#: gtk/gtkmain.c:476
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../gtk/gtkmain.c:559
+#: gtk/gtkmain.c:559
 msgid "GTK+ Options"
 msgstr "Přepínače GTK+"
 
-#: ../gtk/gtkmain.c:559
+#: gtk/gtkmain.c:559
 msgid "Show GTK+ Options"
 msgstr "Zobrazit přepínače GTK+"
 
-#: ../gtk/gtknotebook.c:2718 ../gtk/gtknotebook.c:5064
+#: gtk/gtknotebook.c:2718 gtk/gtknotebook.c:5064
 #, c-format
 msgid "Page %u"
 msgstr "Strana %u"
 
-#: ../gtk/gtkradiotoolbutton.c:92
+#: gtk/gtkradiotoolbutton.c:92
 msgid "Group"
 msgstr "Skupina"
 
-#: ../gtk/gtkradiotoolbutton.c:93
+#: gtk/gtkradiotoolbutton.c:93
 msgid "The radio tool button whose group this button belongs to."
 msgstr "Přepínací tlačíko, do jehož skupiny patří toto tlačítko."
 
-#: ../gtk/gtkrc.c:2400
+#: gtk/gtkrc.c:2400
 #, c-format
 msgid "Unable to find include file: \"%s\""
 msgstr "Nemohu nalézt vložený soubor: \"%s\""
 
-#: ../gtk/gtkrc.c:3042 ../gtk/gtkrc.c:3045
+#: gtk/gtkrc.c:3042 gtk/gtkrc.c:3045
 #, c-format
 msgid "Unable to locate image file in pixmap_path: \"%s\""
 msgstr "Nemohu nalézt soubor obrázku v pixmap_path: \"%s\""
 
-#: ../gtk/gtkrc.c:3480
+#: gtk/gtkrc.c:3480
 #, c-format
 msgid "Pixmap path element: \"%s\" must be absolute, %s, line %d"
 msgstr "Element cesty k pixmapám: \"%s\" musí být absolutní, %s, řádek %d"
 
 #. KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate
-#: ../gtk/gtkstock.c:308
+#: gtk/gtkstock.c:308
 msgid "Information"
 msgstr "Informace"
 
-#: ../gtk/gtkstock.c:309
+#: gtk/gtkstock.c:309
 msgid "Warning"
 msgstr "Varování"
 
-#: ../gtk/gtkstock.c:310
+#: gtk/gtkstock.c:310
 msgid "Error"
 msgstr "Chyba"
 
-#: ../gtk/gtkstock.c:311
+#: gtk/gtkstock.c:311
 msgid "Question"
 msgstr "Otázka"
 
 #. FIXME these need accelerators when appropriate, and
 #. * need the mnemonics to be rationalized
 #.
-#: ../gtk/gtkstock.c:316
+#: gtk/gtkstock.c:316
 msgid "_About"
 msgstr "O _aplikaci"
 
-#: ../gtk/gtkstock.c:318
+#: gtk/gtkstock.c:318
 msgid "_Apply"
 msgstr "_Použít"
 
-#: ../gtk/gtkstock.c:319
+#: gtk/gtkstock.c:319
 msgid "_Bold"
 msgstr "_Tučné"
 
-#: ../gtk/gtkstock.c:320
+#: gtk/gtkstock.c:320
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: ../gtk/gtkstock.c:321
+#: gtk/gtkstock.c:321
 msgid "_CD-Rom"
 msgstr "_CD-ROM"
 
-#: ../gtk/gtkstock.c:322
+#: gtk/gtkstock.c:322
 msgid "_Clear"
 msgstr "Vy_mazat"
 
-#: ../gtk/gtkstock.c:323
+#: gtk/gtkstock.c:323
 msgid "_Close"
 msgstr "_Zavřít"
 
-#: ../gtk/gtkstock.c:324
+#: gtk/gtkstock.c:324
 msgid "_Convert"
 msgstr "_Převést"
 
-#: ../gtk/gtkstock.c:325
+#: gtk/gtkstock.c:325
 msgid "_Copy"
 msgstr "_Kopírovat"
 
-#: ../gtk/gtkstock.c:326
+#: gtk/gtkstock.c:326
 msgid "Cu_t"
 msgstr "_Vyjmout"
 
-#: ../gtk/gtkstock.c:327
+#: gtk/gtkstock.c:327
 msgid "_Delete"
 msgstr "_Odstranit"
 
-#: ../gtk/gtkstock.c:328
+#: gtk/gtkstock.c:328
 msgid "_Execute"
 msgstr "_Spustit"
 
-#: ../gtk/gtkstock.c:329
+#: gtk/gtkstock.c:329
 msgid "_Edit"
 msgstr "_Upravit"
 
-#: ../gtk/gtkstock.c:330
+#: gtk/gtkstock.c:330
 msgid "_Find"
 msgstr "_Hledat"
 
-#: ../gtk/gtkstock.c:331
+#: gtk/gtkstock.c:331
 msgid "Find and _Replace"
 msgstr "Hledat a nah_radit"
 
-#: ../gtk/gtkstock.c:332
+#: gtk/gtkstock.c:332
 msgid "_Floppy"
 msgstr "_Disketa"
 
-#: ../gtk/gtkstock.c:333
+#: gtk/gtkstock.c:333
 msgid "_Fullscreen"
 msgstr "_Celá obrazovka"
 
-#: ../gtk/gtkstock.c:334
+#: gtk/gtkstock.c:334
 msgid "_Leave Fullscreen"
 msgstr "_Opustit celou obrazovku"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:336
+#: gtk/gtkstock.c:336
 msgid "Navigation|_Bottom"
 msgstr "_Dole"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:338
+#: gtk/gtkstock.c:338
 msgid "Navigation|_First"
 msgstr "P_rvní"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:340
+#: gtk/gtkstock.c:340
 msgid "Navigation|_Last"
 msgstr "Po_slední"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:342
+#: gtk/gtkstock.c:342
 msgid "Navigation|_Top"
 msgstr "_Nahoru"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:344
+#: gtk/gtkstock.c:344
 msgid "Navigation|_Back"
 msgstr "_Zpět"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:346
+#: gtk/gtkstock.c:346
 msgid "Navigation|_Down"
 msgstr "_Dolů"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:348
+#: gtk/gtkstock.c:348
 msgid "Navigation|_Forward"
 msgstr "_Vpřed"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:350
+#: gtk/gtkstock.c:350
 msgid "Navigation|_Up"
 msgstr "_Nahoru"
 
-#: ../gtk/gtkstock.c:351
+#: gtk/gtkstock.c:351
 msgid "_Harddisk"
 msgstr "_Pevný disk"
 
-#: ../gtk/gtkstock.c:352
+#: gtk/gtkstock.c:352
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: ../gtk/gtkstock.c:353
+#: gtk/gtkstock.c:353
 msgid "_Home"
 msgstr "_Domů"
 
-#: ../gtk/gtkstock.c:354
+#: gtk/gtkstock.c:354
 msgid "Increase Indent"
 msgstr "Zvětšit odsazení"
 
-#: ../gtk/gtkstock.c:355
+#: gtk/gtkstock.c:355
 msgid "Decrease Indent"
 msgstr "Zmenšit odsazení"
 
-#: ../gtk/gtkstock.c:356
+#: gtk/gtkstock.c:356
 msgid "_Index"
 msgstr "_Index"
 
-#: ../gtk/gtkstock.c:357
+#: gtk/gtkstock.c:357
 msgid "_Information"
 msgstr "_Informace"
 
-#: ../gtk/gtkstock.c:358
+#: gtk/gtkstock.c:358
 msgid "_Italic"
 msgstr "_Kurzíva"
 
-#: ../gtk/gtkstock.c:359
+#: gtk/gtkstock.c:359
 msgid "_Jump to"
 msgstr "_Přejít na"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:361
+#: gtk/gtkstock.c:361
 msgid "Justify|_Center"
 msgstr "Na _střed"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:363
+#: gtk/gtkstock.c:363
 msgid "Justify|_Fill"
 msgstr "_Vyplnit"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:365
+#: gtk/gtkstock.c:365
 msgid "Justify|_Left"
 msgstr "Do_leva"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:367
+#: gtk/gtkstock.c:367
 msgid "Justify|_Right"
 msgstr "Do_prava"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:370
+#: gtk/gtkstock.c:370
 msgid "Media|_Forward"
 msgstr "_Vpřed"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:372
+#: gtk/gtkstock.c:372
 msgid "Media|_Next"
 msgstr "_Následující"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:374
+#: gtk/gtkstock.c:374
 msgid "Media|P_ause"
 msgstr "_Pozastavit"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:376
+#: gtk/gtkstock.c:376
 msgid "Media|_Play"
 msgstr "Pře_hrávat"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:378
+#: gtk/gtkstock.c:378
 msgid "Media|Pre_vious"
 msgstr "_Předchozí"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:380
+#: gtk/gtkstock.c:380
 msgid "Media|_Record"
 msgstr "_Zaznamenávat"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:382
+#: gtk/gtkstock.c:382
 msgid "Media|R_ewind"
 msgstr "Pře_točit"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:384
+#: gtk/gtkstock.c:384
 msgid "Media|_Stop"
 msgstr "Za_stavit"
 
-#: ../gtk/gtkstock.c:385
+#: gtk/gtkstock.c:385
 msgid "_Network"
 msgstr "_Síť"
 
-#: ../gtk/gtkstock.c:386
+#: gtk/gtkstock.c:386
 msgid "_New"
 msgstr "_Nový"
 
-#: ../gtk/gtkstock.c:387
+#: gtk/gtkstock.c:387
 msgid "_No"
 msgstr "_Ne"
 
-#: ../gtk/gtkstock.c:388
+#: gtk/gtkstock.c:388
 msgid "_OK"
 msgstr "_Budiž"
 
-#: ../gtk/gtkstock.c:389
+#: gtk/gtkstock.c:389
 msgid "_Open"
 msgstr "_Otevřít"
 
-#: ../gtk/gtkstock.c:390
+#: gtk/gtkstock.c:390
 msgid "_Paste"
 msgstr "V_ložit"
 
-#: ../gtk/gtkstock.c:391
+#: gtk/gtkstock.c:391
 msgid "_Preferences"
 msgstr "_Nastavení"
 
-#: ../gtk/gtkstock.c:392
+#: gtk/gtkstock.c:392
 msgid "_Print"
 msgstr "_Tisk"
 
-#: ../gtk/gtkstock.c:393
+#: gtk/gtkstock.c:393
 msgid "Print Pre_view"
 msgstr "Ná_hled tisku"
 
-#: ../gtk/gtkstock.c:394
+#: gtk/gtkstock.c:394
 msgid "_Properties"
 msgstr "_Vlastnosti"
 
-#: ../gtk/gtkstock.c:395
+#: gtk/gtkstock.c:395
 msgid "_Quit"
 msgstr "U_končit"
 
-#: ../gtk/gtkstock.c:396
+#: gtk/gtkstock.c:396
 msgid "_Redo"
 msgstr "Zn_ovu"
 
-#: ../gtk/gtkstock.c:397
+#: gtk/gtkstock.c:397
 msgid "_Refresh"
 msgstr "Ob_novit"
 
-#: ../gtk/gtkstock.c:399
+#: gtk/gtkstock.c:399
 msgid "_Revert"
 msgstr "_Vrátit"
 
-#: ../gtk/gtkstock.c:400
+#: gtk/gtkstock.c:400
 msgid "_Save"
 msgstr "_Uložit"
 
-#: ../gtk/gtkstock.c:401
+#: gtk/gtkstock.c:401
 msgid "Save _As"
 msgstr "Uložit _jako"
 
-#: ../gtk/gtkstock.c:402
+#: gtk/gtkstock.c:402
 msgid "_Color"
 msgstr "_Barva"
 
-#: ../gtk/gtkstock.c:403
+#: gtk/gtkstock.c:403
 msgid "_Font"
 msgstr "_Písmo"
 
-#: ../gtk/gtkstock.c:404
+#: gtk/gtkstock.c:404
 msgid "_Ascending"
 msgstr "_Vzestupně"
 
-#: ../gtk/gtkstock.c:405
+#: gtk/gtkstock.c:405
 msgid "_Descending"
 msgstr "_Sestupně"
 
-#: ../gtk/gtkstock.c:406
+#: gtk/gtkstock.c:406
 msgid "_Spell Check"
 msgstr "_Kontrola pravopisu"
 
-#: ../gtk/gtkstock.c:407
+#: gtk/gtkstock.c:407
 msgid "_Stop"
 msgstr "Za_stavit"
 
-#: ../gtk/gtkstock.c:408
+#: gtk/gtkstock.c:408
 msgid "_Strikethrough"
 msgstr "_Přeškrtnuté"
 
-#: ../gtk/gtkstock.c:409
+#: gtk/gtkstock.c:409
 msgid "_Undelete"
 msgstr "_Zrušit odstranění"
 
-#: ../gtk/gtkstock.c:410
+#: gtk/gtkstock.c:410
 msgid "_Underline"
 msgstr "Po_dtržené"
 
-#: ../gtk/gtkstock.c:411
+#: gtk/gtkstock.c:411
 msgid "_Undo"
 msgstr "_Zpět"
 
-#: ../gtk/gtkstock.c:412
+#: gtk/gtkstock.c:412
 msgid "_Yes"
 msgstr "_Ano"
 
-#: ../gtk/gtkstock.c:413
+#: gtk/gtkstock.c:413
 msgid "_Normal Size"
 msgstr "_Normální velikost"
 
-#: ../gtk/gtkstock.c:414
+#: gtk/gtkstock.c:414
 msgid "Best _Fit"
 msgstr "Při_způsobit velikost"
 
-#: ../gtk/gtkstock.c:415
+#: gtk/gtkstock.c:415
 msgid "Zoom _In"
 msgstr "Z_většit"
 
-#: ../gtk/gtkstock.c:416
+#: gtk/gtkstock.c:416
 msgid "Zoom _Out"
 msgstr "Z_menšit"
 
-#: ../gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM značka _Left-to-right"
 
-#: ../gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM značka _Right-to-left"
 
-#: ../gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Left-to-right _zapouzdření"
 
-#: ../gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Right-to-left z_apouzdření"
 
-#: ../gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Left-to-right _přepisování"
 
-#: ../gtk/gtktextutil.c:58
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Right-to-left př_episování"
 
-#: ../gtk/gtktextutil.c:59
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF Směrované formátování _pop"
 
-#: ../gtk/gtktextutil.c:60
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS Mezera _nulové šířky"
 
-#: ../gtk/gtktextutil.c:61
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ _Spojovatel nulové šířky"
 
-#: ../gtk/gtktextutil.c:62
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ nespojovatel nulové šířky"
 
-#: ../gtk/gtkthemes.c:71
+#: gtk/gtkthemes.c:71
 #, c-format
 msgid "Unable to locate theme engine in module_path: \"%s\","
 msgstr "Nemohu nalézt knihovnu pro témata v module_path: \"%s\","
 
-#: ../gtk/gtktipsquery.c:186
+#: gtk/gtktipsquery.c:186
 msgid "--- No Tip ---"
 msgstr "--- Bez rady ---"
 
-#: ../gtk/gtkuimanager.c:1154
+#: gtk/gtkuimanager.c:1154
 #, c-format
 msgid "Unknown attribute '%s' on line %d char %d"
 msgstr "Neznámý atribut '%s' na řádku %d znak %d"
 
-#: ../gtk/gtkuimanager.c:1371
+#: gtk/gtkuimanager.c:1371
 #, c-format
 msgid "Unexpected start tag '%s' on line %d char %d"
 msgstr "Neočekávaný počáteční tag '%s' na řádku %d znak %d"
 
-#: ../gtk/gtkuimanager.c:1461
+#: gtk/gtkuimanager.c:1461
 #, c-format
 msgid "Unexpected character data on line %d char %d"
 msgstr "Neočekávaná data znaků na řádku %d znak %d"
 
-#: ../gtk/gtkuimanager.c:2272
+#: gtk/gtkuimanager.c:2272
 msgid "Empty"
 msgstr "Prázdný"
 
 #. ID
-#: ../modules/input/imam-et.c:454
+#: modules/input/imam-et.c:454
 msgid "Amharic (EZ+)"
 msgstr "Amharicky (EZ+)"
 
 #. ID
-#: ../modules/input/imcedilla.c:91
+#: modules/input/imcedilla.c:91
 msgid "Cedilla"
 msgstr "Cedilla"
 
 #. ID
-#: ../modules/input/imcyrillic-translit.c:217
+#: modules/input/imcyrillic-translit.c:217
 msgid "Cyrillic (Transliterated)"
 msgstr "Azbuka (Transliterovaná)"
 
 #. ID
-#: ../modules/input/iminuktitut.c:127
+#: modules/input/iminuktitut.c:127
 msgid "Inuktitut (Transliterated)"
 msgstr "Inuktitut (Transliterovaný)"
 
 #. ID
-#: ../modules/input/imipa.c:145
+#: modules/input/imipa.c:145
 msgid "IPA"
 msgstr "IPA"
 
 #. ID
-#: ../modules/input/imthai-broken.c:178
+#: modules/input/imthai-broken.c:178
 msgid "Thai (Broken)"
 msgstr "Thajsky (Nefunkční)"
 
 #. ID
-#: ../modules/input/imti-er.c:453
+#: modules/input/imti-er.c:453
 msgid "Tigrigna-Eritrean (EZ+)"
 msgstr "Tigrigna-Eritrejsky (EZ+)"
 
 #. ID
-#: ../modules/input/imti-et.c:453
+#: modules/input/imti-et.c:453
 msgid "Tigrigna-Ethiopian (EZ+)"
 msgstr "Tigrigna-Etiopsky (EZ+)"
 
 #. ID
-#: ../modules/input/imviqr.c:244
+#: modules/input/imviqr.c:244
 msgid "Vietnamese (VIQR)"
 msgstr "Vietnamsky (VIQR)"
 
 #. ID
-#: ../modules/input/imxim.c:28
+#: modules/input/imxim.c:28
 msgid "X Input Method"
 msgstr "Vstupní metoda X"
 
-#: ../tests/testfilechooser.c:205
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Nemohu získat informace o souboru '%s': %s"
diff --git a/po/cy.po b/po/cy.po
index bd28629c7b..ac19187873 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-01-08 08:46+0000\n"
 "Last-Translator: Rhys Jones <rhys@sucs.org>\n"
 "Language-Team: Cymraeg <gnome-cy@pengwyn.linux.org.uk>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n == 2) ? 1 : 0;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Methu agor y ffeil '%s': %s"
@@ -28,7 +28,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Mae'r ffeil delwedd '%s' yn cynnwys dim data"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1268,20 +1268,20 @@ msgstr "Olwyn Lliw"
 msgid "Color Selection"
 msgstr "Dewis Lliw"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Dewis _Popeth"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Moddau _Mewnbwn"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Mewnosod Nod Rheoli Unicode"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Enw ffeil annilys: %s"
@@ -1290,12 +1290,12 @@ msgstr "Enw ffeil annilys: %s"
 msgid "Select A File"
 msgstr "Dewiswch Ffeil"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Cartref"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Penbwrdd"
@@ -1308,241 +1308,257 @@ msgstr "(Dim)"
 msgid "Other..."
 msgstr "Arall..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Methwyd cyrchu gwybodaeth ynghylch y ffeil"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Methwyd ychwanegu llyfrnod"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Methwyd dileu'r llyfrnod"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Methu creu'r blygell"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Enw ffeil annilys"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Ni fedrwyd dangos cynnwys y blygell"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Methwyd cyrchu gwybodaeth ar gyfer y ffeil '%s': %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Ychwanegu'r blygell '%s' at y llyfrnodau"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Ychwanegu'r blygell bresennol at y llyfrnodau"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Ychwanegu'r plygellau sydd wedi eu dewis at y llyfrnodau"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Tynnu'r llyfrnod '%s'"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "Methwyd ychwanegu llyfrnod ar gyfer %s am nad yw'n enw llwybr dilys."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Tynnu"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Ailenwi"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Byrlwybrau"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Plygell"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Ychwanegu"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 #, fuzzy
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Ychwanegu'r blygell sydd wedi ei dewis at y llyfrnodau"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Tynnu"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Dileu'r llyfrnod sydd wedi ei ddewis"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Methwyd dewis eitem"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "Methwyd ychwanegu llyfrnod ar gyfer %s am nad yw'n enw llwybr dilys."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "Ychwanegu llyfrnod"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Agor _Lleoliad"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Dangos Ffeiliau _Cudd"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Ffeiliau"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Enw"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Maint"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Wedi newid"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Dewis pa fathau o ffeiliau a ddangosir"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Creu _Plygell"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Enw:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Pori am blygellau eraill"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Arbed mewn _plygell:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Creu mewn _plygell:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Methwyd newid i'r blygell am nad yw'n lleol"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Nid yw'r byrlwybr %s yn bodoli"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Ailenwi"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Methu â gosod %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Teipiwch enw'r plygell newydd"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d beit"
 msgstr[1] "%d feit"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f C"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Heddiw"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Ddoe"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Methu newid plygell"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Mae llwybr y blygell ddewisoch yn un annilys."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Methu adeiladu enw ffeil o '%s' a '%s'"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Methwyd dewis eitem"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Agor Lleoliad"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Cadw mewn Lleoliad"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Lleoliad: "
 
@@ -1748,7 +1764,7 @@ msgid "This file system does not support mounting"
 msgstr "Nid yw'r system ffeiliau yma yn cynnal gosod disgiau"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+msgid "File System"
 msgstr "System Ffeiliau"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1851,7 +1867,7 @@ msgstr "_Gwerth Gamma"
 msgid "Error loading icon: %s"
 msgstr "Gwall wrth lwytho eicon: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1864,7 +1880,7 @@ msgstr ""
 "Gellwch gael copi o:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Nid yw'r eicon '%s' yn bresennol yn y thema"
@@ -1952,7 +1968,7 @@ msgstr "(anhysbys)"
 msgid "clear"
 msgstr "clir"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Dewis Popeth"
 
@@ -2393,46 +2409,46 @@ msgstr "_Chwyddo"
 msgid "Zoom _Out"
 msgstr "_Crebachu"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM Mark _chwith-i'r-dde"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM Marc _dde-i'r-chwith"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE _Ymgorffori chwith-i'r-dde"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Y_mgorffori dde-i'r-chwith"
 
 # EFALLAI
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO _Gwrthweithred chwith-i'r-dde."
 
 # EFALLAI
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "LRO G_wrthweithred dde-i'r-chwith"
 
 # EFALLAI
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Popio fformadu cyfeiriadol"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS Bwlch lled _sero"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Ym_unydd lled sero"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "JWNJ _Nid-ymunyddi lled sero"
 
@@ -2515,11 +2531,14 @@ msgstr "Fietnameg (VIQR)"
 msgid "X Input Method"
 msgstr "Modd Mewnbwn X"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Methwyd cyrchu gwybodaeth ar gyfer y ffeil '%s': %s"
 
+#~ msgid "Filesystem"
+#~ msgstr "System Ffeiliau"
+
 #, fuzzy
 #~ msgid "Writing %s failed: %s"
 #~ msgstr "Methwyd arbed llyfrnodau: %s"
@@ -3784,9 +3803,6 @@ msgstr "Methwyd cyrchu gwybodaeth ar gyfer y ffeil '%s': %s"
 #~ msgid "The type of operation that the file selector is performing"
 #~ msgstr "Y math o weithred mae'r dewisydd ffeil yn ei gyflawni"
 
-#~ msgid "File System"
-#~ msgstr "System Ffeiliau"
-
 #~ msgid "File system object to use"
 #~ msgstr "Y gwrthrydd system ffeiliau i'w ddefnyddio"
 
diff --git a/po/da.po b/po/da.po
index 1b62fe8dee..8adaed9d59 100644
--- a/po/da.po
+++ b/po/da.po
@@ -32,7 +32,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-06-14 11:11+0200\n"
 "Last-Translator: Martin Willemoes Hansen <mwh@sysrq.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -42,7 +42,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Kunne ikke åbne filen '%s': %s"
@@ -53,7 +53,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Billedfil '%s' indeholder ingen data"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1284,20 +1284,20 @@ msgstr "Farvehjul"
 msgid "Color Selection"
 msgstr "Farvevælger"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Markér _alt"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Indtastnings_metoder"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Indsæt Unicode-kontroltegn"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Ugyldigt filnavn: %s"
@@ -1306,12 +1306,12 @@ msgstr "Ugyldigt filnavn: %s"
 msgid "Select A File"
 msgstr "Vælg en fil"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Hjem"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Skrivebord"
@@ -1324,23 +1324,23 @@ msgstr "(ingen)"
 msgid "Other..."
 msgstr "Anden..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Kunne ikke indhente oplysninger om filen"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Kunne ikke tilføje et bogmærke"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Kunne ikke fjerne bogmærke"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Mappen kunne ikke oprettes"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1348,218 +1348,234 @@ msgstr ""
 "Mappen kunne ikke oprettes fordi en fil med samme navn allerede findes. Prøv "
 "at brug et andet mappenavn eller omdøb filen."
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Ugyldigt filnavn"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Indholdet af mappen kunne ikke vises"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Kunne ikke indhente oplysninger om \"%s\": %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Tilføj mappen \"%s\" til bogmærkerne"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Tilføj den aktuelle mappe til bogmærkerne"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Tilføj de markerede mapper til bogmærkerne"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Fjern bogmærket \"%s\""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Kunne ikke tilføje et bogmærke for \"%s\" fordi det er et ugyldigt stinavn."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Fjern"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Omdøb..."
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Genveje"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Mappe"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Tilføj"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Tilføj den markerede mappe til bogmærkerne"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Fjern det markerede bogmærke"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Kunne ikke vælge element"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "Kunne ikke tilføje et bogmærke for \"%s\" fordi det er et ugyldigt stinavn."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "_Tilføj til bogmærker"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Åbn _placering"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Vis _skjulte filer"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Filer"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Navn"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Størrelse"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Ændret"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Vælg hvilke typer filer der vises"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Opret _mappe"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Se efter andre mapper"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Gem i _mappe:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Opret i _mappe:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Kan ikke skifte til mappen fordi den ikke er lokal"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Genvejen %s findes ikke"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Omdøb"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Kunne ikke montere %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Indtast navn på ny mappe"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d byte"
 msgstr[1] "%d byte"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f k"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "I dag"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "I går"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Kan ikke skifte mappe"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Mappen du har angivet har en ugyldig sti."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Kunne ikke opbygge filnavn fra \"%s\" og \"%s\""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Kunne ikke vælge element"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Åbn placering"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Åbn i placering"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Sted:"
 
@@ -1759,7 +1775,8 @@ msgid "This file system does not support mounting"
 msgstr "Dette filsystem understøtter ikke montering"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Filsystemer"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1863,7 +1880,7 @@ msgstr "_Gammaværdi"
 msgid "Error loading icon: %s"
 msgstr "Fejl ved indlæsning af ikon: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1876,7 +1893,7 @@ msgstr ""
 "installere det. Du kan få en kopi fra:\n"
 "           %s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Ikonet \"%s\" er ikke tilgængeligt i tema"
@@ -1964,7 +1981,7 @@ msgstr "(ukendt)"
 msgid "clear"
 msgstr "ryd"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Markér alt"
 
@@ -2391,44 +2408,44 @@ msgstr "Zoom _ind"
 msgid "Zoom _Out"
 msgstr "Zoom _ud"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM _venstre-mod-højre-mærke"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM _højre-mod-venstre-mærke"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE venstre-mod-højre-_indlejring"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE højre-mod-venstre-i_ndlejring"
 
 # RETMIG: rigtigt?
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO venstre-mod-højre-_overskrivning"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO højre-mod-venstre-o_verskrivning"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _glem retningsformatering"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _nul bredde mellemrum"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ nul bredde _sammenbinder"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ nul bredde i_kke-sammenbinder"
 
@@ -2510,7 +2527,7 @@ msgstr "Vietnamesisk (VIQR)"
 msgid "X Input Method"
 msgstr "X-indtastningsmetode"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Kunne ikke indhente oplysninger om filen \"%s\": %s"
diff --git a/po/de.po b/po/de.po
index 4a38251f86..8ce1d1beae 100644
--- a/po/de.po
+++ b/po/de.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GTK+ HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-12-18 14:55+0100\n"
 "Last-Translator: Hendrik Richter <hendi@gnome-de.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Datei »%s« konnte nicht geöffnet werden: %s"
@@ -34,7 +34,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Bilddatei »%s« enthält keine Daten"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1287,20 +1287,20 @@ msgstr "Farbrad"
 msgid "Color Selection"
 msgstr "Schriftwahl"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "A_lles markieren"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Eingabe_methoden"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Unicode-Steuerzeichen einfügen"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Ungültiger Dateiname: %s"
@@ -1310,12 +1310,12 @@ msgstr "Ungültiger Dateiname: %s"
 msgid "Select A File"
 msgstr "Datei auswählen"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Persönlicher Ordner"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Desktop"
@@ -1328,198 +1328,214 @@ msgstr "(keine)"
 msgid "Other..."
 msgstr "Andere..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr ""
 "Es konnten keine Informationen zu %s abgerufen werden:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 #, fuzzy
 msgid "Could not add a bookmark"
 msgstr ""
 "Es konnte kein Lesezeichen für %s hinzugefügt werden:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 #, fuzzy
 msgid "Could not remove bookmark"
 msgstr ""
 "Das Lesezeichen für %s konnte nicht entfernt werden:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Ungültiger Dateiname: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 "Es konnten keine Informationen zu %s abgerufen werden:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Ordner »%s« zu den Lesezeichen hinzufügen"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Aktuellen Ordner zu den Lesezeichen hinzufügen"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Ausgewählte Ordner zu den Lesezeichen hinzufügen"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Lesezeichen »%s« entfernen"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, fuzzy, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Es konnte kein Lesezeichen für %s hinzugefügt werden, da dies ein ungültiger "
 "Pfadname ist."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Entfernen"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Umbenennen"
 
 # CHECK - Shortcuts == Lesezeichen?
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Lesezeichen"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Ordner"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Hinzufügen"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 #, fuzzy
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Den ausgewählten Ordner zu den Lesezeichen hinzufügen"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Ausgewähltes Lesezeichen entfernen"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "%s konnte nicht gewählt werden:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "Es konnte kein Lesezeichen für %s hinzugefügt werden, da dies ein ungültiger "
 "Pfadname ist."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "Zu Lesezeichen _hinzufügen"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "Ort öffnen"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "_Verborgene Dateien anzeigen"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Dateien"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Name"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Größe"
 
 # CHECK
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Letzte Änderung"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Wählen Sie die anzuzeigenden Dateitypen"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "_Ordner anlegen"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Name:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "Ordner-_Browser"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "In _Ordner speichern:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "In _Ordner anlegen"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr ""
 "Es konnte nicht in den angegebenen Ordner gewechselt werden, da dieser nicht "
 "lokal ist."
 
 # CHECK - shortcuts == Lesezeichen?
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Das Lesezeichen %s existiert nicht"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Umbenennen"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
@@ -1527,79 +1543,79 @@ msgstr ""
 "%s"
 
 # CHECK
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Ordnername eingeben"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d Byte"
 msgstr[1] "%d Bytes"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Heute"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Gestern"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "In _Ordner anlegen"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 #, fuzzy
 msgid "The folder you specified is an invalid path."
 msgstr ""
 "Es konnte nicht in den angegebenen Ordner gewechselt werden, da dessen Pfad "
 "ungültig ist."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, fuzzy, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 "Der Dateiname konnte nicht aus »%s« und »%s« konstruiert werden:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "%s konnte nicht gewählt werden:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Ort öffnen"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "An Ort speichern"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Ort:"
 
@@ -1804,7 +1820,8 @@ msgid "This file system does not support mounting"
 msgstr "Dieses Dateisystem unterstützt das Einbinden nicht"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Dateisystem"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1907,7 +1924,7 @@ msgstr "_Gamma-Wert"
 msgid "Error loading icon: %s"
 msgstr "Fehler beim Laden des Symbols: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1920,7 +1937,7 @@ msgstr ""
 "Sie können sich eine Kopie herunterladen unter:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Symbol »%s« nicht im Thema vorhanden"
@@ -2009,7 +2026,7 @@ msgstr "(unbekannt)"
 msgid "clear"
 msgstr "leeren"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Alles markieren"
 
@@ -2452,43 +2469,43 @@ msgstr "_Heranzoomen"
 msgid "Zoom _Out"
 msgstr "_Wegzoomen"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM Von-_links-nach-rechts-Marke"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM Von-_rechts-nach-links-Marke"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Von-links-nach-rechts-_Einbettung"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Von-rechts-nach-Links-E_inbettung"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Von-links-nach-rechts-_Überschreiben"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Von-rechts-nach-links-Ü_berschreiben"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF Richtungsformatierungs-_Pop"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS-Leerraum mit Breite _null"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ-_Verbinder mit Breite null"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ-_Trenner mit Breite null"
 
@@ -2571,7 +2588,7 @@ msgstr "Vietnamesisch (VIQR)"
 msgid "X Input Method"
 msgstr "X-Eingabemethode"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Es konnten keine Informationen zur Datei »%s« abgerufen werden: %s"
diff --git a/po/el.po b/po/el.po
index e056af4028..b0d9de3cd8 100644
--- a/po/el.po
+++ b/po/el.po
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-04-25 11:58+0300\n"
 "Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -39,7 +39,7 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Αποτυχία ανοίγματος αρχείου '%s': %s "
@@ -50,7 +50,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Το αρχείο εικόνας '%s' δεν περιέχει δεδομένα"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1308,20 +1308,20 @@ msgstr "Χρώμα τροχού"
 msgid "Color Selection"
 msgstr "Επιλογή χρώματος"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Επιλογή ό_λων"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Μέθοδοι _Εισαγωγής"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "Ε_ισαγωγή χαρακτήρα Unicode control"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Μη έγκυρο όνομα αρχείου: %s"
@@ -1331,12 +1331,12 @@ msgstr "Μη έγκυρο όνομα αρχείου: %s"
 msgid "Select A File"
 msgstr "Διαγραφή Αρχείου"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Αρχή"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Επιφάνεια εργασίας"
@@ -1350,264 +1350,280 @@ msgstr "κανένα"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr "Αδυναμία λήψης πληροφοριών για '%s': %s"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 #, fuzzy
 msgid "Could not add a bookmark"
 msgstr ""
 "Αποτυχία πρoσθήκης σελιδοδείκτη για %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 #, fuzzy
 msgid "Could not remove bookmark"
 msgstr ""
 "Αδυναμία απομάκρυνσης σελιδοδείκτη για  %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Μη έγκυρο όνομα αρχείου: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Αδυναμία λήψης πληροφοριών για '%s': %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, fuzzy, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Αποτυχία πρόθεσης σελιδοδείκτη για %s επειδή έχει μή έγκυρο όνομα διαδρομής."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Απομάκρυνση"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Μετονομασία"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Φάκελος"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Προσθήκη"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Απομάκρυνση"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "Αδυναμία επιλογής %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "Αποτυχία πρόθεσης σελιδοδείκτη για %s επειδή έχει μή έγκυρο όνομα διαδρομής."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "Άνοιγμα τοποθεσίας"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Προβολή _κρυφών αρχείων"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Αρχεία"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Όνομα"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Τροποποιήθηκε"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Δημιουργία _φακέλου"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "Ό_νομα:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Περιήγηση για άλλους φακέλους"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Αποθήκευση σε _φάκελο:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Δημιουργία σε _φάκελο:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 #, fuzzy
 msgid "Cannot change to folder because it is not local"
 msgstr "Αποτυχία αλλαγής στο φάκελο γιατί δεν είναι τοπικός"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Η συντόμευση  %s  δεν υπάρχει."
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Μετονομασία"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "Αδυναμία επιλογής %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Πληκτρολογήστε το όνομα του νέου φακέλου"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d byte"
 msgstr[1] "%d bytes"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Σήμερα"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Χθές"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Δημιουργία σε _φάκελο:"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 #, fuzzy
 msgid "The folder you specified is an invalid path."
 msgstr ""
 "Αποτυχία αλλαγής στο φάκελο που καθορίσατε επειδή έχει μή έγκυρο όνομα "
 "διαδρομής."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, fuzzy, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 "Αδυναμία build όνομα αρχείου από '%s' και '%s':\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "Αδυναμία επιλογής %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Άνοιγμα τοποθεσίας"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Αποθήκευση σε τοποθεσία"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "Τοπο_θεσία:"
 
@@ -1813,7 +1829,8 @@ msgid "This file system does not support mounting"
 msgstr "Το σύστημα αρχείων δεν υποστηρίζει προσάρτηση"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Σύστημα Aρχείων"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1916,7 +1933,7 @@ msgstr "Τιμή _Gamma"
 msgid "Error loading icon: %s"
 msgstr "Σφάλμα φόρτωσης εικονιδίου: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1929,7 +1946,7 @@ msgstr ""
 "Μπορείτε να πάρετε ένα αντίγραφο από:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Το εικονίδιο '%s' δε βρίσκεται στο θέμα"
@@ -2017,7 +2034,7 @@ msgstr "(άγνωστο)"
 msgid "clear"
 msgstr "εκκαθάριση"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Επιλογή Όλων"
 
@@ -2453,43 +2470,43 @@ msgstr "Μεγέ_θυνση"
 msgid "Zoom _Out"
 msgstr "Σμ_ίκρυνση"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM _Left-to-right mark"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM _Right-to-left mark"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Left-to-right _embedding"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Right-to-left e_mbedding"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Left-to-right _override"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Right-to-left o_verride"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Pop directional formatting"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _Zero width space"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Zero width _joiner"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Zero width _non-joiner"
 
@@ -2572,7 +2589,7 @@ msgstr "Vietnamese (VIQR)"
 msgid "X Input Method"
 msgstr "Μέθοδος Eισαγωγής Χ"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Αδυναμία λήψης πληροφοριών για το αρχείο '%s': %s"
diff --git a/po/en_CA.po b/po/en_CA.po
index a3e6ee9f7f..b74e496ca6 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-07-07 03:57-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Failed to open file '%s': %s"
@@ -29,7 +29,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Image file '%s' contains no data"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1255,20 +1255,20 @@ msgstr "Colour Wheel"
 msgid "Color Selection"
 msgstr "Colour Selection"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Select _All"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Input _Methods"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Insert Unicode Control Character"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Invalid filename: %s"
@@ -1277,12 +1277,12 @@ msgstr "Invalid filename: %s"
 msgid "Select A File"
 msgstr "Select A File"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Home"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Desktop"
@@ -1295,23 +1295,23 @@ msgstr "(None)"
 msgid "Other..."
 msgstr "Other..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Could not retrieve information about the file"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Could not add a bookmark"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Could not remove bookmark"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "The folder could not be created"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1319,215 +1319,231 @@ msgstr ""
 "The folder could not be created because a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Invalid file name"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "The folder contents could not be displayed"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Could not get information about '%s': %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Add the folder '%s' to the bookmarks"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Add the current folder to the bookmarks"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Add the selected folders to the bookmarks"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Remove the bookmark '%s'"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "Could not add a bookmark for '%s' because it is an invalid path name."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Remove"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Rename..."
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Folder"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Add"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Add the selected folder to the Bookmarks"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Remove"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Remove the selected bookmark"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 msgid "Could not select file"
 msgstr "Could not select file"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "Could not select file '%s' because it is an invalid path name."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "_Add to Bookmarks"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Open _Location"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Show _Hidden Files"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Files"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Name"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Size"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Modified"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Select which types of files are shown"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Create Fo_lder"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Name:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Browse for other folders"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Save in _folder:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Create in _folder:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Cannot change to folder because it is not local"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Shortcut %s does not exist"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Rename"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Could not mount %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Type name of new folder"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d byte"
 msgstr[1] "%d bytes"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Unknown"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Today"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Yesterday"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Cannot change folder"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "The folder you specified is an invalid path."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Could not build file name from '%s' and '%s'"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Could not select item"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Open Location"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Save in Location"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Location:"
 
@@ -1728,7 +1744,8 @@ msgid "This file system does not support mounting"
 msgstr "This file system does not support mounting"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Filesystem"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1831,7 +1848,7 @@ msgstr "_Gamma value"
 msgid "Error loading icon: %s"
 msgstr "Error loading icon: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1844,7 +1861,7 @@ msgstr ""
 "You can get a copy from:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Icon '%s' not present in theme"
@@ -1932,7 +1949,7 @@ msgstr "(unknown)"
 msgid "clear"
 msgstr "clear"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Select All"
 
@@ -2358,43 +2375,43 @@ msgstr "Zoom _In"
 msgid "Zoom _Out"
 msgstr "Zoom _Out"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM _Left-to-right mark"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM _Right-to-left mark"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Left-to-right _embedding"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Right-to-left e_mbedding"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Left-to-right _override"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Right-to-left o_verride"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Pop directional formatting"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _Zero width space"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Zero width _joiner"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Zero width _non-joiner"
 
@@ -2476,7 +2493,7 @@ msgstr "Vietnamese (VIQR)"
 msgid "X Input Method"
 msgstr "X Input Method"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Could not get information for file '%s': %s"
diff --git a/po/en_GB.po b/po/en_GB.po
index aeb97fa046..9f728a3323 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-04-07 21:31-0400\n"
 "Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team:  <en@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Failed to open file '%s': %s"
@@ -29,7 +29,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Image file '%s' contains no data"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1254,20 +1254,20 @@ msgstr "Colour Wheel"
 msgid "Color Selection"
 msgstr "Colour Selection"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Select _All"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Input _Methods"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Insert Unicode Control Character"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Invalid filename: %s"
@@ -1276,12 +1276,12 @@ msgstr "Invalid filename: %s"
 msgid "Select A File"
 msgstr "Select A File"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Home"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Desktop"
@@ -1294,238 +1294,254 @@ msgstr "(None)"
 msgid "Other..."
 msgstr "Other..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Could not retrieve information about the file"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Could not add a bookmark"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Could not remove bookmark"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "The folder could not be created"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Invalid file name"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "The folder contents could not be displayed"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Could not get information about '%s': %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Add the folder '%s' to the bookmarks"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Add the current folder to the bookmarks"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Add the selected folders to the bookmarks"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Remove the bookmark '%s'"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "Could not add a bookmark for '%s' because it is an invalid path name."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Remove"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Rename..."
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Folder"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Add"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Add the selected folder to the Bookmarks"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Remove"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Remove the selected bookmark"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Could not select item"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "Could not add a bookmark for '%s' because it is an invalid path name."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "_Add to Bookmarks"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Open _Location"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Show _Hidden Files"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Files"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Name:"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Size"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Modified"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Select which types of files are shown"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Create Fo_lder"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Name:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Browse for other folders"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Save in _folder:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Create in _folder:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Cannot change to folder because it is not local"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Shortcut %s does not exist"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Rename"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Could not mount %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Type name of new folder"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d byte"
 msgstr[1] "%d bytes"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Unknown"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Today"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Yesterday"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Cannot change folder"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "The folder you specified is an invalid path."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Could not build file name from '%s' and '%s'"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Could not select item"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Open Location"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Save in Location"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Location:"
 
@@ -1726,7 +1742,8 @@ msgid "This file system does not support mounting"
 msgstr "This file system does not support mounting"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Filesystem"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1829,7 +1846,7 @@ msgstr "_Gamma value"
 msgid "Error loading icon: %s"
 msgstr "Error loading icon: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1842,7 +1859,7 @@ msgstr ""
 "You can get a copy from:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Icon '%s' not present in theme"
@@ -1930,7 +1947,7 @@ msgstr "(unknown)"
 msgid "clear"
 msgstr "clear"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Select All"
 
@@ -2357,43 +2374,43 @@ msgstr "Zoom _In"
 msgid "Zoom _Out"
 msgstr "Zoom _Out"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM _Left-to-right mark"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM _Right-to-left mark"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Left-to-right _embedding"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Right-to-left e_mbedding"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Left-to-right _override"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Right-to-left o_verride"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Pop directional formatting"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _Zero width space"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Zero width _joiner"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Zero width _non-joiner"
 
@@ -2475,7 +2492,7 @@ msgstr "Vietnamese (VIQR)"
 msgid "X Input Method"
 msgstr "X Input Method"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Could not get information for file '%s': %s"
diff --git a/po/es.po b/po/es.po
index bdf4f38625..34d3c73600 100644
--- a/po/es.po
+++ b/po/es.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GTK+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-15 21:11+0200\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-07-15 21:13+0200\n"
 "Last-Translator: Francisco Javier F. Serrador <serrador@cvs.gnome.org>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
@@ -25,19 +25,19 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:153 ../gdk-pixbuf/gdk-pixbuf-io.c:838
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1089 ../tests/testfilechooser.c:218
+#: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "No se ha podido abrir el archivo «%s»: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:166 ../gdk-pixbuf/gdk-pixbuf-io.c:850
+#: gdk-pixbuf/gdk-pixbuf-animation.c:166 gdk-pixbuf/gdk-pixbuf-io.c:850
 #, c-format
 msgid "Image file '%s' contains no data"
 msgstr "El archivo de imagen «%s» no contiene datos"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:208 ../gdk-pixbuf/gdk-pixbuf-io.c:887
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1130 ../tests/testfilechooser.c:263
+#: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -45,7 +45,7 @@ msgstr ""
 "No se ha podido cargar la imagen «%s»: el motivo es desconocido, "
 "probablemente el archivo gráfico esté corrupto"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:241
+#: gdk-pixbuf/gdk-pixbuf-animation.c:241
 #, c-format
 msgid ""
 "Failed to load animation '%s': reason not known, probably a corrupt "
@@ -54,12 +54,12 @@ msgstr ""
 "No se ha podido cargar la animación «%s»: el motivo es desconocido, "
 "probablemente el archivo de la animación esté corrupto"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:444
+#: gdk-pixbuf/gdk-pixbuf-io.c:444
 #, c-format
 msgid "Unable to load image-loading module: %s: %s"
 msgstr "No es posible cargar el módulo de carga de imágenes: %s:·%s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:459
+#: gdk-pixbuf/gdk-pixbuf-io.c:459
 #, c-format
 msgid ""
 "Image-loading module %s does not export the proper interface; perhaps it's "
@@ -68,55 +68,55 @@ msgstr ""
 "El módulo de carga de imágenes %s no exporta el interfaz adecuado; ¿puede "
 "que sea de una versión de GTK diferente?"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:628 ../gdk-pixbuf/gdk-pixbuf-io.c:680
+#: gdk-pixbuf/gdk-pixbuf-io.c:628 gdk-pixbuf/gdk-pixbuf-io.c:680
 #, c-format
 msgid "Image type '%s' is not supported"
 msgstr "El tipo de imagen «%s» no está soportado"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:720
+#: gdk-pixbuf/gdk-pixbuf-io.c:720
 #, c-format
 msgid "Couldn't recognize the image file format for file '%s'"
 msgstr "No se ha podido reconocer el formato de imagen del archivo «%s»"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:728
+#: gdk-pixbuf/gdk-pixbuf-io.c:728
 msgid "Unrecognized image file format"
 msgstr "No se ha reconocido el formato de imagen del archivo"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:896
+#: gdk-pixbuf/gdk-pixbuf-io.c:896
 #, c-format
 msgid "Failed to load image '%s': %s"
 msgstr "No se ha podido cargar la imagen «%s»: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1357
+#: gdk-pixbuf/gdk-pixbuf-io.c:1357
 #, c-format
 msgid "Error writing to image file: %s"
 msgstr "Error al escribir en el archivo imagen: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1403 ../gdk-pixbuf/gdk-pixbuf-io.c:1532
+#: gdk-pixbuf/gdk-pixbuf-io.c:1403 gdk-pixbuf/gdk-pixbuf-io.c:1532
 #, c-format
 msgid "This build of gdk-pixbuf does not support saving the image format: %s"
 msgstr ""
 "Esta compilación de gdk-pixbuf no soporta el almacenamiento de imágenes con "
 "el formato: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1437
+#: gdk-pixbuf/gdk-pixbuf-io.c:1437
 msgid "Insufficient memory to save image to callback"
 msgstr "No hay memoria suficiente para guardar la imagen a la que retrollamar"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1449
+#: gdk-pixbuf/gdk-pixbuf-io.c:1449
 msgid "Failed to open temporary file"
 msgstr "Falló al abrir el archivo temporal"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1474
+#: gdk-pixbuf/gdk-pixbuf-io.c:1474
 msgid "Failed to read from temporary file"
 msgstr "Falló al leer del archivo temporal"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1708
+#: gdk-pixbuf/gdk-pixbuf-io.c:1708
 #, c-format
 msgid "Failed to open '%s' for writing: %s"
 msgstr "Falló al abrir «%s» para escritura: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1732
+#: gdk-pixbuf/gdk-pixbuf-io.c:1732
 #, c-format
 msgid ""
 "Failed to close '%s' while writing image, all data may not have been saved: %"
@@ -125,16 +125,16 @@ msgstr ""
 "No se ha podido cerrar «%s» mientras se escribía la imagen, puede que no se "
 "hayan guardado todos los datos: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1952 ../gdk-pixbuf/gdk-pixbuf-io.c:2002
+#: gdk-pixbuf/gdk-pixbuf-io.c:1952 gdk-pixbuf/gdk-pixbuf-io.c:2002
 msgid "Insufficient memory to save image into a buffer"
 msgstr "No hay memoria suficiente para guardar la imagen en un búfer"
 
-#: ../gdk-pixbuf/gdk-pixbuf-loader.c:383
+#: gdk-pixbuf/gdk-pixbuf-loader.c:383
 #, c-format
 msgid "Incremental loading of image type '%s' is not supported"
 msgstr "No está implementada la carga incremental de los tipos de imagen «%s»"
 
-#: ../gdk-pixbuf/gdk-pixbuf-loader.c:411 ../gdk-pixbuf/gdk-pixbuf-loader.c:513
+#: gdk-pixbuf/gdk-pixbuf-loader.c:411 gdk-pixbuf/gdk-pixbuf-loader.c:513
 #, c-format
 msgid ""
 "Internal error: Image loader module '%s' failed to begin loading an image, "
@@ -143,138 +143,134 @@ msgstr ""
 "Error interno: El módulo de carga de imágenes «%s» ha fallado al comenzar la "
 "carga de una imagen, pero no ha dado ningún motivo del fallo"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:147
+#: gdk-pixbuf/gdk-pixdata.c:147
 msgid "Image header corrupt"
 msgstr "La cabecera de la imagen está corrupta"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:152
+#: gdk-pixbuf/gdk-pixdata.c:152
 msgid "Image format unknown"
 msgstr "El formato de la imagen es desconocido"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:157 ../gdk-pixbuf/gdk-pixdata.c:487
+#: gdk-pixbuf/gdk-pixdata.c:157 gdk-pixbuf/gdk-pixdata.c:487
 msgid "Image pixel data corrupt"
 msgstr "Los datos del píxel de la imagen están corrompidos"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:431
+#: gdk-pixbuf/gdk-pixdata.c:431
 #, c-format
 msgid "failed to allocate image buffer of %u byte"
 msgid_plural "failed to allocate image buffer of %u bytes"
 msgstr[0] "no se ha podido asignar un búfer para la imagen de %u byte"
 msgstr[1] "no se ha podido asignar un búfer para la imagen de %u bytes"
 
-#: ../gdk-pixbuf/io-ani.c:244
+#: gdk-pixbuf/io-ani.c:244
 msgid "Unexpected icon chunk in animation"
 msgstr "Porción de icono inesperada en la animación"
 
-#: ../gdk-pixbuf/io-ani.c:337
+#: gdk-pixbuf/io-ani.c:337
 msgid "Unsupported animation type"
 msgstr "Tipo de animación no soportado"
 
-#: ../gdk-pixbuf/io-ani.c:348 ../gdk-pixbuf/io-ani.c:538
+#: gdk-pixbuf/io-ani.c:348 gdk-pixbuf/io-ani.c:538
 msgid "Invalid header in animation"
 msgstr "Cabecera inválida en la animación"
 
-#: ../gdk-pixbuf/io-ani.c:358 ../gdk-pixbuf/io-ani.c:382
-#: ../gdk-pixbuf/io-ani.c:441 ../gdk-pixbuf/io-ani.c:460
-#: ../gdk-pixbuf/io-ani.c:511 ../gdk-pixbuf/io-ani.c:583
+#: gdk-pixbuf/io-ani.c:358 gdk-pixbuf/io-ani.c:382 gdk-pixbuf/io-ani.c:441
+#: gdk-pixbuf/io-ani.c:460 gdk-pixbuf/io-ani.c:511 gdk-pixbuf/io-ani.c:583
 msgid "Not enough memory to load animation"
 msgstr "No hay memoria suficiente para cargar la animación"
 
-#: ../gdk-pixbuf/io-ani.c:400 ../gdk-pixbuf/io-ani.c:417
-#: ../gdk-pixbuf/io-ani.c:428
+#: gdk-pixbuf/io-ani.c:400 gdk-pixbuf/io-ani.c:417 gdk-pixbuf/io-ani.c:428
 msgid "Malformed chunk in animation"
 msgstr "Porción malformada en la animación"
 
-#: ../gdk-pixbuf/io-ani.c:676
+#: gdk-pixbuf/io-ani.c:676
 msgid "The ANI image format"
 msgstr "El formato de imagen ANI"
 
-#: ../gdk-pixbuf/io-bmp.c:228 ../gdk-pixbuf/io-bmp.c:306
-#: ../gdk-pixbuf/io-bmp.c:338 ../gdk-pixbuf/io-bmp.c:361
-#: ../gdk-pixbuf/io-bmp.c:442
+#: gdk-pixbuf/io-bmp.c:228 gdk-pixbuf/io-bmp.c:306 gdk-pixbuf/io-bmp.c:338
+#: gdk-pixbuf/io-bmp.c:361 gdk-pixbuf/io-bmp.c:442
 msgid "BMP image has bogus header data"
 msgstr "La imagen BMP tiene datos de cabecera erróneos"
 
-#: ../gdk-pixbuf/io-bmp.c:239 ../gdk-pixbuf/io-bmp.c:401
+#: gdk-pixbuf/io-bmp.c:239 gdk-pixbuf/io-bmp.c:401
 msgid "Not enough memory to load bitmap image"
 msgstr "No existe memoria suficiente para cargar el mapa de bits"
 
-#: ../gdk-pixbuf/io-bmp.c:287
+#: gdk-pixbuf/io-bmp.c:287
 msgid "BMP image has unsupported header size"
 msgstr "La imagen BMP tiene un tamaño de cabecera no soportado"
 
-#: ../gdk-pixbuf/io-bmp.c:325
+#: gdk-pixbuf/io-bmp.c:325
 msgid "Topdown BMP images cannot be compressed"
 msgstr "Las imágenes BMP «Topdown» no se pueden comprimir"
 
-#: ../gdk-pixbuf/io-bmp.c:1203
+#: gdk-pixbuf/io-bmp.c:1203
 msgid "Couldn't allocate memory for saving BMP file"
 msgstr "No se pudo asignar memoria para guardar el archivo BMP"
 
-#: ../gdk-pixbuf/io-bmp.c:1244
+#: gdk-pixbuf/io-bmp.c:1244
 msgid "Couldn't write to BMP file"
 msgstr "No se ha podido escribir en el archivo BMP"
 
-#: ../gdk-pixbuf/io-bmp.c:1293
+#: gdk-pixbuf/io-bmp.c:1293
 msgid "The BMP image format"
 msgstr "El formato de imagen BMP"
 
-#: ../gdk-pixbuf/io-gif.c:220
+#: gdk-pixbuf/io-gif.c:220
 #, c-format
 msgid "Failure reading GIF: %s"
 msgstr "Fallo durante la lectura del GIF: %s"
 
-#: ../gdk-pixbuf/io-gif.c:492 ../gdk-pixbuf/io-gif.c:1463
-#: ../gdk-pixbuf/io-gif.c:1624
+#: gdk-pixbuf/io-gif.c:492 gdk-pixbuf/io-gif.c:1463 gdk-pixbuf/io-gif.c:1624
 msgid "GIF file was missing some data (perhaps it was truncated somehow?)"
 msgstr ""
 "Al archivo GIF le faltan algunos de datos (¿quizás se ha truncado en algún "
 "momento?)"
 
-#: ../gdk-pixbuf/io-gif.c:501
+#: gdk-pixbuf/io-gif.c:501
 #, c-format
 msgid "Internal error in the GIF loader (%s)"
 msgstr "Error interno en el cargador de GIF (%s)"
 
-#: ../gdk-pixbuf/io-gif.c:575
+#: gdk-pixbuf/io-gif.c:575
 msgid "Stack overflow"
 msgstr "Desbordamiento de pila"
 
-#: ../gdk-pixbuf/io-gif.c:635
+#: gdk-pixbuf/io-gif.c:635
 msgid "GIF image loader cannot understand this image."
 msgstr "El cargador de imágenes GIF no puede entender esta imagen."
 
-#: ../gdk-pixbuf/io-gif.c:664
+#: gdk-pixbuf/io-gif.c:664
 msgid "Bad code encountered"
 msgstr "Se ha encontrado un código incorrecto"
 
-#: ../gdk-pixbuf/io-gif.c:674
+#: gdk-pixbuf/io-gif.c:674
 msgid "Circular table entry in GIF file"
 msgstr "Entrada de tabla circular en el archivo GIF"
 
-#: ../gdk-pixbuf/io-gif.c:862 ../gdk-pixbuf/io-gif.c:1451
-#: ../gdk-pixbuf/io-gif.c:1497 ../gdk-pixbuf/io-gif.c:1612
+#: gdk-pixbuf/io-gif.c:862 gdk-pixbuf/io-gif.c:1451 gdk-pixbuf/io-gif.c:1497
+#: gdk-pixbuf/io-gif.c:1612
 msgid "Not enough memory to load GIF file"
 msgstr "No hay memoria suficiente para cargar el archivo GIF"
 
-#: ../gdk-pixbuf/io-gif.c:947
+#: gdk-pixbuf/io-gif.c:947
 msgid "Not enough memory to composite a frame in GIF file"
 msgstr "No hay memoria suficiente para componer un fotograma en el archivo GIF"
 
-#: ../gdk-pixbuf/io-gif.c:1116
+#: gdk-pixbuf/io-gif.c:1116
 msgid "GIF image is corrupt (incorrect LZW compression)"
 msgstr "La imagen GIF está corrupta (la compresión LZW es incorrecta)"
 
-#: ../gdk-pixbuf/io-gif.c:1166
+#: gdk-pixbuf/io-gif.c:1166
 msgid "File does not appear to be a GIF file"
 msgstr "El archivo no parece ser un archivo GIF"
 
-#: ../gdk-pixbuf/io-gif.c:1178
+#: gdk-pixbuf/io-gif.c:1178
 #, c-format
 msgid "Version %s of the GIF file format is not supported"
 msgstr "La versión %s del formato de archivo GIF no está soportada"
 
-#: ../gdk-pixbuf/io-gif.c:1287
+#: gdk-pixbuf/io-gif.c:1287
 msgid ""
 "GIF image has no global colormap, and a frame inside it has no local "
 "colormap."
@@ -282,67 +278,66 @@ msgstr ""
 "La imagen GIF no tiene un mapa de colores global, y un marco interno no "
 "tiene un mapa de color local."
 
-#: ../gdk-pixbuf/io-gif.c:1519
+#: gdk-pixbuf/io-gif.c:1519
 msgid "GIF image was truncated or incomplete."
 msgstr "La imagen GIF fue truncada o incompleta."
 
-#: ../gdk-pixbuf/io-gif.c:1671
+#: gdk-pixbuf/io-gif.c:1671
 msgid "The GIF image format"
 msgstr "El formato de imagen GIF"
 
-#: ../gdk-pixbuf/io-ico.c:219 ../gdk-pixbuf/io-ico.c:271
-#: ../gdk-pixbuf/io-ico.c:340 ../gdk-pixbuf/io-ico.c:403
-#: ../gdk-pixbuf/io-ico.c:433
+#: gdk-pixbuf/io-ico.c:219 gdk-pixbuf/io-ico.c:271 gdk-pixbuf/io-ico.c:340
+#: gdk-pixbuf/io-ico.c:403 gdk-pixbuf/io-ico.c:433
 msgid "Not enough memory to load icon"
 msgstr "No hay memoria suficiente para cargar el icono"
 
-#: ../gdk-pixbuf/io-ico.c:256 ../gdk-pixbuf/io-ico.c:330
+#: gdk-pixbuf/io-ico.c:256 gdk-pixbuf/io-ico.c:330
 msgid "Invalid header in icon"
 msgstr "La cabecera del icono no es válida"
 
-#: ../gdk-pixbuf/io-ico.c:293
+#: gdk-pixbuf/io-ico.c:293
 msgid "Icon has zero width"
 msgstr "El ancho del icono es cero"
 
-#: ../gdk-pixbuf/io-ico.c:303
+#: gdk-pixbuf/io-ico.c:303
 msgid "Icon has zero height"
 msgstr "El alto del icono es cero"
 
-#: ../gdk-pixbuf/io-ico.c:355
+#: gdk-pixbuf/io-ico.c:355
 msgid "Compressed icons are not supported"
 msgstr "Los iconos comprimidos no están implementados"
 
-#: ../gdk-pixbuf/io-ico.c:388
+#: gdk-pixbuf/io-ico.c:388
 msgid "Unsupported icon type"
 msgstr "Tipo de icono no implementado"
 
-#: ../gdk-pixbuf/io-ico.c:482
+#: gdk-pixbuf/io-ico.c:482
 msgid "Not enough memory to load ICO file"
 msgstr "No hay memoria suficiente para cargar el archivo ICO"
 
-#: ../gdk-pixbuf/io-ico.c:947
+#: gdk-pixbuf/io-ico.c:947
 msgid "Image too large to be saved as ICO"
 msgstr "Imagen demasiado grande para ser guardada como ICO"
 
-#: ../gdk-pixbuf/io-ico.c:958
+#: gdk-pixbuf/io-ico.c:958
 msgid "Cursor hotspot outside image"
 msgstr "Punto caliente del cursor fuera de la imagen"
 
-#: ../gdk-pixbuf/io-ico.c:981
+#: gdk-pixbuf/io-ico.c:981
 #, c-format
 msgid "Unsupported depth for ICO file: %d"
 msgstr "Profundidad no soportada para el archivo ICO: %d"
 
-#: ../gdk-pixbuf/io-ico.c:1210
+#: gdk-pixbuf/io-ico.c:1210
 msgid "The ICO image format"
 msgstr "El formato de imagen ICO"
 
-#: ../gdk-pixbuf/io-jpeg.c:114
+#: gdk-pixbuf/io-jpeg.c:114
 #, c-format
 msgid "Error interpreting JPEG image file (%s)"
 msgstr "Error interpretando el archivo gráfico JPEG (%s)"
 
-#: ../gdk-pixbuf/io-jpeg.c:349
+#: gdk-pixbuf/io-jpeg.c:349
 msgid ""
 "Insufficient memory to load image, try exiting some applications to free "
 "memory"
@@ -350,17 +345,17 @@ msgstr ""
 "No hay memoria suficiente para cargar la imagen, intente cerrar algunas "
 "aplicaciones para liberar memoria"
 
-#: ../gdk-pixbuf/io-jpeg.c:383 ../gdk-pixbuf/io-jpeg.c:749
+#: gdk-pixbuf/io-jpeg.c:383 gdk-pixbuf/io-jpeg.c:749
 #, c-format
 msgid "Unsupported JPEG color space (%s)"
 msgstr "Espacio de color JPEG no soportado (%s)"
 
-#: ../gdk-pixbuf/io-jpeg.c:481 ../gdk-pixbuf/io-jpeg.c:678
-#: ../gdk-pixbuf/io-jpeg.c:943 ../gdk-pixbuf/io-jpeg.c:952
+#: gdk-pixbuf/io-jpeg.c:481 gdk-pixbuf/io-jpeg.c:678 gdk-pixbuf/io-jpeg.c:943
+#: gdk-pixbuf/io-jpeg.c:952
 msgid "Couldn't allocate memory for loading JPEG file"
 msgstr "No se puede asignar memoria para cargar el archivo JPG"
 
-#: ../gdk-pixbuf/io-jpeg.c:894
+#: gdk-pixbuf/io-jpeg.c:894
 #, c-format
 msgid ""
 "JPEG quality must be a value between 0 and 100; value '%s' could not be "
@@ -369,7 +364,7 @@ msgstr ""
 "La calidad de un JPEG debe ser un valor entre 0 y 100; el valor «%s» no "
 "puede ser interpretado."
 
-#: ../gdk-pixbuf/io-jpeg.c:909
+#: gdk-pixbuf/io-jpeg.c:909
 #, c-format
 msgid ""
 "JPEG quality must be a value between 0 and 100; value '%d' is not allowed."
@@ -377,87 +372,87 @@ msgstr ""
 "La calidad JPEG debe ser un valor entre 0 y 100; el valor «%d» no está "
 "permitido."
 
-#: ../gdk-pixbuf/io-jpeg.c:1071
+#: gdk-pixbuf/io-jpeg.c:1071
 msgid "The JPEG image format"
 msgstr "El formato de imagen JPEG"
 
-#: ../gdk-pixbuf/io-pcx.c:191
+#: gdk-pixbuf/io-pcx.c:191
 msgid "Couldn't allocate memory for header"
 msgstr "No se puede asignar memoria para la cabecera"
 
-#: ../gdk-pixbuf/io-pcx.c:206 ../gdk-pixbuf/io-pcx.c:566
+#: gdk-pixbuf/io-pcx.c:206 gdk-pixbuf/io-pcx.c:566
 msgid "Couldn't allocate memory for context buffer"
 msgstr "No se puede asignar memoria para el búfer del contexto"
 
-#: ../gdk-pixbuf/io-pcx.c:607
+#: gdk-pixbuf/io-pcx.c:607
 msgid "Image has invalid width and/or height"
 msgstr "La imagen tiene una anchura y/o altura inválida"
 
-#: ../gdk-pixbuf/io-pcx.c:619 ../gdk-pixbuf/io-pcx.c:680
+#: gdk-pixbuf/io-pcx.c:619 gdk-pixbuf/io-pcx.c:680
 msgid "Image has unsupported bpp"
 msgstr "La imagen tiene un bpp no soportado"
 
-#: ../gdk-pixbuf/io-pcx.c:624 ../gdk-pixbuf/io-pcx.c:632
+#: gdk-pixbuf/io-pcx.c:624 gdk-pixbuf/io-pcx.c:632
 #, c-format
 msgid "Image has unsupported number of %d-bit planes"
 msgstr "La imagen tiene un número no soportado de planos %d-bit"
 
-#: ../gdk-pixbuf/io-pcx.c:648
+#: gdk-pixbuf/io-pcx.c:648
 msgid "Couldn't create new pixbuf"
 msgstr "No se puede crear un búfer de píxeles nuevo"
 
-#: ../gdk-pixbuf/io-pcx.c:656
+#: gdk-pixbuf/io-pcx.c:656
 msgid "Couldn't allocate memory for line data"
 msgstr "No se puede asignar memoria para los datos de línea"
 
-#: ../gdk-pixbuf/io-pcx.c:663
+#: gdk-pixbuf/io-pcx.c:663
 msgid "Couldn't allocate memory for paletted data"
 msgstr "No se puede asignar memoria para los datos de paleta"
 
-#: ../gdk-pixbuf/io-pcx.c:710
+#: gdk-pixbuf/io-pcx.c:710
 msgid "Didn't get all lines of PCX image"
 msgstr "No se obtuvieron todas las líneas de la imagen PCX"
 
-#: ../gdk-pixbuf/io-pcx.c:717
+#: gdk-pixbuf/io-pcx.c:717
 msgid "No palette found at end of PCX data"
 msgstr "No se encontró una paleta al final de los datos PCX"
 
-#: ../gdk-pixbuf/io-pcx.c:758
+#: gdk-pixbuf/io-pcx.c:758
 msgid "The PCX image format"
 msgstr "El formato de imagen PCX"
 
-#: ../gdk-pixbuf/io-png.c:55
+#: gdk-pixbuf/io-png.c:55
 msgid "Bits per channel of PNG image is invalid."
 msgstr "Los bits por canal de la imagen PNG son inválidos."
 
-#: ../gdk-pixbuf/io-png.c:136
+#: gdk-pixbuf/io-png.c:136
 msgid "Transformed PNG has zero width or height."
 msgstr "El PNG transformado tiene anchura o altura cero."
 
-#: ../gdk-pixbuf/io-png.c:144
+#: gdk-pixbuf/io-png.c:144
 msgid "Bits per channel of transformed PNG is not 8."
 msgstr "Los bits por canal del PNG transformado no son 8."
 
-#: ../gdk-pixbuf/io-png.c:153
+#: gdk-pixbuf/io-png.c:153
 msgid "Transformed PNG not RGB or RGBA."
 msgstr "El PNG transformado no es RGB o RGBA."
 
-#: ../gdk-pixbuf/io-png.c:162
+#: gdk-pixbuf/io-png.c:162
 msgid "Transformed PNG has unsupported number of channels, must be 3 or 4."
 msgstr ""
 "El PNG transformado posee un número de canales no soportados, deben ser 3 o "
 "4."
 
-#: ../gdk-pixbuf/io-png.c:183
+#: gdk-pixbuf/io-png.c:183
 #, c-format
 msgid "Fatal error in PNG image file: %s"
 msgstr "Error fatal en el archivo gráfico PNG: %s"
 
-#: ../gdk-pixbuf/io-png.c:301
+#: gdk-pixbuf/io-png.c:301
 msgid "Insufficient memory to load PNG file"
 msgstr "No hay memoria suficiente para cargar el archivo PNG"
 
-#: ../gdk-pixbuf/io-png.c:618
+#: gdk-pixbuf/io-png.c:618
 #, c-format
 msgid ""
 "Insufficient memory to store a %ld by %ld image; try exiting some "
@@ -466,27 +461,27 @@ msgstr ""
 "No hay memoria suficiente para almacenar una imagen de %ld por %ld; intente "
 "cerrar algunas aplicaciones para reducir la utilización de memoria"
 
-#: ../gdk-pixbuf/io-png.c:669
+#: gdk-pixbuf/io-png.c:669
 msgid "Fatal error reading PNG image file"
 msgstr "Error fatal leyendo el archivo gráfico PNG"
 
-#: ../gdk-pixbuf/io-png.c:718
+#: gdk-pixbuf/io-png.c:718
 #, c-format
 msgid "Fatal error reading PNG image file: %s"
 msgstr "Error fatal leyendo el archivo gráfico PNG: %s"
 
-#: ../gdk-pixbuf/io-png.c:810
+#: gdk-pixbuf/io-png.c:810
 msgid ""
 "Keys for PNG text chunks must have at least 1 and at most 79 characters."
 msgstr ""
 "Las claves para las porciones de texto PNG deben tener al menos entre 1 y un "
 "máximo de 79 caracteres."
 
-#: ../gdk-pixbuf/io-png.c:818
+#: gdk-pixbuf/io-png.c:818
 msgid "Keys for PNG text chunks must be ASCII characters."
 msgstr "Las claves para las porciones de texto PNG deben ser caracteres ASCII."
 
-#: ../gdk-pixbuf/io-png.c:831
+#: gdk-pixbuf/io-png.c:831
 #, c-format
 msgid ""
 "PNG compression level must be a value between 0 and 9; value '%s' could not "
@@ -495,7 +490,7 @@ msgstr ""
 "El nivel de compresión PNG debe ser un valor entre 0 y 9; el valor «%s» no "
 "puede ser analizado."
 
-#: ../gdk-pixbuf/io-png.c:843
+#: gdk-pixbuf/io-png.c:843
 #, c-format
 msgid ""
 "PNG compression level must be a value between 0 and 9; value '%d' is not "
@@ -504,337 +499,334 @@ msgstr ""
 "El nivel de compresión PNG debe ser un valor entre 0 y 9; el valor «%d» no "
 "está permitido."
 
-#: ../gdk-pixbuf/io-png.c:883
+#: gdk-pixbuf/io-png.c:883
 #, c-format
 msgid "Value for PNG text chunk %s cannot be converted to ISO-8859-1 encoding."
 msgstr ""
 "El valor la porción de texto PNG %s no puede convertirse a la codificación "
 "ISO-8859-1."
 
-#: ../gdk-pixbuf/io-png.c:1026
+#: gdk-pixbuf/io-png.c:1026
 msgid "The PNG image format"
 msgstr "El formato de imagen PNG"
 
-#: ../gdk-pixbuf/io-pnm.c:252
+#: gdk-pixbuf/io-pnm.c:252
 msgid "PNM loader expected to find an integer, but didn't"
 msgstr "El cargador PNM esperaba encontrar un entero, pero no lo encontró"
 
-#: ../gdk-pixbuf/io-pnm.c:284
+#: gdk-pixbuf/io-pnm.c:284
 msgid "PNM file has an incorrect initial byte"
 msgstr "El archivo PNM tiene un byte inicial incorrecto"
 
-#: ../gdk-pixbuf/io-pnm.c:314
+#: gdk-pixbuf/io-pnm.c:314
 msgid "PNM file is not in a recognized PNM subformat"
 msgstr "El archivo PNM no está en un subformato PNM reconocido"
 
-#: ../gdk-pixbuf/io-pnm.c:339
+#: gdk-pixbuf/io-pnm.c:339
 msgid "PNM file has an image width of 0"
 msgstr "El archivo PNM tiene un ancho de imagen de 0"
 
-#: ../gdk-pixbuf/io-pnm.c:360
+#: gdk-pixbuf/io-pnm.c:360
 msgid "PNM file has an image height of 0"
 msgstr "El archivo PNM tiene un alto de imagen de 0"
 
-#: ../gdk-pixbuf/io-pnm.c:383
+#: gdk-pixbuf/io-pnm.c:383
 msgid "Maximum color value in PNM file is 0"
 msgstr "El valor máximo de color en el archivo PNM es 0"
 
-#: ../gdk-pixbuf/io-pnm.c:391
+#: gdk-pixbuf/io-pnm.c:391
 msgid "Maximum color value in PNM file is too large"
 msgstr "El valor máximo de color en el archivo PNM es demasiado alto"
 
-#: ../gdk-pixbuf/io-pnm.c:399
+#: gdk-pixbuf/io-pnm.c:399
 msgid "Cannot handle PNM files with maximum color values greater than 255"
 msgstr ""
 "No se pueden manipular archivos PNM con el valor de color máximo mayor que "
 "255"
 
-#: ../gdk-pixbuf/io-pnm.c:438 ../gdk-pixbuf/io-pnm.c:466
-#: ../gdk-pixbuf/io-pnm.c:498
+#: gdk-pixbuf/io-pnm.c:438 gdk-pixbuf/io-pnm.c:466 gdk-pixbuf/io-pnm.c:498
 msgid "Raw PNM image type is invalid"
 msgstr "El tipo de imagen PNM en bruto no es válido"
 
-#: ../gdk-pixbuf/io-pnm.c:562 ../gdk-pixbuf/io-pnm.c:604
+#: gdk-pixbuf/io-pnm.c:562 gdk-pixbuf/io-pnm.c:604
 msgid "PNM image format is invalid"
 msgstr "El formato PNM de la imagen no es válido"
 
-#: ../gdk-pixbuf/io-pnm.c:663
+#: gdk-pixbuf/io-pnm.c:663
 msgid "PNM image loader does not support this PNM subformat"
 msgstr "El cargador de imágenes PNM no permite este subformato PNM"
 
-#: ../gdk-pixbuf/io-pnm.c:718
+#: gdk-pixbuf/io-pnm.c:718
 msgid "Premature end-of-file encountered"
 msgstr "Se ha encontrado un final de archivo antes de lo esperado"
 
-#: ../gdk-pixbuf/io-pnm.c:750 ../gdk-pixbuf/io-pnm.c:981
+#: gdk-pixbuf/io-pnm.c:750 gdk-pixbuf/io-pnm.c:981
 msgid "Raw PNM formats require exactly one whitespace before sample data"
 msgstr ""
 "Los formatos PNM en bruto requieren exactamente un espacio en blanco antes "
 "de los datos"
 
-#: ../gdk-pixbuf/io-pnm.c:777
+#: gdk-pixbuf/io-pnm.c:777
 msgid "Cannot allocate memory for loading PNM image"
 msgstr "No se puede asignar memoria para cargar la imagen PNM"
 
-#: ../gdk-pixbuf/io-pnm.c:827
+#: gdk-pixbuf/io-pnm.c:827
 msgid "Insufficient memory to load PNM context struct"
 msgstr ""
 "No hay memoria suficiente para cargar la estructura de contexto del PNM"
 
-#: ../gdk-pixbuf/io-pnm.c:878
+#: gdk-pixbuf/io-pnm.c:878
 msgid "Unexpected end of PNM image data"
 msgstr "Final no esperado de los datos de la imagen PNM"
 
-#: ../gdk-pixbuf/io-pnm.c:1010
+#: gdk-pixbuf/io-pnm.c:1010
 msgid "Insufficient memory to load PNM file"
 msgstr "No hay memoria suficiente para cargar el archivo PNM"
 
-#: ../gdk-pixbuf/io-pnm.c:1089
+#: gdk-pixbuf/io-pnm.c:1089
 msgid "The PNM/PBM/PGM/PPM image format family"
 msgstr "La familia formato de imágenes PNM/PBM/PGM/PPM"
 
-#: ../gdk-pixbuf/io-ras.c:126
+#: gdk-pixbuf/io-ras.c:126
 msgid "RAS image has bogus header data"
 msgstr "La imagen RAS posee datos de cabecera erróneos"
 
-#: ../gdk-pixbuf/io-ras.c:148
+#: gdk-pixbuf/io-ras.c:148
 msgid "RAS image has unknown type"
 msgstr "La imagen RAS posee un tipo desconocido"
 
-#: ../gdk-pixbuf/io-ras.c:156
+#: gdk-pixbuf/io-ras.c:156
 msgid "unsupported RAS image variation"
 msgstr "Variación de imagen RAS no soportada"
 
-#: ../gdk-pixbuf/io-ras.c:171 ../gdk-pixbuf/io-ras.c:200
+#: gdk-pixbuf/io-ras.c:171 gdk-pixbuf/io-ras.c:200
 msgid "Not enough memory to load RAS image"
 msgstr "No hay memoria suficiente para cargar la imagen RAS"
 
-#: ../gdk-pixbuf/io-ras.c:543
+#: gdk-pixbuf/io-ras.c:543
 msgid "The Sun raster image format"
 msgstr "El formato de imagen Sun raster"
 
-#: ../gdk-pixbuf/io-tga.c:154
+#: gdk-pixbuf/io-tga.c:154
 msgid "Cannot allocate memory for IOBuffer struct"
 msgstr "No se puede asignar memoria para la estructura IOBuffer"
 
-#: ../gdk-pixbuf/io-tga.c:173
+#: gdk-pixbuf/io-tga.c:173
 msgid "Cannot allocate memory for IOBuffer data"
 msgstr "No se puede asignar memoria para los datos de IOBuffer"
 
-#: ../gdk-pixbuf/io-tga.c:184
+#: gdk-pixbuf/io-tga.c:184
 msgid "Cannot realloc IOBuffer data"
 msgstr "No se puede volver a reservar memoria para los datos de IOBuffer"
 
-#: ../gdk-pixbuf/io-tga.c:214
+#: gdk-pixbuf/io-tga.c:214
 msgid "Cannot allocate temporary IOBuffer data"
 msgstr "No se pueden asignar los datos temporales de IOBuffer"
 
-#: ../gdk-pixbuf/io-tga.c:348
+#: gdk-pixbuf/io-tga.c:348
 msgid "Cannot allocate new pixbuf"
 msgstr "No se puede asignar un nuevo pixbuf"
 
-#: ../gdk-pixbuf/io-tga.c:689
+#: gdk-pixbuf/io-tga.c:689
 msgid "Cannot allocate colormap structure"
 msgstr "No se puede asignar la estructura del mapa de colores"
 
-#: ../gdk-pixbuf/io-tga.c:696
+#: gdk-pixbuf/io-tga.c:696
 msgid "Cannot allocate colormap entries"
 msgstr "No se puede asignar las entradas del mapa de colores"
 
-#: ../gdk-pixbuf/io-tga.c:718
+#: gdk-pixbuf/io-tga.c:718
 msgid "Unexpected bitdepth for colormap entries"
 msgstr "Profundidad de color inesperada para las entradas del mapa de color"
 
-#: ../gdk-pixbuf/io-tga.c:736
+#: gdk-pixbuf/io-tga.c:736
 msgid "Cannot allocate TGA header memory"
 msgstr "No se puede asignar memoria para la cabecera TGA"
 
-#: ../gdk-pixbuf/io-tga.c:769
+#: gdk-pixbuf/io-tga.c:769
 msgid "TGA image has invalid dimensions"
 msgstr "La imagen TGA tiene dimensiones no válidas"
 
-#: ../gdk-pixbuf/io-tga.c:775 ../gdk-pixbuf/io-tga.c:784
-#: ../gdk-pixbuf/io-tga.c:794 ../gdk-pixbuf/io-tga.c:804
-#: ../gdk-pixbuf/io-tga.c:811
+#: gdk-pixbuf/io-tga.c:775 gdk-pixbuf/io-tga.c:784 gdk-pixbuf/io-tga.c:794
+#: gdk-pixbuf/io-tga.c:804 gdk-pixbuf/io-tga.c:811
 msgid "TGA image type not supported"
 msgstr "El tipo de imagen TGA no está implementado"
 
-#: ../gdk-pixbuf/io-tga.c:858
+#: gdk-pixbuf/io-tga.c:858
 msgid "Cannot allocate memory for TGA context struct"
 msgstr "No se puede asignar memoria para la estructura context de TGA"
 
-#: ../gdk-pixbuf/io-tga.c:923
+#: gdk-pixbuf/io-tga.c:923
 msgid "Excess data in file"
 msgstr "Exceso de datos en el archivo"
 
-#: ../gdk-pixbuf/io-tga.c:992
+#: gdk-pixbuf/io-tga.c:992
 msgid "The Targa image format"
 msgstr "El formato de imagen Targa"
 
-#: ../gdk-pixbuf/io-tiff.c:173
+#: gdk-pixbuf/io-tiff.c:173
 msgid "Could not get image width (bad TIFF file)"
 msgstr ""
 "No se ha podido obtener el ancho de la imagen (archivo TIFF incorrecto)"
 
-#: ../gdk-pixbuf/io-tiff.c:180
+#: gdk-pixbuf/io-tiff.c:180
 msgid "Could not get image height (bad TIFF file)"
 msgstr "No se puede obtener el alto de la imagen (archivo TIFF incorrecto)"
 
-#: ../gdk-pixbuf/io-tiff.c:188
+#: gdk-pixbuf/io-tiff.c:188
 msgid "Width or height of TIFF image is zero"
 msgstr "El ancho o alto de la imagen TIFF es cero"
 
-#: ../gdk-pixbuf/io-tiff.c:197 ../gdk-pixbuf/io-tiff.c:206
+#: gdk-pixbuf/io-tiff.c:197 gdk-pixbuf/io-tiff.c:206
 msgid "Dimensions of TIFF image too large"
 msgstr "Las dimensiones de la imagen TIFF son demasiado grandes"
 
-#: ../gdk-pixbuf/io-tiff.c:225 ../gdk-pixbuf/io-tiff.c:237
-#: ../gdk-pixbuf/io-tiff.c:286 ../gdk-pixbuf/io-tiff.c:572
+#: gdk-pixbuf/io-tiff.c:225 gdk-pixbuf/io-tiff.c:237 gdk-pixbuf/io-tiff.c:286
+#: gdk-pixbuf/io-tiff.c:572
 msgid "Insufficient memory to open TIFF file"
 msgstr "No hay memoria suficiente para abrir el archivo TIFF"
 
-#: ../gdk-pixbuf/io-tiff.c:251 ../gdk-pixbuf/io-tiff.c:294
+#: gdk-pixbuf/io-tiff.c:251 gdk-pixbuf/io-tiff.c:294
 msgid "Failed to load RGB data from TIFF file"
 msgstr "No se ha podido cargar los datos RGB desde el archivo TIFF"
 
-#: ../gdk-pixbuf/io-tiff.c:361
+#: gdk-pixbuf/io-tiff.c:361
 msgid "Failed to open TIFF image"
 msgstr "No se ha podido abrir la imagen TIFF"
 
-#: ../gdk-pixbuf/io-tiff.c:373
+#: gdk-pixbuf/io-tiff.c:373
 msgid "TIFFClose operation failed"
 msgstr "La operación TIFFClose falló"
 
-#: ../gdk-pixbuf/io-tiff.c:504 ../gdk-pixbuf/io-tiff.c:517
+#: gdk-pixbuf/io-tiff.c:504 gdk-pixbuf/io-tiff.c:517
 msgid "Failed to load TIFF image"
 msgstr "No se ha podido cargar la imagen TIFF"
 
-#: ../gdk-pixbuf/io-tiff.c:610
+#: gdk-pixbuf/io-tiff.c:610
 msgid "The TIFF image format"
 msgstr "El formato de imagen TIFF"
 
-#: ../gdk-pixbuf/io-wbmp.c:246
+#: gdk-pixbuf/io-wbmp.c:246
 msgid "Image has zero width"
 msgstr "La imagen tiene ancho cero"
 
-#: ../gdk-pixbuf/io-wbmp.c:264
+#: gdk-pixbuf/io-wbmp.c:264
 msgid "Image has zero height"
 msgstr "La imagen tiene alto cero"
 
-#: ../gdk-pixbuf/io-wbmp.c:275
+#: gdk-pixbuf/io-wbmp.c:275
 msgid "Not enough memory to load image"
 msgstr "No hay memoria suficiente para cargar la imagen"
 
-#: ../gdk-pixbuf/io-wbmp.c:334
+#: gdk-pixbuf/io-wbmp.c:334
 msgid "Couldn't save the rest"
 msgstr "No se ha podido guardar el resto"
 
-#: ../gdk-pixbuf/io-wbmp.c:368
+#: gdk-pixbuf/io-wbmp.c:368
 msgid "The WBMP image format"
 msgstr "El formato de imagen WBMP"
 
-#: ../gdk-pixbuf/io-xbm.c:287
+#: gdk-pixbuf/io-xbm.c:287
 msgid "Invalid XBM file"
 msgstr "El archivo XBM no es válido"
 
-#: ../gdk-pixbuf/io-xbm.c:297
+#: gdk-pixbuf/io-xbm.c:297
 msgid "Insufficient memory to load XBM image file"
 msgstr "No hay memoria suficiente para cargar el archivo gráfico XBM"
 
-#: ../gdk-pixbuf/io-xbm.c:441
+#: gdk-pixbuf/io-xbm.c:441
 msgid "Failed to write to temporary file when loading XBM image"
 msgstr ""
 "No se ha podido escribir en el archivo temporal cuando se cargaba la imagen "
 "XBM"
 
-#: ../gdk-pixbuf/io-xbm.c:476
+#: gdk-pixbuf/io-xbm.c:476
 msgid "The XBM image format"
 msgstr "El formato de imagen XBM"
 
-#: ../gdk-pixbuf/io-xpm.c:467
+#: gdk-pixbuf/io-xpm.c:467
 msgid "No XPM header found"
 msgstr "No se ha encontrado la cabecera XPM"
 
-#: ../gdk-pixbuf/io-xpm.c:476
+#: gdk-pixbuf/io-xpm.c:476
 msgid "Invalid XPM header"
 msgstr "Cabecera XPM inválida"
 
-#: ../gdk-pixbuf/io-xpm.c:484
+#: gdk-pixbuf/io-xpm.c:484
 msgid "XPM file has image width <= 0"
 msgstr "El archivo XPM tiene un ancho de imagen <= 0"
 
-#: ../gdk-pixbuf/io-xpm.c:492
+#: gdk-pixbuf/io-xpm.c:492
 msgid "XPM file has image height <= 0"
 msgstr "El archivo XPM tienen un alto de imagen <= 0"
 
-#: ../gdk-pixbuf/io-xpm.c:500
+#: gdk-pixbuf/io-xpm.c:500
 msgid "XPM has invalid number of chars per pixel"
 msgstr "El XPM tiene un número inválido de caracteres por píxel"
 
-#: ../gdk-pixbuf/io-xpm.c:507
+#: gdk-pixbuf/io-xpm.c:507
 msgid "XPM file has invalid number of colors"
 msgstr "El archivo XPM tienen un número inválido de colores"
 
-#: ../gdk-pixbuf/io-xpm.c:519 ../gdk-pixbuf/io-xpm.c:528
-#: ../gdk-pixbuf/io-xpm.c:580
+#: gdk-pixbuf/io-xpm.c:519 gdk-pixbuf/io-xpm.c:528 gdk-pixbuf/io-xpm.c:580
 msgid "Cannot allocate memory for loading XPM image"
 msgstr "No se puede asignar memoria para cargar la imagen XPM"
 
-#: ../gdk-pixbuf/io-xpm.c:542
+#: gdk-pixbuf/io-xpm.c:542
 msgid "Cannot read XPM colormap"
 msgstr "No se puede leer el mapa de color de XPM"
 
-#: ../gdk-pixbuf/io-xpm.c:771
+#: gdk-pixbuf/io-xpm.c:771
 msgid "Failed to write to temporary file when loading XPM image"
 msgstr ""
 "No se ha podido escribir en el archivo temporal al cargar la imagen XPM"
 
-#: ../gdk-pixbuf/io-xpm.c:806
+#: gdk-pixbuf/io-xpm.c:806
 msgid "The XPM image format"
 msgstr "El formato de imagen XPM"
 
 #. Description of --class=CLASS in --help output
-#: ../gdk/gdk.c:115
+#: gdk/gdk.c:115
 msgid "Program class as used by the window manager"
 msgstr "Clase del programa tal como la usa el gestor de ventanas"
 
 #. Placeholder in --class=CLASS in --help output
-#: ../gdk/gdk.c:116
+#: gdk/gdk.c:116
 msgid "CLASS"
 msgstr "CLASE"
 
 #. Description of --name=NAME in --help output
-#: ../gdk/gdk.c:118
+#: gdk/gdk.c:118
 msgid "Program name as used by the window manager"
 msgstr "Nombre del programa tal como lo usa el gestor de ventanas"
 
 #. Placeholder in --name=NAME in --help output
-#: ../gdk/gdk.c:119
+#: gdk/gdk.c:119
 msgid "NAME"
 msgstr "NOMBRE"
 
 #. Description of --display=DISPLAY in --help output
-#: ../gdk/gdk.c:121
+#: gdk/gdk.c:121
 msgid "X display to use"
 msgstr "Visor (display) X a usar"
 
 #. Placeholder in --display=DISPLAY in --help output
-#: ../gdk/gdk.c:122
+#: gdk/gdk.c:122
 msgid "DISPLAY"
 msgstr "VISOR"
 
 #. Description of --screen=SCREEN in --help output
-#: ../gdk/gdk.c:124
+#: gdk/gdk.c:124
 msgid "X screen to use"
 msgstr "Pantalla (screen) X a usar"
 
 #. Placeholder in --screen=SCREEN in --help output
-#: ../gdk/gdk.c:125
+#: gdk/gdk.c:125
 msgid "SCREEN"
 msgstr "PANTALLA"
 
 #. Description of --gdk-debug=FLAGS in --help output
-#: ../gdk/gdk.c:128
+#: gdk/gdk.c:128
 msgid "Gdk debugging flags to set"
 msgstr "Flags de depuración Ggk a establecer"
 
@@ -842,222 +834,222 @@ msgstr "Flags de depuración Ggk a establecer"
 #. Placeholder in --gdk-no-debug=FLAGS in --help output
 #. Placeholder in --gtk-debug=FLAGS in --help output
 #. Placeholder in --gtk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:129 ../gdk/gdk.c:132 ../gtk/gtkmain.c:405 ../gtk/gtkmain.c:408
+#: gdk/gdk.c:129 gdk/gdk.c:132 gtk/gtkmain.c:405 gtk/gtkmain.c:408
 msgid "FLAGS"
 msgstr "FLAGS"
 
 #. Description of --gdk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:131
+#: gdk/gdk.c:131
 msgid "Gdk debugging flags to unset"
 msgstr "Flags de depuración Gdk a quitar"
 
-#: ../gdk/keyname-table.h:3940
+#: gdk/keyname-table.h:3940
 msgid "keyboard label|BackSpace"
 msgstr "Retroceso"
 
-#: ../gdk/keyname-table.h:3941
+#: gdk/keyname-table.h:3941
 msgid "keyboard label|Tab"
 msgstr "Tabulador"
 
-#: ../gdk/keyname-table.h:3942
+#: gdk/keyname-table.h:3942
 msgid "keyboard label|Return"
 msgstr "Retorno"
 
-#: ../gdk/keyname-table.h:3943
+#: gdk/keyname-table.h:3943
 msgid "keyboard label|Pause"
 msgstr "Pausa"
 
-#: ../gdk/keyname-table.h:3944
+#: gdk/keyname-table.h:3944
 msgid "keyboard label|Scroll_Lock"
 msgstr "Bloq Despl"
 
-#: ../gdk/keyname-table.h:3945
+#: gdk/keyname-table.h:3945
 msgid "keyboard label|Sys_Req"
 msgstr "PetSis"
 
-#: ../gdk/keyname-table.h:3946
+#: gdk/keyname-table.h:3946
 msgid "keyboard label|Escape"
 msgstr "Esc"
 
-#: ../gdk/keyname-table.h:3947
+#: gdk/keyname-table.h:3947
 msgid "keyboard label|Multi_key"
 msgstr "Multikey"
 
-#: ../gdk/keyname-table.h:3948
+#: gdk/keyname-table.h:3948
 msgid "keyboard label|Home"
 msgstr "Inicio"
 
-#: ../gdk/keyname-table.h:3949
+#: gdk/keyname-table.h:3949
 msgid "keyboard label|Page_Up"
 msgstr "RePág"
 
-#: ../gdk/keyname-table.h:3950
+#: gdk/keyname-table.h:3950
 msgid "keyboard label|Page_Down"
 msgstr "AvPág"
 
-#: ../gdk/keyname-table.h:3951
+#: gdk/keyname-table.h:3951
 msgid "keyboard label|End"
 msgstr "Fin"
 
-#: ../gdk/keyname-table.h:3952
+#: gdk/keyname-table.h:3952
 msgid "keyboard label|Begin"
 msgstr "Inicio"
 
-#: ../gdk/keyname-table.h:3953
+#: gdk/keyname-table.h:3953
 msgid "keyboard label|Print"
 msgstr "Impr Pant"
 
-#: ../gdk/keyname-table.h:3954
+#: gdk/keyname-table.h:3954
 msgid "keyboard label|Insert"
 msgstr "Insert"
 
-#: ../gdk/keyname-table.h:3955
+#: gdk/keyname-table.h:3955
 msgid "keyboard label|Num_Lock"
 msgstr "BloqNum"
 
-#: ../gdk/keyname-table.h:3956
+#: gdk/keyname-table.h:3956
 msgid "keyboard label|KP_Space"
 msgstr "Espacio"
 
-#: ../gdk/keyname-table.h:3957
+#: gdk/keyname-table.h:3957
 msgid "keyboard label|KP_Tab"
 msgstr "Tabulador"
 
-#: ../gdk/keyname-table.h:3958
+#: gdk/keyname-table.h:3958
 msgid "keyboard label|KP_Enter"
 msgstr "TN Intro"
 
-#: ../gdk/keyname-table.h:3959
+#: gdk/keyname-table.h:3959
 msgid "keyboard label|KP_Home"
 msgstr "TN Inicio"
 
-#: ../gdk/keyname-table.h:3960
+#: gdk/keyname-table.h:3960
 msgid "keyboard label|KP_Left"
 msgstr "TN ←"
 
-#: ../gdk/keyname-table.h:3961
+#: gdk/keyname-table.h:3961
 msgid "keyboard label|KP_Up"
 msgstr "TN ↑"
 
-#: ../gdk/keyname-table.h:3962
+#: gdk/keyname-table.h:3962
 msgid "keyboard label|KP_Right"
 msgstr "TN →"
 
-#: ../gdk/keyname-table.h:3963
+#: gdk/keyname-table.h:3963
 msgid "keyboard label|KP_Down"
 msgstr "TN ↓"
 
-#: ../gdk/keyname-table.h:3964
+#: gdk/keyname-table.h:3964
 msgid "keyboard label|KP_Page_Up"
 msgstr "TN RePag"
 
-#: ../gdk/keyname-table.h:3965
+#: gdk/keyname-table.h:3965
 msgid "keyboard label|KP_Prior"
 msgstr "TN Anterior"
 
-#: ../gdk/keyname-table.h:3966
+#: gdk/keyname-table.h:3966
 msgid "keyboard label|KP_Page_Down"
 msgstr "TN AvPag"
 
-#: ../gdk/keyname-table.h:3967
+#: gdk/keyname-table.h:3967
 msgid "keyboard label|KP_Next"
 msgstr "TN Siguiente"
 
-#: ../gdk/keyname-table.h:3968
+#: gdk/keyname-table.h:3968
 msgid "keyboard label|KP_End"
 msgstr "TN Fin"
 
-#: ../gdk/keyname-table.h:3969
+#: gdk/keyname-table.h:3969
 msgid "keyboard label|KP_Begin"
 msgstr "TN Inicio"
 
-#: ../gdk/keyname-table.h:3970
+#: gdk/keyname-table.h:3970
 msgid "keyboard label|KP_Insert"
 msgstr "TN Ins"
 
-#: ../gdk/keyname-table.h:3971
+#: gdk/keyname-table.h:3971
 msgid "keyboard label|KP_Delete"
 msgstr "TN Supr"
 
-#: ../gdk/keyname-table.h:3972
+#: gdk/keyname-table.h:3972
 msgid "keyboard label|Delete"
 msgstr "Supr"
 
 #. Description of --sync in --help output
-#: ../gdk/win32/gdkmain-win32.c:60
+#: gdk/win32/gdkmain-win32.c:60
 msgid "Don't batch GDI requests"
 msgstr "No poner en lotes las solicitudes GDI"
 
 #. Description of --no-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:62
+#: gdk/win32/gdkmain-win32.c:62
 msgid "Don't use the Wintab API for tablet support"
 msgstr "No usar el API Wintab para el soporte de tablas"
 
 #. Description of --ignore-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:64
+#: gdk/win32/gdkmain-win32.c:64
 msgid "Same as --no-wintab"
 msgstr "Lo mismo que --no-wintab"
 
 #. Description of --use-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:66
+#: gdk/win32/gdkmain-win32.c:66
 msgid "Do use the Wintab API [default]"
 msgstr "No usar el API Wintab [predeterminado]"
 
 #. Description of --max-colors=COLORS in --help output
-#: ../gdk/win32/gdkmain-win32.c:68
+#: gdk/win32/gdkmain-win32.c:68
 msgid "Size of the palette in 8 bit mode"
 msgstr "Tamaño de la paleta en modo 8 bit"
 
 #. Placeholder in --max-colors=COLORS in --help output
-#: ../gdk/win32/gdkmain-win32.c:69
+#: gdk/win32/gdkmain-win32.c:69
 msgid "COLORS"
 msgstr "COLORES"
 
 #. Description of --sync in --help output
-#: ../gdk/x11/gdkmain-x11.c:92
+#: gdk/x11/gdkmain-x11.c:92
 msgid "Make X calls synchronous"
 msgstr "Hacer llamadas a X síncronas"
 
-#: ../gtk/gtkaboutdialog.c:273 ../gtk/gtkaboutdialog.c:2103
+#: gtk/gtkaboutdialog.c:273 gtk/gtkaboutdialog.c:2103
 msgid "License"
 msgstr "Licencia"
 
-#: ../gtk/gtkaboutdialog.c:274
+#: gtk/gtkaboutdialog.c:274
 msgid "The license of the program"
 msgstr "La licencia del programa"
 
 #. Add the credits button
-#: ../gtk/gtkaboutdialog.c:509
+#: gtk/gtkaboutdialog.c:509
 msgid "C_redits"
 msgstr "_Créditos"
 
 #. Add the license button
-#: ../gtk/gtkaboutdialog.c:519
+#: gtk/gtkaboutdialog.c:519
 msgid "_License"
 msgstr "_Licencia"
 
-#: ../gtk/gtkaboutdialog.c:756
+#: gtk/gtkaboutdialog.c:756
 #, c-format
 msgid "About %s"
 msgstr "Acerca de %s"
 
-#: ../gtk/gtkaboutdialog.c:2031
+#: gtk/gtkaboutdialog.c:2031
 msgid "Credits"
 msgstr "Créditos"
 
-#: ../gtk/gtkaboutdialog.c:2057
+#: gtk/gtkaboutdialog.c:2057
 msgid "Written by"
 msgstr "Escrito por"
 
-#: ../gtk/gtkaboutdialog.c:2060
+#: gtk/gtkaboutdialog.c:2060
 msgid "Documented by"
 msgstr "Documentado por"
 
-#: ../gtk/gtkaboutdialog.c:2072
+#: gtk/gtkaboutdialog.c:2072
 msgid "Translated by"
 msgstr "Traducido por"
 
-#: ../gtk/gtkaboutdialog.c:2076
+#: gtk/gtkaboutdialog.c:2076
 msgid "Artwork by"
 msgstr "Arte por"
 
@@ -1067,7 +1059,7 @@ msgstr "Arte por"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:121
+#: gtk/gtkaccellabel.c:121
 msgid "keyboard label|Shift"
 msgstr "Mayús."
 
@@ -1077,7 +1069,7 @@ msgstr "Mayús."
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:128
+#: gtk/gtkaccellabel.c:128
 msgid "keyboard label|Ctrl"
 msgstr "Control"
 
@@ -1087,17 +1079,17 @@ msgstr "Control"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:135
+#: gtk/gtkaccellabel.c:135
 msgid "keyboard label|Alt"
 msgstr "Alt"
 
 #. do not translate the part before the |
-#: ../gtk/gtkaccellabel.c:577
+#: gtk/gtkaccellabel.c:577
 msgid "keyboard label|Space"
 msgstr "Espacio"
 
 #. do not translate the part before the |
-#: ../gtk/gtkaccellabel.c:581
+#: gtk/gtkaccellabel.c:581
 msgid "keyboard label|Backslash"
 msgstr "\\"
 
@@ -1110,7 +1102,7 @@ msgstr "\\"
 #. * so if you have a default text direction of RTL and YM, then
 #. * the year will appear on the right.
 #.
-#: ../gtk/gtkcalendar.c:647
+#: gtk/gtkcalendar.c:647
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
@@ -1118,7 +1110,7 @@ msgstr "calendar:MY"
 #. * first day of the week to calendar:week_start:1 if you want Monday
 #. * to be the first day of the week, and so on.
 #.
-#: ../gtk/gtkcalendar.c:661
+#: gtk/gtkcalendar.c:661
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:1"
 
@@ -1130,7 +1122,7 @@ msgstr "calendar:week_start:1"
 #. *
 #. * If you don't understand this, leave it as "2000"
 #.
-#: ../gtk/gtkcalendar.c:1549
+#: gtk/gtkcalendar.c:1549
 msgid "year measurement template|2000"
 msgstr "2000"
 
@@ -1145,25 +1137,25 @@ msgstr "2000"
 #. * Don't include the prefix "calendar year format|" in the
 #. * translation. "%Y" is appropriate for most locales.
 #.
-#: ../gtk/gtkcalendar.c:1826
+#: gtk/gtkcalendar.c:1826
 msgid "calendar year format|%Y"
 msgstr "%Y"
 
 #. do not translate the part before the |
-#: ../gtk/gtkcellrendererprogress.c:237 ../gtk/gtkcellrendererprogress.c:295
+#: gtk/gtkcellrendererprogress.c:237 gtk/gtkcellrendererprogress.c:295
 #, c-format
 msgid "progress bar label|%d %%"
 msgstr "%d %%"
 
-#: ../gtk/gtkcolorbutton.c:221 ../gtk/gtkcolorbutton.c:576
+#: gtk/gtkcolorbutton.c:221 gtk/gtkcolorbutton.c:576
 msgid "Pick a Color"
 msgstr "Escoja un color"
 
-#: ../gtk/gtkcolorbutton.c:467
+#: gtk/gtkcolorbutton.c:467
 msgid "Received invalid color data\n"
 msgstr "Se recibió un dato de color no válido\n"
 
-#: ../gtk/gtkcolorsel.c:565
+#: gtk/gtkcolorsel.c:565
 msgid ""
 "The previously-selected color, for comparison to the color you're selecting "
 "now. You can drag this color to a palette entry, or select this color as "
@@ -1174,7 +1166,7 @@ msgstr ""
 "o seleccionar este color como actual arrastrándolo al otro color a lo largo "
 "de la muestra."
 
-#: ../gtk/gtkcolorsel.c:570
+#: gtk/gtkcolorsel.c:570
 msgid ""
 "The color you've chosen. You can drag this color to a palette entry to save "
 "it for use in the future."
@@ -1182,11 +1174,11 @@ msgstr ""
 "El que color elegido. Puede arrastrar este color a la paleta y guardarla "
 "para usarla en el futuro."
 
-#: ../gtk/gtkcolorsel.c:961
+#: gtk/gtkcolorsel.c:961
 msgid "_Save color here"
 msgstr "_Guardar color aquí"
 
-#: ../gtk/gtkcolorsel.c:1166
+#: gtk/gtkcolorsel.c:1166
 msgid ""
 "Click this palette entry to make it the current color. To change this entry, "
 "drag a color swatch here or right-click it and select \"Save color here.\""
@@ -1195,7 +1187,7 @@ msgstr ""
 "cambiar esta entrada, arrastre un color de muestra aquí o pulse con el botón "
 "derecho sobre éste y seleccione «Guardar color aquí»."
 
-#: ../gtk/gtkcolorsel.c:1953
+#: gtk/gtkcolorsel.c:1953
 msgid ""
 "Select the color you want from the outer ring. Select the darkness or "
 "lightness of that color using the inner triangle."
@@ -1203,7 +1195,7 @@ msgstr ""
 "Seleccione el color que desea desde el anillo exterior. Seleccione la "
 "oscuridad o luminosidad de ese color usando el triángulo interior."
 
-#: ../gtk/gtkcolorsel.c:1978
+#: gtk/gtkcolorsel.c:1978
 msgid ""
 "Click the eyedropper, then click a color anywhere on your screen to select "
 "that color."
@@ -1211,67 +1203,67 @@ msgstr ""
 "Seleccione el gotero, luego pulse sobre cualquier color que haya en su "
 "pantalla para seleccionar ese color."
 
-#: ../gtk/gtkcolorsel.c:1987
+#: gtk/gtkcolorsel.c:1987
 msgid "_Hue:"
 msgstr "_Matiz:"
 
-#: ../gtk/gtkcolorsel.c:1988
+#: gtk/gtkcolorsel.c:1988
 msgid "Position on the color wheel."
 msgstr "Posición en la rueda de colores."
 
-#: ../gtk/gtkcolorsel.c:1990
+#: gtk/gtkcolorsel.c:1990
 msgid "_Saturation:"
 msgstr "_Saturación:"
 
-#: ../gtk/gtkcolorsel.c:1991
+#: gtk/gtkcolorsel.c:1991
 msgid "\"Deepness\" of the color."
 msgstr "«Profundidad» del color."
 
-#: ../gtk/gtkcolorsel.c:1992
+#: gtk/gtkcolorsel.c:1992
 msgid "_Value:"
 msgstr "_Valor:"
 
-#: ../gtk/gtkcolorsel.c:1993
+#: gtk/gtkcolorsel.c:1993
 msgid "Brightness of the color."
 msgstr "Brillo del color."
 
-#: ../gtk/gtkcolorsel.c:1994
+#: gtk/gtkcolorsel.c:1994
 msgid "_Red:"
 msgstr "_Rojo:"
 
-#: ../gtk/gtkcolorsel.c:1995
+#: gtk/gtkcolorsel.c:1995
 msgid "Amount of red light in the color."
 msgstr "Cantidad de luz roja en el color."
 
-#: ../gtk/gtkcolorsel.c:1996
+#: gtk/gtkcolorsel.c:1996
 msgid "_Green:"
 msgstr "_Verde:"
 
-#: ../gtk/gtkcolorsel.c:1997
+#: gtk/gtkcolorsel.c:1997
 msgid "Amount of green light in the color."
 msgstr "Cantidad de luz verde en el color."
 
-#: ../gtk/gtkcolorsel.c:1998
+#: gtk/gtkcolorsel.c:1998
 msgid "_Blue:"
 msgstr "_Azul:"
 
-#: ../gtk/gtkcolorsel.c:1999
+#: gtk/gtkcolorsel.c:1999
 msgid "Amount of blue light in the color."
 msgstr "Cantidad de luz azul en el color."
 
-#: ../gtk/gtkcolorsel.c:2002
+#: gtk/gtkcolorsel.c:2002
 msgid "_Opacity:"
 msgstr "_Opacidad:"
 
-#: ../gtk/gtkcolorsel.c:2010 ../gtk/gtkcolorsel.c:2021
+#: gtk/gtkcolorsel.c:2010 gtk/gtkcolorsel.c:2021
 msgid "Transparency of the color."
 msgstr "Transparencia del color."
 
-#: ../gtk/gtkcolorsel.c:2028
+#: gtk/gtkcolorsel.c:2028
 msgid "Color _Name:"
 msgstr "_Nombre del color:"
 
-#: ../gtk/gtkcolorsel.c:2043
+#: gtk/gtkcolorsel.c:2043
 msgid ""
 "You can enter an HTML-style hexadecimal color value, or simply a color name "
 "such as 'orange' in this entry."
@@ -1279,77 +1271,77 @@ msgstr ""
 "Puede introducir en esta entrada un valor de color en estilo HTML "
 "hexadecimal, o simplemente un nombre de color como «orange»."
 
-#: ../gtk/gtkcolorsel.c:2062
+#: gtk/gtkcolorsel.c:2062
 msgid "_Palette"
 msgstr "_Paleta"
 
-#: ../gtk/gtkcolorsel.c:2094
+#: gtk/gtkcolorsel.c:2094
 msgid "Color Wheel"
 msgstr "Rueda de color"
 
-#: ../gtk/gtkcolorseldialog.c:123
+#: gtk/gtkcolorseldialog.c:123
 msgid "Color Selection"
 msgstr "Selección de color"
 
-#: ../gtk/gtkentry.c:4560 ../gtk/gtktextview.c:7125
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: ../gtk/gtkentry.c:4570 ../gtk/gtktextview.c:7135
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Métodos de entrada"
 
-#: ../gtk/gtkentry.c:4581 ../gtk/gtktextview.c:7146
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Insertar un carácter de control Unicode"
 
-#: ../gtk/gtkfilechooser.c:1623 ../gtk/gtkfilechooser.c:1667
-#: ../gtk/gtkfilechooser.c:1742 ../gtk/gtkfilechooser.c:1786
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Nombre de archivo no válido: %s"
 
-#: ../gtk/gtkfilechooserbutton.c:67
+#: gtk/gtkfilechooserbutton.c:67
 msgid "Select A File"
 msgstr "Seleccione un archivo"
 
-#: ../gtk/gtkfilechooserbutton.c:68 ../gtk/gtkfilechooserdefault.c:1317
-#: ../gtk/gtkpathbar.c:1020
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
+#: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Inicio"
 
-#: ../gtk/gtkfilechooserbutton.c:69 ../gtk/gtkfilechooserdefault.c:1344
-#: ../gtk/gtkpathbar.c:1022
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
+#: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Escritorio"
 
 # #-#-#-#-#  memoria.po (memoria 1.0)  #-#-#-#-#
 # src/file-manager/fm-icon-text-window.c:85
-#: ../gtk/gtkfilechooserbutton.c:70
+#: gtk/gtkfilechooserbutton.c:70
 msgid "(None)"
 msgstr "(Ninguno)"
 
-#: ../gtk/gtkfilechooserbutton.c:1523
+#: gtk/gtkfilechooserbutton.c:1523
 msgid "Other..."
 msgstr "Otro..."
 
-#: ../gtk/gtkfilechooserdefault.c:932
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "No se pudo obtener la información acerca del archivo"
 
-#: ../gtk/gtkfilechooserdefault.c:943
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "No se pudo añadir un marcador"
 
-#: ../gtk/gtkfilechooserdefault.c:954
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "No se pudo eliminar el marcador"
 
-#: ../gtk/gtkfilechooserdefault.c:965
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "No se pudo crear la carpeta"
 
-#: ../gtk/gtkfilechooserdefault.c:978
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1357,253 +1349,254 @@ msgstr ""
 "No se pudo crear la carpeta, debido a que ya existe un archivo con el mismo "
 "nombre. Intenta usar un nombre distinto o renombre el archivo primero."
 
-#: ../gtk/gtkfilechooserdefault.c:991
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Nombre de archivo inválido"
 
-#: ../gtk/gtkfilechooserdefault.c:1001
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "No se pudo mostrar el contenido de la carpeta"
 
-#: ../gtk/gtkfilechooserdefault.c:1207
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "No se ha podido obtener información acerca de «%s» : %s"
 
-#: ../gtk/gtkfilechooserdefault.c:2223
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Añadir la carpeta «%s» a los marcadores"
 
-#: ../gtk/gtkfilechooserdefault.c:2264
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Añadir la carpeta actual a los marcadores"
 
-#: ../gtk/gtkfilechooserdefault.c:2266
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Añadir las carpetas seleccionadas a los marcadores"
 
-#: ../gtk/gtkfilechooserdefault.c:2306
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Quitar el marcador «%s»"
 
-#: ../gtk/gtkfilechooserdefault.c:2737
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "No se pudo añadir un marcador para «%s» porque es un nombre de ruta inválido."
 
-#: ../gtk/gtkfilechooserdefault.c:2952
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Quitar"
 
-#: ../gtk/gtkfilechooserdefault.c:2961
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Renombrar..."
 
-#: ../gtk/gtkfilechooserdefault.c:3084
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Atajos"
 
-#: ../gtk/gtkfilechooserdefault.c:3138
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Carpeta"
 
-#: ../gtk/gtkfilechooserdefault.c:3194 ../gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Añadir"
 
-#: ../gtk/gtkfilechooserdefault.c:3201
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Añadir la carpeta seleccionada a los marcadores"
 
-#: ../gtk/gtkfilechooserdefault.c:3206 ../gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Quitar"
 
-#: ../gtk/gtkfilechooserdefault.c:3213
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Quitar el marcador seleccionado"
 
-#: ../gtk/gtkfilechooserdefault.c:3313
+#: gtk/gtkfilechooserdefault.c:3313
 msgid "Could not select file"
 msgstr "No se pudo seleccionar el archivo"
 
-#: ../gtk/gtkfilechooserdefault.c:3369
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "No se pudo seleccionar el archivo «%s» porque es un nombre de ruta inválido."
 
-#: ../gtk/gtkfilechooserdefault.c:3441
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "_Añadir a los marcadores"
 
-#: ../gtk/gtkfilechooserdefault.c:3451
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Abrir _dirección"
 
-#: ../gtk/gtkfilechooserdefault.c:3463
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Mostrar archivos _ocultos"
 
-#: ../gtk/gtkfilechooserdefault.c:3587 ../gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Archivos"
 
-#: ../gtk/gtkfilechooserdefault.c:3632
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Nombre"
 
-#: ../gtk/gtkfilechooserdefault.c:3657
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../gtk/gtkfilechooserdefault.c:3670
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Modificado"
 
-#: ../gtk/gtkfilechooserdefault.c:3702
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Seleccione qué tipos de archivos se muestran"
 
 #. Create Folder
-#: ../gtk/gtkfilechooserdefault.c:3738
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Crear _carpeta"
 
 #. Name entry
-#: ../gtk/gtkfilechooserdefault.c:3859
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: ../gtk/gtkfilechooserdefault.c:3899
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Buscar otras carpetas"
 
-#: ../gtk/gtkfilechooserdefault.c:4150
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Guardar en una _carpeta:"
 
-#: ../gtk/gtkfilechooserdefault.c:4152
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Crear en la _carpeta:"
 
-#: ../gtk/gtkfilechooserdefault.c:5148
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "No se pudo cambiar a la carpeta porque no es local"
 
-#: ../gtk/gtkfilechooserdefault.c:5702
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "El atajo %s no existe"
 
-#: ../gtk/gtkfilechooserdefault.c:5957
+#: gtk/gtkfilechooserdefault.c:5957
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Ya existe un archivo llamado «%s». ¿Quiere reemplazarlo?"
 
-#: ../gtk/gtkfilechooserdefault.c:5960
+#: gtk/gtkfilechooserdefault.c:5960
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr "El archivo ya existe en «%s». Si lo reemplaza sobreescribirá su contenido."
+msgstr ""
+"El archivo ya existe en «%s». Si lo reemplaza sobreescribirá su contenido."
 
-#: ../gtk/gtkfilechooserdefault.c:5965
+#: gtk/gtkfilechooserdefault.c:5965
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: ../gtk/gtkfilechooserdefault.c:6453
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "No se pudo montar %s"
 
-#: ../gtk/gtkfilechooserdefault.c:6741
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Nombre del tipo de la carpeta nueva"
 
-#: ../gtk/gtkfilechooserdefault.c:6783
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d byte"
 msgstr[1] "%d bytes"
 
-#: ../gtk/gtkfilechooserdefault.c:6785
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f Kib"
 
-#: ../gtk/gtkfilechooserdefault.c:6787
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f Mib"
 
-#: ../gtk/gtkfilechooserdefault.c:6789
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f Gib"
 
-#: ../gtk/gtkfilechooserdefault.c:6835 ../gtk/gtkfilechooserdefault.c:6859
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Hoy"
 
-#: ../gtk/gtkfilechooserdefault.c:6848
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Ayer"
 
-#: ../gtk/gtkfilechooserdefault.c:6930
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "No se pudo cambiar la carpeta"
 
-#: ../gtk/gtkfilechooserdefault.c:6931
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "La carpeta que especificó es una ruta inválida."
 
-#: ../gtk/gtkfilechooserdefault.c:6970
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "No se pudo construir un nombre de archivo de «%s» y «%s»"
 
-#: ../gtk/gtkfilechooserdefault.c:7006
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "No se pudo seleccionar el elemento"
 
-#: ../gtk/gtkfilechooserdefault.c:7046
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Abrir dirección"
 
-#: ../gtk/gtkfilechooserdefault.c:7053
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Guardar en dirección"
 
-#: ../gtk/gtkfilechooserdefault.c:7077
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Dirección:"
 
-#: ../gtk/gtkfilesel.c:727
+#: gtk/gtkfilesel.c:727
 msgid "Folders"
 msgstr "Carpetas"
 
-#: ../gtk/gtkfilesel.c:731
+#: gtk/gtkfilesel.c:731
 msgid "Fol_ders"
 msgstr "_Carpetas"
 
-#: ../gtk/gtkfilesel.c:767
+#: gtk/gtkfilesel.c:767
 msgid "_Files"
 msgstr "_Archivos"
 
-#: ../gtk/gtkfilesel.c:855 ../gtk/gtkfilesel.c:2242
+#: gtk/gtkfilesel.c:855 gtk/gtkfilesel.c:2242
 #, c-format
 msgid "Folder unreadable: %s"
 msgstr "Carpeta ilegible: %s"
 
-#: ../gtk/gtkfilesel.c:984
+#: gtk/gtkfilesel.c:984
 #, c-format
 msgid ""
 "The file \"%s\" resides on another machine (called %s) and may not be "
@@ -1614,19 +1607,19 @@ msgstr ""
 "disponible para este programa.\n"
 "¿Está seguro que desea seleccionarlo?"
 
-#: ../gtk/gtkfilesel.c:1114
+#: gtk/gtkfilesel.c:1114
 msgid "_New Folder"
 msgstr "Carpeta _nueva"
 
-#: ../gtk/gtkfilesel.c:1125
+#: gtk/gtkfilesel.c:1125
 msgid "De_lete File"
 msgstr "_Borrar archivo"
 
-#: ../gtk/gtkfilesel.c:1136
+#: gtk/gtkfilesel.c:1136
 msgid "_Rename File"
 msgstr "_Renombrar archivo"
 
-#: ../gtk/gtkfilesel.c:1438
+#: gtk/gtkfilesel.c:1438
 #, c-format
 msgid ""
 "The folder name \"%s\" contains symbols that are not allowed in filenames"
@@ -1634,7 +1627,7 @@ msgstr ""
 "El nombre de la carpeta «%s» contiene símbolos que no están permitidos en "
 "los nombres de archivos"
 
-#: ../gtk/gtkfilesel.c:1440
+#: gtk/gtkfilesel.c:1440
 #, c-format
 msgid ""
 "Error creating folder \"%s\": %s\n"
@@ -1643,36 +1636,36 @@ msgstr ""
 "Ha ocurrido un error al crear la carpeta «%s» : %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1441 ../gtk/gtkfilesel.c:1677
+#: gtk/gtkfilesel.c:1441 gtk/gtkfilesel.c:1677
 msgid "You probably used symbols not allowed in filenames."
 msgstr ""
 "Probablemente ha empleado símbolos no permitidos en nombres de archivo."
 
-#: ../gtk/gtkfilesel.c:1449
+#: gtk/gtkfilesel.c:1449
 #, c-format
 msgid "Error creating folder \"%s\": %s\n"
 msgstr "Error al crear la carpeta «%s» : %s\n"
 
-#: ../gtk/gtkfilesel.c:1483
+#: gtk/gtkfilesel.c:1483
 msgid "New Folder"
 msgstr "Carpeta nueva"
 
-#: ../gtk/gtkfilesel.c:1498
+#: gtk/gtkfilesel.c:1498
 msgid "_Folder name:"
 msgstr "_Nombre de la carpeta:"
 
-#: ../gtk/gtkfilesel.c:1522
+#: gtk/gtkfilesel.c:1522
 msgid "C_reate"
 msgstr "C_rear"
 
-#: ../gtk/gtkfilesel.c:1565
+#: gtk/gtkfilesel.c:1565
 #, c-format
 msgid "The filename \"%s\" contains symbols that are not allowed in filenames"
 msgstr ""
 "El nombre «%s» contiene símbolos que no están permitidos en nombres de "
 "archivos"
 
-#: ../gtk/gtkfilesel.c:1568
+#: gtk/gtkfilesel.c:1568
 #, c-format
 msgid ""
 "Error deleting file \"%s\": %s\n"
@@ -1681,34 +1674,34 @@ msgstr ""
 "Error al borrar el archivo «%s»: %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1570 ../gtk/gtkfilesel.c:1691
+#: gtk/gtkfilesel.c:1570 gtk/gtkfilesel.c:1691
 msgid "It probably contains symbols not allowed in filenames."
 msgstr ""
 "Probablemente contenga símbolos que no están permitidos en los nombres de "
 "archivo."
 
-#: ../gtk/gtkfilesel.c:1579
+#: gtk/gtkfilesel.c:1579
 #, c-format
 msgid "Error deleting file \"%s\": %s"
 msgstr "Error al borrar el archivo «%s»: %s"
 
-#: ../gtk/gtkfilesel.c:1622
+#: gtk/gtkfilesel.c:1622
 #, c-format
 msgid "Really delete file \"%s\"?"
 msgstr "¿Realmente desea borrar el archivo «%s»?"
 
-#: ../gtk/gtkfilesel.c:1627
+#: gtk/gtkfilesel.c:1627
 msgid "Delete File"
 msgstr "Borrar archivo"
 
-#: ../gtk/gtkfilesel.c:1673 ../gtk/gtkfilesel.c:1687
+#: gtk/gtkfilesel.c:1673 gtk/gtkfilesel.c:1687
 #, c-format
 msgid "The file name \"%s\" contains symbols that are not allowed in filenames"
 msgstr ""
 "El nombre «%s» contiene símbolos que no están permitidos en nombres de "
 "archivos"
 
-#: ../gtk/gtkfilesel.c:1675
+#: gtk/gtkfilesel.c:1675
 #, c-format
 msgid ""
 "Error renaming file to \"%s\": %s\n"
@@ -1717,7 +1710,7 @@ msgstr ""
 "Error al renombrar el archivo como «%s»: %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1689
+#: gtk/gtkfilesel.c:1689
 #, c-format
 msgid ""
 "Error renaming file \"%s\": %s\n"
@@ -1726,29 +1719,29 @@ msgstr ""
 "Error al renombrar el archivo «%s»: %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1699
+#: gtk/gtkfilesel.c:1699
 #, c-format
 msgid "Error renaming file \"%s\" to \"%s\": %s"
 msgstr "Error al renombrar el archivo «%s» como «%s»: %s"
 
-#: ../gtk/gtkfilesel.c:1746
+#: gtk/gtkfilesel.c:1746
 msgid "Rename File"
 msgstr "Renombrar archivo"
 
-#: ../gtk/gtkfilesel.c:1761
+#: gtk/gtkfilesel.c:1761
 #, c-format
 msgid "Rename file \"%s\" to:"
 msgstr "Renombrar archivo «%s» como:"
 
-#: ../gtk/gtkfilesel.c:1790
+#: gtk/gtkfilesel.c:1790
 msgid "_Rename"
 msgstr "_Renombrar"
 
-#: ../gtk/gtkfilesel.c:2222
+#: gtk/gtkfilesel.c:2222
 msgid "_Selection: "
 msgstr "_Selección: "
 
-#: ../gtk/gtkfilesel.c:3147
+#: gtk/gtkfilesel.c:3147
 #, c-format
 msgid ""
 "The filename \"%s\" couldn't be converted to UTF-8. (try setting the "
@@ -1757,48 +1750,48 @@ msgstr ""
 "El nombre de archivo «%s» no ha podido ser convertido a UTF-8. (intente "
 "definir la variable de entorno G_FILENAME_ENCODING): %s"
 
-#: ../gtk/gtkfilesel.c:3150
+#: gtk/gtkfilesel.c:3150
 msgid "Invalid UTF-8"
 msgstr "UTF-8 inválido"
 
-#: ../gtk/gtkfilesel.c:4027
+#: gtk/gtkfilesel.c:4027
 msgid "Name too long"
 msgstr "El nombre es demasiado largo"
 
-#: ../gtk/gtkfilesel.c:4029
+#: gtk/gtkfilesel.c:4029
 msgid "Couldn't convert filename"
 msgstr "No se ha podido convertir el nombre del archivo"
 
-#: ../gtk/gtkfilesystemmodel.c:1267
+#: gtk/gtkfilesystemmodel.c:1267
 msgid "(Empty)"
 msgstr "(Vacío)"
 
-#: ../gtk/gtkfilesystemunix.c:476 ../gtk/gtkfilesystemunix.c:682
-#: ../gtk/gtkfilesystemunix.c:1858 ../gtk/gtkfilesystemwin32.c:482
-#: ../gtk/gtkfilesystemwin32.c:495 ../gtk/gtkfilesystemwin32.c:1487
+#: gtk/gtkfilesystemunix.c:476 gtk/gtkfilesystemunix.c:682
+#: gtk/gtkfilesystemunix.c:1858 gtk/gtkfilesystemwin32.c:482
+#: gtk/gtkfilesystemwin32.c:495 gtk/gtkfilesystemwin32.c:1487
 #, c-format
 msgid "Error getting information for '%s': %s"
 msgstr "Error al obtener información para «%s» : %s"
 
-#: ../gtk/gtkfilesystemunix.c:551 ../gtk/gtkfilesystemwin32.c:537
+#: gtk/gtkfilesystemunix.c:551 gtk/gtkfilesystemwin32.c:537
 #, c-format
 msgid "Error creating directory '%s': %s"
 msgstr "Error al crear la carpeta «%s» : %s"
 
-#: ../gtk/gtkfilesystemunix.c:631 ../gtk/gtkfilesystemwin32.c:597
+#: gtk/gtkfilesystemunix.c:631 gtk/gtkfilesystemwin32.c:597
 msgid "This file system does not support mounting"
 msgstr "Este sistema de archivos no soporta montaje"
 
-#: ../gtk/gtkfilesystemunix.c:639
+#: gtk/gtkfilesystemunix.c:639
 msgid "File System"
 msgstr "Sistema de archivos"
 
-#: ../gtk/gtkfilesystemunix.c:796
+#: gtk/gtkfilesystemunix.c:796
 #, c-format
 msgid "Could not get a stock icon for %s"
 msgstr "No se ha podido obtener el icono de fábrica para %s"
 
-#: ../gtk/gtkfilesystemunix.c:891
+#: gtk/gtkfilesystemunix.c:891
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"%s\". "
@@ -1807,93 +1800,93 @@ msgstr ""
 "El nombre «%s» no es válido debido a que contiene el carácter «%s». Por "
 "favor, use un nombre diferente."
 
-#: ../gtk/gtkfilesystemunix.c:1463 ../gtk/gtkfilesystemwin32.c:1032
+#: gtk/gtkfilesystemunix.c:1463 gtk/gtkfilesystemwin32.c:1032
 #, c-format
 msgid "Bookmark saving failed: %s"
 msgstr "Ha fallado el guardado del marcador: %s"
 
-#: ../gtk/gtkfilesystemunix.c:1518
+#: gtk/gtkfilesystemunix.c:1518
 #, c-format
 msgid "'%s' already exists in the bookmarks list"
 msgstr "«%s» ya existe en la lista de marcadores"
 
-#: ../gtk/gtkfilesystemunix.c:1590
+#: gtk/gtkfilesystemunix.c:1590
 #, c-format
 msgid "'%s' does not exist in the bookmarks list"
 msgstr "«%s» no existe en la lista de marcadores"
 
-#: ../gtk/gtkfilesystemunix.c:1818
+#: gtk/gtkfilesystemunix.c:1818
 #, c-format
 msgid "Error getting information for '/': %s"
 msgstr "Error al obtener información para «/» : %s"
 
-#: ../gtk/gtkfilesystemwin32.c:611
+#: gtk/gtkfilesystemwin32.c:611
 #, c-format
 msgid "Network Drive (%s)"
 msgstr "Unidad de red (%s)"
 
-#: ../gtk/gtkfilesystemwin32.c:650
+#: gtk/gtkfilesystemwin32.c:650
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../gtk/gtkfontbutton.c:179 ../gtk/gtkfontbutton.c:292
+#: gtk/gtkfontbutton.c:179 gtk/gtkfontbutton.c:292
 msgid "Pick a Font"
 msgstr "Escoja una tipografía"
 
 #. Initialize fields
-#: ../gtk/gtkfontbutton.c:286
+#: gtk/gtkfontbutton.c:286
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: ../gtk/gtkfontbutton.c:804
+#: gtk/gtkfontbutton.c:804
 msgid "Font"
 msgstr "Tipografía"
 
 #. This is the default text shown in the preview entry, though the user
 #. can set it. Remember that some fonts only have capital letters.
-#: ../gtk/gtkfontsel.c:74
+#: gtk/gtkfontsel.c:74
 msgid "abcdefghijk ABCDEFGHIJK"
 msgstr "abcdefghijk ABCDEFGHIJK"
 
-#: ../gtk/gtkfontsel.c:361
+#: gtk/gtkfontsel.c:361
 msgid "_Family:"
 msgstr "_Familia:"
 
-#: ../gtk/gtkfontsel.c:367
+#: gtk/gtkfontsel.c:367
 msgid "_Style:"
 msgstr "_Estilo:"
 
-#: ../gtk/gtkfontsel.c:373
+#: gtk/gtkfontsel.c:373
 msgid "Si_ze:"
 msgstr "_Tamaño:"
 
 #. create the text entry widget
-#: ../gtk/gtkfontsel.c:549
+#: gtk/gtkfontsel.c:549
 msgid "_Preview:"
 msgstr "_Vista preliminar:"
 
-#: ../gtk/gtkfontsel.c:1383
+#: gtk/gtkfontsel.c:1383
 msgid "Font Selection"
 msgstr "Selección de tipografías"
 
-#: ../gtk/gtkgamma.c:401
+#: gtk/gtkgamma.c:401
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../gtk/gtkgamma.c:411
+#: gtk/gtkgamma.c:411
 msgid "_Gamma value"
 msgstr "Valor _gamma"
 
 #. Remove this icon source so we don't keep trying to
 #. * load it.
 #.
-#: ../gtk/gtkiconfactory.c:1656
+#: gtk/gtkiconfactory.c:1656
 #, c-format
 msgid "Error loading icon: %s"
 msgstr "Ocurrió un error al cargar el icono: %s"
 
-#: ../gtk/gtkicontheme.c:1239
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1906,122 +1899,122 @@ msgstr ""
 "Puede obtener una copia desde:\n"
 "\t%s"
 
-#: ../gtk/gtkicontheme.c:1304
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "El icono «%s» no está presente en el tema"
 
-#: ../gtk/gtkimmodule.c:427
+#: gtk/gtkimmodule.c:427
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../gtk/gtkinputdialog.c:235
+#: gtk/gtkinputdialog.c:235
 msgid "Input"
 msgstr "Entrada"
 
-#: ../gtk/gtkinputdialog.c:244
+#: gtk/gtkinputdialog.c:244
 msgid "No extended input devices"
 msgstr "Ningún dispositivo de entrada extendido"
 
-#: ../gtk/gtkinputdialog.c:256
+#: gtk/gtkinputdialog.c:256
 msgid "_Device:"
 msgstr "_Dispositivo:"
 
-#: ../gtk/gtkinputdialog.c:273
+#: gtk/gtkinputdialog.c:273
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: ../gtk/gtkinputdialog.c:280
+#: gtk/gtkinputdialog.c:280
 msgid "Screen"
 msgstr "Pantalla"
 
-#: ../gtk/gtkinputdialog.c:287
+#: gtk/gtkinputdialog.c:287
 msgid "Window"
 msgstr "Ventana"
 
-#: ../gtk/gtkinputdialog.c:294
+#: gtk/gtkinputdialog.c:294
 msgid "_Mode: "
 msgstr "_Modo: "
 
 #. The axis listbox
-#: ../gtk/gtkinputdialog.c:325
+#: gtk/gtkinputdialog.c:325
 msgid "_Axes"
 msgstr "_Ejes"
 
 #. Keys listbox
-#: ../gtk/gtkinputdialog.c:342
+#: gtk/gtkinputdialog.c:342
 msgid "_Keys"
 msgstr "_Teclas"
 
-#: ../gtk/gtkinputdialog.c:562
+#: gtk/gtkinputdialog.c:562
 msgid "X"
 msgstr "X"
 
-#: ../gtk/gtkinputdialog.c:563
+#: gtk/gtkinputdialog.c:563
 msgid "Y"
 msgstr "Y"
 
-#: ../gtk/gtkinputdialog.c:564
+#: gtk/gtkinputdialog.c:564
 msgid "Pressure"
 msgstr "Presión"
 
-#: ../gtk/gtkinputdialog.c:565
+#: gtk/gtkinputdialog.c:565
 msgid "X Tilt"
 msgstr "Límite de activación X"
 
-#: ../gtk/gtkinputdialog.c:566
+#: gtk/gtkinputdialog.c:566
 msgid "Y Tilt"
 msgstr "Límite de activación Y"
 
-#: ../gtk/gtkinputdialog.c:567
+#: gtk/gtkinputdialog.c:567
 msgid "Wheel"
 msgstr "Rueda"
 
 # #-#-#-#-#  memoria.po (memoria 1.0)  #-#-#-#-#
 # src/file-manager/fm-icon-text-window.c:85
-#: ../gtk/gtkinputdialog.c:607
+#: gtk/gtkinputdialog.c:607
 msgid "none"
 msgstr "ninguno"
 
-#: ../gtk/gtkinputdialog.c:643 ../gtk/gtkinputdialog.c:679
+#: gtk/gtkinputdialog.c:643 gtk/gtkinputdialog.c:679
 msgid "(disabled)"
 msgstr "(desactivado)"
 
-#: ../gtk/gtkinputdialog.c:672
+#: gtk/gtkinputdialog.c:672
 msgid "(unknown)"
 msgstr "(desconocido)"
 
 #. and clear button
-#: ../gtk/gtkinputdialog.c:759
+#: gtk/gtkinputdialog.c:759
 msgid "clear"
 msgstr "limpiar"
 
-#: ../gtk/gtklabel.c:3985
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Seleccionar todo"
 
 #. Description of --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:398
+#: gtk/gtkmain.c:398
 msgid "Load additional GTK+ modules"
 msgstr "Cargar módulos adicionales GTK+"
 
 #. Placeholder in --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:399
+#: gtk/gtkmain.c:399
 msgid "MODULES"
 msgstr "MÓDULOS"
 
 #. Description of --g-fatal-warnings in --help output
-#: ../gtk/gtkmain.c:401
+#: gtk/gtkmain.c:401
 msgid "Make all warnings fatal"
 msgstr "Hacer todas las advertencias fatales"
 
 #. Description of --gtk-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:404
+#: gtk/gtkmain.c:404
 msgid "GTK+ debugging flags to set"
 msgstr "Flags de depuración GTK+ a establecer"
 
 #. Description of --gtk-no-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:407
+#: gtk/gtkmain.c:407
 msgid "GTK+ debugging flags to unset"
 msgstr "Flags de depuración GTK+ a quitar"
 
@@ -2030,519 +2023,519 @@ msgstr "Flags de depuración GTK+ a quitar"
 #. * Do *not* translate it to "predefinito:LTR", if it
 #. * it isn't default:LTR or default:RTL it will not work
 #.
-#: ../gtk/gtkmain.c:476
+#: gtk/gtkmain.c:476
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../gtk/gtkmain.c:559
+#: gtk/gtkmain.c:559
 msgid "GTK+ Options"
 msgstr "Opciones GTK+"
 
-#: ../gtk/gtkmain.c:559
+#: gtk/gtkmain.c:559
 msgid "Show GTK+ Options"
 msgstr "Mostrar opciones GTK+"
 
-#: ../gtk/gtknotebook.c:2718 ../gtk/gtknotebook.c:5064
+#: gtk/gtknotebook.c:2718 gtk/gtknotebook.c:5064
 #, c-format
 msgid "Page %u"
 msgstr "Página %u"
 
-#: ../gtk/gtkradiotoolbutton.c:92
+#: gtk/gtkradiotoolbutton.c:92
 msgid "Group"
 msgstr "Grupo"
 
-#: ../gtk/gtkradiotoolbutton.c:93
+#: gtk/gtkradiotoolbutton.c:93
 msgid "The radio tool button whose group this button belongs to."
 msgstr "La herramienta de botón de radio a cuyo grupo pertenece este botón."
 
-#: ../gtk/gtkrc.c:2400
+#: gtk/gtkrc.c:2400
 #, c-format
 msgid "Unable to find include file: \"%s\""
 msgstr "No se ha podido encontrar el archivo «include»: «%s»"
 
-#: ../gtk/gtkrc.c:3042 ../gtk/gtkrc.c:3045
+#: gtk/gtkrc.c:3042 gtk/gtkrc.c:3045
 #, c-format
 msgid "Unable to locate image file in pixmap_path: \"%s\""
 msgstr "Imposible encontrar un archivo imagen en pixmap_path: «%s»"
 
-#: ../gtk/gtkrc.c:3480
+#: gtk/gtkrc.c:3480
 #, c-format
 msgid "Pixmap path element: \"%s\" must be absolute, %s, line %d"
 msgstr "La ruta del elemento pixmap: «%s» debe ser absoluta, %s, línea %d"
 
 #. KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate
-#: ../gtk/gtkstock.c:308
+#: gtk/gtkstock.c:308
 msgid "Information"
 msgstr "Información"
 
-#: ../gtk/gtkstock.c:309
+#: gtk/gtkstock.c:309
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../gtk/gtkstock.c:310
+#: gtk/gtkstock.c:310
 msgid "Error"
 msgstr "Error"
 
-#: ../gtk/gtkstock.c:311
+#: gtk/gtkstock.c:311
 msgid "Question"
 msgstr "Pregunta"
 
 #. FIXME these need accelerators when appropriate, and
 #. * need the mnemonics to be rationalized
 #.
-#: ../gtk/gtkstock.c:316
+#: gtk/gtkstock.c:316
 msgid "_About"
 msgstr "A_cerca de"
 
-#: ../gtk/gtkstock.c:318
+#: gtk/gtkstock.c:318
 msgid "_Apply"
 msgstr "_Aplicar"
 
-#: ../gtk/gtkstock.c:319
+#: gtk/gtkstock.c:319
 msgid "_Bold"
 msgstr "_Negrita"
 
-#: ../gtk/gtkstock.c:320
+#: gtk/gtkstock.c:320
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../gtk/gtkstock.c:321
+#: gtk/gtkstock.c:321
 msgid "_CD-Rom"
 msgstr "_CD-Rom"
 
-#: ../gtk/gtkstock.c:322
+#: gtk/gtkstock.c:322
 msgid "_Clear"
 msgstr "_Limpiar"
 
-#: ../gtk/gtkstock.c:323
+#: gtk/gtkstock.c:323
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ../gtk/gtkstock.c:324
+#: gtk/gtkstock.c:324
 msgid "_Convert"
 msgstr "_Convertir"
 
-#: ../gtk/gtkstock.c:325
+#: gtk/gtkstock.c:325
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../gtk/gtkstock.c:326
+#: gtk/gtkstock.c:326
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: ../gtk/gtkstock.c:327
+#: gtk/gtkstock.c:327
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: ../gtk/gtkstock.c:328
+#: gtk/gtkstock.c:328
 msgid "_Execute"
 msgstr "_Ejecutar"
 
-#: ../gtk/gtkstock.c:329
+#: gtk/gtkstock.c:329
 msgid "_Edit"
 msgstr "_Editar"
 
 # src/nautilus-first-time-druid.c:290
-#: ../gtk/gtkstock.c:330
+#: gtk/gtkstock.c:330
 msgid "_Find"
 msgstr "_Buscar"
 
-#: ../gtk/gtkstock.c:331
+#: gtk/gtkstock.c:331
 msgid "Find and _Replace"
 msgstr "Buscar y _reemplazar"
 
-#: ../gtk/gtkstock.c:332
+#: gtk/gtkstock.c:332
 msgid "_Floppy"
 msgstr "_Disquete"
 
-#: ../gtk/gtkstock.c:333
+#: gtk/gtkstock.c:333
 msgid "_Fullscreen"
 msgstr "Pantalla _completa"
 
-#: ../gtk/gtkstock.c:334
+#: gtk/gtkstock.c:334
 msgid "_Leave Fullscreen"
 msgstr "_Salir de pantalla completa"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:336
+#: gtk/gtkstock.c:336
 msgid "Navigation|_Bottom"
 msgstr "_Fondo"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:338
+#: gtk/gtkstock.c:338
 msgid "Navigation|_First"
 msgstr "_Primero"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:340
+#: gtk/gtkstock.c:340
 msgid "Navigation|_Last"
 msgstr "_Último"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:342
+#: gtk/gtkstock.c:342
 msgid "Navigation|_Top"
 msgstr "_Cima"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:344
+#: gtk/gtkstock.c:344
 msgid "Navigation|_Back"
 msgstr "_Atrás"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:346
+#: gtk/gtkstock.c:346
 msgid "Navigation|_Down"
 msgstr "_Bajar"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:348
+#: gtk/gtkstock.c:348
 msgid "Navigation|_Forward"
 msgstr "_Adelante"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:350
+#: gtk/gtkstock.c:350
 msgid "Navigation|_Up"
 msgstr "_Subir"
 
-#: ../gtk/gtkstock.c:351
+#: gtk/gtkstock.c:351
 msgid "_Harddisk"
 msgstr "_Disco duro"
 
-#: ../gtk/gtkstock.c:352
+#: gtk/gtkstock.c:352
 msgid "_Help"
 msgstr "A_yuda"
 
-#: ../gtk/gtkstock.c:353
+#: gtk/gtkstock.c:353
 msgid "_Home"
 msgstr "_Inicio"
 
-#: ../gtk/gtkstock.c:354
+#: gtk/gtkstock.c:354
 msgid "Increase Indent"
 msgstr "Aumentar sangría"
 
-#: ../gtk/gtkstock.c:355
+#: gtk/gtkstock.c:355
 msgid "Decrease Indent"
 msgstr "Disminuir sangría"
 
-#: ../gtk/gtkstock.c:356
+#: gtk/gtkstock.c:356
 msgid "_Index"
 msgstr "_Índice"
 
-#: ../gtk/gtkstock.c:357
+#: gtk/gtkstock.c:357
 msgid "_Information"
 msgstr "_Información"
 
-#: ../gtk/gtkstock.c:358
+#: gtk/gtkstock.c:358
 msgid "_Italic"
 msgstr "_Itálica"
 
-#: ../gtk/gtkstock.c:359
+#: gtk/gtkstock.c:359
 msgid "_Jump to"
 msgstr "_Ir a"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:361
+#: gtk/gtkstock.c:361
 msgid "Justify|_Center"
 msgstr "_Centrar"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:363
+#: gtk/gtkstock.c:363
 msgid "Justify|_Fill"
 msgstr "_Rellenar"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:365
+#: gtk/gtkstock.c:365
 msgid "Justify|_Left"
 msgstr "_Izquierda"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:367
+#: gtk/gtkstock.c:367
 msgid "Justify|_Right"
 msgstr "_Derecha"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:370
+#: gtk/gtkstock.c:370
 msgid "Media|_Forward"
 msgstr "_Adelantar"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:372
+#: gtk/gtkstock.c:372
 msgid "Media|_Next"
 msgstr "_Siguiente"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:374
+#: gtk/gtkstock.c:374
 msgid "Media|P_ause"
 msgstr "_Pausa"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:376
+#: gtk/gtkstock.c:376
 msgid "Media|_Play"
 msgstr "_Reproducir"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:378
+#: gtk/gtkstock.c:378
 msgid "Media|Pre_vious"
 msgstr "_Anterior"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:380
+#: gtk/gtkstock.c:380
 msgid "Media|_Record"
 msgstr "_Grabar"
 
 # src/nautilus-first-time-druid.c:290
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:382
+#: gtk/gtkstock.c:382
 msgid "Media|R_ewind"
 msgstr "_Rebobinar"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:384
+#: gtk/gtkstock.c:384
 msgid "Media|_Stop"
 msgstr "_Detener"
 
-#: ../gtk/gtkstock.c:385
+#: gtk/gtkstock.c:385
 msgid "_Network"
 msgstr "_Red"
 
-#: ../gtk/gtkstock.c:386
+#: gtk/gtkstock.c:386
 msgid "_New"
 msgstr "_Nuevo"
 
-#: ../gtk/gtkstock.c:387
+#: gtk/gtkstock.c:387
 msgid "_No"
 msgstr "_No"
 
-#: ../gtk/gtkstock.c:388
+#: gtk/gtkstock.c:388
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: ../gtk/gtkstock.c:389
+#: gtk/gtkstock.c:389
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../gtk/gtkstock.c:390
+#: gtk/gtkstock.c:390
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ../gtk/gtkstock.c:391
+#: gtk/gtkstock.c:391
 msgid "_Preferences"
 msgstr "_Preferencias"
 
-#: ../gtk/gtkstock.c:392
+#: gtk/gtkstock.c:392
 msgid "_Print"
 msgstr "Im_primir"
 
-#: ../gtk/gtkstock.c:393
+#: gtk/gtkstock.c:393
 msgid "Print Pre_view"
 msgstr "Vista pre_via de impresión"
 
-#: ../gtk/gtkstock.c:394
+#: gtk/gtkstock.c:394
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../gtk/gtkstock.c:395
+#: gtk/gtkstock.c:395
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../gtk/gtkstock.c:396
+#: gtk/gtkstock.c:396
 msgid "_Redo"
 msgstr "_Rehacer"
 
-#: ../gtk/gtkstock.c:397
+#: gtk/gtkstock.c:397
 msgid "_Refresh"
 msgstr "_Refrescar"
 
-#: ../gtk/gtkstock.c:399
+#: gtk/gtkstock.c:399
 msgid "_Revert"
 msgstr "_Revertir"
 
-#: ../gtk/gtkstock.c:400
+#: gtk/gtkstock.c:400
 msgid "_Save"
 msgstr "_Guardar"
 
-#: ../gtk/gtkstock.c:401
+#: gtk/gtkstock.c:401
 msgid "Save _As"
 msgstr "Guardar _como"
 
-#: ../gtk/gtkstock.c:402
+#: gtk/gtkstock.c:402
 msgid "_Color"
 msgstr "_Color"
 
-#: ../gtk/gtkstock.c:403
+#: gtk/gtkstock.c:403
 msgid "_Font"
 msgstr "Tipogra_fía"
 
-#: ../gtk/gtkstock.c:404
+#: gtk/gtkstock.c:404
 msgid "_Ascending"
 msgstr "_Ascendente"
 
-#: ../gtk/gtkstock.c:405
+#: gtk/gtkstock.c:405
 msgid "_Descending"
 msgstr "_Descendente"
 
-#: ../gtk/gtkstock.c:406
+#: gtk/gtkstock.c:406
 msgid "_Spell Check"
 msgstr "Comprobar _ortografía"
 
-#: ../gtk/gtkstock.c:407
+#: gtk/gtkstock.c:407
 msgid "_Stop"
 msgstr "_Detener"
 
-#: ../gtk/gtkstock.c:408
+#: gtk/gtkstock.c:408
 msgid "_Strikethrough"
 msgstr "_Tachar"
 
-#: ../gtk/gtkstock.c:409
+#: gtk/gtkstock.c:409
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: ../gtk/gtkstock.c:410
+#: gtk/gtkstock.c:410
 msgid "_Underline"
 msgstr "_Subrayar"
 
-#: ../gtk/gtkstock.c:411
+#: gtk/gtkstock.c:411
 msgid "_Undo"
 msgstr "_Deshacer"
 
-#: ../gtk/gtkstock.c:412
+#: gtk/gtkstock.c:412
 msgid "_Yes"
 msgstr "_Sí"
 
-#: ../gtk/gtkstock.c:413
+#: gtk/gtkstock.c:413
 msgid "_Normal Size"
 msgstr "Tamaño _normal"
 
-#: ../gtk/gtkstock.c:414
+#: gtk/gtkstock.c:414
 msgid "Best _Fit"
 msgstr "Ajuste _óptimo"
 
-#: ../gtk/gtkstock.c:415
+#: gtk/gtkstock.c:415
 msgid "Zoom _In"
 msgstr "_Ampliar"
 
-#: ../gtk/gtkstock.c:416
+#: gtk/gtkstock.c:416
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
-#: ../gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM Marca de _izquierda-a-derecha"
 
-#: ../gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM Marca de _derecha-a-izquierda"
 
-#: ../gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE In_crustamiento de izquierda-a-derecha"
 
-#: ../gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Inc_rustamiento de derecha-a-izquierda"
 
-#: ../gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "_Sobreescritura de izquierda-a-derecha [LRO]"
 
-#: ../gtk/gtktextutil.c:58
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "S_obreescritura de derecha-a-izquierda [RLO]"
 
-#: ../gtk/gtktextutil.c:59
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "Formateo d_ireccional emergente [PDF]"
 
-#: ../gtk/gtktextutil.c:60
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "Espacio de ancho _cero [ZWS]"
 
-#: ../gtk/gtktextutil.c:61
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "En_samblador de ancho cero [ZWJ]"
 
-#: ../gtk/gtktextutil.c:62
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "_No-ensamblador de ancho cero [ZWNJ]"
 
-#: ../gtk/gtkthemes.c:71
+#: gtk/gtkthemes.c:71
 #, c-format
 msgid "Unable to locate theme engine in module_path: \"%s\","
 msgstr "Imposible encontrar el motor de temas en la ruta al _modulo: «%s»,"
 
-#: ../gtk/gtktipsquery.c:186
+#: gtk/gtktipsquery.c:186
 msgid "--- No Tip ---"
 msgstr "-- Sin consejo --"
 
-#: ../gtk/gtkuimanager.c:1154
+#: gtk/gtkuimanager.c:1154
 #, c-format
 msgid "Unknown attribute '%s' on line %d char %d"
 msgstr "Atributo «%s» desconocido en la línea %d, carácter %d"
 
-#: ../gtk/gtkuimanager.c:1371
+#: gtk/gtkuimanager.c:1371
 #, c-format
 msgid "Unexpected start tag '%s' on line %d char %d"
 msgstr "Etiqueta de inicio «%s» inesperada en la línea %d, carácter %d"
 
-#: ../gtk/gtkuimanager.c:1461
+#: gtk/gtkuimanager.c:1461
 #, c-format
 msgid "Unexpected character data on line %d char %d"
 msgstr "Dato carácter inesperado en la línea %d, carácter %d"
 
-#: ../gtk/gtkuimanager.c:2272
+#: gtk/gtkuimanager.c:2272
 msgid "Empty"
 msgstr "Vacío"
 
 #. ID
-#: ../modules/input/imam-et.c:454
+#: modules/input/imam-et.c:454
 msgid "Amharic (EZ+)"
 msgstr "Amhárico (EZ+)"
 
 #. ID
-#: ../modules/input/imcedilla.c:91
+#: modules/input/imcedilla.c:91
 msgid "Cedilla"
 msgstr "Cedilla"
 
 #. ID
-#: ../modules/input/imcyrillic-translit.c:217
+#: modules/input/imcyrillic-translit.c:217
 msgid "Cyrillic (Transliterated)"
 msgstr "Cirílico (Transliterado)"
 
 #. ID
-#: ../modules/input/iminuktitut.c:127
+#: modules/input/iminuktitut.c:127
 msgid "Inuktitut (Transliterated)"
 msgstr "Inuktitut (Transliterado)"
 
 #. ID
-#: ../modules/input/imipa.c:145
+#: modules/input/imipa.c:145
 msgid "IPA"
 msgstr "IPA"
 
 #. ID
-#: ../modules/input/imthai-broken.c:178
+#: modules/input/imthai-broken.c:178
 msgid "Thai (Broken)"
 msgstr "Tailandés (Roto)"
 
 #. ID
-#: ../modules/input/imti-er.c:453
+#: modules/input/imti-er.c:453
 msgid "Tigrigna-Eritrean (EZ+)"
 msgstr "Tigrigna-Eritreo (EZ+)"
 
 #. ID
-#: ../modules/input/imti-et.c:453
+#: modules/input/imti-et.c:453
 msgid "Tigrigna-Ethiopian (EZ+)"
 msgstr "Tigrigna-Etíope (EZ+)"
 
 #. ID
-#: ../modules/input/imviqr.c:244
+#: modules/input/imviqr.c:244
 msgid "Vietnamese (VIQR)"
 msgstr "Vietnamita (VIQR)"
 
 #. ID
-#: ../modules/input/imxim.c:28
+#: modules/input/imxim.c:28
 msgid "X Input Method"
 msgstr "Método de entrada X"
 
-#: ../tests/testfilechooser.c:205
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "No se ha podido obtener información para el archivo «%s» : %s"
diff --git a/po/et.po b/po/et.po
index f2b83ddd1e..b58dd1f18b 100644
--- a/po/et.po
+++ b/po/et.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:26+0000\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-07-08 18:19+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
@@ -22,19 +22,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:153 ../gdk-pixbuf/gdk-pixbuf-io.c:838
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1089 ../tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Tõrge faili '%s' avamisel: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:166 ../gdk-pixbuf/gdk-pixbuf-io.c:850
+#: gdk-pixbuf/gdk-pixbuf-animation.c:166 gdk-pixbuf/gdk-pixbuf-io.c:850
 #, c-format
 msgid "Image file '%s' contains no data"
 msgstr "Pildifaili '%s' ei sisalda andmeid"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:208 ../gdk-pixbuf/gdk-pixbuf-io.c:887
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1130 ../tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -42,7 +42,7 @@ msgstr ""
 "Tõrge pildifaili '%s' laadimisel: põhjus teadmata, arvatavasti on pildifail "
 "rikutud"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:241
+#: gdk-pixbuf/gdk-pixbuf-animation.c:241
 #, c-format
 msgid ""
 "Failed to load animation '%s': reason not known, probably a corrupt "
@@ -51,12 +51,12 @@ msgstr ""
 "Tõrge animatsiooni '%s' laadimisel: põhjuse teadmata, arvatavasti on "
 "animatsioonifail rikutud"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:444
+#: gdk-pixbuf/gdk-pixbuf-io.c:444
 #, c-format
 msgid "Unable to load image-loading module: %s: %s"
 msgstr "Piltide laadimise moodulit pole võimalik laadida: %s: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:459
+#: gdk-pixbuf/gdk-pixbuf-io.c:459
 #, c-format
 msgid ""
 "Image-loading module %s does not export the proper interface; perhaps it's "
@@ -65,53 +65,53 @@ msgstr ""
 "Pildilaadimismoodul '%s' ei väljasta korralikku liidest; võibolla on "
 "tegemist erinevate GTK versioonidega?"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:628 ../gdk-pixbuf/gdk-pixbuf-io.c:680
+#: gdk-pixbuf/gdk-pixbuf-io.c:628 gdk-pixbuf/gdk-pixbuf-io.c:680
 #, c-format
 msgid "Image type '%s' is not supported"
 msgstr "'%s' pilditüüp ei ole toetatud"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:720
+#: gdk-pixbuf/gdk-pixbuf-io.c:720
 #, c-format
 msgid "Couldn't recognize the image file format for file '%s'"
 msgstr "Pildifaili '%s' vormingut ei ole võimalik ära tunda."
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:728
+#: gdk-pixbuf/gdk-pixbuf-io.c:728
 msgid "Unrecognized image file format"
 msgstr "Tundmatu pildifaili vorming"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:896
+#: gdk-pixbuf/gdk-pixbuf-io.c:896
 #, c-format
 msgid "Failed to load image '%s': %s"
 msgstr "Tõrge pildi '%s' laadimisel: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1357
+#: gdk-pixbuf/gdk-pixbuf-io.c:1357
 #, c-format
 msgid "Error writing to image file: %s"
 msgstr "Viga pildifaili kirjutamisel: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1403 ../gdk-pixbuf/gdk-pixbuf-io.c:1532
+#: gdk-pixbuf/gdk-pixbuf-io.c:1403 gdk-pixbuf/gdk-pixbuf-io.c:1532
 #, c-format
 msgid "This build of gdk-pixbuf does not support saving the image format: %s"
 msgstr "See gdk-pixbuf'i build ei toeta %s pildivormingu salvestamist"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1437
+#: gdk-pixbuf/gdk-pixbuf-io.c:1437
 msgid "Insufficient memory to save image to callback"
 msgstr ""
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1449
+#: gdk-pixbuf/gdk-pixbuf-io.c:1449
 msgid "Failed to open temporary file"
 msgstr "Tõrge ajutise faili avamisel"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1474
+#: gdk-pixbuf/gdk-pixbuf-io.c:1474
 msgid "Failed to read from temporary file"
 msgstr "Tõrge ajutisest failist lugemisel"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1708
+#: gdk-pixbuf/gdk-pixbuf-io.c:1708
 #, c-format
 msgid "Failed to open '%s' for writing: %s"
 msgstr "Tõrge faili '%s' avamise kirjutamiseks: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1732
+#: gdk-pixbuf/gdk-pixbuf-io.c:1732
 #, c-format
 msgid ""
 "Failed to close '%s' while writing image, all data may not have been saved: %"
@@ -119,16 +119,16 @@ msgid ""
 msgstr ""
 "Tõrge faili '%s' sulgemisel, kõiki andmeid ei pruugi olla salvestatud: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1952 ../gdk-pixbuf/gdk-pixbuf-io.c:2002
+#: gdk-pixbuf/gdk-pixbuf-io.c:1952 gdk-pixbuf/gdk-pixbuf-io.c:2002
 msgid "Insufficient memory to save image into a buffer"
 msgstr "Pildi puhvrisse salvestamiseks pole piisavalt mälu"
 
-#: ../gdk-pixbuf/gdk-pixbuf-loader.c:383
+#: gdk-pixbuf/gdk-pixbuf-loader.c:383
 #, c-format
 msgid "Incremental loading of image type '%s' is not supported"
 msgstr "Osade kaupa laadimine pole %s pilditüübi puhul toetatud"
 
-#: ../gdk-pixbuf/gdk-pixbuf-loader.c:411 ../gdk-pixbuf/gdk-pixbuf-loader.c:513
+#: gdk-pixbuf/gdk-pixbuf-loader.c:411 gdk-pixbuf/gdk-pixbuf-loader.c:513
 #, c-format
 msgid ""
 "Internal error: Image loader module '%s' failed to begin loading an image, "
@@ -137,203 +137,198 @@ msgstr ""
 "Sisemine viga: Pildilaadimismooduli '%s' tõrge pildi laadimisel, tõrke "
 "põhjust moodul ei teatanud."
 
-#: ../gdk-pixbuf/gdk-pixdata.c:147
+#: gdk-pixbuf/gdk-pixdata.c:147
 msgid "Image header corrupt"
 msgstr "Pildi päis on rikutud"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:152
+#: gdk-pixbuf/gdk-pixdata.c:152
 msgid "Image format unknown"
 msgstr "Pildi vorming on tundmatu"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:157 ../gdk-pixbuf/gdk-pixdata.c:487
+#: gdk-pixbuf/gdk-pixdata.c:157 gdk-pixbuf/gdk-pixdata.c:487
 msgid "Image pixel data corrupt"
 msgstr "Pildi piksliandmed on rikutud"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:431
+#: gdk-pixbuf/gdk-pixdata.c:431
 #, c-format
 msgid "failed to allocate image buffer of %u byte"
 msgid_plural "failed to allocate image buffer of %u bytes"
 msgstr[0] "tõrge pildipuhvrile %u baidi eraldamisel"
 msgstr[1] "tõrge pildipuhvrile %u baidi eraldamisel"
 
-#: ../gdk-pixbuf/io-ani.c:244
+#: gdk-pixbuf/io-ani.c:244
 msgid "Unexpected icon chunk in animation"
 msgstr ""
 
-#: ../gdk-pixbuf/io-ani.c:337
+#: gdk-pixbuf/io-ani.c:337
 msgid "Unsupported animation type"
 msgstr "Animatsioonitüüp ei ole toetatud"
 
-#: ../gdk-pixbuf/io-ani.c:348 ../gdk-pixbuf/io-ani.c:538
+#: gdk-pixbuf/io-ani.c:348 gdk-pixbuf/io-ani.c:538
 msgid "Invalid header in animation"
 msgstr "Vigane päis animatsioonis"
 
-#: ../gdk-pixbuf/io-ani.c:358 ../gdk-pixbuf/io-ani.c:382
-#: ../gdk-pixbuf/io-ani.c:441 ../gdk-pixbuf/io-ani.c:460
-#: ../gdk-pixbuf/io-ani.c:511 ../gdk-pixbuf/io-ani.c:583
+#: gdk-pixbuf/io-ani.c:358 gdk-pixbuf/io-ani.c:382 gdk-pixbuf/io-ani.c:441
+#: gdk-pixbuf/io-ani.c:460 gdk-pixbuf/io-ani.c:511 gdk-pixbuf/io-ani.c:583
 msgid "Not enough memory to load animation"
 msgstr "Animatsiooni laadimiseks ei ole piisavalt mälu"
 
-#: ../gdk-pixbuf/io-ani.c:400 ../gdk-pixbuf/io-ani.c:417
-#: ../gdk-pixbuf/io-ani.c:428
+#: gdk-pixbuf/io-ani.c:400 gdk-pixbuf/io-ani.c:417 gdk-pixbuf/io-ani.c:428
 msgid "Malformed chunk in animation"
 msgstr ""
 
-#: ../gdk-pixbuf/io-ani.c:676
+#: gdk-pixbuf/io-ani.c:676
 msgid "The ANI image format"
 msgstr "ANI pildivorming"
 
-#: ../gdk-pixbuf/io-bmp.c:228 ../gdk-pixbuf/io-bmp.c:306
-#: ../gdk-pixbuf/io-bmp.c:338 ../gdk-pixbuf/io-bmp.c:361
-#: ../gdk-pixbuf/io-bmp.c:442
+#: gdk-pixbuf/io-bmp.c:228 gdk-pixbuf/io-bmp.c:306 gdk-pixbuf/io-bmp.c:338
+#: gdk-pixbuf/io-bmp.c:361 gdk-pixbuf/io-bmp.c:442
 msgid "BMP image has bogus header data"
 msgstr "BMP pilt omas võltse päiseandmeid"
 
-#: ../gdk-pixbuf/io-bmp.c:239 ../gdk-pixbuf/io-bmp.c:401
+#: gdk-pixbuf/io-bmp.c:239 gdk-pixbuf/io-bmp.c:401
 msgid "Not enough memory to load bitmap image"
 msgstr "Rastergraafikapildi laadimiseks pole piisavalt mälu"
 
-#: ../gdk-pixbuf/io-bmp.c:287
+#: gdk-pixbuf/io-bmp.c:287
 msgid "BMP image has unsupported header size"
 msgstr "BMP pilt omas toetamata suurusega päist"
 
-#: ../gdk-pixbuf/io-bmp.c:325
+#: gdk-pixbuf/io-bmp.c:325
 msgid "Topdown BMP images cannot be compressed"
 msgstr "Ülalt-alla BMP pilte pole võimalik pakkida"
 
-#: ../gdk-pixbuf/io-bmp.c:1203
+#: gdk-pixbuf/io-bmp.c:1203
 msgid "Couldn't allocate memory for saving BMP file"
 msgstr "BMP faili salvestamiseks pole võimalik mälu eraldada"
 
-#: ../gdk-pixbuf/io-bmp.c:1244
+#: gdk-pixbuf/io-bmp.c:1244
 msgid "Couldn't write to BMP file"
 msgstr "BMP faili pole võimalik kirjutada"
 
-#: ../gdk-pixbuf/io-bmp.c:1293
+#: gdk-pixbuf/io-bmp.c:1293
 msgid "The BMP image format"
 msgstr "BMP pildivorming"
 
-#: ../gdk-pixbuf/io-gif.c:220
+#: gdk-pixbuf/io-gif.c:220
 #, c-format
 msgid "Failure reading GIF: %s"
 msgstr "Viga GIF faili lugemisel: %s"
 
-#: ../gdk-pixbuf/io-gif.c:492 ../gdk-pixbuf/io-gif.c:1463
-#: ../gdk-pixbuf/io-gif.c:1624
+#: gdk-pixbuf/io-gif.c:492 gdk-pixbuf/io-gif.c:1463 gdk-pixbuf/io-gif.c:1624
 msgid "GIF file was missing some data (perhaps it was truncated somehow?)"
 msgstr "GIF failis on mõningad andmed puudu (kas seda on kuidagi tükeldatud?)"
 
-#: ../gdk-pixbuf/io-gif.c:501
+#: gdk-pixbuf/io-gif.c:501
 #, c-format
 msgid "Internal error in the GIF loader (%s)"
 msgstr "Sisemine viga GIF laadijas (%s)"
 
-#: ../gdk-pixbuf/io-gif.c:575
+#: gdk-pixbuf/io-gif.c:575
 msgid "Stack overflow"
 msgstr "Pinu ületäituvus"
 
-#: ../gdk-pixbuf/io-gif.c:635
+#: gdk-pixbuf/io-gif.c:635
 msgid "GIF image loader cannot understand this image."
 msgstr "GIF pildifaili laadija ei saa sellest pildist aru. "
 
-#: ../gdk-pixbuf/io-gif.c:664
+#: gdk-pixbuf/io-gif.c:664
 msgid "Bad code encountered"
 msgstr ""
 
-#: ../gdk-pixbuf/io-gif.c:674
+#: gdk-pixbuf/io-gif.c:674
 msgid "Circular table entry in GIF file"
 msgstr ""
 
-#: ../gdk-pixbuf/io-gif.c:862 ../gdk-pixbuf/io-gif.c:1451
-#: ../gdk-pixbuf/io-gif.c:1497 ../gdk-pixbuf/io-gif.c:1612
+#: gdk-pixbuf/io-gif.c:862 gdk-pixbuf/io-gif.c:1451 gdk-pixbuf/io-gif.c:1497
+#: gdk-pixbuf/io-gif.c:1612
 msgid "Not enough memory to load GIF file"
 msgstr "GIF faili laadimiseks ei ole piisavalt mälu"
 
-#: ../gdk-pixbuf/io-gif.c:947
+#: gdk-pixbuf/io-gif.c:947
 msgid "Not enough memory to composite a frame in GIF file"
 msgstr ""
 
-#: ../gdk-pixbuf/io-gif.c:1116
+#: gdk-pixbuf/io-gif.c:1116
 msgid "GIF image is corrupt (incorrect LZW compression)"
 msgstr "GIF pilt on rikutud (mittekorrektne LZW pakkimine)"
 
-#: ../gdk-pixbuf/io-gif.c:1166
+#: gdk-pixbuf/io-gif.c:1166
 msgid "File does not appear to be a GIF file"
 msgstr "Fail ei tundu olevat GIF fail"
 
-#: ../gdk-pixbuf/io-gif.c:1178
+#: gdk-pixbuf/io-gif.c:1178
 #, c-format
 msgid "Version %s of the GIF file format is not supported"
 msgstr "GIF failiformaadi %s versioon ei ole toetatud"
 
-#: ../gdk-pixbuf/io-gif.c:1287
+#: gdk-pixbuf/io-gif.c:1287
 msgid ""
 "GIF image has no global colormap, and a frame inside it has no local "
 "colormap."
 msgstr ""
 "GIF pildil puudub üldine värvikaart ja raami sees pole kohalikku värvikaarti."
 
-#: ../gdk-pixbuf/io-gif.c:1519
+#: gdk-pixbuf/io-gif.c:1519
 msgid "GIF image was truncated or incomplete."
 msgstr "GIF pilt pole täielik või on seda tükeldatud."
 
-#: ../gdk-pixbuf/io-gif.c:1671
+#: gdk-pixbuf/io-gif.c:1671
 msgid "The GIF image format"
 msgstr "GIF failivorming"
 
-#: ../gdk-pixbuf/io-ico.c:219 ../gdk-pixbuf/io-ico.c:271
-#: ../gdk-pixbuf/io-ico.c:340 ../gdk-pixbuf/io-ico.c:403
-#: ../gdk-pixbuf/io-ico.c:433
+#: gdk-pixbuf/io-ico.c:219 gdk-pixbuf/io-ico.c:271 gdk-pixbuf/io-ico.c:340
+#: gdk-pixbuf/io-ico.c:403 gdk-pixbuf/io-ico.c:433
 msgid "Not enough memory to load icon"
 msgstr "Ikooni laadimiseks ei ole piisavalt mälu"
 
-#: ../gdk-pixbuf/io-ico.c:256 ../gdk-pixbuf/io-ico.c:330
+#: gdk-pixbuf/io-ico.c:256 gdk-pixbuf/io-ico.c:330
 msgid "Invalid header in icon"
 msgstr "Vigane päis ikoonis"
 
-#: ../gdk-pixbuf/io-ico.c:293
+#: gdk-pixbuf/io-ico.c:293
 msgid "Icon has zero width"
 msgstr "Ikoonil on null-laius"
 
-#: ../gdk-pixbuf/io-ico.c:303
+#: gdk-pixbuf/io-ico.c:303
 msgid "Icon has zero height"
 msgstr "Ikoonil on null-kõrgus"
 
-#: ../gdk-pixbuf/io-ico.c:355
+#: gdk-pixbuf/io-ico.c:355
 msgid "Compressed icons are not supported"
 msgstr "Pakitud ikoonid ei ole toetatud"
 
-#: ../gdk-pixbuf/io-ico.c:388
+#: gdk-pixbuf/io-ico.c:388
 msgid "Unsupported icon type"
 msgstr "Toetamata ikoonitüüp"
 
-#: ../gdk-pixbuf/io-ico.c:482
+#: gdk-pixbuf/io-ico.c:482
 msgid "Not enough memory to load ICO file"
 msgstr "ICO faili laadimiseks ei ole piisavalt mälu"
 
-#: ../gdk-pixbuf/io-ico.c:947
+#: gdk-pixbuf/io-ico.c:947
 msgid "Image too large to be saved as ICO"
 msgstr "Pilt on ICO vormingus salvestamiseks liiga suur"
 
-#: ../gdk-pixbuf/io-ico.c:958
+#: gdk-pixbuf/io-ico.c:958
 msgid "Cursor hotspot outside image"
 msgstr ""
 
-#: ../gdk-pixbuf/io-ico.c:981
+#: gdk-pixbuf/io-ico.c:981
 #, c-format
 msgid "Unsupported depth for ICO file: %d"
 msgstr "Toetamata värvisügavus %d ICO faili jaoks."
 
-#: ../gdk-pixbuf/io-ico.c:1210
+#: gdk-pixbuf/io-ico.c:1210
 msgid "The ICO image format"
 msgstr "ICO pildivorming"
 
-#: ../gdk-pixbuf/io-jpeg.c:114
+#: gdk-pixbuf/io-jpeg.c:114
 #, c-format
 msgid "Error interpreting JPEG image file (%s)"
 msgstr "Viga JPEG pildifaili (%s) tõlgendamisel"
 
-#: ../gdk-pixbuf/io-jpeg.c:349
+#: gdk-pixbuf/io-jpeg.c:349
 msgid ""
 "Insufficient memory to load image, try exiting some applications to free "
 "memory"
@@ -341,17 +336,17 @@ msgstr ""
 "Pildifaili laadimiseks pole piisavalt mälu. Mälu vabastamiseks võid sa "
 "proovida sulgeda mõned rakendused"
 
-#: ../gdk-pixbuf/io-jpeg.c:383 ../gdk-pixbuf/io-jpeg.c:749
+#: gdk-pixbuf/io-jpeg.c:383 gdk-pixbuf/io-jpeg.c:749
 #, c-format
 msgid "Unsupported JPEG color space (%s)"
 msgstr "Toetamata JPEG värvituum (%s)"
 
-#: ../gdk-pixbuf/io-jpeg.c:481 ../gdk-pixbuf/io-jpeg.c:678
-#: ../gdk-pixbuf/io-jpeg.c:943 ../gdk-pixbuf/io-jpeg.c:952
+#: gdk-pixbuf/io-jpeg.c:481 gdk-pixbuf/io-jpeg.c:678 gdk-pixbuf/io-jpeg.c:943
+#: gdk-pixbuf/io-jpeg.c:952
 msgid "Couldn't allocate memory for loading JPEG file"
 msgstr "JPEG faili laadimiseks pole võimalik mälu eraldada"
 
-#: ../gdk-pixbuf/io-jpeg.c:894
+#: gdk-pixbuf/io-jpeg.c:894
 #, c-format
 msgid ""
 "JPEG quality must be a value between 0 and 100; value '%s' could not be "
@@ -360,7 +355,7 @@ msgstr ""
 "JPEG kvaliteedi väärtus peab olema 0 ja 100 vahel; väärtust '%s' ei ole "
 "võimalik analüüsida."
 
-#: ../gdk-pixbuf/io-jpeg.c:909
+#: gdk-pixbuf/io-jpeg.c:909
 #, c-format
 msgid ""
 "JPEG quality must be a value between 0 and 100; value '%d' is not allowed."
@@ -368,112 +363,113 @@ msgstr ""
 "JPEG kvaliteedi väärtus peab olema 0 ja 100 vahel; väärtus '%d' ei ole "
 "lubatud."
 
-#: ../gdk-pixbuf/io-jpeg.c:1071
+#: gdk-pixbuf/io-jpeg.c:1071
 msgid "The JPEG image format"
 msgstr "JPEG pildivorming"
 
-#: ../gdk-pixbuf/io-pcx.c:191
+#: gdk-pixbuf/io-pcx.c:191
 msgid "Couldn't allocate memory for header"
 msgstr "Päise jaoks pole võimalik mälu eraldada"
 
-#: ../gdk-pixbuf/io-pcx.c:206 ../gdk-pixbuf/io-pcx.c:566
+#: gdk-pixbuf/io-pcx.c:206 gdk-pixbuf/io-pcx.c:566
 msgid "Couldn't allocate memory for context buffer"
 msgstr "Kontekstipuhvri jaoks pole võimalik mälu eraldada"
 
-#: ../gdk-pixbuf/io-pcx.c:607
+#: gdk-pixbuf/io-pcx.c:607
 msgid "Image has invalid width and/or height"
 msgstr "Pildil on vigane laius ja/või kõrgus"
 
-#: ../gdk-pixbuf/io-pcx.c:619 ../gdk-pixbuf/io-pcx.c:680
+#: gdk-pixbuf/io-pcx.c:619 gdk-pixbuf/io-pcx.c:680
 msgid "Image has unsupported bpp"
 msgstr ""
 
-#: ../gdk-pixbuf/io-pcx.c:624 ../gdk-pixbuf/io-pcx.c:632
+#: gdk-pixbuf/io-pcx.c:624 gdk-pixbuf/io-pcx.c:632
 #, c-format
 msgid "Image has unsupported number of %d-bit planes"
 msgstr ""
 
-#: ../gdk-pixbuf/io-pcx.c:648
+#: gdk-pixbuf/io-pcx.c:648
 msgid "Couldn't create new pixbuf"
 msgstr ""
 
-#: ../gdk-pixbuf/io-pcx.c:656
+#: gdk-pixbuf/io-pcx.c:656
 msgid "Couldn't allocate memory for line data"
 msgstr "Joone andmetele pole võimalik mälu eraldada"
 
-#: ../gdk-pixbuf/io-pcx.c:663
+#: gdk-pixbuf/io-pcx.c:663
 msgid "Couldn't allocate memory for paletted data"
 msgstr "Paleti andmetele pole võimalik mälu eraldada"
 
-#: ../gdk-pixbuf/io-pcx.c:710
+#: gdk-pixbuf/io-pcx.c:710
 msgid "Didn't get all lines of PCX image"
 msgstr ""
 
-#: ../gdk-pixbuf/io-pcx.c:717
+#: gdk-pixbuf/io-pcx.c:717
 msgid "No palette found at end of PCX data"
 msgstr ""
 
-#: ../gdk-pixbuf/io-pcx.c:758
+#: gdk-pixbuf/io-pcx.c:758
 msgid "The PCX image format"
 msgstr "PCX pildivorming"
 
-#: ../gdk-pixbuf/io-png.c:55
+#: gdk-pixbuf/io-png.c:55
 msgid "Bits per channel of PNG image is invalid."
 msgstr "Bittide arv PNG faili kanalis on vigane."
 
-#: ../gdk-pixbuf/io-png.c:136
+#: gdk-pixbuf/io-png.c:136
 msgid "Transformed PNG has zero width or height."
 msgstr "Transformeeritud PNG laius või kõrgus on null."
 
-#: ../gdk-pixbuf/io-png.c:144
+#: gdk-pixbuf/io-png.c:144
 msgid "Bits per channel of transformed PNG is not 8."
 msgstr "Bittide arv transformeeritud PNG kanali kohta ei ole 8."
 
-#: ../gdk-pixbuf/io-png.c:153
+#: gdk-pixbuf/io-png.c:153
 msgid "Transformed PNG not RGB or RGBA."
 msgstr "Transformeeritud PNG ei ole RGB ega RGBA."
 
-#: ../gdk-pixbuf/io-png.c:162
+#: gdk-pixbuf/io-png.c:162
 msgid "Transformed PNG has unsupported number of channels, must be 3 or 4."
 msgstr ""
 "Transformeeritud PNG omab toetamata arvu kanaleid, peaks olema 3 või 4."
 
-#: ../gdk-pixbuf/io-png.c:183
+#: gdk-pixbuf/io-png.c:183
 #, c-format
 msgid "Fatal error in PNG image file: %s"
 msgstr "Saatuslik viga PNG pildifailis: %s"
 
-#: ../gdk-pixbuf/io-png.c:301
+#: gdk-pixbuf/io-png.c:301
 msgid "Insufficient memory to load PNG file"
 msgstr "PNG faili laadimiseks pole piisavalt mälu"
 
-#: ../gdk-pixbuf/io-png.c:618
+#: gdk-pixbuf/io-png.c:618
 #, c-format
 msgid ""
 "Insufficient memory to store a %ld by %ld image; try exiting some "
 "applications to reduce memory usage"
 msgstr ""
-"%ldx%ld suurusega pildi salvestamiseks pole piisavalt mälu. Mälukasutuse vähendamiseks võid sa proovida mõnede rakenduste sulgemist"
+"%ldx%ld suurusega pildi salvestamiseks pole piisavalt mälu. Mälukasutuse "
+"vähendamiseks võid sa proovida mõnede rakenduste sulgemist"
 
-#: ../gdk-pixbuf/io-png.c:669
+#: gdk-pixbuf/io-png.c:669
 msgid "Fatal error reading PNG image file"
 msgstr "Saatuslik viga PNG pildifaili lugemisel"
 
-#: ../gdk-pixbuf/io-png.c:718
+#: gdk-pixbuf/io-png.c:718
 #, c-format
 msgid "Fatal error reading PNG image file: %s"
 msgstr "Saatuslik viga PNG pildifaili lugemisel: %s"
 
-#: ../gdk-pixbuf/io-png.c:810
+#: gdk-pixbuf/io-png.c:810
 msgid ""
 "Keys for PNG text chunks must have at least 1 and at most 79 characters."
 msgstr ""
 
-#: ../gdk-pixbuf/io-png.c:818
+#: gdk-pixbuf/io-png.c:818
 msgid "Keys for PNG text chunks must be ASCII characters."
 msgstr ""
 
-#: ../gdk-pixbuf/io-png.c:831
+#: gdk-pixbuf/io-png.c:831
 #, c-format
 msgid ""
 "PNG compression level must be a value between 0 and 9; value '%s' could not "
@@ -482,333 +478,330 @@ msgstr ""
 "PNG pakkimistase peab olema 0 ja 9 vahel; väärtust '%s' pole võimalik "
 "analüüsida."
 
-#: ../gdk-pixbuf/io-png.c:843
+#: gdk-pixbuf/io-png.c:843
 #, c-format
 msgid ""
 "PNG compression level must be a value between 0 and 9; value '%d' is not "
 "allowed."
 msgstr "PNG pakkimistase peab olema 0 ja 9 vahel; väärtus '%d' pole lubatud."
 
-#: ../gdk-pixbuf/io-png.c:883
+#: gdk-pixbuf/io-png.c:883
 #, c-format
 msgid "Value for PNG text chunk %s cannot be converted to ISO-8859-1 encoding."
 msgstr ""
 
-#: ../gdk-pixbuf/io-png.c:1026
+#: gdk-pixbuf/io-png.c:1026
 msgid "The PNG image format"
 msgstr "PNG pildivorming"
 
-#: ../gdk-pixbuf/io-pnm.c:252
+#: gdk-pixbuf/io-pnm.c:252
 msgid "PNM loader expected to find an integer, but didn't"
 msgstr "PNM laadur lootis leida täisarvu, kuid ei leidnud"
 
-#: ../gdk-pixbuf/io-pnm.c:284
+#: gdk-pixbuf/io-pnm.c:284
 msgid "PNM file has an incorrect initial byte"
 msgstr "PNM failil on ebakorrektne algbait"
 
-#: ../gdk-pixbuf/io-pnm.c:314
+#: gdk-pixbuf/io-pnm.c:314
 msgid "PNM file is not in a recognized PNM subformat"
 msgstr "PNM fail ei ole äratuntavas PNM alamvormingus"
 
-#: ../gdk-pixbuf/io-pnm.c:339
+#: gdk-pixbuf/io-pnm.c:339
 msgid "PNM file has an image width of 0"
 msgstr "PNM failil on pildi laius 0"
 
-#: ../gdk-pixbuf/io-pnm.c:360
+#: gdk-pixbuf/io-pnm.c:360
 msgid "PNM file has an image height of 0"
 msgstr "PNM failil on pildi kõrgus 0"
 
-#: ../gdk-pixbuf/io-pnm.c:383
+#: gdk-pixbuf/io-pnm.c:383
 msgid "Maximum color value in PNM file is 0"
 msgstr "Maksimaalne suurim värvi väärtus PNM failis on 0"
 
-#: ../gdk-pixbuf/io-pnm.c:391
+#: gdk-pixbuf/io-pnm.c:391
 msgid "Maximum color value in PNM file is too large"
 msgstr "Maksimaalne suurim värvi väärtus PNM failis on liiga suur"
 
-#: ../gdk-pixbuf/io-pnm.c:399
+#: gdk-pixbuf/io-pnm.c:399
 msgid "Cannot handle PNM files with maximum color values greater than 255"
 msgstr "PNM faile rohkem kui 255 värviga pole võimalik käsitleda"
 
-#: ../gdk-pixbuf/io-pnm.c:438 ../gdk-pixbuf/io-pnm.c:466
-#: ../gdk-pixbuf/io-pnm.c:498
+#: gdk-pixbuf/io-pnm.c:438 gdk-pixbuf/io-pnm.c:466 gdk-pixbuf/io-pnm.c:498
 msgid "Raw PNM image type is invalid"
 msgstr "Toore PNM faili tüüp on vigane"
 
-#: ../gdk-pixbuf/io-pnm.c:562 ../gdk-pixbuf/io-pnm.c:604
+#: gdk-pixbuf/io-pnm.c:562 gdk-pixbuf/io-pnm.c:604
 msgid "PNM image format is invalid"
 msgstr "PNM pildivorming on vigane"
 
-#: ../gdk-pixbuf/io-pnm.c:663
+#: gdk-pixbuf/io-pnm.c:663
 msgid "PNM image loader does not support this PNM subformat"
 msgstr "PNM pildivormingu laadija ei toeta seda PNM'i alamvormingut"
 
-#: ../gdk-pixbuf/io-pnm.c:718
+#: gdk-pixbuf/io-pnm.c:718
 msgid "Premature end-of-file encountered"
 msgstr ""
 
-#: ../gdk-pixbuf/io-pnm.c:750 ../gdk-pixbuf/io-pnm.c:981
+#: gdk-pixbuf/io-pnm.c:750 gdk-pixbuf/io-pnm.c:981
 msgid "Raw PNM formats require exactly one whitespace before sample data"
 msgstr ""
 
-#: ../gdk-pixbuf/io-pnm.c:777
+#: gdk-pixbuf/io-pnm.c:777
 msgid "Cannot allocate memory for loading PNM image"
 msgstr "PNM faili laadimiseks pole võimalik mälu eraldada"
 
-#: ../gdk-pixbuf/io-pnm.c:827
+#: gdk-pixbuf/io-pnm.c:827
 msgid "Insufficient memory to load PNM context struct"
 msgstr "PNM kontekstistruktuuri laadimiseks pole piisavalt mälu"
 
-#: ../gdk-pixbuf/io-pnm.c:878
+#: gdk-pixbuf/io-pnm.c:878
 msgid "Unexpected end of PNM image data"
 msgstr "Ootamatu PNM pildi andmete lõpp"
 
-#: ../gdk-pixbuf/io-pnm.c:1010
+#: gdk-pixbuf/io-pnm.c:1010
 msgid "Insufficient memory to load PNM file"
 msgstr "PNM faili laadimiseks pole piisavalt mälu"
 
-#: ../gdk-pixbuf/io-pnm.c:1089
+#: gdk-pixbuf/io-pnm.c:1089
 msgid "The PNM/PBM/PGM/PPM image format family"
 msgstr "PNM/PBM/PGM/PPM pildivormingu perekond"
 
-#: ../gdk-pixbuf/io-ras.c:126
+#: gdk-pixbuf/io-ras.c:126
 msgid "RAS image has bogus header data"
 msgstr ""
 
-#: ../gdk-pixbuf/io-ras.c:148
+#: gdk-pixbuf/io-ras.c:148
 msgid "RAS image has unknown type"
 msgstr "RAS pildil on tundmatu tüüp"
 
-#: ../gdk-pixbuf/io-ras.c:156
+#: gdk-pixbuf/io-ras.c:156
 msgid "unsupported RAS image variation"
 msgstr ""
 
-#: ../gdk-pixbuf/io-ras.c:171 ../gdk-pixbuf/io-ras.c:200
+#: gdk-pixbuf/io-ras.c:171 gdk-pixbuf/io-ras.c:200
 msgid "Not enough memory to load RAS image"
 msgstr "Ebapiisav mälu RAS pildi laadimiseks"
 
-#: ../gdk-pixbuf/io-ras.c:543
+#: gdk-pixbuf/io-ras.c:543
 msgid "The Sun raster image format"
 msgstr "Sun rastripildivorming"
 
-#: ../gdk-pixbuf/io-tga.c:154
+#: gdk-pixbuf/io-tga.c:154
 msgid "Cannot allocate memory for IOBuffer struct"
 msgstr "IOBuffer struktuuri jaoks pole võimalik mälu eraldada"
 
-#: ../gdk-pixbuf/io-tga.c:173
+#: gdk-pixbuf/io-tga.c:173
 msgid "Cannot allocate memory for IOBuffer data"
 msgstr "IOBuffer andmete jaoks pole võimalik mälu eraldada"
 
-#: ../gdk-pixbuf/io-tga.c:184
+#: gdk-pixbuf/io-tga.c:184
 msgid "Cannot realloc IOBuffer data"
 msgstr ""
 
-#: ../gdk-pixbuf/io-tga.c:214
+#: gdk-pixbuf/io-tga.c:214
 msgid "Cannot allocate temporary IOBuffer data"
 msgstr "IOBuffer"
 
-#: ../gdk-pixbuf/io-tga.c:348
+#: gdk-pixbuf/io-tga.c:348
 msgid "Cannot allocate new pixbuf"
 msgstr ""
 
-#: ../gdk-pixbuf/io-tga.c:689
+#: gdk-pixbuf/io-tga.c:689
 msgid "Cannot allocate colormap structure"
 msgstr "Värvikaardi struktuurile pole võimalik mälu eraldada"
 
-#: ../gdk-pixbuf/io-tga.c:696
+#: gdk-pixbuf/io-tga.c:696
 msgid "Cannot allocate colormap entries"
 msgstr "Värvikaardi kirjetele pole võimalik mälu eraldada"
 
-#: ../gdk-pixbuf/io-tga.c:718
+#: gdk-pixbuf/io-tga.c:718
 msgid "Unexpected bitdepth for colormap entries"
 msgstr ""
 
-#: ../gdk-pixbuf/io-tga.c:736
+#: gdk-pixbuf/io-tga.c:736
 msgid "Cannot allocate TGA header memory"
 msgstr "TGA päisele pole võimalik mälu eraldada"
 
-#: ../gdk-pixbuf/io-tga.c:769
+#: gdk-pixbuf/io-tga.c:769
 msgid "TGA image has invalid dimensions"
 msgstr "TGA pildil on vigane suurus"
 
-#: ../gdk-pixbuf/io-tga.c:775 ../gdk-pixbuf/io-tga.c:784
-#: ../gdk-pixbuf/io-tga.c:794 ../gdk-pixbuf/io-tga.c:804
-#: ../gdk-pixbuf/io-tga.c:811
+#: gdk-pixbuf/io-tga.c:775 gdk-pixbuf/io-tga.c:784 gdk-pixbuf/io-tga.c:794
+#: gdk-pixbuf/io-tga.c:804 gdk-pixbuf/io-tga.c:811
 msgid "TGA image type not supported"
 msgstr "TGA pilditüüp ei ole toetatud"
 
-#: ../gdk-pixbuf/io-tga.c:858
+#: gdk-pixbuf/io-tga.c:858
 msgid "Cannot allocate memory for TGA context struct"
 msgstr "TGA kontekstistruktuuri jaoks pole võimalik mälu eraldada"
 
-#: ../gdk-pixbuf/io-tga.c:923
+#: gdk-pixbuf/io-tga.c:923
 msgid "Excess data in file"
 msgstr "Failis on liigsed andmed"
 
-#: ../gdk-pixbuf/io-tga.c:992
+#: gdk-pixbuf/io-tga.c:992
 msgid "The Targa image format"
 msgstr "Targa pildivorming"
 
-#: ../gdk-pixbuf/io-tiff.c:173
+#: gdk-pixbuf/io-tiff.c:173
 msgid "Could not get image width (bad TIFF file)"
 msgstr "Ei suuda saada pildi laiust (vigane TIFF fail)"
 
-#: ../gdk-pixbuf/io-tiff.c:180
+#: gdk-pixbuf/io-tiff.c:180
 msgid "Could not get image height (bad TIFF file)"
 msgstr "Ei suuda saada pildi kõrgust (vigane TIFF fail)"
 
-#: ../gdk-pixbuf/io-tiff.c:188
+#: gdk-pixbuf/io-tiff.c:188
 msgid "Width or height of TIFF image is zero"
 msgstr "TIFF pildi laius või kõrgus on null"
 
-#: ../gdk-pixbuf/io-tiff.c:197 ../gdk-pixbuf/io-tiff.c:206
+#: gdk-pixbuf/io-tiff.c:197 gdk-pixbuf/io-tiff.c:206
 msgid "Dimensions of TIFF image too large"
 msgstr "TIFF pildi mõõtmed on liiga suured"
 
-#: ../gdk-pixbuf/io-tiff.c:225 ../gdk-pixbuf/io-tiff.c:237
-#: ../gdk-pixbuf/io-tiff.c:286 ../gdk-pixbuf/io-tiff.c:572
+#: gdk-pixbuf/io-tiff.c:225 gdk-pixbuf/io-tiff.c:237 gdk-pixbuf/io-tiff.c:286
+#: gdk-pixbuf/io-tiff.c:572
 msgid "Insufficient memory to open TIFF file"
 msgstr "TIFF faili avamiseks pole piisavalt mälu"
 
-#: ../gdk-pixbuf/io-tiff.c:251 ../gdk-pixbuf/io-tiff.c:294
+#: gdk-pixbuf/io-tiff.c:251 gdk-pixbuf/io-tiff.c:294
 msgid "Failed to load RGB data from TIFF file"
 msgstr ""
 
-#: ../gdk-pixbuf/io-tiff.c:361
+#: gdk-pixbuf/io-tiff.c:361
 msgid "Failed to open TIFF image"
 msgstr "Tõrge TIFF faili avamisel"
 
-#: ../gdk-pixbuf/io-tiff.c:373
+#: gdk-pixbuf/io-tiff.c:373
 msgid "TIFFClose operation failed"
 msgstr "TIFFSulgemisoperatsioon nurjus"
 
-#: ../gdk-pixbuf/io-tiff.c:504 ../gdk-pixbuf/io-tiff.c:517
+#: gdk-pixbuf/io-tiff.c:504 gdk-pixbuf/io-tiff.c:517
 msgid "Failed to load TIFF image"
 msgstr "Tõrge TIFF faili laadimisel"
 
-#: ../gdk-pixbuf/io-tiff.c:610
+#: gdk-pixbuf/io-tiff.c:610
 msgid "The TIFF image format"
 msgstr "TIFF pildivorming"
 
-#: ../gdk-pixbuf/io-wbmp.c:246
+#: gdk-pixbuf/io-wbmp.c:246
 msgid "Image has zero width"
 msgstr "Pildi laius on null"
 
-#: ../gdk-pixbuf/io-wbmp.c:264
+#: gdk-pixbuf/io-wbmp.c:264
 msgid "Image has zero height"
 msgstr "Pildi kõrgus on null"
 
-#: ../gdk-pixbuf/io-wbmp.c:275
+#: gdk-pixbuf/io-wbmp.c:275
 msgid "Not enough memory to load image"
 msgstr "Ebapiisav mälu pildi laadimiseks"
 
-#: ../gdk-pixbuf/io-wbmp.c:334
+#: gdk-pixbuf/io-wbmp.c:334
 msgid "Couldn't save the rest"
 msgstr ""
 
-#: ../gdk-pixbuf/io-wbmp.c:368
+#: gdk-pixbuf/io-wbmp.c:368
 msgid "The WBMP image format"
 msgstr "WBMP pildivorming"
 
-#: ../gdk-pixbuf/io-xbm.c:287
+#: gdk-pixbuf/io-xbm.c:287
 msgid "Invalid XBM file"
 msgstr "Vigane XBM fail"
 
-#: ../gdk-pixbuf/io-xbm.c:297
+#: gdk-pixbuf/io-xbm.c:297
 msgid "Insufficient memory to load XBM image file"
 msgstr "XBM pildifaili laadimiseks pole piisavalt mälu"
 
-#: ../gdk-pixbuf/io-xbm.c:441
+#: gdk-pixbuf/io-xbm.c:441
 msgid "Failed to write to temporary file when loading XBM image"
 msgstr "Tõrge XBM pildi laadimise käigus ajutisse faili kirjutamisel"
 
-#: ../gdk-pixbuf/io-xbm.c:476
+#: gdk-pixbuf/io-xbm.c:476
 msgid "The XBM image format"
 msgstr "XBM pildivorming"
 
-#: ../gdk-pixbuf/io-xpm.c:467
+#: gdk-pixbuf/io-xpm.c:467
 msgid "No XPM header found"
 msgstr "XPM päist ei leitud"
 
-#: ../gdk-pixbuf/io-xpm.c:476
+#: gdk-pixbuf/io-xpm.c:476
 msgid "Invalid XPM header"
 msgstr "Vigane XPM päis"
 
-#: ../gdk-pixbuf/io-xpm.c:484
+#: gdk-pixbuf/io-xpm.c:484
 msgid "XPM file has image width <= 0"
 msgstr "XPM failil on pildi laius <= 0 "
 
-#: ../gdk-pixbuf/io-xpm.c:492
+#: gdk-pixbuf/io-xpm.c:492
 msgid "XPM file has image height <= 0"
 msgstr "XPM failil on pildi kõrgus <= 0 "
 
-#: ../gdk-pixbuf/io-xpm.c:500
+#: gdk-pixbuf/io-xpm.c:500
 msgid "XPM has invalid number of chars per pixel"
 msgstr "XPM sisaldab vigast \"sümboleid piksli kohta\" numbrit"
 
-#: ../gdk-pixbuf/io-xpm.c:507
+#: gdk-pixbuf/io-xpm.c:507
 msgid "XPM file has invalid number of colors"
 msgstr "XPM fail sisaldab vigast värvide arvu"
 
-#: ../gdk-pixbuf/io-xpm.c:519 ../gdk-pixbuf/io-xpm.c:528
-#: ../gdk-pixbuf/io-xpm.c:580
+#: gdk-pixbuf/io-xpm.c:519 gdk-pixbuf/io-xpm.c:528 gdk-pixbuf/io-xpm.c:580
 msgid "Cannot allocate memory for loading XPM image"
 msgstr "XPM faili laadimiseks pole võimalik mälu eraldada"
 
-#: ../gdk-pixbuf/io-xpm.c:542
+#: gdk-pixbuf/io-xpm.c:542
 msgid "Cannot read XPM colormap"
 msgstr "XPM värvikaarti ei suudeta lugeda"
 
-#: ../gdk-pixbuf/io-xpm.c:771
+#: gdk-pixbuf/io-xpm.c:771
 msgid "Failed to write to temporary file when loading XPM image"
 msgstr "Tõrge ajutise faili kirjutamisel XPM pildi laadimisel"
 
-#: ../gdk-pixbuf/io-xpm.c:806
+#: gdk-pixbuf/io-xpm.c:806
 msgid "The XPM image format"
 msgstr "XPM pildivorming"
 
 #. Description of --class=CLASS in --help output
-#: ../gdk/gdk.c:115
+#: gdk/gdk.c:115
 msgid "Program class as used by the window manager"
 msgstr "Programmi klass, mida kasutab aknahaldur"
 
 #. Placeholder in --class=CLASS in --help output
-#: ../gdk/gdk.c:116
+#: gdk/gdk.c:116
 msgid "CLASS"
 msgstr "KLASS"
 
 #. Description of --name=NAME in --help output
-#: ../gdk/gdk.c:118
+#: gdk/gdk.c:118
 msgid "Program name as used by the window manager"
 msgstr "Programmi nimi, mida kasutab aknahaldur"
 
 #. Placeholder in --name=NAME in --help output
-#: ../gdk/gdk.c:119
+#: gdk/gdk.c:119
 msgid "NAME"
 msgstr "NIMI"
 
 #. Description of --display=DISPLAY in --help output
-#: ../gdk/gdk.c:121
+#: gdk/gdk.c:121
 msgid "X display to use"
 msgstr "Kasutatav X'i kuva"
 
 #. Placeholder in --display=DISPLAY in --help output
-#: ../gdk/gdk.c:122
+#: gdk/gdk.c:122
 msgid "DISPLAY"
 msgstr "KUVA"
 
 #. Description of --screen=SCREEN in --help output
-#: ../gdk/gdk.c:124
+#: gdk/gdk.c:124
 msgid "X screen to use"
 msgstr "Kasutatav X'i ekraan"
 
 #. Placeholder in --screen=SCREEN in --help output
-#: ../gdk/gdk.c:125
+#: gdk/gdk.c:125
 msgid "SCREEN"
 msgstr "EKRAAN"
 
 #. Description of --gdk-debug=FLAGS in --help output
-#: ../gdk/gdk.c:128
+#: gdk/gdk.c:128
 msgid "Gdk debugging flags to set"
 msgstr "Gdk silumislipud, mida seada"
 
@@ -816,222 +809,222 @@ msgstr "Gdk silumislipud, mida seada"
 #. Placeholder in --gdk-no-debug=FLAGS in --help output
 #. Placeholder in --gtk-debug=FLAGS in --help output
 #. Placeholder in --gtk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:129 ../gdk/gdk.c:132 ../gtk/gtkmain.c:405 ../gtk/gtkmain.c:408
+#: gdk/gdk.c:129 gdk/gdk.c:132 gtk/gtkmain.c:405 gtk/gtkmain.c:408
 msgid "FLAGS"
 msgstr "LIPUD"
 
 #. Description of --gdk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:131
+#: gdk/gdk.c:131
 msgid "Gdk debugging flags to unset"
 msgstr "Gdk silumislipud, mida maha võtta"
 
-#: ../gdk/keyname-table.h:3940
+#: gdk/keyname-table.h:3940
 msgid "keyboard label|BackSpace"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3941
+#: gdk/keyname-table.h:3941
 msgid "keyboard label|Tab"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3942
+#: gdk/keyname-table.h:3942
 msgid "keyboard label|Return"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3943
+#: gdk/keyname-table.h:3943
 msgid "keyboard label|Pause"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3944
+#: gdk/keyname-table.h:3944
 msgid "keyboard label|Scroll_Lock"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3945
+#: gdk/keyname-table.h:3945
 msgid "keyboard label|Sys_Req"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3946
+#: gdk/keyname-table.h:3946
 msgid "keyboard label|Escape"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3947
+#: gdk/keyname-table.h:3947
 msgid "keyboard label|Multi_key"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3948
+#: gdk/keyname-table.h:3948
 msgid "keyboard label|Home"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3949
+#: gdk/keyname-table.h:3949
 msgid "keyboard label|Page_Up"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3950
+#: gdk/keyname-table.h:3950
 msgid "keyboard label|Page_Down"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3951
+#: gdk/keyname-table.h:3951
 msgid "keyboard label|End"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3952
+#: gdk/keyname-table.h:3952
 msgid "keyboard label|Begin"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3953
+#: gdk/keyname-table.h:3953
 msgid "keyboard label|Print"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3954
+#: gdk/keyname-table.h:3954
 msgid "keyboard label|Insert"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3955
+#: gdk/keyname-table.h:3955
 msgid "keyboard label|Num_Lock"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3956
+#: gdk/keyname-table.h:3956
 msgid "keyboard label|KP_Space"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3957
+#: gdk/keyname-table.h:3957
 msgid "keyboard label|KP_Tab"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3958
+#: gdk/keyname-table.h:3958
 msgid "keyboard label|KP_Enter"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3959
+#: gdk/keyname-table.h:3959
 msgid "keyboard label|KP_Home"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3960
+#: gdk/keyname-table.h:3960
 msgid "keyboard label|KP_Left"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3961
+#: gdk/keyname-table.h:3961
 msgid "keyboard label|KP_Up"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3962
+#: gdk/keyname-table.h:3962
 msgid "keyboard label|KP_Right"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3963
+#: gdk/keyname-table.h:3963
 msgid "keyboard label|KP_Down"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3964
+#: gdk/keyname-table.h:3964
 msgid "keyboard label|KP_Page_Up"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3965
+#: gdk/keyname-table.h:3965
 msgid "keyboard label|KP_Prior"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3966
+#: gdk/keyname-table.h:3966
 msgid "keyboard label|KP_Page_Down"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3967
+#: gdk/keyname-table.h:3967
 msgid "keyboard label|KP_Next"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3968
+#: gdk/keyname-table.h:3968
 msgid "keyboard label|KP_End"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3969
+#: gdk/keyname-table.h:3969
 msgid "keyboard label|KP_Begin"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3970
+#: gdk/keyname-table.h:3970
 msgid "keyboard label|KP_Insert"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3971
+#: gdk/keyname-table.h:3971
 msgid "keyboard label|KP_Delete"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3972
+#: gdk/keyname-table.h:3972
 msgid "keyboard label|Delete"
 msgstr ""
 
 #. Description of --sync in --help output
-#: ../gdk/win32/gdkmain-win32.c:60
+#: gdk/win32/gdkmain-win32.c:60
 msgid "Don't batch GDI requests"
 msgstr "Ära kuhja GDI päringuid"
 
 #. Description of --no-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:62
+#: gdk/win32/gdkmain-win32.c:62
 msgid "Don't use the Wintab API for tablet support"
 msgstr ""
 
 #. Description of --ignore-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:64
+#: gdk/win32/gdkmain-win32.c:64
 msgid "Same as --no-wintab"
 msgstr "Sama mis --no-wintab"
 
 #. Description of --use-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:66
+#: gdk/win32/gdkmain-win32.c:66
 msgid "Do use the Wintab API [default]"
 msgstr "Ära kasuta Wintab API-t [vaikimisi]"
 
 #. Description of --max-colors=COLORS in --help output
-#: ../gdk/win32/gdkmain-win32.c:68
+#: gdk/win32/gdkmain-win32.c:68
 msgid "Size of the palette in 8 bit mode"
 msgstr "Paleti suurus 8-bitises resiimis"
 
 #. Placeholder in --max-colors=COLORS in --help output
-#: ../gdk/win32/gdkmain-win32.c:69
+#: gdk/win32/gdkmain-win32.c:69
 msgid "COLORS"
 msgstr "VÄRVID"
 
 #. Description of --sync in --help output
-#: ../gdk/x11/gdkmain-x11.c:92
+#: gdk/x11/gdkmain-x11.c:92
 msgid "Make X calls synchronous"
 msgstr "X'i kutsungid sünkroonseks"
 
-#: ../gtk/gtkaboutdialog.c:273 ../gtk/gtkaboutdialog.c:2103
+#: gtk/gtkaboutdialog.c:273 gtk/gtkaboutdialog.c:2103
 msgid "License"
 msgstr "Litsents"
 
-#: ../gtk/gtkaboutdialog.c:274
+#: gtk/gtkaboutdialog.c:274
 msgid "The license of the program"
 msgstr "Programmi litsents"
 
 #. Add the credits button
-#: ../gtk/gtkaboutdialog.c:509
+#: gtk/gtkaboutdialog.c:509
 msgid "C_redits"
 msgstr "_Autorid"
 
 #. Add the license button
-#: ../gtk/gtkaboutdialog.c:519
+#: gtk/gtkaboutdialog.c:519
 msgid "_License"
 msgstr "_Litsents"
 
-#: ../gtk/gtkaboutdialog.c:756
+#: gtk/gtkaboutdialog.c:756
 #, c-format
 msgid "About %s"
 msgstr "Lähem teave %s kohta"
 
-#: ../gtk/gtkaboutdialog.c:2031
+#: gtk/gtkaboutdialog.c:2031
 msgid "Credits"
 msgstr "Autorid"
 
-#: ../gtk/gtkaboutdialog.c:2057
+#: gtk/gtkaboutdialog.c:2057
 msgid "Written by"
 msgstr "Programmeerimine"
 
-#: ../gtk/gtkaboutdialog.c:2060
+#: gtk/gtkaboutdialog.c:2060
 msgid "Documented by"
 msgstr "Dokumentatsioon"
 
-#: ../gtk/gtkaboutdialog.c:2072
+#: gtk/gtkaboutdialog.c:2072
 msgid "Translated by"
 msgstr "Tõlge"
 
-#: ../gtk/gtkaboutdialog.c:2076
+#: gtk/gtkaboutdialog.c:2076
 msgid "Artwork by"
 msgstr "Kunst"
 
@@ -1041,7 +1034,7 @@ msgstr "Kunst"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:121
+#: gtk/gtkaccellabel.c:121
 msgid "keyboard label|Shift"
 msgstr ""
 
@@ -1051,7 +1044,7 @@ msgstr ""
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:128
+#: gtk/gtkaccellabel.c:128
 msgid "keyboard label|Ctrl"
 msgstr ""
 
@@ -1061,17 +1054,17 @@ msgstr ""
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:135
+#: gtk/gtkaccellabel.c:135
 msgid "keyboard label|Alt"
 msgstr ""
 
 #. do not translate the part before the |
-#: ../gtk/gtkaccellabel.c:577
+#: gtk/gtkaccellabel.c:577
 msgid "keyboard label|Space"
 msgstr ""
 
 #. do not translate the part before the |
-#: ../gtk/gtkaccellabel.c:581
+#: gtk/gtkaccellabel.c:581
 msgid "keyboard label|Backslash"
 msgstr ""
 
@@ -1084,7 +1077,7 @@ msgstr ""
 #. * so if you have a default text direction of RTL and YM, then
 #. * the year will appear on the right.
 #.
-#: ../gtk/gtkcalendar.c:647
+#: gtk/gtkcalendar.c:647
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
@@ -1092,7 +1085,7 @@ msgstr "calendar:MY"
 #. * first day of the week to calendar:week_start:1 if you want Monday
 #. * to be the first day of the week, and so on.
 #.
-#: ../gtk/gtkcalendar.c:661
+#: gtk/gtkcalendar.c:661
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:1"
 
@@ -1104,7 +1097,7 @@ msgstr "calendar:week_start:1"
 #. *
 #. * If you don't understand this, leave it as "2000"
 #.
-#: ../gtk/gtkcalendar.c:1549
+#: gtk/gtkcalendar.c:1549
 msgid "year measurement template|2000"
 msgstr "2000"
 
@@ -1119,48 +1112,48 @@ msgstr "2000"
 #. * Don't include the prefix "calendar year format|" in the
 #. * translation. "%Y" is appropriate for most locales.
 #.
-#: ../gtk/gtkcalendar.c:1826
+#: gtk/gtkcalendar.c:1826
 msgid "calendar year format|%Y"
 msgstr "%Y"
 
 #. do not translate the part before the |
-#: ../gtk/gtkcellrendererprogress.c:237 ../gtk/gtkcellrendererprogress.c:295
+#: gtk/gtkcellrendererprogress.c:237 gtk/gtkcellrendererprogress.c:295
 #, c-format
 msgid "progress bar label|%d %%"
 msgstr "%d %%"
 
-#: ../gtk/gtkcolorbutton.c:221 ../gtk/gtkcolorbutton.c:576
+#: gtk/gtkcolorbutton.c:221 gtk/gtkcolorbutton.c:576
 msgid "Pick a Color"
 msgstr "Vali värv"
 
-#: ../gtk/gtkcolorbutton.c:467
+#: gtk/gtkcolorbutton.c:467
 msgid "Received invalid color data\n"
 msgstr ""
 
-#: ../gtk/gtkcolorsel.c:565
+#: gtk/gtkcolorsel.c:565
 msgid ""
 "The previously-selected color, for comparison to the color you're selecting "
 "now. You can drag this color to a palette entry, or select this color as "
 "current by dragging it to the other color swatch alongside."
 msgstr ""
 
-#: ../gtk/gtkcolorsel.c:570
+#: gtk/gtkcolorsel.c:570
 msgid ""
 "The color you've chosen. You can drag this color to a palette entry to save "
 "it for use in the future."
 msgstr ""
 
-#: ../gtk/gtkcolorsel.c:961
+#: gtk/gtkcolorsel.c:961
 msgid "_Save color here"
 msgstr "_Salvesta värv siia"
 
-#: ../gtk/gtkcolorsel.c:1166
+#: gtk/gtkcolorsel.c:1166
 msgid ""
 "Click this palette entry to make it the current color. To change this entry, "
 "drag a color swatch here or right-click it and select \"Save color here.\""
 msgstr ""
 
-#: ../gtk/gtkcolorsel.c:1953
+#: gtk/gtkcolorsel.c:1953
 msgid ""
 "Select the color you want from the outer ring. Select the darkness or "
 "lightness of that color using the inner triangle."
@@ -1168,73 +1161,73 @@ msgstr ""
 "Vali oma soovitud värv välimiselt ringilt. Kasutades sisemist kolmnurka, "
 "vali värvi heledus või tumedus."
 
-#: ../gtk/gtkcolorsel.c:1978
+#: gtk/gtkcolorsel.c:1978
 msgid ""
 "Click the eyedropper, then click a color anywhere on your screen to select "
 "that color."
 msgstr ""
 
-#: ../gtk/gtkcolorsel.c:1987
+#: gtk/gtkcolorsel.c:1987
 msgid "_Hue:"
 msgstr "_Toon:"
 
-#: ../gtk/gtkcolorsel.c:1988
+#: gtk/gtkcolorsel.c:1988
 msgid "Position on the color wheel."
 msgstr "Asukoht värviringil."
 
-#: ../gtk/gtkcolorsel.c:1990
+#: gtk/gtkcolorsel.c:1990
 msgid "_Saturation:"
 msgstr "_Küllastus:"
 
-#: ../gtk/gtkcolorsel.c:1991
+#: gtk/gtkcolorsel.c:1991
 msgid "\"Deepness\" of the color."
 msgstr "Värvi \"sügavus\"."
 
-#: ../gtk/gtkcolorsel.c:1992
+#: gtk/gtkcolorsel.c:1992
 msgid "_Value:"
 msgstr "_Heledus:"
 
-#: ../gtk/gtkcolorsel.c:1993
+#: gtk/gtkcolorsel.c:1993
 msgid "Brightness of the color."
 msgstr "Värvi heledus."
 
-#: ../gtk/gtkcolorsel.c:1994
+#: gtk/gtkcolorsel.c:1994
 msgid "_Red:"
 msgstr "_Punane:"
 
-#: ../gtk/gtkcolorsel.c:1995
+#: gtk/gtkcolorsel.c:1995
 msgid "Amount of red light in the color."
 msgstr "Punase valguse kogus värvis."
 
-#: ../gtk/gtkcolorsel.c:1996
+#: gtk/gtkcolorsel.c:1996
 msgid "_Green:"
 msgstr "_Roheline:"
 
-#: ../gtk/gtkcolorsel.c:1997
+#: gtk/gtkcolorsel.c:1997
 msgid "Amount of green light in the color."
 msgstr "Rohelise valguse kogus värvis."
 
-#: ../gtk/gtkcolorsel.c:1998
+#: gtk/gtkcolorsel.c:1998
 msgid "_Blue:"
 msgstr "_Sinine:"
 
-#: ../gtk/gtkcolorsel.c:1999
+#: gtk/gtkcolorsel.c:1999
 msgid "Amount of blue light in the color."
 msgstr "Sinise valguse kogus värvis."
 
-#: ../gtk/gtkcolorsel.c:2002
+#: gtk/gtkcolorsel.c:2002
 msgid "_Opacity:"
 msgstr "Kat_vus:"
 
-#: ../gtk/gtkcolorsel.c:2010 ../gtk/gtkcolorsel.c:2021
+#: gtk/gtkcolorsel.c:2010 gtk/gtkcolorsel.c:2021
 msgid "Transparency of the color."
 msgstr "Värvi läbipaistvus."
 
-#: ../gtk/gtkcolorsel.c:2028
+#: gtk/gtkcolorsel.c:2028
 msgid "Color _Name:"
 msgstr "Värvi _nimi:"
 
-#: ../gtk/gtkcolorsel.c:2043
+#: gtk/gtkcolorsel.c:2043
 msgid ""
 "You can enter an HTML-style hexadecimal color value, or simply a color name "
 "such as 'orange' in this entry."
@@ -1242,310 +1235,326 @@ msgstr ""
 "Siia võid sisestada HTML-stiilis kuueteistkümnendarvuna värvi väärtuse, või "
 "värvi inglisekeelse nimetuse (näiteks 'orange')."
 
-#: ../gtk/gtkcolorsel.c:2062
+#: gtk/gtkcolorsel.c:2062
 msgid "_Palette"
 msgstr "Pal_ett"
 
-#: ../gtk/gtkcolorsel.c:2094
+#: gtk/gtkcolorsel.c:2094
 msgid "Color Wheel"
 msgstr "Värviratas"
 
-#: ../gtk/gtkcolorseldialog.c:123
+#: gtk/gtkcolorseldialog.c:123
 msgid "Color Selection"
 msgstr "Värvi valik"
 
-#: ../gtk/gtkentry.c:4508 ../gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Vali k_õik"
 
-#: ../gtk/gtkentry.c:4518 ../gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Sisestus_meetodid"
 
-#: ../gtk/gtkentry.c:4529 ../gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "L_isa Unicode'i juhtmärk"
 
-#: ../gtk/gtkfilechooser.c:1588 ../gtk/gtkfilechooser.c:1632
-#: ../gtk/gtkfilechooser.c:1707 ../gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Vigane failinimi: %s"
 
-#: ../gtk/gtkfilechooserbutton.c:67
+#: gtk/gtkfilechooserbutton.c:67
 msgid "Select A File"
 msgstr "Faili valimine"
 
-#: ../gtk/gtkfilechooserbutton.c:68 ../gtk/gtkfilechooserdefault.c:1316
-#: ../gtk/gtkpathbar.c:1020
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
+#: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Kodu"
 
-#: ../gtk/gtkfilechooserbutton.c:69 ../gtk/gtkfilechooserdefault.c:1343
-#: ../gtk/gtkpathbar.c:1022
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
+#: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Töölaud"
 
-#: ../gtk/gtkfilechooserbutton.c:70
+#: gtk/gtkfilechooserbutton.c:70
 msgid "(None)"
 msgstr ""
 
-#: ../gtk/gtkfilechooserbutton.c:1523
+#: gtk/gtkfilechooserbutton.c:1523
 msgid "Other..."
 msgstr "Muu..."
 
-#: ../gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Faili kohta pole võimalik teavet hankida"
 
-#: ../gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Järjehoidjat pole võimalik lisada"
 
-#: ../gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Järjehoidjat pole võimalik eemaldada"
 
-#: ../gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Kataloogi pole võimalik luua"
 
-#: ../gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: ../gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Vigane failinimi"
 
-#: ../gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Kataloogi sisu pole võimalik kuvada"
 
-#: ../gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Viga info saamisel '%s' jaoks: %s"
 
-#: ../gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Kataloogi '%s' lisamine järjehoidjatesse"
 
-#: ../gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Käesoleva kataloogi lisamine järjehoidjatesse"
 
-#: ../gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Valitud kataloogide lisamine järjehoidjatesse"
 
-#: ../gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Järjehoidja '%s' eemaldamine"
 
-#: ../gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "Järjehoidjat '%s' pole võimalik lisada kuna selle rajanimi on vigane."
 
-#: ../gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Eemalda"
 
-#: ../gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Nimeta ümber..."
 
-#: ../gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Kiirklahvid"
 
-#: ../gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Kataloog"
 
-#: ../gtk/gtkfilechooserdefault.c:3193 ../gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Lisa"
 
-#: ../gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Valitud kataloogi lisamine järjehoidjate hulka"
 
-#: ../gtk/gtkfilechooserdefault.c:3205 ../gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Eemalda"
 
-#: ../gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Eemalda valitud järjehoidja"
 
-#: ../gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 msgid "Could not select file"
 msgstr "Faili pole võimalik valida"
 
-#: ../gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "Faili '%s' pole võimalik lisada kuna selle rajanimi on vigane."
 
-#: ../gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "_Lisa järjehoidjatesse"
 
-#: ../gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "_Ava asukoht"
 
-#: ../gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Näita _peidetud faile"
 
-#: ../gtk/gtkfilechooserdefault.c:3586 ../gtk/gtkfilesel.c:766
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Failid"
 
-#: ../gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Nimi"
 
-#: ../gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Suurus"
 
-#: ../gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Muudetud"
 
-#: ../gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: ../gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Loo _kataloog"
 
 #. Name entry
-#: ../gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: ../gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Sirvi katalooge"
 
-#: ../gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Salvesta _kataloogi:"
 
-#: ../gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Loo _kataloogi:"
 
-#: ../gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Kataloogi pole võimalik muuta kuna see pole kohalik kataloog"
 
-#: ../gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Kiirklahvi %s pole olemas"
 
-#: ../gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Nimeta ümber"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "%s pole võimalik ühendada"
 
-#: ../gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Sisesta uue kataloogi nimi"
 
-#: ../gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d bait"
 msgstr[1] "%d baiti"
 
-#: ../gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: ../gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: ../gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: ../gtk/gtkfilechooserdefault.c:6604 ../gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "tundmatu"
 
-#: ../gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "täna"
 
-#: ../gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "eile"
 
-#: ../gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Kataloogi pole võimalik vahetada"
 
-#: ../gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Sinu kirjeldatud kataloog on vigase otsinguteega."
 
-#: ../gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Faili nime pole '%s' ja '%s' põhjal võimalik luua"
 
-#: ../gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Kirjet pole võimalik valida"
 
-#: ../gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Asukoha avamine"
 
-#: ../gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Salvesta asukohas"
 
-#: ../gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "A_sukoht: "
 
-#: ../gtk/gtkfilesel.c:730
+#: gtk/gtkfilesel.c:727
 msgid "Folders"
 msgstr "Kataloogid"
 
-#: ../gtk/gtkfilesel.c:734
+#: gtk/gtkfilesel.c:731
 msgid "Fol_ders"
 msgstr "_Kataloogid"
 
-#: ../gtk/gtkfilesel.c:770
+#: gtk/gtkfilesel.c:767
 msgid "_Files"
 msgstr "_Failid"
 
-#: ../gtk/gtkfilesel.c:858 ../gtk/gtkfilesel.c:2248
+#: gtk/gtkfilesel.c:855 gtk/gtkfilesel.c:2242
 #, c-format
 msgid "Folder unreadable: %s"
 msgstr "Kataloog on loetamatu: %s"
 
-#: ../gtk/gtkfilesel.c:989
+#: gtk/gtkfilesel.c:984
 #, c-format
 msgid ""
 "The file \"%s\" resides on another machine (called %s) and may not be "
@@ -1556,25 +1565,25 @@ msgstr ""
 "sellele programmile kättesaadav olla.\n"
 "Kas sa tahad kindlasti seda faili valida?"
 
-#: ../gtk/gtkfilesel.c:1120
+#: gtk/gtkfilesel.c:1114
 msgid "_New Folder"
 msgstr "_Uus kataloog"
 
-#: ../gtk/gtkfilesel.c:1131
+#: gtk/gtkfilesel.c:1125
 msgid "De_lete File"
 msgstr "_Kustuta fail"
 
-#: ../gtk/gtkfilesel.c:1142
+#: gtk/gtkfilesel.c:1136
 msgid "_Rename File"
 msgstr "_Nimeta ümber"
 
-#: ../gtk/gtkfilesel.c:1444
+#: gtk/gtkfilesel.c:1438
 #, c-format
 msgid ""
 "The folder name \"%s\" contains symbols that are not allowed in filenames"
 msgstr "Kataloogi \"%s\" nimi sisaldab failinimedes keelatud märke"
 
-#: ../gtk/gtkfilesel.c:1446
+#: gtk/gtkfilesel.c:1440
 #, c-format
 msgid ""
 "Error creating folder \"%s\": %s\n"
@@ -1583,33 +1592,33 @@ msgstr ""
 "Viga kataloogi \"%s\" loomisel: %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1447 ../gtk/gtkfilesel.c:1683
+#: gtk/gtkfilesel.c:1441 gtk/gtkfilesel.c:1677
 msgid "You probably used symbols not allowed in filenames."
 msgstr "Tõenäoliselt kasutasid sa failinimedes keelatud märke."
 
-#: ../gtk/gtkfilesel.c:1455
+#: gtk/gtkfilesel.c:1449
 #, c-format
 msgid "Error creating folder \"%s\": %s\n"
 msgstr "Viga kataloogi \"%s\" loomisel: %s\n"
 
-#: ../gtk/gtkfilesel.c:1489
+#: gtk/gtkfilesel.c:1483
 msgid "New Folder"
 msgstr "Uus kataloog"
 
-#: ../gtk/gtkfilesel.c:1504
+#: gtk/gtkfilesel.c:1498
 msgid "_Folder name:"
 msgstr "_Kataloogi nimi:"
 
-#: ../gtk/gtkfilesel.c:1528
+#: gtk/gtkfilesel.c:1522
 msgid "C_reate"
 msgstr "_Loo"
 
-#: ../gtk/gtkfilesel.c:1571
+#: gtk/gtkfilesel.c:1565
 #, c-format
 msgid "The filename \"%s\" contains symbols that are not allowed in filenames"
 msgstr "Failinimi \"%s\" sisaldab failinimedes keelatud märke"
 
-#: ../gtk/gtkfilesel.c:1574
+#: gtk/gtkfilesel.c:1568
 #, c-format
 msgid ""
 "Error deleting file \"%s\": %s\n"
@@ -1618,30 +1627,30 @@ msgstr ""
 "Viga faili \"%s\" kustutamisel: %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1576 ../gtk/gtkfilesel.c:1697
+#: gtk/gtkfilesel.c:1570 gtk/gtkfilesel.c:1691
 msgid "It probably contains symbols not allowed in filenames."
 msgstr "Tõenäoliselt sisaldab see failinimedes keelatud märke."
 
-#: ../gtk/gtkfilesel.c:1585
+#: gtk/gtkfilesel.c:1579
 #, c-format
 msgid "Error deleting file \"%s\": %s"
 msgstr "Viga faili \"%s\" kustutamisel: %s"
 
-#: ../gtk/gtkfilesel.c:1628
+#: gtk/gtkfilesel.c:1622
 #, c-format
 msgid "Really delete file \"%s\"?"
 msgstr "Kas kindlasti kustutadata fail \"%s\"?"
 
-#: ../gtk/gtkfilesel.c:1633
+#: gtk/gtkfilesel.c:1627
 msgid "Delete File"
 msgstr "Kustuta fail"
 
-#: ../gtk/gtkfilesel.c:1679 ../gtk/gtkfilesel.c:1693
+#: gtk/gtkfilesel.c:1673 gtk/gtkfilesel.c:1687
 #, c-format
 msgid "The file name \"%s\" contains symbols that are not allowed in filenames"
 msgstr "Failinimi \"%s\" sisaldab failinimedes keelatud märke"
 
-#: ../gtk/gtkfilesel.c:1681
+#: gtk/gtkfilesel.c:1675
 #, c-format
 msgid ""
 "Error renaming file to \"%s\": %s\n"
@@ -1650,7 +1659,7 @@ msgstr ""
 "Viga faili ümbernimetamisel \"%s\"-ks: %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1695
+#: gtk/gtkfilesel.c:1689
 #, c-format
 msgid ""
 "Error renaming file \"%s\": %s\n"
@@ -1659,29 +1668,29 @@ msgstr ""
 "Viga faili \"%s\" ümbernimetamisel: %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1705
+#: gtk/gtkfilesel.c:1699
 #, c-format
 msgid "Error renaming file \"%s\" to \"%s\": %s"
 msgstr "Viga faili \"%s\" ümbernimetamisel \"%s\"-ks: %s"
 
-#: ../gtk/gtkfilesel.c:1752
+#: gtk/gtkfilesel.c:1746
 msgid "Rename File"
 msgstr "Nimeta ümber"
 
-#: ../gtk/gtkfilesel.c:1767
+#: gtk/gtkfilesel.c:1761
 #, c-format
 msgid "Rename file \"%s\" to:"
 msgstr "Nimeta fail \"%s\" ümber:"
 
-#: ../gtk/gtkfilesel.c:1796
+#: gtk/gtkfilesel.c:1790
 msgid "_Rename"
 msgstr "_Nimeta ümber"
 
-#: ../gtk/gtkfilesel.c:2228
+#: gtk/gtkfilesel.c:2222
 msgid "_Selection: "
 msgstr "_Valik: "
 
-#: ../gtk/gtkfilesel.c:3153
+#: gtk/gtkfilesel.c:3147
 #, c-format
 msgid ""
 "The filename \"%s\" couldn't be converted to UTF-8. (try setting the "
@@ -1690,48 +1699,49 @@ msgstr ""
 "Failinime \"%s\" pole võimalik UTF-8sse teisendada (proovi keskkonnamuutuja "
 "G_FILENAME_ENCODING seadmist): %s"
 
-#: ../gtk/gtkfilesel.c:3156
+#: gtk/gtkfilesel.c:3150
 msgid "Invalid UTF-8"
 msgstr "Vigane UTF-8"
 
-#: ../gtk/gtkfilesel.c:4033
+#: gtk/gtkfilesel.c:4027
 msgid "Name too long"
 msgstr "Nimi on liiga pikk"
 
-#: ../gtk/gtkfilesel.c:4035
+#: gtk/gtkfilesel.c:4029
 msgid "Couldn't convert filename"
 msgstr "Ei saa failinime ümber kodeerida"
 
-#: ../gtk/gtkfilesystemmodel.c:1267
+#: gtk/gtkfilesystemmodel.c:1267
 msgid "(Empty)"
 msgstr "(tühi)"
 
-#: ../gtk/gtkfilesystemunix.c:476 ../gtk/gtkfilesystemunix.c:682
-#: ../gtk/gtkfilesystemunix.c:1858 ../gtk/gtkfilesystemwin32.c:482
-#: ../gtk/gtkfilesystemwin32.c:495 ../gtk/gtkfilesystemwin32.c:1487
+#: gtk/gtkfilesystemunix.c:476 gtk/gtkfilesystemunix.c:682
+#: gtk/gtkfilesystemunix.c:1858 gtk/gtkfilesystemwin32.c:482
+#: gtk/gtkfilesystemwin32.c:495 gtk/gtkfilesystemwin32.c:1487
 #, c-format
 msgid "Error getting information for '%s': %s"
 msgstr "Viga info saamisel '%s' jaoks: %s"
 
-#: ../gtk/gtkfilesystemunix.c:551 ../gtk/gtkfilesystemwin32.c:537
+#: gtk/gtkfilesystemunix.c:551 gtk/gtkfilesystemwin32.c:537
 #, c-format
 msgid "Error creating directory '%s': %s"
 msgstr "Viga kataloogi '%s' loomisel: %s"
 
-#: ../gtk/gtkfilesystemunix.c:631 ../gtk/gtkfilesystemwin32.c:597
+#: gtk/gtkfilesystemunix.c:631 gtk/gtkfilesystemwin32.c:597
 msgid "This file system does not support mounting"
 msgstr "See failisüsteem ei toeta ühendamist"
 
-#: ../gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#: gtk/gtkfilesystemunix.c:639
+#, fuzzy
+msgid "File System"
 msgstr "Failisüsteem"
 
-#: ../gtk/gtkfilesystemunix.c:796
+#: gtk/gtkfilesystemunix.c:796
 #, c-format
 msgid "Could not get a stock icon for %s"
 msgstr ""
 
-#: ../gtk/gtkfilesystemunix.c:891
+#: gtk/gtkfilesystemunix.c:891
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"%s\". "
@@ -1740,93 +1750,93 @@ msgstr ""
 "Nimi \"%s\" ei ole lubatud kuna see sisaldab sümbolit \"%s\". Palun kasuta "
 "mõnda muud nime."
 
-#: ../gtk/gtkfilesystemunix.c:1463 ../gtk/gtkfilesystemwin32.c:1032
+#: gtk/gtkfilesystemunix.c:1463 gtk/gtkfilesystemwin32.c:1032
 #, c-format
 msgid "Bookmark saving failed: %s"
 msgstr "Tõrge järjehoidja salvestamisel (%s)"
 
-#: ../gtk/gtkfilesystemunix.c:1518
+#: gtk/gtkfilesystemunix.c:1518
 #, c-format
 msgid "'%s' already exists in the bookmarks list"
 msgstr "'%s' on juba järjehoidjate loendis olemas"
 
-#: ../gtk/gtkfilesystemunix.c:1590
+#: gtk/gtkfilesystemunix.c:1590
 #, c-format
 msgid "'%s' does not exist in the bookmarks list"
 msgstr "'%s' ei ole järjehoidjate loendis olemas"
 
-#: ../gtk/gtkfilesystemunix.c:1818
+#: gtk/gtkfilesystemunix.c:1818
 #, c-format
 msgid "Error getting information for '/': %s"
 msgstr "Viga info saamisel '/' jaoks: %s"
 
-#: ../gtk/gtkfilesystemwin32.c:611
+#: gtk/gtkfilesystemwin32.c:611
 #, c-format
 msgid "Network Drive (%s)"
 msgstr "Võrguketas (%s)"
 
-#: ../gtk/gtkfilesystemwin32.c:650
+#: gtk/gtkfilesystemwin32.c:650
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../gtk/gtkfontbutton.c:179 ../gtk/gtkfontbutton.c:292
+#: gtk/gtkfontbutton.c:179 gtk/gtkfontbutton.c:292
 msgid "Pick a Font"
 msgstr "Vali kirjatüüp"
 
 #. Initialize fields
-#: ../gtk/gtkfontbutton.c:286
+#: gtk/gtkfontbutton.c:286
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: ../gtk/gtkfontbutton.c:804
+#: gtk/gtkfontbutton.c:804
 msgid "Font"
 msgstr "Kirjatüüp"
 
 #. This is the default text shown in the preview entry, though the user
 #. can set it. Remember that some fonts only have capital letters.
-#: ../gtk/gtkfontsel.c:74
+#: gtk/gtkfontsel.c:74
 msgid "abcdefghijk ABCDEFGHIJK"
 msgstr "abcdefghijkõäöü ABCDEFGHIJKÕÄÖÜ"
 
-#: ../gtk/gtkfontsel.c:361
+#: gtk/gtkfontsel.c:361
 msgid "_Family:"
 msgstr "_Perekond:"
 
-#: ../gtk/gtkfontsel.c:367
+#: gtk/gtkfontsel.c:367
 msgid "_Style:"
 msgstr "_Laad:"
 
-#: ../gtk/gtkfontsel.c:373
+#: gtk/gtkfontsel.c:373
 msgid "Si_ze:"
 msgstr "_Suurus:"
 
 #. create the text entry widget
-#: ../gtk/gtkfontsel.c:549
+#: gtk/gtkfontsel.c:549
 msgid "_Preview:"
 msgstr "_Näidis:"
 
-#: ../gtk/gtkfontsel.c:1383
+#: gtk/gtkfontsel.c:1383
 msgid "Font Selection"
 msgstr "Kirjatüübi valik"
 
-#: ../gtk/gtkgamma.c:401
+#: gtk/gtkgamma.c:401
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../gtk/gtkgamma.c:411
+#: gtk/gtkgamma.c:411
 msgid "_Gamma value"
 msgstr "_Gamma väärtus"
 
 #. Remove this icon source so we don't keep trying to
 #. * load it.
 #.
-#: ../gtk/gtkiconfactory.c:1656
+#: gtk/gtkiconfactory.c:1656
 #, c-format
 msgid "Error loading icon: %s"
 msgstr "Viga ikooni laadimisel: %s"
 
-#: ../gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1835,120 +1845,120 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: ../gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Ikooni '%s' ei ole teemas"
 
-#: ../gtk/gtkimmodule.c:427
+#: gtk/gtkimmodule.c:427
 msgid "Default"
 msgstr "Vaikimisi"
 
-#: ../gtk/gtkinputdialog.c:235
+#: gtk/gtkinputdialog.c:235
 msgid "Input"
 msgstr "Sisend"
 
-#: ../gtk/gtkinputdialog.c:244
+#: gtk/gtkinputdialog.c:244
 msgid "No extended input devices"
 msgstr "Laiendatud sisendseadmeid ei ole"
 
-#: ../gtk/gtkinputdialog.c:256
+#: gtk/gtkinputdialog.c:256
 msgid "_Device:"
 msgstr "_Seade:"
 
-#: ../gtk/gtkinputdialog.c:273
+#: gtk/gtkinputdialog.c:273
 msgid "Disabled"
 msgstr "Välja lülitatud"
 
-#: ../gtk/gtkinputdialog.c:280
+#: gtk/gtkinputdialog.c:280
 msgid "Screen"
 msgstr "Ekraan"
 
-#: ../gtk/gtkinputdialog.c:287
+#: gtk/gtkinputdialog.c:287
 msgid "Window"
 msgstr "Aken"
 
-#: ../gtk/gtkinputdialog.c:294
+#: gtk/gtkinputdialog.c:294
 msgid "_Mode: "
 msgstr "_Režiim:"
 
 #. The axis listbox
-#: ../gtk/gtkinputdialog.c:325
+#: gtk/gtkinputdialog.c:325
 msgid "_Axes"
 msgstr "_Teljed"
 
 #. Keys listbox
-#: ../gtk/gtkinputdialog.c:342
+#: gtk/gtkinputdialog.c:342
 msgid "_Keys"
 msgstr "_Klahvid"
 
-#: ../gtk/gtkinputdialog.c:562
+#: gtk/gtkinputdialog.c:562
 msgid "X"
 msgstr "X"
 
-#: ../gtk/gtkinputdialog.c:563
+#: gtk/gtkinputdialog.c:563
 msgid "Y"
 msgstr "Y"
 
-#: ../gtk/gtkinputdialog.c:564
+#: gtk/gtkinputdialog.c:564
 msgid "Pressure"
 msgstr "Vajutus"
 
-#: ../gtk/gtkinputdialog.c:565
+#: gtk/gtkinputdialog.c:565
 msgid "X Tilt"
 msgstr "X kalle"
 
-#: ../gtk/gtkinputdialog.c:566
+#: gtk/gtkinputdialog.c:566
 msgid "Y Tilt"
 msgstr "Y kalle"
 
-#: ../gtk/gtkinputdialog.c:567
+#: gtk/gtkinputdialog.c:567
 msgid "Wheel"
 msgstr "Ratas"
 
-#: ../gtk/gtkinputdialog.c:607
+#: gtk/gtkinputdialog.c:607
 msgid "none"
 msgstr "ei ole"
 
-#: ../gtk/gtkinputdialog.c:643 ../gtk/gtkinputdialog.c:679
+#: gtk/gtkinputdialog.c:643 gtk/gtkinputdialog.c:679
 msgid "(disabled)"
 msgstr "(välja lülitatud)"
 
-#: ../gtk/gtkinputdialog.c:672
+#: gtk/gtkinputdialog.c:672
 msgid "(unknown)"
 msgstr "(tundmatu)"
 
 #. and clear button
-#: ../gtk/gtkinputdialog.c:759
+#: gtk/gtkinputdialog.c:759
 msgid "clear"
 msgstr "kustuta"
 
-#: ../gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Vali kõik"
 
 #. Description of --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:398
+#: gtk/gtkmain.c:398
 msgid "Load additional GTK+ modules"
 msgstr "Täiendavate GTK+ moodulite laadimine"
 
 #. Placeholder in --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:399
+#: gtk/gtkmain.c:399
 msgid "MODULES"
 msgstr "MOODULID"
 
 #. Description of --g-fatal-warnings in --help output
-#: ../gtk/gtkmain.c:401
+#: gtk/gtkmain.c:401
 msgid "Make all warnings fatal"
 msgstr "Kõikide hoiatuste fataalseks muutmine"
 
 #. Description of --gtk-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:404
+#: gtk/gtkmain.c:404
 msgid "GTK+ debugging flags to set"
 msgstr "GTK+ silumislipud, mida seada"
 
 #. Description of --gtk-no-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:407
+#: gtk/gtkmain.c:407
 msgid "GTK+ debugging flags to unset"
 msgstr "GTK+ silumislipud, mida maha võtta"
 
@@ -1957,517 +1967,517 @@ msgstr "GTK+ silumislipud, mida maha võtta"
 #. * Do *not* translate it to "predefinito:LTR", if it
 #. * it isn't default:LTR or default:RTL it will not work
 #.
-#: ../gtk/gtkmain.c:476
+#: gtk/gtkmain.c:476
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../gtk/gtkmain.c:559
+#: gtk/gtkmain.c:559
 msgid "GTK+ Options"
 msgstr "GTK+ võtmed"
 
-#: ../gtk/gtkmain.c:559
+#: gtk/gtkmain.c:559
 msgid "Show GTK+ Options"
 msgstr "GTK+ võtmete näitamine"
 
-#: ../gtk/gtknotebook.c:2718 ../gtk/gtknotebook.c:5064
+#: gtk/gtknotebook.c:2718 gtk/gtknotebook.c:5064
 #, c-format
 msgid "Page %u"
 msgstr "Lehekülg %u"
 
-#: ../gtk/gtkradiotoolbutton.c:92
+#: gtk/gtkradiotoolbutton.c:92
 msgid "Group"
 msgstr "Grupp"
 
-#: ../gtk/gtkradiotoolbutton.c:93
+#: gtk/gtkradiotoolbutton.c:93
 msgid "The radio tool button whose group this button belongs to."
 msgstr ""
 
-#: ../gtk/gtkrc.c:2400
+#: gtk/gtkrc.c:2400
 #, c-format
 msgid "Unable to find include file: \"%s\""
 msgstr "Faili pole võimalik kaasata: \"%s\""
 
-#: ../gtk/gtkrc.c:3042 ../gtk/gtkrc.c:3045
+#: gtk/gtkrc.c:3042 gtk/gtkrc.c:3045
 #, c-format
 msgid "Unable to locate image file in pixmap_path: \"%s\""
 msgstr "Ei leia pildifaili otsingurajalt 'pixmap_path': \"%s\""
 
-#: ../gtk/gtkrc.c:3480
+#: gtk/gtkrc.c:3480
 #, c-format
 msgid "Pixmap path element: \"%s\" must be absolute, %s, line %d"
 msgstr "Pildi raja element: \"%s\" peab olema absoluutne, %s, rida %d"
 
 #. KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate
-#: ../gtk/gtkstock.c:308
+#: gtk/gtkstock.c:308
 msgid "Information"
 msgstr "Info"
 
-#: ../gtk/gtkstock.c:309
+#: gtk/gtkstock.c:309
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../gtk/gtkstock.c:310
+#: gtk/gtkstock.c:310
 msgid "Error"
 msgstr "Viga"
 
-#: ../gtk/gtkstock.c:311
+#: gtk/gtkstock.c:311
 msgid "Question"
 msgstr "Küsimus"
 
 #. FIXME these need accelerators when appropriate, and
 #. * need the mnemonics to be rationalized
 #.
-#: ../gtk/gtkstock.c:316
+#: gtk/gtkstock.c:316
 msgid "_About"
 msgstr "_Programmist"
 
-#: ../gtk/gtkstock.c:318
+#: gtk/gtkstock.c:318
 msgid "_Apply"
 msgstr "_Rakenda"
 
-#: ../gtk/gtkstock.c:319
+#: gtk/gtkstock.c:319
 msgid "_Bold"
 msgstr "_Paks"
 
-#: ../gtk/gtkstock.c:320
+#: gtk/gtkstock.c:320
 msgid "_Cancel"
 msgstr "_Loobu"
 
-#: ../gtk/gtkstock.c:321
+#: gtk/gtkstock.c:321
 msgid "_CD-Rom"
 msgstr "_CD-ROM"
 
-#: ../gtk/gtkstock.c:322
+#: gtk/gtkstock.c:322
 msgid "_Clear"
 msgstr "_Tühjenda"
 
-#: ../gtk/gtkstock.c:323
+#: gtk/gtkstock.c:323
 msgid "_Close"
 msgstr "_Sulge"
 
-#: ../gtk/gtkstock.c:324
+#: gtk/gtkstock.c:324
 msgid "_Convert"
 msgstr "_Konverdi"
 
-#: ../gtk/gtkstock.c:325
+#: gtk/gtkstock.c:325
 msgid "_Copy"
 msgstr "_Kopeeri"
 
-#: ../gtk/gtkstock.c:326
+#: gtk/gtkstock.c:326
 msgid "Cu_t"
 msgstr "_Lõika"
 
-#: ../gtk/gtkstock.c:327
+#: gtk/gtkstock.c:327
 msgid "_Delete"
 msgstr "Ku_stuta"
 
-#: ../gtk/gtkstock.c:328
+#: gtk/gtkstock.c:328
 msgid "_Execute"
 msgstr "K_äivita"
 
-#: ../gtk/gtkstock.c:329
+#: gtk/gtkstock.c:329
 msgid "_Edit"
 msgstr "_Redigeeri"
 
-#: ../gtk/gtkstock.c:330
+#: gtk/gtkstock.c:330
 msgid "_Find"
 msgstr "_Otsi"
 
-#: ../gtk/gtkstock.c:331
+#: gtk/gtkstock.c:331
 msgid "Find and _Replace"
 msgstr "Otsi ja _asenda"
 
-#: ../gtk/gtkstock.c:332
+#: gtk/gtkstock.c:332
 msgid "_Floppy"
 msgstr "_Flopi"
 
-#: ../gtk/gtkstock.c:333
+#: gtk/gtkstock.c:333
 msgid "_Fullscreen"
 msgstr "_Täisekraan"
 
-#: ../gtk/gtkstock.c:334
+#: gtk/gtkstock.c:334
 msgid "_Leave Fullscreen"
 msgstr "_Lahku täisekraanist"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:336
+#: gtk/gtkstock.c:336
 msgid "Navigation|_Bottom"
 msgstr "Lõ_ppu"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:338
+#: gtk/gtkstock.c:338
 msgid "Navigation|_First"
 msgstr "E_simesele"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:340
+#: gtk/gtkstock.c:340
 msgid "Navigation|_Last"
 msgstr "_Viimasele"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:342
+#: gtk/gtkstock.c:342
 msgid "Navigation|_Top"
 msgstr "Al_gusesse"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:344
+#: gtk/gtkstock.c:344
 msgid "Navigation|_Back"
 msgstr "_Tagasi"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:346
+#: gtk/gtkstock.c:346
 msgid "Navigation|_Down"
 msgstr "_Alla"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:348
+#: gtk/gtkstock.c:348
 msgid "Navigation|_Forward"
 msgstr "_Edasi"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:350
+#: gtk/gtkstock.c:350
 msgid "Navigation|_Up"
 msgstr "Ü_les"
 
-#: ../gtk/gtkstock.c:351
+#: gtk/gtkstock.c:351
 msgid "_Harddisk"
 msgstr "_Kõvaketas"
 
-#: ../gtk/gtkstock.c:352
+#: gtk/gtkstock.c:352
 msgid "_Help"
 msgstr "_Abi"
 
-#: ../gtk/gtkstock.c:353
+#: gtk/gtkstock.c:353
 msgid "_Home"
 msgstr "_Kodu"
 
-#: ../gtk/gtkstock.c:354
+#: gtk/gtkstock.c:354
 msgid "Increase Indent"
 msgstr "Suurenda taandust"
 
-#: ../gtk/gtkstock.c:355
+#: gtk/gtkstock.c:355
 msgid "Decrease Indent"
 msgstr "Vähenda taandust"
 
-#: ../gtk/gtkstock.c:356
+#: gtk/gtkstock.c:356
 msgid "_Index"
 msgstr "_Indeks"
 
-#: ../gtk/gtkstock.c:357
+#: gtk/gtkstock.c:357
 msgid "_Information"
 msgstr "_Teave"
 
-#: ../gtk/gtkstock.c:358
+#: gtk/gtkstock.c:358
 msgid "_Italic"
 msgstr "_Kursiiv"
 
-#: ../gtk/gtkstock.c:359
+#: gtk/gtkstock.c:359
 msgid "_Jump to"
 msgstr "_Hüppa kuni"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:361
+#: gtk/gtkstock.c:361
 msgid "Justify|_Center"
 msgstr "_Keskel"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:363
+#: gtk/gtkstock.c:363
 msgid "Justify|_Fill"
 msgstr "_Täida"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:365
+#: gtk/gtkstock.c:365
 msgid "Justify|_Left"
 msgstr "_Vasakule"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:367
+#: gtk/gtkstock.c:367
 msgid "Justify|_Right"
 msgstr "_Paremale"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:370
+#: gtk/gtkstock.c:370
 msgid "Media|_Forward"
 msgstr "Keri e_dasi"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:372
+#: gtk/gtkstock.c:372
 msgid "Media|_Next"
 msgstr "_Järgmine"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:374
+#: gtk/gtkstock.c:374
 msgid "Media|P_ause"
 msgstr "P_ausi"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:376
+#: gtk/gtkstock.c:376
 msgid "Media|_Play"
 msgstr "Es_ita"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:378
+#: gtk/gtkstock.c:378
 msgid "Media|Pre_vious"
 msgstr "Ee_lmine"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:380
+#: gtk/gtkstock.c:380
 msgid "Media|_Record"
 msgstr "_Salvesta"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:382
+#: gtk/gtkstock.c:382
 msgid "Media|R_ewind"
 msgstr "Keri _tagasi"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:384
+#: gtk/gtkstock.c:384
 msgid "Media|_Stop"
 msgstr "_Peata"
 
-#: ../gtk/gtkstock.c:385
+#: gtk/gtkstock.c:385
 msgid "_Network"
 msgstr "_Võrk"
 
-#: ../gtk/gtkstock.c:386
+#: gtk/gtkstock.c:386
 msgid "_New"
 msgstr "_Uus"
 
-#: ../gtk/gtkstock.c:387
+#: gtk/gtkstock.c:387
 msgid "_No"
 msgstr "_Ei"
 
-#: ../gtk/gtkstock.c:388
+#: gtk/gtkstock.c:388
 msgid "_OK"
 msgstr "_Olgu"
 
-#: ../gtk/gtkstock.c:389
+#: gtk/gtkstock.c:389
 msgid "_Open"
 msgstr "_Ava"
 
-#: ../gtk/gtkstock.c:390
+#: gtk/gtkstock.c:390
 msgid "_Paste"
 msgstr "_Aseta"
 
-#: ../gtk/gtkstock.c:391
+#: gtk/gtkstock.c:391
 msgid "_Preferences"
 msgstr "_Eelistused"
 
-#: ../gtk/gtkstock.c:392
+#: gtk/gtkstock.c:392
 msgid "_Print"
 msgstr "_Trüki"
 
-#: ../gtk/gtkstock.c:393
+#: gtk/gtkstock.c:393
 msgid "Print Pre_view"
 msgstr "Trükkimise eel_vaade"
 
-#: ../gtk/gtkstock.c:394
+#: gtk/gtkstock.c:394
 msgid "_Properties"
 msgstr "_Omadused"
 
-#: ../gtk/gtkstock.c:395
+#: gtk/gtkstock.c:395
 msgid "_Quit"
 msgstr "_Lõpeta"
 
-#: ../gtk/gtkstock.c:396
+#: gtk/gtkstock.c:396
 msgid "_Redo"
 msgstr "Uu_esti"
 
-#: ../gtk/gtkstock.c:397
+#: gtk/gtkstock.c:397
 msgid "_Refresh"
 msgstr "_Värskenda"
 
-#: ../gtk/gtkstock.c:399
+#: gtk/gtkstock.c:399
 msgid "_Revert"
 msgstr "_Taasta"
 
-#: ../gtk/gtkstock.c:400
+#: gtk/gtkstock.c:400
 msgid "_Save"
 msgstr "_Salvesta"
 
-#: ../gtk/gtkstock.c:401
+#: gtk/gtkstock.c:401
 msgid "Save _As"
 msgstr "Salvesta _kui"
 
-#: ../gtk/gtkstock.c:402
+#: gtk/gtkstock.c:402
 msgid "_Color"
 msgstr "_Värv"
 
-#: ../gtk/gtkstock.c:403
+#: gtk/gtkstock.c:403
 msgid "_Font"
 msgstr "_Kirjatüüp"
 
-#: ../gtk/gtkstock.c:404
+#: gtk/gtkstock.c:404
 msgid "_Ascending"
 msgstr "_Kasvav"
 
-#: ../gtk/gtkstock.c:405
+#: gtk/gtkstock.c:405
 msgid "_Descending"
 msgstr "K_ahanev"
 
-#: ../gtk/gtkstock.c:406
+#: gtk/gtkstock.c:406
 msgid "_Spell Check"
 msgstr "Õ_igekirjakontroll"
 
-#: ../gtk/gtkstock.c:407
+#: gtk/gtkstock.c:407
 msgid "_Stop"
 msgstr "_Peata"
 
-#: ../gtk/gtkstock.c:408
+#: gtk/gtkstock.c:408
 msgid "_Strikethrough"
 msgstr "_Läbikriipsutus"
 
-#: ../gtk/gtkstock.c:409
+#: gtk/gtkstock.c:409
 msgid "_Undelete"
 msgstr "_Taasta"
 
-#: ../gtk/gtkstock.c:410
+#: gtk/gtkstock.c:410
 msgid "_Underline"
 msgstr "_Allajoonitud"
 
-#: ../gtk/gtkstock.c:411
+#: gtk/gtkstock.c:411
 msgid "_Undo"
 msgstr "_Unusta"
 
-#: ../gtk/gtkstock.c:412
+#: gtk/gtkstock.c:412
 msgid "_Yes"
 msgstr "_Jah"
 
-#: ../gtk/gtkstock.c:413
+#: gtk/gtkstock.c:413
 msgid "_Normal Size"
 msgstr "_Normaalsuurus"
 
-#: ../gtk/gtkstock.c:414
+#: gtk/gtkstock.c:414
 msgid "Best _Fit"
 msgstr "Mahuta _parim"
 
-#: ../gtk/gtkstock.c:415
+#: gtk/gtkstock.c:415
 msgid "Zoom _In"
 msgstr "_Suurenda"
 
-#: ../gtk/gtkstock.c:416
+#: gtk/gtkstock.c:416
 msgid "Zoom _Out"
 msgstr "_Vähenda"
 
-#: ../gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM _Vasakult-paremale märk"
 
-#: ../gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM _Paremalt-vasakule märk"
 
-#: ../gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr ""
 
-#: ../gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr ""
 
-#: ../gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr ""
 
-#: ../gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr ""
 
-#: ../gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr ""
 
-#: ../gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _Null-laiusega tühik"
 
-#: ../gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr ""
 
-#: ../gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr ""
 
-#: ../gtk/gtkthemes.c:71
+#: gtk/gtkthemes.c:71
 #, c-format
 msgid "Unable to locate theme engine in module_path: \"%s\","
 msgstr "Ei leia teemamootorit otsingurajalt 'module_path': \"%s\","
 
-#: ../gtk/gtktipsquery.c:186
+#: gtk/gtktipsquery.c:186
 msgid "--- No Tip ---"
 msgstr "--- Vihjet ei ole ---"
 
-#: ../gtk/gtkuimanager.c:1154
+#: gtk/gtkuimanager.c:1154
 #, c-format
 msgid "Unknown attribute '%s' on line %d char %d"
 msgstr "Tundmatu tunnus '%s', rida %d sümbol %d"
 
-#: ../gtk/gtkuimanager.c:1371
+#: gtk/gtkuimanager.c:1371
 #, c-format
 msgid "Unexpected start tag '%s' on line %d char %d"
 msgstr "Tundmatu algussilt '%s', rida %d sümbol %d"
 
-#: ../gtk/gtkuimanager.c:1461
+#: gtk/gtkuimanager.c:1461
 #, c-format
 msgid "Unexpected character data on line %d char %d"
 msgstr "Tundmatu andmevoog, rida %d sümbol %d"
 
-#: ../gtk/gtkuimanager.c:2272
+#: gtk/gtkuimanager.c:2272
 msgid "Empty"
 msgstr "Tühi"
 
 #. ID
-#: ../modules/input/imam-et.c:454
+#: modules/input/imam-et.c:454
 msgid "Amharic (EZ+)"
 msgstr "Amhari (EZ+)"
 
 #. ID
-#: ../modules/input/imcedilla.c:91
+#: modules/input/imcedilla.c:91
 msgid "Cedilla"
 msgstr "Sedii"
 
 #. ID
-#: ../modules/input/imcyrillic-translit.c:217
+#: modules/input/imcyrillic-translit.c:217
 msgid "Cyrillic (Transliterated)"
 msgstr "Kirillits (translitereeritud)"
 
 #. ID
-#: ../modules/input/iminuktitut.c:127
+#: modules/input/iminuktitut.c:127
 msgid "Inuktitut (Transliterated)"
 msgstr "Inukitut (translitereeritud)"
 
 #. ID
-#: ../modules/input/imipa.c:145
+#: modules/input/imipa.c:145
 msgid "IPA"
 msgstr "IPA"
 
 #. ID
-#: ../modules/input/imthai-broken.c:178
+#: modules/input/imthai-broken.c:178
 msgid "Thai (Broken)"
 msgstr "Tai (katkine)"
 
 #. ID
-#: ../modules/input/imti-er.c:453
+#: modules/input/imti-er.c:453
 msgid "Tigrigna-Eritrean (EZ+)"
 msgstr ""
 
 #. ID
-#: ../modules/input/imti-et.c:453
+#: modules/input/imti-et.c:453
 msgid "Tigrigna-Ethiopian (EZ+)"
 msgstr ""
 
 #. ID
-#: ../modules/input/imviqr.c:244
+#: modules/input/imviqr.c:244
 msgid "Vietnamese (VIQR)"
 msgstr "Vietnami (VIQR)"
 
 #. ID
-#: ../modules/input/imxim.c:28
+#: modules/input/imxim.c:28
 msgid "X Input Method"
 msgstr "X Sisestusmeetod"
 
-#: ../tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Infot faili '%s' ei õnnestunud saada: %s"
diff --git a/po/eu.po b/po/eu.po
index c52677dd05..fc1ad5cfed 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-04-13 20:19+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
 "Language-Team:  <itzulpena@euskalgnu.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Ezin izan da '%s' fitxategia ireki: %s"
@@ -34,7 +34,7 @@ msgid "Image file '%s' contains no data"
 msgstr "'%s' irudi-fitxategiak ez du daturik"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1276,20 +1276,20 @@ msgid "Color Selection"
 msgstr "Kolore-hautapena"
 
 #
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Hautatu _dena"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Sartzeko _metodoak"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Txertatu Unicode kontrol-karakterea"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Fitxategi baliogabea: %s"
@@ -1300,12 +1300,12 @@ msgid "Select A File"
 msgstr "Hautatu fitxategia"
 
 #
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Etxea"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Mahaigaina"
@@ -1318,249 +1318,266 @@ msgstr "(bat ere ez)"
 msgid "Other..."
 msgstr "Besterik..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Ezin da fitxategiari buruzko informaziorik lortu"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Ezin da laster-marka gehitu"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Ezin izan da laster-marka ezabatu"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Ezin izan da karpeta sortu"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Fitxategi-izen baliogabea"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Karpetaren edukia ezin izan da bistaratu"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Ezin da %s-ri buruzko informaziorik lortu: %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Gehitu '%s' karpeta laster-markei"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Gehitu uneko karpeta laster-markei"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Gehitu hautatutako karpetak laster-markei"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Kendu '%s' laster-marka"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Ezin izan da %s-ren laster-markarik gehitu, bide-izena baliogabea delako."
 
 #
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Kendu"
 
 #
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Izena aldatu..."
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Lasterbideak"
 
 #
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Karpeta"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Gehitu"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Gehitu hautatutako karpetak laster-markei"
 
 #
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Kendu"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Kendu hautatutako lastermarka"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Ezin da elementua hautatu"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "Ezin izan da %s-ren laster-markarik gehitu, bide-izena baliogabea delako."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "_Gehitu laster-markei"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Ireki _helbidea"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Erakutsi fitxategi _ezkutuak"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Fitxategiak"
 
 #
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Izena"
 
 #
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Tamaina"
 
 #
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Aldatua"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Hautatu erakutsiko diren fitxategi motak"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Sortu karpeta"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Izena:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Arakatu beste karpetak"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Gorde _karpetan:"
 
 #
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Sortu _karpetan:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Ezin aldatu karpetara, lokala ez delako."
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "%s lasterbidea ez da existitzen"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "I_zena aldatu"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Ezin da %s muntatu"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Idatzi karpeta berriaren izena"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "byte %d"
 msgstr[1] "%d byte"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Gaur"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Atzo"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Ezin izan da karpeta aldatu"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Zehaztutako karpetak bide-izen baliogabea dauka"
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Ezin da '%s' eta '%s' fitxategien izenik eraiki"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Ezin da elementua hautatu"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Ireki helbidea"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Gorde helbidean"
 
 #
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Helbidea:"
 
@@ -1771,7 +1788,8 @@ msgid "This file system does not support mounting"
 msgstr "Fitxategi-sistema honek ez du muntaia onartzen"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Fitxategi-sistema"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1879,7 +1897,7 @@ msgstr "_Gamma-balioa"
 msgid "Error loading icon: %s"
 msgstr "Errorea ikonoa kargatzean: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1892,7 +1910,7 @@ msgstr ""
 "Kopia bat hemen lor dezakezu:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "'%s' ikonoa ez dago gaian"
@@ -1986,7 +2004,7 @@ msgid "clear"
 msgstr "garbitu"
 
 #
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Hautatu dena"
 
@@ -2440,43 +2458,43 @@ msgstr "Zooma ha_ndiagotu"
 msgid "Zoom _Out"
 msgstr "Zooma t_xikiagotu"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM _Ezkerretik_eskuinera marka"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM E_skuinetik_ezkerrera marka"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Ezkerretik_eskuinera ka_psulatzea"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Eskuinetik_ezkerrera _kapsulatzea"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Ezkerretik_eskuinera _gainidaztea"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Eskuinetik_ezkerrera gai_nidaztea"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Formateatze direkzionala agertzea"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _Zero zabaleraren tartea"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Zero zabaleraren _mihiztatzailea"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Zero zabaleraren ez-mihiztatzailea"
 
@@ -2558,7 +2576,7 @@ msgstr "Vietnamdarra (VIQR)"
 msgid "X Input Method"
 msgstr "X sarrera-metodoa"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Ezin izan da %s fitxaegirako informaziorik lortu: %s"
diff --git a/po/fa.po b/po/fa.po
index d154de3309..0c616c6ddb 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-02-14 18:03+0330\n"
 "Last-Translator: Roozbeh Pournader <roozbeh@farsiweb.info>\n"
 "Language-Team: Persian <farsi@lists.sharif.edu>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "باز کردن پرونده‌ی «%s» شکست خورد: %s"
@@ -28,7 +28,7 @@ msgid "Image file '%s' contains no data"
 msgstr "پرونده‌ی تصویری «%s» هیچ داده‌ای ندارد"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1252,20 +1252,20 @@ msgstr "چرخ رنگ"
 msgid "Color Selection"
 msgstr "انتخاب رنگ"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "انتخاب _همه"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "روش‌های ورودی"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_درج نویسه‌ی کنترلی یونی‌کد"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "نام پرونده‌ی نامعتبر: %s"
@@ -1274,12 +1274,12 @@ msgstr "نام پرونده‌ی نامعتبر: %s"
 msgid "Select A File"
 msgstr "یک پرونده انتخاب کنید"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "آغازه"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "رومیزی"
@@ -1293,242 +1293,258 @@ msgstr "(هیچ‌کدام)"
 msgid "Other..."
 msgstr "غیره..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "نمی‌توان اطلاعاتی درباره‌ی پرونده بازیابی کرد"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "نمی‌توان چوب‌الفی اضافه کرد"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "نمی‌توان چوب‌الف را حذف کرد"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "نمی‌توان پوشه را ایجاد کرد"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "نام پرونده‌ی نامعتبر"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "نمی‌توان محتویات پوشه را نمایش داد"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "نمی‌توان درباره‌ی «%s» اطلاعات گرفت: %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "اضافه کردن پوشه‌ی «%s» به چوب‌الفها"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "اضافه کردن پوشه‌ی فعلی به چوب‌الفها"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "اضافه کردن پوشه‌های انتخاب‌شده به چوب‌الفها"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "حذف چوب‌الف «%s»"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "نمی‌توان برای «%s» چوب‌الفی اضافه کرد چون نام مسیر نامعتبری است."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "حذف"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_تغییر نام"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "میانبرها"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "پوشه"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_افزودن"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 #, fuzzy
 msgid "Add the selected folder to the Bookmarks"
 msgstr "افزودن پوشه‌ی انتخاب‌شده به چوب‌الفها"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_حذف"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "حذف پوشه‌های انتخاب‌شده"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "نمی‌توان مورد را انتخاب کرد"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "نمی‌توان برای «%s» چوب‌الفی اضافه کرد چون نام مسیر نامعتبری است."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "_افزودن به میانبرها"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "باز کردن _مکان"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "نمایش پرونده‌های _مخفی"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "پرونده‌ها"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "_نام:"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "اندازه"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "تغییریافته"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "انتخاب این که کدام نوع پرونده‌ها نمایش داده شوند"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "ایجاد پو_شه"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_نام:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_مرور برای سایر پوشه‌ها"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "ذخیره در پو_شه‌ی:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "ایجاد در پو_شه‌ی:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "نمی‌توان به پوشه رفت چون محلی نیست"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "میانبر %s وجود ندارد"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_تغییر نام"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "نمی‌توان %s را سوار کرد"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "نام پوشه‌ی جدید را وارد کنید"
 
 # c-format
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%Id بایت"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%I.1f کیلو"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%I.1f مگا"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%I.1f گیگا"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "نامعلوم"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "امروز"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "دیروز"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "نمی‌توان پوشه را تغییر داد"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "پوشه‌ای که مشخص کرده‌اید مسیر نامعتبری است."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "نمی‌توان از «%s» و «%s» نام پرونده ساخت"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "نمی‌توان مورد را انتخاب کرد"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "باز کردن مکان"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "ذخیره در مکان"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_مکان:"
 
@@ -1727,7 +1743,8 @@ msgid "This file system does not support mounting"
 msgstr "این سیستم پرونده‌ها از سوار شدن پشتیبانی نمی‌کند"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "سیستم پرونده‌ها"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1829,7 +1846,7 @@ msgstr "مقدار _گاما"
 msgid "Error loading icon: %s"
 msgstr "خطا در بار کردن شمایل: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1842,7 +1859,7 @@ msgstr ""
 "می‌توانید یک نسخه از نشانی زیر بگیرید:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "شمایل «%s» در تم وجود ندارد"
@@ -1930,7 +1947,7 @@ msgstr "(نامعلوم)"
 msgid "clear"
 msgstr "پاک شود"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "انتخاب همه"
 
@@ -2367,43 +2384,43 @@ msgstr "زوم به _داخل"
 msgid "Zoom _Out"
 msgstr "زوم به _خارج"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "نشانه‌ی _چپ‌به‌راست"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "نشانه‌ی _راست‌به‌چپ"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "زیرمتن چپ‌به‌راست_"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "ز_یرمتن راست‌به‌چپ"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "زیرمتن ا_کیداً چپ‌به‌راست"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "زیرمتن اکی_داً راست‌به‌چپ"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "پایان زیرمتن_"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "فاصله‌ی _بی‌عرض"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "_اتصال مجازی"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "_فاصله‌ی مجازی"
 
@@ -2485,7 +2502,7 @@ msgstr "ویتنامی (VIQR)"
 msgid "X Input Method"
 msgstr "شیوه‌ی ورودی X"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "نمی‌توان برای پرونده‌ی «%s» اطلاعات گرفت: %s"
diff --git a/po/fi.po b/po/fi.po
index 8ad5b7ad87..3eb7833839 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-02-06 03:48+0200\n"
 "Last-Translator: Pauli Virtanen <pauli.virtanen@hut.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Tiedoston \"%s\" avaus epäonnistui: %s"
@@ -31,7 +31,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Kuvatiedostossa \"%s\" ei ole sisältöä"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1257,20 +1257,20 @@ msgstr "Väriympyrä"
 msgid "Color Selection"
 msgstr "Värin valinta"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Valitse k_aikki"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Syöttö_tavat"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Lisää Unicode-säätömerkki"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Virheellinen tiedostonimi: %s"
@@ -1279,12 +1279,12 @@ msgstr "Virheellinen tiedostonimi: %s"
 msgid "Select A File"
 msgstr "Valitse tiedosto"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Koti"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Työpöytä"
@@ -1297,246 +1297,262 @@ msgstr "(ei mikään)"
 msgid "Other..."
 msgstr "Muu..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Tiedostosta ei saatu tietoja"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Kirjanmerkkiä ei voitu lisätä"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Kirjanmerkin poisto epäonnistui"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Kansion luominen epäonnistui"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Virheellinen tiedostonimi"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Kansion sisältöä ei voitu näyttää"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Kohteesta \"%s\" ei saatu tietoja: %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Lisää kansio \"%s\" kirjanmerkkeihin"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Lisää nykyinen kansio kirjanmerkkeihin"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Lisää valitut kansiot kirjanmerkkeihin"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Poista kirjanmerkki \"%s\""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Kohteelle \"%s\" ei voi lisätä kirjanmerkkiä, koska sen polku on "
 "virheellinen."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Poista"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Nimeä uudelleen"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Pikavalinnat"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Kansio"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Lisää"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 #, fuzzy
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Lisää valittu kansio kirjanmerkkeihin"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Poista"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Poista valittu kirjanmerkki"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Kohteen valitseminen ei onnistunut"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "Kohteelle \"%s\" ei voi lisätä kirjanmerkkiä, koska sen polku on "
 "virheellinen."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "_Lisää kirjanmerkkeihin"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Avaa si_jainti"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Näytä _piilotiedostot"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Tiedostot"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Nimi"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Koko"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Muokattu"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Valitse minkätyyppiset tiedostot näkyvät"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Luo _kansio"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Selaa muita kansioita"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Tallenna _kansioon:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Luo _kansioon:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Kansioon ei voi siirtyä, koska se ei ole paikallinen"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Pikavalintaa %s ei ole olemassa"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Nimeä uudelleen"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Taltion %s liittäminen ei onnistunut"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Kirjoita uuden kansion nimi"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d tavu"
 msgstr[1] "%d tavua"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f kt"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f Mt"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f Gt"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Tänään"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Eilen"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Kansion vaihtaminen epäonnistui"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Annetun kansion polku on virheellinen."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Tiedostonimen muodostus osista \"%s\" ja \"%s\" ei onnistunut"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Kohteen valitseminen ei onnistunut"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Avaa sijainti"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Tallenna sijaintiin"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "Si_jainti:"
 
@@ -1738,7 +1754,8 @@ msgid "This file system does not support mounting"
 msgstr "Tämä tiedostojärjestelmä ei tue liittämistä"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Tiedostojärjestelmä"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1840,7 +1857,7 @@ msgstr "_Gamma-arvo"
 msgid "Error loading icon: %s"
 msgstr "Virhe ladatessa kuvaketta: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1853,7 +1870,7 @@ msgstr ""
 "Sen voi hakea osoitteesta:\n"
 "    %s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Kuvaketta \"%s\" ei ole teemassa"
@@ -1941,7 +1958,7 @@ msgstr "(tuntematon)"
 msgid "clear"
 msgstr "tyhjennä"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Valitse kaikki"
 
@@ -2380,43 +2397,43 @@ msgstr "_Lähennä"
 msgid "Zoom _Out"
 msgstr "L_oitonna"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM _Vasemmalta oikealle -merkki"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM _Oikealta vasemmalle -merkki"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Vasemmalta oikealle -_upotus"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Oikelta vasemmalle -u_potus"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Vasemmalta oikealle -_sivuutus"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Oikealta vasemmalle -s_ivuutus"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF P_alauta suuntamuotoilu"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _Nollan levyinen väli"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWN Nollan levyinen _yhdistäjä"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Nollan levyinen _ei-yhdistäjä"
 
@@ -2499,7 +2516,7 @@ msgstr "Vietnam (VIQR)"
 msgid "X Input Method"
 msgstr "X-syöttötapa"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Tiedoston \"%s\" tietojen saaminen epäonnistui: %s"
diff --git a/po/fr.po b/po/fr.po
index 3c0c76c8a6..af5fe6b9c2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.6.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-06-20 22:49+0200\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "L'ouverture du fichier « %s » a échoué : %s"
@@ -32,7 +32,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Le fichier image « %s » ne contient pas de données"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1282,20 +1282,20 @@ msgstr "Cercle des couleurs"
 msgid "Color Selection"
 msgstr "Sélecteur de couleurs"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "_Tout sélectionner"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Méthodes de saisie"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Insérer un caractère de contrôle Unicode"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Nom de fichier non valide : %s"
@@ -1304,12 +1304,12 @@ msgstr "Nom de fichier non valide : %s"
 msgid "Select A File"
 msgstr "Sélectionner un fichier"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Dossier personnel"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Bureau"
@@ -1322,23 +1322,23 @@ msgstr "(Aucun)"
 msgid "Other..."
 msgstr "Autre..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Impossible d'obtenir les informations concernant le fichier"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Impossible d'ajouter un signet"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Impossible de supprimer le signet"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Le dossier ne peut être créé"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1347,225 +1347,241 @@ msgstr ""
 "Essayez d'utiliser un nom différent pour le dossier ou de renommer le "
 "fichier en premier."
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Nom de fichier non valide"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Le contenu du dossier ne peut être affiché"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Impossible d'obtenir les informations concernant « %s » : %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Ajouter le dossier « %s » aux signets"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Ajouter le dossier courant aux signets"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Ajouter les dossiers sélectionnés aux signets"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Supprimer le signet « %s »"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Impossible d'ajouter un signet pour « %s » car ce n'est pas un chemin "
 "d'accès valide."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Enlever"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Renommer"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Dossier"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "A_jouter"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 #, fuzzy
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Ajouter le dossier sélectionné aux signets"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Enlever"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Supprimer le signet sélectionné"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Impossible de sélectionner l'élément"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "Impossible d'ajouter un signet pour « %s » car ce n'est pas un chemin "
 "d'accès valide."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "A_jouter aux raccourcis"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Ouvrir un _emplacement"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Afficher les fichiers _cachés"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Fichiers"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Nom"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Taille"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Modifié"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Sélectionnez les types de fichiers à afficher"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Créer un _dossier"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Nom :"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Parcourir pour d'autres dossiers"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Enregistrer dans le _dossier :"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Créer dans le _dossier :"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Impossible d'aller au dossier car il n'est pas local"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Le raccourci %s n'existe pas"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Renommer"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Impossible de monter %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Saisissez le nom du nouveau dossier"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d octet"
 msgstr[1] "%d octets"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f k"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Hier"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Impossible d'aller au dossier"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Le dossier que vous avez spécifié a un chemin d'accès non valide."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 "Impossible de construire le nom du fichier à partir de « %s » et « %s »"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Impossible de sélectionner l'élément"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Ouvrir un emplacement"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Enregistrer dans un emplacement"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Emplacement :"
 
@@ -1773,7 +1789,8 @@ msgid "This file system does not support mounting"
 msgstr "Ce système de fichiers ne supporte pas le montage"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Système de fichiers"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1877,7 +1894,7 @@ msgstr "Valeur _gamma"
 msgid "Error loading icon: %s"
 msgstr "Erreur de chargement de l'icône : %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1890,7 +1907,7 @@ msgstr ""
 "l'installer. Vous pouvez obtenir une copie à :\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "L'icône « %s » n'est pas présente dans le thème"
@@ -1978,7 +1995,7 @@ msgstr "(inconnu)"
 msgid "clear"
 msgstr "effacer"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Tout sélectionner"
 
@@ -2416,43 +2433,43 @@ msgstr "Zoom a_vant"
 msgid "Zoom _Out"
 msgstr "Zoom a_rrière"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM Marque _gauche-à-droite"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM Marque _droite-à-gauche"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE _Enchâssement gauche-à-droite "
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE E_nchâssement droite-à-gauche"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO _Forçage gauche-à-droite"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO F_orçage droite-à-gauche"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Dépilement de formatage directionnel"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS E_space sans chasse"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ _Liant sans chasse"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ _Anti-liant sans chasse"
 
@@ -2534,7 +2551,7 @@ msgstr "Vietnamien (VIQR)"
 msgid "X Input Method"
 msgstr "Méthode de saisie X"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Impossible d'obtenir les informations du fichier « %s » : %s"
diff --git a/po/ga.po b/po/ga.po
index c1be28ea4a..f7ae7c321e 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-05-26 20:00+0000\n"
 "Last-Translator: Alan Horkan \n"
 "Language-Team: Gaeilge <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Teip as oscail comhad '%s': %s"
@@ -28,7 +28,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Níl sonraí ar fáil san comhad d'Íomha '%s'"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1222,20 +1222,20 @@ msgstr "Roth Dathanna"
 msgid "Color Selection"
 msgstr "Roghachais Dath"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Roghnaigh _Gach Rud"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Modhanna Ionchuir"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr ""
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Comhad neamhbhailí: %s"
@@ -1245,12 +1245,12 @@ msgstr "Comhad neamhbhailí: %s"
 msgid "Select A File"
 msgstr "Pioc Comhad"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Baile"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Deasc"
@@ -1264,256 +1264,272 @@ msgstr "ceann ar bith"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Comhad neamhbhailí: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 "Earraidh ag cruthaigh fillteán %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Scríos"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Athainmnigh"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Fillteán"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Suimigh"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Scríos"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "Earraidh ag cruthaigh fillteán %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "Oscail Áit"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Comhaid"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 #, fuzzy
 msgid "Name"
 msgstr "_Ainm:"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Méid"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "Cruthaigh _Fillteán"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Ainm:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 #, fuzzy
 msgid "Save in _folder:"
 msgstr "Sábháil mar _Fillteán:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 #, fuzzy
 msgid "Create in _folder:"
 msgstr "Cruthaigh _Fillteán"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Athainmnigh"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "Earraidh ag cruthaigh fillteán %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "(gan fhios)"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Inniu"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Inné"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Cruthaigh _Fillteán"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "Earraidh ag cruthaigh fillteán %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Oscail Áit"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "Oscail Áit"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Áit:"
 
@@ -1701,7 +1717,8 @@ msgid "This file system does not support mounting"
 msgstr ""
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Corás Comhaid"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1804,7 +1821,7 @@ msgstr "Luach _Gamma"
 msgid "Error loading icon: %s"
 msgstr "Earraidh ag lódáil dealbh: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1813,7 +1830,7 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr ""
@@ -1901,7 +1918,7 @@ msgstr "(gan fhios)"
 msgid "clear"
 msgstr "bánaigh"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Roghnaigh Gach Rud"
 
@@ -2341,43 +2358,43 @@ msgstr "Súmáil _Isteach"
 msgid "Zoom _Out"
 msgstr "Súmáil _Amach"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr ""
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr ""
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr ""
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr ""
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr ""
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr ""
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr ""
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr ""
 
@@ -2459,7 +2476,7 @@ msgstr "Vítneaimis (VIQR)"
 msgid "X Input Method"
 msgstr ""
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 2da2050229..b957e1ddfe 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 1.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2000-08-10 23:10+0200\n"
 "Last-Translator: Jesus Bravo Alvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr ""
@@ -33,7 +33,7 @@ msgid "Image file '%s' contains no data"
 msgstr ""
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1234,21 +1234,21 @@ msgstr "Selección de Fonte"
 msgid "Color Selection"
 msgstr "Selección de Fonte"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 #, fuzzy
 msgid "Select _All"
 msgstr "Borrar"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr ""
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr ""
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr ""
@@ -1258,13 +1258,13 @@ msgstr ""
 msgid "Select A File"
 msgstr "Borrar Ficheiro"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 #, fuzzy
 msgid "Home"
 msgstr "Axuda"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr ""
@@ -1278,255 +1278,271 @@ msgstr "ningún"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Renomear"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Poñer Cor"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "Vermello:"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "Renomear"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 #, fuzzy
 msgid "Folder"
 msgstr "Ficheiros"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 #, fuzzy
 msgid "_Remove"
 msgstr "Vermello:"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Poñer Cor"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "Selección: "
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Ficheiros"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 #, fuzzy
 msgid "Name"
 msgstr "Renomear"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 #, fuzzy
 msgid "Size"
 msgstr "Tamaño:"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 #, fuzzy
 msgid "Modified"
 msgstr "Modo: "
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "Poñer Cor"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 #, fuzzy
 msgid "_Name:"
 msgstr "Renomear"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 #, fuzzy
 msgid "Save in _folder:"
 msgstr "Poñer Cor"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 #, fuzzy
 msgid "Create in _folder:"
 msgstr "Poñer Cor"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "Renomear"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr "Poñer Cor"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 #, fuzzy
 msgid "Unknown"
 msgstr "(descoñecido)"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Poñer Cor"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr "Poñer Cor"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "Selección: "
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 #, fuzzy
 msgid "_Location:"
 msgstr "Selección: "
@@ -1723,7 +1739,7 @@ msgstr ""
 
 #: gtk/gtkfilesystemunix.c:639
 #, fuzzy
-msgid "Filesystem"
+msgid "File System"
 msgstr "Ficheiros"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1829,7 +1845,7 @@ msgstr "Valor gamma"
 msgid "Error loading icon: %s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1838,7 +1854,7 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr ""
@@ -1933,7 +1949,7 @@ msgstr "(descoñecido)"
 msgid "clear"
 msgstr "limpar"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 #, fuzzy
 msgid "Select All"
 msgstr "Borrar"
@@ -2388,43 +2404,43 @@ msgstr ""
 msgid "Zoom _Out"
 msgstr ""
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr ""
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr ""
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr ""
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr ""
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr ""
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr ""
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr ""
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr ""
 
@@ -2506,7 +2522,7 @@ msgstr ""
 msgid "X Input Method"
 msgstr ""
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr ""
diff --git a/po/gu.po b/po/gu.po
index c3c05527f7..347dbe4f81 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-03-25 01:10+0530\n"
 "Last-Translator: Kartik Mistry <kartik_m@magnet-i.com> \n"
 "Language-Team:  Gujarati<utkarsh@magnet-i.com>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "'%s' ફાઈલ લાવવામાં નિષ્ફળ: %s"
@@ -27,7 +27,7 @@ msgid "Image file '%s' contains no data"
 msgstr "ચિત્ર ફાઈલ '%s'માં કોઇ માહિતી નથી"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1252,20 +1252,20 @@ msgstr "પૈડંુ"
 msgid "Color Selection"
 msgstr "રંગની પસંદગી"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "બધું પસંદ કરો"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "ઈનપુટ માટેની પધ્ધતિઓ (_M)"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "યૂનિકોડ નિયંત્રણ અક્ષર ઉમેરો (_I)"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "અયોગ્ય ફાઈલનામ: %s"
@@ -1275,12 +1275,12 @@ msgstr "અયોગ્ય ફાઈલનામ: %s"
 msgid "Select A File"
 msgstr "પસંદ કરી શકાય તેવુ"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "ઘર(_H)"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "ડૅસ્કટોપ"
@@ -1294,263 +1294,279 @@ msgstr "કોઈ નહિ"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr "%s વિશે જાણકારી મેળવી શકાતી નથી: %s"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 #, fuzzy
 msgid "Could not add a bookmark"
 msgstr "%s માટે બૂકમાર્ક ઉમેરી શકાતો નથી: %s"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 #, fuzzy
 msgid "Could not remove bookmark"
 msgstr ""
 "%s માટે બૂકમાર્ક દૂર કરી શકાતુ નથી:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 #, fuzzy
 msgid "The folder could not be created"
 msgstr "ફેરબદલી માટેનું બટન કાર્યશીલ કરી શકાય છે"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "અયોગ્ય ફાઈલનામ: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 #, fuzzy
 msgid "The folder contents could not be displayed"
 msgstr "શું સમાવિષ્ટ પ્રવેશોને બદલી શકાય છે"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "%s વિશે જાણકારી મેળવી શકાતી નથી: %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, fuzzy, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "%s માટે બૂકમાર્ક ઉમેરી શકાતે નથી કારણકે તે અયોગ્ય પથ નામ છે."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "કાઢી નાખો(_R)"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "ફરીથી નામ આપો (_R)"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "ટૂંકા રસ્તા"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "ફોલ્ડર"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "ઉમેરો(_A)"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "કાઢી નાખો(_R)"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "ફોલ્ડર %s બનાવી શકાતુ નથી:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "%s માટે બૂકમાર્ક ઉમેરી શકાતે નથી કારણકે તે અયોગ્ય પથ નામ છે."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "ટૂંકા રસ્તા"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "જગ્યા ખોલો"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "સંતાડેલ ફાઇલો બતાવો"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "ફાઈલો"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "નામ"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "માપ"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "સુધારેલ"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "ફોલ્ડર બનાવો (_F)"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "નામ: (_N)"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "બીજા ફોલ્ડરો માટે શોધો (_B)"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "ફોલ્ડરમાં સંગ્રહ કરો: (_F)"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "ફોલ્ડર બનાવો (_F)"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "તમે સ્પષ્ટ કરેલ ફોલ્ડરમાં બદલી શકાતુ નથી કારણકે તે અયોગ્ય પથ છે."
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "ટૂંકાણ %s અસ્તિત્વમાં નથી"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "ફરીથી નામ આપો (_R)"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "ફોલ્ડર %s બનાવી શકાતુ નથી:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "નવા ફોલ્ડરના પ્રકારનુ નામ"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d બાઇટ"
 msgstr[1] "%d બાઇટ"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "અજાણીતુ"
 
 # #-#-#-#-#  libgnomeui.HEAD.hi.po (libgnomeui-2.0.hi)  #-#-#-#-#
 # libgnomeui/gnome-file-entry.c:216
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "આજે"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "ગઇકાલે"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "પ્રવેગ(accelerators) બદલી શકે છે"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 #, fuzzy
 msgid "The folder you specified is an invalid path."
 msgstr "તમે સ્પષ્ટ કરેલ ફોલ્ડરમાં બદલી શકાતુ નથી કારણકે તે અયોગ્ય પથ છે."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, fuzzy, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 "'%s' અને '%s' માંથી ફાઇલ લાવી શકાતી નથી:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "ફોલ્ડર %s બનાવી શકાતુ નથી:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "જગ્યા ખોલો"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "જગ્યા ખોલો"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "જગ્યા: (_L)"
 
@@ -1749,7 +1765,8 @@ msgid "This file system does not support mounting"
 msgstr "આ ફાઇલ સિસ્ટમ માઉન્ટ કરવાનુને આધાર આપતી નથી"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "ફાઈલસિસ્ટમ"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1851,7 +1868,7 @@ msgstr "ગામાની કિંમત(_G)"
 msgid "Error loading icon: %s"
 msgstr "ચિહ્ન લાવવામાં ભૂલ: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1864,7 +1881,7 @@ msgstr ""
 "તમે માંથી નકલ મેળવી શકો છો:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "ચિહ્ન '%s' થીમમાં હાજર નથી"
@@ -1952,7 +1969,7 @@ msgstr "(અજાણ્યુ)"
 msgid "clear"
 msgstr "સાફ કરો"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "બધું પસંદ કરો"
 
@@ -2390,43 +2407,43 @@ msgstr "મોટુ કરો(_I)"
 msgid "Zoom _Out"
 msgstr "નાનુ કરો(_O)"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM ડાબેથી-જમણાની નિશાની"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM જમણેથી-ડાબેથી નિશાની"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE ડાબેથી જમણે જડવું"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE જમણેથી ડાબે જડવું(_m)"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO ડાબેથી જમણે ઉપર ચઢવુ(_o)"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO જમણેથી ડાબે ઉપર ચઢવુ(_v)"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Pop દિશાકીય ફોરમેટિંગ(_P)"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _શૂન્ય પહોળાઈ(_Z)"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ શૂન્ય પહોળાઈને જોડનાર(_j)"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ શૂન્ય પહોળાઈ ન જોડનાર(_n)"
 
@@ -2509,7 +2526,7 @@ msgstr "Vietnamese (VIQR)"
 msgid "X Input Method"
 msgstr "X ઈનપુટ પદ્ધતિ"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "ફાઈલ '%s' માટેની જાણકારી મેળવી શકાતી નથી: %s"
diff --git a/po/he.po b/po/he.po
index 65d47edbc0..13b2373cc1 100644
--- a/po/he.po
+++ b/po/he.po
@@ -22,115 +22,115 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+.HEAD.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:26+0000\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-07-08 19:10+0300\n"
 "Last-Translator: Yair Hershkovitz <yairhr@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:153 ../gdk-pixbuf/gdk-pixbuf-io.c:838
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1089 ../tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "נכשל בפתיחת הקובץ '%s': %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:166 ../gdk-pixbuf/gdk-pixbuf-io.c:850
+#: gdk-pixbuf/gdk-pixbuf-animation.c:166 gdk-pixbuf/gdk-pixbuf-io.c:850
 #, c-format
 msgid "Image file '%s' contains no data"
 msgstr "התמונה '%s' לא מכילה מידע"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:208 ../gdk-pixbuf/gdk-pixbuf-io.c:887
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1130 ../tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "נכשל בפתיחת התמונה '%s': הסיבה איננה ידועה, כנראה קובץ תמונה פגום"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:241
+#: gdk-pixbuf/gdk-pixbuf-animation.c:241
 #, c-format
 msgid ""
 "Failed to load animation '%s': reason not known, probably a corrupt "
 "animation file"
 msgstr "נכשל בפתיחת ההנפשה '%s': הסיבה איננה ידועה, כנראה קובץ הנפשה פגום"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:444
+#: gdk-pixbuf/gdk-pixbuf-io.c:444
 #, c-format
 msgid "Unable to load image-loading module: %s: %s"
 msgstr "לא מצליח לטעון את מודול התמונה: %s %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:459
+#: gdk-pixbuf/gdk-pixbuf-io.c:459
 #, c-format
 msgid ""
 "Image-loading module %s does not export the proper interface; perhaps it's "
 "from a different GTK version?"
 msgstr ""
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:628 ../gdk-pixbuf/gdk-pixbuf-io.c:680
+#: gdk-pixbuf/gdk-pixbuf-io.c:628 gdk-pixbuf/gdk-pixbuf-io.c:680
 #, c-format
 msgid "Image type '%s' is not supported"
 msgstr "סוג התמונה '%s' אינו נתמך"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:720
+#: gdk-pixbuf/gdk-pixbuf-io.c:720
 #, c-format
 msgid "Couldn't recognize the image file format for file '%s'"
 msgstr "לא ניתן לזהות את פורמט התמונה בקובץ '%s'"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:728
+#: gdk-pixbuf/gdk-pixbuf-io.c:728
 msgid "Unrecognized image file format"
 msgstr "פורמט קובץ תמונה לא מזוהה"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:896
+#: gdk-pixbuf/gdk-pixbuf-io.c:896
 #, c-format
 msgid "Failed to load image '%s': %s"
 msgstr "נכשל בטעינת התמונה '%s': %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1357
+#: gdk-pixbuf/gdk-pixbuf-io.c:1357
 #, c-format
 msgid "Error writing to image file: %s"
 msgstr "שגיאה בכתיבה לקובץ תמונה: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1403 ../gdk-pixbuf/gdk-pixbuf-io.c:1532
+#: gdk-pixbuf/gdk-pixbuf-io.c:1403 gdk-pixbuf/gdk-pixbuf-io.c:1532
 #, c-format
 msgid "This build of gdk-pixbuf does not support saving the image format: %s"
 msgstr "בניה זו של gdk-pixbuf לא תומכת בשמירת התמונה בפורמט: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1437
+#: gdk-pixbuf/gdk-pixbuf-io.c:1437
 msgid "Insufficient memory to save image to callback"
 msgstr ""
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1449
+#: gdk-pixbuf/gdk-pixbuf-io.c:1449
 msgid "Failed to open temporary file"
 msgstr "נכשל בפתיחת קובץ זמני"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1474
+#: gdk-pixbuf/gdk-pixbuf-io.c:1474
 msgid "Failed to read from temporary file"
 msgstr "נכשל בקריאה מקובץ זמני"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1708
+#: gdk-pixbuf/gdk-pixbuf-io.c:1708
 #, c-format
 msgid "Failed to open '%s' for writing: %s"
 msgstr "נכשל בפתיחת '%s' לכתיבה: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1732
+#: gdk-pixbuf/gdk-pixbuf-io.c:1732
 #, c-format
 msgid ""
 "Failed to close '%s' while writing image, all data may not have been saved: %"
 "s"
 msgstr "נכשל בסגירת '%s' בזמן כתיבת תמונה, ייתכן וכל המידע לא נשמר: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1952 ../gdk-pixbuf/gdk-pixbuf-io.c:2002
+#: gdk-pixbuf/gdk-pixbuf-io.c:1952 gdk-pixbuf/gdk-pixbuf-io.c:2002
 msgid "Insufficient memory to save image into a buffer"
 msgstr "אין מספיק זיכרון לשמירת התמונה לחוצץ"
 
-#: ../gdk-pixbuf/gdk-pixbuf-loader.c:383
+#: gdk-pixbuf/gdk-pixbuf-loader.c:383
 #, c-format
 msgid "Incremental loading of image type '%s' is not supported"
 msgstr ""
 
-#: ../gdk-pixbuf/gdk-pixbuf-loader.c:411 ../gdk-pixbuf/gdk-pixbuf-loader.c:513
+#: gdk-pixbuf/gdk-pixbuf-loader.c:411 gdk-pixbuf/gdk-pixbuf-loader.c:513
 #, c-format
 msgid ""
 "Internal error: Image loader module '%s' failed to begin loading an image, "
@@ -139,219 +139,214 @@ msgstr ""
 "שגיאה פנימית: מודול טעינת התמונה '%s' נכשל בתחילת טעינת תמונה, אך לא נתן "
 "סיבה לכשלון זה"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:147
+#: gdk-pixbuf/gdk-pixdata.c:147
 msgid "Image header corrupt"
 msgstr "כותרת תמונה פגומה"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:152
+#: gdk-pixbuf/gdk-pixdata.c:152
 msgid "Image format unknown"
 msgstr "פורמט תמונה לא ידוע"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:157 ../gdk-pixbuf/gdk-pixdata.c:487
+#: gdk-pixbuf/gdk-pixdata.c:157 gdk-pixbuf/gdk-pixdata.c:487
 msgid "Image pixel data corrupt"
 msgstr "מידע הפיקסלים של התמונה פגום"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:431
+#: gdk-pixbuf/gdk-pixdata.c:431
 #, c-format
 msgid "failed to allocate image buffer of %u byte"
 msgid_plural "failed to allocate image buffer of %u bytes"
 msgstr[0] "נכשל בהקצאת חוצץ תמונה של בית אחד"
 msgstr[1] "נכשל בהקצאת חוצץ תמונה של %u בתים"
 
-#: ../gdk-pixbuf/io-ani.c:244
+#: gdk-pixbuf/io-ani.c:244
 msgid "Unexpected icon chunk in animation"
 msgstr "נתך סמל לא צפוי בהנפשה"
 
-#: ../gdk-pixbuf/io-ani.c:337
+#: gdk-pixbuf/io-ani.c:337
 msgid "Unsupported animation type"
 msgstr "סוג הנפשה שאינו נתמך"
 
-#: ../gdk-pixbuf/io-ani.c:348 ../gdk-pixbuf/io-ani.c:538
+#: gdk-pixbuf/io-ani.c:348 gdk-pixbuf/io-ani.c:538
 msgid "Invalid header in animation"
 msgstr "כותרת לא תקנית בהנפשה"
 
-#: ../gdk-pixbuf/io-ani.c:358 ../gdk-pixbuf/io-ani.c:382
-#: ../gdk-pixbuf/io-ani.c:441 ../gdk-pixbuf/io-ani.c:460
-#: ../gdk-pixbuf/io-ani.c:511 ../gdk-pixbuf/io-ani.c:583
+#: gdk-pixbuf/io-ani.c:358 gdk-pixbuf/io-ani.c:382 gdk-pixbuf/io-ani.c:441
+#: gdk-pixbuf/io-ani.c:460 gdk-pixbuf/io-ani.c:511 gdk-pixbuf/io-ani.c:583
 msgid "Not enough memory to load animation"
 msgstr "אין מספיק זכרון לטעינת ההנפשה"
 
-#: ../gdk-pixbuf/io-ani.c:400 ../gdk-pixbuf/io-ani.c:417
-#: ../gdk-pixbuf/io-ani.c:428
+#: gdk-pixbuf/io-ani.c:400 gdk-pixbuf/io-ani.c:417 gdk-pixbuf/io-ani.c:428
 msgid "Malformed chunk in animation"
 msgstr "נתח פגום בהנפשה"
 
-#: ../gdk-pixbuf/io-ani.c:676
+#: gdk-pixbuf/io-ani.c:676
 msgid "The ANI image format"
 msgstr "פורמט תמונת ANI"
 
-#: ../gdk-pixbuf/io-bmp.c:228 ../gdk-pixbuf/io-bmp.c:306
-#: ../gdk-pixbuf/io-bmp.c:338 ../gdk-pixbuf/io-bmp.c:361
-#: ../gdk-pixbuf/io-bmp.c:442
+#: gdk-pixbuf/io-bmp.c:228 gdk-pixbuf/io-bmp.c:306 gdk-pixbuf/io-bmp.c:338
+#: gdk-pixbuf/io-bmp.c:361 gdk-pixbuf/io-bmp.c:442
 msgid "BMP image has bogus header data"
 msgstr "לתמונת ה BMP יש מידע כותרת מזוייף"
 
-#: ../gdk-pixbuf/io-bmp.c:239 ../gdk-pixbuf/io-bmp.c:401
+#: gdk-pixbuf/io-bmp.c:239 gdk-pixbuf/io-bmp.c:401
 msgid "Not enough memory to load bitmap image"
 msgstr "אין מספיק זכרון לטעינת תמונת מפת סיביות"
 
-#: ../gdk-pixbuf/io-bmp.c:287
+#: gdk-pixbuf/io-bmp.c:287
 msgid "BMP image has unsupported header size"
 msgstr "לתמונת ה BMP יש גודל כותרת שאינו נתמך"
 
-#: ../gdk-pixbuf/io-bmp.c:325
+#: gdk-pixbuf/io-bmp.c:325
 msgid "Topdown BMP images cannot be compressed"
 msgstr ""
 
-#: ../gdk-pixbuf/io-bmp.c:1203
+#: gdk-pixbuf/io-bmp.c:1203
 msgid "Couldn't allocate memory for saving BMP file"
 msgstr "לא ניתן להקצות זכרון לטעינת קובץ BMP"
 
-#: ../gdk-pixbuf/io-bmp.c:1244
+#: gdk-pixbuf/io-bmp.c:1244
 msgid "Couldn't write to BMP file"
 msgstr "לא ניתן לכתוב לקובץ ה BMP"
 
-#: ../gdk-pixbuf/io-bmp.c:1293
+#: gdk-pixbuf/io-bmp.c:1293
 msgid "The BMP image format"
 msgstr "פורמט תמונת BMP"
 
-#: ../gdk-pixbuf/io-gif.c:220
+#: gdk-pixbuf/io-gif.c:220
 #, c-format
 msgid "Failure reading GIF: %s"
 msgstr "שגיאה בקריאת GIF: %s"
 
-#: ../gdk-pixbuf/io-gif.c:492 ../gdk-pixbuf/io-gif.c:1463
-#: ../gdk-pixbuf/io-gif.c:1624
+#: gdk-pixbuf/io-gif.c:492 gdk-pixbuf/io-gif.c:1463 gdk-pixbuf/io-gif.c:1624
 msgid "GIF file was missing some data (perhaps it was truncated somehow?)"
 msgstr "לקובץ ה GIF חסר מידע (ייתכן ונקטע בדרך כלשהי?)"
 
-#: ../gdk-pixbuf/io-gif.c:501
+#: gdk-pixbuf/io-gif.c:501
 #, c-format
 msgid "Internal error in the GIF loader (%s)"
 msgstr "שגיאה פנימית בטוען ה GIF (%s)"
 
-#: ../gdk-pixbuf/io-gif.c:575
+#: gdk-pixbuf/io-gif.c:575
 msgid "Stack overflow"
 msgstr "גלישת מחסנית"
 
-#: ../gdk-pixbuf/io-gif.c:635
+#: gdk-pixbuf/io-gif.c:635
 msgid "GIF image loader cannot understand this image."
 msgstr "טוען תמונת ה GIF לא יכול להבין את התמונה הזו."
 
-#: ../gdk-pixbuf/io-gif.c:664
+#: gdk-pixbuf/io-gif.c:664
 msgid "Bad code encountered"
 msgstr "התקלות בקוד גרוע"
 
-#: ../gdk-pixbuf/io-gif.c:674
+#: gdk-pixbuf/io-gif.c:674
 msgid "Circular table entry in GIF file"
 msgstr "רישום טבלה מעגלי בקובץ ה GIF"
 
-#: ../gdk-pixbuf/io-gif.c:862 ../gdk-pixbuf/io-gif.c:1451
-#: ../gdk-pixbuf/io-gif.c:1497 ../gdk-pixbuf/io-gif.c:1612
+#: gdk-pixbuf/io-gif.c:862 gdk-pixbuf/io-gif.c:1451 gdk-pixbuf/io-gif.c:1497
+#: gdk-pixbuf/io-gif.c:1612
 msgid "Not enough memory to load GIF file"
 msgstr "אין מספיק זכרון לטעינת קובץ GIF"
 
-#: ../gdk-pixbuf/io-gif.c:947
+#: gdk-pixbuf/io-gif.c:947
 msgid "Not enough memory to composite a frame in GIF file"
 msgstr "אין מספיק זכרון להרכיב מסגרת נוספת בקובץ ה GIF"
 
-#: ../gdk-pixbuf/io-gif.c:1116
+#: gdk-pixbuf/io-gif.c:1116
 msgid "GIF image is corrupt (incorrect LZW compression)"
 msgstr "תמונת ה GIF פגומה (כיווץ LZW שגוי)"
 
-#: ../gdk-pixbuf/io-gif.c:1166
+#: gdk-pixbuf/io-gif.c:1166
 msgid "File does not appear to be a GIF file"
 msgstr "הקובץ לא נראה כקובץ GIF"
 
-#: ../gdk-pixbuf/io-gif.c:1178
+#: gdk-pixbuf/io-gif.c:1178
 #, c-format
 msgid "Version %s of the GIF file format is not supported"
 msgstr "גירסה %s של פורמט קובץ ה GIF אינה נתמכת"
 
-#: ../gdk-pixbuf/io-gif.c:1287
+#: gdk-pixbuf/io-gif.c:1287
 msgid ""
 "GIF image has no global colormap, and a frame inside it has no local "
 "colormap."
 msgstr ""
 
-#: ../gdk-pixbuf/io-gif.c:1519
+#: gdk-pixbuf/io-gif.c:1519
 msgid "GIF image was truncated or incomplete."
 msgstr "תמונת ה GIF הייתה קטועה או לא מושלמת."
 
-#: ../gdk-pixbuf/io-gif.c:1671
+#: gdk-pixbuf/io-gif.c:1671
 msgid "The GIF image format"
 msgstr "פורמט קובץ GIF"
 
-#: ../gdk-pixbuf/io-ico.c:219 ../gdk-pixbuf/io-ico.c:271
-#: ../gdk-pixbuf/io-ico.c:340 ../gdk-pixbuf/io-ico.c:403
-#: ../gdk-pixbuf/io-ico.c:433
+#: gdk-pixbuf/io-ico.c:219 gdk-pixbuf/io-ico.c:271 gdk-pixbuf/io-ico.c:340
+#: gdk-pixbuf/io-ico.c:403 gdk-pixbuf/io-ico.c:433
 msgid "Not enough memory to load icon"
 msgstr "אין מספיק זכרון לטעינת סמל"
 
-#: ../gdk-pixbuf/io-ico.c:256 ../gdk-pixbuf/io-ico.c:330
+#: gdk-pixbuf/io-ico.c:256 gdk-pixbuf/io-ico.c:330
 msgid "Invalid header in icon"
 msgstr "כותרת לא תקנית בסמל"
 
-#: ../gdk-pixbuf/io-ico.c:293
+#: gdk-pixbuf/io-ico.c:293
 msgid "Icon has zero width"
 msgstr "לסמל יש רוחב אפס"
 
-#: ../gdk-pixbuf/io-ico.c:303
+#: gdk-pixbuf/io-ico.c:303
 msgid "Icon has zero height"
 msgstr "לסמל יש גובה אפס"
 
-#: ../gdk-pixbuf/io-ico.c:355
+#: gdk-pixbuf/io-ico.c:355
 msgid "Compressed icons are not supported"
 msgstr "סמלים מכווצים אינם נתמכים"
 
-#: ../gdk-pixbuf/io-ico.c:388
+#: gdk-pixbuf/io-ico.c:388
 msgid "Unsupported icon type"
 msgstr "סוג סמל לא נתמך"
 
-#: ../gdk-pixbuf/io-ico.c:482
+#: gdk-pixbuf/io-ico.c:482
 msgid "Not enough memory to load ICO file"
 msgstr "אין מספיק זכרון לטעינת קובץ ICO"
 
-#: ../gdk-pixbuf/io-ico.c:947
+#: gdk-pixbuf/io-ico.c:947
 msgid "Image too large to be saved as ICO"
 msgstr ""
 
-#: ../gdk-pixbuf/io-ico.c:958
+#: gdk-pixbuf/io-ico.c:958
 msgid "Cursor hotspot outside image"
 msgstr ""
 
-#: ../gdk-pixbuf/io-ico.c:981
+#: gdk-pixbuf/io-ico.c:981
 #, c-format
 msgid "Unsupported depth for ICO file: %d"
 msgstr ""
 
-#: ../gdk-pixbuf/io-ico.c:1210
+#: gdk-pixbuf/io-ico.c:1210
 msgid "The ICO image format"
 msgstr "פורמט קובץ ICO"
 
-#: ../gdk-pixbuf/io-jpeg.c:114
+#: gdk-pixbuf/io-jpeg.c:114
 #, c-format
 msgid "Error interpreting JPEG image file (%s)"
 msgstr "שגיאה בפיענוח קובץ תמונת JPEG (%s)"
 
-#: ../gdk-pixbuf/io-jpeg.c:349
+#: gdk-pixbuf/io-jpeg.c:349
 msgid ""
 "Insufficient memory to load image, try exiting some applications to free "
 "memory"
 msgstr ""
 "אין מספיק זיכרון לטעינת התמונה, נסה לסגור מספר יישומים כדי לפנות זיכרון"
 
-#: ../gdk-pixbuf/io-jpeg.c:383 ../gdk-pixbuf/io-jpeg.c:749
+#: gdk-pixbuf/io-jpeg.c:383 gdk-pixbuf/io-jpeg.c:749
 #, c-format
 msgid "Unsupported JPEG color space (%s)"
 msgstr ""
 
-#: ../gdk-pixbuf/io-jpeg.c:481 ../gdk-pixbuf/io-jpeg.c:678
-#: ../gdk-pixbuf/io-jpeg.c:943 ../gdk-pixbuf/io-jpeg.c:952
+#: gdk-pixbuf/io-jpeg.c:481 gdk-pixbuf/io-jpeg.c:678 gdk-pixbuf/io-jpeg.c:943
+#: gdk-pixbuf/io-jpeg.c:952
 msgid "Couldn't allocate memory for loading JPEG file"
 msgstr "לא ניתן להקצות זכרון לטעינת קובץ JPEG"
 
-#: ../gdk-pixbuf/io-jpeg.c:894
+#: gdk-pixbuf/io-jpeg.c:894
 #, c-format
 msgid ""
 "JPEG quality must be a value between 0 and 100; value '%s' could not be "
@@ -359,91 +354,91 @@ msgid ""
 msgstr ""
 "איכות קובץ JPEG חייבת להיות בין 0 ל 100, הערך '%s' לא יכול להיות מפורש."
 
-#: ../gdk-pixbuf/io-jpeg.c:909
+#: gdk-pixbuf/io-jpeg.c:909
 #, c-format
 msgid ""
 "JPEG quality must be a value between 0 and 100; value '%d' is not allowed."
 msgstr "איכות קובץ JPEG חייבת להיות בין 0 ל 100, הערך '%d' אינו מורשה."
 
-#: ../gdk-pixbuf/io-jpeg.c:1071
+#: gdk-pixbuf/io-jpeg.c:1071
 msgid "The JPEG image format"
 msgstr "פורמט קובץ JPEG"
 
-#: ../gdk-pixbuf/io-pcx.c:191
+#: gdk-pixbuf/io-pcx.c:191
 msgid "Couldn't allocate memory for header"
 msgstr "לא ניתן להקצות זיכרון לכותרת"
 
-#: ../gdk-pixbuf/io-pcx.c:206 ../gdk-pixbuf/io-pcx.c:566
+#: gdk-pixbuf/io-pcx.c:206 gdk-pixbuf/io-pcx.c:566
 msgid "Couldn't allocate memory for context buffer"
 msgstr ""
 
-#: ../gdk-pixbuf/io-pcx.c:607
+#: gdk-pixbuf/io-pcx.c:607
 msgid "Image has invalid width and/or height"
 msgstr "לתמונה יש רוחב ו/או גובה לא תקניים"
 
-#: ../gdk-pixbuf/io-pcx.c:619 ../gdk-pixbuf/io-pcx.c:680
+#: gdk-pixbuf/io-pcx.c:619 gdk-pixbuf/io-pcx.c:680
 msgid "Image has unsupported bpp"
 msgstr "לתמונת יש bpp לא נתמך"
 
-#: ../gdk-pixbuf/io-pcx.c:624 ../gdk-pixbuf/io-pcx.c:632
+#: gdk-pixbuf/io-pcx.c:624 gdk-pixbuf/io-pcx.c:632
 #, c-format
 msgid "Image has unsupported number of %d-bit planes"
 msgstr ""
 
-#: ../gdk-pixbuf/io-pcx.c:648
+#: gdk-pixbuf/io-pcx.c:648
 msgid "Couldn't create new pixbuf"
 msgstr "לא ניתן ליצור pixbuf חדש"
 
-#: ../gdk-pixbuf/io-pcx.c:656
+#: gdk-pixbuf/io-pcx.c:656
 msgid "Couldn't allocate memory for line data"
 msgstr "לא ניתן להקצות זיכרון למידע שורה"
 
-#: ../gdk-pixbuf/io-pcx.c:663
+#: gdk-pixbuf/io-pcx.c:663
 msgid "Couldn't allocate memory for paletted data"
 msgstr "לא ניתן להקצות זיכרון למידע פלטה"
 
-#: ../gdk-pixbuf/io-pcx.c:710
+#: gdk-pixbuf/io-pcx.c:710
 msgid "Didn't get all lines of PCX image"
 msgstr ""
 
-#: ../gdk-pixbuf/io-pcx.c:717
+#: gdk-pixbuf/io-pcx.c:717
 msgid "No palette found at end of PCX data"
 msgstr ""
 
-#: ../gdk-pixbuf/io-pcx.c:758
+#: gdk-pixbuf/io-pcx.c:758
 msgid "The PCX image format"
 msgstr "פורמט תמונת PCX"
 
-#: ../gdk-pixbuf/io-png.c:55
+#: gdk-pixbuf/io-png.c:55
 msgid "Bits per channel of PNG image is invalid."
 msgstr "הסיביות לערוץ של קובץ PNG אינן תקינות."
 
-#: ../gdk-pixbuf/io-png.c:136
+#: gdk-pixbuf/io-png.c:136
 msgid "Transformed PNG has zero width or height."
 msgstr ""
 
-#: ../gdk-pixbuf/io-png.c:144
+#: gdk-pixbuf/io-png.c:144
 msgid "Bits per channel of transformed PNG is not 8."
 msgstr ""
 
-#: ../gdk-pixbuf/io-png.c:153
+#: gdk-pixbuf/io-png.c:153
 msgid "Transformed PNG not RGB or RGBA."
 msgstr ""
 
-#: ../gdk-pixbuf/io-png.c:162
+#: gdk-pixbuf/io-png.c:162
 msgid "Transformed PNG has unsupported number of channels, must be 3 or 4."
 msgstr ""
 
-#: ../gdk-pixbuf/io-png.c:183
+#: gdk-pixbuf/io-png.c:183
 #, c-format
 msgid "Fatal error in PNG image file: %s"
 msgstr "שגיאה חמורה בקובץ תמונת PNG: %s"
 
-#: ../gdk-pixbuf/io-png.c:301
+#: gdk-pixbuf/io-png.c:301
 msgid "Insufficient memory to load PNG file"
 msgstr "אין מספיק זיכרון לטעינת קובץ PNG"
 
-#: ../gdk-pixbuf/io-png.c:618
+#: gdk-pixbuf/io-png.c:618
 #, c-format
 msgid ""
 "Insufficient memory to store a %ld by %ld image; try exiting some "
@@ -452,359 +447,355 @@ msgstr ""
 "אין מספיק זיכרון לשמירת %ld על-ידי תמונת %ld; נסה לצאת ממספר יישומים כדי "
 "להקטין את השימוש בזיכרון"
 
-#: ../gdk-pixbuf/io-png.c:669
+#: gdk-pixbuf/io-png.c:669
 msgid "Fatal error reading PNG image file"
 msgstr "שגיאה חמורה בקריאת קובץ PNG"
 
-#: ../gdk-pixbuf/io-png.c:718
+#: gdk-pixbuf/io-png.c:718
 #, c-format
 msgid "Fatal error reading PNG image file: %s"
 msgstr "שגיאה חמורה בקריאת קובץ PNG: %s"
 
-#: ../gdk-pixbuf/io-png.c:810
+#: gdk-pixbuf/io-png.c:810
 msgid ""
 "Keys for PNG text chunks must have at least 1 and at most 79 characters."
 msgstr ""
 
-#: ../gdk-pixbuf/io-png.c:818
+#: gdk-pixbuf/io-png.c:818
 msgid "Keys for PNG text chunks must be ASCII characters."
 msgstr ""
 
-#: ../gdk-pixbuf/io-png.c:831
+#: gdk-pixbuf/io-png.c:831
 #, c-format
 msgid ""
 "PNG compression level must be a value between 0 and 9; value '%s' could not "
 "be parsed."
-msgstr ""
-"איכות קובץ PNG חייבת להיות בין 0 ל 100, הערך '%s' לא יכול להיות מפורש."
+msgstr "איכות קובץ PNG חייבת להיות בין 0 ל 100, הערך '%s' לא יכול להיות מפורש."
 
-#: ../gdk-pixbuf/io-png.c:843
+#: gdk-pixbuf/io-png.c:843
 #, c-format
 msgid ""
 "PNG compression level must be a value between 0 and 9; value '%d' is not "
 "allowed."
 msgstr "איכות קובץ PNG חייבת להיות בין 0 ל 100, הערך '%d' אינו מורשה."
 
-#: ../gdk-pixbuf/io-png.c:883
+#: gdk-pixbuf/io-png.c:883
 #, c-format
 msgid "Value for PNG text chunk %s cannot be converted to ISO-8859-1 encoding."
 msgstr ""
 
-#: ../gdk-pixbuf/io-png.c:1026
+#: gdk-pixbuf/io-png.c:1026
 msgid "The PNG image format"
 msgstr "פורמט תמונת PNG"
 
-#: ../gdk-pixbuf/io-pnm.c:252
+#: gdk-pixbuf/io-pnm.c:252
 msgid "PNM loader expected to find an integer, but didn't"
 msgstr "טוען ה PNM ציפה למצוא מספר שלם; אך לא מצא"
 
-#: ../gdk-pixbuf/io-pnm.c:284
+#: gdk-pixbuf/io-pnm.c:284
 msgid "PNM file has an incorrect initial byte"
 msgstr "לקובץ ה PNM יש סיבית פנימית לא תיקנית"
 
-#: ../gdk-pixbuf/io-pnm.c:314
+#: gdk-pixbuf/io-pnm.c:314
 msgid "PNM file is not in a recognized PNM subformat"
 msgstr ""
 
-#: ../gdk-pixbuf/io-pnm.c:339
+#: gdk-pixbuf/io-pnm.c:339
 msgid "PNM file has an image width of 0"
 msgstr "רוחב תמונת PNM הוא 0"
 
-#: ../gdk-pixbuf/io-pnm.c:360
+#: gdk-pixbuf/io-pnm.c:360
 msgid "PNM file has an image height of 0"
 msgstr "גובה תמונת PNM הוא 0"
 
-#: ../gdk-pixbuf/io-pnm.c:383
+#: gdk-pixbuf/io-pnm.c:383
 msgid "Maximum color value in PNM file is 0"
 msgstr "ערך הצבע המקסימלי בקובץ PNM הוא 0"
 
-#: ../gdk-pixbuf/io-pnm.c:391
+#: gdk-pixbuf/io-pnm.c:391
 msgid "Maximum color value in PNM file is too large"
 msgstr "ערך הצבע המקסימלי בקובץ PNM הוא גדול מידי"
 
-#: ../gdk-pixbuf/io-pnm.c:399
+#: gdk-pixbuf/io-pnm.c:399
 msgid "Cannot handle PNM files with maximum color values greater than 255"
 msgstr "לא יכול לנהל קבצי PNM עם ערכי צבע הגדולים מ 255"
 
-#: ../gdk-pixbuf/io-pnm.c:438 ../gdk-pixbuf/io-pnm.c:466
-#: ../gdk-pixbuf/io-pnm.c:498
+#: gdk-pixbuf/io-pnm.c:438 gdk-pixbuf/io-pnm.c:466 gdk-pixbuf/io-pnm.c:498
 msgid "Raw PNM image type is invalid"
 msgstr ""
 
-#: ../gdk-pixbuf/io-pnm.c:562 ../gdk-pixbuf/io-pnm.c:604
+#: gdk-pixbuf/io-pnm.c:562 gdk-pixbuf/io-pnm.c:604
 msgid "PNM image format is invalid"
 msgstr "פורמט קובץ ה PNM אינו תקני"
 
-#: ../gdk-pixbuf/io-pnm.c:663
+#: gdk-pixbuf/io-pnm.c:663
 msgid "PNM image loader does not support this PNM subformat"
 msgstr ""
 
-#: ../gdk-pixbuf/io-pnm.c:718
+#: gdk-pixbuf/io-pnm.c:718
 msgid "Premature end-of-file encountered"
 msgstr "התקלות מוקדמת מידי בסוף הקובץ"
 
-#: ../gdk-pixbuf/io-pnm.c:750 ../gdk-pixbuf/io-pnm.c:981
+#: gdk-pixbuf/io-pnm.c:750 gdk-pixbuf/io-pnm.c:981
 msgid "Raw PNM formats require exactly one whitespace before sample data"
 msgstr ""
 
-#: ../gdk-pixbuf/io-pnm.c:777
+#: gdk-pixbuf/io-pnm.c:777
 msgid "Cannot allocate memory for loading PNM image"
 msgstr "לא ניתן להקצות זיכרון לטעינת תמונת PNM"
 
-#: ../gdk-pixbuf/io-pnm.c:827
+#: gdk-pixbuf/io-pnm.c:827
 msgid "Insufficient memory to load PNM context struct"
 msgstr ""
 
-#: ../gdk-pixbuf/io-pnm.c:878
+#: gdk-pixbuf/io-pnm.c:878
 msgid "Unexpected end of PNM image data"
 msgstr "סוף מידע תמונת PNM לא צפוי"
 
-#: ../gdk-pixbuf/io-pnm.c:1010
+#: gdk-pixbuf/io-pnm.c:1010
 msgid "Insufficient memory to load PNM file"
 msgstr "אין מספיק זיכרון לטעינת קובץ PNM"
 
-#: ../gdk-pixbuf/io-pnm.c:1089
+#: gdk-pixbuf/io-pnm.c:1089
 msgid "The PNM/PBM/PGM/PPM image format family"
 msgstr "משפחת פורמטי התמונה PNM/PBM/PGM/PPM"
 
-#: ../gdk-pixbuf/io-ras.c:126
+#: gdk-pixbuf/io-ras.c:126
 msgid "RAS image has bogus header data"
 msgstr "לתמונת RAS יש מידע כותרת מזוייף"
 
-#: ../gdk-pixbuf/io-ras.c:148
+#: gdk-pixbuf/io-ras.c:148
 msgid "RAS image has unknown type"
 msgstr "תמונת RAS מסוג לא ידוע"
 
-#: ../gdk-pixbuf/io-ras.c:156
+#: gdk-pixbuf/io-ras.c:156
 msgid "unsupported RAS image variation"
 msgstr "צורת תמונת RAS לא נתמכת"
 
-#: ../gdk-pixbuf/io-ras.c:171 ../gdk-pixbuf/io-ras.c:200
+#: gdk-pixbuf/io-ras.c:171 gdk-pixbuf/io-ras.c:200
 msgid "Not enough memory to load RAS image"
 msgstr "אין מספיק זיכרון לטעינת תמונת RAS"
 
-#: ../gdk-pixbuf/io-ras.c:543
+#: gdk-pixbuf/io-ras.c:543
 msgid "The Sun raster image format"
 msgstr "פורמט התמונה Sun raster"
 
-#: ../gdk-pixbuf/io-tga.c:154
+#: gdk-pixbuf/io-tga.c:154
 msgid "Cannot allocate memory for IOBuffer struct"
 msgstr "לא ניתן להקצות זיכרון למבנה IOBuffer"
 
-#: ../gdk-pixbuf/io-tga.c:173
+#: gdk-pixbuf/io-tga.c:173
 msgid "Cannot allocate memory for IOBuffer data"
 msgstr "לא ניתן להקצות זיכרון למידע IOBuffer"
 
-#: ../gdk-pixbuf/io-tga.c:184
+#: gdk-pixbuf/io-tga.c:184
 msgid "Cannot realloc IOBuffer data"
 msgstr "לא ניתן להקצות מחדש זיכרון למידע IOBuffer"
 
-#: ../gdk-pixbuf/io-tga.c:214
+#: gdk-pixbuf/io-tga.c:214
 msgid "Cannot allocate temporary IOBuffer data"
 msgstr "לא ניתן להקצות מידע IOBuffer זמני"
 
-#: ../gdk-pixbuf/io-tga.c:348
+#: gdk-pixbuf/io-tga.c:348
 msgid "Cannot allocate new pixbuf"
 msgstr "לא ניתן להקצות pixbuf חדש"
 
-#: ../gdk-pixbuf/io-tga.c:689
+#: gdk-pixbuf/io-tga.c:689
 msgid "Cannot allocate colormap structure"
 msgstr "לא ניתן להקצות מבנה מפת צבעים"
 
-#: ../gdk-pixbuf/io-tga.c:696
+#: gdk-pixbuf/io-tga.c:696
 msgid "Cannot allocate colormap entries"
 msgstr "לא ניתן להקצות ערכי מפת צבעים"
 
-#: ../gdk-pixbuf/io-tga.c:718
+#: gdk-pixbuf/io-tga.c:718
 msgid "Unexpected bitdepth for colormap entries"
 msgstr ""
 
-#: ../gdk-pixbuf/io-tga.c:736
+#: gdk-pixbuf/io-tga.c:736
 msgid "Cannot allocate TGA header memory"
 msgstr "לא ניתן להקצות זיכרון לכותרת TGA"
 
-#: ../gdk-pixbuf/io-tga.c:769
+#: gdk-pixbuf/io-tga.c:769
 msgid "TGA image has invalid dimensions"
 msgstr "לתמונת TGA יש מימדים לא תקניים"
 
-#: ../gdk-pixbuf/io-tga.c:775 ../gdk-pixbuf/io-tga.c:784
-#: ../gdk-pixbuf/io-tga.c:794 ../gdk-pixbuf/io-tga.c:804
-#: ../gdk-pixbuf/io-tga.c:811
+#: gdk-pixbuf/io-tga.c:775 gdk-pixbuf/io-tga.c:784 gdk-pixbuf/io-tga.c:794
+#: gdk-pixbuf/io-tga.c:804 gdk-pixbuf/io-tga.c:811
 msgid "TGA image type not supported"
 msgstr "סוג תמונת TGA אינו נתמך"
 
-#: ../gdk-pixbuf/io-tga.c:858
+#: gdk-pixbuf/io-tga.c:858
 msgid "Cannot allocate memory for TGA context struct"
 msgstr "לא ניתן להקצות זיכרון למבנה הקשר TGA"
 
-#: ../gdk-pixbuf/io-tga.c:923
+#: gdk-pixbuf/io-tga.c:923
 msgid "Excess data in file"
 msgstr "מידע עודף בקובץ"
 
-#: ../gdk-pixbuf/io-tga.c:992
+#: gdk-pixbuf/io-tga.c:992
 msgid "The Targa image format"
 msgstr "פורמט התמונה Targa"
 
-#: ../gdk-pixbuf/io-tiff.c:173
+#: gdk-pixbuf/io-tiff.c:173
 msgid "Could not get image width (bad TIFF file)"
 msgstr "לא ניתן לקבל את רוחב התמונה (קובץ TIFF שגוי)"
 
-#: ../gdk-pixbuf/io-tiff.c:180
+#: gdk-pixbuf/io-tiff.c:180
 msgid "Could not get image height (bad TIFF file)"
 msgstr "לא ניתן לקבל את גובה התמונה (קובץ TIFF שגוי)"
 
-#: ../gdk-pixbuf/io-tiff.c:188
+#: gdk-pixbuf/io-tiff.c:188
 msgid "Width or height of TIFF image is zero"
 msgstr "גובה או רוחב תמונת TIFF הוא אפס"
 
-#: ../gdk-pixbuf/io-tiff.c:197 ../gdk-pixbuf/io-tiff.c:206
+#: gdk-pixbuf/io-tiff.c:197 gdk-pixbuf/io-tiff.c:206
 msgid "Dimensions of TIFF image too large"
 msgstr "מימדי תמונת TIFF גדולים מידי"
 
-#: ../gdk-pixbuf/io-tiff.c:225 ../gdk-pixbuf/io-tiff.c:237
-#: ../gdk-pixbuf/io-tiff.c:286 ../gdk-pixbuf/io-tiff.c:572
+#: gdk-pixbuf/io-tiff.c:225 gdk-pixbuf/io-tiff.c:237 gdk-pixbuf/io-tiff.c:286
+#: gdk-pixbuf/io-tiff.c:572
 msgid "Insufficient memory to open TIFF file"
 msgstr "אין מספיק זיכרון לפתיחת תמונת TIFF"
 
-#: ../gdk-pixbuf/io-tiff.c:251 ../gdk-pixbuf/io-tiff.c:294
+#: gdk-pixbuf/io-tiff.c:251 gdk-pixbuf/io-tiff.c:294
 msgid "Failed to load RGB data from TIFF file"
 msgstr "נכשל בטעינת מידע RGB מקובץ TIFF"
 
-#: ../gdk-pixbuf/io-tiff.c:361
+#: gdk-pixbuf/io-tiff.c:361
 msgid "Failed to open TIFF image"
 msgstr "נכשל בפתיחת תמונת TIFF"
 
-#: ../gdk-pixbuf/io-tiff.c:373
+#: gdk-pixbuf/io-tiff.c:373
 msgid "TIFFClose operation failed"
 msgstr "פעולת TIFFClose נכשלה"
 
-#: ../gdk-pixbuf/io-tiff.c:504 ../gdk-pixbuf/io-tiff.c:517
+#: gdk-pixbuf/io-tiff.c:504 gdk-pixbuf/io-tiff.c:517
 msgid "Failed to load TIFF image"
 msgstr "נכשל בטעינת תמונת TIFF"
 
-#: ../gdk-pixbuf/io-tiff.c:610
+#: gdk-pixbuf/io-tiff.c:610
 msgid "The TIFF image format"
 msgstr "פורמט תמונת TIFF"
 
-#: ../gdk-pixbuf/io-wbmp.c:246
+#: gdk-pixbuf/io-wbmp.c:246
 msgid "Image has zero width"
 msgstr "לתמונה יש רוחב אפס"
 
-#: ../gdk-pixbuf/io-wbmp.c:264
+#: gdk-pixbuf/io-wbmp.c:264
 msgid "Image has zero height"
 msgstr "לתמונה יש גובה אפס"
 
-#: ../gdk-pixbuf/io-wbmp.c:275
+#: gdk-pixbuf/io-wbmp.c:275
 msgid "Not enough memory to load image"
 msgstr "אין מספיק זיכרון לטעינת התמונה"
 
-#: ../gdk-pixbuf/io-wbmp.c:334
+#: gdk-pixbuf/io-wbmp.c:334
 msgid "Couldn't save the rest"
 msgstr "לא ניתן לשמור את השאר"
 
-#: ../gdk-pixbuf/io-wbmp.c:368
+#: gdk-pixbuf/io-wbmp.c:368
 msgid "The WBMP image format"
 msgstr "פורמט התמונה WBMP"
 
-#: ../gdk-pixbuf/io-xbm.c:287
+#: gdk-pixbuf/io-xbm.c:287
 msgid "Invalid XBM file"
 msgstr "קובץ XBM לא תקני"
 
-#: ../gdk-pixbuf/io-xbm.c:297
+#: gdk-pixbuf/io-xbm.c:297
 msgid "Insufficient memory to load XBM image file"
 msgstr "אין מספיק זיכרון לטעינת קובץ תמונת XBM"
 
-#: ../gdk-pixbuf/io-xbm.c:441
+#: gdk-pixbuf/io-xbm.c:441
 msgid "Failed to write to temporary file when loading XBM image"
 msgstr "נכשל בכתיבה לקובץ זמני בזמן טעינת תמונת XBM"
 
-#: ../gdk-pixbuf/io-xbm.c:476
+#: gdk-pixbuf/io-xbm.c:476
 msgid "The XBM image format"
 msgstr "פורמט התמונה XBM"
 
-#: ../gdk-pixbuf/io-xpm.c:467
+#: gdk-pixbuf/io-xpm.c:467
 msgid "No XPM header found"
 msgstr "לא נמצאה כותרת XPM"
 
-#: ../gdk-pixbuf/io-xpm.c:476
+#: gdk-pixbuf/io-xpm.c:476
 msgid "Invalid XPM header"
 msgstr "קובץ XPM לא תקני"
 
-#: ../gdk-pixbuf/io-xpm.c:484
+#: gdk-pixbuf/io-xpm.c:484
 msgid "XPM file has image width <= 0"
 msgstr "לקובץ תמונה XPM יש רוחב <=0"
 
-#: ../gdk-pixbuf/io-xpm.c:492
+#: gdk-pixbuf/io-xpm.c:492
 msgid "XPM file has image height <= 0"
 msgstr "לקובץ תמונה XPM יש גובה <=0"
 
-#: ../gdk-pixbuf/io-xpm.c:500
+#: gdk-pixbuf/io-xpm.c:500
 msgid "XPM has invalid number of chars per pixel"
 msgstr "לקובץ XPM יש מספר לא תקני של תוים לפיקסלים"
 
-#: ../gdk-pixbuf/io-xpm.c:507
+#: gdk-pixbuf/io-xpm.c:507
 msgid "XPM file has invalid number of colors"
 msgstr "לקובץ XPM יש מספר לא תקני של צבעים"
 
-#: ../gdk-pixbuf/io-xpm.c:519 ../gdk-pixbuf/io-xpm.c:528
-#: ../gdk-pixbuf/io-xpm.c:580
+#: gdk-pixbuf/io-xpm.c:519 gdk-pixbuf/io-xpm.c:528 gdk-pixbuf/io-xpm.c:580
 msgid "Cannot allocate memory for loading XPM image"
 msgstr "לא ניתן להקצות זיכרון לטעינת תמונת XPM"
 
-#: ../gdk-pixbuf/io-xpm.c:542
+#: gdk-pixbuf/io-xpm.c:542
 msgid "Cannot read XPM colormap"
 msgstr "לא ניתן לקרוא את מפת הצבעים של XPM"
 
-#: ../gdk-pixbuf/io-xpm.c:771
+#: gdk-pixbuf/io-xpm.c:771
 msgid "Failed to write to temporary file when loading XPM image"
 msgstr "נכשל בכתיבה לקובץ זמני בזמן טעינת תמונת XPM"
 
-#: ../gdk-pixbuf/io-xpm.c:806
+#: gdk-pixbuf/io-xpm.c:806
 msgid "The XPM image format"
 msgstr "פורמט התמונה XPM"
 
 #. Description of --class=CLASS in --help output
-#: ../gdk/gdk.c:115
+#: gdk/gdk.c:115
 msgid "Program class as used by the window manager"
 msgstr ""
 
 #. Placeholder in --class=CLASS in --help output
-#: ../gdk/gdk.c:116
+#: gdk/gdk.c:116
 msgid "CLASS"
 msgstr ""
 
 #. Description of --name=NAME in --help output
-#: ../gdk/gdk.c:118
+#: gdk/gdk.c:118
 msgid "Program name as used by the window manager"
 msgstr ""
 
 #. Placeholder in --name=NAME in --help output
-#: ../gdk/gdk.c:119
+#: gdk/gdk.c:119
 msgid "NAME"
 msgstr ""
 
 #. Description of --display=DISPLAY in --help output
-#: ../gdk/gdk.c:121
+#: gdk/gdk.c:121
 msgid "X display to use"
 msgstr ""
 
 #. Placeholder in --display=DISPLAY in --help output
-#: ../gdk/gdk.c:122
+#: gdk/gdk.c:122
 msgid "DISPLAY"
 msgstr ""
 
 #. Description of --screen=SCREEN in --help output
-#: ../gdk/gdk.c:124
+#: gdk/gdk.c:124
 msgid "X screen to use"
 msgstr ""
 
 #. Placeholder in --screen=SCREEN in --help output
-#: ../gdk/gdk.c:125
+#: gdk/gdk.c:125
 msgid "SCREEN"
 msgstr ""
 
 #. Description of --gdk-debug=FLAGS in --help output
-#: ../gdk/gdk.c:128
+#: gdk/gdk.c:128
 msgid "Gdk debugging flags to set"
 msgstr ""
 
@@ -812,225 +803,222 @@ msgstr ""
 #. Placeholder in --gdk-no-debug=FLAGS in --help output
 #. Placeholder in --gtk-debug=FLAGS in --help output
 #. Placeholder in --gtk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:129 ../gdk/gdk.c:132 ../gtk/gtkmain.c:405 ../gtk/gtkmain.c:408
+#: gdk/gdk.c:129 gdk/gdk.c:132 gtk/gtkmain.c:405 gtk/gtkmain.c:408
 msgid "FLAGS"
 msgstr ""
 
 #. Description of --gdk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:131
+#: gdk/gdk.c:131
 msgid "Gdk debugging flags to unset"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3940
+#: gdk/keyname-table.h:3940
 msgid "keyboard label|BackSpace"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3941
+#: gdk/keyname-table.h:3941
 msgid "keyboard label|Tab"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3942
+#: gdk/keyname-table.h:3942
 msgid "keyboard label|Return"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3943
+#: gdk/keyname-table.h:3943
 msgid "keyboard label|Pause"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3944
+#: gdk/keyname-table.h:3944
 msgid "keyboard label|Scroll_Lock"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3945
+#: gdk/keyname-table.h:3945
 msgid "keyboard label|Sys_Req"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3946
+#: gdk/keyname-table.h:3946
 msgid "keyboard label|Escape"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3947
+#: gdk/keyname-table.h:3947
 msgid "keyboard label|Multi_key"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3948
+#: gdk/keyname-table.h:3948
 msgid "keyboard label|Home"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3949
+#: gdk/keyname-table.h:3949
 msgid "keyboard label|Page_Up"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3950
+#: gdk/keyname-table.h:3950
 msgid "keyboard label|Page_Down"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3951
+#: gdk/keyname-table.h:3951
 msgid "keyboard label|End"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3952
+#: gdk/keyname-table.h:3952
 msgid "keyboard label|Begin"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3953
+#: gdk/keyname-table.h:3953
 msgid "keyboard label|Print"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3954
+#: gdk/keyname-table.h:3954
 msgid "keyboard label|Insert"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3955
+#: gdk/keyname-table.h:3955
 msgid "keyboard label|Num_Lock"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3956
+#: gdk/keyname-table.h:3956
 msgid "keyboard label|KP_Space"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3957
+#: gdk/keyname-table.h:3957
 msgid "keyboard label|KP_Tab"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3958
+#: gdk/keyname-table.h:3958
 msgid "keyboard label|KP_Enter"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3959
+#: gdk/keyname-table.h:3959
 msgid "keyboard label|KP_Home"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3960
+#: gdk/keyname-table.h:3960
 msgid "keyboard label|KP_Left"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3961
+#: gdk/keyname-table.h:3961
 msgid "keyboard label|KP_Up"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3962
+#: gdk/keyname-table.h:3962
 msgid "keyboard label|KP_Right"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3963
+#: gdk/keyname-table.h:3963
 msgid "keyboard label|KP_Down"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3964
+#: gdk/keyname-table.h:3964
 msgid "keyboard label|KP_Page_Up"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3965
+#: gdk/keyname-table.h:3965
 msgid "keyboard label|KP_Prior"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3966
+#: gdk/keyname-table.h:3966
 msgid "keyboard label|KP_Page_Down"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3967
+#: gdk/keyname-table.h:3967
 msgid "keyboard label|KP_Next"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3968
+#: gdk/keyname-table.h:3968
 msgid "keyboard label|KP_End"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3969
+#: gdk/keyname-table.h:3969
 msgid "keyboard label|KP_Begin"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3970
+#: gdk/keyname-table.h:3970
 msgid "keyboard label|KP_Insert"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3971
+#: gdk/keyname-table.h:3971
 msgid "keyboard label|KP_Delete"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3972
+#: gdk/keyname-table.h:3972
 msgid "keyboard label|Delete"
 msgstr ""
 
 #. Description of --sync in --help output
-#: ../gdk/win32/gdkmain-win32.c:60
+#: gdk/win32/gdkmain-win32.c:60
 msgid "Don't batch GDI requests"
 msgstr ""
 
 #. Description of --no-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:62
+#: gdk/win32/gdkmain-win32.c:62
 msgid "Don't use the Wintab API for tablet support"
 msgstr ""
 
 #. Description of --ignore-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:64
+#: gdk/win32/gdkmain-win32.c:64
 msgid "Same as --no-wintab"
 msgstr ""
 
 #. Description of --use-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:66
+#: gdk/win32/gdkmain-win32.c:66
 msgid "Do use the Wintab API [default]"
 msgstr ""
 
 #. Description of --max-colors=COLORS in --help output
-#: ../gdk/win32/gdkmain-win32.c:68
+#: gdk/win32/gdkmain-win32.c:68
 msgid "Size of the palette in 8 bit mode"
 msgstr ""
 
 #. Placeholder in --max-colors=COLORS in --help output
-#: ../gdk/win32/gdkmain-win32.c:69
+#: gdk/win32/gdkmain-win32.c:69
 msgid "COLORS"
 msgstr ""
 
 #. Description of --sync in --help output
-#: ../gdk/x11/gdkmain-x11.c:92
+#: gdk/x11/gdkmain-x11.c:92
 msgid "Make X calls synchronous"
 msgstr ""
 
-#: ../gtk/gtkaboutdialog.c:273 ../gtk/gtkaboutdialog.c:2103
+#: gtk/gtkaboutdialog.c:273 gtk/gtkaboutdialog.c:2103
 msgid "License"
 msgstr "רישיון"
 
-#: ../gtk/gtkaboutdialog.c:274
+#: gtk/gtkaboutdialog.c:274
 msgid "The license of the program"
 msgstr ""
 
 #. Add the credits button
-#: ../gtk/gtkaboutdialog.c:509
+#: gtk/gtkaboutdialog.c:509
 msgid "C_redits"
 msgstr "_תודות"
 
-msgid "_Credits"
-msgstr "_תודות"
-
 #. Add the license button
-#: ../gtk/gtkaboutdialog.c:519
+#: gtk/gtkaboutdialog.c:519
 msgid "_License"
 msgstr "_רישיון"
 
-#: ../gtk/gtkaboutdialog.c:756
+#: gtk/gtkaboutdialog.c:756
 #, c-format
 msgid "About %s"
 msgstr "אודות %s"
 
-#: ../gtk/gtkaboutdialog.c:2031
+#: gtk/gtkaboutdialog.c:2031
 msgid "Credits"
 msgstr "תודות"
 
-#: ../gtk/gtkaboutdialog.c:2057
+#: gtk/gtkaboutdialog.c:2057
 msgid "Written by"
 msgstr "נכתב על ידי"
 
-#: ../gtk/gtkaboutdialog.c:2060
+#: gtk/gtkaboutdialog.c:2060
 msgid "Documented by"
 msgstr "תועד על ידי"
 
-#: ../gtk/gtkaboutdialog.c:2072
+#: gtk/gtkaboutdialog.c:2072
 msgid "Translated by"
 msgstr "תורגם על ידי"
 
-#: ../gtk/gtkaboutdialog.c:2076
+#: gtk/gtkaboutdialog.c:2076
 msgid "Artwork by"
 msgstr "אומנות על ידי"
 
@@ -1040,7 +1028,7 @@ msgstr "אומנות על ידי"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:121
+#: gtk/gtkaccellabel.c:121
 msgid "keyboard label|Shift"
 msgstr ""
 
@@ -1050,7 +1038,7 @@ msgstr ""
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:128
+#: gtk/gtkaccellabel.c:128
 msgid "keyboard label|Ctrl"
 msgstr ""
 
@@ -1060,17 +1048,17 @@ msgstr ""
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:135
+#: gtk/gtkaccellabel.c:135
 msgid "keyboard label|Alt"
 msgstr ""
 
 #. do not translate the part before the |
-#: ../gtk/gtkaccellabel.c:577
+#: gtk/gtkaccellabel.c:577
 msgid "keyboard label|Space"
 msgstr ""
 
 #. do not translate the part before the |
-#: ../gtk/gtkaccellabel.c:581
+#: gtk/gtkaccellabel.c:581
 msgid "keyboard label|Backslash"
 msgstr ""
 
@@ -1083,7 +1071,7 @@ msgstr ""
 #. * so if you have a default text direction of RTL and YM, then
 #. * the year will appear on the right.
 #.
-#: ../gtk/gtkcalendar.c:647
+#: gtk/gtkcalendar.c:647
 msgid "calendar:MY"
 msgstr "calendar:YM"
 
@@ -1091,7 +1079,7 @@ msgstr "calendar:YM"
 #. * first day of the week to calendar:week_start:1 if you want Monday
 #. * to be the first day of the week, and so on.
 #.
-#: ../gtk/gtkcalendar.c:661
+#: gtk/gtkcalendar.c:661
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:0"
 
@@ -1103,7 +1091,7 @@ msgstr "calendar:week_start:0"
 #. *
 #. * If you don't understand this, leave it as "2000"
 #.
-#: ../gtk/gtkcalendar.c:1549
+#: gtk/gtkcalendar.c:1549
 msgid "year measurement template|2000"
 msgstr ""
 
@@ -1118,25 +1106,25 @@ msgstr ""
 #. * Don't include the prefix "calendar year format|" in the
 #. * translation. "%Y" is appropriate for most locales.
 #.
-#: ../gtk/gtkcalendar.c:1826
+#: gtk/gtkcalendar.c:1826
 msgid "calendar year format|%Y"
 msgstr ""
 
 #. do not translate the part before the |
-#: ../gtk/gtkcellrendererprogress.c:237 ../gtk/gtkcellrendererprogress.c:295
+#: gtk/gtkcellrendererprogress.c:237 gtk/gtkcellrendererprogress.c:295
 #, c-format
 msgid "progress bar label|%d %%"
 msgstr ""
 
-#: ../gtk/gtkcolorbutton.c:221 ../gtk/gtkcolorbutton.c:576
+#: gtk/gtkcolorbutton.c:221 gtk/gtkcolorbutton.c:576
 msgid "Pick a Color"
 msgstr "בחר צבע"
 
-#: ../gtk/gtkcolorbutton.c:467
+#: gtk/gtkcolorbutton.c:467
 msgid "Received invalid color data\n"
 msgstr "התקבל מידע צבע לא תקני\n"
 
-#: ../gtk/gtkcolorsel.c:565
+#: gtk/gtkcolorsel.c:565
 msgid ""
 "The previously-selected color, for comparison to the color you're selecting "
 "now. You can drag this color to a palette entry, or select this color as "
@@ -1145,18 +1133,18 @@ msgstr ""
 "הצבע הקודם שבחרת, להשוואה עם הצבע שאתה בוחר עכשיו. אתה יכול לגרור צבע זה "
 "לערך פלטה, או לבחור צבע זה כנוכחי על-ידי גרירתו לפיסת הצבע השניה לצידו."
 
-#: ../gtk/gtkcolorsel.c:570
+#: gtk/gtkcolorsel.c:570
 msgid ""
 "The color you've chosen. You can drag this color to a palette entry to save "
 "it for use in the future."
 msgstr ""
 "הצבע שבחרת. אתה יכול לגרור צבע זה לערך פלטה כדי לשמור אותו לשימוש בעתיד."
 
-#: ../gtk/gtkcolorsel.c:961
+#: gtk/gtkcolorsel.c:961
 msgid "_Save color here"
 msgstr "_שמור צבע כאן"
 
-#: ../gtk/gtkcolorsel.c:1166
+#: gtk/gtkcolorsel.c:1166
 msgid ""
 "Click this palette entry to make it the current color. To change this entry, "
 "drag a color swatch here or right-click it and select \"Save color here.\""
@@ -1164,7 +1152,7 @@ msgstr ""
 "לחץ על ערך הפלטה כדי לעשותו הצבע הנוכחי. כדי לשנות ערך זה, גרור פיסת צבע "
 "לכאן או לחץ לחיצה ימינית ובחר \"שמור צבע כאן\"."
 
-#: ../gtk/gtkcolorsel.c:1953
+#: gtk/gtkcolorsel.c:1953
 msgid ""
 "Select the color you want from the outer ring. Select the darkness or "
 "lightness of that color using the inner triangle."
@@ -1172,73 +1160,73 @@ msgstr ""
 "בחר את הצבע שאתה רוצה מהטבעת החיצונית. בחר את הכהות או הבהירות של הצבע הזה "
 "בעזרת המשולש הפנימי."
 
-#: ../gtk/gtkcolorsel.c:1978
+#: gtk/gtkcolorsel.c:1978
 msgid ""
 "Click the eyedropper, then click a color anywhere on your screen to select "
 "that color."
 msgstr "לחץ על הטפטפת, אז לחץ על צבע כלשהו במסך לבחירת אותו צבע."
 
-#: ../gtk/gtkcolorsel.c:1987
+#: gtk/gtkcolorsel.c:1987
 msgid "_Hue:"
 msgstr "_גוון:"
 
-#: ../gtk/gtkcolorsel.c:1988
+#: gtk/gtkcolorsel.c:1988
 msgid "Position on the color wheel."
 msgstr "מיקום על גלגל הצבעים."
 
-#: ../gtk/gtkcolorsel.c:1990
+#: gtk/gtkcolorsel.c:1990
 msgid "_Saturation:"
 msgstr "_רוויה:"
 
-#: ../gtk/gtkcolorsel.c:1991
+#: gtk/gtkcolorsel.c:1991
 msgid "\"Deepness\" of the color."
 msgstr "\"העומק\" של הצבע."
 
-#: ../gtk/gtkcolorsel.c:1992
+#: gtk/gtkcolorsel.c:1992
 msgid "_Value:"
 msgstr "_ערך:"
 
-#: ../gtk/gtkcolorsel.c:1993
+#: gtk/gtkcolorsel.c:1993
 msgid "Brightness of the color."
 msgstr "הבהירות של הצבע."
 
-#: ../gtk/gtkcolorsel.c:1994
+#: gtk/gtkcolorsel.c:1994
 msgid "_Red:"
 msgstr "_אדום:"
 
-#: ../gtk/gtkcolorsel.c:1995
+#: gtk/gtkcolorsel.c:1995
 msgid "Amount of red light in the color."
 msgstr "כמות האור האדום בצבע."
 
-#: ../gtk/gtkcolorsel.c:1996
+#: gtk/gtkcolorsel.c:1996
 msgid "_Green:"
 msgstr "_ירוק:"
 
-#: ../gtk/gtkcolorsel.c:1997
+#: gtk/gtkcolorsel.c:1997
 msgid "Amount of green light in the color."
 msgstr "כמות האור הירוק בצבע."
 
-#: ../gtk/gtkcolorsel.c:1998
+#: gtk/gtkcolorsel.c:1998
 msgid "_Blue:"
 msgstr "_כחול:"
 
-#: ../gtk/gtkcolorsel.c:1999
+#: gtk/gtkcolorsel.c:1999
 msgid "Amount of blue light in the color."
 msgstr "כמות האור הכחול בצבע."
 
-#: ../gtk/gtkcolorsel.c:2002
+#: gtk/gtkcolorsel.c:2002
 msgid "_Opacity:"
 msgstr "_אטימות:"
 
-#: ../gtk/gtkcolorsel.c:2010 ../gtk/gtkcolorsel.c:2021
+#: gtk/gtkcolorsel.c:2010 gtk/gtkcolorsel.c:2021
 msgid "Transparency of the color."
 msgstr "שקיפות הצבע."
 
-#: ../gtk/gtkcolorsel.c:2028
+#: gtk/gtkcolorsel.c:2028
 msgid "Color _Name:"
 msgstr "_שם הצבע:"
 
-#: ../gtk/gtkcolorsel.c:2043
+#: gtk/gtkcolorsel.c:2043
 msgid ""
 "You can enter an HTML-style hexadecimal color value, or simply a color name "
 "such as 'orange' in this entry."
@@ -1246,325 +1234,336 @@ msgstr ""
 "אתה יכול להזין ערך צבע הקסדצימלי בסגנון HTML, או פשוט לכתוב שם צבע באנגלית "
 "כמו 'orange' בערך זה."
 
-#: ../gtk/gtkcolorsel.c:2062
+#: gtk/gtkcolorsel.c:2062
 msgid "_Palette"
 msgstr "_פלטה"
 
-#: ../gtk/gtkcolorsel.c:2094
+#: gtk/gtkcolorsel.c:2094
 msgid "Color Wheel"
 msgstr "גלגלת צבע"
 
-#: ../gtk/gtkcolorseldialog.c:123
+#: gtk/gtkcolorseldialog.c:123
 msgid "Color Selection"
 msgstr "בחירת צבע"
 
-#: ../gtk/gtkentry.c:4508 ../gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "בחר ה_כל"
 
-#: ../gtk/gtkentry.c:4518 ../gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_שיטות קלט"
 
-#: ../gtk/gtkentry.c:4529 ../gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_הזן תו בקרה יוניקוד"
 
-#: ../gtk/gtkfilechooser.c:1588 ../gtk/gtkfilechooser.c:1632
-#: ../gtk/gtkfilechooser.c:1707 ../gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "שם קובץ לא תקני: %s"
 
-#: ../gtk/gtkfilechooserbutton.c:67
+#: gtk/gtkfilechooserbutton.c:67
 msgid "Select A File"
 msgstr "בחר קובץ"
 
-#: ../gtk/gtkfilechooserbutton.c:68 ../gtk/gtkfilechooserdefault.c:1316
-#: ../gtk/gtkpathbar.c:1020
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
+#: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "בית"
 
-#: ../gtk/gtkfilechooserbutton.c:69 ../gtk/gtkfilechooserdefault.c:1343
-#: ../gtk/gtkpathbar.c:1022
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
+#: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "שולחן עבודה"
 
-#: ../gtk/gtkfilechooserbutton.c:70
+#: gtk/gtkfilechooserbutton.c:70
 msgid "(None)"
 msgstr "(ללא)"
 
-#: ../gtk/gtkfilechooserbutton.c:1523
+#: gtk/gtkfilechooserbutton.c:1523
 msgid "Other..."
 msgstr "אחר..."
 
-#: ../gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "לא ניתן לקבל מידע על הקובץ"
 
-#: ../gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
-msgstr ""
-"לא ניתן להוסיף סימנייה"
+msgstr "לא ניתן להוסיף סימנייה"
 
-#: ../gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
-msgstr ""
-"לא ניתן להסיר את הסימנייה"
+msgstr "לא ניתן להסיר את הסימנייה"
 
-#: ../gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "לא ניתן ליצור את התיקייה"
 
-#: ../gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: ../gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "שם קובץ לא תקני"
 
-#: ../gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: ../gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "ךא ניתן לקבל מידע על '%s': %s"
 
-#: ../gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: ../gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: ../gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: ../gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: ../gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "לא ניתן להוסיף סימנייה ל %s כיוון שזהו שם נתיב לא תקני."
 
-#: ../gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "הסר"
 
-#: ../gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "שנה שם..."
 
-#: ../gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "קיצורי דרך"
 
 # hebrew note: "תיקיה" is "folder", but there is no better word for
 # "directory"
-#: ../gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "תיקייה"
 
-#: ../gtk/gtkfilechooserdefault.c:3193 ../gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_הוסף"
 
-#: ../gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: ../gtk/gtkfilechooserdefault.c:3205 ../gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_הסר"
 
-#: ../gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: ../gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 msgid "Could not select file"
-msgstr ""
-"לא ניתן לבחור את הקובץ"
+msgstr "לא ניתן לבחור את הקובץ"
 
-#: ../gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "לא ניתן לבחור את הקובץ %s כיוון שזהו שם נתיב לא תקני."
 
-#: ../gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: ../gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "פתח _מיקום"
 
-#: ../gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "הצג קבצים _נסתרים"
 
 # hebrew note: "תיקיה" is "folder", but there is no better word for
 # "directory"
-#: ../gtk/gtkfilechooserdefault.c:3586 ../gtk/gtkfilesel.c:766
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "קבצים"
 
-#: ../gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "שם"
 
-#: ../gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "גודל"
 
-#: ../gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "שונה"
 
-#: ../gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "בחר איזה סוגי קבצים מוצגים"
 
 #. Create Folder
-#: ../gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "צור _תיקייה"
 
 #. Name entry
-#: ../gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_שם:"
 
-#: ../gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_דפדף לתיקיות אחרות"
 
-#: ../gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "שמור ב_תיקייה:"
 
-#: ../gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "צור ב_תיקייה:"
 
-#: ../gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "לא ניתן לשנות תיקייה כיוון שהיא איננה מקומית"
 
-#: ../gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "הקיצור %s אינו קיים"
 
-#: ../gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_שנה שם"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "לא ניתן לעגון את %s"
 
-#: ../gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "כתוב שם לתיקייה החדשה"
 
-#: ../gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "בית אחד"
 msgstr[1] "   בתים     %d"
 
-#: ../gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: ../gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: ../gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: ../gtk/gtkfilechooserdefault.c:6604 ../gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: ../gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "היום"
 
-#: ../gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "אתמול"
 
-#: ../gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "לא ניתן לשנות תיקייה"
 
-#: ../gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "התיקייה בה בחרת היא נתיב לא תקני."
 
-#: ../gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
-msgstr ""
-"לא ניתן לבנות שם קובץ מ '%s' ו '%s'"
+msgstr "לא ניתן לבנות שם קובץ מ '%s' ו '%s'"
 
-#: ../gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
-msgstr ""
-"לא ניתן לבחור את הפריט"
+msgstr "לא ניתן לבחור את הפריט"
 
-#: ../gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "פתח מיקום"
 
-#: ../gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "שמור במיקום"
 
-#: ../gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_מיקום:"
 
 # hebrew note: "תיקיה" is "folder", but there is no better word for
 # "directory"
-#: ../gtk/gtkfilesel.c:730
+#: gtk/gtkfilesel.c:727
 msgid "Folders"
 msgstr "תיקיות"
 
 # hebrew note: "תיקיה" is "folder", but there is no better word for
 # "directory"
-#: ../gtk/gtkfilesel.c:734
+#: gtk/gtkfilesel.c:731
 msgid "Fol_ders"
 msgstr "_תיקיות"
 
 # hebrew note: "תיקיה" is "folder", but there is no better word for
 # "directory"
-#: ../gtk/gtkfilesel.c:770
+#: gtk/gtkfilesel.c:767
 msgid "_Files"
 msgstr "_קבצים"
 
-#: ../gtk/gtkfilesel.c:858 ../gtk/gtkfilesel.c:2248
+#: gtk/gtkfilesel.c:855 gtk/gtkfilesel.c:2242
 #, c-format
 msgid "Folder unreadable: %s"
 msgstr "תיקיה לא קריאה: %s"
 
-#: ../gtk/gtkfilesel.c:989
+#: gtk/gtkfilesel.c:984
 #, c-format
 msgid ""
 "The file \"%s\" resides on another machine (called %s) and may not be "
@@ -1574,25 +1573,25 @@ msgstr ""
 "הקובץ \"%s\" תלוי במכונה אחרת (הנקראת %s) וייתכן כי לא תיהיה זמינה לתוכנית "
 "זו. האם אתה בטוח שברצונך לבחור אותו?"
 
-#: ../gtk/gtkfilesel.c:1120
+#: gtk/gtkfilesel.c:1114
 msgid "_New Folder"
 msgstr "תיקייה _חדשה"
 
-#: ../gtk/gtkfilesel.c:1131
+#: gtk/gtkfilesel.c:1125
 msgid "De_lete File"
 msgstr "_מחק קובץ"
 
-#: ../gtk/gtkfilesel.c:1142
+#: gtk/gtkfilesel.c:1136
 msgid "_Rename File"
 msgstr "_שנה שם קובץ"
 
-#: ../gtk/gtkfilesel.c:1444
+#: gtk/gtkfilesel.c:1438
 #, c-format
 msgid ""
 "The folder name \"%s\" contains symbols that are not allowed in filenames"
 msgstr "התיקייה בשם \"%s\" מכילה סמלים שאינם מותרים בשמות קבצים"
 
-#: ../gtk/gtkfilesel.c:1446
+#: gtk/gtkfilesel.c:1440
 #, c-format
 msgid ""
 "Error creating folder \"%s\": %s\n"
@@ -1601,33 +1600,33 @@ msgstr ""
 "שגיאה ביצירת התיקייה \"%s\": %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1447 ../gtk/gtkfilesel.c:1683
+#: gtk/gtkfilesel.c:1441 gtk/gtkfilesel.c:1677
 msgid "You probably used symbols not allowed in filenames."
 msgstr "כנראה השתמשת בסמלים שאינם מותרים בשמות קבצים."
 
-#: ../gtk/gtkfilesel.c:1455
+#: gtk/gtkfilesel.c:1449
 #, c-format
 msgid "Error creating folder \"%s\": %s\n"
 msgstr "שגיאה ביצירת התיקייה \"%s\": %s\n"
 
-#: ../gtk/gtkfilesel.c:1489
+#: gtk/gtkfilesel.c:1483
 msgid "New Folder"
 msgstr "תיקייה חדשה"
 
-#: ../gtk/gtkfilesel.c:1504
+#: gtk/gtkfilesel.c:1498
 msgid "_Folder name:"
 msgstr "שם ה_תיקייה:"
 
-#: ../gtk/gtkfilesel.c:1528
+#: gtk/gtkfilesel.c:1522
 msgid "C_reate"
 msgstr "_צור"
 
-#: ../gtk/gtkfilesel.c:1571
+#: gtk/gtkfilesel.c:1565
 #, c-format
 msgid "The filename \"%s\" contains symbols that are not allowed in filenames"
 msgstr "שם הקובץ \"%s\" מכיל סמלים שאינם מותרים לשימוש בשמות קבצים"
 
-#: ../gtk/gtkfilesel.c:1574
+#: gtk/gtkfilesel.c:1568
 #, c-format
 msgid ""
 "Error deleting file \"%s\": %s\n"
@@ -1636,30 +1635,30 @@ msgstr ""
 "שגיאה במחיקת הקובץ \"%s\": %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1576 ../gtk/gtkfilesel.c:1697
+#: gtk/gtkfilesel.c:1570 gtk/gtkfilesel.c:1691
 msgid "It probably contains symbols not allowed in filenames."
 msgstr "זה כנראה מכיל סמלים שאינם מותרים לשימוש בשמות קבצים."
 
-#: ../gtk/gtkfilesel.c:1585
+#: gtk/gtkfilesel.c:1579
 #, c-format
 msgid "Error deleting file \"%s\": %s"
 msgstr "שגיאה במחיקת הקובץ \"%s\": %s"
 
-#: ../gtk/gtkfilesel.c:1628
+#: gtk/gtkfilesel.c:1622
 #, c-format
 msgid "Really delete file \"%s\"?"
 msgstr "באמת למחוק את הקובץ \"%s\"?"
 
-#: ../gtk/gtkfilesel.c:1633
+#: gtk/gtkfilesel.c:1627
 msgid "Delete File"
 msgstr "מחיקת קובץ"
 
-#: ../gtk/gtkfilesel.c:1679 ../gtk/gtkfilesel.c:1693
+#: gtk/gtkfilesel.c:1673 gtk/gtkfilesel.c:1687
 #, c-format
 msgid "The file name \"%s\" contains symbols that are not allowed in filenames"
 msgstr "הקובץ בשם \"%s\" מכיל סמלים אסורים בשמות קבצים"
 
-#: ../gtk/gtkfilesel.c:1681
+#: gtk/gtkfilesel.c:1675
 #, c-format
 msgid ""
 "Error renaming file to \"%s\": %s\n"
@@ -1668,7 +1667,7 @@ msgstr ""
 "שגיאה בשינוי שם הקובץ ל \"%s\": %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1695
+#: gtk/gtkfilesel.c:1689
 #, c-format
 msgid ""
 "Error renaming file \"%s\": %s\n"
@@ -1677,29 +1676,29 @@ msgstr ""
 "שגיאה בשינוי שם הקובץ \"%s\": %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1705
+#: gtk/gtkfilesel.c:1699
 #, c-format
 msgid "Error renaming file \"%s\" to \"%s\": %s"
 msgstr "שגיאה בשינוי שם הקובץ \"%s\" ל \"%s\": %s"
 
-#: ../gtk/gtkfilesel.c:1752
+#: gtk/gtkfilesel.c:1746
 msgid "Rename File"
 msgstr "שינוי שם קובץ"
 
-#: ../gtk/gtkfilesel.c:1767
+#: gtk/gtkfilesel.c:1761
 #, c-format
 msgid "Rename file \"%s\" to:"
 msgstr "שנה את שם הקובץ \"%s\" ל:"
 
-#: ../gtk/gtkfilesel.c:1796
+#: gtk/gtkfilesel.c:1790
 msgid "_Rename"
 msgstr "_שנה שם"
 
-#: ../gtk/gtkfilesel.c:2228
+#: gtk/gtkfilesel.c:2222
 msgid "_Selection: "
 msgstr "_בחירה:"
 
-#: ../gtk/gtkfilesel.c:3153
+#: gtk/gtkfilesel.c:3147
 #, c-format
 msgid ""
 "The filename \"%s\" couldn't be converted to UTF-8. (try setting the "
@@ -1708,143 +1707,144 @@ msgstr ""
 "הקובץ \"%s\" לא יכול להיות מומר ל UTF-8 (נסה לשנות את משתנה הסביבה "
 "G_FILENAME_ENCODING): %s"
 
-#: ../gtk/gtkfilesel.c:3156
+#: gtk/gtkfilesel.c:3150
 msgid "Invalid UTF-8"
 msgstr "‏UTF-8 לא תקני"
 
-#: ../gtk/gtkfilesel.c:4033
+#: gtk/gtkfilesel.c:4027
 msgid "Name too long"
 msgstr "שם ארוך מידי"
 
-#: ../gtk/gtkfilesel.c:4035
+#: gtk/gtkfilesel.c:4029
 msgid "Couldn't convert filename"
 msgstr "לא ניתן להמיר את שם הקובץ"
 
-#: ../gtk/gtkfilesystemmodel.c:1267
+#: gtk/gtkfilesystemmodel.c:1267
 msgid "(Empty)"
 msgstr "(ריק)"
 
-#: ../gtk/gtkfilesystemunix.c:476 ../gtk/gtkfilesystemunix.c:682
-#: ../gtk/gtkfilesystemunix.c:1858 ../gtk/gtkfilesystemwin32.c:482
-#: ../gtk/gtkfilesystemwin32.c:495 ../gtk/gtkfilesystemwin32.c:1487
+#: gtk/gtkfilesystemunix.c:476 gtk/gtkfilesystemunix.c:682
+#: gtk/gtkfilesystemunix.c:1858 gtk/gtkfilesystemwin32.c:482
+#: gtk/gtkfilesystemwin32.c:495 gtk/gtkfilesystemwin32.c:1487
 #, c-format
 msgid "Error getting information for '%s': %s"
 msgstr "שגיאה בקבלת מידע עבור '%s':%s"
 
-#: ../gtk/gtkfilesystemunix.c:551 ../gtk/gtkfilesystemwin32.c:537
+#: gtk/gtkfilesystemunix.c:551 gtk/gtkfilesystemwin32.c:537
 #, c-format
 msgid "Error creating directory '%s': %s"
 msgstr "שגיאה ביצירת התיקייה '%s': %s"
 
-#: ../gtk/gtkfilesystemunix.c:631 ../gtk/gtkfilesystemwin32.c:597
+#: gtk/gtkfilesystemunix.c:631 gtk/gtkfilesystemwin32.c:597
 msgid "This file system does not support mounting"
 msgstr "מערכת הקבצים הזו אינה תומכת בחיבורים"
 
 # hebrew note: "תיקיה" is "folder", but there is no better word for
 # "directory"
-#: ../gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#: gtk/gtkfilesystemunix.c:639
+#, fuzzy
+msgid "File System"
 msgstr "מערכת קבצים"
 
-#: ../gtk/gtkfilesystemunix.c:796
+#: gtk/gtkfilesystemunix.c:796
 #, c-format
 msgid "Could not get a stock icon for %s"
 msgstr ""
 
-#: ../gtk/gtkfilesystemunix.c:891
+#: gtk/gtkfilesystemunix.c:891
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"%s\". "
 "Please use a different name."
 msgstr ""
 
-#: ../gtk/gtkfilesystemunix.c:1463 ../gtk/gtkfilesystemwin32.c:1032
+#: gtk/gtkfilesystemunix.c:1463 gtk/gtkfilesystemwin32.c:1032
 #, c-format
 msgid "Bookmark saving failed: %s"
 msgstr "שמירת סימנייה נכשלה: %s"
 
-#: ../gtk/gtkfilesystemunix.c:1518
+#: gtk/gtkfilesystemunix.c:1518
 #, c-format
 msgid "'%s' already exists in the bookmarks list"
 msgstr ""
 
-#: ../gtk/gtkfilesystemunix.c:1590
+#: gtk/gtkfilesystemunix.c:1590
 #, c-format
 msgid "'%s' does not exist in the bookmarks list"
 msgstr ""
 
-#: ../gtk/gtkfilesystemunix.c:1818
+#: gtk/gtkfilesystemunix.c:1818
 #, c-format
 msgid "Error getting information for '/': %s"
 msgstr "שגיאה בקבלת מידע עבור '/': %s"
 
-#: ../gtk/gtkfilesystemwin32.c:611
+#: gtk/gtkfilesystemwin32.c:611
 #, c-format
 msgid "Network Drive (%s)"
 msgstr ""
 
-#: ../gtk/gtkfilesystemwin32.c:650
+#: gtk/gtkfilesystemwin32.c:650
 #, c-format
 msgid "%s (%s)"
 msgstr "‏%s (%s)"
 
-#: ../gtk/gtkfontbutton.c:179 ../gtk/gtkfontbutton.c:292
+#: gtk/gtkfontbutton.c:179 gtk/gtkfontbutton.c:292
 msgid "Pick a Font"
 msgstr "בחר גופן"
 
 #. Initialize fields
-#: ../gtk/gtkfontbutton.c:286
+#: gtk/gtkfontbutton.c:286
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: ../gtk/gtkfontbutton.c:804
+#: gtk/gtkfontbutton.c:804
 msgid "Font"
 msgstr "גופן"
 
 #. This is the default text shown in the preview entry, though the user
 #. can set it. Remember that some fonts only have capital letters.
-#: ../gtk/gtkfontsel.c:74
+#: gtk/gtkfontsel.c:74
 msgid "abcdefghijk ABCDEFGHIJK"
 msgstr "abcdef ABCDEF אבגדהו"
 
-#: ../gtk/gtkfontsel.c:361
+#: gtk/gtkfontsel.c:361
 msgid "_Family:"
 msgstr "_משפחה:"
 
-#: ../gtk/gtkfontsel.c:367
+#: gtk/gtkfontsel.c:367
 msgid "_Style:"
 msgstr "_סגנון:"
 
-#: ../gtk/gtkfontsel.c:373
+#: gtk/gtkfontsel.c:373
 msgid "Si_ze:"
 msgstr "_גודל:"
 
 #. create the text entry widget
-#: ../gtk/gtkfontsel.c:549
+#: gtk/gtkfontsel.c:549
 msgid "_Preview:"
 msgstr "_תצוגה מקדימה:"
 
-#: ../gtk/gtkfontsel.c:1383
+#: gtk/gtkfontsel.c:1383
 msgid "Font Selection"
 msgstr "בחירת גופן"
 
-#: ../gtk/gtkgamma.c:401
+#: gtk/gtkgamma.c:401
 msgid "Gamma"
 msgstr "גאמה"
 
-#: ../gtk/gtkgamma.c:411
+#: gtk/gtkgamma.c:411
 msgid "_Gamma value"
 msgstr "ערכי _גאמא"
 
 #. Remove this icon source so we don't keep trying to
 #. * load it.
 #.
-#: ../gtk/gtkiconfactory.c:1656
+#: gtk/gtkiconfactory.c:1656
 #, c-format
 msgid "Error loading icon: %s"
 msgstr "שגיאה בטעינת סמל: %s"
 
-#: ../gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1857,120 +1857,120 @@ msgstr ""
 "אתה יכול לקבל עותק מ:\n"
 "\t%s"
 
-#: ../gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "הסמל '%s' לא קיים בערכת הנושא"
 
-#: ../gtk/gtkimmodule.c:427
+#: gtk/gtkimmodule.c:427
 msgid "Default"
 msgstr "ברירת מחדל"
 
-#: ../gtk/gtkinputdialog.c:235
+#: gtk/gtkinputdialog.c:235
 msgid "Input"
 msgstr "קלט"
 
-#: ../gtk/gtkinputdialog.c:244
+#: gtk/gtkinputdialog.c:244
 msgid "No extended input devices"
 msgstr "אין התקני קלט מורחבים"
 
-#: ../gtk/gtkinputdialog.c:256
+#: gtk/gtkinputdialog.c:256
 msgid "_Device:"
 msgstr "_התקן:"
 
-#: ../gtk/gtkinputdialog.c:273
+#: gtk/gtkinputdialog.c:273
 msgid "Disabled"
 msgstr "כבוי"
 
-#: ../gtk/gtkinputdialog.c:280
+#: gtk/gtkinputdialog.c:280
 msgid "Screen"
 msgstr "צג"
 
-#: ../gtk/gtkinputdialog.c:287
+#: gtk/gtkinputdialog.c:287
 msgid "Window"
 msgstr "חלון"
 
-#: ../gtk/gtkinputdialog.c:294
+#: gtk/gtkinputdialog.c:294
 msgid "_Mode: "
 msgstr "_מצב: "
 
 #. The axis listbox
-#: ../gtk/gtkinputdialog.c:325
+#: gtk/gtkinputdialog.c:325
 msgid "_Axes"
 msgstr "_צירים"
 
 #. Keys listbox
-#: ../gtk/gtkinputdialog.c:342
+#: gtk/gtkinputdialog.c:342
 msgid "_Keys"
 msgstr "_מקשים"
 
-#: ../gtk/gtkinputdialog.c:562
+#: gtk/gtkinputdialog.c:562
 msgid "X"
 msgstr "X"
 
-#: ../gtk/gtkinputdialog.c:563
+#: gtk/gtkinputdialog.c:563
 msgid "Y"
 msgstr "Y"
 
-#: ../gtk/gtkinputdialog.c:564
+#: gtk/gtkinputdialog.c:564
 msgid "Pressure"
 msgstr "לחץ"
 
-#: ../gtk/gtkinputdialog.c:565
+#: gtk/gtkinputdialog.c:565
 msgid "X Tilt"
 msgstr "הטיה אופקית"
 
-#: ../gtk/gtkinputdialog.c:566
+#: gtk/gtkinputdialog.c:566
 msgid "Y Tilt"
 msgstr "הטיה אנכית"
 
-#: ../gtk/gtkinputdialog.c:567
+#: gtk/gtkinputdialog.c:567
 msgid "Wheel"
 msgstr "גלגל"
 
-#: ../gtk/gtkinputdialog.c:607
+#: gtk/gtkinputdialog.c:607
 msgid "none"
 msgstr "ללא"
 
-#: ../gtk/gtkinputdialog.c:643 ../gtk/gtkinputdialog.c:679
+#: gtk/gtkinputdialog.c:643 gtk/gtkinputdialog.c:679
 msgid "(disabled)"
 msgstr "(כבוי)"
 
-#: ../gtk/gtkinputdialog.c:672
+#: gtk/gtkinputdialog.c:672
 msgid "(unknown)"
 msgstr "(לא ידוע)"
 
 #. and clear button
-#: ../gtk/gtkinputdialog.c:759
+#: gtk/gtkinputdialog.c:759
 msgid "clear"
 msgstr "נקה"
 
-#: ../gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "בחר הכל"
 
 #. Description of --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:398
+#: gtk/gtkmain.c:398
 msgid "Load additional GTK+ modules"
 msgstr ""
 
 #. Placeholder in --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:399
+#: gtk/gtkmain.c:399
 msgid "MODULES"
 msgstr ""
 
 #. Description of --g-fatal-warnings in --help output
-#: ../gtk/gtkmain.c:401
+#: gtk/gtkmain.c:401
 msgid "Make all warnings fatal"
 msgstr ""
 
 #. Description of --gtk-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:404
+#: gtk/gtkmain.c:404
 msgid "GTK+ debugging flags to set"
 msgstr ""
 
 #. Description of --gtk-no-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:407
+#: gtk/gtkmain.c:407
 msgid "GTK+ debugging flags to unset"
 msgstr ""
 
@@ -1979,522 +1979,525 @@ msgstr ""
 #. * Do *not* translate it to "predefinito:LTR", if it
 #. * it isn't default:LTR or default:RTL it will not work
 #.
-#: ../gtk/gtkmain.c:476
+#: gtk/gtkmain.c:476
 msgid "default:LTR"
 msgstr "default:RTL"
 
-#: ../gtk/gtkmain.c:559
+#: gtk/gtkmain.c:559
 msgid "GTK+ Options"
 msgstr ""
 
-#: ../gtk/gtkmain.c:559
+#: gtk/gtkmain.c:559
 msgid "Show GTK+ Options"
 msgstr ""
 
-#: ../gtk/gtknotebook.c:2718 ../gtk/gtknotebook.c:5064
+#: gtk/gtknotebook.c:2718 gtk/gtknotebook.c:5064
 #, c-format
 msgid "Page %u"
 msgstr "עמוד %u"
 
-#: ../gtk/gtkradiotoolbutton.c:92
+#: gtk/gtkradiotoolbutton.c:92
 msgid "Group"
 msgstr "קבוצה"
 
-#: ../gtk/gtkradiotoolbutton.c:93
+#: gtk/gtkradiotoolbutton.c:93
 msgid "The radio tool button whose group this button belongs to."
 msgstr ""
 
-#: ../gtk/gtkrc.c:2400
+#: gtk/gtkrc.c:2400
 #, c-format
 msgid "Unable to find include file: \"%s\""
 msgstr "לא ניתן למצוא את קובץ ה include: \"%s\""
 
-#: ../gtk/gtkrc.c:3042 ../gtk/gtkrc.c:3045
+#: gtk/gtkrc.c:3042 gtk/gtkrc.c:3045
 #, c-format
 msgid "Unable to locate image file in pixmap_path: \"%s\""
 msgstr "לא מצליח לאתר את קובץ התמונה ב-pixmap_path: \"%s\""
 
-#: ../gtk/gtkrc.c:3480
+#: gtk/gtkrc.c:3480
 #, c-format
 msgid "Pixmap path element: \"%s\" must be absolute, %s, line %d"
 msgstr ""
 
 #. KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate
-#: ../gtk/gtkstock.c:308
+#: gtk/gtkstock.c:308
 msgid "Information"
 msgstr "מידע"
 
-#: ../gtk/gtkstock.c:309
+#: gtk/gtkstock.c:309
 msgid "Warning"
 msgstr "אזהרה"
 
-#: ../gtk/gtkstock.c:310
+#: gtk/gtkstock.c:310
 msgid "Error"
 msgstr "שגיאה"
 
-#: ../gtk/gtkstock.c:311
+#: gtk/gtkstock.c:311
 msgid "Question"
 msgstr "שאלה"
 
 #. FIXME these need accelerators when appropriate, and
 #. * need the mnemonics to be rationalized
 #.
-#: ../gtk/gtkstock.c:316
+#: gtk/gtkstock.c:316
 msgid "_About"
 msgstr "_אודות"
 
-#: ../gtk/gtkstock.c:318
+#: gtk/gtkstock.c:318
 msgid "_Apply"
 msgstr "_החל"
 
-#: ../gtk/gtkstock.c:319
+#: gtk/gtkstock.c:319
 msgid "_Bold"
 msgstr "_מודגש"
 
-#: ../gtk/gtkstock.c:320
+#: gtk/gtkstock.c:320
 msgid "_Cancel"
 msgstr "_ביטול"
 
-#: ../gtk/gtkstock.c:321
+#: gtk/gtkstock.c:321
 msgid "_CD-Rom"
 msgstr "_תקליטור"
 
-#: ../gtk/gtkstock.c:322
+#: gtk/gtkstock.c:322
 msgid "_Clear"
 msgstr "_נקה"
 
-#: ../gtk/gtkstock.c:323
+#: gtk/gtkstock.c:323
 msgid "_Close"
 msgstr "_סגור"
 
-#: ../gtk/gtkstock.c:324
+#: gtk/gtkstock.c:324
 msgid "_Convert"
 msgstr "_המר"
 
-#: ../gtk/gtkstock.c:325
+#: gtk/gtkstock.c:325
 msgid "_Copy"
 msgstr "ה_עתק"
 
-#: ../gtk/gtkstock.c:326
+#: gtk/gtkstock.c:326
 msgid "Cu_t"
 msgstr "_גזור"
 
-#: ../gtk/gtkstock.c:327
+#: gtk/gtkstock.c:327
 msgid "_Delete"
 msgstr "_מחק"
 
-#: ../gtk/gtkstock.c:328
+#: gtk/gtkstock.c:328
 msgid "_Execute"
 msgstr "_הפעל"
 
-#: ../gtk/gtkstock.c:329
+#: gtk/gtkstock.c:329
 msgid "_Edit"
 msgstr "_עריכה"
 
-#: ../gtk/gtkstock.c:330
+#: gtk/gtkstock.c:330
 msgid "_Find"
 msgstr "_מצא"
 
-#: ../gtk/gtkstock.c:331
+#: gtk/gtkstock.c:331
 msgid "Find and _Replace"
 msgstr "מצא וה_חלף"
 
-#: ../gtk/gtkstock.c:332
+#: gtk/gtkstock.c:332
 msgid "_Floppy"
 msgstr "ת_קליטון"
 
-#: ../gtk/gtkstock.c:333
+#: gtk/gtkstock.c:333
 msgid "_Fullscreen"
 msgstr "מסך _מלא"
 
-#: ../gtk/gtkstock.c:334
+#: gtk/gtkstock.c:334
 msgid "_Leave Fullscreen"
 msgstr "_צא ממסך מלא"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:336
+#: gtk/gtkstock.c:336
 msgid "Navigation|_Bottom"
 msgstr ""
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:338
+#: gtk/gtkstock.c:338
 msgid "Navigation|_First"
 msgstr ""
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:340
+#: gtk/gtkstock.c:340
 msgid "Navigation|_Last"
 msgstr ""
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:342
+#: gtk/gtkstock.c:342
 msgid "Navigation|_Top"
 msgstr ""
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:344
+#: gtk/gtkstock.c:344
 msgid "Navigation|_Back"
 msgstr ""
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:346
+#: gtk/gtkstock.c:346
 msgid "Navigation|_Down"
 msgstr ""
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:348
+#: gtk/gtkstock.c:348
 msgid "Navigation|_Forward"
 msgstr ""
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:350
+#: gtk/gtkstock.c:350
 msgid "Navigation|_Up"
 msgstr ""
 
-#: ../gtk/gtkstock.c:351
+#: gtk/gtkstock.c:351
 msgid "_Harddisk"
 msgstr "_דיסק קשיח"
 
-#: ../gtk/gtkstock.c:352
+#: gtk/gtkstock.c:352
 msgid "_Help"
 msgstr "_עזרה"
 
-#: ../gtk/gtkstock.c:353
+#: gtk/gtkstock.c:353
 msgid "_Home"
 msgstr "_בית"
 
-#: ../gtk/gtkstock.c:354
+#: gtk/gtkstock.c:354
 msgid "Increase Indent"
 msgstr "הגדל זיח"
 
-#: ../gtk/gtkstock.c:355
+#: gtk/gtkstock.c:355
 msgid "Decrease Indent"
 msgstr "הקטן זיח"
 
-#: ../gtk/gtkstock.c:356
+#: gtk/gtkstock.c:356
 msgid "_Index"
 msgstr "_אינדקס"
 
-#: ../gtk/gtkstock.c:357
+#: gtk/gtkstock.c:357
 msgid "_Information"
 msgstr "_מידע"
 
-#: ../gtk/gtkstock.c:358
+#: gtk/gtkstock.c:358
 msgid "_Italic"
 msgstr "_נטוי"
 
-#: ../gtk/gtkstock.c:359
+#: gtk/gtkstock.c:359
 msgid "_Jump to"
 msgstr "_קפוץ אל"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:361
+#: gtk/gtkstock.c:361
 msgid "Justify|_Center"
 msgstr "_מרכז"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:363
+#: gtk/gtkstock.c:363
 msgid "Justify|_Fill"
 msgstr ""
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:365
+#: gtk/gtkstock.c:365
 msgid "Justify|_Left"
 msgstr "ישר ל_שמאל"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:367
+#: gtk/gtkstock.c:367
 msgid "Justify|_Right"
 msgstr "ישר ל_ימין"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:370
+#: gtk/gtkstock.c:370
 msgid "Media|_Forward"
 msgstr ""
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:372
+#: gtk/gtkstock.c:372
 msgid "Media|_Next"
 msgstr ""
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:374
+#: gtk/gtkstock.c:374
 msgid "Media|P_ause"
 msgstr ""
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:376
+#: gtk/gtkstock.c:376
 msgid "Media|_Play"
 msgstr ""
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:378
+#: gtk/gtkstock.c:378
 msgid "Media|Pre_vious"
 msgstr ""
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:380
+#: gtk/gtkstock.c:380
 msgid "Media|_Record"
 msgstr ""
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:382
+#: gtk/gtkstock.c:382
 msgid "Media|R_ewind"
 msgstr ""
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:384
+#: gtk/gtkstock.c:384
 msgid "Media|_Stop"
 msgstr "_ע"
 
-#: ../gtk/gtkstock.c:385
+#: gtk/gtkstock.c:385
 msgid "_Network"
 msgstr "_רשת"
 
-#: ../gtk/gtkstock.c:386
+#: gtk/gtkstock.c:386
 msgid "_New"
 msgstr "_חדש"
 
-#: ../gtk/gtkstock.c:387
+#: gtk/gtkstock.c:387
 msgid "_No"
 msgstr "_לא"
 
-#: ../gtk/gtkstock.c:388
+#: gtk/gtkstock.c:388
 msgid "_OK"
 msgstr "_אישור"
 
-#: ../gtk/gtkstock.c:389
+#: gtk/gtkstock.c:389
 msgid "_Open"
 msgstr "_פתח"
 
-#: ../gtk/gtkstock.c:390
+#: gtk/gtkstock.c:390
 msgid "_Paste"
 msgstr "ה_דבק"
 
-#: ../gtk/gtkstock.c:391
+#: gtk/gtkstock.c:391
 msgid "_Preferences"
 msgstr "_העדפות"
 
-#: ../gtk/gtkstock.c:392
+#: gtk/gtkstock.c:392
 msgid "_Print"
 msgstr "_הדפס"
 
-#: ../gtk/gtkstock.c:393
+#: gtk/gtkstock.c:393
 msgid "Print Pre_view"
 msgstr "_תצוגה מקדימה"
 
-#: ../gtk/gtkstock.c:394
+#: gtk/gtkstock.c:394
 msgid "_Properties"
 msgstr "_מאפיינים"
 
-#: ../gtk/gtkstock.c:395
+#: gtk/gtkstock.c:395
 msgid "_Quit"
 msgstr "י_ציאה"
 
-#: ../gtk/gtkstock.c:396
+#: gtk/gtkstock.c:396
 msgid "_Redo"
 msgstr "_בצע שוב"
 
-#: ../gtk/gtkstock.c:397
+#: gtk/gtkstock.c:397
 msgid "_Refresh"
 msgstr "_רענן"
 
-#: ../gtk/gtkstock.c:399
+#: gtk/gtkstock.c:399
 msgid "_Revert"
 msgstr "_החזר"
 
-#: ../gtk/gtkstock.c:400
+#: gtk/gtkstock.c:400
 msgid "_Save"
 msgstr "_שמור"
 
 # hebrew note: note that "key" has a different meaning - "מפתח"
-#: ../gtk/gtkstock.c:401
+#: gtk/gtkstock.c:401
 msgid "Save _As"
 msgstr "שמור _בשם"
 
-#: ../gtk/gtkstock.c:402
+#: gtk/gtkstock.c:402
 msgid "_Color"
 msgstr "_צבע"
 
-#: ../gtk/gtkstock.c:403
+#: gtk/gtkstock.c:403
 msgid "_Font"
 msgstr "_גופן"
 
-#: ../gtk/gtkstock.c:404
+#: gtk/gtkstock.c:404
 msgid "_Ascending"
 msgstr "סדר _עולה"
 
-#: ../gtk/gtkstock.c:405
+#: gtk/gtkstock.c:405
 msgid "_Descending"
 msgstr "סדר _יורד"
 
-#: ../gtk/gtkstock.c:406
+#: gtk/gtkstock.c:406
 msgid "_Spell Check"
 msgstr "_בדיקת איות"
 
-#: ../gtk/gtkstock.c:407
+#: gtk/gtkstock.c:407
 msgid "_Stop"
 msgstr "_עצור"
 
-#: ../gtk/gtkstock.c:408
+#: gtk/gtkstock.c:408
 msgid "_Strikethrough"
 msgstr "_קו מחיקה"
 
-#: ../gtk/gtkstock.c:409
+#: gtk/gtkstock.c:409
 msgid "_Undelete"
 msgstr "_ביטול מחיקה"
 
-#: ../gtk/gtkstock.c:410
+#: gtk/gtkstock.c:410
 msgid "_Underline"
 msgstr "קו _תחתי"
 
-#: ../gtk/gtkstock.c:411
+#: gtk/gtkstock.c:411
 msgid "_Undo"
 msgstr "_בטל"
 
-#: ../gtk/gtkstock.c:412
+#: gtk/gtkstock.c:412
 msgid "_Yes"
 msgstr "_כן"
 
-#: ../gtk/gtkstock.c:413
+#: gtk/gtkstock.c:413
 msgid "_Normal Size"
 msgstr "גודל _רגיל"
 
-#: ../gtk/gtkstock.c:414
+#: gtk/gtkstock.c:414
 msgid "Best _Fit"
 msgstr "ה_תאמה"
 
-#: ../gtk/gtkstock.c:415
+#: gtk/gtkstock.c:415
 msgid "Zoom _In"
 msgstr "הת_קרב"
 
-#: ../gtk/gtkstock.c:416
+#: gtk/gtkstock.c:416
 msgid "Zoom _Out"
 msgstr "הת_רחק"
 
-#: ../gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM סימון _שמאל לימין"
 
-#: ../gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM סימון _ימין לשמאל"
 
-#: ../gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE _הטבעת שמאל לימין"
 
-#: ../gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE ה_טבעת ימין לשמאל"
 
-#: ../gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO _ביטול שמאל לימין"
 
-#: ../gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO ביט_ול ימין לשמאל"
 
-#: ../gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF פורמט כיוון _קופץ"
 
-#: ../gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _מרווח רוחב אפסי"
 
-#: ../gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr ""
 
-#: ../gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr ""
 
-#: ../gtk/gtkthemes.c:71
+#: gtk/gtkthemes.c:71
 #, c-format
 msgid "Unable to locate theme engine in module_path: \"%s\","
 msgstr "לא מצליח לאתר את מנוע ערכת הנושא הנטען ב-module_path: \"%s\","
 
-#: ../gtk/gtktipsquery.c:186
+#: gtk/gtktipsquery.c:186
 msgid "--- No Tip ---"
 msgstr "--- אין טיפ ---"
 
-#: ../gtk/gtkuimanager.c:1154
+#: gtk/gtkuimanager.c:1154
 #, c-format
 msgid "Unknown attribute '%s' on line %d char %d"
 msgstr "מאפיין לא ידוע '%s' בשורה %d תו %d"
 
-#: ../gtk/gtkuimanager.c:1371
+#: gtk/gtkuimanager.c:1371
 #, c-format
 msgid "Unexpected start tag '%s' on line %d char %d"
 msgstr "תג פתיחב לא צפוי '%s' בשורה %d תו %d"
 
-#: ../gtk/gtkuimanager.c:1461
+#: gtk/gtkuimanager.c:1461
 #, c-format
 msgid "Unexpected character data on line %d char %d"
 msgstr "מידע תו לא צפוי בשורה %d תו %d"
 
-#: ../gtk/gtkuimanager.c:2272
+#: gtk/gtkuimanager.c:2272
 msgid "Empty"
 msgstr "ריק"
 
 #. ID
-#: ../modules/input/imam-et.c:454
+#: modules/input/imam-et.c:454
 msgid "Amharic (EZ+)"
 msgstr "אמהרית (EZ+)"
 
 #. ID
-#: ../modules/input/imcedilla.c:91
+#: modules/input/imcedilla.c:91
 msgid "Cedilla"
 msgstr ""
 
 #. ID
-#: ../modules/input/imcyrillic-translit.c:217
+#: modules/input/imcyrillic-translit.c:217
 msgid "Cyrillic (Transliterated)"
 msgstr "קרילי (מועתק)"
 
 #. ID
-#: ../modules/input/iminuktitut.c:127
+#: modules/input/iminuktitut.c:127
 msgid "Inuktitut (Transliterated)"
 msgstr ""
 
 #. ID
-#: ../modules/input/imipa.c:145
+#: modules/input/imipa.c:145
 msgid "IPA"
 msgstr "IPA"
 
 #. ID
-#: ../modules/input/imthai-broken.c:178
+#: modules/input/imthai-broken.c:178
 msgid "Thai (Broken)"
 msgstr "תאי (שבור)"
 
 #. ID
-#: ../modules/input/imti-er.c:453
+#: modules/input/imti-er.c:453
 msgid "Tigrigna-Eritrean (EZ+)"
 msgstr ""
 
 #. ID
-#: ../modules/input/imti-et.c:453
+#: modules/input/imti-et.c:453
 msgid "Tigrigna-Ethiopian (EZ+)"
 msgstr ""
 
 #. ID
-#: ../modules/input/imviqr.c:244
+#: modules/input/imviqr.c:244
 msgid "Vietnamese (VIQR)"
 msgstr "ויאטנמית (VIQR)"
 
 #. ID
-#: ../modules/input/imxim.c:28
+#: modules/input/imxim.c:28
 msgid "X Input Method"
 msgstr "שיטת הקלט של X"
 
-#: ../tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "לא ניתן לקבל מידע על הקובץ '%s': %s"
 
+#~ msgid "_Credits"
+#~ msgstr "_תודות"
+
 #, fuzzy
 #~ msgid "Writing %s failed: %s"
 #~ msgstr "שמירת סימנייה נכשלה (%s)"
diff --git a/po/hi.po b/po/hi.po
index 18dd68b058..575dcce85f 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -180,7 +180,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+.HEAD.hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-07-07 16:36+0530\n"
 "Last-Translator: Rajesh Ranjan <rranjan@redhat.com>\n"
 "Language-Team: Hindi <fedora-trans-hi@redhat.com>\n"
@@ -193,7 +193,7 @@ msgstr ""
 "\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr " '%s' फ़ाइल खोलने में असफलः %s"
@@ -204,7 +204,7 @@ msgid "Image file '%s' contains no data"
 msgstr "छवि फ़ाइल '%s' में कोई डेटा नहीं है"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1423,20 +1423,20 @@ msgstr "रंग चक्र"
 msgid "Color Selection"
 msgstr "रंग चयन"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "सभी चुनें (_A)"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "इनपुट विधियाँ"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "यूनिकोड कन्ट्रोल कैरेक्टर प्रविष्ट करें (_I)"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "अवैध फ़ाइलनाम: %s"
@@ -1445,12 +1445,12 @@ msgstr "अवैध फ़ाइलनाम: %s"
 msgid "Select A File"
 msgstr "एक फ़ाइल चुनें"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "घर"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "डेस्कटॉप"
@@ -1463,23 +1463,23 @@ msgstr "(कुछ नहीं)"
 msgid "Other..."
 msgstr "अन्य..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "फाइल के बारे में जानकारी नहीं पा सका"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "पुस्तकचिह्न नहीं जोड़ सका"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "पुस्तकचिह्न मिटा नहीं सका"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "फोल्डर बनाया नहीं जा सकता"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1487,220 +1487,236 @@ msgstr ""
 "फोल्डर नहीं बनाया जा सका, क्योंकि उस नाम के साथ फाइल पहले से मौजूद है.  फोल्डर के लिये "
 "अलग नाम ढूंढने की कोशिश करें, यह फाइल का पहले फिर नामकरण करें."
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "अमान्य फाइल नाम"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "फोल्डर की सामग्री दिखायी नहीं जा सकती"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "'%s' के बारे में जानकारी नहीं पा सका: %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "फोल्डर '%s' को पुस्तकचिह्न में जोड़ें"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "पुस्तकचिह्न में मौजूदा फोल्डर जोड़ें"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "पुस्तकचिह्न में चयनित फोल्डर जोड़ें"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "'%s' पुस्तकचिह्न हटायें"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "%s हेतु पुस्तकचिह्न जोड़ नहीं सकता चूंकि यह एक अवैध पथ नाम है."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "हटाओ"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "नाम बदलें..."
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "शॉर्टकट्स"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "फ़ोल्डर"
 
 #  FIXME these need accelerators when appropriate, and
 #  * need the mnemonics to be rationalized
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "जोड़ें (_A)"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "पुस्तकचिह्न में चुना हुआ फोल्डर जोड़ें"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "मिटाएँ (_R)"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "चयनित पुस्तकचिह्न हटायें"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "मद चुन नहीं सका"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "%s हेतु पुस्तकचिह्न जोड़ नहीं सकता चूंकि यह एक अवैध पथ नाम है."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "एक पुस्तकचिह्न जोड़ें (_A)"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "अवस्थिति खोलें (_L)"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "छुपी फ़ाइलें दिखाएँ (_h)"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "फ़ाइलें"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "नाम"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "आकार "
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "परिवर्धित"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "चुनें कि कैसी फाइल दिखायी गई है"
 
 #  Create Folder
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "फ़ोल्डर बनाएँ (_l)"
 
 #  Name entry
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "नाम: (_N)"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "अन्य फ़ोल्डर्स हेतु ब्राउज़ करें (_B)"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "फ़ोल्डर में सहेजें: (_D)"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "फ़ोल्डर में बनाएँ: (_f) "
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "फ़ोल्डर में बदल नहीं सकता चूंकि यह स्थानीय नहीं है"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "शॉर्टकट %s अस्तित्व में नहीं है"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "नाम बदलें (_R)"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "%s को आरोहित न कर सका"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "नए फ़ोल्डर का नाम टाइप करें"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d बाइट"
 msgstr[1] "%d बाइट्स"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f कि."
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f मे."
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f गी."
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "अज्ञात"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "आज"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "कल"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "फ़ोल्डर बदल नहीं सकता"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "आपके द्वारा निर्दिष्ट फ़ोल्डर एक अवैध पथ है."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "'%s' तथा '%s' से फ़ाइलनाम बिल्ड नहीं कर सका"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "मद चुन नहीं सका"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "स्थान खोलें"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "स्थान में सहेजें"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "स्थान (_L):"
 
@@ -1898,7 +1914,8 @@ msgid "This file system does not support mounting"
 msgstr "फ़ाइल सिस्टम माउन्टिंग समर्थित नहीं करता है"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "फ़ाइलसिस्टम"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -2005,7 +2022,7 @@ msgstr "गामा मान (_G)"
 msgid "Error loading icon: %s"
 msgstr "चिह्न लोड करने में त्रुटिः %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -2018,7 +2035,7 @@ msgstr ""
 "आप इससे एक कॉपी पा सकते हैं:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "चिह्न '%s' प्रसंग में उपस्थित नहीं है"
@@ -2108,7 +2125,7 @@ msgstr "(अज्ञात)"
 msgid "clear"
 msgstr "साफ करें"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "सभी चुनें"
 
@@ -2540,43 +2557,43 @@ msgstr "बड़ा आकार (_I)"
 msgid "Zoom _Out"
 msgstr "छोटा आकार (_O)"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM बाएँ-से-दाएँ चिह्न"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM दाएँ-से-बाएँ चिह्न (_R)"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE बाएँ-से-दाएँ अंतः स्थापित (_e)"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE दाएँ-से-बाएँ अंतःस्थापित (_m)"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO बाएँ-से-दाएँ ओवरराइड (_o)"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO दाएँ-से-बाएँ ओवरराइड (_v)"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "पीडीएफ़ पॉप डायरेक्शनल फ़ॉर्मेटिंग (_P)"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS शून्य चौड़ाई स्थान (_Z)"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ शून्य चौड़ाई जॉइनर (_j)"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ शून्य चौड़ाई नॉन-जॉइनर ( _n)"
 
@@ -2668,7 +2685,7 @@ msgstr "विएतनामी (VIQR)"
 msgid "X Input Method"
 msgstr "एक्स इनपुट विधि"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "फ़ाइल '%s' हेतु जानकारी नहीं पा सका: %s"
diff --git a/po/hr.po b/po/hr.po
index acfdc87657..035669bb5a 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-03-21 09:20+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Greška pri otvaranju datoteke '%s': %s"
@@ -28,7 +28,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Slika \"%s\" ne sadrži podatke"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1279,20 +1279,20 @@ msgstr "Kotačić"
 msgid "Color Selection"
 msgstr "Odabir boja"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Označi _sve"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Ulazne metode"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Ubaciti Unicode kontrolni znak"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Neispravno ime datoteke: %s"
@@ -1302,12 +1302,12 @@ msgstr "Neispravno ime datoteke: %s"
 msgid "Select A File"
 msgstr "Obriši datoteku"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Početak"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Radna površina"
@@ -1321,202 +1321,218 @@ msgstr "ništa"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr ""
 "Nisam mogao dohvatiti informaciju o %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 #, fuzzy
 msgid "Could not add a bookmark"
 msgstr ""
 "Nisam mogao dodati knjižnu oznaku za %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 #, fuzzy
 msgid "Could not remove bookmark"
 msgstr ""
 "Nisam mogao ukloniti knjišku oznaku za %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Neispravno ime datoteke: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 "Nisam mogao dohvatiti informaciju o %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, fuzzy, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Nisam mogao dodati knjižnu oznaku za %s, jer je to neispravno ime putanje."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Ukloni"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Promijeni ime"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Mapa"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "Nisam mogao označiti %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "Nisam mogao dodati knjižnu oznaku za %s, jer je to neispravno ime putanje."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "Otvori mjesto"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Datoteke"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Ime"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Veličina"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Mijenjano"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "Stvori _mapu"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Pregledaj druge mape"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Spremi u _mapu:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Stvori u _mapi:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 #, fuzzy
 msgid "Cannot change to folder because it is not local"
 msgstr "Nisam se mogao postaviti u mapu, jer je nije na računalu."
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Ne postoji kratica %s"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Promijeni ime"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "Nisam mogao označiti %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Upišite ime nove mape"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
@@ -1524,69 +1540,69 @@ msgstr[0] "%d bajt"
 msgstr[1] "%d bajta"
 msgstr[2] "%d bajtova"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Danas"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Jučer"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Stvori u _mapi:"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 #, fuzzy
 msgid "The folder you specified is an invalid path."
 msgstr ""
 "Nisam se mogao postaviti u mapu koju ste odredili, jer je to neispravna "
 "putanja."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, fuzzy, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 "Nisam mogao stvoriti ime datoteke iz '%s' i '%s':\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "Nisam mogao označiti %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Otvori mjesto"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "Otvori mjesto"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Mjesto:"
 
@@ -1787,7 +1803,8 @@ msgid "This file system does not support mounting"
 msgstr "Ovaj datotečni sustav ne podržava montiranje."
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Datotečni sustav"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1888,7 +1905,7 @@ msgstr "_Gama vrijednost"
 msgid "Error loading icon: %s"
 msgstr "Greška pri učitavanju sličice: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1901,7 +1918,7 @@ msgstr ""
 "Kopiju možete preuzeti sa:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Sličica %s nije prisutna u temi"
@@ -1989,7 +2006,7 @@ msgstr "(nepoznato)"
 msgid "clear"
 msgstr "očisti"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Označi sve"
 
@@ -2424,43 +2441,43 @@ msgstr "U_većaj"
 msgid "Zoom _Out"
 msgstr "U_manji"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM Obilježavanje sa  s_lijeva-na-desno"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM Označivač za s _desna-na-lijevo"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE _ubacivanje s lijeva-na-desno"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE u_bacivanje s desna-na-lijevo"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO pr_imoravanje slijeva-na-desno"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO primorava_nje s desna-na-lijevo"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Počni usmjeren zapis"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _razmak bez širine"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ _spojnica bez širine"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ _nespojnica bez širine"
 
@@ -2543,7 +2560,7 @@ msgstr "Vijetnamski (VIQR)"
 msgid "X Input Method"
 msgstr "X način unosa (XIM)"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Nisam mogao dohvatiti podatak za datoteku '%s': %s"
diff --git a/po/hu.po b/po/hu.po
index 65bb8d7ed8..1e9c701ac9 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+.gtk-2-6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-05 06:17+0000\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-07-12 18:37+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
@@ -20,24 +20,26 @@ msgstr ""
 "Plural-Forms:  nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.10.1\n"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:153 ../gdk-pixbuf/gdk-pixbuf-io.c:838
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1089 ../tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Nem sikerült megnyitni a(z) '%s' fájlt: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:166 ../gdk-pixbuf/gdk-pixbuf-io.c:850
+#: gdk-pixbuf/gdk-pixbuf-animation.c:166 gdk-pixbuf/gdk-pixbuf-io.c:850
 #, c-format
 msgid "Image file '%s' contains no data"
 msgstr "A(z) '%s' képfájl nem tartalmaz adatokat"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:208 ../gdk-pixbuf/gdk-pixbuf-io.c:887
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1130 ../tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
-msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr "Nem sikerült betölteni a(z) '%s' képet: ok ismeretlen, talán sérült a képfájl"
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+"Nem sikerült betölteni a(z) '%s' képet: ok ismeretlen, talán sérült a képfájl"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:241
+#: gdk-pixbuf/gdk-pixbuf-animation.c:241
 #, c-format
 msgid ""
 "Failed to load animation '%s': reason not known, probably a corrupt "
@@ -46,12 +48,12 @@ msgstr ""
 "Nem sikerült betölteni a(z) '%s' animációt: ok ismeretlen, talán sérült az "
 "animációfájl"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:444
+#: gdk-pixbuf/gdk-pixbuf-io.c:444
 #, c-format
 msgid "Unable to load image-loading module: %s: %s"
 msgstr "Nem lehet betölteni a képbetöltő modult: %s: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:459
+#: gdk-pixbuf/gdk-pixbuf-io.c:459
 #, c-format
 msgid ""
 "Image-loading module %s does not export the proper interface; perhaps it's "
@@ -60,55 +62,55 @@ msgstr ""
 "A(z) %s képbetöltő-modul nem exportálja a megfelelő felületet, talán egy "
 "másik GTK verzióból van?"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:628 ../gdk-pixbuf/gdk-pixbuf-io.c:680
+#: gdk-pixbuf/gdk-pixbuf-io.c:628 gdk-pixbuf/gdk-pixbuf-io.c:680
 #, c-format
 msgid "Image type '%s' is not supported"
 msgstr "A(z) '%s' képtípus nem támogatott"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:720
+#: gdk-pixbuf/gdk-pixbuf-io.c:720
 #, c-format
 msgid "Couldn't recognize the image file format for file '%s'"
 msgstr "Nem lehet azonosítani a(z) '%s' képfájl formátumát"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:728
+#: gdk-pixbuf/gdk-pixbuf-io.c:728
 msgid "Unrecognized image file format"
 msgstr "Azonosíthatatlan képfájl formátum"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:896
+#: gdk-pixbuf/gdk-pixbuf-io.c:896
 #, c-format
 msgid "Failed to load image '%s': %s"
 msgstr "Nem sikerült betölteni a(z) '%s' képet: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1357
+#: gdk-pixbuf/gdk-pixbuf-io.c:1357
 #, c-format
 msgid "Error writing to image file: %s"
 msgstr "Hiba képfájlba íráskor: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1403 ../gdk-pixbuf/gdk-pixbuf-io.c:1532
+#: gdk-pixbuf/gdk-pixbuf-io.c:1403 gdk-pixbuf/gdk-pixbuf-io.c:1532
 #, c-format
 msgid "This build of gdk-pixbuf does not support saving the image format: %s"
 msgstr ""
 "A gdk-pixbuf ezen változatába nincs befordítva a(z) %s képformátumba való "
 "mentés támogatása"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1437
+#: gdk-pixbuf/gdk-pixbuf-io.c:1437
 msgid "Insufficient memory to save image to callback"
 msgstr "Nincs elég memória a kép visszahíváshoz mentéséhez"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1449
+#: gdk-pixbuf/gdk-pixbuf-io.c:1449
 msgid "Failed to open temporary file"
 msgstr "Nem sikerült megnyitni az átmeneti fájlt"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1474
+#: gdk-pixbuf/gdk-pixbuf-io.c:1474
 msgid "Failed to read from temporary file"
 msgstr "Nem sikerült olvasni az átmeneti fájlból"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1708
+#: gdk-pixbuf/gdk-pixbuf-io.c:1708
 #, c-format
 msgid "Failed to open '%s' for writing: %s"
 msgstr "'%s' megnyitása írásra sikertelen: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1732
+#: gdk-pixbuf/gdk-pixbuf-io.c:1732
 #, c-format
 msgid ""
 "Failed to close '%s' while writing image, all data may not have been saved: %"
@@ -117,16 +119,16 @@ msgstr ""
 "Nem sikerült lezárni a(z) '%s'-t a kép írása közben, lehet, hogy nem "
 "sikerült minden adatot elmenteni: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1952 ../gdk-pixbuf/gdk-pixbuf-io.c:2002
+#: gdk-pixbuf/gdk-pixbuf-io.c:1952 gdk-pixbuf/gdk-pixbuf-io.c:2002
 msgid "Insufficient memory to save image into a buffer"
 msgstr "Nincs elég memória a kép pufferbe mentéséhez"
 
-#: ../gdk-pixbuf/gdk-pixbuf-loader.c:383
+#: gdk-pixbuf/gdk-pixbuf-loader.c:383
 #, c-format
 msgid "Incremental loading of image type '%s' is not supported"
 msgstr "A(z) %s típusú képek növekményes betöltése nem támogatott"
 
-#: ../gdk-pixbuf/gdk-pixbuf-loader.c:411 ../gdk-pixbuf/gdk-pixbuf-loader.c:513
+#: gdk-pixbuf/gdk-pixbuf-loader.c:411 gdk-pixbuf/gdk-pixbuf-loader.c:513
 #, c-format
 msgid ""
 "Internal error: Image loader module '%s' failed to begin loading an image, "
@@ -135,136 +137,132 @@ msgstr ""
 "Belső hiba: A(z) %s képbetöltő modul nem tudta elkezdeni a kép betöltését, "
 "de nem adta meg a hiba okát"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:147
+#: gdk-pixbuf/gdk-pixdata.c:147
 msgid "Image header corrupt"
 msgstr "Hibás képfejléc"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:152
+#: gdk-pixbuf/gdk-pixdata.c:152
 msgid "Image format unknown"
 msgstr "Ismeretlen képformátum"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:157 ../gdk-pixbuf/gdk-pixdata.c:487
+#: gdk-pixbuf/gdk-pixdata.c:157 gdk-pixbuf/gdk-pixdata.c:487
 msgid "Image pixel data corrupt"
 msgstr "A kép képpontadata sérült"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:431
+#: gdk-pixbuf/gdk-pixdata.c:431
 #, c-format
 msgid "failed to allocate image buffer of %u byte"
 msgid_plural "failed to allocate image buffer of %u bytes"
 msgstr[0] "nem sikerült %u bájt méretű képpuffert lefoglalni"
 msgstr[1] "nem sikerült %u bájt méretű képpuffert lefoglalni"
 
-#: ../gdk-pixbuf/io-ani.c:244
+#: gdk-pixbuf/io-ani.c:244
 msgid "Unexpected icon chunk in animation"
 msgstr "Váratlan ikondarab az animációban"
 
-#: ../gdk-pixbuf/io-ani.c:337
+#: gdk-pixbuf/io-ani.c:337
 msgid "Unsupported animation type"
 msgstr "Nem támogatott animációtípus"
 
-#: ../gdk-pixbuf/io-ani.c:348 ../gdk-pixbuf/io-ani.c:538
+#: gdk-pixbuf/io-ani.c:348 gdk-pixbuf/io-ani.c:538
 msgid "Invalid header in animation"
 msgstr "Érvénytelen fejléc az animációban"
 
-#: ../gdk-pixbuf/io-ani.c:358 ../gdk-pixbuf/io-ani.c:382
-#: ../gdk-pixbuf/io-ani.c:441 ../gdk-pixbuf/io-ani.c:460
-#: ../gdk-pixbuf/io-ani.c:511 ../gdk-pixbuf/io-ani.c:583
+#: gdk-pixbuf/io-ani.c:358 gdk-pixbuf/io-ani.c:382 gdk-pixbuf/io-ani.c:441
+#: gdk-pixbuf/io-ani.c:460 gdk-pixbuf/io-ani.c:511 gdk-pixbuf/io-ani.c:583
 msgid "Not enough memory to load animation"
 msgstr "Nincs elég memória az animáció betöltéséhez"
 
-#: ../gdk-pixbuf/io-ani.c:400 ../gdk-pixbuf/io-ani.c:417
-#: ../gdk-pixbuf/io-ani.c:428
+#: gdk-pixbuf/io-ani.c:400 gdk-pixbuf/io-ani.c:417 gdk-pixbuf/io-ani.c:428
 msgid "Malformed chunk in animation"
 msgstr "Hibás részlet az animációban"
 
-#: ../gdk-pixbuf/io-ani.c:676
+#: gdk-pixbuf/io-ani.c:676
 msgid "The ANI image format"
 msgstr "ANI képformátum"
 
-#: ../gdk-pixbuf/io-bmp.c:228 ../gdk-pixbuf/io-bmp.c:306
-#: ../gdk-pixbuf/io-bmp.c:338 ../gdk-pixbuf/io-bmp.c:361
-#: ../gdk-pixbuf/io-bmp.c:442
+#: gdk-pixbuf/io-bmp.c:228 gdk-pixbuf/io-bmp.c:306 gdk-pixbuf/io-bmp.c:338
+#: gdk-pixbuf/io-bmp.c:361 gdk-pixbuf/io-bmp.c:442
 msgid "BMP image has bogus header data"
 msgstr "A BMP-kép fejlécadata hibás"
 
-#: ../gdk-pixbuf/io-bmp.c:239 ../gdk-pixbuf/io-bmp.c:401
+#: gdk-pixbuf/io-bmp.c:239 gdk-pixbuf/io-bmp.c:401
 msgid "Not enough memory to load bitmap image"
 msgstr "Nincs elég memória a kép betöltéséhez"
 
-#: ../gdk-pixbuf/io-bmp.c:287
+#: gdk-pixbuf/io-bmp.c:287
 msgid "BMP image has unsupported header size"
 msgstr "A BMP-kép fejlécmérete nem támogatott"
 
-#: ../gdk-pixbuf/io-bmp.c:325
+#: gdk-pixbuf/io-bmp.c:325
 msgid "Topdown BMP images cannot be compressed"
 msgstr "A fentről-lefelé BMP képek nem tömöríthetőek"
 
-#: ../gdk-pixbuf/io-bmp.c:1203
+#: gdk-pixbuf/io-bmp.c:1203
 msgid "Couldn't allocate memory for saving BMP file"
 msgstr "Nem lehet memóriát foglalni a BMP fájl mentéséhez"
 
-#: ../gdk-pixbuf/io-bmp.c:1244
+#: gdk-pixbuf/io-bmp.c:1244
 msgid "Couldn't write to BMP file"
 msgstr "Nem sikerült írni a BMP fájlba"
 
-#: ../gdk-pixbuf/io-bmp.c:1293
+#: gdk-pixbuf/io-bmp.c:1293
 msgid "The BMP image format"
 msgstr "BMP képformátum"
 
-#: ../gdk-pixbuf/io-gif.c:220
+#: gdk-pixbuf/io-gif.c:220
 #, c-format
 msgid "Failure reading GIF: %s"
 msgstr "Hiba a GIF olvasásánál: %s"
 
-#: ../gdk-pixbuf/io-gif.c:492 ../gdk-pixbuf/io-gif.c:1463
-#: ../gdk-pixbuf/io-gif.c:1624
+#: gdk-pixbuf/io-gif.c:492 gdk-pixbuf/io-gif.c:1463 gdk-pixbuf/io-gif.c:1624
 msgid "GIF file was missing some data (perhaps it was truncated somehow?)"
 msgstr "A GIF fájl egyes adatai hiányoznak (lehet, hogy csonkolódott a fájl?)"
 
-#: ../gdk-pixbuf/io-gif.c:501
+#: gdk-pixbuf/io-gif.c:501
 #, c-format
 msgid "Internal error in the GIF loader (%s)"
 msgstr "Belső hiba a GIF betöltőben (%s)"
 
-#: ../gdk-pixbuf/io-gif.c:575
+#: gdk-pixbuf/io-gif.c:575
 msgid "Stack overflow"
 msgstr "Veremtúlcsordulás"
 
-#: ../gdk-pixbuf/io-gif.c:635
+#: gdk-pixbuf/io-gif.c:635
 msgid "GIF image loader cannot understand this image."
 msgstr "A GIF-képbetöltő nem tudja értelmezni ezt a képet."
 
-#: ../gdk-pixbuf/io-gif.c:664
+#: gdk-pixbuf/io-gif.c:664
 msgid "Bad code encountered"
 msgstr "Hibás kód érkezett"
 
-#: ../gdk-pixbuf/io-gif.c:674
+#: gdk-pixbuf/io-gif.c:674
 msgid "Circular table entry in GIF file"
 msgstr "Körkörös táblázat bejegyzés a GIF fájlban"
 
-#: ../gdk-pixbuf/io-gif.c:862 ../gdk-pixbuf/io-gif.c:1451
-#: ../gdk-pixbuf/io-gif.c:1497 ../gdk-pixbuf/io-gif.c:1612
+#: gdk-pixbuf/io-gif.c:862 gdk-pixbuf/io-gif.c:1451 gdk-pixbuf/io-gif.c:1497
+#: gdk-pixbuf/io-gif.c:1612
 msgid "Not enough memory to load GIF file"
 msgstr "Nincs elég memória a GIF-fájl betöltéséhez"
 
-#: ../gdk-pixbuf/io-gif.c:947
+#: gdk-pixbuf/io-gif.c:947
 msgid "Not enough memory to composite a frame in GIF file"
 msgstr "Nincs elég memória a keretnek a GIF-fájlban való kiegészítéséhez"
 
-#: ../gdk-pixbuf/io-gif.c:1116
+#: gdk-pixbuf/io-gif.c:1116
 msgid "GIF image is corrupt (incorrect LZW compression)"
 msgstr "A GIF-kép hibás (helytelen LZW-tömörítés)"
 
-#: ../gdk-pixbuf/io-gif.c:1166
+#: gdk-pixbuf/io-gif.c:1166
 msgid "File does not appear to be a GIF file"
 msgstr "A fájl nem tűnik GIF formátumúnak"
 
-#: ../gdk-pixbuf/io-gif.c:1178
+#: gdk-pixbuf/io-gif.c:1178
 #, c-format
 msgid "Version %s of the GIF file format is not supported"
 msgstr "A %s verziójú GIF formátum nincs támogatva"
 
-#: ../gdk-pixbuf/io-gif.c:1287
+#: gdk-pixbuf/io-gif.c:1287
 msgid ""
 "GIF image has no global colormap, and a frame inside it has no local "
 "colormap."
@@ -272,67 +270,66 @@ msgstr ""
 "A GIF képnek nincs globális színtérképe, és a benne lévő keretnek sincs "
 "lokális színtérképe."
 
-#: ../gdk-pixbuf/io-gif.c:1519
+#: gdk-pixbuf/io-gif.c:1519
 msgid "GIF image was truncated or incomplete."
 msgstr "A GIF-kép csonkolódott vagy nem teljes."
 
-#: ../gdk-pixbuf/io-gif.c:1671
+#: gdk-pixbuf/io-gif.c:1671
 msgid "The GIF image format"
 msgstr "GIF képformátum"
 
-#: ../gdk-pixbuf/io-ico.c:219 ../gdk-pixbuf/io-ico.c:271
-#: ../gdk-pixbuf/io-ico.c:340 ../gdk-pixbuf/io-ico.c:403
-#: ../gdk-pixbuf/io-ico.c:433
+#: gdk-pixbuf/io-ico.c:219 gdk-pixbuf/io-ico.c:271 gdk-pixbuf/io-ico.c:340
+#: gdk-pixbuf/io-ico.c:403 gdk-pixbuf/io-ico.c:433
 msgid "Not enough memory to load icon"
 msgstr "Nincs elég memória az ikon betöltéséhez"
 
-#: ../gdk-pixbuf/io-ico.c:256 ../gdk-pixbuf/io-ico.c:330
+#: gdk-pixbuf/io-ico.c:256 gdk-pixbuf/io-ico.c:330
 msgid "Invalid header in icon"
 msgstr "Érvénytelen fejléc az ikonban"
 
-#: ../gdk-pixbuf/io-ico.c:293
+#: gdk-pixbuf/io-ico.c:293
 msgid "Icon has zero width"
 msgstr "Az ikon szélessége nulla"
 
-#: ../gdk-pixbuf/io-ico.c:303
+#: gdk-pixbuf/io-ico.c:303
 msgid "Icon has zero height"
 msgstr "Az ikon magassága nulla"
 
-#: ../gdk-pixbuf/io-ico.c:355
+#: gdk-pixbuf/io-ico.c:355
 msgid "Compressed icons are not supported"
 msgstr "Tömörített ikonok nincsenek támogatva"
 
-#: ../gdk-pixbuf/io-ico.c:388
+#: gdk-pixbuf/io-ico.c:388
 msgid "Unsupported icon type"
 msgstr "Nem támogatott ikontípus"
 
-#: ../gdk-pixbuf/io-ico.c:482
+#: gdk-pixbuf/io-ico.c:482
 msgid "Not enough memory to load ICO file"
 msgstr "Nincs elég memória az ICO-fájl betöltéséhez"
 
-#: ../gdk-pixbuf/io-ico.c:947
+#: gdk-pixbuf/io-ico.c:947
 msgid "Image too large to be saved as ICO"
 msgstr "A kép túl nagy ICO formátumba mentéshez"
 
-#: ../gdk-pixbuf/io-ico.c:958
+#: gdk-pixbuf/io-ico.c:958
 msgid "Cursor hotspot outside image"
 msgstr "A kurzor aktív pontja a képen kívül helyezkedik el"
 
-#: ../gdk-pixbuf/io-ico.c:981
+#: gdk-pixbuf/io-ico.c:981
 #, c-format
 msgid "Unsupported depth for ICO file: %d"
 msgstr "Nem támogatott mélység ICO-fájlnál: %d"
 
-#: ../gdk-pixbuf/io-ico.c:1210
+#: gdk-pixbuf/io-ico.c:1210
 msgid "The ICO image format"
 msgstr "ICO képformátum"
 
-#: ../gdk-pixbuf/io-jpeg.c:114
+#: gdk-pixbuf/io-jpeg.c:114
 #, c-format
 msgid "Error interpreting JPEG image file (%s)"
 msgstr "Hiba a JPEG képfájl értelmezésekor (%s)"
 
-#: ../gdk-pixbuf/io-jpeg.c:349
+#: gdk-pixbuf/io-jpeg.c:349
 msgid ""
 "Insufficient memory to load image, try exiting some applications to free "
 "memory"
@@ -340,17 +337,17 @@ msgstr ""
 "Nincs elég memória a kép betöltéséhez, memória felszabadításához próbáljon "
 "meg kilépni néhány alkalmazásból"
 
-#: ../gdk-pixbuf/io-jpeg.c:383 ../gdk-pixbuf/io-jpeg.c:749
+#: gdk-pixbuf/io-jpeg.c:383 gdk-pixbuf/io-jpeg.c:749
 #, c-format
 msgid "Unsupported JPEG color space (%s)"
 msgstr "Nem támogatott JPEG-színtér (%s)"
 
-#: ../gdk-pixbuf/io-jpeg.c:481 ../gdk-pixbuf/io-jpeg.c:678
-#: ../gdk-pixbuf/io-jpeg.c:943 ../gdk-pixbuf/io-jpeg.c:952
+#: gdk-pixbuf/io-jpeg.c:481 gdk-pixbuf/io-jpeg.c:678 gdk-pixbuf/io-jpeg.c:943
+#: gdk-pixbuf/io-jpeg.c:952
 msgid "Couldn't allocate memory for loading JPEG file"
 msgstr "Nem lehet memóriát kiosztani a JPEG fájl betöltéséhez"
 
-#: ../gdk-pixbuf/io-jpeg.c:894
+#: gdk-pixbuf/io-jpeg.c:894
 #, c-format
 msgid ""
 "JPEG quality must be a value between 0 and 100; value '%s' could not be "
@@ -359,94 +356,95 @@ msgstr ""
 "A JPEG-minőség értékének 0 és 100 között kell lennie, a(z) '%s' értéket nem "
 "lehet feldolgozni."
 
-#: ../gdk-pixbuf/io-jpeg.c:909
+#: gdk-pixbuf/io-jpeg.c:909
 #, c-format
-msgid "JPEG quality must be a value between 0 and 100; value '%d' is not allowed."
+msgid ""
+"JPEG quality must be a value between 0 and 100; value '%d' is not allowed."
 msgstr ""
 "A JPEG-minőség értékének 0 és 100 között kell lennie, a(z) '%d' érték nem "
 "megengedett."
 
-#: ../gdk-pixbuf/io-jpeg.c:1071
+#: gdk-pixbuf/io-jpeg.c:1071
 msgid "The JPEG image format"
 msgstr "JPEG képformátum"
 
-#: ../gdk-pixbuf/io-pcx.c:191
+#: gdk-pixbuf/io-pcx.c:191
 msgid "Couldn't allocate memory for header"
 msgstr "Nem lehet memóriát kiosztani a fejléchez"
 
-#: ../gdk-pixbuf/io-pcx.c:206 ../gdk-pixbuf/io-pcx.c:566
+#: gdk-pixbuf/io-pcx.c:206 gdk-pixbuf/io-pcx.c:566
 msgid "Couldn't allocate memory for context buffer"
 msgstr "Nem lehet memóriát foglalni a kontextus-puffer számára"
 
-#: ../gdk-pixbuf/io-pcx.c:607
+#: gdk-pixbuf/io-pcx.c:607
 msgid "Image has invalid width and/or height"
 msgstr "A kép szélessége és/vagy magassága érvénytelen"
 
-#: ../gdk-pixbuf/io-pcx.c:619 ../gdk-pixbuf/io-pcx.c:680
+#: gdk-pixbuf/io-pcx.c:619 gdk-pixbuf/io-pcx.c:680
 msgid "Image has unsupported bpp"
 msgstr "A kép képpontonkénti bitjeinek száma nem támogatott"
 
-#: ../gdk-pixbuf/io-pcx.c:624 ../gdk-pixbuf/io-pcx.c:632
+#: gdk-pixbuf/io-pcx.c:624 gdk-pixbuf/io-pcx.c:632
 #, c-format
 msgid "Image has unsupported number of %d-bit planes"
 msgstr "Nem támogatott számú %d bites színsík van a képben"
 
-#: ../gdk-pixbuf/io-pcx.c:648
+#: gdk-pixbuf/io-pcx.c:648
 msgid "Couldn't create new pixbuf"
 msgstr "Nem lehet létrehozni új pixbuf-t"
 
-#: ../gdk-pixbuf/io-pcx.c:656
+#: gdk-pixbuf/io-pcx.c:656
 msgid "Couldn't allocate memory for line data"
 msgstr "Nem lehet memóriát foglalni a vonaladatok számára"
 
-#: ../gdk-pixbuf/io-pcx.c:663
+#: gdk-pixbuf/io-pcx.c:663
 msgid "Couldn't allocate memory for paletted data"
 msgstr "Nem lehet memóriát foglalni a palettaadatok számára"
 
-#: ../gdk-pixbuf/io-pcx.c:710
+#: gdk-pixbuf/io-pcx.c:710
 msgid "Didn't get all lines of PCX image"
 msgstr "Nem található a PCX-kép minden sora"
 
-#: ../gdk-pixbuf/io-pcx.c:717
+#: gdk-pixbuf/io-pcx.c:717
 msgid "No palette found at end of PCX data"
 msgstr "Nem található paletta a PCX-adat végén"
 
-#: ../gdk-pixbuf/io-pcx.c:758
+#: gdk-pixbuf/io-pcx.c:758
 msgid "The PCX image format"
 msgstr "PCX képformátum"
 
-#: ../gdk-pixbuf/io-png.c:55
+#: gdk-pixbuf/io-png.c:55
 msgid "Bits per channel of PNG image is invalid."
 msgstr "A PNG-kép csatornánkénti bitjeinek száma érvénytelen."
 
-#: ../gdk-pixbuf/io-png.c:136
+#: gdk-pixbuf/io-png.c:136
 msgid "Transformed PNG has zero width or height."
 msgstr "Az átalakított PNG szélessége vagy magasság nulla."
 
-#: ../gdk-pixbuf/io-png.c:144
+#: gdk-pixbuf/io-png.c:144
 msgid "Bits per channel of transformed PNG is not 8."
 msgstr "Az átalakított PNG csatornánkénti bitjeinek száma nem 8."
 
-#: ../gdk-pixbuf/io-png.c:153
+#: gdk-pixbuf/io-png.c:153
 msgid "Transformed PNG not RGB or RGBA."
 msgstr "Az átalakított PNG nem RGB vagy RGBA módú."
 
-#: ../gdk-pixbuf/io-png.c:162
+#: gdk-pixbuf/io-png.c:162
 msgid "Transformed PNG has unsupported number of channels, must be 3 or 4."
 msgstr ""
 "Az átalakított PNG csatornánkénti bitjeinek száma nem támogatott, 3-nak vagy "
 "4-nek kell lennie."
 
-#: ../gdk-pixbuf/io-png.c:183
+#: gdk-pixbuf/io-png.c:183
 #, c-format
 msgid "Fatal error in PNG image file: %s"
 msgstr "Végzetes hiba a PNG képfájlban: %s"
 
-#: ../gdk-pixbuf/io-png.c:301
+#: gdk-pixbuf/io-png.c:301
 msgid "Insufficient memory to load PNG file"
 msgstr "Nincs elég memória a PNG fájl betöltéséhez"
 
-#: ../gdk-pixbuf/io-png.c:618
+#: gdk-pixbuf/io-png.c:618
 #, c-format
 msgid ""
 "Insufficient memory to store a %ld by %ld image; try exiting some "
@@ -455,26 +453,27 @@ msgstr ""
 "Nincs elég memória egy %ld x %ld méretű kép betöltéséhez, próbáljon meg "
 "kilépni néhány alkalmazásból a memóriahasználat csökkentéséhez"
 
-#: ../gdk-pixbuf/io-png.c:669
+#: gdk-pixbuf/io-png.c:669
 msgid "Fatal error reading PNG image file"
 msgstr "Végzetes hiba a PNG képfájl olvasásakor"
 
-#: ../gdk-pixbuf/io-png.c:718
+#: gdk-pixbuf/io-png.c:718
 #, c-format
 msgid "Fatal error reading PNG image file: %s"
 msgstr "Végzetes hiba a PNG képfájl olvasásakor: %s"
 
-#: ../gdk-pixbuf/io-png.c:810
-msgid "Keys for PNG text chunks must have at least 1 and at most 79 characters."
+#: gdk-pixbuf/io-png.c:810
+msgid ""
+"Keys for PNG text chunks must have at least 1 and at most 79 characters."
 msgstr ""
 "A PNG szöveges darabok kulcsainak legalább 1 és legfeljebb 79 karakterből "
 "kell állniuk."
 
-#: ../gdk-pixbuf/io-png.c:818
+#: gdk-pixbuf/io-png.c:818
 msgid "Keys for PNG text chunks must be ASCII characters."
 msgstr "A PNG szöveges darabok kulcsainak ASCII karaktereknek kell lenniük."
 
-#: ../gdk-pixbuf/io-png.c:831
+#: gdk-pixbuf/io-png.c:831
 #, c-format
 msgid ""
 "PNG compression level must be a value between 0 and 9; value '%s' could not "
@@ -483,7 +482,7 @@ msgstr ""
 "A PNG-tömörítés értékének 0 és 9 között kell lennie, a(z) \"%s\" értéket nem "
 "lehet feldolgozni."
 
-#: ../gdk-pixbuf/io-png.c:843
+#: gdk-pixbuf/io-png.c:843
 #, c-format
 msgid ""
 "PNG compression level must be a value between 0 and 9; value '%d' is not "
@@ -492,330 +491,327 @@ msgstr ""
 "A PNG-tömörítés értékének 0 és 9 között kell lennie, a(z) \"%d\" érték nem "
 "engedélyezett."
 
-#: ../gdk-pixbuf/io-png.c:883
+#: gdk-pixbuf/io-png.c:883
 #, c-format
 msgid "Value for PNG text chunk %s cannot be converted to ISO-8859-1 encoding."
 msgstr "%s PNG szöveges darab értéke nem konvertálható ISO-8859-1 kódolásúra."
 
-#: ../gdk-pixbuf/io-png.c:1026
+#: gdk-pixbuf/io-png.c:1026
 msgid "The PNG image format"
 msgstr "PNG képformátum"
 
-#: ../gdk-pixbuf/io-pnm.c:252
+#: gdk-pixbuf/io-pnm.c:252
 msgid "PNM loader expected to find an integer, but didn't"
 msgstr "A PNM-betöltő egy egészet várt, de nem talált"
 
-#: ../gdk-pixbuf/io-pnm.c:284
+#: gdk-pixbuf/io-pnm.c:284
 msgid "PNM file has an incorrect initial byte"
 msgstr "A PNM-fájl kezdő bájtja helytelen"
 
-#: ../gdk-pixbuf/io-pnm.c:314
+#: gdk-pixbuf/io-pnm.c:314
 msgid "PNM file is not in a recognized PNM subformat"
 msgstr "A PNM-fájl nincs felismert PNM-alformátumban"
 
-#: ../gdk-pixbuf/io-pnm.c:339
+#: gdk-pixbuf/io-pnm.c:339
 msgid "PNM file has an image width of 0"
 msgstr "A PNM-fájl képszélessége 0"
 
-#: ../gdk-pixbuf/io-pnm.c:360
+#: gdk-pixbuf/io-pnm.c:360
 msgid "PNM file has an image height of 0"
 msgstr "A PNM-fájl képmagassága 0"
 
-#: ../gdk-pixbuf/io-pnm.c:383
+#: gdk-pixbuf/io-pnm.c:383
 msgid "Maximum color value in PNM file is 0"
 msgstr "A PNM-fájlban a maximális színérték 0"
 
-#: ../gdk-pixbuf/io-pnm.c:391
+#: gdk-pixbuf/io-pnm.c:391
 msgid "Maximum color value in PNM file is too large"
 msgstr "A PNM-fájlban a maximális színérték túl nagy"
 
-#: ../gdk-pixbuf/io-pnm.c:399
+#: gdk-pixbuf/io-pnm.c:399
 msgid "Cannot handle PNM files with maximum color values greater than 255"
 msgstr ""
 "Nem lehet kezelni a 255-nél nagyobb maximális színértékkel rendelkező PNM-"
 "fájlokat"
 
-#: ../gdk-pixbuf/io-pnm.c:438 ../gdk-pixbuf/io-pnm.c:466
-#: ../gdk-pixbuf/io-pnm.c:498
+#: gdk-pixbuf/io-pnm.c:438 gdk-pixbuf/io-pnm.c:466 gdk-pixbuf/io-pnm.c:498
 msgid "Raw PNM image type is invalid"
 msgstr "A nyers PNM-képtípus érvénytelen"
 
-#: ../gdk-pixbuf/io-pnm.c:562 ../gdk-pixbuf/io-pnm.c:604
+#: gdk-pixbuf/io-pnm.c:562 gdk-pixbuf/io-pnm.c:604
 msgid "PNM image format is invalid"
 msgstr "Érvénytelen PNM-képformátum"
 
-#: ../gdk-pixbuf/io-pnm.c:663
+#: gdk-pixbuf/io-pnm.c:663
 msgid "PNM image loader does not support this PNM subformat"
 msgstr "A PNM-képbetöltő nem támogatja ezt a PNM-alformátumot"
 
-#: ../gdk-pixbuf/io-pnm.c:718
+#: gdk-pixbuf/io-pnm.c:718
 msgid "Premature end-of-file encountered"
 msgstr "A fájl végét túl korán értem el"
 
-#: ../gdk-pixbuf/io-pnm.c:750 ../gdk-pixbuf/io-pnm.c:981
+#: gdk-pixbuf/io-pnm.c:750 gdk-pixbuf/io-pnm.c:981
 msgid "Raw PNM formats require exactly one whitespace before sample data"
 msgstr ""
 "A nyers PNM-formátumok pontosan egy üreshely-karaktert igényelnek a "
 "mintaadatok előtt"
 
-#: ../gdk-pixbuf/io-pnm.c:777
+#: gdk-pixbuf/io-pnm.c:777
 msgid "Cannot allocate memory for loading PNM image"
 msgstr "Nem lehet memóriát kiosztani a PNM-kép betöltéséhez"
 
-#: ../gdk-pixbuf/io-pnm.c:827
+#: gdk-pixbuf/io-pnm.c:827
 msgid "Insufficient memory to load PNM context struct"
 msgstr "Nincs elég memória a PNM kontextus struktúrának"
 
-#: ../gdk-pixbuf/io-pnm.c:878
+#: gdk-pixbuf/io-pnm.c:878
 msgid "Unexpected end of PNM image data"
 msgstr "A PNM-képadatnak váratlanul vége"
 
-#: ../gdk-pixbuf/io-pnm.c:1010
+#: gdk-pixbuf/io-pnm.c:1010
 msgid "Insufficient memory to load PNM file"
 msgstr "Nincs elég memória a PNM fájl betöltéséhez"
 
-#: ../gdk-pixbuf/io-pnm.c:1089
+#: gdk-pixbuf/io-pnm.c:1089
 msgid "The PNM/PBM/PGM/PPM image format family"
 msgstr "A PNM/PBM/PGM/PPM képformátum család"
 
-#: ../gdk-pixbuf/io-ras.c:126
+#: gdk-pixbuf/io-ras.c:126
 msgid "RAS image has bogus header data"
 msgstr "A RAS-kép fejlécadata hibás"
 
-#: ../gdk-pixbuf/io-ras.c:148
+#: gdk-pixbuf/io-ras.c:148
 msgid "RAS image has unknown type"
 msgstr "A RAS-kép típusa ismeretlen"
 
-#: ../gdk-pixbuf/io-ras.c:156
+#: gdk-pixbuf/io-ras.c:156
 msgid "unsupported RAS image variation"
 msgstr "nem támogatott RAS-képváltozat"
 
-#: ../gdk-pixbuf/io-ras.c:171 ../gdk-pixbuf/io-ras.c:200
+#: gdk-pixbuf/io-ras.c:171 gdk-pixbuf/io-ras.c:200
 msgid "Not enough memory to load RAS image"
 msgstr "Nincs elég memória a RAS-kép betöltéséhez"
 
-#: ../gdk-pixbuf/io-ras.c:543
+#: gdk-pixbuf/io-ras.c:543
 msgid "The Sun raster image format"
 msgstr "Sun raster képformátum"
 
-#: ../gdk-pixbuf/io-tga.c:154
+#: gdk-pixbuf/io-tga.c:154
 msgid "Cannot allocate memory for IOBuffer struct"
 msgstr "Nem lehet memóriát kiosztani az IOBuffer-struktúrához"
 
-#: ../gdk-pixbuf/io-tga.c:173
+#: gdk-pixbuf/io-tga.c:173
 msgid "Cannot allocate memory for IOBuffer data"
 msgstr "Nem lehet memóriát kiosztani az IOBuffer-adathoz"
 
-#: ../gdk-pixbuf/io-tga.c:184
+#: gdk-pixbuf/io-tga.c:184
 msgid "Cannot realloc IOBuffer data"
 msgstr "Nem lehet újra kiosztani az IOBuffer-adatot"
 
-#: ../gdk-pixbuf/io-tga.c:214
+#: gdk-pixbuf/io-tga.c:214
 msgid "Cannot allocate temporary IOBuffer data"
 msgstr "Nem lehet kiosztani az átmeneti IOBuffer-adatot"
 
-#: ../gdk-pixbuf/io-tga.c:348
+#: gdk-pixbuf/io-tga.c:348
 msgid "Cannot allocate new pixbuf"
 msgstr "Nem lehet kiosztani új pixbuf-t"
 
-#: ../gdk-pixbuf/io-tga.c:689
+#: gdk-pixbuf/io-tga.c:689
 msgid "Cannot allocate colormap structure"
 msgstr "Nem lehet kiosztani színtérkép struktúrát"
 
-#: ../gdk-pixbuf/io-tga.c:696
+#: gdk-pixbuf/io-tga.c:696
 msgid "Cannot allocate colormap entries"
 msgstr "Nem lehet kiosztani színtérkép bejegyzéseket"
 
-#: ../gdk-pixbuf/io-tga.c:718
+#: gdk-pixbuf/io-tga.c:718
 msgid "Unexpected bitdepth for colormap entries"
 msgstr "Váratlan bitmélység a színtérkép-bejegyzésekhez"
 
-#: ../gdk-pixbuf/io-tga.c:736
+#: gdk-pixbuf/io-tga.c:736
 msgid "Cannot allocate TGA header memory"
 msgstr "Nem lehet kiosztani TGA-fejlécmemóriát"
 
-#: ../gdk-pixbuf/io-tga.c:769
+#: gdk-pixbuf/io-tga.c:769
 msgid "TGA image has invalid dimensions"
 msgstr "A TGA-kép mérete érvénytelen"
 
-#: ../gdk-pixbuf/io-tga.c:775 ../gdk-pixbuf/io-tga.c:784
-#: ../gdk-pixbuf/io-tga.c:794 ../gdk-pixbuf/io-tga.c:804
-#: ../gdk-pixbuf/io-tga.c:811
+#: gdk-pixbuf/io-tga.c:775 gdk-pixbuf/io-tga.c:784 gdk-pixbuf/io-tga.c:794
+#: gdk-pixbuf/io-tga.c:804 gdk-pixbuf/io-tga.c:811
 msgid "TGA image type not supported"
 msgstr "A TGA képformátum nem támogatott"
 
-#: ../gdk-pixbuf/io-tga.c:858
+#: gdk-pixbuf/io-tga.c:858
 msgid "Cannot allocate memory for TGA context struct"
 msgstr "Nem lehet memóriát lefoglalni a TGA kontextus struktúrának"
 
-#: ../gdk-pixbuf/io-tga.c:923
+#: gdk-pixbuf/io-tga.c:923
 msgid "Excess data in file"
 msgstr "Többletadat a fájlban"
 
-#: ../gdk-pixbuf/io-tga.c:992
+#: gdk-pixbuf/io-tga.c:992
 msgid "The Targa image format"
 msgstr "Targa képformátum"
 
-#: ../gdk-pixbuf/io-tiff.c:173
+#: gdk-pixbuf/io-tiff.c:173
 msgid "Could not get image width (bad TIFF file)"
 msgstr "Nem lehet megszerezni a kép szélességét (hibás TIFF fájl)"
 
-#: ../gdk-pixbuf/io-tiff.c:180
+#: gdk-pixbuf/io-tiff.c:180
 msgid "Could not get image height (bad TIFF file)"
 msgstr "Nem lehet megszerezni a kép magasságát (hibás TIFF fájl)"
 
-#: ../gdk-pixbuf/io-tiff.c:188
+#: gdk-pixbuf/io-tiff.c:188
 msgid "Width or height of TIFF image is zero"
 msgstr "A TIFF-kép szélessége vagy magassága nulla"
 
-#: ../gdk-pixbuf/io-tiff.c:197 ../gdk-pixbuf/io-tiff.c:206
+#: gdk-pixbuf/io-tiff.c:197 gdk-pixbuf/io-tiff.c:206
 msgid "Dimensions of TIFF image too large"
 msgstr "A TGA-kép mérete túl nagy"
 
-#: ../gdk-pixbuf/io-tiff.c:225 ../gdk-pixbuf/io-tiff.c:237
-#: ../gdk-pixbuf/io-tiff.c:286 ../gdk-pixbuf/io-tiff.c:572
+#: gdk-pixbuf/io-tiff.c:225 gdk-pixbuf/io-tiff.c:237 gdk-pixbuf/io-tiff.c:286
+#: gdk-pixbuf/io-tiff.c:572
 msgid "Insufficient memory to open TIFF file"
 msgstr "Nincs elég memória a TIFF fájl megnyitásához"
 
-#: ../gdk-pixbuf/io-tiff.c:251 ../gdk-pixbuf/io-tiff.c:294
+#: gdk-pixbuf/io-tiff.c:251 gdk-pixbuf/io-tiff.c:294
 msgid "Failed to load RGB data from TIFF file"
 msgstr "RGB-adat betöltése a TIFF-fájlból sikertelen"
 
-#: ../gdk-pixbuf/io-tiff.c:361
+#: gdk-pixbuf/io-tiff.c:361
 msgid "Failed to open TIFF image"
 msgstr "Nem sikerült megnyitni a TIFF képet"
 
-#: ../gdk-pixbuf/io-tiff.c:373
+#: gdk-pixbuf/io-tiff.c:373
 msgid "TIFFClose operation failed"
 msgstr "A TIFFClose művelet sikertelen"
 
-#: ../gdk-pixbuf/io-tiff.c:504 ../gdk-pixbuf/io-tiff.c:517
+#: gdk-pixbuf/io-tiff.c:504 gdk-pixbuf/io-tiff.c:517
 msgid "Failed to load TIFF image"
 msgstr "Nem sikerült betölteni a TIFF képet"
 
-#: ../gdk-pixbuf/io-tiff.c:610
+#: gdk-pixbuf/io-tiff.c:610
 msgid "The TIFF image format"
 msgstr "TIFF képformátum"
 
-#: ../gdk-pixbuf/io-wbmp.c:246
+#: gdk-pixbuf/io-wbmp.c:246
 msgid "Image has zero width"
 msgstr "A kép szélessége nulla"
 
-#: ../gdk-pixbuf/io-wbmp.c:264
+#: gdk-pixbuf/io-wbmp.c:264
 msgid "Image has zero height"
 msgstr "A kép magassága nulla"
 
-#: ../gdk-pixbuf/io-wbmp.c:275
+#: gdk-pixbuf/io-wbmp.c:275
 msgid "Not enough memory to load image"
 msgstr "Nincs elég memória a kép betöltéséhez"
 
-#: ../gdk-pixbuf/io-wbmp.c:334
+#: gdk-pixbuf/io-wbmp.c:334
 msgid "Couldn't save the rest"
 msgstr "Nem lehet menteni a többit"
 
-#: ../gdk-pixbuf/io-wbmp.c:368
+#: gdk-pixbuf/io-wbmp.c:368
 msgid "The WBMP image format"
 msgstr "WBMP képformátum"
 
-#: ../gdk-pixbuf/io-xbm.c:287
+#: gdk-pixbuf/io-xbm.c:287
 msgid "Invalid XBM file"
 msgstr "Érvénytelen XBM-fájl"
 
-#: ../gdk-pixbuf/io-xbm.c:297
+#: gdk-pixbuf/io-xbm.c:297
 msgid "Insufficient memory to load XBM image file"
 msgstr "Nincs elég memória az XBM képfájl betöltéséhez"
 
-#: ../gdk-pixbuf/io-xbm.c:441
+#: gdk-pixbuf/io-xbm.c:441
 msgid "Failed to write to temporary file when loading XBM image"
 msgstr "Átmeneti fájlba írás az XBM-kép betöltésekor sikertelen"
 
-#: ../gdk-pixbuf/io-xbm.c:476
+#: gdk-pixbuf/io-xbm.c:476
 msgid "The XBM image format"
 msgstr "XBM képformátum"
 
-#: ../gdk-pixbuf/io-xpm.c:467
+#: gdk-pixbuf/io-xpm.c:467
 msgid "No XPM header found"
 msgstr "Nem található az XPM-fejléc"
 
-#: ../gdk-pixbuf/io-xpm.c:476
+#: gdk-pixbuf/io-xpm.c:476
 msgid "Invalid XPM header"
 msgstr "Érvénytelen XPM-fejléc"
 
-#: ../gdk-pixbuf/io-xpm.c:484
+#: gdk-pixbuf/io-xpm.c:484
 msgid "XPM file has image width <= 0"
 msgstr "Az XPM-fájl képszélessége <= 0"
 
-#: ../gdk-pixbuf/io-xpm.c:492
+#: gdk-pixbuf/io-xpm.c:492
 msgid "XPM file has image height <= 0"
 msgstr "Az XPM-fájl képmagassága <= 0"
 
-#: ../gdk-pixbuf/io-xpm.c:500
+#: gdk-pixbuf/io-xpm.c:500
 msgid "XPM has invalid number of chars per pixel"
 msgstr "Az XPM-fájl képpontonkénti karaktereinek száma érvénytelen"
 
-#: ../gdk-pixbuf/io-xpm.c:507
+#: gdk-pixbuf/io-xpm.c:507
 msgid "XPM file has invalid number of colors"
 msgstr "Az XPM-fájl színeinek száma érvénytelen"
 
-#: ../gdk-pixbuf/io-xpm.c:519 ../gdk-pixbuf/io-xpm.c:528
-#: ../gdk-pixbuf/io-xpm.c:580
+#: gdk-pixbuf/io-xpm.c:519 gdk-pixbuf/io-xpm.c:528 gdk-pixbuf/io-xpm.c:580
 msgid "Cannot allocate memory for loading XPM image"
 msgstr "Nem lehet memóriát kiosztani az XPM-kép betöltéséhez"
 
-#: ../gdk-pixbuf/io-xpm.c:542
+#: gdk-pixbuf/io-xpm.c:542
 msgid "Cannot read XPM colormap"
 msgstr "Nem lehet olvasni az XPM-színtérképet"
 
-#: ../gdk-pixbuf/io-xpm.c:771
+#: gdk-pixbuf/io-xpm.c:771
 msgid "Failed to write to temporary file when loading XPM image"
 msgstr "Átmeneti fájlba írás az XPM-kép betöltésekor sikertelen"
 
-#: ../gdk-pixbuf/io-xpm.c:806
+#: gdk-pixbuf/io-xpm.c:806
 msgid "The XPM image format"
 msgstr "XPM képformátum"
 
 #. Description of --class=CLASS in --help output
-#: ../gdk/gdk.c:115
+#: gdk/gdk.c:115
 msgid "Program class as used by the window manager"
 msgstr "A program osztálya, ahogy az ablakkezelő használja"
 
 #. Placeholder in --class=CLASS in --help output
-#: ../gdk/gdk.c:116
+#: gdk/gdk.c:116
 msgid "CLASS"
 msgstr "CLASS"
 
 #. Description of --name=NAME in --help output
-#: ../gdk/gdk.c:118
+#: gdk/gdk.c:118
 msgid "Program name as used by the window manager"
 msgstr "A programnév, ahogy az ablakkezelő használja"
 
 #. Placeholder in --name=NAME in --help output
-#: ../gdk/gdk.c:119
+#: gdk/gdk.c:119
 msgid "NAME"
 msgstr "NAME"
 
 #. Description of --display=DISPLAY in --help output
-#: ../gdk/gdk.c:121
+#: gdk/gdk.c:121
 msgid "X display to use"
 msgstr "Használandó X-megjelenítő"
 
 #. Placeholder in --display=DISPLAY in --help output
-#: ../gdk/gdk.c:122
+#: gdk/gdk.c:122
 msgid "DISPLAY"
 msgstr "DISPLAY"
 
 #. Description of --screen=SCREEN in --help output
-#: ../gdk/gdk.c:124
+#: gdk/gdk.c:124
 msgid "X screen to use"
 msgstr "Használandó X-képernyő"
 
 #. Placeholder in --screen=SCREEN in --help output
-#: ../gdk/gdk.c:125
+#: gdk/gdk.c:125
 msgid "SCREEN"
 msgstr "SCREEN"
 
 #. Description of --gdk-debug=FLAGS in --help output
-#: ../gdk/gdk.c:128
+#: gdk/gdk.c:128
 msgid "Gdk debugging flags to set"
 msgstr "Beállítandó Gdk debug jelzőbitek"
 
@@ -823,222 +819,222 @@ msgstr "Beállítandó Gdk debug jelzőbitek"
 #. Placeholder in --gdk-no-debug=FLAGS in --help output
 #. Placeholder in --gtk-debug=FLAGS in --help output
 #. Placeholder in --gtk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:129 ../gdk/gdk.c:132 ../gtk/gtkmain.c:405 ../gtk/gtkmain.c:408
+#: gdk/gdk.c:129 gdk/gdk.c:132 gtk/gtkmain.c:405 gtk/gtkmain.c:408
 msgid "FLAGS"
 msgstr "FLAGS"
 
 #. Description of --gdk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:131
+#: gdk/gdk.c:131
 msgid "Gdk debugging flags to unset"
 msgstr "Kikapcsolandó Gdk debug jelzőbitek"
 
-#: ../gdk/keyname-table.h:3940
+#: gdk/keyname-table.h:3940
 msgid "keyboard label|BackSpace"
 msgstr "BackSpace"
 
-#: ../gdk/keyname-table.h:3941
+#: gdk/keyname-table.h:3941
 msgid "keyboard label|Tab"
 msgstr "Tab"
 
-#: ../gdk/keyname-table.h:3942
+#: gdk/keyname-table.h:3942
 msgid "keyboard label|Return"
 msgstr "Enter"
 
-#: ../gdk/keyname-table.h:3943
+#: gdk/keyname-table.h:3943
 msgid "keyboard label|Pause"
 msgstr "Pause"
 
-#: ../gdk/keyname-table.h:3944
+#: gdk/keyname-table.h:3944
 msgid "keyboard label|Scroll_Lock"
 msgstr "Scroll_Lock"
 
-#: ../gdk/keyname-table.h:3945
+#: gdk/keyname-table.h:3945
 msgid "keyboard label|Sys_Req"
 msgstr "Sys_Req"
 
-#: ../gdk/keyname-table.h:3946
+#: gdk/keyname-table.h:3946
 msgid "keyboard label|Escape"
 msgstr "Escape"
 
-#: ../gdk/keyname-table.h:3947
+#: gdk/keyname-table.h:3947
 msgid "keyboard label|Multi_key"
 msgstr "Multi_billentyű"
 
-#: ../gdk/keyname-table.h:3948
+#: gdk/keyname-table.h:3948
 msgid "keyboard label|Home"
 msgstr "Home"
 
-#: ../gdk/keyname-table.h:3949
+#: gdk/keyname-table.h:3949
 msgid "keyboard label|Page_Up"
 msgstr "Page_Up"
 
-#: ../gdk/keyname-table.h:3950
+#: gdk/keyname-table.h:3950
 msgid "keyboard label|Page_Down"
 msgstr "Page_Down"
 
-#: ../gdk/keyname-table.h:3951
+#: gdk/keyname-table.h:3951
 msgid "keyboard label|End"
 msgstr "End"
 
-#: ../gdk/keyname-table.h:3952
+#: gdk/keyname-table.h:3952
 msgid "keyboard label|Begin"
 msgstr "Begin"
 
-#: ../gdk/keyname-table.h:3953
+#: gdk/keyname-table.h:3953
 msgid "keyboard label|Print"
 msgstr "Print"
 
-#: ../gdk/keyname-table.h:3954
+#: gdk/keyname-table.h:3954
 msgid "keyboard label|Insert"
 msgstr "Insert"
 
-#: ../gdk/keyname-table.h:3955
+#: gdk/keyname-table.h:3955
 msgid "keyboard label|Num_Lock"
 msgstr "Num_Lock"
 
-#: ../gdk/keyname-table.h:3956
+#: gdk/keyname-table.h:3956
 msgid "keyboard label|KP_Space"
 msgstr "KP_Szóköz"
 
-#: ../gdk/keyname-table.h:3957
+#: gdk/keyname-table.h:3957
 msgid "keyboard label|KP_Tab"
 msgstr "KP_Tab"
 
-#: ../gdk/keyname-table.h:3958
+#: gdk/keyname-table.h:3958
 msgid "keyboard label|KP_Enter"
 msgstr "KP_Enter"
 
-#: ../gdk/keyname-table.h:3959
+#: gdk/keyname-table.h:3959
 msgid "keyboard label|KP_Home"
 msgstr "KP_Home"
 
-#: ../gdk/keyname-table.h:3960
+#: gdk/keyname-table.h:3960
 msgid "keyboard label|KP_Left"
 msgstr "KP_Balra"
 
-#: ../gdk/keyname-table.h:3961
+#: gdk/keyname-table.h:3961
 msgid "keyboard label|KP_Up"
 msgstr "KP_Fel"
 
-#: ../gdk/keyname-table.h:3962
+#: gdk/keyname-table.h:3962
 msgid "keyboard label|KP_Right"
 msgstr "KP_Jobbra"
 
-#: ../gdk/keyname-table.h:3963
+#: gdk/keyname-table.h:3963
 msgid "keyboard label|KP_Down"
 msgstr "KP_Le"
 
-#: ../gdk/keyname-table.h:3964
+#: gdk/keyname-table.h:3964
 msgid "keyboard label|KP_Page_Up"
 msgstr "KP_Page_Up"
 
-#: ../gdk/keyname-table.h:3965
+#: gdk/keyname-table.h:3965
 msgid "keyboard label|KP_Prior"
 msgstr "KP_Prior"
 
-#: ../gdk/keyname-table.h:3966
+#: gdk/keyname-table.h:3966
 msgid "keyboard label|KP_Page_Down"
 msgstr "KP_Page_Down"
 
-#: ../gdk/keyname-table.h:3967
+#: gdk/keyname-table.h:3967
 msgid "keyboard label|KP_Next"
 msgstr "KP_Next"
 
-#: ../gdk/keyname-table.h:3968
+#: gdk/keyname-table.h:3968
 msgid "keyboard label|KP_End"
 msgstr "KP_End"
 
-#: ../gdk/keyname-table.h:3969
+#: gdk/keyname-table.h:3969
 msgid "keyboard label|KP_Begin"
 msgstr "KP_Begin"
 
-#: ../gdk/keyname-table.h:3970
+#: gdk/keyname-table.h:3970
 msgid "keyboard label|KP_Insert"
 msgstr "KP_Insert"
 
-#: ../gdk/keyname-table.h:3971
+#: gdk/keyname-table.h:3971
 msgid "keyboard label|KP_Delete"
 msgstr "KP_Delete"
 
-#: ../gdk/keyname-table.h:3972
+#: gdk/keyname-table.h:3972
 msgid "keyboard label|Delete"
 msgstr "Delete"
 
 #. Description of --sync in --help output
-#: ../gdk/win32/gdkmain-win32.c:60
+#: gdk/win32/gdkmain-win32.c:60
 msgid "Don't batch GDI requests"
 msgstr "Ne kötegelje a GDI kéréseket"
 
 #. Description of --no-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:62
+#: gdk/win32/gdkmain-win32.c:62
 msgid "Don't use the Wintab API for tablet support"
 msgstr "Ne használja a Wintab API-t a tablet támogatáshoz"
 
 #. Description of --ignore-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:64
+#: gdk/win32/gdkmain-win32.c:64
 msgid "Same as --no-wintab"
 msgstr "Ugyanaz mint --no-wintab"
 
 #. Description of --use-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:66
+#: gdk/win32/gdkmain-win32.c:66
 msgid "Do use the Wintab API [default]"
 msgstr "Ne használja a Wintab API-t [alapértelmezett]"
 
 #. Description of --max-colors=COLORS in --help output
-#: ../gdk/win32/gdkmain-win32.c:68
+#: gdk/win32/gdkmain-win32.c:68
 msgid "Size of the palette in 8 bit mode"
 msgstr "A paletta mérete 8 bites módban"
 
 #. Placeholder in --max-colors=COLORS in --help output
-#: ../gdk/win32/gdkmain-win32.c:69
+#: gdk/win32/gdkmain-win32.c:69
 msgid "COLORS"
 msgstr "COLORS"
 
 #. Description of --sync in --help output
-#: ../gdk/x11/gdkmain-x11.c:92
+#: gdk/x11/gdkmain-x11.c:92
 msgid "Make X calls synchronous"
 msgstr "Legyenek szinkron X-hívások"
 
-#: ../gtk/gtkaboutdialog.c:270 ../gtk/gtkaboutdialog.c:2025
+#: gtk/gtkaboutdialog.c:273 gtk/gtkaboutdialog.c:2103
 msgid "License"
 msgstr "Licenc"
 
-#: ../gtk/gtkaboutdialog.c:271
+#: gtk/gtkaboutdialog.c:274
 msgid "The license of the program"
 msgstr "A program licence"
 
 #. Add the credits button
-#: ../gtk/gtkaboutdialog.c:491
+#: gtk/gtkaboutdialog.c:509
 msgid "C_redits"
 msgstr "_Köszönet"
 
 #. Add the license button
-#: ../gtk/gtkaboutdialog.c:501
+#: gtk/gtkaboutdialog.c:519
 msgid "_License"
 msgstr "_Licenc"
 
-#: ../gtk/gtkaboutdialog.c:731
+#: gtk/gtkaboutdialog.c:756
 #, c-format
 msgid "About %s"
 msgstr "%s névjegye"
 
-#: ../gtk/gtkaboutdialog.c:1953
+#: gtk/gtkaboutdialog.c:2031
 msgid "Credits"
 msgstr "Köszönet"
 
-#: ../gtk/gtkaboutdialog.c:1979
+#: gtk/gtkaboutdialog.c:2057
 msgid "Written by"
 msgstr "Írta"
 
-#: ../gtk/gtkaboutdialog.c:1982
+#: gtk/gtkaboutdialog.c:2060
 msgid "Documented by"
 msgstr "Dokumentáció"
 
-#: ../gtk/gtkaboutdialog.c:1994
+#: gtk/gtkaboutdialog.c:2072
 msgid "Translated by"
 msgstr "Fordította"
 
-#: ../gtk/gtkaboutdialog.c:1998
+#: gtk/gtkaboutdialog.c:2076
 msgid "Artwork by"
 msgstr "Grafika"
 
@@ -1048,7 +1044,7 @@ msgstr "Grafika"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:121
+#: gtk/gtkaccellabel.c:121
 msgid "keyboard label|Shift"
 msgstr "Shift"
 
@@ -1058,7 +1054,7 @@ msgstr "Shift"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:128
+#: gtk/gtkaccellabel.c:128
 msgid "keyboard label|Ctrl"
 msgstr "Ctrl"
 
@@ -1068,17 +1064,17 @@ msgstr "Ctrl"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:135
+#: gtk/gtkaccellabel.c:135
 msgid "keyboard label|Alt"
 msgstr "Alt"
 
 #. do not translate the part before the |
-#: ../gtk/gtkaccellabel.c:577
+#: gtk/gtkaccellabel.c:577
 msgid "keyboard label|Space"
 msgstr "Szóköz"
 
 #. do not translate the part before the |
-#: ../gtk/gtkaccellabel.c:581
+#: gtk/gtkaccellabel.c:581
 msgid "keyboard label|Backslash"
 msgstr "Fordított törtvonal"
 
@@ -1091,7 +1087,7 @@ msgstr "Fordított törtvonal"
 #. * so if you have a default text direction of RTL and YM, then
 #. * the year will appear on the right.
 #.
-#: ../gtk/gtkcalendar.c:647
+#: gtk/gtkcalendar.c:647
 msgid "calendar:MY"
 msgstr "calendar:YM"
 
@@ -1099,7 +1095,7 @@ msgstr "calendar:YM"
 #. * first day of the week to calendar:week_start:1 if you want Monday
 #. * to be the first day of the week, and so on.
 #.
-#: ../gtk/gtkcalendar.c:661
+#: gtk/gtkcalendar.c:661
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:1"
 
@@ -1111,7 +1107,7 @@ msgstr "calendar:week_start:1"
 #. *
 #. * If you don't understand this, leave it as "2000"
 #.
-#: ../gtk/gtkcalendar.c:1549
+#: gtk/gtkcalendar.c:1549
 msgid "year measurement template|2000"
 msgstr "2000"
 
@@ -1126,25 +1122,25 @@ msgstr "2000"
 #. * Don't include the prefix "calendar year format|" in the
 #. * translation. "%Y" is appropriate for most locales.
 #.
-#: ../gtk/gtkcalendar.c:1826
+#: gtk/gtkcalendar.c:1826
 msgid "calendar year format|%Y"
 msgstr "%Y"
 
 #. do not translate the part before the |
-#: ../gtk/gtkcellrendererprogress.c:237 ../gtk/gtkcellrendererprogress.c:295
+#: gtk/gtkcellrendererprogress.c:237 gtk/gtkcellrendererprogress.c:295
 #, c-format
 msgid "progress bar label|%d %%"
 msgstr "%d %%"
 
-#: ../gtk/gtkcolorbutton.c:221 ../gtk/gtkcolorbutton.c:576
+#: gtk/gtkcolorbutton.c:221 gtk/gtkcolorbutton.c:576
 msgid "Pick a Color"
 msgstr "Szín kiválasztása"
 
-#: ../gtk/gtkcolorbutton.c:467
+#: gtk/gtkcolorbutton.c:467
 msgid "Received invalid color data\n"
 msgstr "Érvénytelen színadat érkezett\n"
 
-#: ../gtk/gtkcolorsel.c:565
+#: gtk/gtkcolorsel.c:565
 msgid ""
 "The previously-selected color, for comparison to the color you're selecting "
 "now. You can drag this color to a palette entry, or select this color as "
@@ -1154,7 +1150,7 @@ msgstr ""
 "Áthúzhatja ezt a színt egy palettabejegyzéshez, vagy kiválaszthatja mint "
 "jelenlegit a mellette lévő mezőbe húzással."
 
-#: ../gtk/gtkcolorsel.c:570
+#: gtk/gtkcolorsel.c:570
 msgid ""
 "The color you've chosen. You can drag this color to a palette entry to save "
 "it for use in the future."
@@ -1162,11 +1158,11 @@ msgstr ""
 "Az ön által kiválasztott szín. Ezt a színt egy palettabejegyzésbe áthúzva "
 "elmentheti későbbi felhasználásra."
 
-#: ../gtk/gtkcolorsel.c:961
+#: gtk/gtkcolorsel.c:961
 msgid "_Save color here"
 msgstr "_Szín mentése ide"
 
-#: ../gtk/gtkcolorsel.c:1166
+#: gtk/gtkcolorsel.c:1166
 msgid ""
 "Click this palette entry to make it the current color. To change this entry, "
 "drag a color swatch here or right-click it and select \"Save color here.\""
@@ -1176,7 +1172,7 @@ msgstr ""
 "színmezőből vagy a jobb gombos menüben kattintson a \"Szín mentése ide\" "
 "pontra."
 
-#: ../gtk/gtkcolorsel.c:1953
+#: gtk/gtkcolorsel.c:1953
 msgid ""
 "Select the color you want from the outer ring. Select the darkness or "
 "lightness of that color using the inner triangle."
@@ -1184,7 +1180,7 @@ msgstr ""
 "Válassza ki a kívánt színt a külső gyűrűről. Válassza ki ezen szín a "
 "sötétségét vagy világosságát a belső háromszög használatával."
 
-#: ../gtk/gtkcolorsel.c:1978
+#: gtk/gtkcolorsel.c:1978
 msgid ""
 "Click the eyedropper, then click a color anywhere on your screen to select "
 "that color."
@@ -1192,67 +1188,67 @@ msgstr ""
 "Kattintson a pipettára, majd a képernyő bármely pontjára az ott lévő szín "
 "kiválasztásához."
 
-#: ../gtk/gtkcolorsel.c:1987
+#: gtk/gtkcolorsel.c:1987
 msgid "_Hue:"
 msgstr "Á_rnyalat:"
 
-#: ../gtk/gtkcolorsel.c:1988
+#: gtk/gtkcolorsel.c:1988
 msgid "Position on the color wheel."
 msgstr "A színkerék pozíciója."
 
-#: ../gtk/gtkcolorsel.c:1990
+#: gtk/gtkcolorsel.c:1990
 msgid "_Saturation:"
 msgstr "Telített_ség:"
 
-#: ../gtk/gtkcolorsel.c:1991
+#: gtk/gtkcolorsel.c:1991
 msgid "\"Deepness\" of the color."
 msgstr "A szín telítettsége."
 
-#: ../gtk/gtkcolorsel.c:1992
+#: gtk/gtkcolorsel.c:1992
 msgid "_Value:"
 msgstr "É_rték:"
 
-#: ../gtk/gtkcolorsel.c:1993
+#: gtk/gtkcolorsel.c:1993
 msgid "Brightness of the color."
 msgstr "A szín fényessége."
 
-#: ../gtk/gtkcolorsel.c:1994
+#: gtk/gtkcolorsel.c:1994
 msgid "_Red:"
 msgstr "_Vörös:"
 
-#: ../gtk/gtkcolorsel.c:1995
+#: gtk/gtkcolorsel.c:1995
 msgid "Amount of red light in the color."
 msgstr "A vörös fény mennyisége a színben."
 
-#: ../gtk/gtkcolorsel.c:1996
+#: gtk/gtkcolorsel.c:1996
 msgid "_Green:"
 msgstr "_Zöld:"
 
-#: ../gtk/gtkcolorsel.c:1997
+#: gtk/gtkcolorsel.c:1997
 msgid "Amount of green light in the color."
 msgstr "A zöld fény mennyisége a színben."
 
-#: ../gtk/gtkcolorsel.c:1998
+#: gtk/gtkcolorsel.c:1998
 msgid "_Blue:"
 msgstr "_Kék:"
 
-#: ../gtk/gtkcolorsel.c:1999
+#: gtk/gtkcolorsel.c:1999
 msgid "Amount of blue light in the color."
 msgstr "A kék fény mennyisége a színben."
 
-#: ../gtk/gtkcolorsel.c:2002
+#: gtk/gtkcolorsel.c:2002
 msgid "_Opacity:"
 msgstr "Á_tlátszatlanság:"
 
-#: ../gtk/gtkcolorsel.c:2010 ../gtk/gtkcolorsel.c:2021
+#: gtk/gtkcolorsel.c:2010 gtk/gtkcolorsel.c:2021
 msgid "Transparency of the color."
 msgstr "A szín átlátszósága."
 
-#: ../gtk/gtkcolorsel.c:2028
+#: gtk/gtkcolorsel.c:2028
 msgid "Color _Name:"
 msgstr "Szín _neve:"
 
-#: ../gtk/gtkcolorsel.c:2043
+#: gtk/gtkcolorsel.c:2043
 msgid ""
 "You can enter an HTML-style hexadecimal color value, or simply a color name "
 "such as 'orange' in this entry."
@@ -1260,75 +1256,75 @@ msgstr ""
 "Beírhat ide egy HTML-stílusú hexadecimális színértéket, vagy egyszerűen egy "
 "színnevet, például 'orange'."
 
-#: ../gtk/gtkcolorsel.c:2062
+#: gtk/gtkcolorsel.c:2062
 msgid "_Palette"
 msgstr "_Paletta"
 
-#: ../gtk/gtkcolorsel.c:2094
+#: gtk/gtkcolorsel.c:2094
 msgid "Color Wheel"
 msgstr "Színkerék"
 
-#: ../gtk/gtkcolorseldialog.c:123
+#: gtk/gtkcolorseldialog.c:123
 msgid "Color Selection"
 msgstr "Szín kiválasztása"
 
-#: ../gtk/gtkentry.c:4508 ../gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "_Mindent kijelöl"
 
-#: ../gtk/gtkentry.c:4518 ../gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Beviteli _módok"
 
-#: ../gtk/gtkentry.c:4529 ../gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "Unicode vezérlőkarakter _beszúrása"
 
-#: ../gtk/gtkfilechooser.c:1588 ../gtk/gtkfilechooser.c:1632
-#: ../gtk/gtkfilechooser.c:1707 ../gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Érvénytelen fájlnév: %s"
 
-#: ../gtk/gtkfilechooserbutton.c:67
+#: gtk/gtkfilechooserbutton.c:67
 msgid "Select A File"
 msgstr "Válasszon ki egy fájlt"
 
-#: ../gtk/gtkfilechooserbutton.c:68 ../gtk/gtkfilechooserdefault.c:1302
-#: ../gtk/gtkpathbar.c:1020
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
+#: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Saját mappa"
 
-#: ../gtk/gtkfilechooserbutton.c:69 ../gtk/gtkfilechooserdefault.c:1329
-#: ../gtk/gtkpathbar.c:1022
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
+#: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Munkaasztal"
 
-#: ../gtk/gtkfilechooserbutton.c:70
+#: gtk/gtkfilechooserbutton.c:70
 msgid "(None)"
 msgstr "(Nincs)"
 
-#: ../gtk/gtkfilechooserbutton.c:1523
+#: gtk/gtkfilechooserbutton.c:1523
 msgid "Other..."
 msgstr "Egyéb..."
 
-#: ../gtk/gtkfilechooserdefault.c:917
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Nem érhető el információ a fájlról"
 
-#: ../gtk/gtkfilechooserdefault.c:928
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Nem adható hozzá könyvjelző"
 
-#: ../gtk/gtkfilechooserdefault.c:939
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Nem lehet eltávolítani a könyvjelzőt"
 
-#: ../gtk/gtkfilechooserdefault.c:950
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "A mappa nem hozható létre"
 
-#: ../gtk/gtkfilechooserdefault.c:963
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1336,227 +1332,253 @@ msgstr ""
 "A mappát nem lehet létrehozni, mivel már létezik egy fájl ugyanezen a néven. "
 "Próbáljon más nevet adni a mappának vagy nevezze át a fájlt."
 
-#: ../gtk/gtkfilechooserdefault.c:976
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Érvénytelen fájlnév"
 
-#: ../gtk/gtkfilechooserdefault.c:986
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "A mappa tartalma nem jeleníthető meg"
 
-#: ../gtk/gtkfilechooserdefault.c:1192
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Nem lehet információt szerezni erről: '%s': %s"
 
-#: ../gtk/gtkfilechooserdefault.c:2208
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "A(z) '%s' mappa hozzáadása a könyvjelzőkhöz"
 
-#: ../gtk/gtkfilechooserdefault.c:2249
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "A jelenlegi mappa hozzáadása a könyvjelzőkhöz"
 
-#: ../gtk/gtkfilechooserdefault.c:2251
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "A kijelölt mappák hozzáadása a könyvjelzőkhöz"
 
-#: ../gtk/gtkfilechooserdefault.c:2291
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "A(z) '%s' könyvjelző eltávolítása"
 
-#: ../gtk/gtkfilechooserdefault.c:2722
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "%s érvénytelen útvonalnév, nem adható hozzá könyvjelző."
 
-#: ../gtk/gtkfilechooserdefault.c:2937
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Eltávolítás"
 
-#: ../gtk/gtkfilechooserdefault.c:2946
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Átnevezés..."
 
-#: ../gtk/gtkfilechooserdefault.c:3069
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Gyorsbillentyűk"
 
-#: ../gtk/gtkfilechooserdefault.c:3123
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Mappa"
 
-#: ../gtk/gtkfilechooserdefault.c:3179 ../gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "Hozzá_adás"
 
-#: ../gtk/gtkfilechooserdefault.c:3186
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "A kijelölt mappa hozzáadása a könyvjelzőkhöz"
 
-#: ../gtk/gtkfilechooserdefault.c:3191 ../gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
-#: ../gtk/gtkfilechooserdefault.c:3198
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "A kijelölt könyvjelző eltávolítása"
 
-#: ../gtk/gtkfilechooserdefault.c:3305
+#: gtk/gtkfilechooserdefault.c:3313
+#, fuzzy
+msgid "Could not select file"
+msgstr "Nem lehet kijelölni az elemet"
+
+#: gtk/gtkfilechooserdefault.c:3369
+#, fuzzy, c-format
+msgid "Could not select file '%s' because it is an invalid path name."
+msgstr "%s érvénytelen útvonalnév, nem adható hozzá könyvjelző."
+
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "Hozzá_adás a könyvjelzőkhöz"
 
-#: ../gtk/gtkfilechooserdefault.c:3315
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "He_ly megnyitása"
 
-#: ../gtk/gtkfilechooserdefault.c:3327
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Re_jtett fájlok megjelenítése"
 
-#: ../gtk/gtkfilechooserdefault.c:3451 ../gtk/gtkfilesel.c:766
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Fájlok"
 
-#: ../gtk/gtkfilechooserdefault.c:3482
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Név"
 
-#: ../gtk/gtkfilechooserdefault.c:3507
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Méret"
 
-#: ../gtk/gtkfilechooserdefault.c:3520
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Módosítva"
 
-#: ../gtk/gtkfilechooserdefault.c:3552
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Válassza ki, hogy milyen típusú fájlok jelenjenek meg"
 
 #. Create Folder
-#: ../gtk/gtkfilechooserdefault.c:3588
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Mappa _létrehozása"
 
 #. Name entry
-#: ../gtk/gtkfilechooserdefault.c:3709
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Név:"
 
-#: ../gtk/gtkfilechooserdefault.c:3749
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "Egyéb mappák _böngészése"
 
-#: ../gtk/gtkfilechooserdefault.c:4000
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Mentés _mappába:"
 
-#: ../gtk/gtkfilechooserdefault.c:4002
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Létrehozás _mappában:"
 
-#: ../gtk/gtkfilechooserdefault.c:4959
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Nem lehet megváltoztatni a mappát, mert az nem helyi"
 
-#: ../gtk/gtkfilechooserdefault.c:5513
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "%s gyorsbillentyű nem létezik"
 
-#: ../gtk/gtkfilechooserdefault.c:6057
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "Á_tnevezés"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Nem lehet csatlakoztatni a(z) %s-t"
 
-#: ../gtk/gtkfilechooserdefault.c:6352
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Adja meg az új mappa nevét"
 
-#: ../gtk/gtkfilechooserdefault.c:6394
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d bájt"
 msgstr[1] "%d bájt"
 
-#: ../gtk/gtkfilechooserdefault.c:6396
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: ../gtk/gtkfilechooserdefault.c:6398
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: ../gtk/gtkfilechooserdefault.c:6400
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: ../gtk/gtkfilechooserdefault.c:6446 ../gtk/gtkfilechooserdefault.c:6470
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../gtk/gtkfilechooserdefault.c:6457
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Ma"
 
-#: ../gtk/gtkfilechooserdefault.c:6459
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Tegnap"
 
-#: ../gtk/gtkfilechooserdefault.c:6541
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Nem lehet könyvtárat váltani"
 
-#: ../gtk/gtkfilechooserdefault.c:6542
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Az ön által megadott mappa egy érvénytelen útvonal."
 
-#: ../gtk/gtkfilechooserdefault.c:6581
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Nem hozható létre fájlnév ebből: %s és ebből: %s"
 
-#: ../gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Nem lehet kijelölni az elemet"
 
-#: ../gtk/gtkfilechooserdefault.c:6657
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Hely megnyitása"
 
-#: ../gtk/gtkfilechooserdefault.c:6664
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Mentés helye"
 
-#: ../gtk/gtkfilechooserdefault.c:6688
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "He_ly:"
 
-#: ../gtk/gtkfilesel.c:730
+#: gtk/gtkfilesel.c:727
 msgid "Folders"
 msgstr "Mappák"
 
-#: ../gtk/gtkfilesel.c:734
+#: gtk/gtkfilesel.c:731
 msgid "Fol_ders"
 msgstr "_Mappák"
 
-#: ../gtk/gtkfilesel.c:770
+#: gtk/gtkfilesel.c:767
 msgid "_Files"
 msgstr "_Fájlok"
 
-#: ../gtk/gtkfilesel.c:858 ../gtk/gtkfilesel.c:2248
+#: gtk/gtkfilesel.c:855 gtk/gtkfilesel.c:2242
 #, c-format
 msgid "Folder unreadable: %s"
 msgstr "Olvashatatlan könyvtár: %s"
 
-#: ../gtk/gtkfilesel.c:989
+#: gtk/gtkfilesel.c:984
 #, c-format
 msgid ""
 "The file \"%s\" resides on another machine (called %s) and may not be "
@@ -1567,24 +1589,26 @@ msgstr ""
 "ezen program számára.\n"
 "Valóban ki akarja választani?"
 
-#: ../gtk/gtkfilesel.c:1120
+#: gtk/gtkfilesel.c:1114
 msgid "_New Folder"
 msgstr "Új _mappa"
 
-#: ../gtk/gtkfilesel.c:1131
+#: gtk/gtkfilesel.c:1125
 msgid "De_lete File"
 msgstr "Fáj_l törlése"
 
-#: ../gtk/gtkfilesel.c:1142
+#: gtk/gtkfilesel.c:1136
 msgid "_Rename File"
 msgstr "Fájl át_nevezése"
 
-#: ../gtk/gtkfilesel.c:1444
+#: gtk/gtkfilesel.c:1438
 #, c-format
-msgid "The folder name \"%s\" contains symbols that are not allowed in filenames"
-msgstr "A(z) \"%s\" mappanév fájlnevekben meg nem engedett szimbólumokat tartalmaz"
+msgid ""
+"The folder name \"%s\" contains symbols that are not allowed in filenames"
+msgstr ""
+"A(z) \"%s\" mappanév fájlnevekben meg nem engedett szimbólumokat tartalmaz"
 
-#: ../gtk/gtkfilesel.c:1446
+#: gtk/gtkfilesel.c:1440
 #, c-format
 msgid ""
 "Error creating folder \"%s\": %s\n"
@@ -1593,33 +1617,34 @@ msgstr ""
 "Hiba a(z) \"%s\" mappa létrehozásakor: %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1447 ../gtk/gtkfilesel.c:1683
+#: gtk/gtkfilesel.c:1441 gtk/gtkfilesel.c:1677
 msgid "You probably used symbols not allowed in filenames."
 msgstr "Valószínűleg fájlnevekben meg nem engedett szimbólumokat használt."
 
-#: ../gtk/gtkfilesel.c:1455
+#: gtk/gtkfilesel.c:1449
 #, c-format
 msgid "Error creating folder \"%s\": %s\n"
 msgstr "Hiba a(z) \"%s\" mappa létrehozásakor: %s\n"
 
-#: ../gtk/gtkfilesel.c:1489
+#: gtk/gtkfilesel.c:1483
 msgid "New Folder"
 msgstr "Új mappa"
 
-#: ../gtk/gtkfilesel.c:1504
+#: gtk/gtkfilesel.c:1498
 msgid "_Folder name:"
 msgstr "_Mappa neve:"
 
-#: ../gtk/gtkfilesel.c:1528
+#: gtk/gtkfilesel.c:1522
 msgid "C_reate"
 msgstr "Lét_rehozás"
 
-#: ../gtk/gtkfilesel.c:1571
+#: gtk/gtkfilesel.c:1565
 #, c-format
 msgid "The filename \"%s\" contains symbols that are not allowed in filenames"
-msgstr "A(z) \"%s\" fájlnév fájlnevekben meg nem engedett szimbólumokat tartalmaz"
+msgstr ""
+"A(z) \"%s\" fájlnév fájlnevekben meg nem engedett szimbólumokat tartalmaz"
 
-#: ../gtk/gtkfilesel.c:1574
+#: gtk/gtkfilesel.c:1568
 #, c-format
 msgid ""
 "Error deleting file \"%s\": %s\n"
@@ -1628,30 +1653,31 @@ msgstr ""
 "Hiba a(z) \"%s\" fájl törlése közben: %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1576 ../gtk/gtkfilesel.c:1697
+#: gtk/gtkfilesel.c:1570 gtk/gtkfilesel.c:1691
 msgid "It probably contains symbols not allowed in filenames."
 msgstr "Valószínűleg fájlnevekben meg nem engedett szimbólumokat tartalmaz."
 
-#: ../gtk/gtkfilesel.c:1585
+#: gtk/gtkfilesel.c:1579
 #, c-format
 msgid "Error deleting file \"%s\": %s"
 msgstr "Hiba a(z) \"%s\" fájl törlése közben: %s"
 
-#: ../gtk/gtkfilesel.c:1628
+#: gtk/gtkfilesel.c:1622
 #, c-format
 msgid "Really delete file \"%s\"?"
 msgstr "Biztos törli a(z) \"%s\"-t?"
 
-#: ../gtk/gtkfilesel.c:1633
+#: gtk/gtkfilesel.c:1627
 msgid "Delete File"
 msgstr "Fájl törlése"
 
-#: ../gtk/gtkfilesel.c:1679 ../gtk/gtkfilesel.c:1693
+#: gtk/gtkfilesel.c:1673 gtk/gtkfilesel.c:1687
 #, c-format
 msgid "The file name \"%s\" contains symbols that are not allowed in filenames"
-msgstr "A(z) \"%s\" fájlnév fájlnevekben meg nem engedett szimbólumokat tartalmaz"
+msgstr ""
+"A(z) \"%s\" fájlnév fájlnevekben meg nem engedett szimbólumokat tartalmaz"
 
-#: ../gtk/gtkfilesel.c:1681
+#: gtk/gtkfilesel.c:1675
 #, c-format
 msgid ""
 "Error renaming file to \"%s\": %s\n"
@@ -1660,7 +1686,7 @@ msgstr ""
 "Hiba a fájl átnevezése közben erre: \"%s\" : %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1695
+#: gtk/gtkfilesel.c:1689
 #, c-format
 msgid ""
 "Error renaming file \"%s\": %s\n"
@@ -1669,29 +1695,29 @@ msgstr ""
 "Hiba \"%s\" fájl átnevezése közben: %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1705
+#: gtk/gtkfilesel.c:1699
 #, c-format
 msgid "Error renaming file \"%s\" to \"%s\": %s"
 msgstr "Hiba \"%s\" fájl erre: \"%s\" való átnevezése közben: %s"
 
-#: ../gtk/gtkfilesel.c:1752
+#: gtk/gtkfilesel.c:1746
 msgid "Rename File"
 msgstr "Fájl átnevezése"
 
-#: ../gtk/gtkfilesel.c:1767
+#: gtk/gtkfilesel.c:1761
 #, c-format
 msgid "Rename file \"%s\" to:"
 msgstr "'%s' fájl átnevezése:"
 
-#: ../gtk/gtkfilesel.c:1796
+#: gtk/gtkfilesel.c:1790
 msgid "_Rename"
 msgstr "Á_tnevezés"
 
-#: ../gtk/gtkfilesel.c:2228
+#: gtk/gtkfilesel.c:2222
 msgid "_Selection: "
 msgstr "_Kijelölés: "
 
-#: ../gtk/gtkfilesel.c:3153
+#: gtk/gtkfilesel.c:3147
 #, c-format
 msgid ""
 "The filename \"%s\" couldn't be converted to UTF-8. (try setting the "
@@ -1700,48 +1726,49 @@ msgstr ""
 "A(z) \"%s\" fájlnevet nem lehet UTF-8-ra konvertálni. (próbálja meg "
 "beállítani a G_FILENAME_ENCODING környezeti változót): %s"
 
-#: ../gtk/gtkfilesel.c:3156
+#: gtk/gtkfilesel.c:3150
 msgid "Invalid UTF-8"
 msgstr "Érvénytelen UTF-8"
 
-#: ../gtk/gtkfilesel.c:4033
+#: gtk/gtkfilesel.c:4027
 msgid "Name too long"
 msgstr "Túl hosszú a név"
 
-#: ../gtk/gtkfilesel.c:4035
+#: gtk/gtkfilesel.c:4029
 msgid "Couldn't convert filename"
 msgstr "Nem lehet konvertálni a fájlnevet"
 
-#: ../gtk/gtkfilesystemmodel.c:1267
+#: gtk/gtkfilesystemmodel.c:1267
 msgid "(Empty)"
 msgstr "(Üres)"
 
-#: ../gtk/gtkfilesystemunix.c:476 ../gtk/gtkfilesystemunix.c:682
-#: ../gtk/gtkfilesystemunix.c:1858 ../gtk/gtkfilesystemwin32.c:482
-#: ../gtk/gtkfilesystemwin32.c:495 ../gtk/gtkfilesystemwin32.c:1560
+#: gtk/gtkfilesystemunix.c:476 gtk/gtkfilesystemunix.c:682
+#: gtk/gtkfilesystemunix.c:1858 gtk/gtkfilesystemwin32.c:482
+#: gtk/gtkfilesystemwin32.c:495 gtk/gtkfilesystemwin32.c:1487
 #, c-format
 msgid "Error getting information for '%s': %s"
 msgstr "Hiba a(z) \"%s\" számára való információszerzés közben: %s"
 
-#: ../gtk/gtkfilesystemunix.c:551 ../gtk/gtkfilesystemwin32.c:537
+#: gtk/gtkfilesystemunix.c:551 gtk/gtkfilesystemwin32.c:537
 #, c-format
 msgid "Error creating directory '%s': %s"
 msgstr "Hiba a(z) '%s' könyvtár létrehozásakor: %s"
 
-#: ../gtk/gtkfilesystemunix.c:631 ../gtk/gtkfilesystemwin32.c:597
+#: gtk/gtkfilesystemunix.c:631 gtk/gtkfilesystemwin32.c:597
 msgid "This file system does not support mounting"
 msgstr "A fájlrendszer nem támogatja a csatlakoztatást"
 
-#: ../gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#: gtk/gtkfilesystemunix.c:639
+#, fuzzy
+msgid "File System"
 msgstr "Fájlrendszer"
 
-#: ../gtk/gtkfilesystemunix.c:796
+#: gtk/gtkfilesystemunix.c:796
 #, c-format
 msgid "Could not get a stock icon for %s"
 msgstr "Nem érhető el alapértelmezett ikon a következőhöz: %s"
 
-#: ../gtk/gtkfilesystemunix.c:891
+#: gtk/gtkfilesystemunix.c:891
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"%s\". "
@@ -1750,93 +1777,93 @@ msgstr ""
 "A(z) \"%s\" név érvénytelen, mert \"%s\" karaktert tartalmaz. Használjon "
 "másik nevet."
 
-#: ../gtk/gtkfilesystemunix.c:1463 ../gtk/gtkfilesystemwin32.c:1032
+#: gtk/gtkfilesystemunix.c:1463 gtk/gtkfilesystemwin32.c:1032
 #, c-format
 msgid "Bookmark saving failed: %s"
 msgstr "Könyvjelző mentése sikertelen: %s"
 
-#: ../gtk/gtkfilesystemunix.c:1518
+#: gtk/gtkfilesystemunix.c:1518
 #, c-format
 msgid "'%s' already exists in the bookmarks list"
 msgstr "\"%s\" már létezik a könyvjelzők listájában"
 
-#: ../gtk/gtkfilesystemunix.c:1590
+#: gtk/gtkfilesystemunix.c:1590
 #, c-format
 msgid "'%s' does not exist in the bookmarks list"
 msgstr "\"%s\" nem létezik a könyvjelzők listájában"
 
-#: ../gtk/gtkfilesystemunix.c:1818
+#: gtk/gtkfilesystemunix.c:1818
 #, c-format
 msgid "Error getting information for '/': %s"
 msgstr "Hiba a '/' számára való információszerzés közben: %s"
 
-#: ../gtk/gtkfilesystemwin32.c:611
+#: gtk/gtkfilesystemwin32.c:611
 #, c-format
 msgid "Network Drive (%s)"
 msgstr "Hálózati meghajtó (%s)"
 
-#: ../gtk/gtkfilesystemwin32.c:650
+#: gtk/gtkfilesystemwin32.c:650
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../gtk/gtkfontbutton.c:179 ../gtk/gtkfontbutton.c:292
+#: gtk/gtkfontbutton.c:179 gtk/gtkfontbutton.c:292
 msgid "Pick a Font"
 msgstr "Betűkészlet kiválasztása"
 
 #. Initialize fields
-#: ../gtk/gtkfontbutton.c:286
+#: gtk/gtkfontbutton.c:286
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: ../gtk/gtkfontbutton.c:804
+#: gtk/gtkfontbutton.c:804
 msgid "Font"
 msgstr "Betűkészlet"
 
 #. This is the default text shown in the preview entry, though the user
 #. can set it. Remember that some fonts only have capital letters.
-#: ../gtk/gtkfontsel.c:74
+#: gtk/gtkfontsel.c:74
 msgid "abcdefghijk ABCDEFGHIJK"
 msgstr "árvíztűrő tükörfúrógép ÁRVÍZTŰRŐ TÜKÖRFÚRÓGÉP"
 
-#: ../gtk/gtkfontsel.c:361
+#: gtk/gtkfontsel.c:361
 msgid "_Family:"
 msgstr "_Család:"
 
-#: ../gtk/gtkfontsel.c:367
+#: gtk/gtkfontsel.c:367
 msgid "_Style:"
 msgstr "_Stílus:"
 
-#: ../gtk/gtkfontsel.c:373
+#: gtk/gtkfontsel.c:373
 msgid "Si_ze:"
 msgstr "_Méret:"
 
 #. create the text entry widget
-#: ../gtk/gtkfontsel.c:549
+#: gtk/gtkfontsel.c:549
 msgid "_Preview:"
 msgstr "_Előnézet:"
 
-#: ../gtk/gtkfontsel.c:1383
+#: gtk/gtkfontsel.c:1383
 msgid "Font Selection"
 msgstr "Betűkészlet-választó"
 
-#: ../gtk/gtkgamma.c:401
+#: gtk/gtkgamma.c:401
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../gtk/gtkgamma.c:411
+#: gtk/gtkgamma.c:411
 msgid "_Gamma value"
 msgstr "_Gamma érték"
 
 #. Remove this icon source so we don't keep trying to
 #. * load it.
 #.
-#: ../gtk/gtkiconfactory.c:1656
+#: gtk/gtkiconfactory.c:1656
 #, c-format
 msgid "Error loading icon: %s"
 msgstr "Hiba az ikon betöltésekor: %s"
 
-#: ../gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1849,120 +1876,120 @@ msgstr ""
 "Beszerezhet egy másolatot a következő helyről:\n"
 "\t%s"
 
-#: ../gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "'%s' ikon nincs a témában"
 
-#: ../gtk/gtkimmodule.c:427
+#: gtk/gtkimmodule.c:427
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: ../gtk/gtkinputdialog.c:235
+#: gtk/gtkinputdialog.c:235
 msgid "Input"
 msgstr "Bevitel"
 
-#: ../gtk/gtkinputdialog.c:244
+#: gtk/gtkinputdialog.c:244
 msgid "No extended input devices"
 msgstr "Nincs kiterjesztett beviteli eszköz"
 
-#: ../gtk/gtkinputdialog.c:256
+#: gtk/gtkinputdialog.c:256
 msgid "_Device:"
 msgstr "_Eszköz:"
 
-#: ../gtk/gtkinputdialog.c:273
+#: gtk/gtkinputdialog.c:273
 msgid "Disabled"
 msgstr "Tiltva"
 
-#: ../gtk/gtkinputdialog.c:280
+#: gtk/gtkinputdialog.c:280
 msgid "Screen"
 msgstr "Képernyő"
 
-#: ../gtk/gtkinputdialog.c:287
+#: gtk/gtkinputdialog.c:287
 msgid "Window"
 msgstr "Ablak"
 
-#: ../gtk/gtkinputdialog.c:294
+#: gtk/gtkinputdialog.c:294
 msgid "_Mode: "
 msgstr "_Mód: "
 
 #. The axis listbox
-#: ../gtk/gtkinputdialog.c:325
+#: gtk/gtkinputdialog.c:325
 msgid "_Axes"
 msgstr "_Tengelyek"
 
 #. Keys listbox
-#: ../gtk/gtkinputdialog.c:342
+#: gtk/gtkinputdialog.c:342
 msgid "_Keys"
 msgstr "_Billentyűk"
 
-#: ../gtk/gtkinputdialog.c:562
+#: gtk/gtkinputdialog.c:562
 msgid "X"
 msgstr "X"
 
-#: ../gtk/gtkinputdialog.c:563
+#: gtk/gtkinputdialog.c:563
 msgid "Y"
 msgstr "Y"
 
-#: ../gtk/gtkinputdialog.c:564
+#: gtk/gtkinputdialog.c:564
 msgid "Pressure"
 msgstr "Nyomás"
 
-#: ../gtk/gtkinputdialog.c:565
+#: gtk/gtkinputdialog.c:565
 msgid "X Tilt"
 msgstr "X döntés"
 
-#: ../gtk/gtkinputdialog.c:566
+#: gtk/gtkinputdialog.c:566
 msgid "Y Tilt"
 msgstr "Y döntés"
 
-#: ../gtk/gtkinputdialog.c:567
+#: gtk/gtkinputdialog.c:567
 msgid "Wheel"
 msgstr "Görgő"
 
-#: ../gtk/gtkinputdialog.c:607
+#: gtk/gtkinputdialog.c:607
 msgid "none"
 msgstr "nincs"
 
-#: ../gtk/gtkinputdialog.c:643 ../gtk/gtkinputdialog.c:679
+#: gtk/gtkinputdialog.c:643 gtk/gtkinputdialog.c:679
 msgid "(disabled)"
 msgstr "(tiltva)"
 
-#: ../gtk/gtkinputdialog.c:672
+#: gtk/gtkinputdialog.c:672
 msgid "(unknown)"
 msgstr "(ismeretlen)"
 
 #. and clear button
-#: ../gtk/gtkinputdialog.c:759
+#: gtk/gtkinputdialog.c:759
 msgid "clear"
 msgstr "törlés"
 
-#: ../gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Mindent kijelöl"
 
 #. Description of --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:398
+#: gtk/gtkmain.c:398
 msgid "Load additional GTK+ modules"
 msgstr "További GTK+ modulok betöltése"
 
 #. Placeholder in --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:399
+#: gtk/gtkmain.c:399
 msgid "MODULES"
 msgstr "MODULES"
 
 #. Description of --g-fatal-warnings in --help output
-#: ../gtk/gtkmain.c:401
+#: gtk/gtkmain.c:401
 msgid "Make all warnings fatal"
 msgstr "Minden figyelmeztetés végzetes legyen"
 
 #. Description of --gtk-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:404
+#: gtk/gtkmain.c:404
 msgid "GTK+ debugging flags to set"
 msgstr "Beállítandó Gtk+ debug jelzőbitek"
 
 #. Description of --gtk-no-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:407
+#: gtk/gtkmain.c:407
 msgid "GTK+ debugging flags to unset"
 msgstr "Kikapcsolandó Gtk+ jelzőbitek"
 
@@ -1971,530 +1998,529 @@ msgstr "Kikapcsolandó Gtk+ jelzőbitek"
 #. * Do *not* translate it to "predefinito:LTR", if it
 #. * it isn't default:LTR or default:RTL it will not work
 #.
-#: ../gtk/gtkmain.c:476
+#: gtk/gtkmain.c:476
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../gtk/gtkmain.c:559
+#: gtk/gtkmain.c:559
 msgid "GTK+ Options"
 msgstr "GTK+ beállításai"
 
-#: ../gtk/gtkmain.c:559
+#: gtk/gtkmain.c:559
 msgid "Show GTK+ Options"
 msgstr "GTK+ beállítások megjelenítése"
 
-#: ../gtk/gtknotebook.c:2718 ../gtk/gtknotebook.c:5064
+#: gtk/gtknotebook.c:2718 gtk/gtknotebook.c:5064
 #, c-format
 msgid "Page %u"
 msgstr "%u. oldal"
 
-#: ../gtk/gtkradiotoolbutton.c:92
+#: gtk/gtkradiotoolbutton.c:92
 msgid "Group"
 msgstr "Csoport"
 
-#: ../gtk/gtkradiotoolbutton.c:93
+#: gtk/gtkradiotoolbutton.c:93
 msgid "The radio tool button whose group this button belongs to."
 msgstr "Az a rádiógomb-csoport, amelyhez ez a rádiógomb tartozik."
 
-#: ../gtk/gtkrc.c:2400
+#: gtk/gtkrc.c:2400
 #, c-format
 msgid "Unable to find include file: \"%s\""
 msgstr "Include-fájl nem található: \"%s\""
 
-#: ../gtk/gtkrc.c:3042 ../gtk/gtkrc.c:3045
+#: gtk/gtkrc.c:3042 gtk/gtkrc.c:3045
 #, c-format
 msgid "Unable to locate image file in pixmap_path: \"%s\""
 msgstr "A kép nem található a következő pixmap_path útvonalon: \"%s\""
 
-#: ../gtk/gtkrc.c:3480
+#: gtk/gtkrc.c:3480
 #, c-format
 msgid "Pixmap path element: \"%s\" must be absolute, %s, line %d"
 msgstr "A kép útvonalának eleme: \"%s\" abszolút kell legyen, %s, %d. sor"
 
 #. KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate
-#: ../gtk/gtkstock.c:308
+#: gtk/gtkstock.c:308
 msgid "Information"
 msgstr "Információ"
 
-#: ../gtk/gtkstock.c:309
+#: gtk/gtkstock.c:309
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: ../gtk/gtkstock.c:310
+#: gtk/gtkstock.c:310
 msgid "Error"
 msgstr "Hiba"
 
-#: ../gtk/gtkstock.c:311
+#: gtk/gtkstock.c:311
 msgid "Question"
 msgstr "Kérdés"
 
 #. FIXME these need accelerators when appropriate, and
 #. * need the mnemonics to be rationalized
 #.
-#: ../gtk/gtkstock.c:316
+#: gtk/gtkstock.c:316
 msgid "_About"
 msgstr "_Névjegy"
 
-#: ../gtk/gtkstock.c:318
+#: gtk/gtkstock.c:318
 msgid "_Apply"
 msgstr "_Alkalmaz"
 
-#: ../gtk/gtkstock.c:319
+#: gtk/gtkstock.c:319
 msgid "_Bold"
 msgstr "_Félkövér"
 
-#: ../gtk/gtkstock.c:320
+#: gtk/gtkstock.c:320
 msgid "_Cancel"
 msgstr "Mé_gsem"
 
-#: ../gtk/gtkstock.c:321
+#: gtk/gtkstock.c:321
 msgid "_CD-Rom"
 msgstr "_CD-ROM"
 
-#: ../gtk/gtkstock.c:322
+#: gtk/gtkstock.c:322
 msgid "_Clear"
 msgstr "_Törlés"
 
-#: ../gtk/gtkstock.c:323
+#: gtk/gtkstock.c:323
 msgid "_Close"
 msgstr "_Bezárás"
 
-#: ../gtk/gtkstock.c:324
+#: gtk/gtkstock.c:324
 msgid "_Convert"
 msgstr "_Konvertálás"
 
-#: ../gtk/gtkstock.c:325
+#: gtk/gtkstock.c:325
 msgid "_Copy"
 msgstr "_Másolás"
 
-#: ../gtk/gtkstock.c:326
+#: gtk/gtkstock.c:326
 msgid "Cu_t"
 msgstr "_Kivágás"
 
-#: ../gtk/gtkstock.c:327
+#: gtk/gtkstock.c:327
 msgid "_Delete"
 msgstr "_Törlés"
 
-#: ../gtk/gtkstock.c:328
+#: gtk/gtkstock.c:328
 msgid "_Execute"
 msgstr "_Végrehajtás"
 
-#: ../gtk/gtkstock.c:329
+#: gtk/gtkstock.c:329
 msgid "_Edit"
 msgstr "S_zerkesztés"
 
-#: ../gtk/gtkstock.c:330
+#: gtk/gtkstock.c:330
 msgid "_Find"
 msgstr "_Keresés"
 
-#: ../gtk/gtkstock.c:331
+#: gtk/gtkstock.c:331
 msgid "Find and _Replace"
 msgstr "Keresés és _csere"
 
-#: ../gtk/gtkstock.c:332
+#: gtk/gtkstock.c:332
 msgid "_Floppy"
 msgstr "_Floppy"
 
-#: ../gtk/gtkstock.c:333
+#: gtk/gtkstock.c:333
 msgid "_Fullscreen"
 msgstr "_Teljes képernyő"
 
-#: ../gtk/gtkstock.c:334
+#: gtk/gtkstock.c:334
 msgid "_Leave Fullscreen"
 msgstr "T_eljes képernyő elhagyása"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:336
+#: gtk/gtkstock.c:336
 msgid "Navigation|_Bottom"
 msgstr "_Alsó"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:338
+#: gtk/gtkstock.c:338
 msgid "Navigation|_First"
 msgstr "El_ső"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:340
+#: gtk/gtkstock.c:340
 msgid "Navigation|_Last"
 msgstr "_Utolsó"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:342
+#: gtk/gtkstock.c:342
 msgid "Navigation|_Top"
 msgstr "F_első"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:344
+#: gtk/gtkstock.c:344
 msgid "Navigation|_Back"
 msgstr "_Vissza"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:346
+#: gtk/gtkstock.c:346
 msgid "Navigation|_Down"
 msgstr "_Le"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:348
+#: gtk/gtkstock.c:348
 msgid "Navigation|_Forward"
 msgstr "Elő_re"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:350
+#: gtk/gtkstock.c:350
 msgid "Navigation|_Up"
 msgstr "_Fel"
 
-#: ../gtk/gtkstock.c:351
+#: gtk/gtkstock.c:351
 msgid "_Harddisk"
 msgstr "_Merevlemez"
 
-#: ../gtk/gtkstock.c:352
+#: gtk/gtkstock.c:352
 msgid "_Help"
 msgstr "_Súgó"
 
-#: ../gtk/gtkstock.c:353
+#: gtk/gtkstock.c:353
 msgid "_Home"
 msgstr "Saját _mappa"
 
-#: ../gtk/gtkstock.c:354
+#: gtk/gtkstock.c:354
 msgid "Increase Indent"
 msgstr "Behúzás növelése"
 
-#: ../gtk/gtkstock.c:355
+#: gtk/gtkstock.c:355
 msgid "Decrease Indent"
 msgstr "Behúzás csökkentése"
 
-#: ../gtk/gtkstock.c:356
+#: gtk/gtkstock.c:356
 msgid "_Index"
 msgstr "_Index"
 
-#: ../gtk/gtkstock.c:357
+#: gtk/gtkstock.c:357
 msgid "_Information"
 msgstr "_Információ"
 
-#: ../gtk/gtkstock.c:358
+#: gtk/gtkstock.c:358
 msgid "_Italic"
 msgstr "_Dőlt"
 
-#: ../gtk/gtkstock.c:359
+#: gtk/gtkstock.c:359
 msgid "_Jump to"
 msgstr "_Ugrás"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:361
+#: gtk/gtkstock.c:361
 msgid "Justify|_Center"
 msgstr "Közé_pre"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:363
+#: gtk/gtkstock.c:363
 msgid "Justify|_Fill"
 msgstr "_Kitöltés"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:365
+#: gtk/gtkstock.c:365
 msgid "Justify|_Left"
 msgstr "_Balra"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:367
+#: gtk/gtkstock.c:367
 msgid "Justify|_Right"
 msgstr "_Jobbra"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:370
+#: gtk/gtkstock.c:370
 msgid "Media|_Forward"
 msgstr "Elő_re"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:372
+#: gtk/gtkstock.c:372
 msgid "Media|_Next"
 msgstr "_Következő"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:374
+#: gtk/gtkstock.c:374
 msgid "Media|P_ause"
 msgstr "_Szünet"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:376
+#: gtk/gtkstock.c:376
 msgid "Media|_Play"
 msgstr "Le_játszás"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:378
+#: gtk/gtkstock.c:378
 msgid "Media|Pre_vious"
 msgstr "_Előző"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:380
+#: gtk/gtkstock.c:380
 msgid "Media|_Record"
 msgstr "_Felvétel"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:382
+#: gtk/gtkstock.c:382
 msgid "Media|R_ewind"
 msgstr "_Vissza"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:384
+#: gtk/gtkstock.c:384
 msgid "Media|_Stop"
 msgstr "_Leállítás"
 
-#: ../gtk/gtkstock.c:385
+#: gtk/gtkstock.c:385
 msgid "_Network"
 msgstr "_Hálózat"
 
-#: ../gtk/gtkstock.c:386
+#: gtk/gtkstock.c:386
 msgid "_New"
 msgstr "Ú_j"
 
-#: ../gtk/gtkstock.c:387
+#: gtk/gtkstock.c:387
 msgid "_No"
 msgstr "_Nem"
 
-#: ../gtk/gtkstock.c:388
+#: gtk/gtkstock.c:388
 msgid "_OK"
 msgstr "_OK"
 
-#: ../gtk/gtkstock.c:389
+#: gtk/gtkstock.c:389
 msgid "_Open"
 msgstr "_Megnyitás"
 
-#: ../gtk/gtkstock.c:390
+#: gtk/gtkstock.c:390
 msgid "_Paste"
 msgstr "_Beillesztés"
 
-#: ../gtk/gtkstock.c:391
+#: gtk/gtkstock.c:391
 msgid "_Preferences"
 msgstr "_Beállítások"
 
-#: ../gtk/gtkstock.c:392
+#: gtk/gtkstock.c:392
 msgid "_Print"
 msgstr "_Nyomtatás"
 
-#: ../gtk/gtkstock.c:393
+#: gtk/gtkstock.c:393
 msgid "Print Pre_view"
 msgstr "Nyomtatási _kép"
 
-#: ../gtk/gtkstock.c:394
+#: gtk/gtkstock.c:394
 msgid "_Properties"
 msgstr "_Tulajdonságok"
 
-#: ../gtk/gtkstock.c:395
+#: gtk/gtkstock.c:395
 msgid "_Quit"
 msgstr "_Kilépés"
 
-#: ../gtk/gtkstock.c:396
+#: gtk/gtkstock.c:396
 msgid "_Redo"
 msgstr "Új_ra"
 
-#: ../gtk/gtkstock.c:397
+#: gtk/gtkstock.c:397
 msgid "_Refresh"
 msgstr "_Frissítés"
 
-#: ../gtk/gtkstock.c:399
+#: gtk/gtkstock.c:399
 msgid "_Revert"
 msgstr "_Visszaállítás"
 
-#: ../gtk/gtkstock.c:400
+#: gtk/gtkstock.c:400
 msgid "_Save"
 msgstr "M_entés"
 
-#: ../gtk/gtkstock.c:401
+#: gtk/gtkstock.c:401
 msgid "Save _As"
 msgstr "Men_tés másként"
 
-#: ../gtk/gtkstock.c:402
+#: gtk/gtkstock.c:402
 msgid "_Color"
 msgstr "_Szín"
 
-#: ../gtk/gtkstock.c:403
+#: gtk/gtkstock.c:403
 msgid "_Font"
 msgstr "_Betűkészlet"
 
-#: ../gtk/gtkstock.c:404
+#: gtk/gtkstock.c:404
 msgid "_Ascending"
 msgstr "_Növekvő"
 
-#: ../gtk/gtkstock.c:405
+#: gtk/gtkstock.c:405
 msgid "_Descending"
 msgstr "_Csökkenő"
 
-#: ../gtk/gtkstock.c:406
+#: gtk/gtkstock.c:406
 msgid "_Spell Check"
 msgstr "_Helyesírás-ellenőrzés"
 
-#: ../gtk/gtkstock.c:407
+#: gtk/gtkstock.c:407
 msgid "_Stop"
 msgstr "_Leállítás"
 
-#: ../gtk/gtkstock.c:408
+#: gtk/gtkstock.c:408
 msgid "_Strikethrough"
 msgstr "Át_húzás"
 
-#: ../gtk/gtkstock.c:409
+#: gtk/gtkstock.c:409
 msgid "_Undelete"
 msgstr "_Visszaállítás"
 
-#: ../gtk/gtkstock.c:410
+#: gtk/gtkstock.c:410
 msgid "_Underline"
 msgstr "_Aláhúzás"
 
-#: ../gtk/gtkstock.c:411
+#: gtk/gtkstock.c:411
 msgid "_Undo"
 msgstr "_Visszavonás"
 
-#: ../gtk/gtkstock.c:412
+#: gtk/gtkstock.c:412
 msgid "_Yes"
 msgstr "_Igen"
 
-#: ../gtk/gtkstock.c:413
+#: gtk/gtkstock.c:413
 msgid "_Normal Size"
 msgstr "_Normál méret"
 
-#: ../gtk/gtkstock.c:414
+#: gtk/gtkstock.c:414
 msgid "Best _Fit"
 msgstr "Legjobb _illeszkedés"
 
-#: ../gtk/gtkstock.c:415
+#: gtk/gtkstock.c:415
 msgid "Zoom _In"
 msgstr "_Nagyítás"
 
-#: ../gtk/gtkstock.c:416
+#: gtk/gtkstock.c:416
 msgid "Zoom _Out"
 msgstr "_Kicsinyítés"
 
-#: ../gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM _Balról-jobbra jel"
 
-#: ../gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM _Jobbról-balra jel"
 
-#: ../gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Balról-jobbra _beágyazás"
 
-#: ../gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Jobbról-balra b_eágyazás"
 
-#: ../gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Balról-jobbra _felülbírálás"
 
-#: ../gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Jobbról-balra fe_lülbírálás"
 
-#: ../gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF Irányformázás _visszakapása"
 
-#: ../gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _Null szélességű szóköz"
 
-#: ../gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Null szélességű ö_sszekötő"
 
-#: ../gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Null szélességű _nem-összekötő"
 
-#: ../gtk/gtkthemes.c:71
+#: gtk/gtkthemes.c:71
 #, c-format
 msgid "Unable to locate theme engine in module_path: \"%s\","
 msgstr "Nem található a témamotor a következő modul útvonalon: \"%s\","
 
-#: ../gtk/gtktipsquery.c:186
+#: gtk/gtktipsquery.c:186
 msgid "--- No Tip ---"
 msgstr "-- Nincs segédszöveg --"
 
-#: ../gtk/gtkuimanager.c:1154
+#: gtk/gtkuimanager.c:1154
 #, c-format
 msgid "Unknown attribute '%s' on line %d char %d"
 msgstr "Ismeretlen paraméter: \"%s\" a(z) %d. sor %d. karakterénél "
 
-#: ../gtk/gtkuimanager.c:1371
+#: gtk/gtkuimanager.c:1371
 #, c-format
 msgid "Unexpected start tag '%s' on line %d char %d"
 msgstr "Váratlan kezdőcímke: \"%s\" a(z) %d. sor %d. karakterénél"
 
-#: ../gtk/gtkuimanager.c:1461
+#: gtk/gtkuimanager.c:1461
 #, c-format
 msgid "Unexpected character data on line %d char %d"
 msgstr "Váratlan karakteradat a(z) %d. sor %d. karakterénél"
 
-#: ../gtk/gtkuimanager.c:2272
+#: gtk/gtkuimanager.c:2272
 msgid "Empty"
 msgstr "Üres"
 
 #. ID
-#: ../modules/input/imam-et.c:454
+#: modules/input/imam-et.c:454
 msgid "Amharic (EZ+)"
 msgstr "Amharic (EZ+)"
 
 #. ID
-#: ../modules/input/imcedilla.c:91
+#: modules/input/imcedilla.c:91
 msgid "Cedilla"
 msgstr "Cedilla"
 
 #. ID
-#: ../modules/input/imcyrillic-translit.c:217
+#: modules/input/imcyrillic-translit.c:217
 msgid "Cyrillic (Transliterated)"
 msgstr "Cirill (Transliterált)"
 
 #. ID
-#: ../modules/input/iminuktitut.c:127
+#: modules/input/iminuktitut.c:127
 msgid "Inuktitut (Transliterated)"
 msgstr "Inuktitut (Transliterált)"
 
 #. ID
-#: ../modules/input/imipa.c:145
+#: modules/input/imipa.c:145
 msgid "IPA"
 msgstr "IPA"
 
 #. ID
-#: ../modules/input/imthai-broken.c:178
+#: modules/input/imthai-broken.c:178
 msgid "Thai (Broken)"
 msgstr "Thai (hibás)"
 
 #. ID
-#: ../modules/input/imti-er.c:453
+#: modules/input/imti-er.c:453
 msgid "Tigrigna-Eritrean (EZ+)"
 msgstr "Eritreai tigrigna (EZ+)"
 
 #. ID
-#: ../modules/input/imti-et.c:453
+#: modules/input/imti-et.c:453
 msgid "Tigrigna-Ethiopian (EZ+)"
 msgstr "Etióp tigrigna (EZ+)"
 
 #. ID
-#: ../modules/input/imviqr.c:244
+#: modules/input/imviqr.c:244
 msgid "Vietnamese (VIQR)"
 msgstr "Vietnami (VIQR)"
 
 #. ID
-#: ../modules/input/imxim.c:28
+#: modules/input/imxim.c:28
 msgid "X Input Method"
 msgstr "X Input Method"
 
-#: ../tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Nem lehet információt szerezni a(z) '%s' fájlról: %s"
 
-msgid "Writing %s failed: %s"
-msgstr "%s írása sikertelen: %s"
-
-msgid "Shift"
-msgstr "Shift"
+#~ msgid "Writing %s failed: %s"
+#~ msgstr "%s írása sikertelen: %s"
 
-msgid "Ctrl"
-msgstr "Ctrl"
+#~ msgid "Shift"
+#~ msgstr "Shift"
 
-msgid "Alt"
-msgstr "Alt"
+#~ msgid "Ctrl"
+#~ msgstr "Ctrl"
 
+#~ msgid "Alt"
+#~ msgstr "Alt"
diff --git a/po/ia.po b/po/ia.po
index 04a4d4b0b4..fa1e758147 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2000-10-27 02:02+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: Interlingua\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Incapabile de cargaration de archivo '%s' : %s"
@@ -28,7 +28,7 @@ msgid "Image file '%s' contains no data"
 msgstr ""
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1235,21 +1235,21 @@ msgstr "Rota"
 msgid "Color Selection"
 msgstr "Selection de Fonte"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 #, fuzzy
 msgid "Select _All"
 msgstr "Deler"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr ""
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr ""
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr ""
@@ -1259,13 +1259,13 @@ msgstr ""
 msgid "Select A File"
 msgstr "Deler Archivo"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 #, fuzzy
 msgid "Home"
 msgstr "Adjuta"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr ""
@@ -1279,255 +1279,271 @@ msgstr "necun"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Renominar"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Definir Color"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "Rubor:"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "Renominar"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 #, fuzzy
 msgid "Folder"
 msgstr "Archivos"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 #, fuzzy
 msgid "_Remove"
 msgstr "Rubor:"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Definir Color"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "Selection: "
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Archivos"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 #, fuzzy
 msgid "Name"
 msgstr "Renominar"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 #, fuzzy
 msgid "Size"
 msgstr "Dimension:"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 #, fuzzy
 msgid "Modified"
 msgstr "Modo: "
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "Definir Color"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 #, fuzzy
 msgid "_Name:"
 msgstr "Renominar"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 #, fuzzy
 msgid "Save in _folder:"
 msgstr "Definir Color"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 #, fuzzy
 msgid "Create in _folder:"
 msgstr "Definir Color"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "Renominar"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr "Definir Color"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 #, fuzzy
 msgid "Unknown"
 msgstr "(incognite)"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Definir Color"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr "Definir Color"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "Selection: "
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 #, fuzzy
 msgid "_Location:"
 msgstr "Selection: "
@@ -1724,7 +1740,7 @@ msgstr ""
 
 #: gtk/gtkfilesystemunix.c:639
 #, fuzzy
-msgid "Filesystem"
+msgid "File System"
 msgstr "Archivos"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1831,7 +1847,7 @@ msgstr "Gamma valor"
 msgid "Error loading icon: %s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1840,7 +1856,7 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr ""
@@ -1935,7 +1951,7 @@ msgstr "(incognite)"
 msgid "clear"
 msgstr "depurar"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 #, fuzzy
 msgid "Select All"
 msgstr "Deler"
@@ -2388,43 +2404,43 @@ msgstr ""
 msgid "Zoom _Out"
 msgstr ""
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr ""
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr ""
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr ""
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr ""
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr ""
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr ""
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr ""
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr ""
 
@@ -2506,7 +2522,7 @@ msgstr ""
 msgid "X Input Method"
 msgstr ""
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 02f34d2712..9ec8205451 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-05-18 22:28+0300\n"
 "Last-Translator: Mohammad DAMT <mdamt@bisnisweb.com>\n"
 "Language-Team: Indonesia <sukarelawan@gnome.linux.or.id>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Gagal saat membuka berkas '%s': %s"
@@ -28,7 +28,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Berkas gambar %s tidak ada isinya"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1255,20 +1255,20 @@ msgstr "Roda Warna"
 msgid "Color Selection"
 msgstr "Pemilihan Warna"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Pilih semu_a"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Metode Input"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Isikan karakter kontrol Unicode"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Nama berkas ini salah: %s"
@@ -1277,12 +1277,12 @@ msgstr "Nama berkas ini salah: %s"
 msgid "Select A File"
 msgstr "Pilih Berkas"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Rumah"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Desktop"
@@ -1295,238 +1295,254 @@ msgstr "(Tidak ada)"
 msgid "Other..."
 msgstr "Lainnya..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Informasi mengenai berkas ini tidak tersedia"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Tidak dapat menambah buku alamat"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Tidak dapat menghapus buku alamat"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Folder tidak dapat dibuat"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Nama berkas tidak benar"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Isi folder tidak dapat ditampilkan"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Informasi tentang '%s' tidak tersedia: %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Masukkan folder '%s' ke dalam buku alamat"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Masukkan folder ini ke dalam buku alamat"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Masukkan folder terpilih ke dalam buku alamat"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Hapus buku alamat '%s'"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "Buku alamat %s tidak dapat dibuat karena nama pathnya salah."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Hapus"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Ganti nama..."
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Jalan Pintas"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Folder"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "T_ambah"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Masukkan folder terpilih ke dalam Buku Alamat"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "Hapu_s"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Hapus buku alamat yang sedang dipilih"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Komponen tidak dapat dipilih"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "Buku alamat %s tidak dapat dibuat karena nama pathnya salah."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "M_asukkan dalam Buku Alamat"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Buka _Lokasi"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Tampilkan Berkas _Tersembunyi"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "File"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "_Nama"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Ukuran"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Pilih jenis berkas yang ingin ditampilkan"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Buat Fo_lder baru"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Nama:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Lihat folder lainnya"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Simpan ke dalam _folder:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Buat di dalam _folder:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Tidak dapat mengganti folder karena tidak berada pada komputer lokal"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Jalan pintas  %s tidak ada"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Ganti nama"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "%s tidak dapat dipasang"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Ketikkan nama untuk folder baru ini"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d byte"
 msgstr[1] "%d byte"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "tidak diketahui"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Hari Ini"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Kemarin"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Folder tidak dapat diganti"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Folder yang Anda sebutkan tidak benar."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Nama berkas tidak dapat dibuat dari '%s' dan '%s'"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Komponen tidak dapat dipilih"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Buka Lokasi"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Simpan pada"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Lokasi: "
 
@@ -1726,7 +1742,8 @@ msgid "This file system does not support mounting"
 msgstr "Sistem berkas ini tidak dapat melakukan mounting"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Sistem File"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1829,7 +1846,7 @@ msgstr "nilai _Gamma"
 msgid "Error loading icon: %s"
 msgstr "Error saat membuka ikon: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1842,7 +1859,7 @@ msgstr ""
 "Anda bisa mendapatkannya dari:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Ikon '%s' tidak ada pada tema"
@@ -1930,7 +1947,7 @@ msgstr "(tidak diketahui)"
 msgid "clear"
 msgstr "kosongkan"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Pilih semua"
 
@@ -2357,43 +2374,43 @@ msgstr "Zoom _Perbesar"
 msgid "Zoom _Out"
 msgstr "Z_oom perkecil"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM tanda _Left-to-right"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM tanda _Right-to-left"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Left-to-right _embedding"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Right-to-left e_mbedding"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Left-to-right _override"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Right-to-left o_verride"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Pop directional formatting"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _Zero width space"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Zero width _joiner"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Zero width _non-joiner"
 
@@ -2475,7 +2492,7 @@ msgstr "Vietnam (VIQR)"
 msgid "X Input Method"
 msgstr "X Input Method"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Gagal mengambil informasi mengenai berkas '%s': %s"
diff --git a/po/is.po b/po/is.po
index f1d990ae5a..840fcd23c9 100644
--- a/po/is.po
+++ b/po/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk 2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-03-12 15:42-0000\n"
 "Last-Translator: Richard Allen <ra@ra.is>\n"
 "Language-Team: is <kde-isl@molar.is>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Gat ekki opnað skrána '%s': %s"
@@ -27,7 +27,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Myndskráin '%s' inniheldur ekkert"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1274,20 +1274,20 @@ msgstr "Litahjól"
 msgid "Color Selection"
 msgstr "Litaval"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Velja _Allt"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr ""
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr ""
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Ógilt skráarheiti: %s"
@@ -1297,12 +1297,12 @@ msgstr "Ógilt skráarheiti: %s"
 msgid "Select A File"
 msgstr "Velja skrá"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Heim"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Skjáborð"
@@ -1315,249 +1315,265 @@ msgstr "(Ekkert)"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr "Óþekkt myndsnið í skránni '%s'"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Ógilt skráarheiti: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Óþekkt myndsnið í skránni '%s'"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Fjarlægja"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Endurnefna"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Mappa"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Bæta við"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Fjarlægja"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Litaval"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "S_taðsetning:"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Skrár"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Nafn"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Stærð"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Breytt"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #  Create Folder
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "Sto_fna Möppu "
 
 #  Name entry
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Nafn:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Vista í _möppu:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Búa til í _möppu:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Endurnefna"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Óþekkt"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Í dag"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Í gær"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Búa til í _möppu:"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr "Litaval"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "S_taðsetning:"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "S_taðsetning:"
 
@@ -1756,7 +1772,8 @@ msgid "This file system does not support mounting"
 msgstr ""
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Skráarkerfi"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1859,7 +1876,7 @@ msgstr ""
 msgid "Error loading icon: %s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1868,7 +1885,7 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr ""
@@ -1959,7 +1976,7 @@ msgstr "(óþekkt)"
 msgid "clear"
 msgstr "hreinsa"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Velja Allt"
 
@@ -2400,43 +2417,43 @@ msgstr "Renna _að"
 msgid "Zoom _Out"
 msgstr "Renna _frá"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM _vinstr til hægri merki"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM _Hægri til vinstri merki"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Vintri til hægri _innfelling"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Hægri til vinstri i_nnfelling"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr ""
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr ""
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr ""
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr ""
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr ""
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr ""
 
@@ -2529,7 +2546,7 @@ msgstr "Vietnamese (VIQR)"
 msgid "X Input Method"
 msgstr ""
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, fuzzy, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Óþekkt myndsnið í skránni '%s'"
diff --git a/po/it.po b/po/it.po
index 6251e43113..43739df314 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-04-06 22:31+0200\n"
 "Last-Translator: Alessio Dessì <alessiodessi@tiscali.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Apertura del file «%s» fallita: %s"
@@ -28,7 +28,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Il file d'immagine «%s» non contiene dati"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1296,20 +1296,20 @@ msgstr "Rotella"
 msgid "Color Selection"
 msgstr "Selezione colore"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "_Seleziona tutto"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Metodi di input"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Inserisci carattere di controllo unicode"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Nome del file non valido: %s"
@@ -1319,12 +1319,12 @@ msgstr "Nome del file non valido: %s"
 msgid "Select A File"
 msgstr "Elimina file"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Home"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Desktop"
@@ -1338,272 +1338,288 @@ msgstr "nessuno"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr ""
 "Impossibile recuperare informazioni su «%s»:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 #, fuzzy
 msgid "Could not add a bookmark"
 msgstr ""
 "Impossibile aggiungere un segnalibro per «%s»:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 #, fuzzy
 msgid "Could not remove bookmark"
 msgstr ""
 "Impossibile rimuovere il segnalibro per %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Nome del file non valido: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 "Impossibile recuperare informazioni su «%s»:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, fuzzy, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Impossibile aggiungere un segnalibro per «%s» perché è un nome di percorso "
 "non valido."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Rimuovi"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Rinomina"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Cartella"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "A_ggiungi"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Rimuovi"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "Impossibile selezionare «%s»:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "Impossibile aggiungere un segnalibro per «%s» perché è un nome di percorso "
 "non valido."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "Apri posizione"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Most_ra file nascosti"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "File"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Nome"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Dimensione"
 
 # Visto che si applica a cartelle (f) e file (m) mi pare più corretto.
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Data modifica"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Nuova _cartella"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Nome: "
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Esplora altre cartelle"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Salva nella ca_rtella:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Crea nella _cartella:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 #, fuzzy
 msgid "Cannot change to folder because it is not local"
 msgstr "Impossibile passare alla cartella specificata perché non è locale"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "la scorciatoia «%s» non esiste"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Rinomina"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "Impossibile selezionare «%s»:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Digitare il nome della nuova cartella"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d byte"
 msgstr[1] "%d byte"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f kB"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f MB"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f GB"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Oggi"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Ieri"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Crea nella _cartella:"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 #, fuzzy
 msgid "The folder you specified is an invalid path."
 msgstr ""
 "Impossibile passare alla cartella specificata perché è stato fornito un "
 "percorso non valido."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, fuzzy, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 "Impossibile costruire il nome del file da «%s» e «%s»;\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "Impossibile selezionare «%s»:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Apri posizione"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Salva nella posizione"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Posizione: "
 
@@ -1806,7 +1822,8 @@ msgid "This file system does not support mounting"
 msgstr "Questo file system non supporta operazioni di mount"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "File system"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1909,7 +1926,7 @@ msgstr "Valore _gamma"
 msgid "Error loading icon: %s"
 msgstr "Errore nel caricare l'icona: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1922,7 +1939,7 @@ msgstr ""
 "È possibile recuperarne una copia presso:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Icona «%s» non presente nel tema"
@@ -2010,7 +2027,7 @@ msgstr "(sconosciuto)"
 msgid "clear"
 msgstr "pulisci"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Seleziona tutto"
 
@@ -2447,43 +2464,43 @@ msgstr "Aum_enta ingrandimento"
 msgid "Zoom _Out"
 msgstr "Rid_uci ingrandimento"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "MSD marcatura _sinistra-destra"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "MDS marcatura _destra-sinistra"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "ISD _inserimento sinistra-destra"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "IDS i_nserimento destra-sinistra"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "SSD _sovrascrivi sinistra-destra"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "SDS sovrascrivi destra-sinistra"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "CFD cancella formattazione direzionale"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "SLN spa_zio a larghezza nulla"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "SULN spazio di _unione a larghezza nulla"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "SNULN spazio _non di unione a larghezza nulla"
 
@@ -2566,7 +2583,7 @@ msgstr "Vietnamita (VIQR)"
 msgid "X Input Method"
 msgstr "Metodo di inserimento X"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Impossibile ottenere informazioni per il file «%s»: %s"
diff --git a/po/ja.po b/po/ja.po
index 1777c1f5e4..a12f14a52c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-01-15 21:54+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "ファイル '%s' のオープンに失敗しました: %s"
@@ -32,7 +32,7 @@ msgid "Image file '%s' contains no data"
 msgstr "画像ファイル '%s' にはデータがありません"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1265,20 +1265,20 @@ msgstr "色ホイール"
 msgid "Color Selection"
 msgstr "色の選択"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "全て選択(_A)"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "入力メソッド(_M)"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "Unicode 制御文字の挿入(_I)"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "ファイル名が不正です: %s"
@@ -1287,12 +1287,12 @@ msgstr "ファイル名が不正です: %s"
 msgid "Select A File"
 msgstr "ファイルの選択"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "ホーム"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "デスクトップ"
@@ -1305,241 +1305,257 @@ msgstr "(なし)"
 msgid "Other..."
 msgstr "その他..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "ファイルに関する情報を取得できませんでした"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "ブックマークを追加できませんでした"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "ブックマークを削除できませんでした"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "フォルダを生成できませんでした"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "ファイル名が不正です"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "フォルダの内容を表示できませんでした"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "'%s' の情報を取得できませんでした: %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "フォルダ '%s' をブックマークへ追加します"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "このフォルダをブックマークへ追加します"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "指定したフォルダをブックマークへ追加します"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "ブックマーク '%s' を削除します"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "パス名が正しくないので、'%s' のブックマークを追加できませんでした。"
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "削除(_R)"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "ファイル名の変更(_R)"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "ショートカット"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "フォルダ"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "追加(_A)"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 #, fuzzy
 msgid "Add the selected folder to the Bookmarks"
 msgstr "指定したフォルダを複数のブックマークへ追加します"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "削除(_R)"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "指定したブックマークを削除します"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "アイテムを選択できませんでした"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "パス名が正しくないので、'%s' のブックマークを追加できませんでした。"
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "ショートカットの追加(_A)"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "場所を開く(_L)"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "隠しファイルを表示する(_H)"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "ファイル"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "名前"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "サイズ"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "最終変更日"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "表示するファイルの種類を選択して下さい"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "フォルダの作成(_L)"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "名前(_N):"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "他のフォルダの参照(_B)"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "フォルダの中に保存(_F):"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "フォルダの中に作成(_F):"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "ローカルではないので、フォルダを変更できません"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "ショートカット %s は存在しません"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "ファイル名の変更(_R)"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "%s をマウントできませんでした"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "新しいフォルダの種類"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d バイト"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f Kバイト"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f Mバイト"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f Gバイト"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "不明"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "今日"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "昨日"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "フォルダへ移動できません"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "指定したフォルダのパス名が不正です。"
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "'%s' と '%s' からファイル名を作成できませんでした"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "アイテムを選択できませんでした"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "指定した場所を開きます"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "指定した場所へ保存します"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "場所(_L):"
 
@@ -1738,7 +1754,8 @@ msgid "This file system does not support mounting"
 msgstr "このファイル・システムでは mount をサポートしていません"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "ファイルシステム"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1841,7 +1858,7 @@ msgstr "ガンマ値(_G)"
 msgid "Error loading icon: %s"
 msgstr "アイコンの読み込みでエラー: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1854,7 +1871,7 @@ msgstr ""
 "次からコピーを取得できます:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "テーマの中にアイコン '%s' はありません"
@@ -1942,7 +1959,7 @@ msgstr "(不明)"
 msgid "clear"
 msgstr "クリア"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "全て選択"
 
@@ -2379,43 +2396,43 @@ msgstr "拡大(_I)"
 msgid "Zoom _Out"
 msgstr "縮小(_O)"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM 左→右 Mark(_L)"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM 右→左 Mark(_R)"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE 左→右 Embedding(_E)"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE 右→左 Embedding(_M)"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO 左→右 Override(_O)"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO 右→左 Override(_V)"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF POP Directional Formatting(_P)"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS Zero Width Space(_Z)"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Zero Width Joiner(_J)"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Zero Width Non-Joiner(_N)"
 
@@ -2497,7 +2514,7 @@ msgstr "ベトナム語 (VIQR)"
 msgid "X Input Method"
 msgstr "X 入力メソッド"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "ファイル '%s' の情報を取得できませんでした: %s"
diff --git a/po/ko.po b/po/ko.po
index c358083630..43cb340a9d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-04-16 23:15+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Gnome Korea <gnome-kr-hackers@lists.kldp.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "파일 '%s' 열기 실패 : %s"
@@ -26,7 +26,7 @@ msgid "Image file '%s' contains no data"
 msgstr "그림 파일 '%s'에 데이타가 없습니다"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1266,20 +1266,20 @@ msgstr "색상환"
 msgid "Color Selection"
 msgstr "색 선택"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "모두 선택(_A)"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "입력기(_M)"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "유니코드 제어 문자 넣기(_I)"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "잘못된 파일 이름: %s"
@@ -1289,12 +1289,12 @@ msgstr "잘못된 파일 이름: %s"
 msgid "Select A File"
 msgstr "파일 지우기"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "홈"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "바탕 화면"
@@ -1308,264 +1308,280 @@ msgstr "없음"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr ""
 "%s에 관한 정보를 가져오지 못했습니다:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 #, fuzzy
 msgid "Could not add a bookmark"
 msgstr ""
 "%s에 대한 책갈피를 더하지 못했습니다:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 #, fuzzy
 msgid "Could not remove bookmark"
 msgstr ""
 "%s에 대한 책갈피를 지울 수 없습니다:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "잘못된 파일 이름: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 "%s에 관한 정보를 가져오지 못했습니다:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, fuzzy, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "%s에 대한 책갈피를 더할 수 없습니다 - 경로 이름이 잘못되었습니다."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "지우기(_R)"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "이름 바꿈(_R)"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "폴더"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "더하기(_A)"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "지우기(_R)"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "%s 폴더를 선택할 수 없습니다:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "%s에 대한 책갈피를 더할 수 없습니다 - 경로 이름이 잘못되었습니다."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "위치 열기"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "숨겨진 파일 표시(_H)"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "파일"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "이름"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "크기"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "고쳐짐"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "폴더 만들기(_L)"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "이름(_N):"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "다른 폴더 찾아보기(_B)"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "폴더에 저장(_F):"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "폴더에 만들기(_F):"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 #, fuzzy
 msgid "Cannot change to folder because it is not local"
 msgstr "폴더로 이동할 수 없습니다 - 로컬 폴더가 아닙니다"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "%s 바로 가기가 없습니다"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "이름 바꿈(_R)"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "%s 폴더를 선택할 수 없습니다:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "새 폴더의 이름을 넣으십시오"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d바이트"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "모름"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "오늘"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "어제"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "폴더에 만들기(_F):"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 #, fuzzy
 msgid "The folder you specified is an invalid path."
 msgstr "지정한 폴더로 이동할 수 없습니다 - 경로 이름이 잘못되었습니다."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, fuzzy, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 "'%s'와(과) '%s'(으)로 파일 이름을 만들 수 없습니다:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "%s 폴더를 선택할 수 없습니다:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "위치 열기"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "위치에 저장"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "위치(_L):"
 
@@ -1767,7 +1783,8 @@ msgid "This file system does not support mounting"
 msgstr "이 파일 시스템은 마운트를 지원하지 않습니다"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "파일시스템"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1871,7 +1888,7 @@ msgstr "감마 값(_G)"
 msgid "Error loading icon: %s"
 msgstr "아이콘 읽는 중 오류: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1884,7 +1901,7 @@ msgstr ""
 "다음에서 테마를 구할 수 있습니다:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "테마에 '%s' 아이콘이 없습니다"
@@ -1972,7 +1989,7 @@ msgstr "(모름)"
 msgid "clear"
 msgstr "지움"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "모두 선택"
 
@@ -2408,43 +2425,43 @@ msgstr "확대(_I)"
 msgid "Zoom _Out"
 msgstr "축소(_O)"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM 왼쪽에서-오른쪽으로 표시(_L)"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM 오른쪽에서-왼쪽으로 표시(_R)"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE 왼쪽에서-오른쪽으로 임베딩(_E)"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE 오른쪽에서-왼쪽으로 임베딩(_M)"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO 왼쪽에서-오른쪽으로 번복(_O)"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO 오른쪽에서-왼쪽으로 번복(_V)"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF 방향 형식 팝(pop)하기(_P)"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS 너비 0 공백(_Z)"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ 너비 0 결합(_J)"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ 너비 0 결합 금지(_N)"
 
@@ -2527,7 +2544,7 @@ msgstr "베트남어 (VIQR)"
 msgid "X Input Method"
 msgstr "X 입력기"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "파일 '%s'의 정보를 가져올 수 없습니다: %s"
diff --git a/po/li.po b/po/li.po
index 59be49fc49..f550184ca9 100644
--- a/po/li.po
+++ b/po/li.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2003-05-28 17:57+0000\n"
 "Last-Translator: Mathieu van Woerkom <mathieu.brabants.org>\n"
 "Language-Team: Limburgish <li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Äöpene van besjtandj '%s' mislök: %s"
@@ -25,7 +25,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Aafbiljing '%s' haet gei data"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1300,22 +1300,22 @@ msgstr "Raad"
 msgid "Color Selection"
 msgstr "Booksjtaaftiepseleksie"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 #, fuzzy
 msgid "Select _All"
 msgstr "Alles selektere"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "inveur_metood"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 #, fuzzy
 msgid "_Insert Unicode Control Character"
 msgstr "Unicode kentrolteike _Inveuge "
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, fuzzy, c-format
 msgid "Invalid filename: %s"
 msgstr "Óngeljig XBM-besjtandj"
@@ -1325,13 +1325,13 @@ msgstr "Óngeljig XBM-besjtandj"
 msgid "Select A File"
 msgstr "Besjtandj ewegdoon"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 #, fuzzy
 msgid "Home"
 msgstr "_Heim"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr ""
@@ -1345,261 +1345,277 @@ msgstr "gein"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr "Aafbiljingstiep van besjtandj '%s' neet herkènd"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Óngeljig XBM-besjtandj"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Aafbiljingstiep van besjtandj '%s' neet herkènd"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Ewegdoon"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Herneume"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 #, fuzzy
 msgid "Folder"
 msgstr "Mappe"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Toeveuge"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Ewegdoon"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "Faeler bie 't make van map \"%s\": %s\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "_Selektie: "
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Besjtenj"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 #, fuzzy
 msgid "Name"
 msgstr "Kleur_naam:"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Aafmaeting"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 #, fuzzy
 msgid "Modified"
 msgstr "Modus"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "Nuuj map"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 #, fuzzy
 msgid "_Name:"
 msgstr "Kleur_naam:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 #, fuzzy
 msgid "Save in _folder:"
 msgstr "Nuuj map"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 #, fuzzy
 msgid "Create in _folder:"
 msgstr "Nuuj map"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Herneume"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "Faeler bie 't make van map \"%s\": %s\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 #, fuzzy
 msgid "Unknown"
 msgstr "(ónbekènd)"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 #, fuzzy
 msgid "Today"
 msgstr "Modaal"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Nuuj map"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "Faeler bie 't make van map \"%s\": %s\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "_Selektie: "
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 #, fuzzy
 msgid "_Location:"
 msgstr "_Selektie: "
@@ -1809,7 +1825,7 @@ msgstr ""
 
 #: gtk/gtkfilesystemunix.c:639
 #, fuzzy
-msgid "Filesystem"
+msgid "File System"
 msgstr "Besjtenj"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1910,7 +1926,7 @@ msgstr "_Gammawaerd"
 msgid "Error loading icon: %s"
 msgstr "Faeler bie laje van piktogram: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1919,7 +1935,7 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr ""
@@ -2008,7 +2024,7 @@ msgstr "(ónbekènd)"
 msgid "clear"
 msgstr "wösje"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Alles selektere"
 
@@ -2445,43 +2461,43 @@ msgstr "Zoom _In"
 msgid "Zoom _Out"
 msgstr "Zoom _Oet"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM links-nao-rechs markering"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM rechs-nao-links markering"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Links-nao-rechs _inbèdding"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE rechs-nao-links i_nbèdding"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Links-nao-rechs óngeda_on make"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO rechs-nao-links óngedaon mak_e"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Pop richtingsformattering"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS Sjpasie zónger breide"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ koppelaar zónger breide"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ neet-koppelaar zónger breide"
 
@@ -2564,7 +2580,7 @@ msgstr "Viëtnamees (VIQR)"
 msgid "X Input Method"
 msgstr "X inveur-metood"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, fuzzy, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Aafbiljingstiep van besjtandj '%s' neet herkènd"
diff --git a/po/lt.po b/po/lt.po
index f360ddcd68..9a7a54a064 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-12-31 22:00+0200\n"
 "Last-Translator: Žygimantas Beručka <uid0@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Nepavyko atidaryti bylos „%s“: %s"
@@ -30,7 +30,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Paveikslėlio byloje „%s“ nėra duomenų"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1267,20 +1267,20 @@ msgstr "Spalvų ratas"
 msgid "Color Selection"
 msgstr "Spalvos pasirinkimas"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "P_ažymėti viską"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Įvesties _metodai"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "Įterpt_i Unicode valdymo simbolį"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Netinkamas bylos vardas: %s"
@@ -1290,12 +1290,12 @@ msgstr "Netinkamas bylos vardas: %s"
 msgid "Select A File"
 msgstr "Pasirinkite bylą"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Namai"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Darbastalis"
@@ -1308,184 +1308,200 @@ msgstr "(Joks)"
 msgid "Other..."
 msgstr "Kita..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Nepavyko gauti informacijos apie šią bylą"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Nepavyko pridėti žymelės"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Nepavyko pašalinti žymelės"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Nepavyko sukurti aplanko"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Netinkamas bylos vardas"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Nepavyko parodyti aplanko turinio"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Nepavyko gauti bylos „%s“ informacijos: %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Įdėti aplanką „%s“ į žymeles"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Įdėti esamą aplanką į žymeles"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Įdėti pažymėtus aplankus į žymeles"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Pašalinti žymelę „%s“"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "Nepavyko įdėti %s žymelės, nes nurodytas kelias yra netinkamas."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Pašalinti"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "Pe_rvardinti"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Nuorodos"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Aplankas"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Pridėti"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 #, fuzzy
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Įdėti pažymėtą aplanką į žymeles"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Pašalinti"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Pašalinti pažymėtas žymeles"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Nepavyko pasirinkti elemento"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "Nepavyko įdėti %s žymelės, nes nurodytas kelias yra netinkamas."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "Į_dėti į nuorodas"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "Atidaryti vietą"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Rod_yti paslėptas bylas"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Bylos"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Dydis"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Pakeista"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Pasirinkite kokių tipų bylas rodyti"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Sukurti ap_lanką"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Pavadinimas:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Naršyti kitų aplankų"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Išsaugoti _aplanke:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Sukurti _aplanke:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Negalima pakeisti į nurodytą aplanką, nes jis nėra vietinis"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Nuoroda %s neegzistuoja"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "Pe_rvardinti"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Nepavyko prijungti %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Naujo aplanko tipo pavadinimas"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
@@ -1493,59 +1509,59 @@ msgstr[0] "%d baitas"
 msgstr[1] "%d baitai"
 msgstr[2] "%d baitų"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Nežinomas"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Šiandien"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Vakar"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Nepavyko pakeisti aplanko"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Kelias iki nurodyto aplanko yra neteisingas."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Nepavyko suformuoti bylos vardo iš „%s“ ir „%s“"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Nepavyko pasirinkti elemento"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Atidaryti vietą"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Išsaugoti vietoje"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Vieta: "
 
@@ -1745,7 +1761,8 @@ msgid "This file system does not support mounting"
 msgstr "Ši bylų sistema nepalaiko prijungimo"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Bylų sistema"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1848,7 +1865,7 @@ msgstr "_Gamos reikšmė"
 msgid "Error loading icon: %s"
 msgstr "Įvyko klaida įkeliant piktogramą: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1861,7 +1878,7 @@ msgstr ""
 "Jūs galite gauti kopiją:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Piktogramos „%s“ temoje nėra"
@@ -1949,7 +1966,7 @@ msgstr "(nežinomas)"
 msgid "clear"
 msgstr "išvalyti"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Pažymėti viską"
 
@@ -2387,43 +2404,43 @@ msgstr "Pa_didinti"
 msgid "Zoom _Out"
 msgstr "Su_mažinti"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "_LRM Žymė iš kairės į dešinę"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "_RLM Žymė iš dešinės į kairę"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Iš-kairės-į-d_ešinę integruotas"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Iš-dešinės-į-kairę i_ntegruotas"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Iš-kairės-į-dešinę _atšaukiantis"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Iš-dešinės-į-kairę a_tšaukiantis"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Pop kryptingas formatavimas"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS N_ulinio pločio tarpas"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Nulinio pločio _jungtis"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Nulinio pločio _ne-jungtis"
 
@@ -2505,7 +2522,7 @@ msgstr "Vietnamiečių (VIQR)"
 msgid "X Input Method"
 msgstr "X įvesties metodas"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Nepavyko gauti bylos „%s“ informacijos: %s"
diff --git a/po/lv.po b/po/lv.po
index b26a428952..409618bd7d 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2002-12-19 16:10+0200\n"
 "Last-Translator: Artis Trops <hornet@navigator.lv>\n"
 "Language-Team: Latvian <ll10nt@os.lv>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Neizdevās atvērt failu '%s': %s"
@@ -26,7 +26,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Attēla fails '%s' nesatur datus"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1291,22 +1291,22 @@ msgstr "Ritentiņš"
 msgid "Color Selection"
 msgstr "Fonta Izvēle"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 #, fuzzy
 msgid "Select _All"
 msgstr "Izvēlēties Visu"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Ievades _Metodes"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 #, fuzzy
 msgid "_Insert Unicode Control Character"
 msgstr "_Ievietot Unicdoe kontroles rakstzīmi"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, fuzzy, c-format
 msgid "Invalid filename: %s"
 msgstr "Nepareizs XBM fails"
@@ -1316,13 +1316,13 @@ msgstr "Nepareizs XBM fails"
 msgid "Select A File"
 msgstr "Dzēst Failu"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 #, fuzzy
 msgid "Home"
 msgstr "_Mājas"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr ""
@@ -1336,261 +1336,277 @@ msgstr "nekas"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr "Nespēju atpazīt attēla faila formātu failam '%s'"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Nepareizs XBM fails"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Nespēju atpazīt attēla faila formātu failam '%s'"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Izņemt"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Pārsaukt"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 #, fuzzy
 msgid "Folder"
 msgstr "Mapes"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Pievienot"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Izņemt"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "Kļūda veidojot mapi \"%s\" : %s\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "_Izvēle: "
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Faili"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 #, fuzzy
 msgid "Name"
 msgstr "Krāsas _Nosaukums:"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Izmērs"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 #, fuzzy
 msgid "Modified"
 msgstr "Režīms"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "Jauna Mape"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 #, fuzzy
 msgid "_Name:"
 msgstr "Krāsas _Nosaukums:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 #, fuzzy
 msgid "Save in _folder:"
 msgstr "Jauna Mape"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 #, fuzzy
 msgid "Create in _folder:"
 msgstr "Jauna Mape"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Pārsaukt"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "Kļūda veidojot mapi \"%s\" : %s\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 #, fuzzy
 msgid "Unknown"
 msgstr "(nezināms)"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 #, fuzzy
 msgid "Today"
 msgstr "Modāls"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Jauna Mape"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "Kļūda veidojot mapi \"%s\" : %s\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "_Izvēle: "
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 #, fuzzy
 msgid "_Location:"
 msgstr "_Izvēle: "
@@ -1795,7 +1811,7 @@ msgstr ""
 
 #: gtk/gtkfilesystemunix.c:639
 #, fuzzy
-msgid "Filesystem"
+msgid "File System"
 msgstr "Faili"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1896,7 +1912,7 @@ msgstr "_Gamma vērtība"
 msgid "Error loading icon: %s"
 msgstr "Kļūda ielādējot ikonu: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1905,7 +1921,7 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr ""
@@ -1995,7 +2011,7 @@ msgstr "(nezināms)"
 msgid "clear"
 msgstr "tīrs"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Izvēlēties Visu"
 
@@ -2432,43 +2448,43 @@ msgstr "_Palielināt"
 msgid "Zoom _Out"
 msgstr "_Samazināt"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "KLA No-_kreisās-uz-labo atzīme"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "LKA No-_labās-uz-kreiso atzīme"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "KLI No-kreisās-uz-labo ieda_rināšana"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "LKI No-labās-uz-kreiso ie_darināšana"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "KLN No-kreisās-uz-labo _neievērošana"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "LKN No-labās-uz-kreiso neie_vērošana"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Pop virziena formatēšana"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "NPA N_ulles platuma atstarpe"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "NPS Nulles paltuma _savienotājs"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "NPNS Nulles paltuma nesa_vienotājs"
 
@@ -2551,7 +2567,7 @@ msgstr "Vjetnamiešu (VIQR)"
 msgid "X Input Method"
 msgstr "X Ievades Metode"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, fuzzy, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Nespēju atpazīt attēla faila formātu failam '%s'"
diff --git a/po/mi.po b/po/mi.po
index 122b458a4b..cd095dd73e 100644
--- a/po/mi.po
+++ b/po/mi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.3.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-01-27 07:36+1300\n"
 "Last-Translator: Wesley Parish <wes.parish@paradise.net.nz>\n"
 "Language-Team: GNOME Māori Team <maori@nzlinux.org.nz>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Kua hinga kia huaki i te puarahi '%s': %s"
@@ -27,7 +27,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Kaore etahi mohiotanga i te puarahi a te whakaahua '%s'"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1245,20 +1245,20 @@ msgstr "Porohita"
 msgid "Color Selection"
 msgstr "Mea whiriwhiri a te atanga"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Whiriwhiria katoa"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "He pehea puru mohiotanga"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr ""
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Ko koretake te ingoa a te puarahi: %s"
@@ -1268,12 +1268,12 @@ msgstr "Ko koretake te ingoa a te puarahi: %s"
 msgid "Select A File"
 msgstr "Whakangaroa puarahi"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Kainga"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Tepu mahi"
@@ -1287,256 +1287,272 @@ msgstr "koretahi"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 #, fuzzy
 msgid "Could not add a bookmark"
 msgstr ""
 "Kaore e taea e hono i te tohu pukapuka mo %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 #, fuzzy
 msgid "Could not remove bookmark"
 msgstr ""
 "Kaore e taea e nukunuku i te tohu pukapuka mo %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Ko koretake te ingoa a te puarahi: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "He riro i mohiotanga mo '%s': %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, fuzzy, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Kaore e taea e hono i te tohu pukapuka no te mea he ingoa koretake a te %s"
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Nukunuku"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "Huaina hou"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Kōpaki"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Hono"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Nukunuku"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Mea whiriwhiri a te atanga"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "Kaore e taea e hono i te tohu pukapuka no te mea he ingoa koretake a te %s"
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "_Wāhi:"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "He puarahi"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Ingoa"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Rahi"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Kua whakarereketia"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "Hanga he _Kōpaki"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Ingoa:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Pupuri i roto te _kōpaki:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Hanga i roto te _kōpaki:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 #, fuzzy
 msgid "Cannot change to folder because it is not local"
 msgstr "Kaore e taea e hono i te tohu pukapuka %s no te mea ehara kopaki"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "ehara te  %s"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "Huaina hou"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr "Kaore e taea te toenga e pupuri"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Patopato te ingoa a te kopaki hou"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Ehara mohiotia"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Inaianei"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Inanahi"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Hanga i roto te _kōpaki:"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, fuzzy, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 "kaore e taea e hanga i te ingoa a te puarahi mai '%s' me '%s':\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr "Mea whiriwhiri a te atanga"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "_Wāhi:"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Wāhi:"
 
@@ -1731,7 +1747,8 @@ msgid "This file system does not support mounting"
 msgstr "Kaore te  puarahi nei i te tautoko "
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr " puarahi"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1834,7 +1851,7 @@ msgstr ""
 msgid "Error loading icon: %s"
 msgstr "He utaina pakoko: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, fuzzy, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1843,7 +1860,7 @@ msgid ""
 "\t%s"
 msgstr "Kaore te pakoko '%s' i te kitea.  '%s' %s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Kaore te pakoko '%s' kei te "
@@ -1931,7 +1948,7 @@ msgstr "koremohiotia"
 msgid "clear"
 msgstr "whakawātea"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Whiriwhiria katoa"
 
@@ -2367,43 +2384,43 @@ msgstr "Tere _Roto"
 msgid "Zoom _Out"
 msgstr "Tere _Waho"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM Maui-ki-Katau pou rahui"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM Katau-ki-Maui pou rahui"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Maui-ki-Katau whakawhaiti"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Katau-ki-Maui whakawhaiti"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Maui-ki-Katau tahuri"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Katau-ki-Maui tahuri"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr ""
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr ""
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr ""
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr ""
 
@@ -2485,7 +2502,7 @@ msgstr ""
 msgid "X Input Method"
 msgstr "Pehea puru mohiotanga X"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr ""
diff --git a/po/mk.po b/po/mk.po
index 55a31c17a4..349a8d4b13 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -9,16 +9,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-07-14 10:34+0200\n"
 "Last-Translator: Tomislav Markovski <herrera@users.sourceforge.net>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Не успеав да ја отворам датотеката '%s': %s"
@@ -29,12 +29,13 @@ msgid "Image file '%s' contains no data"
 msgstr "Датотеката слика '%s' не содржи податоци"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
-"Не успеав да ја вчитам сликата '%s': причината не е позната, најверојатно се работи за расипана слика"
+"Не успеав да ја вчитам сликата '%s': причината не е позната, најверојатно се "
+"работи за расипана слика"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:241
 #, c-format
@@ -107,8 +108,8 @@ msgid ""
 "Failed to close '%s' while writing image, all data may not have been saved: %"
 "s"
 msgstr ""
-"Не успеав да го затворам '%s' додека ја снимав сликата, можно е да не се зачувани сите податоци: %"
-"s"
+"Не успеав да го затворам '%s' додека ја снимав сликата, можно е да не се "
+"зачувани сите податоци: %s"
 
 #: gdk-pixbuf/gdk-pixbuf-io.c:1952 gdk-pixbuf/gdk-pixbuf-io.c:2002
 msgid "Insufficient memory to save image into a buffer"
@@ -141,7 +142,9 @@ msgstr ""
 #: gdk-pixbuf/gdk-pixdata.c:431
 #, c-format
 msgid "failed to allocate image buffer of %u byte"
-msgstr ""
+msgid_plural "failed to allocate image buffer of %u bytes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: gdk-pixbuf/io-ani.c:244
 msgid "Unexpected icon chunk in animation"
@@ -319,8 +322,8 @@ msgid ""
 "Insufficient memory to load image, try exiting some applications to free "
 "memory"
 msgstr ""
-"Недоволно меморија за да се вчита сликата, пробајте да исклучите некои "
-"од апликациите за да ослободите меморија"
+"Недоволно меморија за да се вчита сликата, пробајте да исклучите некои од "
+"апликациите за да ослободите меморија"
 
 #: gdk-pixbuf/io-jpeg.c:383 gdk-pixbuf/io-jpeg.c:749
 #, c-format
@@ -414,7 +417,8 @@ msgstr ""
 
 #: gdk-pixbuf/io-png.c:162
 msgid "Transformed PNG has unsupported number of channels, must be 3 or 4."
-msgstr "Трансформираната PNG содржи неподдржани канали, мораат да биде 3 или 4."
+msgstr ""
+"Трансформираната PNG содржи неподдржани канали, мораат да биде 3 или 4."
 
 #: gdk-pixbuf/io-png.c:183
 #, c-format
@@ -1224,20 +1228,20 @@ msgstr "Тркало со бои"
 msgid "Color Selection"
 msgstr "Избор на боја"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Избери _сѐ"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Методи за запис"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr ""
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Невалидно име на датотека: %s"
@@ -1246,12 +1250,12 @@ msgstr "Невалидно име на датотека: %s"
 msgid "Select A File"
 msgstr "Изберете датотека"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Дома"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Работна површина"
@@ -1264,235 +1268,253 @@ msgstr "(Ништо)"
 msgid "Other..."
 msgstr "Друго..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Не можам да добијам информации за датотеката"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Не можам да додадам обележувач"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Не можам да го отстранам обележувачот"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Папката не може да биде креирана"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Невалидно име на датотека"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Отстрани го обележувачот: '%s'"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Отстрани"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Реименувај..."
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Кратенки"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Папка"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Додај"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Додај ја избраната папка во обележувачите"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Отстрани"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Отстранете го избраниот обележувач"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 msgid "Could not select file"
 msgstr "Не можам да ја одберам датотеката"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "_Додај обележувачи"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Отвори _локација"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Покажи _скриени датотеки"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Датотеки"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Име"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Големина"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Променето"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Креирај па_пка"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Име:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Разгледај други папки"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Зачувај во _папка:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Креирај во _папка:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Кратенката %s не постои"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Реименувај"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Не можам да монтирам %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Внесете име за новата папка"
 
-#: gtk/gtkfilechooserdefault.c:6552
-#, c-format
+#: gtk/gtkfilechooserdefault.c:6783
+#, fuzzy, c-format
 msgid "%d byte"
-msgstr "%d бајт"
+msgid_plural "%d bytes"
+msgstr[0] "%d бајт"
+msgstr[1] "%d бајт"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Непознато"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Денес"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Вчера"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Не можам да сменам папка"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Не можам да изберам предмет"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Отвори локација"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Зачувај на локација"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Локација:"
 
@@ -1572,7 +1594,8 @@ msgstr "С_оздади"
 #: gtk/gtkfilesel.c:1565
 #, c-format
 msgid "The filename \"%s\" contains symbols that are not allowed in filenames"
-msgstr "Датотеката \"%s\" содржи симболи кои што не се дозволени во име на датотека"
+msgstr ""
+"Датотеката \"%s\" содржи симболи кои што не се дозволени во име на датотека"
 
 #: gtk/gtkfilesel.c:1568
 #, c-format
@@ -1686,7 +1709,8 @@ msgid "This file system does not support mounting"
 msgstr ""
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Датотечен систем"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1787,7 +1811,7 @@ msgstr "_Вредност за гама"
 msgid "Error loading icon: %s"
 msgstr "Грешка при вчитувањето на иконата: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1796,7 +1820,7 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr ""
@@ -1884,7 +1908,7 @@ msgstr "(непознато)"
 msgid "clear"
 msgstr ""
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Избери ги Сите"
 
@@ -2310,43 +2334,43 @@ msgstr "Зумирај"
 msgid "Zoom _Out"
 msgstr "Одзумирај"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM _Left-to-right mark"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM _Right-to-left mark"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Left-to-right _embedding"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Right-to-left e_mbedding"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Left-to-right _override"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Right-to-left o_verride"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr ""
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr ""
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr ""
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr ""
 
@@ -2428,7 +2452,7 @@ msgstr "Vietnamese (VIQR)"
 msgid "X Input Method"
 msgstr "Метод на запис за X"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Не можам да добијам информација за датотеката '%s': %s"
diff --git a/po/ml.po b/po/ml.po
index fce276abeb..3e23f9cc95 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:gtk+.gtk-2-2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2003-07-05 10:29+0530\n"
 "Last-Translator: FSF-India <locale@gnu.org.in>\n"
 "Language-Team: Malayalam <locale@gnu.org.in>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "%s തുറക്കുന്നതില്‌ പരാജയം : %s"
@@ -27,7 +27,7 @@ msgid "Image file '%s' contains no data"
 msgstr "ഛായാശേഖരം %sല്‌ വസ്തുതകള്‌ ഒന്നും ഇല്ല"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1256,21 +1256,21 @@ msgstr "ചക്രം"
 msgid "Color Selection"
 msgstr "അക്ഷരരൂപം തെരഞ്ഞെടുക്കല്"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 #, fuzzy
 msgid "Select _All"
 msgstr "എല്ലാം തെരഞ്ഞെടുക്കുക"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "നിവേശക രീതി"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr ""
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, fuzzy, c-format
 msgid "Invalid filename: %s"
 msgstr "അസാധുവായ XBM ശേഖരം"
@@ -1280,13 +1280,13 @@ msgstr "അസാധുവായ XBM ശേഖരം"
 msgid "Select A File"
 msgstr "രചന നീക്കംചെയ്യ‍ുക"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 #, fuzzy
 msgid "Home"
 msgstr "ആസ്ഥാനം"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr ""
@@ -1300,261 +1300,277 @@ msgstr "ഒന്നും"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr "തിരിച്ചറിയാനാവത്ത ഛായവിവരശേഖര രീതി %s"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "അസാധുവായ XBM ശേഖരം"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "തിരിച്ചറിയാനാവത്ത ഛായവിവരശേഖര രീതി %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "നീക്കുക"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "പേര‍് മാറ്റുക"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 #, fuzzy
 msgid "Folder"
 msgstr "കൂടുകള്"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "ചേര്ക്കുക"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "നീക്കുക"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "കൂട് നി‌‌‌ര്മ്മിക്കുന്നതില്‌ തെറ്റ് \"%s\": %s\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "തെരഞ്ഞെടുക്കുക:"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "രചനകള്"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 #, fuzzy
 msgid "Name"
 msgstr "നിറത്തിന്റെ പേര‍്:"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "വലിപ്പം"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 #, fuzzy
 msgid "Modified"
 msgstr "രീതി"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "പുതിയ കൂട്"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 #, fuzzy
 msgid "_Name:"
 msgstr "നിറത്തിന്റെ പേര‍്:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 #, fuzzy
 msgid "Save in _folder:"
 msgstr "പുതിയ കൂട്"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 #, fuzzy
 msgid "Create in _folder:"
 msgstr "പുതിയ കൂട്"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "പേര‍് മാറ്റുക"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "കൂട് നി‌‌‌ര്മ്മിക്കുന്നതില്‌ തെറ്റ് \"%s\": %s\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 #, fuzzy
 msgid "Unknown"
 msgstr "(അറിയാത്ത)"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 #, fuzzy
 msgid "Today"
 msgstr "മാതൃക"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "പുതിയ കൂട്"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "കൂട് നി‌‌‌ര്മ്മിക്കുന്നതില്‌ തെറ്റ് \"%s\": %s\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "തെരഞ്ഞെടുക്കുക:"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 #, fuzzy
 msgid "_Location:"
 msgstr "തെരഞ്ഞെടുക്കുക:"
@@ -1751,7 +1767,7 @@ msgstr ""
 
 #: gtk/gtkfilesystemunix.c:639
 #, fuzzy
-msgid "Filesystem"
+msgid "File System"
 msgstr "രചനകള്"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1852,7 +1868,7 @@ msgstr "ഗാമാ മൂല്യം"
 msgid "Error loading icon: %s"
 msgstr "സൂചകം നിറയ‌്ക്കുന്നതില്‌ പരാജയം : %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1861,7 +1877,7 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr ""
@@ -1950,7 +1966,7 @@ msgstr "(അറിയാത്ത)"
 msgid "clear"
 msgstr "വൃത്തിയാക്കല്"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "എല്ലാം തെരഞ്ഞെടുക്കുക"
 
@@ -2387,43 +2403,43 @@ msgstr "വലുതാക്കുക"
 msgid "Zoom _Out"
 msgstr "ചെറുതാക്കുക"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr ""
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr ""
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr ""
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr ""
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr ""
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr ""
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr ""
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr ""
 
@@ -2506,7 +2522,7 @@ msgstr "വിയറ്റ്നാമീസ് (VIQR)"
 msgid "X Input Method"
 msgstr "X നിവേശക രീതി"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, fuzzy, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "തിരിച്ചറിയാനാവത്ത ഛായവിവരശേഖര രീതി %s"
diff --git a/po/mn.po b/po/mn.po
index e5186dc86b..3914421f47 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-03-17 17:16+0100\n"
 "Last-Translator: Sanlig Badral <badral@openmn.org>\n"
 "Language-Team: Mongolian <openmn-gnome@lists.sf.net>\n"
@@ -22,7 +22,7 @@ msgstr ""
 
 # gdk-pixbuf/gdk-pixbuf-animation.c:144 gdk-pixbuf/gdk-pixbuf-io.c:581
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "\"%s\" файл нээгдсэнгүй: %s"
@@ -34,7 +34,7 @@ msgid "Image file '%s' contains no data"
 msgstr "\"%s\" зургийн файл өгөгдөл агуулаагүй"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1450,23 +1450,23 @@ msgid "Color Selection"
 msgstr "Өнгө сонголт"
 
 # gtk/gtkentry.c:3850 gtk/gtklabel.c:3164
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "_Бүгдийг сонгох"
 
 # gtk/gtktextview.c:6366
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Оролт_Арга"
 
 # gtk/gtkentry.c:3870 gtk/gtktextview.c:6375
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "Удирдлагын Unicode тэмдэгт _оруулах"
 
 # gdk-pixbuf/io-xbm.c:283
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Буруу файлын нэр: %s"
@@ -1478,12 +1478,12 @@ msgid "Select A File"
 msgstr "Файл устгах"
 
 # gtk/gtkstock.c:299
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Гэр"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Ажлын тавцан"
@@ -1498,283 +1498,300 @@ msgstr "байхгүй"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr ""
 "%s-н тухай мэдээлэл өгөгдөх боломжгүй:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 #, fuzzy
 msgid "Could not add a bookmark"
 msgstr ""
 "%s-н хувьд хавчуур нэмэгдэх боломжгүй:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 #, fuzzy
 msgid "Could not remove bookmark"
 msgstr ""
 "%s-н хувьд лавлах устгах боломжгүй:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
 # gdk-pixbuf/io-xbm.c:283
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Буруу файлын нэр: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 "%s-н тухай мэдээлэл өгөгдөх боломжгүй:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, fuzzy, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "%s-н хувьд хавчуурга нэмэгдэх боломжгүй.Учир нь зам хүчингүй байна"
 
 # gtk/gtkstock.c:319
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Устга"
 
 # gtk/gtkfilesel.c:1712
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Сольж нэрлэх"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
 # gtk/gtkfilesel.c:707
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Хавтас"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Нэм"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
 # gtk/gtkstock.c:319
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Арилгах"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "%s-г тэмдэглэж чадсангүй:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "%s-н хувьд хавчуурга нэмэгдэх боломжгүй.Учир нь зам хүчингүй байна"
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "Байршил нээх"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
 # gtk/gtkfilesel.c:742
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Файлууд"
 
 # gtk/gtkcolorsel.c:1858
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Нэр"
 
 # gtk/gtkfontsel.c:333
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Хэмжээ"
 
 # gtk/gtksizegroup.c:242
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Өөрчлөгдсөн"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 # gtk/gtkfilesel.c:1403
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "_Хавтас үүсгэх"
 
 # gtk/gtkcolorsel.c:1858
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Нэр:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "Бусад лавлахуудыг _нэгжих"
 
 # gtk/gtkfilesel.c:1403
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "_Хавтас дотор хадгалах:"
 
 # gtk/gtkfilesel.c:1403
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "_Хавтас дотор үүсгэх:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 #, fuzzy
 msgid "Cannot change to folder because it is not local"
 msgstr "Хавтас руу очих боломжгүй.Учир нь өгсөн зам дотоод зам биш байна"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "%s богино тушаал алга"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+# gtk/gtkfilesel.c:1712
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Сольж нэрлэх"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "%s-г тэмдэглэж чадсангүй:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Шинэ хавтасын нэрийг бич"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d байт"
 msgstr[1] "%d байт"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f К"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f М"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f Г"
 
 # gtk/gtkinputdialog.c:582
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Тодорхойгүй"
 
 # gtk/gtkwindow.c:449
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Өнөөдөр"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Өчигдар"
 
 # gtk/gtkfilesel.c:1403
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "_Хавтас дотор үүсгэх:"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 #, fuzzy
 msgid "The folder you specified is an invalid path."
 msgstr "Хавтас руу очих боломжгүй.Учир нь өгсөн зам хүчингүй байна"
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, fuzzy, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 "'%s' ба '%s'-с файлын нэр үүсгэх боломжгүй:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "%s-г тэмдэглэж чадсангүй:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Байршил нээх"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "Байршил нээх"
 
 # gtk/gtkfilesel.c:2103
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Байршил:"
 
@@ -2007,7 +2024,8 @@ msgstr "Энэ файлын систем залгахыг дэмжээгүй б�
 
 # gtk/gtkfilesel.c:742
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Файл систем"
 
 # gdk-pixbuf/gdk-pixbuf-io.c:538
@@ -2120,7 +2138,7 @@ msgstr "_Гамма утга"
 msgid "Error loading icon: %s"
 msgstr "Дүрслэл дуудахад алдаа гарлаа: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -2133,7 +2151,7 @@ msgstr ""
 "Та дараахаас хуулж авч болно:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "'%s' эмблем хэлбэрт дүрслэгдэхгүй"
@@ -2242,7 +2260,7 @@ msgid "clear"
 msgstr "цэвэрлэх"
 
 # gtk/gtkentry.c:3850 gtk/gtklabel.c:3164
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Бүгдийг сонгох"
 
@@ -2740,43 +2758,43 @@ msgstr "Масштаб _томруулах"
 msgid "Zoom _Out"
 msgstr "Масштаб жижигрүүлэх"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM Зүүнээс баруун тийш тэмдэглэх"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM Баруунаас зүүн тийш тэмдэглэх"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Зүүнээс баруун тийш _шигтгэх"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Баруунаас зүүн тийш _шигтгэх"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Зүүнээс баруун тийш _дарах"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Баруунаас зүүн тийш дарах"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Босоогоор байрлуулах"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _Тэг өргөнт зай"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Тэг өргөнт нэгтгэгч"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Тэг өргөнт салгагч"
 
@@ -2866,7 +2884,7 @@ msgid "X Input Method"
 msgstr "Х оролтын тогтолцоо"
 
 # gdk-pixbuf/gdk-pixbuf-io.c:538
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "\"%s\" файлын мэдээлэл авагдахгүй байна: %s"
diff --git a/po/mr.po b/po/mr.po
index 4db4b9fe87..8be956a89c 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+.mr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-03-13 14:59+0530\n"
 "Last-Translator: Jitendra Shah <jitendras@vsnl.com>\n"
 "Language-Team:  Marathi <www.indictrans.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 
 # gdk-pixbuf/gdk-pixbuf-animation.c:144 gdk-pixbuf/gdk-pixbuf-io.c:581
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "'%1s' फाइल उघडण्यात असफल: %2s"
@@ -31,7 +31,7 @@ msgstr "प्रतिमा फाइल '%s' मध्ये कोणती�
 
 # gdk-pixbuf/gdk-pixbuf-animation.c:205 gdk-pixbuf/gdk-pixbuf-io.c:636
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1473,25 +1473,25 @@ msgid "Color Selection"
 msgstr "फोन्ट निवडणे"
 
 # gtk/gtkentry.c:3850 gtk/gtklabel.c:3164
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 #, fuzzy
 msgid "Select _All"
 msgstr "सर्व निवडा"
 
 # gtk/gtktextview.c:6366
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "माहीती गोळा करण्याच्या पध्दत्ती"
 
 # gtk/gtkentry.c:3870 gtk/gtktextview.c:6375
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 #, fuzzy
 msgid "_Insert Unicode Control Character"
 msgstr "यूनिकोड नियंत्रण अक्षर सुरू करा"
 
 # gdk-pixbuf/io-xbm.c:283
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, fuzzy, c-format
 msgid "Invalid filename: %s"
 msgstr "अवैध XBM फाइल"
@@ -1503,13 +1503,13 @@ msgid "Select A File"
 msgstr "निवडण्याजोगे"
 
 # gtk/gtkstock.c:299
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 #, fuzzy
 msgid "Home"
 msgstr "घर(_H)"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr ""
@@ -1525,284 +1525,301 @@ msgid "Other..."
 msgstr ""
 
 # gdk-pixbuf/gdk-pixbuf-io.c:538
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr "फाइल '%s' कोणत्या प्रकारची फाइल आहे ते उमगले नाही"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr ""
 
 # gtk/gtkcellrenderertoggle.c:140
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 #, fuzzy
 msgid "The folder could not be created"
 msgstr "हे बटन कार्यान्वित करता येते"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
 # gdk-pixbuf/io-xbm.c:283
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "अवैध XBM फाइल"
 
 # gtk/gtkentry.c:456
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 #, fuzzy
 msgid "The folder contents could not be displayed"
 msgstr "मजकुरातील नोंदी संपादित किंवा सुधारणा करता येतील का"
 
 # gdk-pixbuf/gdk-pixbuf-io.c:538
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "फाइल '%s' कोणत्या प्रकारची फाइल आहे ते उमगले नाही"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 
 # gtk/gtkstock.c:319
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "हटवा(_R)"
 
 # gtk/gtkfilesel.c:1712
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "नाव बदला"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
 # gtk/gtkfilesel.c:707
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 #, fuzzy
 msgid "Folder"
 msgstr "फोल्डर्स"
 
 # gtk/gtkstock.c:275
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "जोडा(_A)"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
 # gtk/gtkstock.c:319
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "हटवा(_R)"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
 # gtk/gtkfontsel.c:1253
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "फोन्ट निवडणे"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
 # gtk/gtkprogressbar.c:139 gtk/gtktoolbar.c:224
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "कल"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
 # gtk/gtkfilesel.c:742
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "फाइली"
 
 # gtk/gtksettings.c:215
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 #, fuzzy
 msgid "Name"
 msgstr "फोन्टचे नाव"
 
 # gtk/gtkfontsel.c:333
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 #, fuzzy
 msgid "Size"
 msgstr "आकार(_z):"
 
 # gtk/gtksizegroup.c:242
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 #, fuzzy
 msgid "Modified"
 msgstr "मोड (रूप)"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 # gtk/gtkfilesel.c:1403
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "नवीन फोल्डर"
 
 # gtk/gtkcolorsel.c:1858
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 #, fuzzy
 msgid "_Name:"
 msgstr "रंगाचे नाव(_N):"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr ""
 
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+# gtk/gtkfilesel.c:1712
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "नाव बदला"
+
 # gdk-pixbuf/io-wbmp.c:366
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr "उर्वरीत (माहीती) साठवता येऊ शकली नाही "
 
 # gtk/gtkwidget.c:391
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 #, fuzzy
 msgid "Type name of new folder"
 msgstr "विडगेटचे नाव"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr ""
 
 # gtk/gtkinputdialog.c:582
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 #, fuzzy
 msgid "Unknown"
 msgstr "(अनोळखी)"
 
 # gtk/gtkwindow.c:449
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 #, fuzzy
 msgid "Today"
 msgstr "पध्दतविषयक"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr ""
 
 # gtk/gtkmenu.c:260
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "वेगकारके बदलले जाऊ शकतात का"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 
 # gtk/gtkfontsel.c:1253
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr "फोन्ट निवडणे"
 
 # gtk/gtkprogressbar.c:139 gtk/gtktoolbar.c:224
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 #, fuzzy
 msgid "Open Location"
 msgstr "कल"
 
 # gtk/gtkprogressbar.c:139 gtk/gtktoolbar.c:224
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "कल"
 
 # gtk/gtkcolorsel.c:1823
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 #, fuzzy
 msgid "_Location:"
 msgstr "संर्पुक्तता(_S):"
@@ -2039,7 +2056,7 @@ msgstr ""
 # gtk/gtkfilesel.c:742
 #: gtk/gtkfilesystemunix.c:639
 #, fuzzy
-msgid "Filesystem"
+msgid "File System"
 msgstr "फाइली"
 
 # gdk-pixbuf/gdk-pixbuf-io.c:538
@@ -2153,7 +2170,7 @@ msgstr "गामा(_G) मूल्य"
 msgid "Error loading icon: %s"
 msgstr "आइकान सुरु करताना चुक: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -2162,7 +2179,7 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr ""
@@ -2273,7 +2290,7 @@ msgid "clear"
 msgstr "रिक्त"
 
 # gtk/gtkentry.c:3850 gtk/gtklabel.c:3164
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "सर्व निवडा"
 
@@ -2784,51 +2801,51 @@ msgid "Zoom _Out"
 msgstr "छोट्या(_O) आकारमानामध्ये घ्या"
 
 # gtk/gtktextutil.c:46
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "डावीकडून-उजवीकडे असे दाखवणारे LRM चिन्ह"
 
 # gtk/gtktextutil.c:47
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "उजवीकडून-डावीकडे असे दाखवणारे RLM चिन्ह"
 
 # gtk/gtktextutil.c:48
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "डावीकडून-उजवीकडे बसवा असे संागणारे LRE चिन्ह"
 
 # gtk/gtktextutil.c:49
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "उजवीकडून-डावीकडे बसवा असे संागणारे LRE चिन्ह"
 
 # gtk/gtktextutil.c:50
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "डावीकडून-उजवीकडे जाताना दुर्लक्ष झाल्याचे सांगणारे LRO"
 
 # gtk/gtktextutil.c:51
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "उजवीकडून-डावीकडे जाताना दुर्लक्ष झाल्याचे सांगणारे LRO"
 
 # gtk/gtktextutil.c:52
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF पोप दिशानीय रचना"
 
 # gtk/gtktextutil.c:53
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "शुन्य रुंदीची मोकळी जागा दाखविणारे ZWS चिन्ह"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "शुन्य रुंदीचा सांधा जोडणारे ZWJ चिन्ह"
 
 # gtk/gtktextutil.c:55
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "शुन्य रुंदीचा सांधा न जोडणारे ZWNJ चिन्ह"
 
@@ -2923,7 +2940,7 @@ msgid "X Input Method"
 msgstr "X माहीती पध्दत "
 
 # gdk-pixbuf/gdk-pixbuf-io.c:538
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, fuzzy, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "फाइल '%s' कोणत्या प्रकारची फाइल आहे ते उमगले नाही"
diff --git a/po/ms.po b/po/ms.po
index ae5de37d86..ec18152896 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gtk+ 1.3.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-04-04 01:11+0730\n"
 "Last-Translator: Hasbullah Bin Pit <sebol@my-penguin.org>\n"
 "Language-Team: Projek Gabai <gabai-penyumbang@list.sourceforge.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Gagal membuka fail '%s': %s"
@@ -25,7 +25,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Fail imej '%s' tida mengandungi data"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1269,20 +1269,20 @@ msgstr "Roda"
 msgid "Color Selection"
 msgstr "Pemilihan Warna"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Pilih _Semua"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Method input"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "Sel_itkan aksara Kawalan Unicode"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Namafail tidak sah: %s"
@@ -1292,12 +1292,12 @@ msgstr "Namafail tidak sah: %s"
 msgid "Select A File"
 msgstr "Padam Fail"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Rumah"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Desktop"
@@ -1311,269 +1311,285 @@ msgstr "tiada"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr ""
 "Tak dapat peroleh maklumat perihal %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 #, fuzzy
 msgid "Could not add a bookmark"
 msgstr ""
 "Tak dapat menambah tandabuku bagi %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 #, fuzzy
 msgid "Could not remove bookmark"
 msgstr ""
 "Tak dapat membuang tandabuku bagi %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Namafail tidak sah: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 "Tak dapat peroleh maklumat perihal %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, fuzzy, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "Tak dapat menambah tandabuku bagi %s kerana nama laluan tidak sah."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Buang"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Tukarnama"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Folder"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Tambah"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Buang"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "Tak dapat memilih %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "Tak dapat menambah tandabuku bagi %s kerana nama laluan tidak sah."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "Buka Lokasi"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Papar Fail _Tersembunyi"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Fail"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Nama"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Saiz"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Diubahsuai"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "Cipta _Folder"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Nama:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Lungsur folder lain"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Simpan di _folder:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Cipta di _folder:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 #, fuzzy
 msgid "Cannot change to folder because it is not local"
 msgstr "Tak dapat tukar ke folder kerana ianya bukan tempatan"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "pintasan %s tak wujud"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Tukarnama"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "Tak dapat memilih %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Taip nama bagi folder baru"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Entah"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Hari ini"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Semalam"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Cipta di _folder:"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 #, fuzzy
 msgid "The folder you specified is an invalid path."
 msgstr ""
 "Tak dapat tukar ke folder yang anda nyatakan kerana ia adalah laluan yang "
 "tak sah."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, fuzzy, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 "Tak dapat membina nama fail drpd '%s' dan '%s':\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "Tak dapat memilih %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Buka Lokasi"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "Buka Lokasi"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Lokasi:"
 
@@ -1773,7 +1789,8 @@ msgid "This file system does not support mounting"
 msgstr "Sistem fail ini tak menyokong pelekapan"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Sistemfail"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1874,7 +1891,7 @@ msgstr "Nilai _Gamma"
 msgid "Error loading icon: %s"
 msgstr "Ralat memuatkan ikon: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1887,7 +1904,7 @@ msgstr ""
 "Anda boleh mendapatkan satu salinan drpd:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Ikon '%s' tak wujud pada tema"
@@ -1975,7 +1992,7 @@ msgstr "(tidak diketahui)"
 msgid "clear"
 msgstr "kosongkan"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Pilih Semua"
 
@@ -2410,43 +2427,43 @@ msgstr "Zoom _Masuk"
 msgid "Zoom _Out"
 msgstr "Zoom _Keluar"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM tanda Ki_ri-ke-kanan"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM tanda ka_nan-ke-kiri"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr ""
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr ""
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr ""
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr ""
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr ""
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr ""
 
@@ -2529,7 +2546,7 @@ msgstr "Vietnam (VIQR)"
 msgid "X Input Method"
 msgstr "Kaedah input X"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Tak dapat peroleh maklumat bagi fail '%s': %s"
diff --git a/po/nb.po b/po/nb.po
index dd7f949f34..c0c656e559 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-15 12:07+0200\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-07-15 12:10+0200\n"
 "Last-Translator: Terance Edward Sola <terance@lyse.net>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
@@ -18,19 +18,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.10\n"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:153 ../gdk-pixbuf/gdk-pixbuf-io.c:838
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1089 ../tests/testfilechooser.c:218
+#: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Klarte ikke å åpne fil «%s»: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:166 ../gdk-pixbuf/gdk-pixbuf-io.c:850
+#: gdk-pixbuf/gdk-pixbuf-animation.c:166 gdk-pixbuf/gdk-pixbuf-io.c:850
 #, c-format
 msgid "Image file '%s' contains no data"
 msgstr "Bildefil «%s» inneholder ikke data"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:208 ../gdk-pixbuf/gdk-pixbuf-io.c:887
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1130 ../tests/testfilechooser.c:263
+#: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -38,7 +38,7 @@ msgstr ""
 "Feil under lasting av bilde «%s»: årsak ikke kjent, sannsynligvis korrupt "
 "bildefil"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:241
+#: gdk-pixbuf/gdk-pixbuf-animation.c:241
 #, c-format
 msgid ""
 "Failed to load animation '%s': reason not known, probably a corrupt "
@@ -47,12 +47,12 @@ msgstr ""
 "Feil under lasting av animasjon «%s»: årsak ikke kjent, sannsynligvis "
 "korrupt animasjonsfil"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:444
+#: gdk-pixbuf/gdk-pixbuf-io.c:444
 #, c-format
 msgid "Unable to load image-loading module: %s: %s"
 msgstr "Kan ikke laste modul for innlesing av bilder: %s: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:459
+#: gdk-pixbuf/gdk-pixbuf-io.c:459
 #, c-format
 msgid ""
 "Image-loading module %s does not export the proper interface; perhaps it's "
@@ -61,54 +61,54 @@ msgstr ""
 "Modul %s for bildelasting eksporterer ikke riktig grensesnitt; kanskje den "
 "er fra en annen GTK-versjon?"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:628 ../gdk-pixbuf/gdk-pixbuf-io.c:680
+#: gdk-pixbuf/gdk-pixbuf-io.c:628 gdk-pixbuf/gdk-pixbuf-io.c:680
 #, c-format
 msgid "Image type '%s' is not supported"
 msgstr "Bildetype «%s» er ikke støttet"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:720
+#: gdk-pixbuf/gdk-pixbuf-io.c:720
 #, c-format
 msgid "Couldn't recognize the image file format for file '%s'"
 msgstr "Kunne ikke gjenkjenne bildeformatet for fil «%s»"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:728
+#: gdk-pixbuf/gdk-pixbuf-io.c:728
 msgid "Unrecognized image file format"
 msgstr "Ikke-gjenkjent bildeformat"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:896
+#: gdk-pixbuf/gdk-pixbuf-io.c:896
 #, c-format
 msgid "Failed to load image '%s': %s"
 msgstr "Feil under lasting av bilde «%s»: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1357
+#: gdk-pixbuf/gdk-pixbuf-io.c:1357
 #, c-format
 msgid "Error writing to image file: %s"
 msgstr "Feil under skriving til bildefil: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1403 ../gdk-pixbuf/gdk-pixbuf-io.c:1532
+#: gdk-pixbuf/gdk-pixbuf-io.c:1403 gdk-pixbuf/gdk-pixbuf-io.c:1532
 #, c-format
 msgid "This build of gdk-pixbuf does not support saving the image format: %s"
 msgstr ""
 "Dette versjonen av gdk-pixbuf støtter ikke lagring av bildeformatet: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1437
+#: gdk-pixbuf/gdk-pixbuf-io.c:1437
 msgid "Insufficient memory to save image to callback"
 msgstr "Ikke nok minne til å lagre bilde til callback"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1449
+#: gdk-pixbuf/gdk-pixbuf-io.c:1449
 msgid "Failed to open temporary file"
 msgstr "Kunne ikke åpne midlertidig fil"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1474
+#: gdk-pixbuf/gdk-pixbuf-io.c:1474
 msgid "Failed to read from temporary file"
 msgstr "Kunne ikke lese fra midlertidig fil"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1708
+#: gdk-pixbuf/gdk-pixbuf-io.c:1708
 #, c-format
 msgid "Failed to open '%s' for writing: %s"
 msgstr "Feil under åpning av «%s» for skriving: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1732
+#: gdk-pixbuf/gdk-pixbuf-io.c:1732
 #, c-format
 msgid ""
 "Failed to close '%s' while writing image, all data may not have been saved: %"
@@ -117,16 +117,16 @@ msgstr ""
 "Feil under lukking av «%s» under skriving av bilde. Det er ikke sikkert at "
 "alle data er lagret: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1952 ../gdk-pixbuf/gdk-pixbuf-io.c:2002
+#: gdk-pixbuf/gdk-pixbuf-io.c:1952 gdk-pixbuf/gdk-pixbuf-io.c:2002
 msgid "Insufficient memory to save image into a buffer"
 msgstr "Ikke nok minne til å lagre bilde til buffer"
 
-#: ../gdk-pixbuf/gdk-pixbuf-loader.c:383
+#: gdk-pixbuf/gdk-pixbuf-loader.c:383
 #, c-format
 msgid "Incremental loading of image type '%s' is not supported"
 msgstr "Stegvis lasting av bildetype «%s» er ikke støttet"
 
-#: ../gdk-pixbuf/gdk-pixbuf-loader.c:411 ../gdk-pixbuf/gdk-pixbuf-loader.c:513
+#: gdk-pixbuf/gdk-pixbuf-loader.c:411 gdk-pixbuf/gdk-pixbuf-loader.c:513
 #, c-format
 msgid ""
 "Internal error: Image loader module '%s' failed to begin loading an image, "
@@ -135,136 +135,132 @@ msgstr ""
 "Intern feil: Modul for lasting av bilder «%s» feilet ved start av "
 "bildelasting, men ga ingen årsak for feilen"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:147
+#: gdk-pixbuf/gdk-pixdata.c:147
 msgid "Image header corrupt"
 msgstr "Korrupt header i bilde"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:152
+#: gdk-pixbuf/gdk-pixdata.c:152
 msgid "Image format unknown"
 msgstr "Ukjent bildeformat"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:157 ../gdk-pixbuf/gdk-pixdata.c:487
+#: gdk-pixbuf/gdk-pixdata.c:157 gdk-pixbuf/gdk-pixdata.c:487
 msgid "Image pixel data corrupt"
 msgstr "Korrupt pikseldata i bilde"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:431
+#: gdk-pixbuf/gdk-pixdata.c:431
 #, c-format
 msgid "failed to allocate image buffer of %u byte"
 msgid_plural "failed to allocate image buffer of %u bytes"
 msgstr[0] "kunne ikke allokere buffer for bilde på %u byte"
 msgstr[1] "kunne ikke allokere buffer for bilde på %u bytes"
 
-#: ../gdk-pixbuf/io-ani.c:244
+#: gdk-pixbuf/io-ani.c:244
 msgid "Unexpected icon chunk in animation"
 msgstr "Uventet ikondel i animasjonen"
 
-#: ../gdk-pixbuf/io-ani.c:337
+#: gdk-pixbuf/io-ani.c:337
 msgid "Unsupported animation type"
 msgstr "Animasjonstype ikke støttet"
 
-#: ../gdk-pixbuf/io-ani.c:348 ../gdk-pixbuf/io-ani.c:538
+#: gdk-pixbuf/io-ani.c:348 gdk-pixbuf/io-ani.c:538
 msgid "Invalid header in animation"
 msgstr "Ugyldig header i animasjon"
 
-#: ../gdk-pixbuf/io-ani.c:358 ../gdk-pixbuf/io-ani.c:382
-#: ../gdk-pixbuf/io-ani.c:441 ../gdk-pixbuf/io-ani.c:460
-#: ../gdk-pixbuf/io-ani.c:511 ../gdk-pixbuf/io-ani.c:583
+#: gdk-pixbuf/io-ani.c:358 gdk-pixbuf/io-ani.c:382 gdk-pixbuf/io-ani.c:441
+#: gdk-pixbuf/io-ani.c:460 gdk-pixbuf/io-ani.c:511 gdk-pixbuf/io-ani.c:583
 msgid "Not enough memory to load animation"
 msgstr "Ikke nok minne til å laste animasjon"
 
-#: ../gdk-pixbuf/io-ani.c:400 ../gdk-pixbuf/io-ani.c:417
-#: ../gdk-pixbuf/io-ani.c:428
+#: gdk-pixbuf/io-ani.c:400 gdk-pixbuf/io-ani.c:417 gdk-pixbuf/io-ani.c:428
 msgid "Malformed chunk in animation"
 msgstr "Feil i en del av animasjonen"
 
-#: ../gdk-pixbuf/io-ani.c:676
+#: gdk-pixbuf/io-ani.c:676
 msgid "The ANI image format"
 msgstr "ANI bildeformat"
 
-#: ../gdk-pixbuf/io-bmp.c:228 ../gdk-pixbuf/io-bmp.c:306
-#: ../gdk-pixbuf/io-bmp.c:338 ../gdk-pixbuf/io-bmp.c:361
-#: ../gdk-pixbuf/io-bmp.c:442
+#: gdk-pixbuf/io-bmp.c:228 gdk-pixbuf/io-bmp.c:306 gdk-pixbuf/io-bmp.c:338
+#: gdk-pixbuf/io-bmp.c:361 gdk-pixbuf/io-bmp.c:442
 msgid "BMP image has bogus header data"
 msgstr "BMP-bilde har ugyldige data i header"
 
-#: ../gdk-pixbuf/io-bmp.c:239 ../gdk-pixbuf/io-bmp.c:401
+#: gdk-pixbuf/io-bmp.c:239 gdk-pixbuf/io-bmp.c:401
 msgid "Not enough memory to load bitmap image"
 msgstr "Ikke nok minne til å laste bitkart-bilde"
 
-#: ../gdk-pixbuf/io-bmp.c:287
+#: gdk-pixbuf/io-bmp.c:287
 msgid "BMP image has unsupported header size"
 msgstr "BMP-bilde har ustøttet headerstørrelse"
 
-#: ../gdk-pixbuf/io-bmp.c:325
+#: gdk-pixbuf/io-bmp.c:325
 msgid "Topdown BMP images cannot be compressed"
 msgstr "Topdown BMP-bilder kan ikke komprimeres"
 
-#: ../gdk-pixbuf/io-bmp.c:1203
+#: gdk-pixbuf/io-bmp.c:1203
 msgid "Couldn't allocate memory for saving BMP file"
 msgstr "Kunne ikke allokere minne for lagring av BMP-fil"
 
-#: ../gdk-pixbuf/io-bmp.c:1244
+#: gdk-pixbuf/io-bmp.c:1244
 msgid "Couldn't write to BMP file"
 msgstr "Kunne ikke skrive til BMP-fil"
 
-#: ../gdk-pixbuf/io-bmp.c:1293
+#: gdk-pixbuf/io-bmp.c:1293
 msgid "The BMP image format"
 msgstr "BMP bildeformat"
 
-#: ../gdk-pixbuf/io-gif.c:220
+#: gdk-pixbuf/io-gif.c:220
 #, c-format
 msgid "Failure reading GIF: %s"
 msgstr "Feil under lesing av GIF: %s"
 
-#: ../gdk-pixbuf/io-gif.c:492 ../gdk-pixbuf/io-gif.c:1463
-#: ../gdk-pixbuf/io-gif.c:1624
+#: gdk-pixbuf/io-gif.c:492 gdk-pixbuf/io-gif.c:1463 gdk-pixbuf/io-gif.c:1624
 msgid "GIF file was missing some data (perhaps it was truncated somehow?)"
 msgstr "GIF-fil mangler data (kanskje den har blitt avkuttet på en måte?)"
 
-#: ../gdk-pixbuf/io-gif.c:501
+#: gdk-pixbuf/io-gif.c:501
 #, c-format
 msgid "Internal error in the GIF loader (%s)"
 msgstr "Intern feil i GIF-laster (%s)"
 
-#: ../gdk-pixbuf/io-gif.c:575
+#: gdk-pixbuf/io-gif.c:575
 msgid "Stack overflow"
 msgstr "Stabeloverflyt"
 
-#: ../gdk-pixbuf/io-gif.c:635
+#: gdk-pixbuf/io-gif.c:635
 msgid "GIF image loader cannot understand this image."
 msgstr "Laster for GIF-bilder forstår ikke dette bildet."
 
-#: ../gdk-pixbuf/io-gif.c:664
+#: gdk-pixbuf/io-gif.c:664
 msgid "Bad code encountered"
 msgstr "Ugyldig kode funnet"
 
-#: ../gdk-pixbuf/io-gif.c:674
+#: gdk-pixbuf/io-gif.c:674
 msgid "Circular table entry in GIF file"
 msgstr "Sirkulær tabelloppføring i GIF-fil"
 
-#: ../gdk-pixbuf/io-gif.c:862 ../gdk-pixbuf/io-gif.c:1451
-#: ../gdk-pixbuf/io-gif.c:1497 ../gdk-pixbuf/io-gif.c:1612
+#: gdk-pixbuf/io-gif.c:862 gdk-pixbuf/io-gif.c:1451 gdk-pixbuf/io-gif.c:1497
+#: gdk-pixbuf/io-gif.c:1612
 msgid "Not enough memory to load GIF file"
 msgstr "Ikke nok minne til å laste GIF-bilde"
 
-#: ../gdk-pixbuf/io-gif.c:947
+#: gdk-pixbuf/io-gif.c:947
 msgid "Not enough memory to composite a frame in GIF file"
 msgstr "Ikke nok minne til å sette sammen en ramme i GIF-filen"
 
-#: ../gdk-pixbuf/io-gif.c:1116
+#: gdk-pixbuf/io-gif.c:1116
 msgid "GIF image is corrupt (incorrect LZW compression)"
 msgstr "GIF-bilde er korrupt (ukorrekt LZW-kompresjon)"
 
-#: ../gdk-pixbuf/io-gif.c:1166
+#: gdk-pixbuf/io-gif.c:1166
 msgid "File does not appear to be a GIF file"
 msgstr "Filen ser ikke ut til å være en GIF-fil"
 
-#: ../gdk-pixbuf/io-gif.c:1178
+#: gdk-pixbuf/io-gif.c:1178
 #, c-format
 msgid "Version %s of the GIF file format is not supported"
 msgstr "Versjon %s av GIF filformatet er ikke støttet"
 
-#: ../gdk-pixbuf/io-gif.c:1287
+#: gdk-pixbuf/io-gif.c:1287
 msgid ""
 "GIF image has no global colormap, and a frame inside it has no local "
 "colormap."
@@ -272,67 +268,66 @@ msgstr ""
 "GIF-bildet har ikke globalt fargekart, og et delbilde i det har ikke lokalt "
 "fargekart."
 
-#: ../gdk-pixbuf/io-gif.c:1519
+#: gdk-pixbuf/io-gif.c:1519
 msgid "GIF image was truncated or incomplete."
 msgstr "GIF-bildet er avkuttet eller ukomplett."
 
-#: ../gdk-pixbuf/io-gif.c:1671
+#: gdk-pixbuf/io-gif.c:1671
 msgid "The GIF image format"
 msgstr "GIF bildeformat"
 
-#: ../gdk-pixbuf/io-ico.c:219 ../gdk-pixbuf/io-ico.c:271
-#: ../gdk-pixbuf/io-ico.c:340 ../gdk-pixbuf/io-ico.c:403
-#: ../gdk-pixbuf/io-ico.c:433
+#: gdk-pixbuf/io-ico.c:219 gdk-pixbuf/io-ico.c:271 gdk-pixbuf/io-ico.c:340
+#: gdk-pixbuf/io-ico.c:403 gdk-pixbuf/io-ico.c:433
 msgid "Not enough memory to load icon"
 msgstr "Ikke nok minne til å laste ikon"
 
-#: ../gdk-pixbuf/io-ico.c:256 ../gdk-pixbuf/io-ico.c:330
+#: gdk-pixbuf/io-ico.c:256 gdk-pixbuf/io-ico.c:330
 msgid "Invalid header in icon"
 msgstr "Ugyldig header i ikon"
 
-#: ../gdk-pixbuf/io-ico.c:293
+#: gdk-pixbuf/io-ico.c:293
 msgid "Icon has zero width"
 msgstr "Ikon har null bredde"
 
-#: ../gdk-pixbuf/io-ico.c:303
+#: gdk-pixbuf/io-ico.c:303
 msgid "Icon has zero height"
 msgstr "Ikon har null høyde"
 
-#: ../gdk-pixbuf/io-ico.c:355
+#: gdk-pixbuf/io-ico.c:355
 msgid "Compressed icons are not supported"
 msgstr "Komprimerte ikoner er ikke støttet"
 
-#: ../gdk-pixbuf/io-ico.c:388
+#: gdk-pixbuf/io-ico.c:388
 msgid "Unsupported icon type"
 msgstr "Ikontype ikke støttet"
 
-#: ../gdk-pixbuf/io-ico.c:482
+#: gdk-pixbuf/io-ico.c:482
 msgid "Not enough memory to load ICO file"
 msgstr "Ikke nok minne til å laste ICO-fil"
 
-#: ../gdk-pixbuf/io-ico.c:947
+#: gdk-pixbuf/io-ico.c:947
 msgid "Image too large to be saved as ICO"
 msgstr "Bildet er for stort til å lagre som ICO"
 
-#: ../gdk-pixbuf/io-ico.c:958
+#: gdk-pixbuf/io-ico.c:958
 msgid "Cursor hotspot outside image"
 msgstr "Markørposisjon utenfor bildet"
 
-#: ../gdk-pixbuf/io-ico.c:981
+#: gdk-pixbuf/io-ico.c:981
 #, c-format
 msgid "Unsupported depth for ICO file: %d"
 msgstr "Ikke støttet dybde for ICO-fil: %d"
 
-#: ../gdk-pixbuf/io-ico.c:1210
+#: gdk-pixbuf/io-ico.c:1210
 msgid "The ICO image format"
 msgstr "ICO bildeformat"
 
-#: ../gdk-pixbuf/io-jpeg.c:114
+#: gdk-pixbuf/io-jpeg.c:114
 #, c-format
 msgid "Error interpreting JPEG image file (%s)"
 msgstr "Feil under tolking av JPEG-bildefil (%s)"
 
-#: ../gdk-pixbuf/io-jpeg.c:349
+#: gdk-pixbuf/io-jpeg.c:349
 msgid ""
 "Insufficient memory to load image, try exiting some applications to free "
 "memory"
@@ -340,17 +335,17 @@ msgstr ""
 "Ikke nok minne til å laste bildet. Prøv å avslutte noen applikasjoner for å "
 "frigjøre minne"
 
-#: ../gdk-pixbuf/io-jpeg.c:383 ../gdk-pixbuf/io-jpeg.c:749
+#: gdk-pixbuf/io-jpeg.c:383 gdk-pixbuf/io-jpeg.c:749
 #, c-format
 msgid "Unsupported JPEG color space (%s)"
 msgstr "JPEG-fargeområde ikke støttet (%s)"
 
-#: ../gdk-pixbuf/io-jpeg.c:481 ../gdk-pixbuf/io-jpeg.c:678
-#: ../gdk-pixbuf/io-jpeg.c:943 ../gdk-pixbuf/io-jpeg.c:952
+#: gdk-pixbuf/io-jpeg.c:481 gdk-pixbuf/io-jpeg.c:678 gdk-pixbuf/io-jpeg.c:943
+#: gdk-pixbuf/io-jpeg.c:952
 msgid "Couldn't allocate memory for loading JPEG file"
 msgstr "Kunne ikke allokere minne for lasting av JPEG-fil"
 
-#: ../gdk-pixbuf/io-jpeg.c:894
+#: gdk-pixbuf/io-jpeg.c:894
 #, c-format
 msgid ""
 "JPEG quality must be a value between 0 and 100; value '%s' could not be "
@@ -359,93 +354,93 @@ msgstr ""
 "JPEG-kvalitet må være en verdi mellom 0 og 100; verdien «%s» kunne ikke "
 "tolkes."
 
-#: ../gdk-pixbuf/io-jpeg.c:909
+#: gdk-pixbuf/io-jpeg.c:909
 #, c-format
 msgid ""
 "JPEG quality must be a value between 0 and 100; value '%d' is not allowed."
 msgstr ""
 "JPEG-kvalitet må være en verdi mellom 0 og 100; verdien «%d» er ikke tillatt."
 
-#: ../gdk-pixbuf/io-jpeg.c:1071
+#: gdk-pixbuf/io-jpeg.c:1071
 msgid "The JPEG image format"
 msgstr "JPEG bildeformatet"
 
-#: ../gdk-pixbuf/io-pcx.c:191
+#: gdk-pixbuf/io-pcx.c:191
 msgid "Couldn't allocate memory for header"
 msgstr "Kan ikke allokere minne for hode"
 
-#: ../gdk-pixbuf/io-pcx.c:206 ../gdk-pixbuf/io-pcx.c:566
+#: gdk-pixbuf/io-pcx.c:206 gdk-pixbuf/io-pcx.c:566
 msgid "Couldn't allocate memory for context buffer"
 msgstr "Kan ikke allokere minne for kontekstbuffer"
 
-#: ../gdk-pixbuf/io-pcx.c:607
+#: gdk-pixbuf/io-pcx.c:607
 msgid "Image has invalid width and/or height"
 msgstr "Bilde har ugyldig bredde og/eller høyde"
 
-#: ../gdk-pixbuf/io-pcx.c:619 ../gdk-pixbuf/io-pcx.c:680
+#: gdk-pixbuf/io-pcx.c:619 gdk-pixbuf/io-pcx.c:680
 msgid "Image has unsupported bpp"
 msgstr "Bildet har ustøttet bpp"
 
-#: ../gdk-pixbuf/io-pcx.c:624 ../gdk-pixbuf/io-pcx.c:632
+#: gdk-pixbuf/io-pcx.c:624 gdk-pixbuf/io-pcx.c:632
 #, c-format
 msgid "Image has unsupported number of %d-bit planes"
 msgstr "Bildet har ustøttet antall %d-bits plan"
 
-#: ../gdk-pixbuf/io-pcx.c:648
+#: gdk-pixbuf/io-pcx.c:648
 msgid "Couldn't create new pixbuf"
 msgstr "Kan ikke opprette ny pixbuf"
 
-#: ../gdk-pixbuf/io-pcx.c:656
+#: gdk-pixbuf/io-pcx.c:656
 msgid "Couldn't allocate memory for line data"
 msgstr "Kunne ikke allokere minne for linjedata"
 
-#: ../gdk-pixbuf/io-pcx.c:663
+#: gdk-pixbuf/io-pcx.c:663
 msgid "Couldn't allocate memory for paletted data"
 msgstr "Kan ikke allokere minne for palett-data"
 
-#: ../gdk-pixbuf/io-pcx.c:710
+#: gdk-pixbuf/io-pcx.c:710
 msgid "Didn't get all lines of PCX image"
 msgstr "Mottok ikke alle linjene for PCX-bilde"
 
-#: ../gdk-pixbuf/io-pcx.c:717
+#: gdk-pixbuf/io-pcx.c:717
 msgid "No palette found at end of PCX data"
 msgstr "Ingen palett funnet ved slutten av PCX-data"
 
-#: ../gdk-pixbuf/io-pcx.c:758
+#: gdk-pixbuf/io-pcx.c:758
 msgid "The PCX image format"
 msgstr "PCX bildeformat"
 
-#: ../gdk-pixbuf/io-png.c:55
+#: gdk-pixbuf/io-png.c:55
 msgid "Bits per channel of PNG image is invalid."
 msgstr "Ugyldig antall biter per kanal i PNG-bilde."
 
-#: ../gdk-pixbuf/io-png.c:136
+#: gdk-pixbuf/io-png.c:136
 msgid "Transformed PNG has zero width or height."
 msgstr "Transformert PNG har bredde eller høyde lik null."
 
-#: ../gdk-pixbuf/io-png.c:144
+#: gdk-pixbuf/io-png.c:144
 msgid "Bits per channel of transformed PNG is not 8."
 msgstr "Antall biter per kanal i transformert PNG er forskjellig fra 8."
 
-#: ../gdk-pixbuf/io-png.c:153
+#: gdk-pixbuf/io-png.c:153
 msgid "Transformed PNG not RGB or RGBA."
 msgstr "Transformert PNG er ikke RGB eller RGBA."
 
-#: ../gdk-pixbuf/io-png.c:162
+#: gdk-pixbuf/io-png.c:162
 msgid "Transformed PNG has unsupported number of channels, must be 3 or 4."
 msgstr ""
 "Transformert PNG har et ikke-støttet antall kanaler, må være 3 eller 4."
 
-#: ../gdk-pixbuf/io-png.c:183
+#: gdk-pixbuf/io-png.c:183
 #, c-format
 msgid "Fatal error in PNG image file: %s"
 msgstr "Fatal feil i PNG-bildefil: %s"
 
-#: ../gdk-pixbuf/io-png.c:301
+#: gdk-pixbuf/io-png.c:301
 msgid "Insufficient memory to load PNG file"
 msgstr "Ikke nok minne til å laste PNG-fil"
 
-#: ../gdk-pixbuf/io-png.c:618
+#: gdk-pixbuf/io-png.c:618
 #, c-format
 msgid ""
 "Insufficient memory to store a %ld by %ld image; try exiting some "
@@ -454,25 +449,25 @@ msgstr ""
 "Ikke nok minne til å lagre et %ld ganger %ld bilde; prøv å avslutte noen "
 "applikasjoner for å redusere minnebruken"
 
-#: ../gdk-pixbuf/io-png.c:669
+#: gdk-pixbuf/io-png.c:669
 msgid "Fatal error reading PNG image file"
 msgstr "Fatal feil under lesing av PNG-bildefil"
 
-#: ../gdk-pixbuf/io-png.c:718
+#: gdk-pixbuf/io-png.c:718
 #, c-format
 msgid "Fatal error reading PNG image file: %s"
 msgstr "Fatal feil under lesing av PNG-bildefil: %s"
 
-#: ../gdk-pixbuf/io-png.c:810
+#: gdk-pixbuf/io-png.c:810
 msgid ""
 "Keys for PNG text chunks must have at least 1 and at most 79 characters."
 msgstr "Nøkler for PNG tekstbiter må minst ha mellom 1 og 79 tegn."
 
-#: ../gdk-pixbuf/io-png.c:818
+#: gdk-pixbuf/io-png.c:818
 msgid "Keys for PNG text chunks must be ASCII characters."
 msgstr "Nøkler for PNG tekstbiter må bestå av ASCII-tegn."
 
-#: ../gdk-pixbuf/io-png.c:831
+#: gdk-pixbuf/io-png.c:831
 #, c-format
 msgid ""
 "PNG compression level must be a value between 0 and 9; value '%s' could not "
@@ -481,7 +476,7 @@ msgstr ""
 "Nivået til PNG-komprimeringen må være en verdi mello 0 og 9; verdi «%s» kan "
 "ikke brukes."
 
-#: ../gdk-pixbuf/io-png.c:843
+#: gdk-pixbuf/io-png.c:843
 #, c-format
 msgid ""
 "PNG compression level must be a value between 0 and 9; value '%d' is not "
@@ -490,327 +485,324 @@ msgstr ""
 "Nivået på PNG-komprimering må være en verdi mellom 0 og 9; verdien «%d» er "
 "ikke tillat."
 
-#: ../gdk-pixbuf/io-png.c:883
+#: gdk-pixbuf/io-png.c:883
 #, c-format
 msgid "Value for PNG text chunk %s cannot be converted to ISO-8859-1 encoding."
 msgstr "Verdi for PNG-tekstbit %s kan ikke konverteres til ISO-8859-1-koding."
 
-#: ../gdk-pixbuf/io-png.c:1026
+#: gdk-pixbuf/io-png.c:1026
 msgid "The PNG image format"
 msgstr "PNG-bildeformat"
 
-#: ../gdk-pixbuf/io-pnm.c:252
+#: gdk-pixbuf/io-pnm.c:252
 msgid "PNM loader expected to find an integer, but didn't"
 msgstr "PNM-laster ventet å finne et heltall, men gjorde ikke det"
 
-#: ../gdk-pixbuf/io-pnm.c:284
+#: gdk-pixbuf/io-pnm.c:284
 msgid "PNM file has an incorrect initial byte"
 msgstr "PNM-filen har ukorrekt initiell byte"
 
-#: ../gdk-pixbuf/io-pnm.c:314
+#: gdk-pixbuf/io-pnm.c:314
 msgid "PNM file is not in a recognized PNM subformat"
 msgstr "PNM-filen er ikke i et gjenkjent PNM-underformat"
 
-#: ../gdk-pixbuf/io-pnm.c:339
+#: gdk-pixbuf/io-pnm.c:339
 msgid "PNM file has an image width of 0"
 msgstr "PNM-filen har en bildebredde på 0"
 
-#: ../gdk-pixbuf/io-pnm.c:360
+#: gdk-pixbuf/io-pnm.c:360
 msgid "PNM file has an image height of 0"
 msgstr "PNM-filen har en bildehøyde på 0"
 
-#: ../gdk-pixbuf/io-pnm.c:383
+#: gdk-pixbuf/io-pnm.c:383
 msgid "Maximum color value in PNM file is 0"
 msgstr "Maksimal fargeverdi i PNM-filen er 0"
 
-#: ../gdk-pixbuf/io-pnm.c:391
+#: gdk-pixbuf/io-pnm.c:391
 msgid "Maximum color value in PNM file is too large"
 msgstr "Maksimal fargeverdi i PNM-filen er for stor"
 
-#: ../gdk-pixbuf/io-pnm.c:399
+#: gdk-pixbuf/io-pnm.c:399
 msgid "Cannot handle PNM files with maximum color values greater than 255"
 msgstr "Kan ikke håndtere PNM-filer med fargeverdier større enn 255"
 
-#: ../gdk-pixbuf/io-pnm.c:438 ../gdk-pixbuf/io-pnm.c:466
-#: ../gdk-pixbuf/io-pnm.c:498
+#: gdk-pixbuf/io-pnm.c:438 gdk-pixbuf/io-pnm.c:466 gdk-pixbuf/io-pnm.c:498
 msgid "Raw PNM image type is invalid"
 msgstr "Rå PNM-bildetype er ugyldig"
 
-#: ../gdk-pixbuf/io-pnm.c:562 ../gdk-pixbuf/io-pnm.c:604
+#: gdk-pixbuf/io-pnm.c:562 gdk-pixbuf/io-pnm.c:604
 msgid "PNM image format is invalid"
 msgstr "PNM-bildeformat er ugyldig"
 
-#: ../gdk-pixbuf/io-pnm.c:663
+#: gdk-pixbuf/io-pnm.c:663
 msgid "PNM image loader does not support this PNM subformat"
 msgstr "PNM-bildelaster støtter ikke dette PNM-underformatet"
 
-#: ../gdk-pixbuf/io-pnm.c:718
+#: gdk-pixbuf/io-pnm.c:718
 msgid "Premature end-of-file encountered"
 msgstr "Prematur slutt-på-fil funnet"
 
-#: ../gdk-pixbuf/io-pnm.c:750 ../gdk-pixbuf/io-pnm.c:981
+#: gdk-pixbuf/io-pnm.c:750 gdk-pixbuf/io-pnm.c:981
 msgid "Raw PNM formats require exactly one whitespace before sample data"
 msgstr ""
 "Ubehandlede PNM-formater krever eksakt ett blankt felt før eksempeldata"
 
-#: ../gdk-pixbuf/io-pnm.c:777
+#: gdk-pixbuf/io-pnm.c:777
 msgid "Cannot allocate memory for loading PNM image"
 msgstr "Kan ikke allokere minne for lasting av PNM-bilde"
 
-#: ../gdk-pixbuf/io-pnm.c:827
+#: gdk-pixbuf/io-pnm.c:827
 msgid "Insufficient memory to load PNM context struct"
 msgstr "Ikke nok minne til å laste PNM kontekstdata"
 
-#: ../gdk-pixbuf/io-pnm.c:878
+#: gdk-pixbuf/io-pnm.c:878
 msgid "Unexpected end of PNM image data"
 msgstr "Uventet slutt på PNM-bildedata"
 
-#: ../gdk-pixbuf/io-pnm.c:1010
+#: gdk-pixbuf/io-pnm.c:1010
 msgid "Insufficient memory to load PNM file"
 msgstr "Ikke nok minne til å laste PNM-fil"
 
-#: ../gdk-pixbuf/io-pnm.c:1089
+#: gdk-pixbuf/io-pnm.c:1089
 msgid "The PNM/PBM/PGM/PPM image format family"
 msgstr "PNM/PBM/PGM/PPM-bildeformatfamilien"
 
-#: ../gdk-pixbuf/io-ras.c:126
+#: gdk-pixbuf/io-ras.c:126
 msgid "RAS image has bogus header data"
 msgstr "RAS-bilde har ugyldige data i header"
 
-#: ../gdk-pixbuf/io-ras.c:148
+#: gdk-pixbuf/io-ras.c:148
 msgid "RAS image has unknown type"
 msgstr "RAS-bilde har ukjent type"
 
-#: ../gdk-pixbuf/io-ras.c:156
+#: gdk-pixbuf/io-ras.c:156
 msgid "unsupported RAS image variation"
 msgstr "RAS-bildevariasjon ikke støttet"
 
-#: ../gdk-pixbuf/io-ras.c:171 ../gdk-pixbuf/io-ras.c:200
+#: gdk-pixbuf/io-ras.c:171 gdk-pixbuf/io-ras.c:200
 msgid "Not enough memory to load RAS image"
 msgstr "Ikke nok minne til å laste RAS-bilde"
 
-#: ../gdk-pixbuf/io-ras.c:543
+#: gdk-pixbuf/io-ras.c:543
 msgid "The Sun raster image format"
 msgstr "Sun raster-bildeformat"
 
-#: ../gdk-pixbuf/io-tga.c:154
+#: gdk-pixbuf/io-tga.c:154
 msgid "Cannot allocate memory for IOBuffer struct"
 msgstr "Kan ikke allokere minne for IOBuffer-struct"
 
-#: ../gdk-pixbuf/io-tga.c:173
+#: gdk-pixbuf/io-tga.c:173
 msgid "Cannot allocate memory for IOBuffer data"
 msgstr "Kan ikke allokere minne for IOBuffer-data"
 
-#: ../gdk-pixbuf/io-tga.c:184
+#: gdk-pixbuf/io-tga.c:184
 msgid "Cannot realloc IOBuffer data"
 msgstr "Kan ikke kjøre realloc for IOBuffer-data"
 
-#: ../gdk-pixbuf/io-tga.c:214
+#: gdk-pixbuf/io-tga.c:214
 msgid "Cannot allocate temporary IOBuffer data"
 msgstr "Kan ikke allokere midlertidige IOBuffer-data"
 
-#: ../gdk-pixbuf/io-tga.c:348
+#: gdk-pixbuf/io-tga.c:348
 msgid "Cannot allocate new pixbuf"
 msgstr "Kan ikke allokere ny pixbuf"
 
-#: ../gdk-pixbuf/io-tga.c:689
+#: gdk-pixbuf/io-tga.c:689
 msgid "Cannot allocate colormap structure"
 msgstr "Kan ikke allokere struktur for fargekart"
 
-#: ../gdk-pixbuf/io-tga.c:696
+#: gdk-pixbuf/io-tga.c:696
 msgid "Cannot allocate colormap entries"
 msgstr "Kan ikke allokere fargekartoppføringer"
 
-#: ../gdk-pixbuf/io-tga.c:718
+#: gdk-pixbuf/io-tga.c:718
 msgid "Unexpected bitdepth for colormap entries"
 msgstr "Uventet oppløsning for fargekartoppføringer"
 
-#: ../gdk-pixbuf/io-tga.c:736
+#: gdk-pixbuf/io-tga.c:736
 msgid "Cannot allocate TGA header memory"
 msgstr "Kan ikke allokere minne for TGA-hode"
 
-#: ../gdk-pixbuf/io-tga.c:769
+#: gdk-pixbuf/io-tga.c:769
 msgid "TGA image has invalid dimensions"
 msgstr "TGA-bilde har ugyldige dimensjoner"
 
-#: ../gdk-pixbuf/io-tga.c:775 ../gdk-pixbuf/io-tga.c:784
-#: ../gdk-pixbuf/io-tga.c:794 ../gdk-pixbuf/io-tga.c:804
-#: ../gdk-pixbuf/io-tga.c:811
+#: gdk-pixbuf/io-tga.c:775 gdk-pixbuf/io-tga.c:784 gdk-pixbuf/io-tga.c:794
+#: gdk-pixbuf/io-tga.c:804 gdk-pixbuf/io-tga.c:811
 msgid "TGA image type not supported"
 msgstr "TGA bildetype er ikke støttet"
 
-#: ../gdk-pixbuf/io-tga.c:858
+#: gdk-pixbuf/io-tga.c:858
 msgid "Cannot allocate memory for TGA context struct"
 msgstr "Kan ikke allokere minne for TGA-kontekststruktur"
 
-#: ../gdk-pixbuf/io-tga.c:923
+#: gdk-pixbuf/io-tga.c:923
 msgid "Excess data in file"
 msgstr "Overflødige data i filen"
 
-#: ../gdk-pixbuf/io-tga.c:992
+#: gdk-pixbuf/io-tga.c:992
 msgid "The Targa image format"
 msgstr "Targa bildeformatet"
 
-#: ../gdk-pixbuf/io-tiff.c:173
+#: gdk-pixbuf/io-tiff.c:173
 msgid "Could not get image width (bad TIFF file)"
 msgstr "Kunne ikke finne bildebredde (ugyldig TIFF-fil)"
 
-#: ../gdk-pixbuf/io-tiff.c:180
+#: gdk-pixbuf/io-tiff.c:180
 msgid "Could not get image height (bad TIFF file)"
 msgstr "Kunne ikke finne bildehøyde (ugyldig TIFF-fil)"
 
-#: ../gdk-pixbuf/io-tiff.c:188
+#: gdk-pixbuf/io-tiff.c:188
 msgid "Width or height of TIFF image is zero"
 msgstr "Bredde eller høyde på TIFF-bilde er null"
 
-#: ../gdk-pixbuf/io-tiff.c:197 ../gdk-pixbuf/io-tiff.c:206
+#: gdk-pixbuf/io-tiff.c:197 gdk-pixbuf/io-tiff.c:206
 msgid "Dimensions of TIFF image too large"
 msgstr "TIFF-bildet er for stort"
 
-#: ../gdk-pixbuf/io-tiff.c:225 ../gdk-pixbuf/io-tiff.c:237
-#: ../gdk-pixbuf/io-tiff.c:286 ../gdk-pixbuf/io-tiff.c:572
+#: gdk-pixbuf/io-tiff.c:225 gdk-pixbuf/io-tiff.c:237 gdk-pixbuf/io-tiff.c:286
+#: gdk-pixbuf/io-tiff.c:572
 msgid "Insufficient memory to open TIFF file"
 msgstr "Ikke nok minne til å åpne TIFF-bilde"
 
-#: ../gdk-pixbuf/io-tiff.c:251 ../gdk-pixbuf/io-tiff.c:294
+#: gdk-pixbuf/io-tiff.c:251 gdk-pixbuf/io-tiff.c:294
 msgid "Failed to load RGB data from TIFF file"
 msgstr "Feil under lasting av RGB-data fra TIFF-fil"
 
-#: ../gdk-pixbuf/io-tiff.c:361
+#: gdk-pixbuf/io-tiff.c:361
 msgid "Failed to open TIFF image"
 msgstr "Feil under åpning av TIFF-bilde"
 
-#: ../gdk-pixbuf/io-tiff.c:373
+#: gdk-pixbuf/io-tiff.c:373
 msgid "TIFFClose operation failed"
 msgstr "TIFFClose operasjonen feilet"
 
-#: ../gdk-pixbuf/io-tiff.c:504 ../gdk-pixbuf/io-tiff.c:517
+#: gdk-pixbuf/io-tiff.c:504 gdk-pixbuf/io-tiff.c:517
 msgid "Failed to load TIFF image"
 msgstr "Feil under åpning av TIFF-bilde"
 
-#: ../gdk-pixbuf/io-tiff.c:610
+#: gdk-pixbuf/io-tiff.c:610
 msgid "The TIFF image format"
 msgstr "TIFF bildeformat"
 
-#: ../gdk-pixbuf/io-wbmp.c:246
+#: gdk-pixbuf/io-wbmp.c:246
 msgid "Image has zero width"
 msgstr "Bilde har null bredde"
 
-#: ../gdk-pixbuf/io-wbmp.c:264
+#: gdk-pixbuf/io-wbmp.c:264
 msgid "Image has zero height"
 msgstr "Bilde har null høyde"
 
-#: ../gdk-pixbuf/io-wbmp.c:275
+#: gdk-pixbuf/io-wbmp.c:275
 msgid "Not enough memory to load image"
 msgstr "Ikke nok minne til å laste bilde"
 
-#: ../gdk-pixbuf/io-wbmp.c:334
+#: gdk-pixbuf/io-wbmp.c:334
 msgid "Couldn't save the rest"
 msgstr "Kunne ikke lagre resten"
 
-#: ../gdk-pixbuf/io-wbmp.c:368
+#: gdk-pixbuf/io-wbmp.c:368
 msgid "The WBMP image format"
 msgstr "WBMP bildeformatet"
 
-#: ../gdk-pixbuf/io-xbm.c:287
+#: gdk-pixbuf/io-xbm.c:287
 msgid "Invalid XBM file"
 msgstr "Ugyldig XBM-fil"
 
-#: ../gdk-pixbuf/io-xbm.c:297
+#: gdk-pixbuf/io-xbm.c:297
 msgid "Insufficient memory to load XBM image file"
 msgstr "Ikke nok minne til å laste XBM-bildefil"
 
-#: ../gdk-pixbuf/io-xbm.c:441
+#: gdk-pixbuf/io-xbm.c:441
 msgid "Failed to write to temporary file when loading XBM image"
 msgstr "Feil under skriving til midlertidig file under lasting av XBM-bilde"
 
-#: ../gdk-pixbuf/io-xbm.c:476
+#: gdk-pixbuf/io-xbm.c:476
 msgid "The XBM image format"
 msgstr "XBM bildeformat"
 
-#: ../gdk-pixbuf/io-xpm.c:467
+#: gdk-pixbuf/io-xpm.c:467
 msgid "No XPM header found"
 msgstr "Ingen XPM-header funnet"
 
-#: ../gdk-pixbuf/io-xpm.c:476
+#: gdk-pixbuf/io-xpm.c:476
 msgid "Invalid XPM header"
 msgstr "Ugyldig XPM-hode"
 
-#: ../gdk-pixbuf/io-xpm.c:484
+#: gdk-pixbuf/io-xpm.c:484
 msgid "XPM file has image width <= 0"
 msgstr "XPM-filen har en bildebredde <= 0"
 
-#: ../gdk-pixbuf/io-xpm.c:492
+#: gdk-pixbuf/io-xpm.c:492
 msgid "XPM file has image height <= 0"
 msgstr "XPM-filen har en bildehøyde <= 0"
 
-#: ../gdk-pixbuf/io-xpm.c:500
+#: gdk-pixbuf/io-xpm.c:500
 msgid "XPM has invalid number of chars per pixel"
 msgstr "XPM har et ugyldig antall tegn per piksel"
 
-#: ../gdk-pixbuf/io-xpm.c:507
+#: gdk-pixbuf/io-xpm.c:507
 msgid "XPM file has invalid number of colors"
 msgstr "XPM-filen har et ugyldig antall farger"
 
-#: ../gdk-pixbuf/io-xpm.c:519 ../gdk-pixbuf/io-xpm.c:528
-#: ../gdk-pixbuf/io-xpm.c:580
+#: gdk-pixbuf/io-xpm.c:519 gdk-pixbuf/io-xpm.c:528 gdk-pixbuf/io-xpm.c:580
 msgid "Cannot allocate memory for loading XPM image"
 msgstr "Kan ikke allokere minne for lasting av XPM-bilde"
 
-#: ../gdk-pixbuf/io-xpm.c:542
+#: gdk-pixbuf/io-xpm.c:542
 msgid "Cannot read XPM colormap"
 msgstr "Kan ikke lese fargekart for XPM"
 
-#: ../gdk-pixbuf/io-xpm.c:771
+#: gdk-pixbuf/io-xpm.c:771
 msgid "Failed to write to temporary file when loading XPM image"
 msgstr "Feil under skriving til midlertidig fil under lasting av XPM-bilde"
 
-#: ../gdk-pixbuf/io-xpm.c:806
+#: gdk-pixbuf/io-xpm.c:806
 msgid "The XPM image format"
 msgstr "XPM bildeformat"
 
 #. Description of --class=CLASS in --help output
-#: ../gdk/gdk.c:115
+#: gdk/gdk.c:115
 msgid "Program class as used by the window manager"
 msgstr "Programklasse som brukes av vindushåndtereren"
 
 #. Placeholder in --class=CLASS in --help output
-#: ../gdk/gdk.c:116
+#: gdk/gdk.c:116
 msgid "CLASS"
 msgstr "KLASSE"
 
 #. Description of --name=NAME in --help output
-#: ../gdk/gdk.c:118
+#: gdk/gdk.c:118
 msgid "Program name as used by the window manager"
 msgstr "Programnavn som brukes av vindushåndtereren"
 
 #. Placeholder in --name=NAME in --help output
-#: ../gdk/gdk.c:119
+#: gdk/gdk.c:119
 msgid "NAME"
 msgstr "NAVN"
 
 #. Description of --display=DISPLAY in --help output
-#: ../gdk/gdk.c:121
+#: gdk/gdk.c:121
 msgid "X display to use"
 msgstr "X-skjerm som skal brukes"
 
 #. Placeholder in --display=DISPLAY in --help output
-#: ../gdk/gdk.c:122
+#: gdk/gdk.c:122
 msgid "DISPLAY"
 msgstr "SKJERM"
 
 #. Description of --screen=SCREEN in --help output
-#: ../gdk/gdk.c:124
+#: gdk/gdk.c:124
 msgid "X screen to use"
 msgstr "X-skjerm som skal brukes"
 
 #. Placeholder in --screen=SCREEN in --help output
-#: ../gdk/gdk.c:125
+#: gdk/gdk.c:125
 msgid "SCREEN"
 msgstr "SKJERM"
 
 #. Description of --gdk-debug=FLAGS in --help output
-#: ../gdk/gdk.c:128
+#: gdk/gdk.c:128
 msgid "Gdk debugging flags to set"
 msgstr "Feilsøkingsflagg som skal settes for Gdk"
 
@@ -818,222 +810,222 @@ msgstr "Feilsøkingsflagg som skal settes for Gdk"
 #. Placeholder in --gdk-no-debug=FLAGS in --help output
 #. Placeholder in --gtk-debug=FLAGS in --help output
 #. Placeholder in --gtk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:129 ../gdk/gdk.c:132 ../gtk/gtkmain.c:405 ../gtk/gtkmain.c:408
+#: gdk/gdk.c:129 gdk/gdk.c:132 gtk/gtkmain.c:405 gtk/gtkmain.c:408
 msgid "FLAGS"
 msgstr "FLAGG"
 
 #. Description of --gdk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:131
+#: gdk/gdk.c:131
 msgid "Gdk debugging flags to unset"
 msgstr "Feilsøkingsflagg for Gdk som skal fjernes"
 
-#: ../gdk/keyname-table.h:3940
+#: gdk/keyname-table.h:3940
 msgid "keyboard label|BackSpace"
 msgstr "Backspace"
 
-#: ../gdk/keyname-table.h:3941
+#: gdk/keyname-table.h:3941
 msgid "keyboard label|Tab"
 msgstr "Tab"
 
-#: ../gdk/keyname-table.h:3942
+#: gdk/keyname-table.h:3942
 msgid "keyboard label|Return"
 msgstr "Enter"
 
-#: ../gdk/keyname-table.h:3943
+#: gdk/keyname-table.h:3943
 msgid "keyboard label|Pause"
 msgstr "Pause"
 
-#: ../gdk/keyname-table.h:3944
+#: gdk/keyname-table.h:3944
 msgid "keyboard label|Scroll_Lock"
 msgstr "Scroll Lock"
 
-#: ../gdk/keyname-table.h:3945
+#: gdk/keyname-table.h:3945
 msgid "keyboard label|Sys_Req"
 msgstr "Sys Req"
 
-#: ../gdk/keyname-table.h:3946
+#: gdk/keyname-table.h:3946
 msgid "keyboard label|Escape"
 msgstr "Escape"
 
-#: ../gdk/keyname-table.h:3947
+#: gdk/keyname-table.h:3947
 msgid "keyboard label|Multi_key"
 msgstr "Multi_key"
 
-#: ../gdk/keyname-table.h:3948
+#: gdk/keyname-table.h:3948
 msgid "keyboard label|Home"
 msgstr "Home"
 
-#: ../gdk/keyname-table.h:3949
+#: gdk/keyname-table.h:3949
 msgid "keyboard label|Page_Up"
 msgstr "Page Up"
 
-#: ../gdk/keyname-table.h:3950
+#: gdk/keyname-table.h:3950
 msgid "keyboard label|Page_Down"
 msgstr "Page Down"
 
-#: ../gdk/keyname-table.h:3951
+#: gdk/keyname-table.h:3951
 msgid "keyboard label|End"
 msgstr "End"
 
-#: ../gdk/keyname-table.h:3952
+#: gdk/keyname-table.h:3952
 msgid "keyboard label|Begin"
 msgstr "Begin"
 
-#: ../gdk/keyname-table.h:3953
+#: gdk/keyname-table.h:3953
 msgid "keyboard label|Print"
 msgstr "Print Screen"
 
-#: ../gdk/keyname-table.h:3954
+#: gdk/keyname-table.h:3954
 msgid "keyboard label|Insert"
 msgstr "Insert"
 
-#: ../gdk/keyname-table.h:3955
+#: gdk/keyname-table.h:3955
 msgid "keyboard label|Num_Lock"
 msgstr "Num Lock"
 
-#: ../gdk/keyname-table.h:3956
+#: gdk/keyname-table.h:3956
 msgid "keyboard label|KP_Space"
 msgstr "KP_Space"
 
-#: ../gdk/keyname-table.h:3957
+#: gdk/keyname-table.h:3957
 msgid "keyboard label|KP_Tab"
 msgstr "KP_Tab"
 
-#: ../gdk/keyname-table.h:3958
+#: gdk/keyname-table.h:3958
 msgid "keyboard label|KP_Enter"
 msgstr "KP_Enter"
 
-#: ../gdk/keyname-table.h:3959
+#: gdk/keyname-table.h:3959
 msgid "keyboard label|KP_Home"
 msgstr "KP_Home"
 
-#: ../gdk/keyname-table.h:3960
+#: gdk/keyname-table.h:3960
 msgid "keyboard label|KP_Left"
 msgstr "KP_Left"
 
-#: ../gdk/keyname-table.h:3961
+#: gdk/keyname-table.h:3961
 msgid "keyboard label|KP_Up"
 msgstr "KP_Up"
 
-#: ../gdk/keyname-table.h:3962
+#: gdk/keyname-table.h:3962
 msgid "keyboard label|KP_Right"
 msgstr "KP_Right"
 
-#: ../gdk/keyname-table.h:3963
+#: gdk/keyname-table.h:3963
 msgid "keyboard label|KP_Down"
 msgstr "KP_Down"
 
-#: ../gdk/keyname-table.h:3964
+#: gdk/keyname-table.h:3964
 msgid "keyboard label|KP_Page_Up"
 msgstr "KP_Page_Up"
 
-#: ../gdk/keyname-table.h:3965
+#: gdk/keyname-table.h:3965
 msgid "keyboard label|KP_Prior"
 msgstr "KP_Prior"
 
-#: ../gdk/keyname-table.h:3966
+#: gdk/keyname-table.h:3966
 msgid "keyboard label|KP_Page_Down"
 msgstr "KP_Page_Down"
 
-#: ../gdk/keyname-table.h:3967
+#: gdk/keyname-table.h:3967
 msgid "keyboard label|KP_Next"
 msgstr "KP_Next"
 
-#: ../gdk/keyname-table.h:3968
+#: gdk/keyname-table.h:3968
 msgid "keyboard label|KP_End"
 msgstr "KP_End"
 
-#: ../gdk/keyname-table.h:3969
+#: gdk/keyname-table.h:3969
 msgid "keyboard label|KP_Begin"
 msgstr "KP_Begin"
 
-#: ../gdk/keyname-table.h:3970
+#: gdk/keyname-table.h:3970
 msgid "keyboard label|KP_Insert"
 msgstr "KP_Insert"
 
-#: ../gdk/keyname-table.h:3971
+#: gdk/keyname-table.h:3971
 msgid "keyboard label|KP_Delete"
 msgstr "KP_Delete"
 
-#: ../gdk/keyname-table.h:3972
+#: gdk/keyname-table.h:3972
 msgid "keyboard label|Delete"
 msgstr "Delete"
 
 #. Description of --sync in --help output
-#: ../gdk/win32/gdkmain-win32.c:60
+#: gdk/win32/gdkmain-win32.c:60
 msgid "Don't batch GDI requests"
 msgstr "Ikke send flere GDI-forespørsler sammen"
 
 #. Description of --no-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:62
+#: gdk/win32/gdkmain-win32.c:62
 msgid "Don't use the Wintab API for tablet support"
 msgstr "Ikke bruk Wintab-APIet for støtte for tablet"
 
 #. Description of --ignore-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:64
+#: gdk/win32/gdkmain-win32.c:64
 msgid "Same as --no-wintab"
 msgstr "Samme som --no-wintab"
 
 #. Description of --use-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:66
+#: gdk/win32/gdkmain-win32.c:66
 msgid "Do use the Wintab API [default]"
 msgstr "Ikke bruk Wintab-API [forvalgt]"
 
 #. Description of --max-colors=COLORS in --help output
-#: ../gdk/win32/gdkmain-win32.c:68
+#: gdk/win32/gdkmain-win32.c:68
 msgid "Size of the palette in 8 bit mode"
 msgstr "Størrelse på paletten i 8-bits modus"
 
 #. Placeholder in --max-colors=COLORS in --help output
-#: ../gdk/win32/gdkmain-win32.c:69
+#: gdk/win32/gdkmain-win32.c:69
 msgid "COLORS"
 msgstr "FARGER"
 
 #. Description of --sync in --help output
-#: ../gdk/x11/gdkmain-x11.c:92
+#: gdk/x11/gdkmain-x11.c:92
 msgid "Make X calls synchronous"
 msgstr "Gjør kall til X-bibliotekene synkrone"
 
-#: ../gtk/gtkaboutdialog.c:273 ../gtk/gtkaboutdialog.c:2103
+#: gtk/gtkaboutdialog.c:273 gtk/gtkaboutdialog.c:2103
 msgid "License"
 msgstr "Lisens"
 
-#: ../gtk/gtkaboutdialog.c:274
+#: gtk/gtkaboutdialog.c:274
 msgid "The license of the program"
 msgstr "Programmets lisens"
 
 #. Add the credits button
-#: ../gtk/gtkaboutdialog.c:509
+#: gtk/gtkaboutdialog.c:509
 msgid "C_redits"
 msgstr "Bid_ragsytere"
 
 #. Add the license button
-#: ../gtk/gtkaboutdialog.c:519
+#: gtk/gtkaboutdialog.c:519
 msgid "_License"
 msgstr "_Lisens"
 
-#: ../gtk/gtkaboutdialog.c:756
+#: gtk/gtkaboutdialog.c:756
 #, c-format
 msgid "About %s"
 msgstr "Om %s"
 
-#: ../gtk/gtkaboutdialog.c:2031
+#: gtk/gtkaboutdialog.c:2031
 msgid "Credits"
 msgstr "Bidragsytere"
 
-#: ../gtk/gtkaboutdialog.c:2057
+#: gtk/gtkaboutdialog.c:2057
 msgid "Written by"
 msgstr "Skrevet av"
 
-#: ../gtk/gtkaboutdialog.c:2060
+#: gtk/gtkaboutdialog.c:2060
 msgid "Documented by"
 msgstr "Dokumentert av"
 
-#: ../gtk/gtkaboutdialog.c:2072
+#: gtk/gtkaboutdialog.c:2072
 msgid "Translated by"
 msgstr "Oversatt av"
 
-#: ../gtk/gtkaboutdialog.c:2076
+#: gtk/gtkaboutdialog.c:2076
 msgid "Artwork by"
 msgstr "Grafikk av"
 
@@ -1043,7 +1035,7 @@ msgstr "Grafikk av"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:121
+#: gtk/gtkaccellabel.c:121
 msgid "keyboard label|Shift"
 msgstr "Shift"
 
@@ -1053,7 +1045,7 @@ msgstr "Shift"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:128
+#: gtk/gtkaccellabel.c:128
 msgid "keyboard label|Ctrl"
 msgstr "Ctrl"
 
@@ -1063,17 +1055,17 @@ msgstr "Ctrl"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:135
+#: gtk/gtkaccellabel.c:135
 msgid "keyboard label|Alt"
 msgstr "Alt"
 
 #. do not translate the part before the |
-#: ../gtk/gtkaccellabel.c:577
+#: gtk/gtkaccellabel.c:577
 msgid "keyboard label|Space"
 msgstr "Mellomrom"
 
 #. do not translate the part before the |
-#: ../gtk/gtkaccellabel.c:581
+#: gtk/gtkaccellabel.c:581
 msgid "keyboard label|Backslash"
 msgstr "Omvendt skråstrek"
 
@@ -1086,7 +1078,7 @@ msgstr "Omvendt skråstrek"
 #. * so if you have a default text direction of RTL and YM, then
 #. * the year will appear on the right.
 #.
-#: ../gtk/gtkcalendar.c:647
+#: gtk/gtkcalendar.c:647
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
@@ -1094,7 +1086,7 @@ msgstr "calendar:MY"
 #. * first day of the week to calendar:week_start:1 if you want Monday
 #. * to be the first day of the week, and so on.
 #.
-#: ../gtk/gtkcalendar.c:661
+#: gtk/gtkcalendar.c:661
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:1"
 
@@ -1106,7 +1098,7 @@ msgstr "calendar:week_start:1"
 #. *
 #. * If you don't understand this, leave it as "2000"
 #.
-#: ../gtk/gtkcalendar.c:1549
+#: gtk/gtkcalendar.c:1549
 msgid "year measurement template|2000"
 msgstr "2000"
 
@@ -1121,25 +1113,25 @@ msgstr "2000"
 #. * Don't include the prefix "calendar year format|" in the
 #. * translation. "%Y" is appropriate for most locales.
 #.
-#: ../gtk/gtkcalendar.c:1826
+#: gtk/gtkcalendar.c:1826
 msgid "calendar year format|%Y"
 msgstr "%Y"
 
 #. do not translate the part before the |
-#: ../gtk/gtkcellrendererprogress.c:237 ../gtk/gtkcellrendererprogress.c:295
+#: gtk/gtkcellrendererprogress.c:237 gtk/gtkcellrendererprogress.c:295
 #, c-format
 msgid "progress bar label|%d %%"
 msgstr "%d %%"
 
-#: ../gtk/gtkcolorbutton.c:221 ../gtk/gtkcolorbutton.c:576
+#: gtk/gtkcolorbutton.c:221 gtk/gtkcolorbutton.c:576
 msgid "Pick a Color"
 msgstr "Velg en farge"
 
-#: ../gtk/gtkcolorbutton.c:467
+#: gtk/gtkcolorbutton.c:467
 msgid "Received invalid color data\n"
 msgstr "Mottok ugyldige fargedata\n"
 
-#: ../gtk/gtkcolorsel.c:565
+#: gtk/gtkcolorsel.c:565
 msgid ""
 "The previously-selected color, for comparison to the color you're selecting "
 "now. You can drag this color to a palette entry, or select this color as "
@@ -1149,7 +1141,7 @@ msgstr ""
 "denne fargen til en palettoppføring, eller velge denne fargen som aktiv ved "
 "å dra den til den andre fargeprøven ved siden av."
 
-#: ../gtk/gtkcolorsel.c:570
+#: gtk/gtkcolorsel.c:570
 msgid ""
 "The color you've chosen. You can drag this color to a palette entry to save "
 "it for use in the future."
@@ -1157,11 +1149,11 @@ msgstr ""
 "Fargen du har valgt. Du kan dra denne fargen til en palettoppføring for å "
 "lagre den for senere bruk."
 
-#: ../gtk/gtkcolorsel.c:961
+#: gtk/gtkcolorsel.c:961
 msgid "_Save color here"
 msgstr "_Lagre fargen her"
 
-#: ../gtk/gtkcolorsel.c:1166
+#: gtk/gtkcolorsel.c:1166
 msgid ""
 "Click this palette entry to make it the current color. To change this entry, "
 "drag a color swatch here or right-click it and select \"Save color here.\""
@@ -1170,7 +1162,7 @@ msgstr ""
 "endre denne oppføringen drar du en fargeprøve hit eller høyreklikk den og "
 "velg «Lagre farge her.»"
 
-#: ../gtk/gtkcolorsel.c:1953
+#: gtk/gtkcolorsel.c:1953
 msgid ""
 "Select the color you want from the outer ring. Select the darkness or "
 "lightness of that color using the inner triangle."
@@ -1178,7 +1170,7 @@ msgstr ""
 "Velg fargen du ønsker fra den ytre ringen. Velg lysstyrke for denne fargen "
 "ved å bruke den indre trekanten."
 
-#: ../gtk/gtkcolorsel.c:1978
+#: gtk/gtkcolorsel.c:1978
 msgid ""
 "Click the eyedropper, then click a color anywhere on your screen to select "
 "that color."
@@ -1186,67 +1178,67 @@ msgstr ""
 "Klikk på dråpetelleren og klikk så på en farge hvor som helst på skjermen "
 "for å velge denne fargen."
 
-#: ../gtk/gtkcolorsel.c:1987
+#: gtk/gtkcolorsel.c:1987
 msgid "_Hue:"
 msgstr "_Glød:"
 
-#: ../gtk/gtkcolorsel.c:1988
+#: gtk/gtkcolorsel.c:1988
 msgid "Position on the color wheel."
 msgstr "Posisjon på fargehjulet."
 
-#: ../gtk/gtkcolorsel.c:1990
+#: gtk/gtkcolorsel.c:1990
 msgid "_Saturation:"
 msgstr "_Metning:"
 
-#: ../gtk/gtkcolorsel.c:1991
+#: gtk/gtkcolorsel.c:1991
 msgid "\"Deepness\" of the color."
 msgstr "Fargens dybde."
 
-#: ../gtk/gtkcolorsel.c:1992
+#: gtk/gtkcolorsel.c:1992
 msgid "_Value:"
 msgstr "_Verdi:"
 
-#: ../gtk/gtkcolorsel.c:1993
+#: gtk/gtkcolorsel.c:1993
 msgid "Brightness of the color."
 msgstr "Lysstyrke for fargen."
 
-#: ../gtk/gtkcolorsel.c:1994
+#: gtk/gtkcolorsel.c:1994
 msgid "_Red:"
 msgstr "_Rød:"
 
-#: ../gtk/gtkcolorsel.c:1995
+#: gtk/gtkcolorsel.c:1995
 msgid "Amount of red light in the color."
 msgstr "Mende med rødt lys i fargen."
 
-#: ../gtk/gtkcolorsel.c:1996
+#: gtk/gtkcolorsel.c:1996
 msgid "_Green:"
 msgstr "_Grønn:"
 
-#: ../gtk/gtkcolorsel.c:1997
+#: gtk/gtkcolorsel.c:1997
 msgid "Amount of green light in the color."
 msgstr "Mengde med grønt lys i fargen."
 
-#: ../gtk/gtkcolorsel.c:1998
+#: gtk/gtkcolorsel.c:1998
 msgid "_Blue:"
 msgstr "_Blå:"
 
-#: ../gtk/gtkcolorsel.c:1999
+#: gtk/gtkcolorsel.c:1999
 msgid "Amount of blue light in the color."
 msgstr "Mengde med blått lys i fargen."
 
-#: ../gtk/gtkcolorsel.c:2002
+#: gtk/gtkcolorsel.c:2002
 msgid "_Opacity:"
 msgstr "_Ugjennomsiktighet:"
 
-#: ../gtk/gtkcolorsel.c:2010 ../gtk/gtkcolorsel.c:2021
+#: gtk/gtkcolorsel.c:2010 gtk/gtkcolorsel.c:2021
 msgid "Transparency of the color."
 msgstr "Gjennomsiktighet for fargen."
 
-#: ../gtk/gtkcolorsel.c:2028
+#: gtk/gtkcolorsel.c:2028
 msgid "Color _Name:"
 msgstr "Farge_navn:"
 
-#: ../gtk/gtkcolorsel.c:2043
+#: gtk/gtkcolorsel.c:2043
 msgid ""
 "You can enter an HTML-style hexadecimal color value, or simply a color name "
 "such as 'orange' in this entry."
@@ -1254,75 +1246,75 @@ msgstr ""
 "Du kan skrive inn en heksadesimal fargeverdi i HTML-stil, eller bruke et "
 "fargenavn som f.eks. «oransje» i denne oppføringen."
 
-#: ../gtk/gtkcolorsel.c:2062
+#: gtk/gtkcolorsel.c:2062
 msgid "_Palette"
 msgstr "_Palett"
 
-#: ../gtk/gtkcolorsel.c:2094
+#: gtk/gtkcolorsel.c:2094
 msgid "Color Wheel"
 msgstr "Fargehjul"
 
-#: ../gtk/gtkcolorseldialog.c:123
+#: gtk/gtkcolorseldialog.c:123
 msgid "Color Selection"
 msgstr "Fargevalg"
 
-#: ../gtk/gtkentry.c:4552 ../gtk/gtktextview.c:7125
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Velg _alt"
 
-#: ../gtk/gtkentry.c:4562 ../gtk/gtktextview.c:7135
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Inndata_metoder"
 
-#: ../gtk/gtkentry.c:4573 ../gtk/gtktextview.c:7146
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "Sett _inn Unicode kontrolltegn"
 
-#: ../gtk/gtkfilechooser.c:1623 ../gtk/gtkfilechooser.c:1667
-#: ../gtk/gtkfilechooser.c:1742 ../gtk/gtkfilechooser.c:1786
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Ugyldig filnavn: %s"
 
-#: ../gtk/gtkfilechooserbutton.c:67
+#: gtk/gtkfilechooserbutton.c:67
 msgid "Select A File"
 msgstr "Velg en fil"
 
-#: ../gtk/gtkfilechooserbutton.c:68 ../gtk/gtkfilechooserdefault.c:1317
-#: ../gtk/gtkpathbar.c:1020
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
+#: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Hjem"
 
-#: ../gtk/gtkfilechooserbutton.c:69 ../gtk/gtkfilechooserdefault.c:1344
-#: ../gtk/gtkpathbar.c:1022
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
+#: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Skrivebord"
 
-#: ../gtk/gtkfilechooserbutton.c:70
+#: gtk/gtkfilechooserbutton.c:70
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: ../gtk/gtkfilechooserbutton.c:1523
+#: gtk/gtkfilechooserbutton.c:1523
 msgid "Other..."
 msgstr "Annet..."
 
-#: ../gtk/gtkfilechooserdefault.c:932
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Kunne ikke hente informasjon om filen"
 
-#: ../gtk/gtkfilechooserdefault.c:943
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Kunne ikke legge til bokmerke"
 
-#: ../gtk/gtkfilechooserdefault.c:954
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Kunne ikke fjerne bokmerke"
 
-#: ../gtk/gtkfilechooserdefault.c:965
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Mappen kunne ikke opprettes"
 
-#: ../gtk/gtkfilechooserdefault.c:978
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1330,255 +1322,254 @@ msgstr ""
 "Kunne ikke opprette mappen på grunn av at det allerede eksisterer en fil med "
 "samme navnet. Bruk et annet navn for mappen eller gi et nytt navn til filen."
 
-#: ../gtk/gtkfilechooserdefault.c:991
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Ugyldig filnavn"
 
-#: ../gtk/gtkfilechooserdefault.c:1001
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Mappeinholdet kunne ikke vises"
 
-#: ../gtk/gtkfilechooserdefault.c:1207
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Kunne ikke hente informasjon om «%s»: %s"
 
-#: ../gtk/gtkfilechooserdefault.c:2223
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Legg til mappe «%s» i bokmerker"
 
-#: ../gtk/gtkfilechooserdefault.c:2264
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Legg til aktiv mappe i bokmerker"
 
-#: ../gtk/gtkfilechooserdefault.c:2266
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Legg til valgte mapper i bokmerker"
 
-#: ../gtk/gtkfilechooserdefault.c:2306
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Fjern bokmerke «%s»"
 
-#: ../gtk/gtkfilechooserdefault.c:2737
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Kunne ikke legge til bokmerke for «%s» fordi det er et ugyldig navn på en "
 "sti."
 
-#: ../gtk/gtkfilechooserdefault.c:2952
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../gtk/gtkfilechooserdefault.c:2961
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Gi nytt navn..."
 
-#: ../gtk/gtkfilechooserdefault.c:3084
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Snarveier"
 
-#: ../gtk/gtkfilechooserdefault.c:3138
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Mappe"
 
-#: ../gtk/gtkfilechooserdefault.c:3194 ../gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Legg til"
 
-#: ../gtk/gtkfilechooserdefault.c:3201
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Legg til valgt mappe i bokmerker"
 
-#: ../gtk/gtkfilechooserdefault.c:3206 ../gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: ../gtk/gtkfilechooserdefault.c:3213
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Fjern valgt bokmerke"
 
-#: ../gtk/gtkfilechooserdefault.c:3313
+#: gtk/gtkfilechooserdefault.c:3313
 msgid "Could not select file"
 msgstr "Kunne ikke velge fil"
 
-#: ../gtk/gtkfilechooserdefault.c:3369
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "Kunne ikke velge fil «%s» fordi navnet på stien er ugyldig."
 
-#: ../gtk/gtkfilechooserdefault.c:3441
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "L_egg til i bokmerker"
 
-#: ../gtk/gtkfilechooserdefault.c:3451
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Åpne _lokasjon"
 
-#: ../gtk/gtkfilechooserdefault.c:3463
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Vis sk_julte filer"
 
-#: ../gtk/gtkfilechooserdefault.c:3587 ../gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Filer"
 
-#: ../gtk/gtkfilechooserdefault.c:3632
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Navn"
 
-#: ../gtk/gtkfilechooserdefault.c:3657
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Størrelse"
 
-#: ../gtk/gtkfilechooserdefault.c:3670
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Endret"
 
-#: ../gtk/gtkfilechooserdefault.c:3702
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Velg hvilke filtyper som skal vises"
 
 #. Create Folder
-#: ../gtk/gtkfilechooserdefault.c:3738
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Opprett _mappe"
 
 #. Name entry
-#: ../gtk/gtkfilechooserdefault.c:3859
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: ../gtk/gtkfilechooserdefault.c:3899
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Se gjennom andre mapper"
 
-#: ../gtk/gtkfilechooserdefault.c:4150
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Lagre i _mappe:"
 
-#: ../gtk/gtkfilechooserdefault.c:4152
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Opprett i _mappe:"
 
-#: ../gtk/gtkfilechooserdefault.c:5148
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Kan ikke gå til mappen fordi den ikke er lokal."
 
-#: ../gtk/gtkfilechooserdefault.c:5702
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Snarvei %s eksisterer ikke"
 
-#: ../gtk/gtkfilechooserdefault.c:5956
-#, c-format
-msgid "A file named \"%s\" already exists."
+#: gtk/gtkfilechooserdefault.c:5957
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "En fil med navn «%s» eksisterer allerede."
 
-#: ../gtk/gtkfilechooserdefault.c:5959
-msgid "Do you want to replace it with the one you are saving?"
-msgstr "Vil du erstatte den med filen du lagrer nå?"
-
-#: ../gtk/gtkfilechooserdefault.c:5961
-msgid "_Select Another File"
-msgstr "_Velg en annen fil"
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
 
-#: ../gtk/gtkfilechooserdefault.c:5962
-msgid "_Replace Existing File"
-msgstr "E_rstatt eksisterende fil"
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Gi nytt navn"
 
-#: ../gtk/gtkfilechooserdefault.c:6388
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Kunne ikke montere %s"
 
-#: ../gtk/gtkfilechooserdefault.c:6676
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Skriv inn navn på ny mappe"
 
-#: ../gtk/gtkfilechooserdefault.c:6718
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d byte"
 msgstr[1] "%d bytes"
 
-#: ../gtk/gtkfilechooserdefault.c:6720
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: ../gtk/gtkfilechooserdefault.c:6722
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: ../gtk/gtkfilechooserdefault.c:6724
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: ../gtk/gtkfilechooserdefault.c:6770 ../gtk/gtkfilechooserdefault.c:6794
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../gtk/gtkfilechooserdefault.c:6781
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "I dag"
 
-#: ../gtk/gtkfilechooserdefault.c:6783
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "I går"
 
-#: ../gtk/gtkfilechooserdefault.c:6865
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Kan ikke bytte mappe"
 
-#: ../gtk/gtkfilechooserdefault.c:6866
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Mappen du oppga er en ugyldig sti."
 
-#: ../gtk/gtkfilechooserdefault.c:6905
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Kunne ikke bygge filnavn fra «%s» og «%s»"
 
-#: ../gtk/gtkfilechooserdefault.c:6941
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Kunne ikke velge oppføring"
 
-#: ../gtk/gtkfilechooserdefault.c:6981
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Åpne lokasjon"
 
-#: ../gtk/gtkfilechooserdefault.c:6988
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Lagre på lokasjon"
 
-#: ../gtk/gtkfilechooserdefault.c:7012
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Lokasjon: "
 
-#: ../gtk/gtkfilesel.c:727
+#: gtk/gtkfilesel.c:727
 msgid "Folders"
 msgstr "Mapper"
 
-#: ../gtk/gtkfilesel.c:731
+#: gtk/gtkfilesel.c:731
 msgid "Fol_ders"
 msgstr "M_apper"
 
-#: ../gtk/gtkfilesel.c:767
+#: gtk/gtkfilesel.c:767
 msgid "_Files"
 msgstr "_Filer"
 
-#: ../gtk/gtkfilesel.c:855 ../gtk/gtkfilesel.c:2242
+#: gtk/gtkfilesel.c:855 gtk/gtkfilesel.c:2242
 #, c-format
 msgid "Folder unreadable: %s"
 msgstr "Uleselig mappe: %s"
 
-#: ../gtk/gtkfilesel.c:984
+#: gtk/gtkfilesel.c:984
 #, c-format
 msgid ""
 "The file \"%s\" resides on another machine (called %s) and may not be "
@@ -1589,25 +1580,25 @@ msgstr ""
 "tilgjengelig for dette programmet.\n"
 "Er du sikker på at du ønsker å velge den?"
 
-#: ../gtk/gtkfilesel.c:1114
+#: gtk/gtkfilesel.c:1114
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: ../gtk/gtkfilesel.c:1125
+#: gtk/gtkfilesel.c:1125
 msgid "De_lete File"
 msgstr "S_lett fil"
 
-#: ../gtk/gtkfilesel.c:1136
+#: gtk/gtkfilesel.c:1136
 msgid "_Rename File"
 msgstr "End_re navn på filen"
 
-#: ../gtk/gtkfilesel.c:1438
+#: gtk/gtkfilesel.c:1438
 #, c-format
 msgid ""
 "The folder name \"%s\" contains symbols that are not allowed in filenames"
 msgstr "Mappenavn «%s» inneholder symboler som ikke er tillatt i filnavn"
 
-#: ../gtk/gtkfilesel.c:1440
+#: gtk/gtkfilesel.c:1440
 #, c-format
 msgid ""
 "Error creating folder \"%s\": %s\n"
@@ -1616,33 +1607,33 @@ msgstr ""
 "Feil under oppretting av mappe «%s»: %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1441 ../gtk/gtkfilesel.c:1677
+#: gtk/gtkfilesel.c:1441 gtk/gtkfilesel.c:1677
 msgid "You probably used symbols not allowed in filenames."
 msgstr "Du brukte sannsynligvis symboler som ikke er tillatt i filnavn."
 
-#: ../gtk/gtkfilesel.c:1449
+#: gtk/gtkfilesel.c:1449
 #, c-format
 msgid "Error creating folder \"%s\": %s\n"
 msgstr "Feil under oppretting av mappe «%s»: %s\n"
 
-#: ../gtk/gtkfilesel.c:1483
+#: gtk/gtkfilesel.c:1483
 msgid "New Folder"
 msgstr "Ny mappe"
 
-#: ../gtk/gtkfilesel.c:1498
+#: gtk/gtkfilesel.c:1498
 msgid "_Folder name:"
 msgstr "_Mappenavn:"
 
-#: ../gtk/gtkfilesel.c:1522
+#: gtk/gtkfilesel.c:1522
 msgid "C_reate"
 msgstr "Opp_rett"
 
-#: ../gtk/gtkfilesel.c:1565
+#: gtk/gtkfilesel.c:1565
 #, c-format
 msgid "The filename \"%s\" contains symbols that are not allowed in filenames"
 msgstr "Filnavnet «%s» inneholder symboler som ikke er tillatt i filnavn"
 
-#: ../gtk/gtkfilesel.c:1568
+#: gtk/gtkfilesel.c:1568
 #, c-format
 msgid ""
 "Error deleting file \"%s\": %s\n"
@@ -1651,30 +1642,30 @@ msgstr ""
 "Feil under sletting av fil «%s»: %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1570 ../gtk/gtkfilesel.c:1691
+#: gtk/gtkfilesel.c:1570 gtk/gtkfilesel.c:1691
 msgid "It probably contains symbols not allowed in filenames."
 msgstr "Det inneholder sannsynligvis symboler som ikke er tillatt i filnavn."
 
-#: ../gtk/gtkfilesel.c:1579
+#: gtk/gtkfilesel.c:1579
 #, c-format
 msgid "Error deleting file \"%s\": %s"
 msgstr "Feil under sletting av fil «%s»: %s"
 
-#: ../gtk/gtkfilesel.c:1622
+#: gtk/gtkfilesel.c:1622
 #, c-format
 msgid "Really delete file \"%s\"?"
 msgstr "Vil du virkelig slette filen «%s»?"
 
-#: ../gtk/gtkfilesel.c:1627
+#: gtk/gtkfilesel.c:1627
 msgid "Delete File"
 msgstr "Slett fil"
 
-#: ../gtk/gtkfilesel.c:1673 ../gtk/gtkfilesel.c:1687
+#: gtk/gtkfilesel.c:1673 gtk/gtkfilesel.c:1687
 #, c-format
 msgid "The file name \"%s\" contains symbols that are not allowed in filenames"
 msgstr "Filnavn «%s» inneholder symboler som ikke er tillatt i filnavn"
 
-#: ../gtk/gtkfilesel.c:1675
+#: gtk/gtkfilesel.c:1675
 #, c-format
 msgid ""
 "Error renaming file to \"%s\": %s\n"
@@ -1683,7 +1674,7 @@ msgstr ""
 "Feil under endring av navn på fil «%s»: %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1689
+#: gtk/gtkfilesel.c:1689
 #, c-format
 msgid ""
 "Error renaming file \"%s\": %s\n"
@@ -1692,29 +1683,29 @@ msgstr ""
 "Feil under endring av navn på fil «%s»: %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1699
+#: gtk/gtkfilesel.c:1699
 #, c-format
 msgid "Error renaming file \"%s\" to \"%s\": %s"
 msgstr "Feil under endring av navn på fil «%s» til «%s»: %s"
 
-#: ../gtk/gtkfilesel.c:1746
+#: gtk/gtkfilesel.c:1746
 msgid "Rename File"
 msgstr "Gi filen nytt navn"
 
-#: ../gtk/gtkfilesel.c:1761
+#: gtk/gtkfilesel.c:1761
 #, c-format
 msgid "Rename file \"%s\" to:"
 msgstr "Gi fil «%s» nytt navn:"
 
-#: ../gtk/gtkfilesel.c:1790
+#: gtk/gtkfilesel.c:1790
 msgid "_Rename"
 msgstr "_Gi nytt navn"
 
-#: ../gtk/gtkfilesel.c:2222
+#: gtk/gtkfilesel.c:2222
 msgid "_Selection: "
 msgstr "_Valg: "
 
-#: ../gtk/gtkfilesel.c:3147
+#: gtk/gtkfilesel.c:3147
 #, c-format
 msgid ""
 "The filename \"%s\" couldn't be converted to UTF-8. (try setting the "
@@ -1723,48 +1714,48 @@ msgstr ""
 "Filnavnet «%s» kunne ikke konverteres til UTF-8 (prøv å sette "
 "miljøvariabelen G_FILENAME_ENCODING): %s"
 
-#: ../gtk/gtkfilesel.c:3150
+#: gtk/gtkfilesel.c:3150
 msgid "Invalid UTF-8"
 msgstr "Ugyldig UTF-8"
 
-#: ../gtk/gtkfilesel.c:4027
+#: gtk/gtkfilesel.c:4027
 msgid "Name too long"
 msgstr "Navnet er for langt"
 
-#: ../gtk/gtkfilesel.c:4029
+#: gtk/gtkfilesel.c:4029
 msgid "Couldn't convert filename"
 msgstr "Kunne ikke konvertere filnavnet"
 
-#: ../gtk/gtkfilesystemmodel.c:1267
+#: gtk/gtkfilesystemmodel.c:1267
 msgid "(Empty)"
 msgstr "(Tom)"
 
-#: ../gtk/gtkfilesystemunix.c:476 ../gtk/gtkfilesystemunix.c:682
-#: ../gtk/gtkfilesystemunix.c:1858 ../gtk/gtkfilesystemwin32.c:482
-#: ../gtk/gtkfilesystemwin32.c:495 ../gtk/gtkfilesystemwin32.c:1487
+#: gtk/gtkfilesystemunix.c:476 gtk/gtkfilesystemunix.c:682
+#: gtk/gtkfilesystemunix.c:1858 gtk/gtkfilesystemwin32.c:482
+#: gtk/gtkfilesystemwin32.c:495 gtk/gtkfilesystemwin32.c:1487
 #, c-format
 msgid "Error getting information for '%s': %s"
 msgstr "Feil under henting av informasjon om «%s»: %s"
 
-#: ../gtk/gtkfilesystemunix.c:551 ../gtk/gtkfilesystemwin32.c:537
+#: gtk/gtkfilesystemunix.c:551 gtk/gtkfilesystemwin32.c:537
 #, c-format
 msgid "Error creating directory '%s': %s"
 msgstr "Feil under oppretting av katalog «%s»: %s"
 
-#: ../gtk/gtkfilesystemunix.c:631 ../gtk/gtkfilesystemwin32.c:597
+#: gtk/gtkfilesystemunix.c:631 gtk/gtkfilesystemwin32.c:597
 msgid "This file system does not support mounting"
 msgstr "Dette filsystemet støtter ikke montering"
 
-#: ../gtk/gtkfilesystemunix.c:639
+#: gtk/gtkfilesystemunix.c:639
 msgid "File System"
 msgstr "Filsystem"
 
-#: ../gtk/gtkfilesystemunix.c:796
+#: gtk/gtkfilesystemunix.c:796
 #, c-format
 msgid "Could not get a stock icon for %s"
 msgstr "Kunne ikke hente et standardikon for %s"
 
-#: ../gtk/gtkfilesystemunix.c:891
+#: gtk/gtkfilesystemunix.c:891
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"%s\". "
@@ -1773,93 +1764,93 @@ msgstr ""
 "Navnet «%s» er ikke gyldig fordi det inneholder tegnet «%s». Vennligst bruk "
 "et annet navn."
 
-#: ../gtk/gtkfilesystemunix.c:1463 ../gtk/gtkfilesystemwin32.c:1032
+#: gtk/gtkfilesystemunix.c:1463 gtk/gtkfilesystemwin32.c:1032
 #, c-format
 msgid "Bookmark saving failed: %s"
 msgstr "Lagring av bokmerke feilet: %s"
 
-#: ../gtk/gtkfilesystemunix.c:1518
+#: gtk/gtkfilesystemunix.c:1518
 #, c-format
 msgid "'%s' already exists in the bookmarks list"
 msgstr "«%s» finnes allerede i bokmerkelisten"
 
-#: ../gtk/gtkfilesystemunix.c:1590
+#: gtk/gtkfilesystemunix.c:1590
 #, c-format
 msgid "'%s' does not exist in the bookmarks list"
 msgstr "«%s» finnes ikke i bokmerkelisten"
 
-#: ../gtk/gtkfilesystemunix.c:1818
+#: gtk/gtkfilesystemunix.c:1818
 #, c-format
 msgid "Error getting information for '/': %s"
 msgstr "Feil under henting av informasjon for «/»: %s"
 
-#: ../gtk/gtkfilesystemwin32.c:611
+#: gtk/gtkfilesystemwin32.c:611
 #, c-format
 msgid "Network Drive (%s)"
 msgstr "Nettverksenhet (%s)"
 
-#: ../gtk/gtkfilesystemwin32.c:650
+#: gtk/gtkfilesystemwin32.c:650
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../gtk/gtkfontbutton.c:179 ../gtk/gtkfontbutton.c:292
+#: gtk/gtkfontbutton.c:179 gtk/gtkfontbutton.c:292
 msgid "Pick a Font"
 msgstr "Velg en skrift"
 
 #. Initialize fields
-#: ../gtk/gtkfontbutton.c:286
+#: gtk/gtkfontbutton.c:286
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: ../gtk/gtkfontbutton.c:804
+#: gtk/gtkfontbutton.c:804
 msgid "Font"
 msgstr "Skrift"
 
 #. This is the default text shown in the preview entry, though the user
 #. can set it. Remember that some fonts only have capital letters.
-#: ../gtk/gtkfontsel.c:74
+#: gtk/gtkfontsel.c:74
 msgid "abcdefghijk ABCDEFGHIJK"
 msgstr "abcdefghijk ABCDEFGHIJK"
 
-#: ../gtk/gtkfontsel.c:361
+#: gtk/gtkfontsel.c:361
 msgid "_Family:"
 msgstr "_Familie:"
 
-#: ../gtk/gtkfontsel.c:367
+#: gtk/gtkfontsel.c:367
 msgid "_Style:"
 msgstr "_Stil:"
 
-#: ../gtk/gtkfontsel.c:373
+#: gtk/gtkfontsel.c:373
 msgid "Si_ze:"
 msgstr "St_ørrelse:"
 
 #. create the text entry widget
-#: ../gtk/gtkfontsel.c:549
+#: gtk/gtkfontsel.c:549
 msgid "_Preview:"
 msgstr "_Forhåndsvisning:"
 
-#: ../gtk/gtkfontsel.c:1383
+#: gtk/gtkfontsel.c:1383
 msgid "Font Selection"
 msgstr "Valg av skrift"
 
-#: ../gtk/gtkgamma.c:401
+#: gtk/gtkgamma.c:401
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../gtk/gtkgamma.c:411
+#: gtk/gtkgamma.c:411
 msgid "_Gamma value"
 msgstr "_Gammaverdi"
 
 #. Remove this icon source so we don't keep trying to
 #. * load it.
 #.
-#: ../gtk/gtkiconfactory.c:1656
+#: gtk/gtkiconfactory.c:1656
 #, c-format
 msgid "Error loading icon: %s"
 msgstr "Feil under lasting av ikon: %s"
 
-#: ../gtk/gtkicontheme.c:1239
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1872,120 +1863,120 @@ msgstr ""
 "Du kan finne en kopi av det på:\n"
 "\t%s"
 
-#: ../gtk/gtkicontheme.c:1304
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Ikon «%s» er ikke tilstede i tema"
 
-#: ../gtk/gtkimmodule.c:427
+#: gtk/gtkimmodule.c:427
 msgid "Default"
 msgstr "Forvalg"
 
-#: ../gtk/gtkinputdialog.c:235
+#: gtk/gtkinputdialog.c:235
 msgid "Input"
 msgstr "Inndata"
 
-#: ../gtk/gtkinputdialog.c:244
+#: gtk/gtkinputdialog.c:244
 msgid "No extended input devices"
 msgstr "Ingen utvidede innenheter"
 
-#: ../gtk/gtkinputdialog.c:256
+#: gtk/gtkinputdialog.c:256
 msgid "_Device:"
 msgstr "_Enhet:"
 
-#: ../gtk/gtkinputdialog.c:273
+#: gtk/gtkinputdialog.c:273
 msgid "Disabled"
 msgstr "Slått av"
 
-#: ../gtk/gtkinputdialog.c:280
+#: gtk/gtkinputdialog.c:280
 msgid "Screen"
 msgstr "Skjerm"
 
-#: ../gtk/gtkinputdialog.c:287
+#: gtk/gtkinputdialog.c:287
 msgid "Window"
 msgstr "Vindu"
 
-#: ../gtk/gtkinputdialog.c:294
+#: gtk/gtkinputdialog.c:294
 msgid "_Mode: "
 msgstr "_Modus: "
 
 #. The axis listbox
-#: ../gtk/gtkinputdialog.c:325
+#: gtk/gtkinputdialog.c:325
 msgid "_Axes"
 msgstr "_Akser"
 
 #. Keys listbox
-#: ../gtk/gtkinputdialog.c:342
+#: gtk/gtkinputdialog.c:342
 msgid "_Keys"
 msgstr "_Taster"
 
-#: ../gtk/gtkinputdialog.c:562
+#: gtk/gtkinputdialog.c:562
 msgid "X"
 msgstr "X"
 
-#: ../gtk/gtkinputdialog.c:563
+#: gtk/gtkinputdialog.c:563
 msgid "Y"
 msgstr "Y"
 
-#: ../gtk/gtkinputdialog.c:564
+#: gtk/gtkinputdialog.c:564
 msgid "Pressure"
 msgstr "Trykk"
 
-#: ../gtk/gtkinputdialog.c:565
+#: gtk/gtkinputdialog.c:565
 msgid "X Tilt"
 msgstr "X-helling"
 
-#: ../gtk/gtkinputdialog.c:566
+#: gtk/gtkinputdialog.c:566
 msgid "Y Tilt"
 msgstr "Y-helling"
 
-#: ../gtk/gtkinputdialog.c:567
+#: gtk/gtkinputdialog.c:567
 msgid "Wheel"
 msgstr "Hjul"
 
-#: ../gtk/gtkinputdialog.c:607
+#: gtk/gtkinputdialog.c:607
 msgid "none"
 msgstr "ingen"
 
-#: ../gtk/gtkinputdialog.c:643 ../gtk/gtkinputdialog.c:679
+#: gtk/gtkinputdialog.c:643 gtk/gtkinputdialog.c:679
 msgid "(disabled)"
 msgstr "(slått av)"
 
-#: ../gtk/gtkinputdialog.c:672
+#: gtk/gtkinputdialog.c:672
 msgid "(unknown)"
 msgstr "(ukjent)"
 
 #. and clear button
-#: ../gtk/gtkinputdialog.c:759
+#: gtk/gtkinputdialog.c:759
 msgid "clear"
 msgstr "tøm"
 
-#: ../gtk/gtklabel.c:3985
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Velg alt"
 
 #. Description of --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:398
+#: gtk/gtkmain.c:398
 msgid "Load additional GTK+ modules"
 msgstr "Last tilleggsmoduler for GTK+"
 
 #. Placeholder in --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:399
+#: gtk/gtkmain.c:399
 msgid "MODULES"
 msgstr "MODULER"
 
 #. Description of --g-fatal-warnings in --help output
-#: ../gtk/gtkmain.c:401
+#: gtk/gtkmain.c:401
 msgid "Make all warnings fatal"
 msgstr "La alle advarsler være fatale"
 
 #. Description of --gtk-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:404
+#: gtk/gtkmain.c:404
 msgid "GTK+ debugging flags to set"
 msgstr "Feilsøkingsflagg som skal settes for GTK+"
 
 #. Description of --gtk-no-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:407
+#: gtk/gtkmain.c:407
 msgid "GTK+ debugging flags to unset"
 msgstr "Feilsøkingsflagg som skal fjernes for GTK+"
 
@@ -1994,517 +1985,526 @@ msgstr "Feilsøkingsflagg som skal fjernes for GTK+"
 #. * Do *not* translate it to "predefinito:LTR", if it
 #. * it isn't default:LTR or default:RTL it will not work
 #.
-#: ../gtk/gtkmain.c:476
+#: gtk/gtkmain.c:476
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../gtk/gtkmain.c:559
+#: gtk/gtkmain.c:559
 msgid "GTK+ Options"
 msgstr "Alternativer for GTK+"
 
-#: ../gtk/gtkmain.c:559
+#: gtk/gtkmain.c:559
 msgid "Show GTK+ Options"
 msgstr "Vis alternativer for GTK+"
 
-#: ../gtk/gtknotebook.c:2718 ../gtk/gtknotebook.c:5064
+#: gtk/gtknotebook.c:2718 gtk/gtknotebook.c:5064
 #, c-format
 msgid "Page %u"
 msgstr "Side %u"
 
-#: ../gtk/gtkradiotoolbutton.c:92
+#: gtk/gtkradiotoolbutton.c:92
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../gtk/gtkradiotoolbutton.c:93
+#: gtk/gtkradiotoolbutton.c:93
 msgid "The radio tool button whose group this button belongs to."
 msgstr "Radioverktøyknapp hvis gruppe denne knappen tilhører."
 
-#: ../gtk/gtkrc.c:2400
+#: gtk/gtkrc.c:2400
 #, c-format
 msgid "Unable to find include file: \"%s\""
 msgstr "Kan ikke finne include-fil: «%s»"
 
-#: ../gtk/gtkrc.c:3042 ../gtk/gtkrc.c:3045
+#: gtk/gtkrc.c:3042 gtk/gtkrc.c:3045
 #, c-format
 msgid "Unable to locate image file in pixmap_path: \"%s\""
 msgstr "Kunne ikke finne bildefil i pixmap_path: «%s»"
 
-#: ../gtk/gtkrc.c:3480
+#: gtk/gtkrc.c:3480
 #, c-format
 msgid "Pixmap path element: \"%s\" must be absolute, %s, line %d"
 msgstr "Stielement for pixmap: «%s» må være absolutt, %s, linje %d"
 
 #. KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate
-#: ../gtk/gtkstock.c:308
+#: gtk/gtkstock.c:308
 msgid "Information"
 msgstr "Informasjon"
 
-#: ../gtk/gtkstock.c:309
+#: gtk/gtkstock.c:309
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../gtk/gtkstock.c:310
+#: gtk/gtkstock.c:310
 msgid "Error"
 msgstr "Feil"
 
-#: ../gtk/gtkstock.c:311
+#: gtk/gtkstock.c:311
 msgid "Question"
 msgstr "Spørsmål"
 
 #. FIXME these need accelerators when appropriate, and
 #. * need the mnemonics to be rationalized
 #.
-#: ../gtk/gtkstock.c:316
+#: gtk/gtkstock.c:316
 msgid "_About"
 msgstr "_Om"
 
-#: ../gtk/gtkstock.c:318
+#: gtk/gtkstock.c:318
 msgid "_Apply"
 msgstr "_Bruk"
 
-#: ../gtk/gtkstock.c:319
+#: gtk/gtkstock.c:319
 msgid "_Bold"
 msgstr "_Uthevet"
 
-#: ../gtk/gtkstock.c:320
+#: gtk/gtkstock.c:320
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../gtk/gtkstock.c:321
+#: gtk/gtkstock.c:321
 msgid "_CD-Rom"
 msgstr "_CD-ROM"
 
-#: ../gtk/gtkstock.c:322
+#: gtk/gtkstock.c:322
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: ../gtk/gtkstock.c:323
+#: gtk/gtkstock.c:323
 msgid "_Close"
 msgstr "_Lukk"
 
-#: ../gtk/gtkstock.c:324
+#: gtk/gtkstock.c:324
 msgid "_Convert"
 msgstr "_Konverter"
 
-#: ../gtk/gtkstock.c:325
+#: gtk/gtkstock.c:325
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: ../gtk/gtkstock.c:326
+#: gtk/gtkstock.c:326
 msgid "Cu_t"
 msgstr "Klipp u_t"
 
-#: ../gtk/gtkstock.c:327
+#: gtk/gtkstock.c:327
 msgid "_Delete"
 msgstr "_Slett"
 
-#: ../gtk/gtkstock.c:328
+#: gtk/gtkstock.c:328
 msgid "_Execute"
 msgstr "_Kjør"
 
-#: ../gtk/gtkstock.c:329
+#: gtk/gtkstock.c:329
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../gtk/gtkstock.c:330
+#: gtk/gtkstock.c:330
 msgid "_Find"
 msgstr "_Finn"
 
-#: ../gtk/gtkstock.c:331
+#: gtk/gtkstock.c:331
 msgid "Find and _Replace"
 msgstr "Finn og e_rstatt"
 
-#: ../gtk/gtkstock.c:332
+#: gtk/gtkstock.c:332
 msgid "_Floppy"
 msgstr "_Diskett"
 
-#: ../gtk/gtkstock.c:333
+#: gtk/gtkstock.c:333
 msgid "_Fullscreen"
 msgstr "_Fullskjerm"
 
-#: ../gtk/gtkstock.c:334
+#: gtk/gtkstock.c:334
 msgid "_Leave Fullscreen"
 msgstr "For_lat fullskjerm"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:336
+#: gtk/gtkstock.c:336
 msgid "Navigation|_Bottom"
 msgstr "_Bunn"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:338
+#: gtk/gtkstock.c:338
 msgid "Navigation|_First"
 msgstr "_Første"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:340
+#: gtk/gtkstock.c:340
 msgid "Navigation|_Last"
 msgstr "_Siste"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:342
+#: gtk/gtkstock.c:342
 msgid "Navigation|_Top"
 msgstr "_Topp"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:344
+#: gtk/gtkstock.c:344
 msgid "Navigation|_Back"
 msgstr "Til_bake"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:346
+#: gtk/gtkstock.c:346
 msgid "Navigation|_Down"
 msgstr "Ne_d"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:348
+#: gtk/gtkstock.c:348
 msgid "Navigation|_Forward"
 msgstr "_Framover"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:350
+#: gtk/gtkstock.c:350
 msgid "Navigation|_Up"
 msgstr "_Opp"
 
-#: ../gtk/gtkstock.c:351
+#: gtk/gtkstock.c:351
 msgid "_Harddisk"
 msgstr "_Harddisk"
 
-#: ../gtk/gtkstock.c:352
+#: gtk/gtkstock.c:352
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../gtk/gtkstock.c:353
+#: gtk/gtkstock.c:353
 msgid "_Home"
 msgstr "_Hjem"
 
-#: ../gtk/gtkstock.c:354
+#: gtk/gtkstock.c:354
 msgid "Increase Indent"
 msgstr "Rykk inn mer"
 
-#: ../gtk/gtkstock.c:355
+#: gtk/gtkstock.c:355
 msgid "Decrease Indent"
 msgstr "Rykk inn mindre"
 
-#: ../gtk/gtkstock.c:356
+#: gtk/gtkstock.c:356
 msgid "_Index"
 msgstr "_Indeks"
 
-#: ../gtk/gtkstock.c:357
+#: gtk/gtkstock.c:357
 msgid "_Information"
 msgstr "_Informasjon"
 
-#: ../gtk/gtkstock.c:358
+#: gtk/gtkstock.c:358
 msgid "_Italic"
 msgstr "Kurs_iv"
 
-#: ../gtk/gtkstock.c:359
+#: gtk/gtkstock.c:359
 msgid "_Jump to"
 msgstr "_Hopp til"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:361
+#: gtk/gtkstock.c:361
 msgid "Justify|_Center"
 msgstr "_Sentrer"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:363
+#: gtk/gtkstock.c:363
 msgid "Justify|_Fill"
 msgstr "_Fyll"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:365
+#: gtk/gtkstock.c:365
 msgid "Justify|_Left"
 msgstr "_Venstre"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:367
+#: gtk/gtkstock.c:367
 msgid "Justify|_Right"
 msgstr "Høy_re"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:370
+#: gtk/gtkstock.c:370
 msgid "Media|_Forward"
 msgstr "_Fremover"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:372
+#: gtk/gtkstock.c:372
 msgid "Media|_Next"
 msgstr "_Neste"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:374
+#: gtk/gtkstock.c:374
 msgid "Media|P_ause"
 msgstr "P_ause"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:376
+#: gtk/gtkstock.c:376
 msgid "Media|_Play"
 msgstr "S_pill av"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:378
+#: gtk/gtkstock.c:378
 msgid "Media|Pre_vious"
 msgstr "_Forrige"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:380
+#: gtk/gtkstock.c:380
 msgid "Media|_Record"
 msgstr "_Ta opp"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:382
+#: gtk/gtkstock.c:382
 msgid "Media|R_ewind"
 msgstr "Spol tilbak_e"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:384
+#: gtk/gtkstock.c:384
 msgid "Media|_Stop"
 msgstr "_Stopp"
 
-#: ../gtk/gtkstock.c:385
+#: gtk/gtkstock.c:385
 msgid "_Network"
 msgstr "_Nettverk"
 
-#: ../gtk/gtkstock.c:386
+#: gtk/gtkstock.c:386
 msgid "_New"
 msgstr "_Ny"
 
-#: ../gtk/gtkstock.c:387
+#: gtk/gtkstock.c:387
 msgid "_No"
 msgstr "_Nei"
 
-#: ../gtk/gtkstock.c:388
+#: gtk/gtkstock.c:388
 msgid "_OK"
 msgstr "_OK"
 
-#: ../gtk/gtkstock.c:389
+#: gtk/gtkstock.c:389
 msgid "_Open"
 msgstr "_Åpne"
 
-#: ../gtk/gtkstock.c:390
+#: gtk/gtkstock.c:390
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: ../gtk/gtkstock.c:391
+#: gtk/gtkstock.c:391
 msgid "_Preferences"
 msgstr "_Brukervalg"
 
-#: ../gtk/gtkstock.c:392
+#: gtk/gtkstock.c:392
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: ../gtk/gtkstock.c:393
+#: gtk/gtkstock.c:393
 msgid "Print Pre_view"
 msgstr "Utskriftsforhåndsvisning"
 
-#: ../gtk/gtkstock.c:394
+#: gtk/gtkstock.c:394
 msgid "_Properties"
 msgstr "E_genskaper"
 
-#: ../gtk/gtkstock.c:395
+#: gtk/gtkstock.c:395
 msgid "_Quit"
 msgstr "A_vslutt"
 
-#: ../gtk/gtkstock.c:396
+#: gtk/gtkstock.c:396
 msgid "_Redo"
 msgstr "_Gjenopprett"
 
-#: ../gtk/gtkstock.c:397
+#: gtk/gtkstock.c:397
 msgid "_Refresh"
 msgstr "_Gjenles"
 
-#: ../gtk/gtkstock.c:399
+#: gtk/gtkstock.c:399
 msgid "_Revert"
 msgstr "Fo_rkast"
 
-#: ../gtk/gtkstock.c:400
+#: gtk/gtkstock.c:400
 msgid "_Save"
 msgstr "_Lagre"
 
-#: ../gtk/gtkstock.c:401
+#: gtk/gtkstock.c:401
 msgid "Save _As"
 msgstr "Lagre s_om"
 
-#: ../gtk/gtkstock.c:402
+#: gtk/gtkstock.c:402
 msgid "_Color"
 msgstr "_Farge"
 
-#: ../gtk/gtkstock.c:403
+#: gtk/gtkstock.c:403
 msgid "_Font"
 msgstr "Skri_fttype"
 
-#: ../gtk/gtkstock.c:404
+#: gtk/gtkstock.c:404
 msgid "_Ascending"
 msgstr "_Stigende"
 
-#: ../gtk/gtkstock.c:405
+#: gtk/gtkstock.c:405
 msgid "_Descending"
 msgstr "S_ynkende"
 
-#: ../gtk/gtkstock.c:406
+#: gtk/gtkstock.c:406
 msgid "_Spell Check"
 msgstr "_Stavekontroll"
 
-#: ../gtk/gtkstock.c:407
+#: gtk/gtkstock.c:407
 msgid "_Stop"
 msgstr "_Stopp"
 
-#: ../gtk/gtkstock.c:408
+#: gtk/gtkstock.c:408
 msgid "_Strikethrough"
 msgstr "_Gjennomstreking"
 
-#: ../gtk/gtkstock.c:409
+#: gtk/gtkstock.c:409
 msgid "_Undelete"
 msgstr "_Angre slett"
 
-#: ../gtk/gtkstock.c:410
+#: gtk/gtkstock.c:410
 msgid "_Underline"
 msgstr "_Understrek"
 
-#: ../gtk/gtkstock.c:411
+#: gtk/gtkstock.c:411
 msgid "_Undo"
 msgstr "_Angre"
 
-#: ../gtk/gtkstock.c:412
+#: gtk/gtkstock.c:412
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../gtk/gtkstock.c:413
+#: gtk/gtkstock.c:413
 msgid "_Normal Size"
 msgstr "_Normal størrelse"
 
-#: ../gtk/gtkstock.c:414
+#: gtk/gtkstock.c:414
 msgid "Best _Fit"
 msgstr "Beste _tilpasning"
 
-#: ../gtk/gtkstock.c:415
+#: gtk/gtkstock.c:415
 msgid "Zoom _In"
 msgstr "Zoom _inn"
 
-#: ../gtk/gtkstock.c:416
+#: gtk/gtkstock.c:416
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
 
-#: ../gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "VHM _Venstre-til-høyre-merke"
 
-#: ../gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "HVM _Høyre-til-venstre-merke"
 
-#: ../gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "VHI V_enstre-til-høyre-innbygging"
 
-#: ../gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "HVE Høyre-til-venstre-in_nbygging"
 
-#: ../gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "VHO Venstre-til-høyre-_overstyring"
 
-#: ../gtk/gtktextutil.c:58
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "HVO Høyre-til-venstre-o_verstyring"
 
-#: ../gtk/gtktextutil.c:59
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Pop directional formatting"
 
-#: ../gtk/gtktextutil.c:60
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "NBO _Nullbreddeområde"
 
-#: ../gtk/gtktextutil.c:61
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Zero width _joiner"
 
-#: ../gtk/gtktextutil.c:62
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Zero width _non-joiner"
 
-#: ../gtk/gtkthemes.c:71
+#: gtk/gtkthemes.c:71
 #, c-format
 msgid "Unable to locate theme engine in module_path: \"%s\","
 msgstr "Kunne ikke finne temamotor i module_path: «%s»."
 
-#: ../gtk/gtktipsquery.c:186
+#: gtk/gtktipsquery.c:186
 msgid "--- No Tip ---"
 msgstr "--- Ingen tips ---"
 
-#: ../gtk/gtkuimanager.c:1154
+#: gtk/gtkuimanager.c:1154
 #, c-format
 msgid "Unknown attribute '%s' on line %d char %d"
 msgstr "Ukjent attributt «%s» på linje %d tegn %d"
 
-#: ../gtk/gtkuimanager.c:1371
+#: gtk/gtkuimanager.c:1371
 #, c-format
 msgid "Unexpected start tag '%s' on line %d char %d"
 msgstr "Uventet startmarkering «%s» på linje %d tegn %d"
 
-#: ../gtk/gtkuimanager.c:1461
+#: gtk/gtkuimanager.c:1461
 #, c-format
 msgid "Unexpected character data on line %d char %d"
 msgstr "Uventet tegndata på linje %d tegn %d"
 
-#: ../gtk/gtkuimanager.c:2272
+#: gtk/gtkuimanager.c:2272
 msgid "Empty"
 msgstr "Tom"
 
 #. ID
-#: ../modules/input/imam-et.c:454
+#: modules/input/imam-et.c:454
 msgid "Amharic (EZ+)"
 msgstr "Ahmaisk (EZ+)"
 
 #. ID
-#: ../modules/input/imcedilla.c:91
+#: modules/input/imcedilla.c:91
 msgid "Cedilla"
 msgstr "Cedilla"
 
 #. ID
-#: ../modules/input/imcyrillic-translit.c:217
+#: modules/input/imcyrillic-translit.c:217
 msgid "Cyrillic (Transliterated)"
 msgstr "Kyrillisk (transliterert)"
 
 #. ID
-#: ../modules/input/iminuktitut.c:127
+#: modules/input/iminuktitut.c:127
 msgid "Inuktitut (Transliterated)"
 msgstr "Inukitut (transliterert)"
 
 #. ID
-#: ../modules/input/imipa.c:145
+#: modules/input/imipa.c:145
 msgid "IPA"
 msgstr "IPA"
 
 #. ID
-#: ../modules/input/imthai-broken.c:178
+#: modules/input/imthai-broken.c:178
 msgid "Thai (Broken)"
 msgstr "Thai (ødelagt)"
 
 #. ID
-#: ../modules/input/imti-er.c:453
+#: modules/input/imti-er.c:453
 msgid "Tigrigna-Eritrean (EZ+)"
 msgstr "Tigrigna-Eritreisk (EZ+)"
 
 #. ID
-#: ../modules/input/imti-et.c:453
+#: modules/input/imti-et.c:453
 msgid "Tigrigna-Ethiopian (EZ+)"
 msgstr "Tigrigna-Etiopisk (EZ+)"
 
 #. ID
-#: ../modules/input/imviqr.c:244
+#: modules/input/imviqr.c:244
 msgid "Vietnamese (VIQR)"
 msgstr "Vietnamesisk (VIQR)"
 
 #. ID
-#: ../modules/input/imxim.c:28
+#: modules/input/imxim.c:28
 msgid "X Input Method"
 msgstr "X-inndatametode"
 
-#: ../tests/testfilechooser.c:205
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Kunne ikke hente informasjon for fil «%s»: %s"
+
+#~ msgid "Do you want to replace it with the one you are saving?"
+#~ msgstr "Vil du erstatte den med filen du lagrer nå?"
+
+#~ msgid "_Select Another File"
+#~ msgstr "_Velg en annen fil"
+
+#~ msgid "_Replace Existing File"
+#~ msgstr "E_rstatt eksisterende fil"
diff --git a/po/ne.po b/po/ne.po
index 696f541f0f..9aa4a1bab1 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-05-20 11:33+0545\n"
 "Last-Translator: Jyotshna Shrestha <shresthajyo@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: nplurals=2;plural=(n!=0)\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "फाईल '%s' खोल्न असफल: %s"
@@ -27,7 +27,7 @@ msgid "Image file '%s' contains no data"
 msgstr "प्रतिविम्ब फाईल '%s' मा तथ्याङ्क छैन"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1233,20 +1233,20 @@ msgstr "रङ्गको चक्र"
 msgid "Color Selection"
 msgstr "रङ्ग छनोट"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "सबै छान्नुस्"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "निवेश गर्ने _तरिका"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "युनीकोड नियन्त्रण वर्ण _घुसाउ"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "अमान्य फाइलनाम: %s"
@@ -1255,12 +1255,12 @@ msgstr "अमान्य फाइलनाम: %s"
 msgid "Select A File"
 msgstr "फाइल छनौट गर"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "घर"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "मंडला"
@@ -1273,238 +1273,254 @@ msgstr "(कोही छैन)"
 msgid "Other..."
 msgstr "अन्य..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "फाइलको बारेमा सुचना पुन: प्रप्त गर्न सकेन"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "पृष्ठचिन्ह थप गर्न सकेन"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "पृष्ठचिन्ह हटाउन सकेन"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "फोल्डर सृजना गर्न सकेन"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "अबैध फाइल नाम"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "फोल्डरको सामग्रीहरू प्रदर्शन गर्न सकेन"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "'%s' को बारेमा सुचना पाउँन सकेन: %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "पृष्ठचिन्हहरूमा फोल्डर '%s' थप गर्नुहोला"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "पृष्ठचिन्हहरूमा चालु फोल्डर थप गर्नुहोला"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "पृष्ठचिन्हहरूमा छानिएका फोल्डरहरू थप गर्नुहोला"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "पृष्ठचिन्ह '%s' हटाउनुहोला"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "'%s' को लागी पृष्ठचिन्ह थप गर्न सकेन किनभने यो अमान्य बाटो नाम हो।"
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "हटाऊ"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "पुन: नामाकरण..."
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "सरलबिधिहरू"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "फोल्डर"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_थप्नुस्"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "पृष्ठचिन्हहरूमा छानिएका फोल्डर थप गर्नुहोला"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_हटाउनुस्"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "छानिएका पृष्ठचिन्ह हटाउनुहोला"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "वस्तु छान्न सकेन"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "'%s' को लागी पृष्ठचिन्ह थप गर्न सकेन किनभने यो अमान्य बाटो नाम हो।"
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "पृष्ठचिन्हहरूमा थप्नुहोला"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "स्थान खोल्नुहोस"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "लुकेको फाईल देखाउनुस्"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "फाइलहरू"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "नाम"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "आकार"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "सुधारिएको"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "कुन प्रकारको फाईलहरू हेर्ने हो छान्नुहोला"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "फोल्डर बनाउनुस्"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_नाम:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_अरु फोल्डरहरूको लागी ब्राउज गर्नुहोला"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "फोल्डरमा भण्डारण गर्नुस्"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "फोल्डरमा बनाउनुस्"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "फोल्डरलाई परिवर्तन गर्न सकेन किनभने यो स्थानिय होइन।"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "सरलबिधि %s अवस्थित छैन"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_पुनर्नामाकरण"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "%s माउण्ट गर्न सकेन"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "नयाँ फोल्डरको नाम लेख"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d बाईट"
 msgstr[1] "%d बाईट्स"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "अपरिचित"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "आज"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "हिजो"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "फोल्डर परिवर्तन गर्न सकेन"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "तपाईले उल्लेख गर्नु भएको फोल्डर अमान्य बाटो हो।"
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "'%s' र '%s' बाट फाइल नाम निर्माण गर्न सकेन"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "वस्तु छान्न सकेन"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "स्थान खोल्नुहोला"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "स्थानमा भण्डारण गर्नुहोला"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "स्थान:"
 
@@ -1703,7 +1719,8 @@ msgid "This file system does not support mounting"
 msgstr "यो फाइल प्रणालीले माउण्ट गर्न सहयोग गरेन"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "फाइल पद्धति"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1804,7 +1821,7 @@ msgstr "_गामा मान"
 msgid "Error loading icon: %s"
 msgstr "चित्रसंकेत लोड गर्दाको त्रुटि: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1817,7 +1834,7 @@ msgstr ""
 "संभवतः तपाईँले यो फाइल जडान गर्नुपर्छ होला ।\n"
 " \t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "थीममा '%s' चिन्ह छैन"
@@ -1906,7 +1923,7 @@ msgstr "(अपरिचित)"
 msgid "clear"
 msgstr "सफा"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "सबै छान्नुस्"
 
@@ -2333,43 +2350,43 @@ msgstr "जूम _बढाउ"
 msgid "Zoom _Out"
 msgstr "जूम _घटाउ"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "एलआरएम _देब्रे-बाट-दाहिने चिन्ह"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "आरएलएम_दाहिने-बाट-देब्रे चिन्ह"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "एलआरई बायाँबाट दायाँ संकेतन"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "आरएलई  बायाँबाट दायाँ संकेतन"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "एलआरओ बायाँबाट दायाँ "
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "दायाँबाट बायाँ आरएलओ अधिगअन"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "पिडिएफ पप निर्देशन प्रारूपण"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "जेडडब्ल्युएस _शून्यसँगको खालीस्थान"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "जेडडब्ल्युजे शून्यले _जोड्ने"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "जेडडब्ल्युएनजे शून्यले _नजोड्ने"
 
@@ -2460,7 +2477,7 @@ msgstr "भियत्‍नामिज (भिआईक्युआर)"
 msgid "X Input Method"
 msgstr "'एक्स' निवेश विधि"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "फाइल '%s' का लागि सूचना पाउन सकेन: %s"
diff --git a/po/nl.po b/po/nl.po
index e76fca5298..c55ab919e4 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 22:24+0000\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-07-09 03:36+0200\n"
 "Last-Translator: Tino Meinen <a.t.meinen@chello.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -27,19 +27,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:153 ../gdk-pixbuf/gdk-pixbuf-io.c:838
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1089 ../tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Openen van bestand '%s' mislukt: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:166 ../gdk-pixbuf/gdk-pixbuf-io.c:850
+#: gdk-pixbuf/gdk-pixbuf-animation.c:166 gdk-pixbuf/gdk-pixbuf-io.c:850
 #, c-format
 msgid "Image file '%s' contains no data"
 msgstr "Afbeelding '%s' bevat geen data"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:208 ../gdk-pixbuf/gdk-pixbuf-io.c:887
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1130 ../tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -47,7 +47,7 @@ msgstr ""
 "Laden van afbeelding '%s' mislukt: reden onbekend, waarschijnlijk een "
 "beschadigde afbeelding"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:241
+#: gdk-pixbuf/gdk-pixbuf-animation.c:241
 #, c-format
 msgid ""
 "Failed to load animation '%s': reason not known, probably a corrupt "
@@ -56,12 +56,12 @@ msgstr ""
 "Laden van animatie '%s' mislukt: reden onbekend, waarschijnlijk een "
 "beschadigde animatie"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:444
+#: gdk-pixbuf/gdk-pixbuf-io.c:444
 #, c-format
 msgid "Unable to load image-loading module: %s: %s"
 msgstr "Laden van afbeeldingslader %s mislukt: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:459
+#: gdk-pixbuf/gdk-pixbuf-io.c:459
 #, c-format
 msgid ""
 "Image-loading module %s does not export the proper interface; perhaps it's "
@@ -70,55 +70,55 @@ msgstr ""
 "Afbeeldingslader %s geeft de verkeerde interface door; misschien is het de "
 "lader van een andere GTK versie?"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:628 ../gdk-pixbuf/gdk-pixbuf-io.c:680
+#: gdk-pixbuf/gdk-pixbuf-io.c:628 gdk-pixbuf/gdk-pixbuf-io.c:680
 #, c-format
 msgid "Image type '%s' is not supported"
 msgstr "Afbeeldingstype '%s' wordt niet ondersteund"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:720
+#: gdk-pixbuf/gdk-pixbuf-io.c:720
 #, c-format
 msgid "Couldn't recognize the image file format for file '%s'"
 msgstr "Afbeeldingstype van bestand '%s' werd niet herkend"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:728
+#: gdk-pixbuf/gdk-pixbuf-io.c:728
 msgid "Unrecognized image file format"
 msgstr "Onbekend afbeeldingstype"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:896
+#: gdk-pixbuf/gdk-pixbuf-io.c:896
 #, c-format
 msgid "Failed to load image '%s': %s"
 msgstr "Laden van afbeelding '%s' mislukt: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1357
+#: gdk-pixbuf/gdk-pixbuf-io.c:1357
 #, c-format
 msgid "Error writing to image file: %s"
 msgstr "Fout bij het schrijven naar afbeelding: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1403 ../gdk-pixbuf/gdk-pixbuf-io.c:1532
+#: gdk-pixbuf/gdk-pixbuf-io.c:1403 gdk-pixbuf/gdk-pixbuf-io.c:1532
 #, c-format
 msgid "This build of gdk-pixbuf does not support saving the image format: %s"
 msgstr ""
 "Deze versie van gdk-pixbuf heeft geen ondersteuning voor het opslaan van het "
 "bestandsformaat: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1437
+#: gdk-pixbuf/gdk-pixbuf-io.c:1437
 msgid "Insufficient memory to save image to callback"
 msgstr "Onvoldoende geheugen om het image op te slaan naar de callback"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1449
+#: gdk-pixbuf/gdk-pixbuf-io.c:1449
 msgid "Failed to open temporary file"
 msgstr "Kon tijdelijk bestand niet openen"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1474
+#: gdk-pixbuf/gdk-pixbuf-io.c:1474
 msgid "Failed to read from temporary file"
 msgstr "Niet mogelijk om van tijdelijk bestand te lezen"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1708
+#: gdk-pixbuf/gdk-pixbuf-io.c:1708
 #, c-format
 msgid "Failed to open '%s' for writing: %s"
 msgstr "Openen van '%s' voor schrijven is mislukt: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1732
+#: gdk-pixbuf/gdk-pixbuf-io.c:1732
 #, c-format
 msgid ""
 "Failed to close '%s' while writing image, all data may not have been saved: %"
@@ -127,19 +127,19 @@ msgstr ""
 "Sluiten van '%s' tijdens het schrijven is mislukt; er kan data verloren "
 "gegaan zijn: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1952 ../gdk-pixbuf/gdk-pixbuf-io.c:2002
+#: gdk-pixbuf/gdk-pixbuf-io.c:1952 gdk-pixbuf/gdk-pixbuf-io.c:2002
 msgid "Insufficient memory to save image into a buffer"
 msgstr "Onvoldoende geheugen om afbeelding in een buffer op te slaan"
 
 # incrementeel is geen nederlands woord.
 # Hier wordt ws bedoeld:
 # Het gedeeltelijk laden en dan al gedeeltelijk weergaven van een afbeelding
-#: ../gdk-pixbuf/gdk-pixbuf-loader.c:383
+#: gdk-pixbuf/gdk-pixbuf-loader.c:383
 #, c-format
 msgid "Incremental loading of image type '%s' is not supported"
 msgstr "Geleidelijk laden van afbeeldingstype '%s' wordt niet ondersteund"
 
-#: ../gdk-pixbuf/gdk-pixbuf-loader.c:411 ../gdk-pixbuf/gdk-pixbuf-loader.c:513
+#: gdk-pixbuf/gdk-pixbuf-loader.c:411 gdk-pixbuf/gdk-pixbuf-loader.c:513
 #, c-format
 msgid ""
 "Internal error: Image loader module '%s' failed to begin loading an image, "
@@ -148,96 +148,92 @@ msgstr ""
 "Interne fout: afbeeldingslader '%s' startte niet met het laden van een "
 "afbeelding, maar gaf geen reden daarvoor"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:147
+#: gdk-pixbuf/gdk-pixdata.c:147
 msgid "Image header corrupt"
 msgstr "Afbeeldingsheader beschadigd"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:152
+#: gdk-pixbuf/gdk-pixdata.c:152
 msgid "Image format unknown"
 msgstr "Bestandsformaat van afbeelding is onbekend"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:157 ../gdk-pixbuf/gdk-pixdata.c:487
+#: gdk-pixbuf/gdk-pixdata.c:157 gdk-pixbuf/gdk-pixdata.c:487
 msgid "Image pixel data corrupt"
 msgstr "Afbeelding beeldpuntdata corrupt"
 
 # meervoud in nl van byte is byte
 # reserveren van %u byte geheugenruimte voor de afbeelding is mislukt
 # Niet mogelijk om afbeeldingsbuffer van %u byte te alloceren
-#: ../gdk-pixbuf/gdk-pixdata.c:431
+#: gdk-pixbuf/gdk-pixdata.c:431
 #, c-format
 msgid "failed to allocate image buffer of %u byte"
 msgid_plural "failed to allocate image buffer of %u bytes"
 msgstr[0] "reserveren van %u byte geheugenruimte voor de afbeelding is mislukt"
 msgstr[1] "reserveren van %u byte geheugenruimte voor de afbeelding is mislukt"
 
-#: ../gdk-pixbuf/io-ani.c:244
+#: gdk-pixbuf/io-ani.c:244
 msgid "Unexpected icon chunk in animation"
 msgstr "Onverwacht pictogram-brokje in animatie"
 
-#: ../gdk-pixbuf/io-ani.c:337
+#: gdk-pixbuf/io-ani.c:337
 msgid "Unsupported animation type"
 msgstr "Niet ondersteund animatietype"
 
-#: ../gdk-pixbuf/io-ani.c:348 ../gdk-pixbuf/io-ani.c:538
+#: gdk-pixbuf/io-ani.c:348 gdk-pixbuf/io-ani.c:538
 msgid "Invalid header in animation"
 msgstr "Ongeldige header in animatie"
 
-#: ../gdk-pixbuf/io-ani.c:358 ../gdk-pixbuf/io-ani.c:382
-#: ../gdk-pixbuf/io-ani.c:441 ../gdk-pixbuf/io-ani.c:460
-#: ../gdk-pixbuf/io-ani.c:511 ../gdk-pixbuf/io-ani.c:583
+#: gdk-pixbuf/io-ani.c:358 gdk-pixbuf/io-ani.c:382 gdk-pixbuf/io-ani.c:441
+#: gdk-pixbuf/io-ani.c:460 gdk-pixbuf/io-ani.c:511 gdk-pixbuf/io-ani.c:583
 msgid "Not enough memory to load animation"
 msgstr "Onvoldoende geheugen om animatie te laden"
 
-#: ../gdk-pixbuf/io-ani.c:400 ../gdk-pixbuf/io-ani.c:417
-#: ../gdk-pixbuf/io-ani.c:428
+#: gdk-pixbuf/io-ani.c:400 gdk-pixbuf/io-ani.c:417 gdk-pixbuf/io-ani.c:428
 msgid "Malformed chunk in animation"
 msgstr "Misvormd brokje in animatie"
 
-#: ../gdk-pixbuf/io-ani.c:676
+#: gdk-pixbuf/io-ani.c:676
 msgid "The ANI image format"
 msgstr "Het ANI-bestandsformaat"
 
-#: ../gdk-pixbuf/io-bmp.c:228 ../gdk-pixbuf/io-bmp.c:306
-#: ../gdk-pixbuf/io-bmp.c:338 ../gdk-pixbuf/io-bmp.c:361
-#: ../gdk-pixbuf/io-bmp.c:442
+#: gdk-pixbuf/io-bmp.c:228 gdk-pixbuf/io-bmp.c:306 gdk-pixbuf/io-bmp.c:338
+#: gdk-pixbuf/io-bmp.c:361 gdk-pixbuf/io-bmp.c:442
 msgid "BMP image has bogus header data"
 msgstr "BMP-afbeelding bevat onzinnige headerdata"
 
-#: ../gdk-pixbuf/io-bmp.c:239 ../gdk-pixbuf/io-bmp.c:401
+#: gdk-pixbuf/io-bmp.c:239 gdk-pixbuf/io-bmp.c:401
 msgid "Not enough memory to load bitmap image"
 msgstr "Onvoldoende geheugen voor het laden van de bitmap-afbeelding"
 
-#: ../gdk-pixbuf/io-bmp.c:287
+#: gdk-pixbuf/io-bmp.c:287
 msgid "BMP image has unsupported header size"
 msgstr "BMP-afbeelding heeft een niet-ondersteunde headergrootte"
 
-#: ../gdk-pixbuf/io-bmp.c:325
+#: gdk-pixbuf/io-bmp.c:325
 msgid "Topdown BMP images cannot be compressed"
 msgstr "Topdown BMP-afbeeldingen kunnen niet worden gecomprimeerd"
 
-#: ../gdk-pixbuf/io-bmp.c:1203
+#: gdk-pixbuf/io-bmp.c:1203
 msgid "Couldn't allocate memory for saving BMP file"
 msgstr "Kon geen geheugenruimte reserveren voor opslaan van BMP-bestand"
 
-#: ../gdk-pixbuf/io-bmp.c:1244
+#: gdk-pixbuf/io-bmp.c:1244
 msgid "Couldn't write to BMP file"
 msgstr "Kon niet naar BMP-bestand schrijven"
 
-#: ../gdk-pixbuf/io-bmp.c:1293
+#: gdk-pixbuf/io-bmp.c:1293
 msgid "The BMP image format"
 msgstr "Het BMP-bestandsformaat"
 
-#: ../gdk-pixbuf/io-gif.c:220
+#: gdk-pixbuf/io-gif.c:220
 #, c-format
 msgid "Failure reading GIF: %s"
 msgstr "Lezen van GIF mislukt: %s"
 
-#: ../gdk-pixbuf/io-gif.c:492 ../gdk-pixbuf/io-gif.c:1463
-#: ../gdk-pixbuf/io-gif.c:1624
+#: gdk-pixbuf/io-gif.c:492 gdk-pixbuf/io-gif.c:1463 gdk-pixbuf/io-gif.c:1624
 msgid "GIF file was missing some data (perhaps it was truncated somehow?)"
 msgstr "Er ontbrak data in het GIF-bestand (misschien was het afgebroken?)"
 
-#: ../gdk-pixbuf/io-gif.c:501
+#: gdk-pixbuf/io-gif.c:501
 #, c-format
 msgid "Internal error in the GIF loader (%s)"
 msgstr "Interne fout in de GIF-lader (%s)"
@@ -247,47 +243,47 @@ msgstr "Interne fout in de GIF-lader (%s)"
 # Ze zouden deze melding eigenlijk niet mogen zien.
 # Om degene die wel weten wat ze ermee kunnen doen niet op een dwaalspoor
 # te zetten: Niet vertaald
-#: ../gdk-pixbuf/io-gif.c:575
+#: gdk-pixbuf/io-gif.c:575
 msgid "Stack overflow"
 msgstr "Stack overflow"
 
-#: ../gdk-pixbuf/io-gif.c:635
+#: gdk-pixbuf/io-gif.c:635
 msgid "GIF image loader cannot understand this image."
 msgstr "GIF-lader begrijpt deze afbeelding niet."
 
 # onjuiste code
-#: ../gdk-pixbuf/io-gif.c:664
+#: gdk-pixbuf/io-gif.c:664
 msgid "Bad code encountered"
 msgstr "Foutieve code ontdekt"
 
-#: ../gdk-pixbuf/io-gif.c:674
+#: gdk-pixbuf/io-gif.c:674
 msgid "Circular table entry in GIF file"
 msgstr "Circulair tabelveld in GIF-bestand"
 
-#: ../gdk-pixbuf/io-gif.c:862 ../gdk-pixbuf/io-gif.c:1451
-#: ../gdk-pixbuf/io-gif.c:1497 ../gdk-pixbuf/io-gif.c:1612
+#: gdk-pixbuf/io-gif.c:862 gdk-pixbuf/io-gif.c:1451 gdk-pixbuf/io-gif.c:1497
+#: gdk-pixbuf/io-gif.c:1612
 msgid "Not enough memory to load GIF file"
 msgstr "Onvoldoende geheugen om GIF-bestand te laden"
 
 # composite a frame?
-#: ../gdk-pixbuf/io-gif.c:947
+#: gdk-pixbuf/io-gif.c:947
 msgid "Not enough memory to composite a frame in GIF file"
 msgstr "Onvoldoende geheugen om een frame samen te stellen in GIF-bestand"
 
-#: ../gdk-pixbuf/io-gif.c:1116
+#: gdk-pixbuf/io-gif.c:1116
 msgid "GIF image is corrupt (incorrect LZW compression)"
 msgstr "GIF-bestand is beschadigd (incorrecte LZW-compressie)"
 
-#: ../gdk-pixbuf/io-gif.c:1166
+#: gdk-pixbuf/io-gif.c:1166
 msgid "File does not appear to be a GIF file"
 msgstr "Bestand lijkt geen GIF-bestand te zijn"
 
-#: ../gdk-pixbuf/io-gif.c:1178
+#: gdk-pixbuf/io-gif.c:1178
 #, c-format
 msgid "Version %s of the GIF file format is not supported"
 msgstr "Versie %s van het GIF-bestandsformaat wordt niet ondersteund"
 
-#: ../gdk-pixbuf/io-gif.c:1287
+#: gdk-pixbuf/io-gif.c:1287
 msgid ""
 "GIF image has no global colormap, and a frame inside it has no local "
 "colormap."
@@ -295,67 +291,66 @@ msgstr ""
 "GIF-bestand heeft geen algemeen kleurenpalet, en een kader daarbinnen heeft "
 "geen lokaal kleurenpalet"
 
-#: ../gdk-pixbuf/io-gif.c:1519
+#: gdk-pixbuf/io-gif.c:1519
 msgid "GIF image was truncated or incomplete."
 msgstr "GIF-bestand is afgebroken of onvolledig"
 
-#: ../gdk-pixbuf/io-gif.c:1671
+#: gdk-pixbuf/io-gif.c:1671
 msgid "The GIF image format"
 msgstr "Het GIF-bestandsformaat"
 
-#: ../gdk-pixbuf/io-ico.c:219 ../gdk-pixbuf/io-ico.c:271
-#: ../gdk-pixbuf/io-ico.c:340 ../gdk-pixbuf/io-ico.c:403
-#: ../gdk-pixbuf/io-ico.c:433
+#: gdk-pixbuf/io-ico.c:219 gdk-pixbuf/io-ico.c:271 gdk-pixbuf/io-ico.c:340
+#: gdk-pixbuf/io-ico.c:403 gdk-pixbuf/io-ico.c:433
 msgid "Not enough memory to load icon"
 msgstr "Onvoldoende geheugen om pictogram te laden"
 
-#: ../gdk-pixbuf/io-ico.c:256 ../gdk-pixbuf/io-ico.c:330
+#: gdk-pixbuf/io-ico.c:256 gdk-pixbuf/io-ico.c:330
 msgid "Invalid header in icon"
 msgstr "Ongeldige header in pictogram"
 
-#: ../gdk-pixbuf/io-ico.c:293
+#: gdk-pixbuf/io-ico.c:293
 msgid "Icon has zero width"
 msgstr "Pictogram heeft breedte nul"
 
-#: ../gdk-pixbuf/io-ico.c:303
+#: gdk-pixbuf/io-ico.c:303
 msgid "Icon has zero height"
 msgstr "Pictogram heeft hoogte nul"
 
-#: ../gdk-pixbuf/io-ico.c:355
+#: gdk-pixbuf/io-ico.c:355
 msgid "Compressed icons are not supported"
 msgstr "Gecomprimeerde pictogrammen worden niet ondersteund"
 
-#: ../gdk-pixbuf/io-ico.c:388
+#: gdk-pixbuf/io-ico.c:388
 msgid "Unsupported icon type"
 msgstr "Niet ondersteund pictogramtype"
 
-#: ../gdk-pixbuf/io-ico.c:482
+#: gdk-pixbuf/io-ico.c:482
 msgid "Not enough memory to load ICO file"
 msgstr "Onvoldoende geheugen om ICO-bestand te laden"
 
-#: ../gdk-pixbuf/io-ico.c:947
+#: gdk-pixbuf/io-ico.c:947
 msgid "Image too large to be saved as ICO"
 msgstr "Afbeelding te groot om als ICO-bestand te worden opgeslagen"
 
-#: ../gdk-pixbuf/io-ico.c:958
+#: gdk-pixbuf/io-ico.c:958
 msgid "Cursor hotspot outside image"
 msgstr "Cursor hotspot valt buiten de afbeelding"
 
-#: ../gdk-pixbuf/io-ico.c:981
+#: gdk-pixbuf/io-ico.c:981
 #, c-format
 msgid "Unsupported depth for ICO file: %d"
 msgstr "Niet ondersteunde diepte voor ICO-bestand: %d"
 
-#: ../gdk-pixbuf/io-ico.c:1210
+#: gdk-pixbuf/io-ico.c:1210
 msgid "The ICO image format"
 msgstr "Het ICO-bestandsformaat"
 
-#: ../gdk-pixbuf/io-jpeg.c:114
+#: gdk-pixbuf/io-jpeg.c:114
 #, c-format
 msgid "Error interpreting JPEG image file (%s)"
 msgstr "Fout bij het interpreteren van JPEG-afbeelding (%s)"
 
-#: ../gdk-pixbuf/io-jpeg.c:349
+#: gdk-pixbuf/io-jpeg.c:349
 msgid ""
 "Insufficient memory to load image, try exiting some applications to free "
 "memory"
@@ -363,17 +358,17 @@ msgstr ""
 "Onvoldoende geheugen om afbeelding te laten, probeer enkele programma's af "
 "te sluiten om geheugen vrij te maken"
 
-#: ../gdk-pixbuf/io-jpeg.c:383 ../gdk-pixbuf/io-jpeg.c:749
+#: gdk-pixbuf/io-jpeg.c:383 gdk-pixbuf/io-jpeg.c:749
 #, c-format
 msgid "Unsupported JPEG color space (%s)"
 msgstr "Niet ondersteunde JPEG kleurruimte (%s)"
 
-#: ../gdk-pixbuf/io-jpeg.c:481 ../gdk-pixbuf/io-jpeg.c:678
-#: ../gdk-pixbuf/io-jpeg.c:943 ../gdk-pixbuf/io-jpeg.c:952
+#: gdk-pixbuf/io-jpeg.c:481 gdk-pixbuf/io-jpeg.c:678 gdk-pixbuf/io-jpeg.c:943
+#: gdk-pixbuf/io-jpeg.c:952
 msgid "Couldn't allocate memory for loading JPEG file"
 msgstr "Kon geen geheugenruimte reserveren voor laden van JPEG-bestand"
 
-#: ../gdk-pixbuf/io-jpeg.c:894
+#: gdk-pixbuf/io-jpeg.c:894
 #, c-format
 msgid ""
 "JPEG quality must be a value between 0 and 100; value '%s' could not be "
@@ -382,94 +377,94 @@ msgstr ""
 "JPEG-kwaliteit moet een waarde tussen 0 en 100 zijn: waarde '%s' kan niet "
 "verwerkt worden."
 
-#: ../gdk-pixbuf/io-jpeg.c:909
+#: gdk-pixbuf/io-jpeg.c:909
 #, c-format
 msgid ""
 "JPEG quality must be a value between 0 and 100; value '%d' is not allowed."
 msgstr ""
 "JPEG-kwaliteit moet tussen 0 en 100 liggen; waarde '%d' is niet toegestaan."
 
-#: ../gdk-pixbuf/io-jpeg.c:1071
+#: gdk-pixbuf/io-jpeg.c:1071
 msgid "The JPEG image format"
 msgstr "Het JPEG-bestandsformaat"
 
-#: ../gdk-pixbuf/io-pcx.c:191
+#: gdk-pixbuf/io-pcx.c:191
 msgid "Couldn't allocate memory for header"
 msgstr "Kon geen geheugenruimte reserveren voor de header"
 
-#: ../gdk-pixbuf/io-pcx.c:206 ../gdk-pixbuf/io-pcx.c:566
+#: gdk-pixbuf/io-pcx.c:206 gdk-pixbuf/io-pcx.c:566
 msgid "Couldn't allocate memory for context buffer"
 msgstr "Kon geen geheugenruimte reserveren voor de context-buffer"
 
-#: ../gdk-pixbuf/io-pcx.c:607
+#: gdk-pixbuf/io-pcx.c:607
 msgid "Image has invalid width and/or height"
 msgstr "Afbeelding heeft ongeldige breedte en/of hoogte"
 
-#: ../gdk-pixbuf/io-pcx.c:619 ../gdk-pixbuf/io-pcx.c:680
+#: gdk-pixbuf/io-pcx.c:619 gdk-pixbuf/io-pcx.c:680
 msgid "Image has unsupported bpp"
 msgstr "Afbeelding heeft een niet ondersteund bpp"
 
-#: ../gdk-pixbuf/io-pcx.c:624 ../gdk-pixbuf/io-pcx.c:632
+#: gdk-pixbuf/io-pcx.c:624 gdk-pixbuf/io-pcx.c:632
 #, c-format
 msgid "Image has unsupported number of %d-bit planes"
 msgstr "Afbeelding heeft een niet ondersteund aantal '%d-bit planes'"
 
-#: ../gdk-pixbuf/io-pcx.c:648
+#: gdk-pixbuf/io-pcx.c:648
 msgid "Couldn't create new pixbuf"
 msgstr "Kon geen nieuwe pixbuf aanmaken"
 
-#: ../gdk-pixbuf/io-pcx.c:656
+#: gdk-pixbuf/io-pcx.c:656
 msgid "Couldn't allocate memory for line data"
 msgstr "Kon geen geheugenruimte reserveren voor lijn-data"
 
-#: ../gdk-pixbuf/io-pcx.c:663
+#: gdk-pixbuf/io-pcx.c:663
 msgid "Couldn't allocate memory for paletted data"
 msgstr "Kon geen geheugenruimte reserveren voor 'paletted data'"
 
-#: ../gdk-pixbuf/io-pcx.c:710
+#: gdk-pixbuf/io-pcx.c:710
 msgid "Didn't get all lines of PCX image"
 msgstr "Niet alle lijnen van PCX-afbeelding verkregen"
 
-#: ../gdk-pixbuf/io-pcx.c:717
+#: gdk-pixbuf/io-pcx.c:717
 msgid "No palette found at end of PCX data"
 msgstr "Geen palet gevonden aan het einde van PCX-data"
 
-#: ../gdk-pixbuf/io-pcx.c:758
+#: gdk-pixbuf/io-pcx.c:758
 msgid "The PCX image format"
 msgstr "Het PCX-bestandsformaat"
 
-#: ../gdk-pixbuf/io-png.c:55
+#: gdk-pixbuf/io-png.c:55
 msgid "Bits per channel of PNG image is invalid."
 msgstr "Bits per kanaal van PNG-afbeelding is ongeldig."
 
-#: ../gdk-pixbuf/io-png.c:136
+#: gdk-pixbuf/io-png.c:136
 msgid "Transformed PNG has zero width or height."
 msgstr "Getransformeerde PNG heeft nul breedte of hoogte."
 
-#: ../gdk-pixbuf/io-png.c:144
+#: gdk-pixbuf/io-png.c:144
 msgid "Bits per channel of transformed PNG is not 8."
 msgstr "Bits per kanaal van getransformeerde PNG is niet gelijk aan 8."
 
-#: ../gdk-pixbuf/io-png.c:153
+#: gdk-pixbuf/io-png.c:153
 msgid "Transformed PNG not RGB or RGBA."
 msgstr "Getransformeerde PNG is geen RGB of RGBA."
 
-#: ../gdk-pixbuf/io-png.c:162
+#: gdk-pixbuf/io-png.c:162
 msgid "Transformed PNG has unsupported number of channels, must be 3 or 4."
 msgstr ""
 "Getransformeerde PNG heeft niet ondersteund aantal kanalen, moet gelijk zijn "
 "aan 3 of 4."
 
-#: ../gdk-pixbuf/io-png.c:183
+#: gdk-pixbuf/io-png.c:183
 #, c-format
 msgid "Fatal error in PNG image file: %s"
 msgstr "Fatale fout in PNG-afbeelding: %s"
 
-#: ../gdk-pixbuf/io-png.c:301
+#: gdk-pixbuf/io-png.c:301
 msgid "Insufficient memory to load PNG file"
 msgstr "Onvoldoende geheugen om PNG-bestand te laden"
 
-#: ../gdk-pixbuf/io-png.c:618
+#: gdk-pixbuf/io-png.c:618
 #, c-format
 msgid ""
 "Insufficient memory to store a %ld by %ld image; try exiting some "
@@ -478,28 +473,28 @@ msgstr ""
 "Onvoldoende geheugen om een afbeelding van %ld bij %ld op te slaan; probeer "
 "enkele toepassingen af te sluiten om geheugen vrij te maken"
 
-#: ../gdk-pixbuf/io-png.c:669
+#: gdk-pixbuf/io-png.c:669
 msgid "Fatal error reading PNG image file"
 msgstr "Fatale fout bij het lezen van PNG-afbeelding"
 
-#: ../gdk-pixbuf/io-png.c:718
+#: gdk-pixbuf/io-png.c:718
 #, c-format
 msgid "Fatal error reading PNG image file: %s"
 msgstr "Fatale fout bij het lezen van PNG-afbeelding: %s"
 
-#: ../gdk-pixbuf/io-png.c:810
+#: gdk-pixbuf/io-png.c:810
 msgid ""
 "Keys for PNG text chunks must have at least 1 and at most 79 characters."
 msgstr ""
 "Sleutels voor PNG-tekstblokken moeten minimaal 1, en maximaal 79 tekens "
 "bevatten"
 
-#: ../gdk-pixbuf/io-png.c:818
+#: gdk-pixbuf/io-png.c:818
 msgid "Keys for PNG text chunks must be ASCII characters."
 msgstr "Sleutels voor PNG-tekstblokken moeten uit ASCII tekens bestaan"
 
 # moet tussen 0 en 9 liggen
-#: ../gdk-pixbuf/io-png.c:831
+#: gdk-pixbuf/io-png.c:831
 #, c-format
 msgid ""
 "PNG compression level must be a value between 0 and 9; value '%s' could not "
@@ -509,7 +504,7 @@ msgstr ""
 "verwerkt worden."
 
 # moet tussen 0 en 9 liggen
-#: ../gdk-pixbuf/io-png.c:843
+#: gdk-pixbuf/io-png.c:843
 #, c-format
 msgid ""
 "PNG compression level must be a value between 0 and 9; value '%d' is not "
@@ -518,340 +513,337 @@ msgstr ""
 "PNG-compressie moet een waarde tussen 0 en 9 zijn; waarde '%d' is niet "
 "toegestaan."
 
-#: ../gdk-pixbuf/io-png.c:883
+#: gdk-pixbuf/io-png.c:883
 #, c-format
 msgid "Value for PNG text chunk %s cannot be converted to ISO-8859-1 encoding."
 msgstr ""
 "Waarde voor PNG-tekstblok %s kan niet naar tekenset ISO-8859-1 worden "
 "omgezet."
 
-#: ../gdk-pixbuf/io-png.c:1026
+#: gdk-pixbuf/io-png.c:1026
 msgid "The PNG image format"
 msgstr "Het PNG-bestandsformaat"
 
-#: ../gdk-pixbuf/io-pnm.c:252
+#: gdk-pixbuf/io-pnm.c:252
 msgid "PNM loader expected to find an integer, but didn't"
 msgstr "PNM-lader verwachte een integer te vinden, maar deed dat niet"
 
-#: ../gdk-pixbuf/io-pnm.c:284
+#: gdk-pixbuf/io-pnm.c:284
 msgid "PNM file has an incorrect initial byte"
 msgstr "PNM-bestand heeft een onjuist eerste byte"
 
-#: ../gdk-pixbuf/io-pnm.c:314
+#: gdk-pixbuf/io-pnm.c:314
 msgid "PNM file is not in a recognized PNM subformat"
 msgstr "PNM staat niet in een herkenbaar PNM-subformaat"
 
-#: ../gdk-pixbuf/io-pnm.c:339
+#: gdk-pixbuf/io-pnm.c:339
 msgid "PNM file has an image width of 0"
 msgstr "PNM-bestand heeft een breedte 0"
 
-#: ../gdk-pixbuf/io-pnm.c:360
+#: gdk-pixbuf/io-pnm.c:360
 msgid "PNM file has an image height of 0"
 msgstr "PNM-bestand heeft een hoogte 0"
 
-#: ../gdk-pixbuf/io-pnm.c:383
+#: gdk-pixbuf/io-pnm.c:383
 msgid "Maximum color value in PNM file is 0"
 msgstr "Maximale kleurwaarde in PNM-bestand is 0"
 
-#: ../gdk-pixbuf/io-pnm.c:391
+#: gdk-pixbuf/io-pnm.c:391
 msgid "Maximum color value in PNM file is too large"
 msgstr "Maximale kleurwaarde in PNM-bestand is te groot"
 
 # kan niet behandelen
 # kan niet aan
-#: ../gdk-pixbuf/io-pnm.c:399
+#: gdk-pixbuf/io-pnm.c:399
 msgid "Cannot handle PNM files with maximum color values greater than 255"
 msgstr "Kan PNM-bestanden met maximale kleurwaardes groter dan 255 niet aan"
 
-#: ../gdk-pixbuf/io-pnm.c:438 ../gdk-pixbuf/io-pnm.c:466
-#: ../gdk-pixbuf/io-pnm.c:498
+#: gdk-pixbuf/io-pnm.c:438 gdk-pixbuf/io-pnm.c:466 gdk-pixbuf/io-pnm.c:498
 msgid "Raw PNM image type is invalid"
 msgstr "Raw PNM-afbeeldingstype is ongeldig"
 
-#: ../gdk-pixbuf/io-pnm.c:562 ../gdk-pixbuf/io-pnm.c:604
+#: gdk-pixbuf/io-pnm.c:562 gdk-pixbuf/io-pnm.c:604
 msgid "PNM image format is invalid"
 msgstr "PNM-bestandsformaat is ongeldig"
 
-#: ../gdk-pixbuf/io-pnm.c:663
+#: gdk-pixbuf/io-pnm.c:663
 msgid "PNM image loader does not support this PNM subformat"
 msgstr "PNM-lader ondersteunt dit PNM-subtype niet"
 
-#: ../gdk-pixbuf/io-pnm.c:718
+#: gdk-pixbuf/io-pnm.c:718
 msgid "Premature end-of-file encountered"
 msgstr "Voortijdig bestandseinde gevonden"
 
-#: ../gdk-pixbuf/io-pnm.c:750 ../gdk-pixbuf/io-pnm.c:981
+#: gdk-pixbuf/io-pnm.c:750 gdk-pixbuf/io-pnm.c:981
 msgid "Raw PNM formats require exactly one whitespace before sample data"
 msgstr ""
 "Raw PNM-formaten moeten precies één spatie hebben voor het begin van de data"
 
-#: ../gdk-pixbuf/io-pnm.c:777
+#: gdk-pixbuf/io-pnm.c:777
 msgid "Cannot allocate memory for loading PNM image"
 msgstr "Kon geen geheugenruimte reserveren voor laden van PNM-bestand"
 
-#: ../gdk-pixbuf/io-pnm.c:827
+#: gdk-pixbuf/io-pnm.c:827
 msgid "Insufficient memory to load PNM context struct"
 msgstr "Onvoldoende geheugen om PNM-context struct te laden"
 
-#: ../gdk-pixbuf/io-pnm.c:878
+#: gdk-pixbuf/io-pnm.c:878
 msgid "Unexpected end of PNM image data"
 msgstr "Onverwacht einde van PNM-afbeeldingsgegevens"
 
-#: ../gdk-pixbuf/io-pnm.c:1010
+#: gdk-pixbuf/io-pnm.c:1010
 msgid "Insufficient memory to load PNM file"
 msgstr "Onvoldoende geheugen om PNM-bestand te laden"
 
-#: ../gdk-pixbuf/io-pnm.c:1089
+#: gdk-pixbuf/io-pnm.c:1089
 msgid "The PNM/PBM/PGM/PPM image format family"
 msgstr "De PNM/PBM/PGM/PPM-bestandsformaatfamilie"
 
-#: ../gdk-pixbuf/io-ras.c:126
+#: gdk-pixbuf/io-ras.c:126
 msgid "RAS image has bogus header data"
 msgstr "RAS-afbeelding bevat onzinnige headerdata"
 
-#: ../gdk-pixbuf/io-ras.c:148
+#: gdk-pixbuf/io-ras.c:148
 msgid "RAS image has unknown type"
 msgstr "RAS-afbeelding is van onbekend type"
 
-#: ../gdk-pixbuf/io-ras.c:156
+#: gdk-pixbuf/io-ras.c:156
 msgid "unsupported RAS image variation"
 msgstr "Niet ondersteunde RAS-afbeeldingsvariatie"
 
-#: ../gdk-pixbuf/io-ras.c:171 ../gdk-pixbuf/io-ras.c:200
+#: gdk-pixbuf/io-ras.c:171 gdk-pixbuf/io-ras.c:200
 msgid "Not enough memory to load RAS image"
 msgstr "Onvoldoende geheugen voor het laden van de RAS-afbeelding"
 
-#: ../gdk-pixbuf/io-ras.c:543
+#: gdk-pixbuf/io-ras.c:543
 msgid "The Sun raster image format"
 msgstr "Het Sun raster-bestandsformaat"
 
 # Reserveren van geheugenruimte voor IOBuffer struct niet gelukt
 # kan geen geheugenruimte reserveren voor ....
-#: ../gdk-pixbuf/io-tga.c:154
+#: gdk-pixbuf/io-tga.c:154
 msgid "Cannot allocate memory for IOBuffer struct"
 msgstr "Kan geen geheugenruimte reserveren voor IOBuffer struct"
 
-#: ../gdk-pixbuf/io-tga.c:173
+#: gdk-pixbuf/io-tga.c:173
 msgid "Cannot allocate memory for IOBuffer data"
 msgstr "Kan geen geheugenruimte reserveren voor IOBUFFER gegevens"
 
 # kan niet opnieuw geheugenruimte reserveren
-#: ../gdk-pixbuf/io-tga.c:184
+#: gdk-pixbuf/io-tga.c:184
 msgid "Cannot realloc IOBuffer data"
 msgstr "Kan geheugenruimte voor IOBuffer-gegevens niet opnieuw reserveren"
 
-#: ../gdk-pixbuf/io-tga.c:214
+#: gdk-pixbuf/io-tga.c:214
 msgid "Cannot allocate temporary IOBuffer data"
 msgstr "Kan geen geheugenruimte reserveren voor tijdelijke IOBuffer-gegevens "
 
-#: ../gdk-pixbuf/io-tga.c:348
+#: gdk-pixbuf/io-tga.c:348
 msgid "Cannot allocate new pixbuf"
 msgstr "Kan geen geheugenruimte reserveren voor nieuwe pixbuf"
 
-#: ../gdk-pixbuf/io-tga.c:689
+#: gdk-pixbuf/io-tga.c:689
 msgid "Cannot allocate colormap structure"
 msgstr "Kan geen geheugenruimte reserveren voor kleurenkaartstructuur"
 
-#: ../gdk-pixbuf/io-tga.c:696
+#: gdk-pixbuf/io-tga.c:696
 msgid "Cannot allocate colormap entries"
 msgstr "Kan geen geheugen reserveren voor kleurenkaart-items "
 
-#: ../gdk-pixbuf/io-tga.c:718
+#: gdk-pixbuf/io-tga.c:718
 msgid "Unexpected bitdepth for colormap entries"
 msgstr "Onverwachte bitdiepte voor ingangen van kleurenkaart"
 
-#: ../gdk-pixbuf/io-tga.c:736
+#: gdk-pixbuf/io-tga.c:736
 msgid "Cannot allocate TGA header memory"
 msgstr "Kan geen geheugenruimte reserveren voor TGA-header"
 
-#: ../gdk-pixbuf/io-tga.c:769
+#: gdk-pixbuf/io-tga.c:769
 msgid "TGA image has invalid dimensions"
 msgstr "TGA-afbeelding heeft ongeldige afmetingen"
 
-#: ../gdk-pixbuf/io-tga.c:775 ../gdk-pixbuf/io-tga.c:784
-#: ../gdk-pixbuf/io-tga.c:794 ../gdk-pixbuf/io-tga.c:804
-#: ../gdk-pixbuf/io-tga.c:811
+#: gdk-pixbuf/io-tga.c:775 gdk-pixbuf/io-tga.c:784 gdk-pixbuf/io-tga.c:794
+#: gdk-pixbuf/io-tga.c:804 gdk-pixbuf/io-tga.c:811
 msgid "TGA image type not supported"
 msgstr "Bestandstype TGA wordt niet ondersteund"
 
-#: ../gdk-pixbuf/io-tga.c:858
+#: gdk-pixbuf/io-tga.c:858
 msgid "Cannot allocate memory for TGA context struct"
 msgstr "Kan geen geheugen reserveren voor TGA-context struct"
 
 # te veel data in bestand
-#: ../gdk-pixbuf/io-tga.c:923
+#: gdk-pixbuf/io-tga.c:923
 msgid "Excess data in file"
 msgstr "Overbodige data in bestand"
 
-#: ../gdk-pixbuf/io-tga.c:992
+#: gdk-pixbuf/io-tga.c:992
 msgid "The Targa image format"
 msgstr "Het Targa-bestandsformaat"
 
-#: ../gdk-pixbuf/io-tiff.c:173
+#: gdk-pixbuf/io-tiff.c:173
 msgid "Could not get image width (bad TIFF file)"
 msgstr "Kon afbeeldingsbreedte niet vinden (foutief TIFF-bestand)"
 
-#: ../gdk-pixbuf/io-tiff.c:180
+#: gdk-pixbuf/io-tiff.c:180
 msgid "Could not get image height (bad TIFF file)"
 msgstr "Kon afbeeldingshoogte niet vinden (foutief TIFF-bestand)"
 
-#: ../gdk-pixbuf/io-tiff.c:188
+#: gdk-pixbuf/io-tiff.c:188
 msgid "Width or height of TIFF image is zero"
 msgstr "Hoogte of breedte van TIFF-afbeelding is nul"
 
-#: ../gdk-pixbuf/io-tiff.c:197 ../gdk-pixbuf/io-tiff.c:206
+#: gdk-pixbuf/io-tiff.c:197 gdk-pixbuf/io-tiff.c:206
 msgid "Dimensions of TIFF image too large"
 msgstr "Afmetingen van TIFF-afbeelding te groot"
 
-#: ../gdk-pixbuf/io-tiff.c:225 ../gdk-pixbuf/io-tiff.c:237
-#: ../gdk-pixbuf/io-tiff.c:286 ../gdk-pixbuf/io-tiff.c:572
+#: gdk-pixbuf/io-tiff.c:225 gdk-pixbuf/io-tiff.c:237 gdk-pixbuf/io-tiff.c:286
+#: gdk-pixbuf/io-tiff.c:572
 msgid "Insufficient memory to open TIFF file"
 msgstr "Onvoldoende geheugen om TIFF-bestand te openen"
 
-#: ../gdk-pixbuf/io-tiff.c:251 ../gdk-pixbuf/io-tiff.c:294
+#: gdk-pixbuf/io-tiff.c:251 gdk-pixbuf/io-tiff.c:294
 msgid "Failed to load RGB data from TIFF file"
 msgstr "Kon RGB-gegevens niet inlezen uit TIFF-bestand"
 
-#: ../gdk-pixbuf/io-tiff.c:361
+#: gdk-pixbuf/io-tiff.c:361
 msgid "Failed to open TIFF image"
 msgstr "Kon TIFF-afbeelding niet openen"
 
-#: ../gdk-pixbuf/io-tiff.c:373
+#: gdk-pixbuf/io-tiff.c:373
 msgid "TIFFClose operation failed"
 msgstr "Bewerking: TIFFClose is mislukt"
 
-#: ../gdk-pixbuf/io-tiff.c:504 ../gdk-pixbuf/io-tiff.c:517
+#: gdk-pixbuf/io-tiff.c:504 gdk-pixbuf/io-tiff.c:517
 msgid "Failed to load TIFF image"
 msgstr "Laden van TIFF-afbeelding is mislukt"
 
-#: ../gdk-pixbuf/io-tiff.c:610
+#: gdk-pixbuf/io-tiff.c:610
 msgid "The TIFF image format"
 msgstr "Het TIFF-bestandsformaat"
 
-#: ../gdk-pixbuf/io-wbmp.c:246
+#: gdk-pixbuf/io-wbmp.c:246
 msgid "Image has zero width"
 msgstr "Afbeelding heeft breedte nul"
 
-#: ../gdk-pixbuf/io-wbmp.c:264
+#: gdk-pixbuf/io-wbmp.c:264
 msgid "Image has zero height"
 msgstr "Afbeelding heeft hoogte nul"
 
-#: ../gdk-pixbuf/io-wbmp.c:275
+#: gdk-pixbuf/io-wbmp.c:275
 msgid "Not enough memory to load image"
 msgstr "Onvoldoende geheugen voor het laden van de afbeelding"
 
-#: ../gdk-pixbuf/io-wbmp.c:334
+#: gdk-pixbuf/io-wbmp.c:334
 msgid "Couldn't save the rest"
 msgstr "Kon de rest niet opslaan"
 
-#: ../gdk-pixbuf/io-wbmp.c:368
+#: gdk-pixbuf/io-wbmp.c:368
 msgid "The WBMP image format"
 msgstr "Het WBMP-bestandsformaat"
 
-#: ../gdk-pixbuf/io-xbm.c:287
+#: gdk-pixbuf/io-xbm.c:287
 msgid "Invalid XBM file"
 msgstr "Ongeldig XBM-bestand"
 
-#: ../gdk-pixbuf/io-xbm.c:297
+#: gdk-pixbuf/io-xbm.c:297
 msgid "Insufficient memory to load XBM image file"
 msgstr "Onvoldoende geheugen om XBM-afbeelding te laden"
 
-#: ../gdk-pixbuf/io-xbm.c:441
+#: gdk-pixbuf/io-xbm.c:441
 msgid "Failed to write to temporary file when loading XBM image"
 msgstr ""
 "Niet mogelijk om naar tijdelijk bestand te schrijven bij het laden van XBM-"
 "afbeelding"
 
-#: ../gdk-pixbuf/io-xbm.c:476
+#: gdk-pixbuf/io-xbm.c:476
 msgid "The XBM image format"
 msgstr "Het XBM-bestandsformaat"
 
-#: ../gdk-pixbuf/io-xpm.c:467
+#: gdk-pixbuf/io-xpm.c:467
 msgid "No XPM header found"
 msgstr "Geen XPM-header gevonden"
 
-#: ../gdk-pixbuf/io-xpm.c:476
+#: gdk-pixbuf/io-xpm.c:476
 msgid "Invalid XPM header"
 msgstr "Ongeldig XPM-header"
 
 # afbeelding ipv bestand gebruikt.
-#: ../gdk-pixbuf/io-xpm.c:484
+#: gdk-pixbuf/io-xpm.c:484
 msgid "XPM file has image width <= 0"
 msgstr "XPM-afbeelding heeft breedte <= 0"
 
-#: ../gdk-pixbuf/io-xpm.c:492
+#: gdk-pixbuf/io-xpm.c:492
 msgid "XPM file has image height <= 0"
 msgstr "XPM-afbeelding heeft hoogte <= 0"
 
-#: ../gdk-pixbuf/io-xpm.c:500
+#: gdk-pixbuf/io-xpm.c:500
 msgid "XPM has invalid number of chars per pixel"
 msgstr "XPM heeft ongeldig aantal tekens per beeldpunt"
 
-#: ../gdk-pixbuf/io-xpm.c:507
+#: gdk-pixbuf/io-xpm.c:507
 msgid "XPM file has invalid number of colors"
 msgstr "XPM-bestand heeft ongeldig aantal kleuren"
 
-#: ../gdk-pixbuf/io-xpm.c:519 ../gdk-pixbuf/io-xpm.c:528
-#: ../gdk-pixbuf/io-xpm.c:580
+#: gdk-pixbuf/io-xpm.c:519 gdk-pixbuf/io-xpm.c:528 gdk-pixbuf/io-xpm.c:580
 msgid "Cannot allocate memory for loading XPM image"
 msgstr "Kan geen geheugenruimte reserveren voor het laden van XPM-afbeelding"
 
-#: ../gdk-pixbuf/io-xpm.c:542
+#: gdk-pixbuf/io-xpm.c:542
 msgid "Cannot read XPM colormap"
 msgstr "Kan XPM-kleurenkaart niet lezen"
 
-#: ../gdk-pixbuf/io-xpm.c:771
+#: gdk-pixbuf/io-xpm.c:771
 msgid "Failed to write to temporary file when loading XPM image"
 msgstr ""
 "Niet mogelijk om naar tijdelijk bestand te schrijven bij het laden van XPM-"
 "afbeelding"
 
-#: ../gdk-pixbuf/io-xpm.c:806
+#: gdk-pixbuf/io-xpm.c:806
 msgid "The XPM image format"
 msgstr "Het XPM-bestandsformaat"
 
 #. Description of --class=CLASS in --help output
-#: ../gdk/gdk.c:115
+#: gdk/gdk.c:115
 msgid "Program class as used by the window manager"
 msgstr "Programmaklasse zoals gebruikt door de window-manager"
 
 #. Placeholder in --class=CLASS in --help output
-#: ../gdk/gdk.c:116
+#: gdk/gdk.c:116
 msgid "CLASS"
 msgstr "KLASSE"
 
 #. Description of --name=NAME in --help output
-#: ../gdk/gdk.c:118
+#: gdk/gdk.c:118
 msgid "Program name as used by the window manager"
 msgstr "Programmanaam zoals gebruikt door de window-manager"
 
 #. Placeholder in --name=NAME in --help output
-#: ../gdk/gdk.c:119
+#: gdk/gdk.c:119
 msgid "NAME"
 msgstr "NAAM"
 
 #. Description of --display=DISPLAY in --help output
-#: ../gdk/gdk.c:121
+#: gdk/gdk.c:121
 msgid "X display to use"
 msgstr "Te gebruiken X-display"
 
 #. Placeholder in --display=DISPLAY in --help output
-#: ../gdk/gdk.c:122
+#: gdk/gdk.c:122
 msgid "DISPLAY"
 msgstr "DISPLAY"
 
 #. Description of --screen=SCREEN in --help output
-#: ../gdk/gdk.c:124
+#: gdk/gdk.c:124
 msgid "X screen to use"
 msgstr "Te gebruiken X-scherm"
 
 #. Placeholder in --screen=SCREEN in --help output
-#: ../gdk/gdk.c:125
+#: gdk/gdk.c:125
 msgid "SCREEN"
 msgstr "SCHERM"
 
 #. Description of --gdk-debug=FLAGS in --help output
-#: ../gdk/gdk.c:128
+#: gdk/gdk.c:128
 msgid "Gdk debugging flags to set"
 msgstr "In te stellen Gdk debug-vlaggen"
 
@@ -859,12 +851,12 @@ msgstr "In te stellen Gdk debug-vlaggen"
 #. Placeholder in --gdk-no-debug=FLAGS in --help output
 #. Placeholder in --gtk-debug=FLAGS in --help output
 #. Placeholder in --gtk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:129 ../gdk/gdk.c:132 ../gtk/gtkmain.c:405 ../gtk/gtkmain.c:408
+#: gdk/gdk.c:129 gdk/gdk.c:132 gtk/gtkmain.c:405 gtk/gtkmain.c:408
 msgid "FLAGS"
 msgstr "VLAGGEN"
 
 #. Description of --gdk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:131
+#: gdk/gdk.c:131
 msgid "Gdk debugging flags to unset"
 msgstr "Uit te zetten gdk debug-vlaggen"
 
@@ -872,216 +864,216 @@ msgstr "Uit te zetten gdk debug-vlaggen"
 # names if they're not translated on keyboards in front of you.  But, be
 # sure to strip the "keyboard label|" part in translations, since that's
 # how context marking works in glib. (Danilo)
-#: ../gdk/keyname-table.h:3940
+#: gdk/keyname-table.h:3940
 msgid "keyboard label|BackSpace"
 msgstr "Backspace"
 
-#: ../gdk/keyname-table.h:3941
+#: gdk/keyname-table.h:3941
 msgid "keyboard label|Tab"
 msgstr "Tab"
 
-#: ../gdk/keyname-table.h:3942
+#: gdk/keyname-table.h:3942
 msgid "keyboard label|Return"
 msgstr "Enter"
 
 # mijn toetsenbord zegt: pauze/n break
-#: ../gdk/keyname-table.h:3943
+#: gdk/keyname-table.h:3943
 msgid "keyboard label|Pause"
 msgstr "Pauze"
 
-#: ../gdk/keyname-table.h:3944
+#: gdk/keyname-table.h:3944
 msgid "keyboard label|Scroll_Lock"
 msgstr "Scroll Lock"
 
-#: ../gdk/keyname-table.h:3945
+#: gdk/keyname-table.h:3945
 msgid "keyboard label|Sys_Req"
 msgstr "SysRq"
 
-#: ../gdk/keyname-table.h:3946
+#: gdk/keyname-table.h:3946
 msgid "keyboard label|Escape"
 msgstr "Esc"
 
 # dit is ws de windowstoets (configureerbaar?)
-#: ../gdk/keyname-table.h:3947
+#: gdk/keyname-table.h:3947
 msgid "keyboard label|Multi_key"
 msgstr "_Windowstoets"
 
-#: ../gdk/keyname-table.h:3948
+#: gdk/keyname-table.h:3948
 msgid "keyboard label|Home"
 msgstr "Home"
 
-#: ../gdk/keyname-table.h:3949
+#: gdk/keyname-table.h:3949
 msgid "keyboard label|Page_Up"
 msgstr "Page Up"
 
-#: ../gdk/keyname-table.h:3950
+#: gdk/keyname-table.h:3950
 msgid "keyboard label|Page_Down"
 msgstr "Page Down"
 
-#: ../gdk/keyname-table.h:3951
+#: gdk/keyname-table.h:3951
 msgid "keyboard label|End"
 msgstr "End"
 
-#: ../gdk/keyname-table.h:3952
+#: gdk/keyname-table.h:3952
 msgid "keyboard label|Begin"
 msgstr "Begin"
 
-#: ../gdk/keyname-table.h:3953
+#: gdk/keyname-table.h:3953
 msgid "keyboard label|Print"
 msgstr "Print"
 
-#: ../gdk/keyname-table.h:3954
+#: gdk/keyname-table.h:3954
 msgid "keyboard label|Insert"
 msgstr "Insert"
 
-#: ../gdk/keyname-table.h:3955
+#: gdk/keyname-table.h:3955
 msgid "keyboard label|Num_Lock"
 msgstr "Num Lock"
 
-#: ../gdk/keyname-table.h:3956
+#: gdk/keyname-table.h:3956
 msgid "keyboard label|KP_Space"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3957
+#: gdk/keyname-table.h:3957
 msgid "keyboard label|KP_Tab"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3958
+#: gdk/keyname-table.h:3958
 msgid "keyboard label|KP_Enter"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3959
+#: gdk/keyname-table.h:3959
 msgid "keyboard label|KP_Home"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3960
+#: gdk/keyname-table.h:3960
 msgid "keyboard label|KP_Left"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3961
+#: gdk/keyname-table.h:3961
 msgid "keyboard label|KP_Up"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3962
+#: gdk/keyname-table.h:3962
 msgid "keyboard label|KP_Right"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3963
+#: gdk/keyname-table.h:3963
 msgid "keyboard label|KP_Down"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3964
+#: gdk/keyname-table.h:3964
 msgid "keyboard label|KP_Page_Up"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3965
+#: gdk/keyname-table.h:3965
 msgid "keyboard label|KP_Prior"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3966
+#: gdk/keyname-table.h:3966
 msgid "keyboard label|KP_Page_Down"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3967
+#: gdk/keyname-table.h:3967
 msgid "keyboard label|KP_Next"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3968
+#: gdk/keyname-table.h:3968
 msgid "keyboard label|KP_End"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3969
+#: gdk/keyname-table.h:3969
 msgid "keyboard label|KP_Begin"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3970
+#: gdk/keyname-table.h:3970
 msgid "keyboard label|KP_Insert"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3971
+#: gdk/keyname-table.h:3971
 msgid "keyboard label|KP_Delete"
 msgstr ""
 
-#: ../gdk/keyname-table.h:3972
+#: gdk/keyname-table.h:3972
 msgid "keyboard label|Delete"
 msgstr "Delete"
 
 #. Description of --sync in --help output
-#: ../gdk/win32/gdkmain-win32.c:60
+#: gdk/win32/gdkmain-win32.c:60
 msgid "Don't batch GDI requests"
 msgstr "Geen GDI-verzoeken op wacht zetten"
 
 #. Description of --no-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:62
+#: gdk/win32/gdkmain-win32.c:62
 msgid "Don't use the Wintab API for tablet support"
 msgstr "Voor tablet-ondersteuning niet de Wintab-API gebruiken"
 
 #. Description of --ignore-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:64
+#: gdk/win32/gdkmain-win32.c:64
 msgid "Same as --no-wintab"
 msgstr "Zelfde als --no-wintab"
 
 #. Description of --use-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:66
+#: gdk/win32/gdkmain-win32.c:66
 msgid "Do use the Wintab API [default]"
 msgstr "Wintab-API niet gebruiken [standaard]"
 
 #. Description of --max-colors=COLORS in --help output
-#: ../gdk/win32/gdkmain-win32.c:68
+#: gdk/win32/gdkmain-win32.c:68
 msgid "Size of the palette in 8 bit mode"
 msgstr "Grootte van het palet in 8-bit modus"
 
 #. Placeholder in --max-colors=COLORS in --help output
-#: ../gdk/win32/gdkmain-win32.c:69
+#: gdk/win32/gdkmain-win32.c:69
 msgid "COLORS"
 msgstr "KLEUREN"
 
 # synchroniseren/synchroon maken
 #. Description of --sync in --help output
-#: ../gdk/x11/gdkmain-x11.c:92
+#: gdk/x11/gdkmain-x11.c:92
 msgid "Make X calls synchronous"
 msgstr "Alle X-aanroepen synchroon maken"
 
-#: ../gtk/gtkaboutdialog.c:273 ../gtk/gtkaboutdialog.c:2103
+#: gtk/gtkaboutdialog.c:273 gtk/gtkaboutdialog.c:2103
 msgid "License"
 msgstr "Licentie"
 
-#: ../gtk/gtkaboutdialog.c:274
+#: gtk/gtkaboutdialog.c:274
 msgid "The license of the program"
 msgstr "De licentie van het programma"
 
 #. Add the credits button
-#: ../gtk/gtkaboutdialog.c:509
+#: gtk/gtkaboutdialog.c:509
 msgid "C_redits"
 msgstr "_Met dank aan"
 
 #. Add the license button
-#: ../gtk/gtkaboutdialog.c:519
+#: gtk/gtkaboutdialog.c:519
 msgid "_License"
 msgstr "_Licentie"
 
-#: ../gtk/gtkaboutdialog.c:756
+#: gtk/gtkaboutdialog.c:756
 #, c-format
 msgid "About %s"
 msgstr "Over %s"
 
-#: ../gtk/gtkaboutdialog.c:2031
+#: gtk/gtkaboutdialog.c:2031
 msgid "Credits"
 msgstr "Met dank aan"
 
-#: ../gtk/gtkaboutdialog.c:2057
+#: gtk/gtkaboutdialog.c:2057
 msgid "Written by"
 msgstr "Geschreven door"
 
-#: ../gtk/gtkaboutdialog.c:2060
+#: gtk/gtkaboutdialog.c:2060
 msgid "Documented by"
 msgstr "Gedocumenteerd door"
 
-#: ../gtk/gtkaboutdialog.c:2072
+#: gtk/gtkaboutdialog.c:2072
 msgid "Translated by"
 msgstr "Vertaald door"
 
-#: ../gtk/gtkaboutdialog.c:2076
+#: gtk/gtkaboutdialog.c:2076
 msgid "Artwork by"
 msgstr "Grafisch werk door"
 
@@ -1091,7 +1083,7 @@ msgstr "Grafisch werk door"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:121
+#: gtk/gtkaccellabel.c:121
 msgid "keyboard label|Shift"
 msgstr "Shift"
 
@@ -1101,7 +1093,7 @@ msgstr "Shift"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:128
+#: gtk/gtkaccellabel.c:128
 msgid "keyboard label|Ctrl"
 msgstr "Ctrl"
 
@@ -1111,18 +1103,18 @@ msgstr "Ctrl"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:135
+#: gtk/gtkaccellabel.c:135
 msgid "keyboard label|Alt"
 msgstr "Alt"
 
 #. do not translate the part before the |
-#: ../gtk/gtkaccellabel.c:577
+#: gtk/gtkaccellabel.c:577
 msgid "keyboard label|Space"
 msgstr "Spatie"
 
 # schuine streep
 #. do not translate the part before the |
-#: ../gtk/gtkaccellabel.c:581
+#: gtk/gtkaccellabel.c:581
 msgid "keyboard label|Backslash"
 msgstr "Backslash"
 
@@ -1135,7 +1127,7 @@ msgstr "Backslash"
 #. * so if you have a default text direction of RTL and YM, then
 #. * the year will appear on the right.
 #.
-#: ../gtk/gtkcalendar.c:647
+#: gtk/gtkcalendar.c:647
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
@@ -1143,7 +1135,7 @@ msgstr "calendar:MY"
 #. * first day of the week to calendar:week_start:1 if you want Monday
 #. * to be the first day of the week, and so on.
 #.
-#: ../gtk/gtkcalendar.c:661
+#: gtk/gtkcalendar.c:661
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:1"
 
@@ -1155,7 +1147,7 @@ msgstr "calendar:week_start:1"
 #. *
 #. * If you don't understand this, leave it as "2000"
 #.
-#: ../gtk/gtkcalendar.c:1549
+#: gtk/gtkcalendar.c:1549
 msgid "year measurement template|2000"
 msgstr "2000"
 
@@ -1170,29 +1162,29 @@ msgstr "2000"
 #. * Don't include the prefix "calendar year format|" in the
 #. * translation. "%Y" is appropriate for most locales.
 #.
-#: ../gtk/gtkcalendar.c:1826
+#: gtk/gtkcalendar.c:1826
 msgid "calendar year format|%Y"
 msgstr "%Y"
 
 # het gedeelte voor | is om het bericht meer uniek te maken en mag niet
 # worden vertaald.
 #. do not translate the part before the |
-#: ../gtk/gtkcellrendererprogress.c:237 ../gtk/gtkcellrendererprogress.c:295
+#: gtk/gtkcellrendererprogress.c:237 gtk/gtkcellrendererprogress.c:295
 #, c-format
 msgid "progress bar label|%d %%"
 msgstr "%d %%"
 
 # 'Kies een kleur'   hier beter dan:  'Een kleur kiezen' ?
-#: ../gtk/gtkcolorbutton.c:221 ../gtk/gtkcolorbutton.c:576
+#: gtk/gtkcolorbutton.c:221 gtk/gtkcolorbutton.c:576
 msgid "Pick a Color"
 msgstr "Kies een kleur"
 
-#: ../gtk/gtkcolorbutton.c:467
+#: gtk/gtkcolorbutton.c:467
 msgid "Received invalid color data\n"
 msgstr "Ongeldige kleurgegevens ontvangen\n"
 
 # niet strikt vertaald.
-#: ../gtk/gtkcolorsel.c:565
+#: gtk/gtkcolorsel.c:565
 msgid ""
 "The previously-selected color, for comparison to the color you're selecting "
 "now. You can drag this color to a palette entry, or select this color as "
@@ -1203,7 +1195,7 @@ msgstr ""
 "door het over de nieuwe kleur heen te slepen."
 
 # niet strikt vertaald
-#: ../gtk/gtkcolorsel.c:570
+#: gtk/gtkcolorsel.c:570
 msgid ""
 "The color you've chosen. You can drag this color to a palette entry to save "
 "it for use in the future."
@@ -1211,11 +1203,11 @@ msgstr ""
 "De nieuwe kleur die u gekozen heeft. U kunt deze verslepen naar een "
 "kleurenpaletom het te bewaren voor toekomstig gebruik."
 
-#: ../gtk/gtkcolorsel.c:961
+#: gtk/gtkcolorsel.c:961
 msgid "_Save color here"
 msgstr "Kleur hier op_slaan"
 
-#: ../gtk/gtkcolorsel.c:1166
+#: gtk/gtkcolorsel.c:1166
 msgid ""
 "Click this palette entry to make it the current color. To change this entry, "
 "drag a color swatch here or right-click it and select \"Save color here.\""
@@ -1225,7 +1217,7 @@ msgstr ""
 "de rechter muisknop en selecteert \"Bewaar kleur hier\""
 
 # niet strikt vertaald
-#: ../gtk/gtkcolorsel.c:1953
+#: gtk/gtkcolorsel.c:1953
 msgid ""
 "Select the color you want from the outer ring. Select the darkness or "
 "lightness of that color using the inner triangle."
@@ -1233,7 +1225,7 @@ msgstr ""
 "Selecteer een kleur in de buitenste ring. De helderheid van deze kleur kunt "
 "u instellen met de driehoek binnenin."
 
-#: ../gtk/gtkcolorsel.c:1978
+#: gtk/gtkcolorsel.c:1978
 msgid ""
 "Click the eyedropper, then click a color anywhere on your screen to select "
 "that color."
@@ -1241,67 +1233,67 @@ msgstr ""
 "Klik op de pipet, klik dan op een kleur ergens op je scherm om die kleur te "
 "selecteren."
 
-#: ../gtk/gtkcolorsel.c:1987
+#: gtk/gtkcolorsel.c:1987
 msgid "_Hue:"
 msgstr "_Tint:"
 
-#: ../gtk/gtkcolorsel.c:1988
+#: gtk/gtkcolorsel.c:1988
 msgid "Position on the color wheel."
 msgstr "Positie op het kleurenwiel."
 
-#: ../gtk/gtkcolorsel.c:1990
+#: gtk/gtkcolorsel.c:1990
 msgid "_Saturation:"
 msgstr "_Verzadiging:"
 
-#: ../gtk/gtkcolorsel.c:1991
+#: gtk/gtkcolorsel.c:1991
 msgid "\"Deepness\" of the color."
 msgstr "\"Diepte\" van de kleur."
 
-#: ../gtk/gtkcolorsel.c:1992
+#: gtk/gtkcolorsel.c:1992
 msgid "_Value:"
 msgstr "_Waarde:"
 
-#: ../gtk/gtkcolorsel.c:1993
+#: gtk/gtkcolorsel.c:1993
 msgid "Brightness of the color."
 msgstr "Helderheid van de kleur."
 
-#: ../gtk/gtkcolorsel.c:1994
+#: gtk/gtkcolorsel.c:1994
 msgid "_Red:"
 msgstr "_Rood:"
 
-#: ../gtk/gtkcolorsel.c:1995
+#: gtk/gtkcolorsel.c:1995
 msgid "Amount of red light in the color."
 msgstr "Hoeveelheid rood licht in de kleur."
 
-#: ../gtk/gtkcolorsel.c:1996
+#: gtk/gtkcolorsel.c:1996
 msgid "_Green:"
 msgstr "_Groen:"
 
-#: ../gtk/gtkcolorsel.c:1997
+#: gtk/gtkcolorsel.c:1997
 msgid "Amount of green light in the color."
 msgstr "Hoeveelheid groen licht in de kleur."
 
-#: ../gtk/gtkcolorsel.c:1998
+#: gtk/gtkcolorsel.c:1998
 msgid "_Blue:"
 msgstr "_Blauw:"
 
-#: ../gtk/gtkcolorsel.c:1999
+#: gtk/gtkcolorsel.c:1999
 msgid "Amount of blue light in the color."
 msgstr "Hoeveelheid blauw licht in de kleur."
 
-#: ../gtk/gtkcolorsel.c:2002
+#: gtk/gtkcolorsel.c:2002
 msgid "_Opacity:"
 msgstr "_Doorzichtig:"
 
-#: ../gtk/gtkcolorsel.c:2010 ../gtk/gtkcolorsel.c:2021
+#: gtk/gtkcolorsel.c:2010 gtk/gtkcolorsel.c:2021
 msgid "Transparency of the color."
 msgstr "Transparantie van de kleur."
 
-#: ../gtk/gtkcolorsel.c:2028
+#: gtk/gtkcolorsel.c:2028
 msgid "Color _Name:"
 msgstr "Kleur_naam:"
 
-#: ../gtk/gtkcolorsel.c:2043
+#: gtk/gtkcolorsel.c:2043
 msgid ""
 "You can enter an HTML-style hexadecimal color value, or simply a color name "
 "such as 'orange' in this entry."
@@ -1309,81 +1301,81 @@ msgstr ""
 "U kunt in dit veld een hexadecimale kleurwaarde in HTML-stijl geven, of "
 "gewoon een kleur (in het Engels) invoeren zoals 'orange'."
 
-#: ../gtk/gtkcolorsel.c:2062
+#: gtk/gtkcolorsel.c:2062
 msgid "_Palette"
 msgstr "_Palet"
 
-#: ../gtk/gtkcolorsel.c:2094
+#: gtk/gtkcolorsel.c:2094
 msgid "Color Wheel"
 msgstr "Kleurwiel"
 
-#: ../gtk/gtkcolorseldialog.c:123
+#: gtk/gtkcolorseldialog.c:123
 msgid "Color Selection"
 msgstr "Kleurselectie"
 
-#: ../gtk/gtkentry.c:4508 ../gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "_Alles selecteren"
 
-#: ../gtk/gtkentry.c:4518 ../gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Invoer_methoden"
 
-#: ../gtk/gtkentry.c:4529 ../gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Unicode controleteken invoegen "
 
-#: ../gtk/gtkfilechooser.c:1588 ../gtk/gtkfilechooser.c:1632
-#: ../gtk/gtkfilechooser.c:1707 ../gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Ongeldige bestandsnaam: %s"
 
-#: ../gtk/gtkfilechooserbutton.c:67
+#: gtk/gtkfilechooserbutton.c:67
 msgid "Select A File"
 msgstr "Een bestand selecteren"
 
 # Dit is de titel van de persoonlijke map in de bestandkiezer
 # eigen map
 # persoonlijke map
-#: ../gtk/gtkfilechooserbutton.c:68 ../gtk/gtkfilechooserdefault.c:1316
-#: ../gtk/gtkpathbar.c:1020
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
+#: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Persoonlijk"
 
 # Werkblad
-#: ../gtk/gtkfilechooserbutton.c:69 ../gtk/gtkfilechooserdefault.c:1343
-#: ../gtk/gtkpathbar.c:1022
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
+#: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Bureaublad"
 
-#: ../gtk/gtkfilechooserbutton.c:70
+#: gtk/gtkfilechooserbutton.c:70
 msgid "(None)"
 msgstr "(Geen)"
 
 # dit is het label op de knop waarmee je naar andere mappen zoekt
 # (andere mappen dan de favoriete)
-#: ../gtk/gtkfilechooserbutton.c:1523
+#: gtk/gtkfilechooserbutton.c:1523
 msgid "Other..."
 msgstr "Andere..."
 
-#: ../gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Kon geen informatie verkrijgen over het bestand"
 
-#: ../gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Kon geen favoriet toevoegen"
 
-#: ../gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Kon favoriet niet verwijderen"
 
-#: ../gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "De map kon niet worden aangemaakt"
 
-#: ../gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1391,109 +1383,109 @@ msgstr ""
 "De map kon niet worden aangemaakt omdat een bestand met dezelfde naam al "
 "bestaat. Kies een andere naam voor de map of hernoem het bestand eerst."
 
-#: ../gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Ongeldige bestandsnaam"
 
 # worden afgebeeld/
-#: ../gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "De mapinhoud kon niet worden weergegeven"
 
-#: ../gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Kon geen informatie verkrijgen over '%s': %s"
 
-#: ../gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "De map '%s' toevoegen aan favorieten"
 
-#: ../gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "De huidige map toevoegen aan de favorieten"
 
-#: ../gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "De geselecteerde mappen toevoegen aan de favorieten"
 
-#: ../gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "'%s' als favoriet verwijderen"
 
-#: ../gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Kon geen favoriet toevoegen voor '%s' omdat het een ongeldige pad-naam is."
 
-#: ../gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Verwijderen"
 
 # naam wijzigen
-#: ../gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Hernoemen..."
 
-#: ../gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Sneltoetsen"
 
-#: ../gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Map"
 
-#: ../gtk/gtkfilechooserdefault.c:3193 ../gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Toevoegen"
 
 # favorieten/bladwijzers
-#: ../gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "De geselecteerde map toevoegen aan de favorieten"
 
-#: ../gtk/gtkfilechooserdefault.c:3205 ../gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Verwijderen"
 
-#: ../gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "De geselecteerde favoriet verwijderen"
 
-#: ../gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 msgid "Could not select file"
 msgstr "Kon bestand niet selecteren"
 
-#: ../gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "Kon bestand '%s' niet selecteren omdat het een ongeldige pad-naam is."
 
-#: ../gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "_Toevoegen aan favorieten"
 
-#: ../gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "_Locatie openen"
 
 # _b zou conflicteren met: _Bladeren naar andere mappen
-#: ../gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Verbo_rgen bestanden tonen"
 
-#: ../gtk/gtkfilechooserdefault.c:3586 ../gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Bestanden"
 
-#: ../gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Naam"
 
-#: ../gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Afmeting"
 
@@ -1502,7 +1494,7 @@ msgstr "Afmeting"
 # veranderd in Wijzigingsdatum.
 # 'Gewijzigd' zou ook kunnen (is korter) maar dan moet Nautilus ook aangepast
 # worden.
-#: ../gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Wijzigingsdatum"
 
@@ -1511,21 +1503,21 @@ msgstr "Wijzigingsdatum"
 #                             wordt weergegeven
 #                   bestand  
 #             type
-#: ../gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Kiezen welke typen bestanden getoond worden"
 
 #. Create Folder
-#: ../gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "_Map aanmaken"
 
 #. Name entry
-#: ../gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Naam:"
 
-#: ../gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Bladeren naar andere mappen"
 
@@ -1540,113 +1532,130 @@ msgstr "_Bladeren naar andere mappen"
 # wat lelijk is.
 # Vandaar dat we kiezen om Create in _folder te vertalen met
 # Aanma_ken in map
-#: ../gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "_Opslaan in map:"
 
-#: ../gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Aanma_ken in map:"
 
-#: ../gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Kan niet naar de map gaan omdat deze niet lokaal is"
 
-#: ../gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Snelkoppeling %s bestaat niet"
 
-#: ../gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+# naam wijzigen
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Hernoemen"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Kon %s niet aankoppelen"
 
-#: ../gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Geef de naam van de nieuwe map"
 
-#: ../gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d byte"
 msgstr[1] "%d byte"
 
-#: ../gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: ../gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: ../gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: ../gtk/gtkfilechooserdefault.c:6604 ../gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Vandaag"
 
-#: ../gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Gisteren"
 
-#: ../gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Kan map niet wijzigen"
 
-#: ../gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "De door u opgegeven map is een ongeldig pad."
 
-#: ../gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Kon geen bestandnaam maken van '%s' en '%s'"
 
-#: ../gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Kon item niet selecteren"
 
-#: ../gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Locatie openen"
 
-#: ../gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Opslaan in locatie"
 
-#: ../gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Locatie:"
 
-#: ../gtk/gtkfilesel.c:727
+#: gtk/gtkfilesel.c:727
 msgid "Folders"
 msgstr "Mappen"
 
-#: ../gtk/gtkfilesel.c:731
+#: gtk/gtkfilesel.c:731
 msgid "Fol_ders"
 msgstr "_Mappen"
 
-#: ../gtk/gtkfilesel.c:767
+#: gtk/gtkfilesel.c:767
 msgid "_Files"
 msgstr "_Bestanden"
 
-#: ../gtk/gtkfilesel.c:855 ../gtk/gtkfilesel.c:2242
+#: gtk/gtkfilesel.c:855 gtk/gtkfilesel.c:2242
 #, c-format
 msgid "Folder unreadable: %s"
 msgstr "Map onleesbaar: %s"
 
-#: ../gtk/gtkfilesel.c:984
+#: gtk/gtkfilesel.c:984
 #, c-format
 msgid ""
 "The file \"%s\" resides on another machine (called %s) and may not be "
@@ -1657,27 +1666,27 @@ msgstr ""
 "mogelijk niet beschikbaar voor dit programma.\n"
 "Weet u zeker dat u het wilt selecteren?"
 
-#: ../gtk/gtkfilesel.c:1114
+#: gtk/gtkfilesel.c:1114
 msgid "_New Folder"
 msgstr "_Nieuwe map"
 
-#: ../gtk/gtkfilesel.c:1125
+#: gtk/gtkfilesel.c:1125
 msgid "De_lete File"
 msgstr "_Bestand verwijderen"
 
-#: ../gtk/gtkfilesel.c:1136
+#: gtk/gtkfilesel.c:1136
 msgid "_Rename File"
 msgstr "Bestand _hernoemen"
 
 # tekens ipv symbolen?
-#: ../gtk/gtkfilesel.c:1438
+#: gtk/gtkfilesel.c:1438
 #, c-format
 msgid ""
 "The folder name \"%s\" contains symbols that are not allowed in filenames"
 msgstr ""
 "De mapnaam \"%s\" bevat symbolen die niet toegestaan zijn in bestandsnamen"
 
-#: ../gtk/gtkfilesel.c:1440
+#: gtk/gtkfilesel.c:1440
 #, c-format
 msgid ""
 "Error creating folder \"%s\": %s\n"
@@ -1687,38 +1696,38 @@ msgstr ""
 "%s"
 
 # tekens ipv symbolen?
-#: ../gtk/gtkfilesel.c:1441 ../gtk/gtkfilesel.c:1677
+#: gtk/gtkfilesel.c:1441 gtk/gtkfilesel.c:1677
 msgid "You probably used symbols not allowed in filenames."
 msgstr ""
 "U heeft waarschijnlijk symbolen gebruikt die niet toegestaan zijn in "
 "bestandsnamen."
 
-#: ../gtk/gtkfilesel.c:1449
+#: gtk/gtkfilesel.c:1449
 #, c-format
 msgid "Error creating folder \"%s\": %s\n"
 msgstr "Fout bij aanmaken van map \"%s\": %s\n"
 
-#: ../gtk/gtkfilesel.c:1483
+#: gtk/gtkfilesel.c:1483
 msgid "New Folder"
 msgstr "Nieuwe map"
 
-#: ../gtk/gtkfilesel.c:1498
+#: gtk/gtkfilesel.c:1498
 msgid "_Folder name:"
 msgstr "_Mapnaam:"
 
 # _A conflicteert ws met _Annuleren
-#: ../gtk/gtkfilesel.c:1522
+#: gtk/gtkfilesel.c:1522
 msgid "C_reate"
 msgstr "Aanma_ken"
 
-#: ../gtk/gtkfilesel.c:1565
+#: gtk/gtkfilesel.c:1565
 #, c-format
 msgid "The filename \"%s\" contains symbols that are not allowed in filenames"
 msgstr ""
 "De bestandsnaam \"%s\" bevat symbolen die niet toegestaan zijn in "
 "bestandsnamen"
 
-#: ../gtk/gtkfilesel.c:1568
+#: gtk/gtkfilesel.c:1568
 #, c-format
 msgid ""
 "Error deleting file \"%s\": %s\n"
@@ -1727,33 +1736,33 @@ msgstr ""
 "Fout bij verwijderen van bestand \"%s\": %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1570 ../gtk/gtkfilesel.c:1691
+#: gtk/gtkfilesel.c:1570 gtk/gtkfilesel.c:1691
 msgid "It probably contains symbols not allowed in filenames."
 msgstr "Het bevat waarschijnlijk symbolen niet toegestaan in bestandsnamen."
 
-#: ../gtk/gtkfilesel.c:1579
+#: gtk/gtkfilesel.c:1579
 #, c-format
 msgid "Error deleting file \"%s\": %s"
 msgstr "Fout bij verwijderen van bestand \"%s\": %s"
 
 # Really hoeft hier niet vertaald te worden.
-#: ../gtk/gtkfilesel.c:1622
+#: gtk/gtkfilesel.c:1622
 #, c-format
 msgid "Really delete file \"%s\"?"
 msgstr "\"%s\" verwijderen?"
 
-#: ../gtk/gtkfilesel.c:1627
+#: gtk/gtkfilesel.c:1627
 msgid "Delete File"
 msgstr "Bestand verwijderen"
 
-#: ../gtk/gtkfilesel.c:1673 ../gtk/gtkfilesel.c:1687
+#: gtk/gtkfilesel.c:1673 gtk/gtkfilesel.c:1687
 #, c-format
 msgid "The file name \"%s\" contains symbols that are not allowed in filenames"
 msgstr ""
 "De bestandsnaam \"%s\" bevat symbolen die niet toegestaan zijn in "
 "bestandsnamen"
 
-#: ../gtk/gtkfilesel.c:1675
+#: gtk/gtkfilesel.c:1675
 #, c-format
 msgid ""
 "Error renaming file to \"%s\": %s\n"
@@ -1762,7 +1771,7 @@ msgstr ""
 "Fout bij hernoemen van bestand naar \"%s\": %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1689
+#: gtk/gtkfilesel.c:1689
 #, c-format
 msgid ""
 "Error renaming file \"%s\": %s\n"
@@ -1771,32 +1780,32 @@ msgstr ""
 "Fout bij hernoemen van bestand \"%s\": %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1699
+#: gtk/gtkfilesel.c:1699
 #, c-format
 msgid "Error renaming file \"%s\" to \"%s\": %s"
 msgstr "Fout bij hernoemen van bestand \"%s\" naar \"%s\": %s"
 
 # bestandsnaam wijzigen
-#: ../gtk/gtkfilesel.c:1746
+#: gtk/gtkfilesel.c:1746
 msgid "Rename File"
 msgstr "Bestand hernoemen"
 
 # bestandsnaam wijzigen in
-#: ../gtk/gtkfilesel.c:1761
+#: gtk/gtkfilesel.c:1761
 #, c-format
 msgid "Rename file \"%s\" to:"
 msgstr "Bestand \"%s\" hernoemen naar:"
 
 # naam wijzigen
-#: ../gtk/gtkfilesel.c:1790
+#: gtk/gtkfilesel.c:1790
 msgid "_Rename"
 msgstr "_Hernoemen"
 
-#: ../gtk/gtkfilesel.c:2222
+#: gtk/gtkfilesel.c:2222
 msgid "_Selection: "
 msgstr "_Selectie: "
 
-#: ../gtk/gtkfilesel.c:3147
+#: gtk/gtkfilesel.c:3147
 #, c-format
 msgid ""
 "The filename \"%s\" couldn't be converted to UTF-8. (try setting the "
@@ -1805,50 +1814,51 @@ msgstr ""
 "De bestandsnaam \"%s\" kon niet geconverteerd worden in UTF-8. (Probeer de "
 "omgevingsvariabele G_FILENAME_ENCODING in te stellen): %s"
 
-#: ../gtk/gtkfilesel.c:3150
+#: gtk/gtkfilesel.c:3150
 msgid "Invalid UTF-8"
 msgstr "Ongeldig UTF-8"
 
-#: ../gtk/gtkfilesel.c:4027
+#: gtk/gtkfilesel.c:4027
 msgid "Name too long"
 msgstr "Naam is te lang"
 
-#: ../gtk/gtkfilesel.c:4029
+#: gtk/gtkfilesel.c:4029
 msgid "Couldn't convert filename"
 msgstr "Kon bestandsnaam niet converteren"
 
 # Legen
-#: ../gtk/gtkfilesystemmodel.c:1267
+#: gtk/gtkfilesystemmodel.c:1267
 msgid "(Empty)"
 msgstr "(Leeg)"
 
-#: ../gtk/gtkfilesystemunix.c:476 ../gtk/gtkfilesystemunix.c:682
-#: ../gtk/gtkfilesystemunix.c:1858 ../gtk/gtkfilesystemwin32.c:482
-#: ../gtk/gtkfilesystemwin32.c:495 ../gtk/gtkfilesystemwin32.c:1487
+#: gtk/gtkfilesystemunix.c:476 gtk/gtkfilesystemunix.c:682
+#: gtk/gtkfilesystemunix.c:1858 gtk/gtkfilesystemwin32.c:482
+#: gtk/gtkfilesystemwin32.c:495 gtk/gtkfilesystemwin32.c:1487
 #, c-format
 msgid "Error getting information for '%s': %s"
 msgstr "Fout bij verkrijgen van informatie over '%s': %s"
 
-#: ../gtk/gtkfilesystemunix.c:551 ../gtk/gtkfilesystemwin32.c:537
+#: gtk/gtkfilesystemunix.c:551 gtk/gtkfilesystemwin32.c:537
 #, c-format
 msgid "Error creating directory '%s': %s"
 msgstr "Fout bij aanmaken van map '%s': %s"
 
-#: ../gtk/gtkfilesystemunix.c:631 ../gtk/gtkfilesystemwin32.c:597
+#: gtk/gtkfilesystemunix.c:631 gtk/gtkfilesystemwin32.c:597
 msgid "This file system does not support mounting"
 msgstr "Dit bestandsysteem ondersteunt geen aankoppelen"
 
-#: ../gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#: gtk/gtkfilesystemunix.c:639
+#, fuzzy
+msgid "File System"
 msgstr "Bestandsysteem"
 
-#: ../gtk/gtkfilesystemunix.c:796
+#: gtk/gtkfilesystemunix.c:796
 #, c-format
 msgid "Could not get a stock icon for %s"
 msgstr "Kon geen standaard pictogram verkrijgen voor %s"
 
 # Kies een andere naam
-#: ../gtk/gtkfilesystemunix.c:891
+#: gtk/gtkfilesystemunix.c:891
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"%s\". "
@@ -1857,93 +1867,93 @@ msgstr ""
 "De naam \"%s\" is ongeldig omdat deze het teken \"%s\" bevat. Gebruik een "
 "andere naam."
 
-#: ../gtk/gtkfilesystemunix.c:1463 ../gtk/gtkfilesystemwin32.c:1032
+#: gtk/gtkfilesystemunix.c:1463 gtk/gtkfilesystemwin32.c:1032
 #, c-format
 msgid "Bookmark saving failed: %s"
 msgstr "Opslaan favorieten mislukt %s"
 
-#: ../gtk/gtkfilesystemunix.c:1518
+#: gtk/gtkfilesystemunix.c:1518
 #, c-format
 msgid "'%s' already exists in the bookmarks list"
 msgstr "'%s' staat al in de lijst met favorieten"
 
-#: ../gtk/gtkfilesystemunix.c:1590
+#: gtk/gtkfilesystemunix.c:1590
 #, c-format
 msgid "'%s' does not exist in the bookmarks list"
 msgstr "'%s' staat niet in de lijst met favorieten"
 
-#: ../gtk/gtkfilesystemunix.c:1818
+#: gtk/gtkfilesystemunix.c:1818
 #, c-format
 msgid "Error getting information for '/': %s"
 msgstr "Fout bij verkrijgen van informatie over '/': %s"
 
-#: ../gtk/gtkfilesystemwin32.c:611
+#: gtk/gtkfilesystemwin32.c:611
 #, c-format
 msgid "Network Drive (%s)"
 msgstr "Netwerkstation (%s)"
 
-#: ../gtk/gtkfilesystemwin32.c:650
+#: gtk/gtkfilesystemwin32.c:650
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../gtk/gtkfontbutton.c:179 ../gtk/gtkfontbutton.c:292
+#: gtk/gtkfontbutton.c:179 gtk/gtkfontbutton.c:292
 msgid "Pick a Font"
 msgstr "Kies een lettertype"
 
 #. Initialize fields
-#: ../gtk/gtkfontbutton.c:286
+#: gtk/gtkfontbutton.c:286
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: ../gtk/gtkfontbutton.c:804
+#: gtk/gtkfontbutton.c:804
 msgid "Font"
 msgstr "Lettertype"
 
 #. This is the default text shown in the preview entry, though the user
 #. can set it. Remember that some fonts only have capital letters.
-#: ../gtk/gtkfontsel.c:74
+#: gtk/gtkfontsel.c:74
 msgid "abcdefghijk ABCDEFGHIJK"
 msgstr "abcdefghijk ABCDEFGHIJK"
 
-#: ../gtk/gtkfontsel.c:361
+#: gtk/gtkfontsel.c:361
 msgid "_Family:"
 msgstr "_Familie:"
 
-#: ../gtk/gtkfontsel.c:367
+#: gtk/gtkfontsel.c:367
 msgid "_Style:"
 msgstr "_Stijl:"
 
-#: ../gtk/gtkfontsel.c:373
+#: gtk/gtkfontsel.c:373
 msgid "Si_ze:"
 msgstr "_Grootte:"
 
 #. create the text entry widget
-#: ../gtk/gtkfontsel.c:549
+#: gtk/gtkfontsel.c:549
 msgid "_Preview:"
 msgstr "_Voorbeeld:"
 
-#: ../gtk/gtkfontsel.c:1383
+#: gtk/gtkfontsel.c:1383
 msgid "Font Selection"
 msgstr "Lettertypeselectie"
 
-#: ../gtk/gtkgamma.c:401
+#: gtk/gtkgamma.c:401
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../gtk/gtkgamma.c:411
+#: gtk/gtkgamma.c:411
 msgid "_Gamma value"
 msgstr "_Gammawaarde"
 
 #. Remove this icon source so we don't keep trying to
 #. * load it.
 #.
-#: ../gtk/gtkiconfactory.c:1656
+#: gtk/gtkiconfactory.c:1656
 #, c-format
 msgid "Error loading icon: %s"
 msgstr "Fout bij laden van pictogram: %s"
 
-#: ../gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1956,120 +1966,120 @@ msgstr ""
 "U kunt een kopie verkrijgen bij:\n"
 "\t%s"
 
-#: ../gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Pictogram '%s' niet beschikbaar in dit thema"
 
-#: ../gtk/gtkimmodule.c:427
+#: gtk/gtkimmodule.c:427
 msgid "Default"
 msgstr "Standaard"
 
-#: ../gtk/gtkinputdialog.c:235
+#: gtk/gtkinputdialog.c:235
 msgid "Input"
 msgstr "Invoer"
 
-#: ../gtk/gtkinputdialog.c:244
+#: gtk/gtkinputdialog.c:244
 msgid "No extended input devices"
 msgstr "Geen uitgebreide invoerapparaten"
 
-#: ../gtk/gtkinputdialog.c:256
+#: gtk/gtkinputdialog.c:256
 msgid "_Device:"
 msgstr "_Apparaat:"
 
-#: ../gtk/gtkinputdialog.c:273
+#: gtk/gtkinputdialog.c:273
 msgid "Disabled"
 msgstr "Uitgeschakeld"
 
-#: ../gtk/gtkinputdialog.c:280
+#: gtk/gtkinputdialog.c:280
 msgid "Screen"
 msgstr "Scherm"
 
-#: ../gtk/gtkinputdialog.c:287
+#: gtk/gtkinputdialog.c:287
 msgid "Window"
 msgstr "Venster"
 
-#: ../gtk/gtkinputdialog.c:294
+#: gtk/gtkinputdialog.c:294
 msgid "_Mode: "
 msgstr "_Modus: "
 
 #. The axis listbox
-#: ../gtk/gtkinputdialog.c:325
+#: gtk/gtkinputdialog.c:325
 msgid "_Axes"
 msgstr "_Assen"
 
 #. Keys listbox
-#: ../gtk/gtkinputdialog.c:342
+#: gtk/gtkinputdialog.c:342
 msgid "_Keys"
 msgstr "_Sleutels"
 
-#: ../gtk/gtkinputdialog.c:562
+#: gtk/gtkinputdialog.c:562
 msgid "X"
 msgstr "X"
 
-#: ../gtk/gtkinputdialog.c:563
+#: gtk/gtkinputdialog.c:563
 msgid "Y"
 msgstr "Y"
 
-#: ../gtk/gtkinputdialog.c:564
+#: gtk/gtkinputdialog.c:564
 msgid "Pressure"
 msgstr "Druk"
 
-#: ../gtk/gtkinputdialog.c:565
+#: gtk/gtkinputdialog.c:565
 msgid "X Tilt"
 msgstr "X Helling"
 
-#: ../gtk/gtkinputdialog.c:566
+#: gtk/gtkinputdialog.c:566
 msgid "Y Tilt"
 msgstr "Y Helling"
 
-#: ../gtk/gtkinputdialog.c:567
+#: gtk/gtkinputdialog.c:567
 msgid "Wheel"
 msgstr "Wiel"
 
-#: ../gtk/gtkinputdialog.c:607
+#: gtk/gtkinputdialog.c:607
 msgid "none"
 msgstr "geen"
 
-#: ../gtk/gtkinputdialog.c:643 ../gtk/gtkinputdialog.c:679
+#: gtk/gtkinputdialog.c:643 gtk/gtkinputdialog.c:679
 msgid "(disabled)"
 msgstr "(uitgeschakeld)"
 
-#: ../gtk/gtkinputdialog.c:672
+#: gtk/gtkinputdialog.c:672
 msgid "(unknown)"
 msgstr "(onbekend)"
 
 #. and clear button
-#: ../gtk/gtkinputdialog.c:759
+#: gtk/gtkinputdialog.c:759
 msgid "clear"
 msgstr "wissen"
 
-#: ../gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Alles selecteren"
 
 #. Description of --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:398
+#: gtk/gtkmain.c:398
 msgid "Load additional GTK+ modules"
 msgstr "Extra GTK+ modules laden"
 
 #. Placeholder in --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:399
+#: gtk/gtkmain.c:399
 msgid "MODULES"
 msgstr "MODULES"
 
 #. Description of --g-fatal-warnings in --help output
-#: ../gtk/gtkmain.c:401
+#: gtk/gtkmain.c:401
 msgid "Make all warnings fatal"
 msgstr "Alle waarschuwing fataal laten zijn"
 
 #. Description of --gtk-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:404
+#: gtk/gtkmain.c:404
 msgid "GTK+ debugging flags to set"
 msgstr "In te stellen GTK+ debug-vlaggen"
 
 #. Description of --gtk-no-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:407
+#: gtk/gtkmain.c:407
 msgid "GTK+ debugging flags to unset"
 msgstr "Uit te zetten GTK+ debug-vlaggen"
 
@@ -2078,529 +2088,529 @@ msgstr "Uit te zetten GTK+ debug-vlaggen"
 #. * Do *not* translate it to "predefinito:LTR", if it
 #. * it isn't default:LTR or default:RTL it will not work
 #.
-#: ../gtk/gtkmain.c:476
+#: gtk/gtkmain.c:476
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../gtk/gtkmain.c:559
+#: gtk/gtkmain.c:559
 msgid "GTK+ Options"
 msgstr "GTK+ opties"
 
-#: ../gtk/gtkmain.c:559
+#: gtk/gtkmain.c:559
 msgid "Show GTK+ Options"
 msgstr "GTK+ options tonen"
 
-#: ../gtk/gtknotebook.c:2718 ../gtk/gtknotebook.c:5064
+#: gtk/gtknotebook.c:2718 gtk/gtknotebook.c:5064
 #, c-format
 msgid "Page %u"
 msgstr "Pagina %u"
 
-#: ../gtk/gtkradiotoolbutton.c:92
+#: gtk/gtkradiotoolbutton.c:92
 msgid "Group"
 msgstr "Groep"
 
-#: ../gtk/gtkradiotoolbutton.c:93
+#: gtk/gtkradiotoolbutton.c:93
 msgid "The radio tool button whose group this button belongs to."
 msgstr "De radioknop aan wiens groep deze knop toebehoort."
 
-#: ../gtk/gtkrc.c:2400
+#: gtk/gtkrc.c:2400
 #, c-format
 msgid "Unable to find include file: \"%s\""
 msgstr "Kan invoegbestand \"%s\" niet vinden"
 
-#: ../gtk/gtkrc.c:3042 ../gtk/gtkrc.c:3045
+#: gtk/gtkrc.c:3042 gtk/gtkrc.c:3045
 #, c-format
 msgid "Unable to locate image file in pixmap_path: \"%s\""
 msgstr "Kan afbeelding in pixmap_pad: \"%s\" niet vinden"
 
-#: ../gtk/gtkrc.c:3480
+#: gtk/gtkrc.c:3480
 #, c-format
 msgid "Pixmap path element: \"%s\" must be absolute, %s, line %d"
 msgstr "Pixmap pad-element: \"%s\" moet absoluut zijn, %s, lijn %d"
 
 #. KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate
-#: ../gtk/gtkstock.c:308
+#: gtk/gtkstock.c:308
 msgid "Information"
 msgstr "Informatie"
 
-#: ../gtk/gtkstock.c:309
+#: gtk/gtkstock.c:309
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: ../gtk/gtkstock.c:310
+#: gtk/gtkstock.c:310
 msgid "Error"
 msgstr "Fout"
 
-#: ../gtk/gtkstock.c:311
+#: gtk/gtkstock.c:311
 msgid "Question"
 msgstr "Vraag"
 
 #. FIXME these need accelerators when appropriate, and
 #. * need the mnemonics to be rationalized
 #.
-#: ../gtk/gtkstock.c:316
+#: gtk/gtkstock.c:316
 msgid "_About"
 msgstr "In_fo"
 
-#: ../gtk/gtkstock.c:318
+#: gtk/gtkstock.c:318
 msgid "_Apply"
 msgstr "_Toepassen"
 
-#: ../gtk/gtkstock.c:319
+#: gtk/gtkstock.c:319
 msgid "_Bold"
 msgstr "_Vet"
 
-#: ../gtk/gtkstock.c:320
+#: gtk/gtkstock.c:320
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: ../gtk/gtkstock.c:321
+#: gtk/gtkstock.c:321
 msgid "_CD-Rom"
 msgstr "_CD-Rom"
 
-#: ../gtk/gtkstock.c:322
+#: gtk/gtkstock.c:322
 msgid "_Clear"
 msgstr "_Wissen"
 
-#: ../gtk/gtkstock.c:323
+#: gtk/gtkstock.c:323
 msgid "_Close"
 msgstr "Sl_uiten"
 
-#: ../gtk/gtkstock.c:324
+#: gtk/gtkstock.c:324
 msgid "_Convert"
 msgstr "_Converteren"
 
-#: ../gtk/gtkstock.c:325
+#: gtk/gtkstock.c:325
 msgid "_Copy"
 msgstr "_Kopiëren"
 
-#: ../gtk/gtkstock.c:326
+#: gtk/gtkstock.c:326
 msgid "Cu_t"
 msgstr "K_nippen"
 
-#: ../gtk/gtkstock.c:327
+#: gtk/gtkstock.c:327
 msgid "_Delete"
 msgstr "_Verwijderen"
 
-#: ../gtk/gtkstock.c:328
+#: gtk/gtkstock.c:328
 msgid "_Execute"
 msgstr "_Uitvoeren"
 
-#: ../gtk/gtkstock.c:329
+#: gtk/gtkstock.c:329
 msgid "_Edit"
 msgstr "Be_werken"
 
-#: ../gtk/gtkstock.c:330
+#: gtk/gtkstock.c:330
 msgid "_Find"
 msgstr "_Zoeken"
 
-#: ../gtk/gtkstock.c:331
+#: gtk/gtkstock.c:331
 msgid "Find and _Replace"
 msgstr "Zoeken en _Vervangen"
 
-#: ../gtk/gtkstock.c:332
+#: gtk/gtkstock.c:332
 msgid "_Floppy"
 msgstr "_Diskette"
 
-#: ../gtk/gtkstock.c:333
+#: gtk/gtkstock.c:333
 msgid "_Fullscreen"
 msgstr ""
 
-#: ../gtk/gtkstock.c:334
+#: gtk/gtkstock.c:334
 msgid "_Leave Fullscreen"
 msgstr ""
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:336
+#: gtk/gtkstock.c:336
 msgid "Navigation|_Bottom"
 msgstr "_Onderste"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:338
+#: gtk/gtkstock.c:338
 msgid "Navigation|_First"
 msgstr "_Eerste"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:340
+#: gtk/gtkstock.c:340
 msgid "Navigation|_Last"
 msgstr "_Laatste"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:342
+#: gtk/gtkstock.c:342
 msgid "Navigation|_Top"
 msgstr "_Bovenste"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:344
+#: gtk/gtkstock.c:344
 msgid "Navigation|_Back"
 msgstr "_Terug"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:346
+#: gtk/gtkstock.c:346
 msgid "Navigation|_Down"
 msgstr "_Neer"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:348
+#: gtk/gtkstock.c:348
 msgid "Navigation|_Forward"
 msgstr "_Voorwaarts"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:350
+#: gtk/gtkstock.c:350
 msgid "Navigation|_Up"
 msgstr "_Op"
 
-#: ../gtk/gtkstock.c:351
+#: gtk/gtkstock.c:351
 msgid "_Harddisk"
 msgstr "_Harde schijf"
 
-#: ../gtk/gtkstock.c:352
+#: gtk/gtkstock.c:352
 msgid "_Help"
 msgstr "_Hulp"
 
 # honk/huis/thuis/persoonlijk/persoonlijke map
-#: ../gtk/gtkstock.c:353
+#: gtk/gtkstock.c:353
 msgid "_Home"
 msgstr "_Thuis"
 
 # Inspringen verhogen/Meer inspringen
-#: ../gtk/gtkstock.c:354
+#: gtk/gtkstock.c:354
 msgid "Increase Indent"
 msgstr "Meer inspringen"
 
 # Inspringen verlagen/Minder inspringen<
-#: ../gtk/gtkstock.c:355
+#: gtk/gtkstock.c:355
 msgid "Decrease Indent"
 msgstr "Minder inspringen"
 
-#: ../gtk/gtkstock.c:356
+#: gtk/gtkstock.c:356
 msgid "_Index"
 msgstr "_Index"
 
-#: ../gtk/gtkstock.c:357
+#: gtk/gtkstock.c:357
 msgid "_Information"
 msgstr "_Informatie"
 
 # _schuin/_schuingedrukt/_cursief
 # voorzover ik kan zien alleen in gucharmap gebruikt.
-#: ../gtk/gtkstock.c:358
+#: gtk/gtkstock.c:358
 msgid "_Italic"
 msgstr "_Schuingedrukt"
 
 # ga naar
-#: ../gtk/gtkstock.c:359
+#: gtk/gtkstock.c:359
 msgid "_Jump to"
 msgstr "_Spring naar"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:361
+#: gtk/gtkstock.c:361
 msgid "Justify|_Center"
 msgstr "Ge_centreerd"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:363
+#: gtk/gtkstock.c:363
 msgid "Justify|_Fill"
 msgstr "_Uitvullen"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:365
+#: gtk/gtkstock.c:365
 msgid "Justify|_Left"
 msgstr "_Links"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:367
+#: gtk/gtkstock.c:367
 msgid "Justify|_Right"
 msgstr "_Rechts"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:370
+#: gtk/gtkstock.c:370
 msgid "Media|_Forward"
 msgstr "_Voorwaarts"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:372
+#: gtk/gtkstock.c:372
 msgid "Media|_Next"
 msgstr "_Volgende"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:374
+#: gtk/gtkstock.c:374
 msgid "Media|P_ause"
 msgstr "_Pauzeren"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:376
+#: gtk/gtkstock.c:376
 msgid "Media|_Play"
 msgstr "_Afspelen"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:378
+#: gtk/gtkstock.c:378
 msgid "Media|Pre_vious"
 msgstr "V_orige"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:380
+#: gtk/gtkstock.c:380
 msgid "Media|_Record"
 msgstr "Op_nemen"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:382
+#: gtk/gtkstock.c:382
 msgid "Media|R_ewind"
 msgstr "_Terugspoelen"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:384
+#: gtk/gtkstock.c:384
 msgid "Media|_Stop"
 msgstr "_Stoppen"
 
-#: ../gtk/gtkstock.c:385
+#: gtk/gtkstock.c:385
 msgid "_Network"
 msgstr "_Netwerk"
 
-#: ../gtk/gtkstock.c:386
+#: gtk/gtkstock.c:386
 msgid "_New"
 msgstr "_Nieuw"
 
-#: ../gtk/gtkstock.c:387
+#: gtk/gtkstock.c:387
 msgid "_No"
 msgstr "_Nee"
 
 # Ok/OK
-#: ../gtk/gtkstock.c:388
+#: gtk/gtkstock.c:388
 msgid "_OK"
 msgstr "_OK"
 
-#: ../gtk/gtkstock.c:389
+#: gtk/gtkstock.c:389
 msgid "_Open"
 msgstr "_Openen"
 
-#: ../gtk/gtkstock.c:390
+#: gtk/gtkstock.c:390
 msgid "_Paste"
 msgstr "_Plakken"
 
-#: ../gtk/gtkstock.c:391
+#: gtk/gtkstock.c:391
 msgid "_Preferences"
 msgstr "_Voorkeuren"
 
-#: ../gtk/gtkstock.c:392
+#: gtk/gtkstock.c:392
 msgid "_Print"
 msgstr "Af_drukken"
 
 # om te voorkomen dat _Voorkeuren en Afdruk_voorbeeld om de _v strijden
 # gebruiken we _Afdrukvoorbeeld. De _A zou in de toekomst misschien
 # kunnen worden gebruikt voor _Afsluiten, dan moet dit aangepast worden
-#: ../gtk/gtkstock.c:393
+#: gtk/gtkstock.c:393
 msgid "Print Pre_view"
 msgstr "_Afdrukvoorbeeld"
 
-#: ../gtk/gtkstock.c:394
+#: gtk/gtkstock.c:394
 msgid "_Properties"
 msgstr "_Eigenschappen"
 
-#: ../gtk/gtkstock.c:395
+#: gtk/gtkstock.c:395
 msgid "_Quit"
 msgstr "A_fsluiten"
 
-#: ../gtk/gtkstock.c:396
+#: gtk/gtkstock.c:396
 msgid "_Redo"
 msgstr "Op_nieuw"
 
 # herladen/verversen
-#: ../gtk/gtkstock.c:397
+#: gtk/gtkstock.c:397
 msgid "_Refresh"
 msgstr "_Verversen"
 
-#: ../gtk/gtkstock.c:399
+#: gtk/gtkstock.c:399
 msgid "_Revert"
 msgstr "_Terugdraaien"
 
-#: ../gtk/gtkstock.c:400
+#: gtk/gtkstock.c:400
 msgid "_Save"
 msgstr "Op_slaan"
 
-#: ../gtk/gtkstock.c:401
+#: gtk/gtkstock.c:401
 msgid "Save _As"
 msgstr "Opslaan _als"
 
-#: ../gtk/gtkstock.c:402
+#: gtk/gtkstock.c:402
 msgid "_Color"
 msgstr "_Kleur"
 
-#: ../gtk/gtkstock.c:403
+#: gtk/gtkstock.c:403
 msgid "_Font"
 msgstr "_Lettertype"
 
-#: ../gtk/gtkstock.c:404
+#: gtk/gtkstock.c:404
 msgid "_Ascending"
 msgstr "_Oplopend"
 
-#: ../gtk/gtkstock.c:405
+#: gtk/gtkstock.c:405
 msgid "_Descending"
 msgstr "_Aflopend"
 
-#: ../gtk/gtkstock.c:406
+#: gtk/gtkstock.c:406
 msgid "_Spell Check"
 msgstr "_Spellingscontrole"
 
-#: ../gtk/gtkstock.c:407
+#: gtk/gtkstock.c:407
 msgid "_Stop"
 msgstr "_Stoppen"
 
-#: ../gtk/gtkstock.c:408
+#: gtk/gtkstock.c:408
 msgid "_Strikethrough"
 msgstr "_Doorhalen"
 
-#: ../gtk/gtkstock.c:409
+#: gtk/gtkstock.c:409
 msgid "_Undelete"
 msgstr "Ter_ugplaatsen"
 
-#: ../gtk/gtkstock.c:410
+#: gtk/gtkstock.c:410
 msgid "_Underline"
 msgstr "_Onderstrepen"
 
-#: ../gtk/gtkstock.c:411
+#: gtk/gtkstock.c:411
 msgid "_Undo"
 msgstr "_Ongedaan maken"
 
-#: ../gtk/gtkstock.c:412
+#: gtk/gtkstock.c:412
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../gtk/gtkstock.c:413
+#: gtk/gtkstock.c:413
 msgid "_Normal Size"
 msgstr "_Normale afmeting"
 
-#: ../gtk/gtkstock.c:414
+#: gtk/gtkstock.c:414
 msgid "Best _Fit"
 msgstr "Best _passend"
 
-#: ../gtk/gtkstock.c:415
+#: gtk/gtkstock.c:415
 msgid "Zoom _In"
 msgstr "_Inzoomen"
 
-#: ../gtk/gtkstock.c:416
+#: gtk/gtkstock.c:416
 msgid "Zoom _Out"
 msgstr "_Uitzoomen"
 
-#: ../gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM _Links-naar-rechts markering"
 
-#: ../gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM _Rechts-naar-links markering"
 
-#: ../gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Links-naar-rechts _inbedding"
 
-#: ../gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Rechts-naar-links i_nbedding"
 
-#: ../gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Links-naar-rechts _tenietdoen"
 
-#: ../gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Rechts-naar-links t_enietdoen"
 
-#: ../gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Pop richtingsformattering"
 
-#: ../gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS Spatie _zonder breedte"
 
-#: ../gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ _koppelaar zonder breedte"
 
-#: ../gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Niet-k_oppelaar zonder breedte"
 
-#: ../gtk/gtkthemes.c:71
+#: gtk/gtkthemes.c:71
 #, c-format
 msgid "Unable to locate theme engine in module_path: \"%s\","
 msgstr "Kan themamodule in modulepad: \"%s\" niet vinden,"
 
-#: ../gtk/gtktipsquery.c:186
+#: gtk/gtktipsquery.c:186
 msgid "--- No Tip ---"
 msgstr "--- Geen Tip ---"
 
-#: ../gtk/gtkuimanager.c:1154
+#: gtk/gtkuimanager.c:1154
 #, c-format
 msgid "Unknown attribute '%s' on line %d char %d"
 msgstr "Onbekend attribuut '%s' bij regel %d teken %d"
 
-#: ../gtk/gtkuimanager.c:1371
+#: gtk/gtkuimanager.c:1371
 #, c-format
 msgid "Unexpected start tag '%s' on line %d char %d"
 msgstr "Onverwacht begin-tag '%s' bij regel %d teken %d"
 
-#: ../gtk/gtkuimanager.c:1461
+#: gtk/gtkuimanager.c:1461
 #, c-format
 msgid "Unexpected character data on line %d char %d"
 msgstr "Onverwacht teken bij regel %d teken %d"
 
 # Legen
-#: ../gtk/gtkuimanager.c:2272
+#: gtk/gtkuimanager.c:2272
 msgid "Empty"
 msgstr "Leeg"
 
 #. ID
-#: ../modules/input/imam-et.c:454
+#: modules/input/imam-et.c:454
 msgid "Amharic (EZ+)"
 msgstr "Amharic (EZ+)"
 
 #. ID
-#: ../modules/input/imcedilla.c:91
+#: modules/input/imcedilla.c:91
 msgid "Cedilla"
 msgstr "Cedilla"
 
 #. ID
-#: ../modules/input/imcyrillic-translit.c:217
+#: modules/input/imcyrillic-translit.c:217
 msgid "Cyrillic (Transliterated)"
 msgstr "Cyrillisch (Transliterated)"
 
 #. ID
-#: ../modules/input/iminuktitut.c:127
+#: modules/input/iminuktitut.c:127
 msgid "Inuktitut (Transliterated)"
 msgstr "Inuktitut (Transliterated)"
 
 #. ID
-#: ../modules/input/imipa.c:145
+#: modules/input/imipa.c:145
 msgid "IPA"
 msgstr "IPA"
 
 #. ID
-#: ../modules/input/imthai-broken.c:178
+#: modules/input/imthai-broken.c:178
 msgid "Thai (Broken)"
 msgstr "Thais (Gebroken)"
 
 #. ID
-#: ../modules/input/imti-er.c:453
+#: modules/input/imti-er.c:453
 msgid "Tigrigna-Eritrean (EZ+)"
 msgstr "Tigrisch-Eritrees (EZ+)"
 
 #. ID
-#: ../modules/input/imti-et.c:453
+#: modules/input/imti-et.c:453
 msgid "Tigrigna-Ethiopian (EZ+)"
 msgstr "Tigrisch-Ethiopisch (EZ+)"
 
 #. ID
-#: ../modules/input/imviqr.c:244
+#: modules/input/imviqr.c:244
 msgid "Vietnamese (VIQR)"
 msgstr "Viëtnamees (VIQR)"
 
 #. ID
-#: ../modules/input/imxim.c:28
+#: modules/input/imxim.c:28
 msgid "X Input Method"
 msgstr "X Invoer-Methode"
 
-#: ../tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Kon geen informatie verkrijgen over bestand '%s': %s"
diff --git a/po/nn.po b/po/nn.po
index bdefc291a8..6aa61d8865 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-03-21 21:36+0100\n"
 "Last-Translator: Åsmund Skjæveland\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Klarte ikkje å opna fila «%s»: %s"
@@ -31,7 +31,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Biletefila «%s» inneheld ikkje data"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1281,20 +1281,20 @@ msgstr "Hjul"
 msgid "Color Selection"
 msgstr "Fargeval"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Marker _alt"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Inndata _metoder"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "Set _inn Unicode-kontrollteikn"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Ugyldig filnamn: %s"
@@ -1304,12 +1304,12 @@ msgstr "Ugyldig filnamn: %s"
 msgid "Select A File"
 msgstr "Slett fil"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Heim"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Skrivebord"
@@ -1323,269 +1323,285 @@ msgstr "ingen"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr ""
 "Klarte ikkje å finna informasjon om %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 #, fuzzy
 msgid "Could not add a bookmark"
 msgstr ""
 "Klarte ikkje å leggja til bokmerke for %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 #, fuzzy
 msgid "Could not remove bookmark"
 msgstr ""
 "Klarte ikkje å fjerna bokmerke for %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Ugyldig filnamn: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 "Klarte ikkje å finna informasjon om %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, fuzzy, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Klarte ikkje å leggja til bokmerke for %s fordi det er eit ugyldig stinamn."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "Fje_rn"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Gje nytt namn"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Mappe"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Legg til"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "Kunne ikkje merka %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "Klarte ikkje å leggja til bokmerke for %s fordi det er eit ugyldig stinamn."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "Opna adresse"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Filer"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Namn"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Storleik"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Endra"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "Lag ny _mappe"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Bla etter andre mapper"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Lagra i _mappe:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Lag i _mappe:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 #, fuzzy
 msgid "Cannot change to folder because it is not local"
 msgstr "Kan ikkje gå til mappa. Ho er ikkje lokal"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "snarvegen %s finst ikkje"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Gje nytt namn"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "Kunne ikkje merka %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Skriv namnet på den nye mappa"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d byte"
 msgstr[1] "%d byte"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f Ki"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f Mi"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f Gi"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "I dag"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "I går"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Lag i _mappe:"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 #, fuzzy
 msgid "The folder you specified is an invalid path."
 msgstr "Kan ikkje gå til den oppgjevne mappa. Stien er ugyldig."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, fuzzy, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 "Klarte ikkje å byggja eit filnamn av «%s» og «%s»:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "Kunne ikkje merka %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Opna adresse"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "Opna adresse"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Adresse:"
 
@@ -1785,7 +1801,8 @@ msgid "This file system does not support mounting"
 msgstr "Dette filsystemet støttar ikkje montering"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Filsystem"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1886,7 +1903,7 @@ msgstr "_Gammaverdi"
 msgid "Error loading icon: %s"
 msgstr "Feil under lasting av ikon: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1899,7 +1916,7 @@ msgstr ""
 "Du kan finna henne på:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Ikonet «%s» er ikkje med i drakta"
@@ -1987,7 +2004,7 @@ msgstr "(ukjent)"
 msgid "clear"
 msgstr "tøm"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Vel alt"
 
@@ -2422,43 +2439,43 @@ msgstr "For_størr"
 msgid "Zoom _Out"
 msgstr "For_minsk"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "VHM _Venstre-til-høgre-merke"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "HVM _Høgre-til-venstre-merke"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "VHI V_enstre-til-høgre-innbygging"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "HVE Høgre-til-venstre-in_nbygging"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "VHO Venstre-til-høgre-_overstyring"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "HVO Høgre-til-venstre-o_verstyring"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Pop directional formatting"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "NBS _Nullbreiddeskiljeteikn"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "NBL _Nullbreiddesamanlimar"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "NBUL _Nullbreidde utan samanliming"
 
@@ -2541,7 +2558,7 @@ msgstr "Vietnamesisk (VIQR)"
 msgid "X Input Method"
 msgstr "X-inndatametode"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Klarte ikkje å henta informasjon om fila «%s»: %s"
diff --git a/po/no.po b/po/no.po
index dd7f949f34..c0c656e559 100644
--- a/po/no.po
+++ b/po/no.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-15 12:07+0200\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-07-15 12:10+0200\n"
 "Last-Translator: Terance Edward Sola <terance@lyse.net>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
@@ -18,19 +18,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.10\n"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:153 ../gdk-pixbuf/gdk-pixbuf-io.c:838
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1089 ../tests/testfilechooser.c:218
+#: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Klarte ikke å åpne fil «%s»: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:166 ../gdk-pixbuf/gdk-pixbuf-io.c:850
+#: gdk-pixbuf/gdk-pixbuf-animation.c:166 gdk-pixbuf/gdk-pixbuf-io.c:850
 #, c-format
 msgid "Image file '%s' contains no data"
 msgstr "Bildefil «%s» inneholder ikke data"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:208 ../gdk-pixbuf/gdk-pixbuf-io.c:887
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1130 ../tests/testfilechooser.c:263
+#: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -38,7 +38,7 @@ msgstr ""
 "Feil under lasting av bilde «%s»: årsak ikke kjent, sannsynligvis korrupt "
 "bildefil"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:241
+#: gdk-pixbuf/gdk-pixbuf-animation.c:241
 #, c-format
 msgid ""
 "Failed to load animation '%s': reason not known, probably a corrupt "
@@ -47,12 +47,12 @@ msgstr ""
 "Feil under lasting av animasjon «%s»: årsak ikke kjent, sannsynligvis "
 "korrupt animasjonsfil"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:444
+#: gdk-pixbuf/gdk-pixbuf-io.c:444
 #, c-format
 msgid "Unable to load image-loading module: %s: %s"
 msgstr "Kan ikke laste modul for innlesing av bilder: %s: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:459
+#: gdk-pixbuf/gdk-pixbuf-io.c:459
 #, c-format
 msgid ""
 "Image-loading module %s does not export the proper interface; perhaps it's "
@@ -61,54 +61,54 @@ msgstr ""
 "Modul %s for bildelasting eksporterer ikke riktig grensesnitt; kanskje den "
 "er fra en annen GTK-versjon?"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:628 ../gdk-pixbuf/gdk-pixbuf-io.c:680
+#: gdk-pixbuf/gdk-pixbuf-io.c:628 gdk-pixbuf/gdk-pixbuf-io.c:680
 #, c-format
 msgid "Image type '%s' is not supported"
 msgstr "Bildetype «%s» er ikke støttet"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:720
+#: gdk-pixbuf/gdk-pixbuf-io.c:720
 #, c-format
 msgid "Couldn't recognize the image file format for file '%s'"
 msgstr "Kunne ikke gjenkjenne bildeformatet for fil «%s»"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:728
+#: gdk-pixbuf/gdk-pixbuf-io.c:728
 msgid "Unrecognized image file format"
 msgstr "Ikke-gjenkjent bildeformat"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:896
+#: gdk-pixbuf/gdk-pixbuf-io.c:896
 #, c-format
 msgid "Failed to load image '%s': %s"
 msgstr "Feil under lasting av bilde «%s»: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1357
+#: gdk-pixbuf/gdk-pixbuf-io.c:1357
 #, c-format
 msgid "Error writing to image file: %s"
 msgstr "Feil under skriving til bildefil: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1403 ../gdk-pixbuf/gdk-pixbuf-io.c:1532
+#: gdk-pixbuf/gdk-pixbuf-io.c:1403 gdk-pixbuf/gdk-pixbuf-io.c:1532
 #, c-format
 msgid "This build of gdk-pixbuf does not support saving the image format: %s"
 msgstr ""
 "Dette versjonen av gdk-pixbuf støtter ikke lagring av bildeformatet: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1437
+#: gdk-pixbuf/gdk-pixbuf-io.c:1437
 msgid "Insufficient memory to save image to callback"
 msgstr "Ikke nok minne til å lagre bilde til callback"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1449
+#: gdk-pixbuf/gdk-pixbuf-io.c:1449
 msgid "Failed to open temporary file"
 msgstr "Kunne ikke åpne midlertidig fil"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1474
+#: gdk-pixbuf/gdk-pixbuf-io.c:1474
 msgid "Failed to read from temporary file"
 msgstr "Kunne ikke lese fra midlertidig fil"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1708
+#: gdk-pixbuf/gdk-pixbuf-io.c:1708
 #, c-format
 msgid "Failed to open '%s' for writing: %s"
 msgstr "Feil under åpning av «%s» for skriving: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1732
+#: gdk-pixbuf/gdk-pixbuf-io.c:1732
 #, c-format
 msgid ""
 "Failed to close '%s' while writing image, all data may not have been saved: %"
@@ -117,16 +117,16 @@ msgstr ""
 "Feil under lukking av «%s» under skriving av bilde. Det er ikke sikkert at "
 "alle data er lagret: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1952 ../gdk-pixbuf/gdk-pixbuf-io.c:2002
+#: gdk-pixbuf/gdk-pixbuf-io.c:1952 gdk-pixbuf/gdk-pixbuf-io.c:2002
 msgid "Insufficient memory to save image into a buffer"
 msgstr "Ikke nok minne til å lagre bilde til buffer"
 
-#: ../gdk-pixbuf/gdk-pixbuf-loader.c:383
+#: gdk-pixbuf/gdk-pixbuf-loader.c:383
 #, c-format
 msgid "Incremental loading of image type '%s' is not supported"
 msgstr "Stegvis lasting av bildetype «%s» er ikke støttet"
 
-#: ../gdk-pixbuf/gdk-pixbuf-loader.c:411 ../gdk-pixbuf/gdk-pixbuf-loader.c:513
+#: gdk-pixbuf/gdk-pixbuf-loader.c:411 gdk-pixbuf/gdk-pixbuf-loader.c:513
 #, c-format
 msgid ""
 "Internal error: Image loader module '%s' failed to begin loading an image, "
@@ -135,136 +135,132 @@ msgstr ""
 "Intern feil: Modul for lasting av bilder «%s» feilet ved start av "
 "bildelasting, men ga ingen årsak for feilen"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:147
+#: gdk-pixbuf/gdk-pixdata.c:147
 msgid "Image header corrupt"
 msgstr "Korrupt header i bilde"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:152
+#: gdk-pixbuf/gdk-pixdata.c:152
 msgid "Image format unknown"
 msgstr "Ukjent bildeformat"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:157 ../gdk-pixbuf/gdk-pixdata.c:487
+#: gdk-pixbuf/gdk-pixdata.c:157 gdk-pixbuf/gdk-pixdata.c:487
 msgid "Image pixel data corrupt"
 msgstr "Korrupt pikseldata i bilde"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:431
+#: gdk-pixbuf/gdk-pixdata.c:431
 #, c-format
 msgid "failed to allocate image buffer of %u byte"
 msgid_plural "failed to allocate image buffer of %u bytes"
 msgstr[0] "kunne ikke allokere buffer for bilde på %u byte"
 msgstr[1] "kunne ikke allokere buffer for bilde på %u bytes"
 
-#: ../gdk-pixbuf/io-ani.c:244
+#: gdk-pixbuf/io-ani.c:244
 msgid "Unexpected icon chunk in animation"
 msgstr "Uventet ikondel i animasjonen"
 
-#: ../gdk-pixbuf/io-ani.c:337
+#: gdk-pixbuf/io-ani.c:337
 msgid "Unsupported animation type"
 msgstr "Animasjonstype ikke støttet"
 
-#: ../gdk-pixbuf/io-ani.c:348 ../gdk-pixbuf/io-ani.c:538
+#: gdk-pixbuf/io-ani.c:348 gdk-pixbuf/io-ani.c:538
 msgid "Invalid header in animation"
 msgstr "Ugyldig header i animasjon"
 
-#: ../gdk-pixbuf/io-ani.c:358 ../gdk-pixbuf/io-ani.c:382
-#: ../gdk-pixbuf/io-ani.c:441 ../gdk-pixbuf/io-ani.c:460
-#: ../gdk-pixbuf/io-ani.c:511 ../gdk-pixbuf/io-ani.c:583
+#: gdk-pixbuf/io-ani.c:358 gdk-pixbuf/io-ani.c:382 gdk-pixbuf/io-ani.c:441
+#: gdk-pixbuf/io-ani.c:460 gdk-pixbuf/io-ani.c:511 gdk-pixbuf/io-ani.c:583
 msgid "Not enough memory to load animation"
 msgstr "Ikke nok minne til å laste animasjon"
 
-#: ../gdk-pixbuf/io-ani.c:400 ../gdk-pixbuf/io-ani.c:417
-#: ../gdk-pixbuf/io-ani.c:428
+#: gdk-pixbuf/io-ani.c:400 gdk-pixbuf/io-ani.c:417 gdk-pixbuf/io-ani.c:428
 msgid "Malformed chunk in animation"
 msgstr "Feil i en del av animasjonen"
 
-#: ../gdk-pixbuf/io-ani.c:676
+#: gdk-pixbuf/io-ani.c:676
 msgid "The ANI image format"
 msgstr "ANI bildeformat"
 
-#: ../gdk-pixbuf/io-bmp.c:228 ../gdk-pixbuf/io-bmp.c:306
-#: ../gdk-pixbuf/io-bmp.c:338 ../gdk-pixbuf/io-bmp.c:361
-#: ../gdk-pixbuf/io-bmp.c:442
+#: gdk-pixbuf/io-bmp.c:228 gdk-pixbuf/io-bmp.c:306 gdk-pixbuf/io-bmp.c:338
+#: gdk-pixbuf/io-bmp.c:361 gdk-pixbuf/io-bmp.c:442
 msgid "BMP image has bogus header data"
 msgstr "BMP-bilde har ugyldige data i header"
 
-#: ../gdk-pixbuf/io-bmp.c:239 ../gdk-pixbuf/io-bmp.c:401
+#: gdk-pixbuf/io-bmp.c:239 gdk-pixbuf/io-bmp.c:401
 msgid "Not enough memory to load bitmap image"
 msgstr "Ikke nok minne til å laste bitkart-bilde"
 
-#: ../gdk-pixbuf/io-bmp.c:287
+#: gdk-pixbuf/io-bmp.c:287
 msgid "BMP image has unsupported header size"
 msgstr "BMP-bilde har ustøttet headerstørrelse"
 
-#: ../gdk-pixbuf/io-bmp.c:325
+#: gdk-pixbuf/io-bmp.c:325
 msgid "Topdown BMP images cannot be compressed"
 msgstr "Topdown BMP-bilder kan ikke komprimeres"
 
-#: ../gdk-pixbuf/io-bmp.c:1203
+#: gdk-pixbuf/io-bmp.c:1203
 msgid "Couldn't allocate memory for saving BMP file"
 msgstr "Kunne ikke allokere minne for lagring av BMP-fil"
 
-#: ../gdk-pixbuf/io-bmp.c:1244
+#: gdk-pixbuf/io-bmp.c:1244
 msgid "Couldn't write to BMP file"
 msgstr "Kunne ikke skrive til BMP-fil"
 
-#: ../gdk-pixbuf/io-bmp.c:1293
+#: gdk-pixbuf/io-bmp.c:1293
 msgid "The BMP image format"
 msgstr "BMP bildeformat"
 
-#: ../gdk-pixbuf/io-gif.c:220
+#: gdk-pixbuf/io-gif.c:220
 #, c-format
 msgid "Failure reading GIF: %s"
 msgstr "Feil under lesing av GIF: %s"
 
-#: ../gdk-pixbuf/io-gif.c:492 ../gdk-pixbuf/io-gif.c:1463
-#: ../gdk-pixbuf/io-gif.c:1624
+#: gdk-pixbuf/io-gif.c:492 gdk-pixbuf/io-gif.c:1463 gdk-pixbuf/io-gif.c:1624
 msgid "GIF file was missing some data (perhaps it was truncated somehow?)"
 msgstr "GIF-fil mangler data (kanskje den har blitt avkuttet på en måte?)"
 
-#: ../gdk-pixbuf/io-gif.c:501
+#: gdk-pixbuf/io-gif.c:501
 #, c-format
 msgid "Internal error in the GIF loader (%s)"
 msgstr "Intern feil i GIF-laster (%s)"
 
-#: ../gdk-pixbuf/io-gif.c:575
+#: gdk-pixbuf/io-gif.c:575
 msgid "Stack overflow"
 msgstr "Stabeloverflyt"
 
-#: ../gdk-pixbuf/io-gif.c:635
+#: gdk-pixbuf/io-gif.c:635
 msgid "GIF image loader cannot understand this image."
 msgstr "Laster for GIF-bilder forstår ikke dette bildet."
 
-#: ../gdk-pixbuf/io-gif.c:664
+#: gdk-pixbuf/io-gif.c:664
 msgid "Bad code encountered"
 msgstr "Ugyldig kode funnet"
 
-#: ../gdk-pixbuf/io-gif.c:674
+#: gdk-pixbuf/io-gif.c:674
 msgid "Circular table entry in GIF file"
 msgstr "Sirkulær tabelloppføring i GIF-fil"
 
-#: ../gdk-pixbuf/io-gif.c:862 ../gdk-pixbuf/io-gif.c:1451
-#: ../gdk-pixbuf/io-gif.c:1497 ../gdk-pixbuf/io-gif.c:1612
+#: gdk-pixbuf/io-gif.c:862 gdk-pixbuf/io-gif.c:1451 gdk-pixbuf/io-gif.c:1497
+#: gdk-pixbuf/io-gif.c:1612
 msgid "Not enough memory to load GIF file"
 msgstr "Ikke nok minne til å laste GIF-bilde"
 
-#: ../gdk-pixbuf/io-gif.c:947
+#: gdk-pixbuf/io-gif.c:947
 msgid "Not enough memory to composite a frame in GIF file"
 msgstr "Ikke nok minne til å sette sammen en ramme i GIF-filen"
 
-#: ../gdk-pixbuf/io-gif.c:1116
+#: gdk-pixbuf/io-gif.c:1116
 msgid "GIF image is corrupt (incorrect LZW compression)"
 msgstr "GIF-bilde er korrupt (ukorrekt LZW-kompresjon)"
 
-#: ../gdk-pixbuf/io-gif.c:1166
+#: gdk-pixbuf/io-gif.c:1166
 msgid "File does not appear to be a GIF file"
 msgstr "Filen ser ikke ut til å være en GIF-fil"
 
-#: ../gdk-pixbuf/io-gif.c:1178
+#: gdk-pixbuf/io-gif.c:1178
 #, c-format
 msgid "Version %s of the GIF file format is not supported"
 msgstr "Versjon %s av GIF filformatet er ikke støttet"
 
-#: ../gdk-pixbuf/io-gif.c:1287
+#: gdk-pixbuf/io-gif.c:1287
 msgid ""
 "GIF image has no global colormap, and a frame inside it has no local "
 "colormap."
@@ -272,67 +268,66 @@ msgstr ""
 "GIF-bildet har ikke globalt fargekart, og et delbilde i det har ikke lokalt "
 "fargekart."
 
-#: ../gdk-pixbuf/io-gif.c:1519
+#: gdk-pixbuf/io-gif.c:1519
 msgid "GIF image was truncated or incomplete."
 msgstr "GIF-bildet er avkuttet eller ukomplett."
 
-#: ../gdk-pixbuf/io-gif.c:1671
+#: gdk-pixbuf/io-gif.c:1671
 msgid "The GIF image format"
 msgstr "GIF bildeformat"
 
-#: ../gdk-pixbuf/io-ico.c:219 ../gdk-pixbuf/io-ico.c:271
-#: ../gdk-pixbuf/io-ico.c:340 ../gdk-pixbuf/io-ico.c:403
-#: ../gdk-pixbuf/io-ico.c:433
+#: gdk-pixbuf/io-ico.c:219 gdk-pixbuf/io-ico.c:271 gdk-pixbuf/io-ico.c:340
+#: gdk-pixbuf/io-ico.c:403 gdk-pixbuf/io-ico.c:433
 msgid "Not enough memory to load icon"
 msgstr "Ikke nok minne til å laste ikon"
 
-#: ../gdk-pixbuf/io-ico.c:256 ../gdk-pixbuf/io-ico.c:330
+#: gdk-pixbuf/io-ico.c:256 gdk-pixbuf/io-ico.c:330
 msgid "Invalid header in icon"
 msgstr "Ugyldig header i ikon"
 
-#: ../gdk-pixbuf/io-ico.c:293
+#: gdk-pixbuf/io-ico.c:293
 msgid "Icon has zero width"
 msgstr "Ikon har null bredde"
 
-#: ../gdk-pixbuf/io-ico.c:303
+#: gdk-pixbuf/io-ico.c:303
 msgid "Icon has zero height"
 msgstr "Ikon har null høyde"
 
-#: ../gdk-pixbuf/io-ico.c:355
+#: gdk-pixbuf/io-ico.c:355
 msgid "Compressed icons are not supported"
 msgstr "Komprimerte ikoner er ikke støttet"
 
-#: ../gdk-pixbuf/io-ico.c:388
+#: gdk-pixbuf/io-ico.c:388
 msgid "Unsupported icon type"
 msgstr "Ikontype ikke støttet"
 
-#: ../gdk-pixbuf/io-ico.c:482
+#: gdk-pixbuf/io-ico.c:482
 msgid "Not enough memory to load ICO file"
 msgstr "Ikke nok minne til å laste ICO-fil"
 
-#: ../gdk-pixbuf/io-ico.c:947
+#: gdk-pixbuf/io-ico.c:947
 msgid "Image too large to be saved as ICO"
 msgstr "Bildet er for stort til å lagre som ICO"
 
-#: ../gdk-pixbuf/io-ico.c:958
+#: gdk-pixbuf/io-ico.c:958
 msgid "Cursor hotspot outside image"
 msgstr "Markørposisjon utenfor bildet"
 
-#: ../gdk-pixbuf/io-ico.c:981
+#: gdk-pixbuf/io-ico.c:981
 #, c-format
 msgid "Unsupported depth for ICO file: %d"
 msgstr "Ikke støttet dybde for ICO-fil: %d"
 
-#: ../gdk-pixbuf/io-ico.c:1210
+#: gdk-pixbuf/io-ico.c:1210
 msgid "The ICO image format"
 msgstr "ICO bildeformat"
 
-#: ../gdk-pixbuf/io-jpeg.c:114
+#: gdk-pixbuf/io-jpeg.c:114
 #, c-format
 msgid "Error interpreting JPEG image file (%s)"
 msgstr "Feil under tolking av JPEG-bildefil (%s)"
 
-#: ../gdk-pixbuf/io-jpeg.c:349
+#: gdk-pixbuf/io-jpeg.c:349
 msgid ""
 "Insufficient memory to load image, try exiting some applications to free "
 "memory"
@@ -340,17 +335,17 @@ msgstr ""
 "Ikke nok minne til å laste bildet. Prøv å avslutte noen applikasjoner for å "
 "frigjøre minne"
 
-#: ../gdk-pixbuf/io-jpeg.c:383 ../gdk-pixbuf/io-jpeg.c:749
+#: gdk-pixbuf/io-jpeg.c:383 gdk-pixbuf/io-jpeg.c:749
 #, c-format
 msgid "Unsupported JPEG color space (%s)"
 msgstr "JPEG-fargeområde ikke støttet (%s)"
 
-#: ../gdk-pixbuf/io-jpeg.c:481 ../gdk-pixbuf/io-jpeg.c:678
-#: ../gdk-pixbuf/io-jpeg.c:943 ../gdk-pixbuf/io-jpeg.c:952
+#: gdk-pixbuf/io-jpeg.c:481 gdk-pixbuf/io-jpeg.c:678 gdk-pixbuf/io-jpeg.c:943
+#: gdk-pixbuf/io-jpeg.c:952
 msgid "Couldn't allocate memory for loading JPEG file"
 msgstr "Kunne ikke allokere minne for lasting av JPEG-fil"
 
-#: ../gdk-pixbuf/io-jpeg.c:894
+#: gdk-pixbuf/io-jpeg.c:894
 #, c-format
 msgid ""
 "JPEG quality must be a value between 0 and 100; value '%s' could not be "
@@ -359,93 +354,93 @@ msgstr ""
 "JPEG-kvalitet må være en verdi mellom 0 og 100; verdien «%s» kunne ikke "
 "tolkes."
 
-#: ../gdk-pixbuf/io-jpeg.c:909
+#: gdk-pixbuf/io-jpeg.c:909
 #, c-format
 msgid ""
 "JPEG quality must be a value between 0 and 100; value '%d' is not allowed."
 msgstr ""
 "JPEG-kvalitet må være en verdi mellom 0 og 100; verdien «%d» er ikke tillatt."
 
-#: ../gdk-pixbuf/io-jpeg.c:1071
+#: gdk-pixbuf/io-jpeg.c:1071
 msgid "The JPEG image format"
 msgstr "JPEG bildeformatet"
 
-#: ../gdk-pixbuf/io-pcx.c:191
+#: gdk-pixbuf/io-pcx.c:191
 msgid "Couldn't allocate memory for header"
 msgstr "Kan ikke allokere minne for hode"
 
-#: ../gdk-pixbuf/io-pcx.c:206 ../gdk-pixbuf/io-pcx.c:566
+#: gdk-pixbuf/io-pcx.c:206 gdk-pixbuf/io-pcx.c:566
 msgid "Couldn't allocate memory for context buffer"
 msgstr "Kan ikke allokere minne for kontekstbuffer"
 
-#: ../gdk-pixbuf/io-pcx.c:607
+#: gdk-pixbuf/io-pcx.c:607
 msgid "Image has invalid width and/or height"
 msgstr "Bilde har ugyldig bredde og/eller høyde"
 
-#: ../gdk-pixbuf/io-pcx.c:619 ../gdk-pixbuf/io-pcx.c:680
+#: gdk-pixbuf/io-pcx.c:619 gdk-pixbuf/io-pcx.c:680
 msgid "Image has unsupported bpp"
 msgstr "Bildet har ustøttet bpp"
 
-#: ../gdk-pixbuf/io-pcx.c:624 ../gdk-pixbuf/io-pcx.c:632
+#: gdk-pixbuf/io-pcx.c:624 gdk-pixbuf/io-pcx.c:632
 #, c-format
 msgid "Image has unsupported number of %d-bit planes"
 msgstr "Bildet har ustøttet antall %d-bits plan"
 
-#: ../gdk-pixbuf/io-pcx.c:648
+#: gdk-pixbuf/io-pcx.c:648
 msgid "Couldn't create new pixbuf"
 msgstr "Kan ikke opprette ny pixbuf"
 
-#: ../gdk-pixbuf/io-pcx.c:656
+#: gdk-pixbuf/io-pcx.c:656
 msgid "Couldn't allocate memory for line data"
 msgstr "Kunne ikke allokere minne for linjedata"
 
-#: ../gdk-pixbuf/io-pcx.c:663
+#: gdk-pixbuf/io-pcx.c:663
 msgid "Couldn't allocate memory for paletted data"
 msgstr "Kan ikke allokere minne for palett-data"
 
-#: ../gdk-pixbuf/io-pcx.c:710
+#: gdk-pixbuf/io-pcx.c:710
 msgid "Didn't get all lines of PCX image"
 msgstr "Mottok ikke alle linjene for PCX-bilde"
 
-#: ../gdk-pixbuf/io-pcx.c:717
+#: gdk-pixbuf/io-pcx.c:717
 msgid "No palette found at end of PCX data"
 msgstr "Ingen palett funnet ved slutten av PCX-data"
 
-#: ../gdk-pixbuf/io-pcx.c:758
+#: gdk-pixbuf/io-pcx.c:758
 msgid "The PCX image format"
 msgstr "PCX bildeformat"
 
-#: ../gdk-pixbuf/io-png.c:55
+#: gdk-pixbuf/io-png.c:55
 msgid "Bits per channel of PNG image is invalid."
 msgstr "Ugyldig antall biter per kanal i PNG-bilde."
 
-#: ../gdk-pixbuf/io-png.c:136
+#: gdk-pixbuf/io-png.c:136
 msgid "Transformed PNG has zero width or height."
 msgstr "Transformert PNG har bredde eller høyde lik null."
 
-#: ../gdk-pixbuf/io-png.c:144
+#: gdk-pixbuf/io-png.c:144
 msgid "Bits per channel of transformed PNG is not 8."
 msgstr "Antall biter per kanal i transformert PNG er forskjellig fra 8."
 
-#: ../gdk-pixbuf/io-png.c:153
+#: gdk-pixbuf/io-png.c:153
 msgid "Transformed PNG not RGB or RGBA."
 msgstr "Transformert PNG er ikke RGB eller RGBA."
 
-#: ../gdk-pixbuf/io-png.c:162
+#: gdk-pixbuf/io-png.c:162
 msgid "Transformed PNG has unsupported number of channels, must be 3 or 4."
 msgstr ""
 "Transformert PNG har et ikke-støttet antall kanaler, må være 3 eller 4."
 
-#: ../gdk-pixbuf/io-png.c:183
+#: gdk-pixbuf/io-png.c:183
 #, c-format
 msgid "Fatal error in PNG image file: %s"
 msgstr "Fatal feil i PNG-bildefil: %s"
 
-#: ../gdk-pixbuf/io-png.c:301
+#: gdk-pixbuf/io-png.c:301
 msgid "Insufficient memory to load PNG file"
 msgstr "Ikke nok minne til å laste PNG-fil"
 
-#: ../gdk-pixbuf/io-png.c:618
+#: gdk-pixbuf/io-png.c:618
 #, c-format
 msgid ""
 "Insufficient memory to store a %ld by %ld image; try exiting some "
@@ -454,25 +449,25 @@ msgstr ""
 "Ikke nok minne til å lagre et %ld ganger %ld bilde; prøv å avslutte noen "
 "applikasjoner for å redusere minnebruken"
 
-#: ../gdk-pixbuf/io-png.c:669
+#: gdk-pixbuf/io-png.c:669
 msgid "Fatal error reading PNG image file"
 msgstr "Fatal feil under lesing av PNG-bildefil"
 
-#: ../gdk-pixbuf/io-png.c:718
+#: gdk-pixbuf/io-png.c:718
 #, c-format
 msgid "Fatal error reading PNG image file: %s"
 msgstr "Fatal feil under lesing av PNG-bildefil: %s"
 
-#: ../gdk-pixbuf/io-png.c:810
+#: gdk-pixbuf/io-png.c:810
 msgid ""
 "Keys for PNG text chunks must have at least 1 and at most 79 characters."
 msgstr "Nøkler for PNG tekstbiter må minst ha mellom 1 og 79 tegn."
 
-#: ../gdk-pixbuf/io-png.c:818
+#: gdk-pixbuf/io-png.c:818
 msgid "Keys for PNG text chunks must be ASCII characters."
 msgstr "Nøkler for PNG tekstbiter må bestå av ASCII-tegn."
 
-#: ../gdk-pixbuf/io-png.c:831
+#: gdk-pixbuf/io-png.c:831
 #, c-format
 msgid ""
 "PNG compression level must be a value between 0 and 9; value '%s' could not "
@@ -481,7 +476,7 @@ msgstr ""
 "Nivået til PNG-komprimeringen må være en verdi mello 0 og 9; verdi «%s» kan "
 "ikke brukes."
 
-#: ../gdk-pixbuf/io-png.c:843
+#: gdk-pixbuf/io-png.c:843
 #, c-format
 msgid ""
 "PNG compression level must be a value between 0 and 9; value '%d' is not "
@@ -490,327 +485,324 @@ msgstr ""
 "Nivået på PNG-komprimering må være en verdi mellom 0 og 9; verdien «%d» er "
 "ikke tillat."
 
-#: ../gdk-pixbuf/io-png.c:883
+#: gdk-pixbuf/io-png.c:883
 #, c-format
 msgid "Value for PNG text chunk %s cannot be converted to ISO-8859-1 encoding."
 msgstr "Verdi for PNG-tekstbit %s kan ikke konverteres til ISO-8859-1-koding."
 
-#: ../gdk-pixbuf/io-png.c:1026
+#: gdk-pixbuf/io-png.c:1026
 msgid "The PNG image format"
 msgstr "PNG-bildeformat"
 
-#: ../gdk-pixbuf/io-pnm.c:252
+#: gdk-pixbuf/io-pnm.c:252
 msgid "PNM loader expected to find an integer, but didn't"
 msgstr "PNM-laster ventet å finne et heltall, men gjorde ikke det"
 
-#: ../gdk-pixbuf/io-pnm.c:284
+#: gdk-pixbuf/io-pnm.c:284
 msgid "PNM file has an incorrect initial byte"
 msgstr "PNM-filen har ukorrekt initiell byte"
 
-#: ../gdk-pixbuf/io-pnm.c:314
+#: gdk-pixbuf/io-pnm.c:314
 msgid "PNM file is not in a recognized PNM subformat"
 msgstr "PNM-filen er ikke i et gjenkjent PNM-underformat"
 
-#: ../gdk-pixbuf/io-pnm.c:339
+#: gdk-pixbuf/io-pnm.c:339
 msgid "PNM file has an image width of 0"
 msgstr "PNM-filen har en bildebredde på 0"
 
-#: ../gdk-pixbuf/io-pnm.c:360
+#: gdk-pixbuf/io-pnm.c:360
 msgid "PNM file has an image height of 0"
 msgstr "PNM-filen har en bildehøyde på 0"
 
-#: ../gdk-pixbuf/io-pnm.c:383
+#: gdk-pixbuf/io-pnm.c:383
 msgid "Maximum color value in PNM file is 0"
 msgstr "Maksimal fargeverdi i PNM-filen er 0"
 
-#: ../gdk-pixbuf/io-pnm.c:391
+#: gdk-pixbuf/io-pnm.c:391
 msgid "Maximum color value in PNM file is too large"
 msgstr "Maksimal fargeverdi i PNM-filen er for stor"
 
-#: ../gdk-pixbuf/io-pnm.c:399
+#: gdk-pixbuf/io-pnm.c:399
 msgid "Cannot handle PNM files with maximum color values greater than 255"
 msgstr "Kan ikke håndtere PNM-filer med fargeverdier større enn 255"
 
-#: ../gdk-pixbuf/io-pnm.c:438 ../gdk-pixbuf/io-pnm.c:466
-#: ../gdk-pixbuf/io-pnm.c:498
+#: gdk-pixbuf/io-pnm.c:438 gdk-pixbuf/io-pnm.c:466 gdk-pixbuf/io-pnm.c:498
 msgid "Raw PNM image type is invalid"
 msgstr "Rå PNM-bildetype er ugyldig"
 
-#: ../gdk-pixbuf/io-pnm.c:562 ../gdk-pixbuf/io-pnm.c:604
+#: gdk-pixbuf/io-pnm.c:562 gdk-pixbuf/io-pnm.c:604
 msgid "PNM image format is invalid"
 msgstr "PNM-bildeformat er ugyldig"
 
-#: ../gdk-pixbuf/io-pnm.c:663
+#: gdk-pixbuf/io-pnm.c:663
 msgid "PNM image loader does not support this PNM subformat"
 msgstr "PNM-bildelaster støtter ikke dette PNM-underformatet"
 
-#: ../gdk-pixbuf/io-pnm.c:718
+#: gdk-pixbuf/io-pnm.c:718
 msgid "Premature end-of-file encountered"
 msgstr "Prematur slutt-på-fil funnet"
 
-#: ../gdk-pixbuf/io-pnm.c:750 ../gdk-pixbuf/io-pnm.c:981
+#: gdk-pixbuf/io-pnm.c:750 gdk-pixbuf/io-pnm.c:981
 msgid "Raw PNM formats require exactly one whitespace before sample data"
 msgstr ""
 "Ubehandlede PNM-formater krever eksakt ett blankt felt før eksempeldata"
 
-#: ../gdk-pixbuf/io-pnm.c:777
+#: gdk-pixbuf/io-pnm.c:777
 msgid "Cannot allocate memory for loading PNM image"
 msgstr "Kan ikke allokere minne for lasting av PNM-bilde"
 
-#: ../gdk-pixbuf/io-pnm.c:827
+#: gdk-pixbuf/io-pnm.c:827
 msgid "Insufficient memory to load PNM context struct"
 msgstr "Ikke nok minne til å laste PNM kontekstdata"
 
-#: ../gdk-pixbuf/io-pnm.c:878
+#: gdk-pixbuf/io-pnm.c:878
 msgid "Unexpected end of PNM image data"
 msgstr "Uventet slutt på PNM-bildedata"
 
-#: ../gdk-pixbuf/io-pnm.c:1010
+#: gdk-pixbuf/io-pnm.c:1010
 msgid "Insufficient memory to load PNM file"
 msgstr "Ikke nok minne til å laste PNM-fil"
 
-#: ../gdk-pixbuf/io-pnm.c:1089
+#: gdk-pixbuf/io-pnm.c:1089
 msgid "The PNM/PBM/PGM/PPM image format family"
 msgstr "PNM/PBM/PGM/PPM-bildeformatfamilien"
 
-#: ../gdk-pixbuf/io-ras.c:126
+#: gdk-pixbuf/io-ras.c:126
 msgid "RAS image has bogus header data"
 msgstr "RAS-bilde har ugyldige data i header"
 
-#: ../gdk-pixbuf/io-ras.c:148
+#: gdk-pixbuf/io-ras.c:148
 msgid "RAS image has unknown type"
 msgstr "RAS-bilde har ukjent type"
 
-#: ../gdk-pixbuf/io-ras.c:156
+#: gdk-pixbuf/io-ras.c:156
 msgid "unsupported RAS image variation"
 msgstr "RAS-bildevariasjon ikke støttet"
 
-#: ../gdk-pixbuf/io-ras.c:171 ../gdk-pixbuf/io-ras.c:200
+#: gdk-pixbuf/io-ras.c:171 gdk-pixbuf/io-ras.c:200
 msgid "Not enough memory to load RAS image"
 msgstr "Ikke nok minne til å laste RAS-bilde"
 
-#: ../gdk-pixbuf/io-ras.c:543
+#: gdk-pixbuf/io-ras.c:543
 msgid "The Sun raster image format"
 msgstr "Sun raster-bildeformat"
 
-#: ../gdk-pixbuf/io-tga.c:154
+#: gdk-pixbuf/io-tga.c:154
 msgid "Cannot allocate memory for IOBuffer struct"
 msgstr "Kan ikke allokere minne for IOBuffer-struct"
 
-#: ../gdk-pixbuf/io-tga.c:173
+#: gdk-pixbuf/io-tga.c:173
 msgid "Cannot allocate memory for IOBuffer data"
 msgstr "Kan ikke allokere minne for IOBuffer-data"
 
-#: ../gdk-pixbuf/io-tga.c:184
+#: gdk-pixbuf/io-tga.c:184
 msgid "Cannot realloc IOBuffer data"
 msgstr "Kan ikke kjøre realloc for IOBuffer-data"
 
-#: ../gdk-pixbuf/io-tga.c:214
+#: gdk-pixbuf/io-tga.c:214
 msgid "Cannot allocate temporary IOBuffer data"
 msgstr "Kan ikke allokere midlertidige IOBuffer-data"
 
-#: ../gdk-pixbuf/io-tga.c:348
+#: gdk-pixbuf/io-tga.c:348
 msgid "Cannot allocate new pixbuf"
 msgstr "Kan ikke allokere ny pixbuf"
 
-#: ../gdk-pixbuf/io-tga.c:689
+#: gdk-pixbuf/io-tga.c:689
 msgid "Cannot allocate colormap structure"
 msgstr "Kan ikke allokere struktur for fargekart"
 
-#: ../gdk-pixbuf/io-tga.c:696
+#: gdk-pixbuf/io-tga.c:696
 msgid "Cannot allocate colormap entries"
 msgstr "Kan ikke allokere fargekartoppføringer"
 
-#: ../gdk-pixbuf/io-tga.c:718
+#: gdk-pixbuf/io-tga.c:718
 msgid "Unexpected bitdepth for colormap entries"
 msgstr "Uventet oppløsning for fargekartoppføringer"
 
-#: ../gdk-pixbuf/io-tga.c:736
+#: gdk-pixbuf/io-tga.c:736
 msgid "Cannot allocate TGA header memory"
 msgstr "Kan ikke allokere minne for TGA-hode"
 
-#: ../gdk-pixbuf/io-tga.c:769
+#: gdk-pixbuf/io-tga.c:769
 msgid "TGA image has invalid dimensions"
 msgstr "TGA-bilde har ugyldige dimensjoner"
 
-#: ../gdk-pixbuf/io-tga.c:775 ../gdk-pixbuf/io-tga.c:784
-#: ../gdk-pixbuf/io-tga.c:794 ../gdk-pixbuf/io-tga.c:804
-#: ../gdk-pixbuf/io-tga.c:811
+#: gdk-pixbuf/io-tga.c:775 gdk-pixbuf/io-tga.c:784 gdk-pixbuf/io-tga.c:794
+#: gdk-pixbuf/io-tga.c:804 gdk-pixbuf/io-tga.c:811
 msgid "TGA image type not supported"
 msgstr "TGA bildetype er ikke støttet"
 
-#: ../gdk-pixbuf/io-tga.c:858
+#: gdk-pixbuf/io-tga.c:858
 msgid "Cannot allocate memory for TGA context struct"
 msgstr "Kan ikke allokere minne for TGA-kontekststruktur"
 
-#: ../gdk-pixbuf/io-tga.c:923
+#: gdk-pixbuf/io-tga.c:923
 msgid "Excess data in file"
 msgstr "Overflødige data i filen"
 
-#: ../gdk-pixbuf/io-tga.c:992
+#: gdk-pixbuf/io-tga.c:992
 msgid "The Targa image format"
 msgstr "Targa bildeformatet"
 
-#: ../gdk-pixbuf/io-tiff.c:173
+#: gdk-pixbuf/io-tiff.c:173
 msgid "Could not get image width (bad TIFF file)"
 msgstr "Kunne ikke finne bildebredde (ugyldig TIFF-fil)"
 
-#: ../gdk-pixbuf/io-tiff.c:180
+#: gdk-pixbuf/io-tiff.c:180
 msgid "Could not get image height (bad TIFF file)"
 msgstr "Kunne ikke finne bildehøyde (ugyldig TIFF-fil)"
 
-#: ../gdk-pixbuf/io-tiff.c:188
+#: gdk-pixbuf/io-tiff.c:188
 msgid "Width or height of TIFF image is zero"
 msgstr "Bredde eller høyde på TIFF-bilde er null"
 
-#: ../gdk-pixbuf/io-tiff.c:197 ../gdk-pixbuf/io-tiff.c:206
+#: gdk-pixbuf/io-tiff.c:197 gdk-pixbuf/io-tiff.c:206
 msgid "Dimensions of TIFF image too large"
 msgstr "TIFF-bildet er for stort"
 
-#: ../gdk-pixbuf/io-tiff.c:225 ../gdk-pixbuf/io-tiff.c:237
-#: ../gdk-pixbuf/io-tiff.c:286 ../gdk-pixbuf/io-tiff.c:572
+#: gdk-pixbuf/io-tiff.c:225 gdk-pixbuf/io-tiff.c:237 gdk-pixbuf/io-tiff.c:286
+#: gdk-pixbuf/io-tiff.c:572
 msgid "Insufficient memory to open TIFF file"
 msgstr "Ikke nok minne til å åpne TIFF-bilde"
 
-#: ../gdk-pixbuf/io-tiff.c:251 ../gdk-pixbuf/io-tiff.c:294
+#: gdk-pixbuf/io-tiff.c:251 gdk-pixbuf/io-tiff.c:294
 msgid "Failed to load RGB data from TIFF file"
 msgstr "Feil under lasting av RGB-data fra TIFF-fil"
 
-#: ../gdk-pixbuf/io-tiff.c:361
+#: gdk-pixbuf/io-tiff.c:361
 msgid "Failed to open TIFF image"
 msgstr "Feil under åpning av TIFF-bilde"
 
-#: ../gdk-pixbuf/io-tiff.c:373
+#: gdk-pixbuf/io-tiff.c:373
 msgid "TIFFClose operation failed"
 msgstr "TIFFClose operasjonen feilet"
 
-#: ../gdk-pixbuf/io-tiff.c:504 ../gdk-pixbuf/io-tiff.c:517
+#: gdk-pixbuf/io-tiff.c:504 gdk-pixbuf/io-tiff.c:517
 msgid "Failed to load TIFF image"
 msgstr "Feil under åpning av TIFF-bilde"
 
-#: ../gdk-pixbuf/io-tiff.c:610
+#: gdk-pixbuf/io-tiff.c:610
 msgid "The TIFF image format"
 msgstr "TIFF bildeformat"
 
-#: ../gdk-pixbuf/io-wbmp.c:246
+#: gdk-pixbuf/io-wbmp.c:246
 msgid "Image has zero width"
 msgstr "Bilde har null bredde"
 
-#: ../gdk-pixbuf/io-wbmp.c:264
+#: gdk-pixbuf/io-wbmp.c:264
 msgid "Image has zero height"
 msgstr "Bilde har null høyde"
 
-#: ../gdk-pixbuf/io-wbmp.c:275
+#: gdk-pixbuf/io-wbmp.c:275
 msgid "Not enough memory to load image"
 msgstr "Ikke nok minne til å laste bilde"
 
-#: ../gdk-pixbuf/io-wbmp.c:334
+#: gdk-pixbuf/io-wbmp.c:334
 msgid "Couldn't save the rest"
 msgstr "Kunne ikke lagre resten"
 
-#: ../gdk-pixbuf/io-wbmp.c:368
+#: gdk-pixbuf/io-wbmp.c:368
 msgid "The WBMP image format"
 msgstr "WBMP bildeformatet"
 
-#: ../gdk-pixbuf/io-xbm.c:287
+#: gdk-pixbuf/io-xbm.c:287
 msgid "Invalid XBM file"
 msgstr "Ugyldig XBM-fil"
 
-#: ../gdk-pixbuf/io-xbm.c:297
+#: gdk-pixbuf/io-xbm.c:297
 msgid "Insufficient memory to load XBM image file"
 msgstr "Ikke nok minne til å laste XBM-bildefil"
 
-#: ../gdk-pixbuf/io-xbm.c:441
+#: gdk-pixbuf/io-xbm.c:441
 msgid "Failed to write to temporary file when loading XBM image"
 msgstr "Feil under skriving til midlertidig file under lasting av XBM-bilde"
 
-#: ../gdk-pixbuf/io-xbm.c:476
+#: gdk-pixbuf/io-xbm.c:476
 msgid "The XBM image format"
 msgstr "XBM bildeformat"
 
-#: ../gdk-pixbuf/io-xpm.c:467
+#: gdk-pixbuf/io-xpm.c:467
 msgid "No XPM header found"
 msgstr "Ingen XPM-header funnet"
 
-#: ../gdk-pixbuf/io-xpm.c:476
+#: gdk-pixbuf/io-xpm.c:476
 msgid "Invalid XPM header"
 msgstr "Ugyldig XPM-hode"
 
-#: ../gdk-pixbuf/io-xpm.c:484
+#: gdk-pixbuf/io-xpm.c:484
 msgid "XPM file has image width <= 0"
 msgstr "XPM-filen har en bildebredde <= 0"
 
-#: ../gdk-pixbuf/io-xpm.c:492
+#: gdk-pixbuf/io-xpm.c:492
 msgid "XPM file has image height <= 0"
 msgstr "XPM-filen har en bildehøyde <= 0"
 
-#: ../gdk-pixbuf/io-xpm.c:500
+#: gdk-pixbuf/io-xpm.c:500
 msgid "XPM has invalid number of chars per pixel"
 msgstr "XPM har et ugyldig antall tegn per piksel"
 
-#: ../gdk-pixbuf/io-xpm.c:507
+#: gdk-pixbuf/io-xpm.c:507
 msgid "XPM file has invalid number of colors"
 msgstr "XPM-filen har et ugyldig antall farger"
 
-#: ../gdk-pixbuf/io-xpm.c:519 ../gdk-pixbuf/io-xpm.c:528
-#: ../gdk-pixbuf/io-xpm.c:580
+#: gdk-pixbuf/io-xpm.c:519 gdk-pixbuf/io-xpm.c:528 gdk-pixbuf/io-xpm.c:580
 msgid "Cannot allocate memory for loading XPM image"
 msgstr "Kan ikke allokere minne for lasting av XPM-bilde"
 
-#: ../gdk-pixbuf/io-xpm.c:542
+#: gdk-pixbuf/io-xpm.c:542
 msgid "Cannot read XPM colormap"
 msgstr "Kan ikke lese fargekart for XPM"
 
-#: ../gdk-pixbuf/io-xpm.c:771
+#: gdk-pixbuf/io-xpm.c:771
 msgid "Failed to write to temporary file when loading XPM image"
 msgstr "Feil under skriving til midlertidig fil under lasting av XPM-bilde"
 
-#: ../gdk-pixbuf/io-xpm.c:806
+#: gdk-pixbuf/io-xpm.c:806
 msgid "The XPM image format"
 msgstr "XPM bildeformat"
 
 #. Description of --class=CLASS in --help output
-#: ../gdk/gdk.c:115
+#: gdk/gdk.c:115
 msgid "Program class as used by the window manager"
 msgstr "Programklasse som brukes av vindushåndtereren"
 
 #. Placeholder in --class=CLASS in --help output
-#: ../gdk/gdk.c:116
+#: gdk/gdk.c:116
 msgid "CLASS"
 msgstr "KLASSE"
 
 #. Description of --name=NAME in --help output
-#: ../gdk/gdk.c:118
+#: gdk/gdk.c:118
 msgid "Program name as used by the window manager"
 msgstr "Programnavn som brukes av vindushåndtereren"
 
 #. Placeholder in --name=NAME in --help output
-#: ../gdk/gdk.c:119
+#: gdk/gdk.c:119
 msgid "NAME"
 msgstr "NAVN"
 
 #. Description of --display=DISPLAY in --help output
-#: ../gdk/gdk.c:121
+#: gdk/gdk.c:121
 msgid "X display to use"
 msgstr "X-skjerm som skal brukes"
 
 #. Placeholder in --display=DISPLAY in --help output
-#: ../gdk/gdk.c:122
+#: gdk/gdk.c:122
 msgid "DISPLAY"
 msgstr "SKJERM"
 
 #. Description of --screen=SCREEN in --help output
-#: ../gdk/gdk.c:124
+#: gdk/gdk.c:124
 msgid "X screen to use"
 msgstr "X-skjerm som skal brukes"
 
 #. Placeholder in --screen=SCREEN in --help output
-#: ../gdk/gdk.c:125
+#: gdk/gdk.c:125
 msgid "SCREEN"
 msgstr "SKJERM"
 
 #. Description of --gdk-debug=FLAGS in --help output
-#: ../gdk/gdk.c:128
+#: gdk/gdk.c:128
 msgid "Gdk debugging flags to set"
 msgstr "Feilsøkingsflagg som skal settes for Gdk"
 
@@ -818,222 +810,222 @@ msgstr "Feilsøkingsflagg som skal settes for Gdk"
 #. Placeholder in --gdk-no-debug=FLAGS in --help output
 #. Placeholder in --gtk-debug=FLAGS in --help output
 #. Placeholder in --gtk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:129 ../gdk/gdk.c:132 ../gtk/gtkmain.c:405 ../gtk/gtkmain.c:408
+#: gdk/gdk.c:129 gdk/gdk.c:132 gtk/gtkmain.c:405 gtk/gtkmain.c:408
 msgid "FLAGS"
 msgstr "FLAGG"
 
 #. Description of --gdk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:131
+#: gdk/gdk.c:131
 msgid "Gdk debugging flags to unset"
 msgstr "Feilsøkingsflagg for Gdk som skal fjernes"
 
-#: ../gdk/keyname-table.h:3940
+#: gdk/keyname-table.h:3940
 msgid "keyboard label|BackSpace"
 msgstr "Backspace"
 
-#: ../gdk/keyname-table.h:3941
+#: gdk/keyname-table.h:3941
 msgid "keyboard label|Tab"
 msgstr "Tab"
 
-#: ../gdk/keyname-table.h:3942
+#: gdk/keyname-table.h:3942
 msgid "keyboard label|Return"
 msgstr "Enter"
 
-#: ../gdk/keyname-table.h:3943
+#: gdk/keyname-table.h:3943
 msgid "keyboard label|Pause"
 msgstr "Pause"
 
-#: ../gdk/keyname-table.h:3944
+#: gdk/keyname-table.h:3944
 msgid "keyboard label|Scroll_Lock"
 msgstr "Scroll Lock"
 
-#: ../gdk/keyname-table.h:3945
+#: gdk/keyname-table.h:3945
 msgid "keyboard label|Sys_Req"
 msgstr "Sys Req"
 
-#: ../gdk/keyname-table.h:3946
+#: gdk/keyname-table.h:3946
 msgid "keyboard label|Escape"
 msgstr "Escape"
 
-#: ../gdk/keyname-table.h:3947
+#: gdk/keyname-table.h:3947
 msgid "keyboard label|Multi_key"
 msgstr "Multi_key"
 
-#: ../gdk/keyname-table.h:3948
+#: gdk/keyname-table.h:3948
 msgid "keyboard label|Home"
 msgstr "Home"
 
-#: ../gdk/keyname-table.h:3949
+#: gdk/keyname-table.h:3949
 msgid "keyboard label|Page_Up"
 msgstr "Page Up"
 
-#: ../gdk/keyname-table.h:3950
+#: gdk/keyname-table.h:3950
 msgid "keyboard label|Page_Down"
 msgstr "Page Down"
 
-#: ../gdk/keyname-table.h:3951
+#: gdk/keyname-table.h:3951
 msgid "keyboard label|End"
 msgstr "End"
 
-#: ../gdk/keyname-table.h:3952
+#: gdk/keyname-table.h:3952
 msgid "keyboard label|Begin"
 msgstr "Begin"
 
-#: ../gdk/keyname-table.h:3953
+#: gdk/keyname-table.h:3953
 msgid "keyboard label|Print"
 msgstr "Print Screen"
 
-#: ../gdk/keyname-table.h:3954
+#: gdk/keyname-table.h:3954
 msgid "keyboard label|Insert"
 msgstr "Insert"
 
-#: ../gdk/keyname-table.h:3955
+#: gdk/keyname-table.h:3955
 msgid "keyboard label|Num_Lock"
 msgstr "Num Lock"
 
-#: ../gdk/keyname-table.h:3956
+#: gdk/keyname-table.h:3956
 msgid "keyboard label|KP_Space"
 msgstr "KP_Space"
 
-#: ../gdk/keyname-table.h:3957
+#: gdk/keyname-table.h:3957
 msgid "keyboard label|KP_Tab"
 msgstr "KP_Tab"
 
-#: ../gdk/keyname-table.h:3958
+#: gdk/keyname-table.h:3958
 msgid "keyboard label|KP_Enter"
 msgstr "KP_Enter"
 
-#: ../gdk/keyname-table.h:3959
+#: gdk/keyname-table.h:3959
 msgid "keyboard label|KP_Home"
 msgstr "KP_Home"
 
-#: ../gdk/keyname-table.h:3960
+#: gdk/keyname-table.h:3960
 msgid "keyboard label|KP_Left"
 msgstr "KP_Left"
 
-#: ../gdk/keyname-table.h:3961
+#: gdk/keyname-table.h:3961
 msgid "keyboard label|KP_Up"
 msgstr "KP_Up"
 
-#: ../gdk/keyname-table.h:3962
+#: gdk/keyname-table.h:3962
 msgid "keyboard label|KP_Right"
 msgstr "KP_Right"
 
-#: ../gdk/keyname-table.h:3963
+#: gdk/keyname-table.h:3963
 msgid "keyboard label|KP_Down"
 msgstr "KP_Down"
 
-#: ../gdk/keyname-table.h:3964
+#: gdk/keyname-table.h:3964
 msgid "keyboard label|KP_Page_Up"
 msgstr "KP_Page_Up"
 
-#: ../gdk/keyname-table.h:3965
+#: gdk/keyname-table.h:3965
 msgid "keyboard label|KP_Prior"
 msgstr "KP_Prior"
 
-#: ../gdk/keyname-table.h:3966
+#: gdk/keyname-table.h:3966
 msgid "keyboard label|KP_Page_Down"
 msgstr "KP_Page_Down"
 
-#: ../gdk/keyname-table.h:3967
+#: gdk/keyname-table.h:3967
 msgid "keyboard label|KP_Next"
 msgstr "KP_Next"
 
-#: ../gdk/keyname-table.h:3968
+#: gdk/keyname-table.h:3968
 msgid "keyboard label|KP_End"
 msgstr "KP_End"
 
-#: ../gdk/keyname-table.h:3969
+#: gdk/keyname-table.h:3969
 msgid "keyboard label|KP_Begin"
 msgstr "KP_Begin"
 
-#: ../gdk/keyname-table.h:3970
+#: gdk/keyname-table.h:3970
 msgid "keyboard label|KP_Insert"
 msgstr "KP_Insert"
 
-#: ../gdk/keyname-table.h:3971
+#: gdk/keyname-table.h:3971
 msgid "keyboard label|KP_Delete"
 msgstr "KP_Delete"
 
-#: ../gdk/keyname-table.h:3972
+#: gdk/keyname-table.h:3972
 msgid "keyboard label|Delete"
 msgstr "Delete"
 
 #. Description of --sync in --help output
-#: ../gdk/win32/gdkmain-win32.c:60
+#: gdk/win32/gdkmain-win32.c:60
 msgid "Don't batch GDI requests"
 msgstr "Ikke send flere GDI-forespørsler sammen"
 
 #. Description of --no-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:62
+#: gdk/win32/gdkmain-win32.c:62
 msgid "Don't use the Wintab API for tablet support"
 msgstr "Ikke bruk Wintab-APIet for støtte for tablet"
 
 #. Description of --ignore-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:64
+#: gdk/win32/gdkmain-win32.c:64
 msgid "Same as --no-wintab"
 msgstr "Samme som --no-wintab"
 
 #. Description of --use-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:66
+#: gdk/win32/gdkmain-win32.c:66
 msgid "Do use the Wintab API [default]"
 msgstr "Ikke bruk Wintab-API [forvalgt]"
 
 #. Description of --max-colors=COLORS in --help output
-#: ../gdk/win32/gdkmain-win32.c:68
+#: gdk/win32/gdkmain-win32.c:68
 msgid "Size of the palette in 8 bit mode"
 msgstr "Størrelse på paletten i 8-bits modus"
 
 #. Placeholder in --max-colors=COLORS in --help output
-#: ../gdk/win32/gdkmain-win32.c:69
+#: gdk/win32/gdkmain-win32.c:69
 msgid "COLORS"
 msgstr "FARGER"
 
 #. Description of --sync in --help output
-#: ../gdk/x11/gdkmain-x11.c:92
+#: gdk/x11/gdkmain-x11.c:92
 msgid "Make X calls synchronous"
 msgstr "Gjør kall til X-bibliotekene synkrone"
 
-#: ../gtk/gtkaboutdialog.c:273 ../gtk/gtkaboutdialog.c:2103
+#: gtk/gtkaboutdialog.c:273 gtk/gtkaboutdialog.c:2103
 msgid "License"
 msgstr "Lisens"
 
-#: ../gtk/gtkaboutdialog.c:274
+#: gtk/gtkaboutdialog.c:274
 msgid "The license of the program"
 msgstr "Programmets lisens"
 
 #. Add the credits button
-#: ../gtk/gtkaboutdialog.c:509
+#: gtk/gtkaboutdialog.c:509
 msgid "C_redits"
 msgstr "Bid_ragsytere"
 
 #. Add the license button
-#: ../gtk/gtkaboutdialog.c:519
+#: gtk/gtkaboutdialog.c:519
 msgid "_License"
 msgstr "_Lisens"
 
-#: ../gtk/gtkaboutdialog.c:756
+#: gtk/gtkaboutdialog.c:756
 #, c-format
 msgid "About %s"
 msgstr "Om %s"
 
-#: ../gtk/gtkaboutdialog.c:2031
+#: gtk/gtkaboutdialog.c:2031
 msgid "Credits"
 msgstr "Bidragsytere"
 
-#: ../gtk/gtkaboutdialog.c:2057
+#: gtk/gtkaboutdialog.c:2057
 msgid "Written by"
 msgstr "Skrevet av"
 
-#: ../gtk/gtkaboutdialog.c:2060
+#: gtk/gtkaboutdialog.c:2060
 msgid "Documented by"
 msgstr "Dokumentert av"
 
-#: ../gtk/gtkaboutdialog.c:2072
+#: gtk/gtkaboutdialog.c:2072
 msgid "Translated by"
 msgstr "Oversatt av"
 
-#: ../gtk/gtkaboutdialog.c:2076
+#: gtk/gtkaboutdialog.c:2076
 msgid "Artwork by"
 msgstr "Grafikk av"
 
@@ -1043,7 +1035,7 @@ msgstr "Grafikk av"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:121
+#: gtk/gtkaccellabel.c:121
 msgid "keyboard label|Shift"
 msgstr "Shift"
 
@@ -1053,7 +1045,7 @@ msgstr "Shift"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:128
+#: gtk/gtkaccellabel.c:128
 msgid "keyboard label|Ctrl"
 msgstr "Ctrl"
 
@@ -1063,17 +1055,17 @@ msgstr "Ctrl"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:135
+#: gtk/gtkaccellabel.c:135
 msgid "keyboard label|Alt"
 msgstr "Alt"
 
 #. do not translate the part before the |
-#: ../gtk/gtkaccellabel.c:577
+#: gtk/gtkaccellabel.c:577
 msgid "keyboard label|Space"
 msgstr "Mellomrom"
 
 #. do not translate the part before the |
-#: ../gtk/gtkaccellabel.c:581
+#: gtk/gtkaccellabel.c:581
 msgid "keyboard label|Backslash"
 msgstr "Omvendt skråstrek"
 
@@ -1086,7 +1078,7 @@ msgstr "Omvendt skråstrek"
 #. * so if you have a default text direction of RTL and YM, then
 #. * the year will appear on the right.
 #.
-#: ../gtk/gtkcalendar.c:647
+#: gtk/gtkcalendar.c:647
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
@@ -1094,7 +1086,7 @@ msgstr "calendar:MY"
 #. * first day of the week to calendar:week_start:1 if you want Monday
 #. * to be the first day of the week, and so on.
 #.
-#: ../gtk/gtkcalendar.c:661
+#: gtk/gtkcalendar.c:661
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:1"
 
@@ -1106,7 +1098,7 @@ msgstr "calendar:week_start:1"
 #. *
 #. * If you don't understand this, leave it as "2000"
 #.
-#: ../gtk/gtkcalendar.c:1549
+#: gtk/gtkcalendar.c:1549
 msgid "year measurement template|2000"
 msgstr "2000"
 
@@ -1121,25 +1113,25 @@ msgstr "2000"
 #. * Don't include the prefix "calendar year format|" in the
 #. * translation. "%Y" is appropriate for most locales.
 #.
-#: ../gtk/gtkcalendar.c:1826
+#: gtk/gtkcalendar.c:1826
 msgid "calendar year format|%Y"
 msgstr "%Y"
 
 #. do not translate the part before the |
-#: ../gtk/gtkcellrendererprogress.c:237 ../gtk/gtkcellrendererprogress.c:295
+#: gtk/gtkcellrendererprogress.c:237 gtk/gtkcellrendererprogress.c:295
 #, c-format
 msgid "progress bar label|%d %%"
 msgstr "%d %%"
 
-#: ../gtk/gtkcolorbutton.c:221 ../gtk/gtkcolorbutton.c:576
+#: gtk/gtkcolorbutton.c:221 gtk/gtkcolorbutton.c:576
 msgid "Pick a Color"
 msgstr "Velg en farge"
 
-#: ../gtk/gtkcolorbutton.c:467
+#: gtk/gtkcolorbutton.c:467
 msgid "Received invalid color data\n"
 msgstr "Mottok ugyldige fargedata\n"
 
-#: ../gtk/gtkcolorsel.c:565
+#: gtk/gtkcolorsel.c:565
 msgid ""
 "The previously-selected color, for comparison to the color you're selecting "
 "now. You can drag this color to a palette entry, or select this color as "
@@ -1149,7 +1141,7 @@ msgstr ""
 "denne fargen til en palettoppføring, eller velge denne fargen som aktiv ved "
 "å dra den til den andre fargeprøven ved siden av."
 
-#: ../gtk/gtkcolorsel.c:570
+#: gtk/gtkcolorsel.c:570
 msgid ""
 "The color you've chosen. You can drag this color to a palette entry to save "
 "it for use in the future."
@@ -1157,11 +1149,11 @@ msgstr ""
 "Fargen du har valgt. Du kan dra denne fargen til en palettoppføring for å "
 "lagre den for senere bruk."
 
-#: ../gtk/gtkcolorsel.c:961
+#: gtk/gtkcolorsel.c:961
 msgid "_Save color here"
 msgstr "_Lagre fargen her"
 
-#: ../gtk/gtkcolorsel.c:1166
+#: gtk/gtkcolorsel.c:1166
 msgid ""
 "Click this palette entry to make it the current color. To change this entry, "
 "drag a color swatch here or right-click it and select \"Save color here.\""
@@ -1170,7 +1162,7 @@ msgstr ""
 "endre denne oppføringen drar du en fargeprøve hit eller høyreklikk den og "
 "velg «Lagre farge her.»"
 
-#: ../gtk/gtkcolorsel.c:1953
+#: gtk/gtkcolorsel.c:1953
 msgid ""
 "Select the color you want from the outer ring. Select the darkness or "
 "lightness of that color using the inner triangle."
@@ -1178,7 +1170,7 @@ msgstr ""
 "Velg fargen du ønsker fra den ytre ringen. Velg lysstyrke for denne fargen "
 "ved å bruke den indre trekanten."
 
-#: ../gtk/gtkcolorsel.c:1978
+#: gtk/gtkcolorsel.c:1978
 msgid ""
 "Click the eyedropper, then click a color anywhere on your screen to select "
 "that color."
@@ -1186,67 +1178,67 @@ msgstr ""
 "Klikk på dråpetelleren og klikk så på en farge hvor som helst på skjermen "
 "for å velge denne fargen."
 
-#: ../gtk/gtkcolorsel.c:1987
+#: gtk/gtkcolorsel.c:1987
 msgid "_Hue:"
 msgstr "_Glød:"
 
-#: ../gtk/gtkcolorsel.c:1988
+#: gtk/gtkcolorsel.c:1988
 msgid "Position on the color wheel."
 msgstr "Posisjon på fargehjulet."
 
-#: ../gtk/gtkcolorsel.c:1990
+#: gtk/gtkcolorsel.c:1990
 msgid "_Saturation:"
 msgstr "_Metning:"
 
-#: ../gtk/gtkcolorsel.c:1991
+#: gtk/gtkcolorsel.c:1991
 msgid "\"Deepness\" of the color."
 msgstr "Fargens dybde."
 
-#: ../gtk/gtkcolorsel.c:1992
+#: gtk/gtkcolorsel.c:1992
 msgid "_Value:"
 msgstr "_Verdi:"
 
-#: ../gtk/gtkcolorsel.c:1993
+#: gtk/gtkcolorsel.c:1993
 msgid "Brightness of the color."
 msgstr "Lysstyrke for fargen."
 
-#: ../gtk/gtkcolorsel.c:1994
+#: gtk/gtkcolorsel.c:1994
 msgid "_Red:"
 msgstr "_Rød:"
 
-#: ../gtk/gtkcolorsel.c:1995
+#: gtk/gtkcolorsel.c:1995
 msgid "Amount of red light in the color."
 msgstr "Mende med rødt lys i fargen."
 
-#: ../gtk/gtkcolorsel.c:1996
+#: gtk/gtkcolorsel.c:1996
 msgid "_Green:"
 msgstr "_Grønn:"
 
-#: ../gtk/gtkcolorsel.c:1997
+#: gtk/gtkcolorsel.c:1997
 msgid "Amount of green light in the color."
 msgstr "Mengde med grønt lys i fargen."
 
-#: ../gtk/gtkcolorsel.c:1998
+#: gtk/gtkcolorsel.c:1998
 msgid "_Blue:"
 msgstr "_Blå:"
 
-#: ../gtk/gtkcolorsel.c:1999
+#: gtk/gtkcolorsel.c:1999
 msgid "Amount of blue light in the color."
 msgstr "Mengde med blått lys i fargen."
 
-#: ../gtk/gtkcolorsel.c:2002
+#: gtk/gtkcolorsel.c:2002
 msgid "_Opacity:"
 msgstr "_Ugjennomsiktighet:"
 
-#: ../gtk/gtkcolorsel.c:2010 ../gtk/gtkcolorsel.c:2021
+#: gtk/gtkcolorsel.c:2010 gtk/gtkcolorsel.c:2021
 msgid "Transparency of the color."
 msgstr "Gjennomsiktighet for fargen."
 
-#: ../gtk/gtkcolorsel.c:2028
+#: gtk/gtkcolorsel.c:2028
 msgid "Color _Name:"
 msgstr "Farge_navn:"
 
-#: ../gtk/gtkcolorsel.c:2043
+#: gtk/gtkcolorsel.c:2043
 msgid ""
 "You can enter an HTML-style hexadecimal color value, or simply a color name "
 "such as 'orange' in this entry."
@@ -1254,75 +1246,75 @@ msgstr ""
 "Du kan skrive inn en heksadesimal fargeverdi i HTML-stil, eller bruke et "
 "fargenavn som f.eks. «oransje» i denne oppføringen."
 
-#: ../gtk/gtkcolorsel.c:2062
+#: gtk/gtkcolorsel.c:2062
 msgid "_Palette"
 msgstr "_Palett"
 
-#: ../gtk/gtkcolorsel.c:2094
+#: gtk/gtkcolorsel.c:2094
 msgid "Color Wheel"
 msgstr "Fargehjul"
 
-#: ../gtk/gtkcolorseldialog.c:123
+#: gtk/gtkcolorseldialog.c:123
 msgid "Color Selection"
 msgstr "Fargevalg"
 
-#: ../gtk/gtkentry.c:4552 ../gtk/gtktextview.c:7125
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Velg _alt"
 
-#: ../gtk/gtkentry.c:4562 ../gtk/gtktextview.c:7135
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Inndata_metoder"
 
-#: ../gtk/gtkentry.c:4573 ../gtk/gtktextview.c:7146
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "Sett _inn Unicode kontrolltegn"
 
-#: ../gtk/gtkfilechooser.c:1623 ../gtk/gtkfilechooser.c:1667
-#: ../gtk/gtkfilechooser.c:1742 ../gtk/gtkfilechooser.c:1786
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Ugyldig filnavn: %s"
 
-#: ../gtk/gtkfilechooserbutton.c:67
+#: gtk/gtkfilechooserbutton.c:67
 msgid "Select A File"
 msgstr "Velg en fil"
 
-#: ../gtk/gtkfilechooserbutton.c:68 ../gtk/gtkfilechooserdefault.c:1317
-#: ../gtk/gtkpathbar.c:1020
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
+#: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Hjem"
 
-#: ../gtk/gtkfilechooserbutton.c:69 ../gtk/gtkfilechooserdefault.c:1344
-#: ../gtk/gtkpathbar.c:1022
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
+#: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Skrivebord"
 
-#: ../gtk/gtkfilechooserbutton.c:70
+#: gtk/gtkfilechooserbutton.c:70
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: ../gtk/gtkfilechooserbutton.c:1523
+#: gtk/gtkfilechooserbutton.c:1523
 msgid "Other..."
 msgstr "Annet..."
 
-#: ../gtk/gtkfilechooserdefault.c:932
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Kunne ikke hente informasjon om filen"
 
-#: ../gtk/gtkfilechooserdefault.c:943
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Kunne ikke legge til bokmerke"
 
-#: ../gtk/gtkfilechooserdefault.c:954
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Kunne ikke fjerne bokmerke"
 
-#: ../gtk/gtkfilechooserdefault.c:965
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Mappen kunne ikke opprettes"
 
-#: ../gtk/gtkfilechooserdefault.c:978
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1330,255 +1322,254 @@ msgstr ""
 "Kunne ikke opprette mappen på grunn av at det allerede eksisterer en fil med "
 "samme navnet. Bruk et annet navn for mappen eller gi et nytt navn til filen."
 
-#: ../gtk/gtkfilechooserdefault.c:991
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Ugyldig filnavn"
 
-#: ../gtk/gtkfilechooserdefault.c:1001
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Mappeinholdet kunne ikke vises"
 
-#: ../gtk/gtkfilechooserdefault.c:1207
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Kunne ikke hente informasjon om «%s»: %s"
 
-#: ../gtk/gtkfilechooserdefault.c:2223
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Legg til mappe «%s» i bokmerker"
 
-#: ../gtk/gtkfilechooserdefault.c:2264
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Legg til aktiv mappe i bokmerker"
 
-#: ../gtk/gtkfilechooserdefault.c:2266
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Legg til valgte mapper i bokmerker"
 
-#: ../gtk/gtkfilechooserdefault.c:2306
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Fjern bokmerke «%s»"
 
-#: ../gtk/gtkfilechooserdefault.c:2737
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Kunne ikke legge til bokmerke for «%s» fordi det er et ugyldig navn på en "
 "sti."
 
-#: ../gtk/gtkfilechooserdefault.c:2952
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../gtk/gtkfilechooserdefault.c:2961
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Gi nytt navn..."
 
-#: ../gtk/gtkfilechooserdefault.c:3084
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Snarveier"
 
-#: ../gtk/gtkfilechooserdefault.c:3138
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Mappe"
 
-#: ../gtk/gtkfilechooserdefault.c:3194 ../gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Legg til"
 
-#: ../gtk/gtkfilechooserdefault.c:3201
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Legg til valgt mappe i bokmerker"
 
-#: ../gtk/gtkfilechooserdefault.c:3206 ../gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: ../gtk/gtkfilechooserdefault.c:3213
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Fjern valgt bokmerke"
 
-#: ../gtk/gtkfilechooserdefault.c:3313
+#: gtk/gtkfilechooserdefault.c:3313
 msgid "Could not select file"
 msgstr "Kunne ikke velge fil"
 
-#: ../gtk/gtkfilechooserdefault.c:3369
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "Kunne ikke velge fil «%s» fordi navnet på stien er ugyldig."
 
-#: ../gtk/gtkfilechooserdefault.c:3441
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "L_egg til i bokmerker"
 
-#: ../gtk/gtkfilechooserdefault.c:3451
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Åpne _lokasjon"
 
-#: ../gtk/gtkfilechooserdefault.c:3463
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Vis sk_julte filer"
 
-#: ../gtk/gtkfilechooserdefault.c:3587 ../gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Filer"
 
-#: ../gtk/gtkfilechooserdefault.c:3632
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Navn"
 
-#: ../gtk/gtkfilechooserdefault.c:3657
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Størrelse"
 
-#: ../gtk/gtkfilechooserdefault.c:3670
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Endret"
 
-#: ../gtk/gtkfilechooserdefault.c:3702
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Velg hvilke filtyper som skal vises"
 
 #. Create Folder
-#: ../gtk/gtkfilechooserdefault.c:3738
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Opprett _mappe"
 
 #. Name entry
-#: ../gtk/gtkfilechooserdefault.c:3859
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: ../gtk/gtkfilechooserdefault.c:3899
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Se gjennom andre mapper"
 
-#: ../gtk/gtkfilechooserdefault.c:4150
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Lagre i _mappe:"
 
-#: ../gtk/gtkfilechooserdefault.c:4152
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Opprett i _mappe:"
 
-#: ../gtk/gtkfilechooserdefault.c:5148
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Kan ikke gå til mappen fordi den ikke er lokal."
 
-#: ../gtk/gtkfilechooserdefault.c:5702
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Snarvei %s eksisterer ikke"
 
-#: ../gtk/gtkfilechooserdefault.c:5956
-#, c-format
-msgid "A file named \"%s\" already exists."
+#: gtk/gtkfilechooserdefault.c:5957
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "En fil med navn «%s» eksisterer allerede."
 
-#: ../gtk/gtkfilechooserdefault.c:5959
-msgid "Do you want to replace it with the one you are saving?"
-msgstr "Vil du erstatte den med filen du lagrer nå?"
-
-#: ../gtk/gtkfilechooserdefault.c:5961
-msgid "_Select Another File"
-msgstr "_Velg en annen fil"
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
 
-#: ../gtk/gtkfilechooserdefault.c:5962
-msgid "_Replace Existing File"
-msgstr "E_rstatt eksisterende fil"
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Gi nytt navn"
 
-#: ../gtk/gtkfilechooserdefault.c:6388
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Kunne ikke montere %s"
 
-#: ../gtk/gtkfilechooserdefault.c:6676
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Skriv inn navn på ny mappe"
 
-#: ../gtk/gtkfilechooserdefault.c:6718
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d byte"
 msgstr[1] "%d bytes"
 
-#: ../gtk/gtkfilechooserdefault.c:6720
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: ../gtk/gtkfilechooserdefault.c:6722
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: ../gtk/gtkfilechooserdefault.c:6724
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: ../gtk/gtkfilechooserdefault.c:6770 ../gtk/gtkfilechooserdefault.c:6794
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../gtk/gtkfilechooserdefault.c:6781
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "I dag"
 
-#: ../gtk/gtkfilechooserdefault.c:6783
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "I går"
 
-#: ../gtk/gtkfilechooserdefault.c:6865
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Kan ikke bytte mappe"
 
-#: ../gtk/gtkfilechooserdefault.c:6866
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Mappen du oppga er en ugyldig sti."
 
-#: ../gtk/gtkfilechooserdefault.c:6905
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Kunne ikke bygge filnavn fra «%s» og «%s»"
 
-#: ../gtk/gtkfilechooserdefault.c:6941
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Kunne ikke velge oppføring"
 
-#: ../gtk/gtkfilechooserdefault.c:6981
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Åpne lokasjon"
 
-#: ../gtk/gtkfilechooserdefault.c:6988
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Lagre på lokasjon"
 
-#: ../gtk/gtkfilechooserdefault.c:7012
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Lokasjon: "
 
-#: ../gtk/gtkfilesel.c:727
+#: gtk/gtkfilesel.c:727
 msgid "Folders"
 msgstr "Mapper"
 
-#: ../gtk/gtkfilesel.c:731
+#: gtk/gtkfilesel.c:731
 msgid "Fol_ders"
 msgstr "M_apper"
 
-#: ../gtk/gtkfilesel.c:767
+#: gtk/gtkfilesel.c:767
 msgid "_Files"
 msgstr "_Filer"
 
-#: ../gtk/gtkfilesel.c:855 ../gtk/gtkfilesel.c:2242
+#: gtk/gtkfilesel.c:855 gtk/gtkfilesel.c:2242
 #, c-format
 msgid "Folder unreadable: %s"
 msgstr "Uleselig mappe: %s"
 
-#: ../gtk/gtkfilesel.c:984
+#: gtk/gtkfilesel.c:984
 #, c-format
 msgid ""
 "The file \"%s\" resides on another machine (called %s) and may not be "
@@ -1589,25 +1580,25 @@ msgstr ""
 "tilgjengelig for dette programmet.\n"
 "Er du sikker på at du ønsker å velge den?"
 
-#: ../gtk/gtkfilesel.c:1114
+#: gtk/gtkfilesel.c:1114
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: ../gtk/gtkfilesel.c:1125
+#: gtk/gtkfilesel.c:1125
 msgid "De_lete File"
 msgstr "S_lett fil"
 
-#: ../gtk/gtkfilesel.c:1136
+#: gtk/gtkfilesel.c:1136
 msgid "_Rename File"
 msgstr "End_re navn på filen"
 
-#: ../gtk/gtkfilesel.c:1438
+#: gtk/gtkfilesel.c:1438
 #, c-format
 msgid ""
 "The folder name \"%s\" contains symbols that are not allowed in filenames"
 msgstr "Mappenavn «%s» inneholder symboler som ikke er tillatt i filnavn"
 
-#: ../gtk/gtkfilesel.c:1440
+#: gtk/gtkfilesel.c:1440
 #, c-format
 msgid ""
 "Error creating folder \"%s\": %s\n"
@@ -1616,33 +1607,33 @@ msgstr ""
 "Feil under oppretting av mappe «%s»: %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1441 ../gtk/gtkfilesel.c:1677
+#: gtk/gtkfilesel.c:1441 gtk/gtkfilesel.c:1677
 msgid "You probably used symbols not allowed in filenames."
 msgstr "Du brukte sannsynligvis symboler som ikke er tillatt i filnavn."
 
-#: ../gtk/gtkfilesel.c:1449
+#: gtk/gtkfilesel.c:1449
 #, c-format
 msgid "Error creating folder \"%s\": %s\n"
 msgstr "Feil under oppretting av mappe «%s»: %s\n"
 
-#: ../gtk/gtkfilesel.c:1483
+#: gtk/gtkfilesel.c:1483
 msgid "New Folder"
 msgstr "Ny mappe"
 
-#: ../gtk/gtkfilesel.c:1498
+#: gtk/gtkfilesel.c:1498
 msgid "_Folder name:"
 msgstr "_Mappenavn:"
 
-#: ../gtk/gtkfilesel.c:1522
+#: gtk/gtkfilesel.c:1522
 msgid "C_reate"
 msgstr "Opp_rett"
 
-#: ../gtk/gtkfilesel.c:1565
+#: gtk/gtkfilesel.c:1565
 #, c-format
 msgid "The filename \"%s\" contains symbols that are not allowed in filenames"
 msgstr "Filnavnet «%s» inneholder symboler som ikke er tillatt i filnavn"
 
-#: ../gtk/gtkfilesel.c:1568
+#: gtk/gtkfilesel.c:1568
 #, c-format
 msgid ""
 "Error deleting file \"%s\": %s\n"
@@ -1651,30 +1642,30 @@ msgstr ""
 "Feil under sletting av fil «%s»: %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1570 ../gtk/gtkfilesel.c:1691
+#: gtk/gtkfilesel.c:1570 gtk/gtkfilesel.c:1691
 msgid "It probably contains symbols not allowed in filenames."
 msgstr "Det inneholder sannsynligvis symboler som ikke er tillatt i filnavn."
 
-#: ../gtk/gtkfilesel.c:1579
+#: gtk/gtkfilesel.c:1579
 #, c-format
 msgid "Error deleting file \"%s\": %s"
 msgstr "Feil under sletting av fil «%s»: %s"
 
-#: ../gtk/gtkfilesel.c:1622
+#: gtk/gtkfilesel.c:1622
 #, c-format
 msgid "Really delete file \"%s\"?"
 msgstr "Vil du virkelig slette filen «%s»?"
 
-#: ../gtk/gtkfilesel.c:1627
+#: gtk/gtkfilesel.c:1627
 msgid "Delete File"
 msgstr "Slett fil"
 
-#: ../gtk/gtkfilesel.c:1673 ../gtk/gtkfilesel.c:1687
+#: gtk/gtkfilesel.c:1673 gtk/gtkfilesel.c:1687
 #, c-format
 msgid "The file name \"%s\" contains symbols that are not allowed in filenames"
 msgstr "Filnavn «%s» inneholder symboler som ikke er tillatt i filnavn"
 
-#: ../gtk/gtkfilesel.c:1675
+#: gtk/gtkfilesel.c:1675
 #, c-format
 msgid ""
 "Error renaming file to \"%s\": %s\n"
@@ -1683,7 +1674,7 @@ msgstr ""
 "Feil under endring av navn på fil «%s»: %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1689
+#: gtk/gtkfilesel.c:1689
 #, c-format
 msgid ""
 "Error renaming file \"%s\": %s\n"
@@ -1692,29 +1683,29 @@ msgstr ""
 "Feil under endring av navn på fil «%s»: %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1699
+#: gtk/gtkfilesel.c:1699
 #, c-format
 msgid "Error renaming file \"%s\" to \"%s\": %s"
 msgstr "Feil under endring av navn på fil «%s» til «%s»: %s"
 
-#: ../gtk/gtkfilesel.c:1746
+#: gtk/gtkfilesel.c:1746
 msgid "Rename File"
 msgstr "Gi filen nytt navn"
 
-#: ../gtk/gtkfilesel.c:1761
+#: gtk/gtkfilesel.c:1761
 #, c-format
 msgid "Rename file \"%s\" to:"
 msgstr "Gi fil «%s» nytt navn:"
 
-#: ../gtk/gtkfilesel.c:1790
+#: gtk/gtkfilesel.c:1790
 msgid "_Rename"
 msgstr "_Gi nytt navn"
 
-#: ../gtk/gtkfilesel.c:2222
+#: gtk/gtkfilesel.c:2222
 msgid "_Selection: "
 msgstr "_Valg: "
 
-#: ../gtk/gtkfilesel.c:3147
+#: gtk/gtkfilesel.c:3147
 #, c-format
 msgid ""
 "The filename \"%s\" couldn't be converted to UTF-8. (try setting the "
@@ -1723,48 +1714,48 @@ msgstr ""
 "Filnavnet «%s» kunne ikke konverteres til UTF-8 (prøv å sette "
 "miljøvariabelen G_FILENAME_ENCODING): %s"
 
-#: ../gtk/gtkfilesel.c:3150
+#: gtk/gtkfilesel.c:3150
 msgid "Invalid UTF-8"
 msgstr "Ugyldig UTF-8"
 
-#: ../gtk/gtkfilesel.c:4027
+#: gtk/gtkfilesel.c:4027
 msgid "Name too long"
 msgstr "Navnet er for langt"
 
-#: ../gtk/gtkfilesel.c:4029
+#: gtk/gtkfilesel.c:4029
 msgid "Couldn't convert filename"
 msgstr "Kunne ikke konvertere filnavnet"
 
-#: ../gtk/gtkfilesystemmodel.c:1267
+#: gtk/gtkfilesystemmodel.c:1267
 msgid "(Empty)"
 msgstr "(Tom)"
 
-#: ../gtk/gtkfilesystemunix.c:476 ../gtk/gtkfilesystemunix.c:682
-#: ../gtk/gtkfilesystemunix.c:1858 ../gtk/gtkfilesystemwin32.c:482
-#: ../gtk/gtkfilesystemwin32.c:495 ../gtk/gtkfilesystemwin32.c:1487
+#: gtk/gtkfilesystemunix.c:476 gtk/gtkfilesystemunix.c:682
+#: gtk/gtkfilesystemunix.c:1858 gtk/gtkfilesystemwin32.c:482
+#: gtk/gtkfilesystemwin32.c:495 gtk/gtkfilesystemwin32.c:1487
 #, c-format
 msgid "Error getting information for '%s': %s"
 msgstr "Feil under henting av informasjon om «%s»: %s"
 
-#: ../gtk/gtkfilesystemunix.c:551 ../gtk/gtkfilesystemwin32.c:537
+#: gtk/gtkfilesystemunix.c:551 gtk/gtkfilesystemwin32.c:537
 #, c-format
 msgid "Error creating directory '%s': %s"
 msgstr "Feil under oppretting av katalog «%s»: %s"
 
-#: ../gtk/gtkfilesystemunix.c:631 ../gtk/gtkfilesystemwin32.c:597
+#: gtk/gtkfilesystemunix.c:631 gtk/gtkfilesystemwin32.c:597
 msgid "This file system does not support mounting"
 msgstr "Dette filsystemet støtter ikke montering"
 
-#: ../gtk/gtkfilesystemunix.c:639
+#: gtk/gtkfilesystemunix.c:639
 msgid "File System"
 msgstr "Filsystem"
 
-#: ../gtk/gtkfilesystemunix.c:796
+#: gtk/gtkfilesystemunix.c:796
 #, c-format
 msgid "Could not get a stock icon for %s"
 msgstr "Kunne ikke hente et standardikon for %s"
 
-#: ../gtk/gtkfilesystemunix.c:891
+#: gtk/gtkfilesystemunix.c:891
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"%s\". "
@@ -1773,93 +1764,93 @@ msgstr ""
 "Navnet «%s» er ikke gyldig fordi det inneholder tegnet «%s». Vennligst bruk "
 "et annet navn."
 
-#: ../gtk/gtkfilesystemunix.c:1463 ../gtk/gtkfilesystemwin32.c:1032
+#: gtk/gtkfilesystemunix.c:1463 gtk/gtkfilesystemwin32.c:1032
 #, c-format
 msgid "Bookmark saving failed: %s"
 msgstr "Lagring av bokmerke feilet: %s"
 
-#: ../gtk/gtkfilesystemunix.c:1518
+#: gtk/gtkfilesystemunix.c:1518
 #, c-format
 msgid "'%s' already exists in the bookmarks list"
 msgstr "«%s» finnes allerede i bokmerkelisten"
 
-#: ../gtk/gtkfilesystemunix.c:1590
+#: gtk/gtkfilesystemunix.c:1590
 #, c-format
 msgid "'%s' does not exist in the bookmarks list"
 msgstr "«%s» finnes ikke i bokmerkelisten"
 
-#: ../gtk/gtkfilesystemunix.c:1818
+#: gtk/gtkfilesystemunix.c:1818
 #, c-format
 msgid "Error getting information for '/': %s"
 msgstr "Feil under henting av informasjon for «/»: %s"
 
-#: ../gtk/gtkfilesystemwin32.c:611
+#: gtk/gtkfilesystemwin32.c:611
 #, c-format
 msgid "Network Drive (%s)"
 msgstr "Nettverksenhet (%s)"
 
-#: ../gtk/gtkfilesystemwin32.c:650
+#: gtk/gtkfilesystemwin32.c:650
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../gtk/gtkfontbutton.c:179 ../gtk/gtkfontbutton.c:292
+#: gtk/gtkfontbutton.c:179 gtk/gtkfontbutton.c:292
 msgid "Pick a Font"
 msgstr "Velg en skrift"
 
 #. Initialize fields
-#: ../gtk/gtkfontbutton.c:286
+#: gtk/gtkfontbutton.c:286
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: ../gtk/gtkfontbutton.c:804
+#: gtk/gtkfontbutton.c:804
 msgid "Font"
 msgstr "Skrift"
 
 #. This is the default text shown in the preview entry, though the user
 #. can set it. Remember that some fonts only have capital letters.
-#: ../gtk/gtkfontsel.c:74
+#: gtk/gtkfontsel.c:74
 msgid "abcdefghijk ABCDEFGHIJK"
 msgstr "abcdefghijk ABCDEFGHIJK"
 
-#: ../gtk/gtkfontsel.c:361
+#: gtk/gtkfontsel.c:361
 msgid "_Family:"
 msgstr "_Familie:"
 
-#: ../gtk/gtkfontsel.c:367
+#: gtk/gtkfontsel.c:367
 msgid "_Style:"
 msgstr "_Stil:"
 
-#: ../gtk/gtkfontsel.c:373
+#: gtk/gtkfontsel.c:373
 msgid "Si_ze:"
 msgstr "St_ørrelse:"
 
 #. create the text entry widget
-#: ../gtk/gtkfontsel.c:549
+#: gtk/gtkfontsel.c:549
 msgid "_Preview:"
 msgstr "_Forhåndsvisning:"
 
-#: ../gtk/gtkfontsel.c:1383
+#: gtk/gtkfontsel.c:1383
 msgid "Font Selection"
 msgstr "Valg av skrift"
 
-#: ../gtk/gtkgamma.c:401
+#: gtk/gtkgamma.c:401
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../gtk/gtkgamma.c:411
+#: gtk/gtkgamma.c:411
 msgid "_Gamma value"
 msgstr "_Gammaverdi"
 
 #. Remove this icon source so we don't keep trying to
 #. * load it.
 #.
-#: ../gtk/gtkiconfactory.c:1656
+#: gtk/gtkiconfactory.c:1656
 #, c-format
 msgid "Error loading icon: %s"
 msgstr "Feil under lasting av ikon: %s"
 
-#: ../gtk/gtkicontheme.c:1239
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1872,120 +1863,120 @@ msgstr ""
 "Du kan finne en kopi av det på:\n"
 "\t%s"
 
-#: ../gtk/gtkicontheme.c:1304
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Ikon «%s» er ikke tilstede i tema"
 
-#: ../gtk/gtkimmodule.c:427
+#: gtk/gtkimmodule.c:427
 msgid "Default"
 msgstr "Forvalg"
 
-#: ../gtk/gtkinputdialog.c:235
+#: gtk/gtkinputdialog.c:235
 msgid "Input"
 msgstr "Inndata"
 
-#: ../gtk/gtkinputdialog.c:244
+#: gtk/gtkinputdialog.c:244
 msgid "No extended input devices"
 msgstr "Ingen utvidede innenheter"
 
-#: ../gtk/gtkinputdialog.c:256
+#: gtk/gtkinputdialog.c:256
 msgid "_Device:"
 msgstr "_Enhet:"
 
-#: ../gtk/gtkinputdialog.c:273
+#: gtk/gtkinputdialog.c:273
 msgid "Disabled"
 msgstr "Slått av"
 
-#: ../gtk/gtkinputdialog.c:280
+#: gtk/gtkinputdialog.c:280
 msgid "Screen"
 msgstr "Skjerm"
 
-#: ../gtk/gtkinputdialog.c:287
+#: gtk/gtkinputdialog.c:287
 msgid "Window"
 msgstr "Vindu"
 
-#: ../gtk/gtkinputdialog.c:294
+#: gtk/gtkinputdialog.c:294
 msgid "_Mode: "
 msgstr "_Modus: "
 
 #. The axis listbox
-#: ../gtk/gtkinputdialog.c:325
+#: gtk/gtkinputdialog.c:325
 msgid "_Axes"
 msgstr "_Akser"
 
 #. Keys listbox
-#: ../gtk/gtkinputdialog.c:342
+#: gtk/gtkinputdialog.c:342
 msgid "_Keys"
 msgstr "_Taster"
 
-#: ../gtk/gtkinputdialog.c:562
+#: gtk/gtkinputdialog.c:562
 msgid "X"
 msgstr "X"
 
-#: ../gtk/gtkinputdialog.c:563
+#: gtk/gtkinputdialog.c:563
 msgid "Y"
 msgstr "Y"
 
-#: ../gtk/gtkinputdialog.c:564
+#: gtk/gtkinputdialog.c:564
 msgid "Pressure"
 msgstr "Trykk"
 
-#: ../gtk/gtkinputdialog.c:565
+#: gtk/gtkinputdialog.c:565
 msgid "X Tilt"
 msgstr "X-helling"
 
-#: ../gtk/gtkinputdialog.c:566
+#: gtk/gtkinputdialog.c:566
 msgid "Y Tilt"
 msgstr "Y-helling"
 
-#: ../gtk/gtkinputdialog.c:567
+#: gtk/gtkinputdialog.c:567
 msgid "Wheel"
 msgstr "Hjul"
 
-#: ../gtk/gtkinputdialog.c:607
+#: gtk/gtkinputdialog.c:607
 msgid "none"
 msgstr "ingen"
 
-#: ../gtk/gtkinputdialog.c:643 ../gtk/gtkinputdialog.c:679
+#: gtk/gtkinputdialog.c:643 gtk/gtkinputdialog.c:679
 msgid "(disabled)"
 msgstr "(slått av)"
 
-#: ../gtk/gtkinputdialog.c:672
+#: gtk/gtkinputdialog.c:672
 msgid "(unknown)"
 msgstr "(ukjent)"
 
 #. and clear button
-#: ../gtk/gtkinputdialog.c:759
+#: gtk/gtkinputdialog.c:759
 msgid "clear"
 msgstr "tøm"
 
-#: ../gtk/gtklabel.c:3985
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Velg alt"
 
 #. Description of --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:398
+#: gtk/gtkmain.c:398
 msgid "Load additional GTK+ modules"
 msgstr "Last tilleggsmoduler for GTK+"
 
 #. Placeholder in --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:399
+#: gtk/gtkmain.c:399
 msgid "MODULES"
 msgstr "MODULER"
 
 #. Description of --g-fatal-warnings in --help output
-#: ../gtk/gtkmain.c:401
+#: gtk/gtkmain.c:401
 msgid "Make all warnings fatal"
 msgstr "La alle advarsler være fatale"
 
 #. Description of --gtk-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:404
+#: gtk/gtkmain.c:404
 msgid "GTK+ debugging flags to set"
 msgstr "Feilsøkingsflagg som skal settes for GTK+"
 
 #. Description of --gtk-no-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:407
+#: gtk/gtkmain.c:407
 msgid "GTK+ debugging flags to unset"
 msgstr "Feilsøkingsflagg som skal fjernes for GTK+"
 
@@ -1994,517 +1985,526 @@ msgstr "Feilsøkingsflagg som skal fjernes for GTK+"
 #. * Do *not* translate it to "predefinito:LTR", if it
 #. * it isn't default:LTR or default:RTL it will not work
 #.
-#: ../gtk/gtkmain.c:476
+#: gtk/gtkmain.c:476
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../gtk/gtkmain.c:559
+#: gtk/gtkmain.c:559
 msgid "GTK+ Options"
 msgstr "Alternativer for GTK+"
 
-#: ../gtk/gtkmain.c:559
+#: gtk/gtkmain.c:559
 msgid "Show GTK+ Options"
 msgstr "Vis alternativer for GTK+"
 
-#: ../gtk/gtknotebook.c:2718 ../gtk/gtknotebook.c:5064
+#: gtk/gtknotebook.c:2718 gtk/gtknotebook.c:5064
 #, c-format
 msgid "Page %u"
 msgstr "Side %u"
 
-#: ../gtk/gtkradiotoolbutton.c:92
+#: gtk/gtkradiotoolbutton.c:92
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../gtk/gtkradiotoolbutton.c:93
+#: gtk/gtkradiotoolbutton.c:93
 msgid "The radio tool button whose group this button belongs to."
 msgstr "Radioverktøyknapp hvis gruppe denne knappen tilhører."
 
-#: ../gtk/gtkrc.c:2400
+#: gtk/gtkrc.c:2400
 #, c-format
 msgid "Unable to find include file: \"%s\""
 msgstr "Kan ikke finne include-fil: «%s»"
 
-#: ../gtk/gtkrc.c:3042 ../gtk/gtkrc.c:3045
+#: gtk/gtkrc.c:3042 gtk/gtkrc.c:3045
 #, c-format
 msgid "Unable to locate image file in pixmap_path: \"%s\""
 msgstr "Kunne ikke finne bildefil i pixmap_path: «%s»"
 
-#: ../gtk/gtkrc.c:3480
+#: gtk/gtkrc.c:3480
 #, c-format
 msgid "Pixmap path element: \"%s\" must be absolute, %s, line %d"
 msgstr "Stielement for pixmap: «%s» må være absolutt, %s, linje %d"
 
 #. KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate
-#: ../gtk/gtkstock.c:308
+#: gtk/gtkstock.c:308
 msgid "Information"
 msgstr "Informasjon"
 
-#: ../gtk/gtkstock.c:309
+#: gtk/gtkstock.c:309
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../gtk/gtkstock.c:310
+#: gtk/gtkstock.c:310
 msgid "Error"
 msgstr "Feil"
 
-#: ../gtk/gtkstock.c:311
+#: gtk/gtkstock.c:311
 msgid "Question"
 msgstr "Spørsmål"
 
 #. FIXME these need accelerators when appropriate, and
 #. * need the mnemonics to be rationalized
 #.
-#: ../gtk/gtkstock.c:316
+#: gtk/gtkstock.c:316
 msgid "_About"
 msgstr "_Om"
 
-#: ../gtk/gtkstock.c:318
+#: gtk/gtkstock.c:318
 msgid "_Apply"
 msgstr "_Bruk"
 
-#: ../gtk/gtkstock.c:319
+#: gtk/gtkstock.c:319
 msgid "_Bold"
 msgstr "_Uthevet"
 
-#: ../gtk/gtkstock.c:320
+#: gtk/gtkstock.c:320
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../gtk/gtkstock.c:321
+#: gtk/gtkstock.c:321
 msgid "_CD-Rom"
 msgstr "_CD-ROM"
 
-#: ../gtk/gtkstock.c:322
+#: gtk/gtkstock.c:322
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: ../gtk/gtkstock.c:323
+#: gtk/gtkstock.c:323
 msgid "_Close"
 msgstr "_Lukk"
 
-#: ../gtk/gtkstock.c:324
+#: gtk/gtkstock.c:324
 msgid "_Convert"
 msgstr "_Konverter"
 
-#: ../gtk/gtkstock.c:325
+#: gtk/gtkstock.c:325
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: ../gtk/gtkstock.c:326
+#: gtk/gtkstock.c:326
 msgid "Cu_t"
 msgstr "Klipp u_t"
 
-#: ../gtk/gtkstock.c:327
+#: gtk/gtkstock.c:327
 msgid "_Delete"
 msgstr "_Slett"
 
-#: ../gtk/gtkstock.c:328
+#: gtk/gtkstock.c:328
 msgid "_Execute"
 msgstr "_Kjør"
 
-#: ../gtk/gtkstock.c:329
+#: gtk/gtkstock.c:329
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../gtk/gtkstock.c:330
+#: gtk/gtkstock.c:330
 msgid "_Find"
 msgstr "_Finn"
 
-#: ../gtk/gtkstock.c:331
+#: gtk/gtkstock.c:331
 msgid "Find and _Replace"
 msgstr "Finn og e_rstatt"
 
-#: ../gtk/gtkstock.c:332
+#: gtk/gtkstock.c:332
 msgid "_Floppy"
 msgstr "_Diskett"
 
-#: ../gtk/gtkstock.c:333
+#: gtk/gtkstock.c:333
 msgid "_Fullscreen"
 msgstr "_Fullskjerm"
 
-#: ../gtk/gtkstock.c:334
+#: gtk/gtkstock.c:334
 msgid "_Leave Fullscreen"
 msgstr "For_lat fullskjerm"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:336
+#: gtk/gtkstock.c:336
 msgid "Navigation|_Bottom"
 msgstr "_Bunn"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:338
+#: gtk/gtkstock.c:338
 msgid "Navigation|_First"
 msgstr "_Første"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:340
+#: gtk/gtkstock.c:340
 msgid "Navigation|_Last"
 msgstr "_Siste"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:342
+#: gtk/gtkstock.c:342
 msgid "Navigation|_Top"
 msgstr "_Topp"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:344
+#: gtk/gtkstock.c:344
 msgid "Navigation|_Back"
 msgstr "Til_bake"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:346
+#: gtk/gtkstock.c:346
 msgid "Navigation|_Down"
 msgstr "Ne_d"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:348
+#: gtk/gtkstock.c:348
 msgid "Navigation|_Forward"
 msgstr "_Framover"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:350
+#: gtk/gtkstock.c:350
 msgid "Navigation|_Up"
 msgstr "_Opp"
 
-#: ../gtk/gtkstock.c:351
+#: gtk/gtkstock.c:351
 msgid "_Harddisk"
 msgstr "_Harddisk"
 
-#: ../gtk/gtkstock.c:352
+#: gtk/gtkstock.c:352
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../gtk/gtkstock.c:353
+#: gtk/gtkstock.c:353
 msgid "_Home"
 msgstr "_Hjem"
 
-#: ../gtk/gtkstock.c:354
+#: gtk/gtkstock.c:354
 msgid "Increase Indent"
 msgstr "Rykk inn mer"
 
-#: ../gtk/gtkstock.c:355
+#: gtk/gtkstock.c:355
 msgid "Decrease Indent"
 msgstr "Rykk inn mindre"
 
-#: ../gtk/gtkstock.c:356
+#: gtk/gtkstock.c:356
 msgid "_Index"
 msgstr "_Indeks"
 
-#: ../gtk/gtkstock.c:357
+#: gtk/gtkstock.c:357
 msgid "_Information"
 msgstr "_Informasjon"
 
-#: ../gtk/gtkstock.c:358
+#: gtk/gtkstock.c:358
 msgid "_Italic"
 msgstr "Kurs_iv"
 
-#: ../gtk/gtkstock.c:359
+#: gtk/gtkstock.c:359
 msgid "_Jump to"
 msgstr "_Hopp til"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:361
+#: gtk/gtkstock.c:361
 msgid "Justify|_Center"
 msgstr "_Sentrer"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:363
+#: gtk/gtkstock.c:363
 msgid "Justify|_Fill"
 msgstr "_Fyll"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:365
+#: gtk/gtkstock.c:365
 msgid "Justify|_Left"
 msgstr "_Venstre"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:367
+#: gtk/gtkstock.c:367
 msgid "Justify|_Right"
 msgstr "Høy_re"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:370
+#: gtk/gtkstock.c:370
 msgid "Media|_Forward"
 msgstr "_Fremover"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:372
+#: gtk/gtkstock.c:372
 msgid "Media|_Next"
 msgstr "_Neste"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:374
+#: gtk/gtkstock.c:374
 msgid "Media|P_ause"
 msgstr "P_ause"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:376
+#: gtk/gtkstock.c:376
 msgid "Media|_Play"
 msgstr "S_pill av"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:378
+#: gtk/gtkstock.c:378
 msgid "Media|Pre_vious"
 msgstr "_Forrige"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:380
+#: gtk/gtkstock.c:380
 msgid "Media|_Record"
 msgstr "_Ta opp"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:382
+#: gtk/gtkstock.c:382
 msgid "Media|R_ewind"
 msgstr "Spol tilbak_e"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:384
+#: gtk/gtkstock.c:384
 msgid "Media|_Stop"
 msgstr "_Stopp"
 
-#: ../gtk/gtkstock.c:385
+#: gtk/gtkstock.c:385
 msgid "_Network"
 msgstr "_Nettverk"
 
-#: ../gtk/gtkstock.c:386
+#: gtk/gtkstock.c:386
 msgid "_New"
 msgstr "_Ny"
 
-#: ../gtk/gtkstock.c:387
+#: gtk/gtkstock.c:387
 msgid "_No"
 msgstr "_Nei"
 
-#: ../gtk/gtkstock.c:388
+#: gtk/gtkstock.c:388
 msgid "_OK"
 msgstr "_OK"
 
-#: ../gtk/gtkstock.c:389
+#: gtk/gtkstock.c:389
 msgid "_Open"
 msgstr "_Åpne"
 
-#: ../gtk/gtkstock.c:390
+#: gtk/gtkstock.c:390
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: ../gtk/gtkstock.c:391
+#: gtk/gtkstock.c:391
 msgid "_Preferences"
 msgstr "_Brukervalg"
 
-#: ../gtk/gtkstock.c:392
+#: gtk/gtkstock.c:392
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: ../gtk/gtkstock.c:393
+#: gtk/gtkstock.c:393
 msgid "Print Pre_view"
 msgstr "Utskriftsforhåndsvisning"
 
-#: ../gtk/gtkstock.c:394
+#: gtk/gtkstock.c:394
 msgid "_Properties"
 msgstr "E_genskaper"
 
-#: ../gtk/gtkstock.c:395
+#: gtk/gtkstock.c:395
 msgid "_Quit"
 msgstr "A_vslutt"
 
-#: ../gtk/gtkstock.c:396
+#: gtk/gtkstock.c:396
 msgid "_Redo"
 msgstr "_Gjenopprett"
 
-#: ../gtk/gtkstock.c:397
+#: gtk/gtkstock.c:397
 msgid "_Refresh"
 msgstr "_Gjenles"
 
-#: ../gtk/gtkstock.c:399
+#: gtk/gtkstock.c:399
 msgid "_Revert"
 msgstr "Fo_rkast"
 
-#: ../gtk/gtkstock.c:400
+#: gtk/gtkstock.c:400
 msgid "_Save"
 msgstr "_Lagre"
 
-#: ../gtk/gtkstock.c:401
+#: gtk/gtkstock.c:401
 msgid "Save _As"
 msgstr "Lagre s_om"
 
-#: ../gtk/gtkstock.c:402
+#: gtk/gtkstock.c:402
 msgid "_Color"
 msgstr "_Farge"
 
-#: ../gtk/gtkstock.c:403
+#: gtk/gtkstock.c:403
 msgid "_Font"
 msgstr "Skri_fttype"
 
-#: ../gtk/gtkstock.c:404
+#: gtk/gtkstock.c:404
 msgid "_Ascending"
 msgstr "_Stigende"
 
-#: ../gtk/gtkstock.c:405
+#: gtk/gtkstock.c:405
 msgid "_Descending"
 msgstr "S_ynkende"
 
-#: ../gtk/gtkstock.c:406
+#: gtk/gtkstock.c:406
 msgid "_Spell Check"
 msgstr "_Stavekontroll"
 
-#: ../gtk/gtkstock.c:407
+#: gtk/gtkstock.c:407
 msgid "_Stop"
 msgstr "_Stopp"
 
-#: ../gtk/gtkstock.c:408
+#: gtk/gtkstock.c:408
 msgid "_Strikethrough"
 msgstr "_Gjennomstreking"
 
-#: ../gtk/gtkstock.c:409
+#: gtk/gtkstock.c:409
 msgid "_Undelete"
 msgstr "_Angre slett"
 
-#: ../gtk/gtkstock.c:410
+#: gtk/gtkstock.c:410
 msgid "_Underline"
 msgstr "_Understrek"
 
-#: ../gtk/gtkstock.c:411
+#: gtk/gtkstock.c:411
 msgid "_Undo"
 msgstr "_Angre"
 
-#: ../gtk/gtkstock.c:412
+#: gtk/gtkstock.c:412
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../gtk/gtkstock.c:413
+#: gtk/gtkstock.c:413
 msgid "_Normal Size"
 msgstr "_Normal størrelse"
 
-#: ../gtk/gtkstock.c:414
+#: gtk/gtkstock.c:414
 msgid "Best _Fit"
 msgstr "Beste _tilpasning"
 
-#: ../gtk/gtkstock.c:415
+#: gtk/gtkstock.c:415
 msgid "Zoom _In"
 msgstr "Zoom _inn"
 
-#: ../gtk/gtkstock.c:416
+#: gtk/gtkstock.c:416
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
 
-#: ../gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "VHM _Venstre-til-høyre-merke"
 
-#: ../gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "HVM _Høyre-til-venstre-merke"
 
-#: ../gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "VHI V_enstre-til-høyre-innbygging"
 
-#: ../gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "HVE Høyre-til-venstre-in_nbygging"
 
-#: ../gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "VHO Venstre-til-høyre-_overstyring"
 
-#: ../gtk/gtktextutil.c:58
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "HVO Høyre-til-venstre-o_verstyring"
 
-#: ../gtk/gtktextutil.c:59
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Pop directional formatting"
 
-#: ../gtk/gtktextutil.c:60
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "NBO _Nullbreddeområde"
 
-#: ../gtk/gtktextutil.c:61
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Zero width _joiner"
 
-#: ../gtk/gtktextutil.c:62
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Zero width _non-joiner"
 
-#: ../gtk/gtkthemes.c:71
+#: gtk/gtkthemes.c:71
 #, c-format
 msgid "Unable to locate theme engine in module_path: \"%s\","
 msgstr "Kunne ikke finne temamotor i module_path: «%s»."
 
-#: ../gtk/gtktipsquery.c:186
+#: gtk/gtktipsquery.c:186
 msgid "--- No Tip ---"
 msgstr "--- Ingen tips ---"
 
-#: ../gtk/gtkuimanager.c:1154
+#: gtk/gtkuimanager.c:1154
 #, c-format
 msgid "Unknown attribute '%s' on line %d char %d"
 msgstr "Ukjent attributt «%s» på linje %d tegn %d"
 
-#: ../gtk/gtkuimanager.c:1371
+#: gtk/gtkuimanager.c:1371
 #, c-format
 msgid "Unexpected start tag '%s' on line %d char %d"
 msgstr "Uventet startmarkering «%s» på linje %d tegn %d"
 
-#: ../gtk/gtkuimanager.c:1461
+#: gtk/gtkuimanager.c:1461
 #, c-format
 msgid "Unexpected character data on line %d char %d"
 msgstr "Uventet tegndata på linje %d tegn %d"
 
-#: ../gtk/gtkuimanager.c:2272
+#: gtk/gtkuimanager.c:2272
 msgid "Empty"
 msgstr "Tom"
 
 #. ID
-#: ../modules/input/imam-et.c:454
+#: modules/input/imam-et.c:454
 msgid "Amharic (EZ+)"
 msgstr "Ahmaisk (EZ+)"
 
 #. ID
-#: ../modules/input/imcedilla.c:91
+#: modules/input/imcedilla.c:91
 msgid "Cedilla"
 msgstr "Cedilla"
 
 #. ID
-#: ../modules/input/imcyrillic-translit.c:217
+#: modules/input/imcyrillic-translit.c:217
 msgid "Cyrillic (Transliterated)"
 msgstr "Kyrillisk (transliterert)"
 
 #. ID
-#: ../modules/input/iminuktitut.c:127
+#: modules/input/iminuktitut.c:127
 msgid "Inuktitut (Transliterated)"
 msgstr "Inukitut (transliterert)"
 
 #. ID
-#: ../modules/input/imipa.c:145
+#: modules/input/imipa.c:145
 msgid "IPA"
 msgstr "IPA"
 
 #. ID
-#: ../modules/input/imthai-broken.c:178
+#: modules/input/imthai-broken.c:178
 msgid "Thai (Broken)"
 msgstr "Thai (ødelagt)"
 
 #. ID
-#: ../modules/input/imti-er.c:453
+#: modules/input/imti-er.c:453
 msgid "Tigrigna-Eritrean (EZ+)"
 msgstr "Tigrigna-Eritreisk (EZ+)"
 
 #. ID
-#: ../modules/input/imti-et.c:453
+#: modules/input/imti-et.c:453
 msgid "Tigrigna-Ethiopian (EZ+)"
 msgstr "Tigrigna-Etiopisk (EZ+)"
 
 #. ID
-#: ../modules/input/imviqr.c:244
+#: modules/input/imviqr.c:244
 msgid "Vietnamese (VIQR)"
 msgstr "Vietnamesisk (VIQR)"
 
 #. ID
-#: ../modules/input/imxim.c:28
+#: modules/input/imxim.c:28
 msgid "X Input Method"
 msgstr "X-inndatametode"
 
-#: ../tests/testfilechooser.c:205
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Kunne ikke hente informasjon for fil «%s»: %s"
+
+#~ msgid "Do you want to replace it with the one you are saving?"
+#~ msgstr "Vil du erstatte den med filen du lagrer nå?"
+
+#~ msgid "_Select Another File"
+#~ msgstr "_Velg en annen fil"
+
+#~ msgid "_Replace Existing File"
+#~ msgstr "E_rstatt eksisterende fil"
diff --git a/po/nso.po b/po/nso.po
index 6b16df996d..6a19cd7cca 100644
--- a/po/nso.po
+++ b/po/nso.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.8-branch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-11-30 16:02+0200\n"
 "Last-Translator: Zuza Software Foundation <info@translate.org.za>\n"
 "Language-Team: Northern Sotho <translate-discuss-nso@lists.sourceforge.net>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "E paletšwe go bula faele ya '%s': %s"
@@ -29,7 +29,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Faele ya seswantšho ya '%s' ga e na tsebišo"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1303,20 +1303,20 @@ msgstr "Leotwana la mmala"
 msgid "Color Selection"
 msgstr "Kgetho ya Mmala"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Kgetha _ka Moka"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Mekgwa _ya Tsebišo"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Tsenya Tlhaka ya Taolo ya Unicode"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Leina la faele leo e sego la kgonthe: %s"
@@ -1326,12 +1326,12 @@ msgstr "Leina la faele leo e sego la kgonthe: %s"
 msgid "Select A File"
 msgstr "Phumola Faele"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Gae"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Teseke"
@@ -1344,272 +1344,288 @@ msgstr "(Ga e gona)"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr ""
 "E be e ka se kgone go tsošološa tshedimošo ka %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 #, fuzzy
 msgid "Could not add a bookmark"
 msgstr ""
 "E be e ka se kgone go oketša puku-tshwayo bakeng sa %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 #, fuzzy
 msgid "Could not remove bookmark"
 msgstr ""
 "E be e ka se kgone go tloša puku-tshwayo bakeng sa %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Leina la faele leo e sego la kgonthe: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 "E be e ka se kgone go tsošološa tshedimošo ka %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, fuzzy, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "E be e ka se kgone go oketša puku-tshwayo bakeng sa %s ka gobane ke leina la "
 "tsejana leo e sego la kgonthe."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Tloša"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Thea ka leswa"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Dikgaoletšo"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Sephuthedi"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Oketša"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Tloša"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "E be e ka se kgethe %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "E be e ka se kgone go oketša puku-tshwayo bakeng sa %s ka gobane ke leina la "
 "tsejana leo e sego la kgonthe."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "Dikgaoletšo"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "Bula Lefelo"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Bontšha _Difaele tše Utilwego"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Difaele"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Leina"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Bogolo"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Mpshafaditšwe"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Hlama Se_phuthedi"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Leina:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Fetleka bakeng sa diphuthedi tše dingwe"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Boloka _sephutheding:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Hlama _sephutheding:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 #, fuzzy
 msgid "Cannot change to folder because it is not local"
 msgstr "E ka se fetolele sephutheding ka gobane ga se sa mo gae"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "kgaoletšo ya %s ga e gona"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Thea ka leswa"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "E be e ka se kgethe %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Tlanya leina la sephuthedi se seswa"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "paete ya %d"
 msgstr[1] "dipaete tša %d"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "E sa tsebjwego"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Lehono"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Maabane"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Hlama _sephutheding:"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 #, fuzzy
 msgid "The folder you specified is an invalid path."
 msgstr ""
 "E ka se fetolele go sephuthedi seo o se laeditšego ka ge e le tsejana yeo e "
 "sego ya kgonthe."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, fuzzy, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 "E be e ka se kgone go aga leina la faele go tšwa go '%s' le '%s':\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "E be e ka se kgethe %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Bula Lefelo"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Boloka Lefelong"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Lefelo:"
 
@@ -1814,7 +1830,8 @@ msgid "This file system does not support mounting"
 msgstr "Tshepedišo ye ya faele ga e thekge koketšego"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Tshepedišo ya faele"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1917,7 +1934,7 @@ msgstr "_Boleng bja Gamma"
 msgid "Error loading icon: %s"
 msgstr "Phošo ya go laiša leswao: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1930,7 +1947,7 @@ msgstr ""
 "O ka hwetša kopi go:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Leswao la '%s' ga le gona sehlogong"
@@ -2018,7 +2035,7 @@ msgstr "(e sa tsebjwego)"
 msgid "clear"
 msgstr "phumola"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Kgetha ka Moka"
 
@@ -2454,43 +2471,43 @@ msgstr "Godišetša _ka gare"
 msgid "Zoom _Out"
 msgstr "Godišetša _ka Ntle"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM _Leswao la lanngele go ya go lagoja"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM _Leswao la lagoja go ya go lanngele"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Dikologa lanngele go ya go l_agoja"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Dikologa lagoja go ya go l_anngele"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Beela ka thoko lanngele go ya go _lagoja"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Beela ka thoko lagoja go ya go l_anngele"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Tšweletša sebopego sa go lebanya"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _Sekgoba sa bophara sa lefeela"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Sekopanyi sa bophara sa _lefeela"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Seo e sego sekopanyi sa bophara sa _lefeela"
 
@@ -2576,7 +2593,7 @@ msgstr "Se-Vietnam (VIQR)"
 msgid "X Input Method"
 msgstr "Mokgwa wa Tsebišo wa X"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "E be e ka se hwetše tshedimošo bakeng sa faele ya '%s': %s"
diff --git a/po/pa.po b/po/pa.po
index 5bd0f3c450..6ac42f3a19 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-07-22 13:53+0530\n"
 "Last-Translator: Amanpreet Singh Alam <aalam@redhat.com>\n"
 "Language-Team: Punjabi <pa@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=0;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "ਫਾਇਲ '%s' ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ %s"
@@ -30,7 +30,7 @@ msgid "Image file '%s' contains no data"
 msgstr "ਚਿੱਤਰ ਫਾਇਲ '%s' ਵਿੱਚ ਕੋਈ ਡਾਟਾ ਨਹੀ ਹੈ"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1242,20 +1242,20 @@ msgstr "ਰੰਗ ਚੱਕਰ"
 msgid "Color Selection"
 msgstr "ਰੰਗ ਚੋਣ"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "_ਸਭ ਚੁਣੋ"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "ਇੰਪੁੱ_ਟ ਢੰਗ"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "ਯੂਨੀਕੋਡ ਕੰਟਰੋਲ ਅੱਖਰ ਸ਼ਾ_ਮਿਲ"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "ਗਲਤ ਫਾਇਲ ਨਾਂ: %s"
@@ -1265,12 +1265,12 @@ msgstr "ਗਲਤ ਫਾਇਲ ਨਾਂ: %s"
 msgid "Select A File"
 msgstr "ਫਾਇਲ ਚੁਣੋ"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "ਘਰ"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "ਵਿਹੜਾ"
@@ -1283,266 +1283,282 @@ msgstr "(ਕੋਈ ਨਹੀ)"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr ""
 "%s ਬਾਰੇ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਨਹੀ ਕਰ ਸਕਿਆ:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 #, fuzzy
 msgid "Could not add a bookmark"
 msgstr ""
 "%s ਲਈ ਬੁੱਕਮਾਰਕ ਜੋਡ਼ ਨਹੀ ਸਕਿਆ:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 #, fuzzy
 msgid "Could not remove bookmark"
 msgstr ""
 "%s ਲਈ ਬੁੱਕਮਾਰਕ ਹਟਾ ਨਹੀ ਸਕਿਆ:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "ਗਲਤ ਫਾਇਲ ਨਾਂ: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 "%s ਬਾਰੇ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਨਹੀ ਕਰ ਸਕਿਆ:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "ਫੋਲਡਰ '%s' ਨੂੰ ਬੁੱਕਮਾਰਕ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ ਨੂੰ ਬੁੱਕਮਾਰਕ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "ਚੁਣੇ ਫੋਲਡਰ ਬੁੱਕਮਾਰਕ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "ਬੁੱਕਮਾਰਕ '%s' ਹਟਾਓ"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, fuzzy, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "%s ਲਈ ਬੁੱਕਮਾਰਕ ਹਟਾ ਨਹੀ ਸਕਿਆ, ਕਿਉਕਿ ਮਾਰਗ ਨਾਂ ਠੀਕ ਨਹੀ ਹੈ।"
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_ਹਟਾਉ"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_ਨਾਂ-ਤਬਦੀਲ:"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "ਸ਼ਾਰਟਕੱਟ"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "ਫੋਲਡਰ"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "ਸ਼ਾਮਿ_ਲ"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 #, fuzzy
 msgid "Add the selected folder to the Bookmarks"
 msgstr "ਚੁਣਿਆ ਫੋਲਡਰ ਬੁੱਕਮਾਰਕ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_ਹਟਾਉ"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "ਚੁਣੇ ਬੁੱਕਮਾਰਕ ਹਟਾਓ"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "%s ਚੁਣਿਆ ਜਾ ਸਕਿਆ:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "%s ਲਈ ਬੁੱਕਮਾਰਕ ਹਟਾ ਨਹੀ ਸਕਿਆ, ਕਿਉਕਿ ਮਾਰਗ ਨਾਂ ਠੀਕ ਨਹੀ ਹੈ।"
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "ਸ਼ਾਰਟਕੱਟ ਸ਼ਾਮਿ_ਲ"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "ਸਥਿਤੀ ਖੋਲ੍ਹੋ"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "_ਲੁਕਵੀਆਂ ਫਾਇਲਾਂ ਵੇਖਾਓ"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "ਫਾਇਲਾਂ"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "ਨਾਂ"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "ਆਕਾਰ"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "ਸੋਧ"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "ਚੁਣੋ ਕਿ ਕਿਸ ਕਿਸਮ ਦੀਆਂ ਫਾਇਲਾਂ ਤੁਸੀਂ ਵੇਖਣੀਆਂ ਚਾਹੁੰਦੇ ਹੋ"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "ਫੋਲ_ਡਰ ਬਣਾਓ"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_ਨਾਂ:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "ਹੋਰ ਫੋਲਡਰ ਲਈ ਝਲ_ਕ"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "ਫੋ_ਲਡਰ ਵਿੱਚ ਸੰਭਾਲੋ:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "ਫੋ_ਲਡਰ ਵਿੱਚ ਬਣਾਉ:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "ਫੋਲਡਰ ਨੂੰ ਤਬਦੀਲ਼ ਨਹੀ ਕਰ ਸਕਿਆ ਕਿਉਂਕਿ ਇਹ ਸਥਾਨਿਕ ਨਹੀ ਹੈ"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "ਸ਼ਾਰਟਕੱਟ %s ਮੌਜੂਦਾ ਨਹੀ ਹੈ"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_ਨਾਂ-ਤਬਦੀਲ:"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "%s ਚੁਣਿਆ ਜਾ ਸਕਿਆ:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "ਨਵੇਂ ਫੋਲਡਰ ਦਾ ਨਾਂ ਲਿਖੋ"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d ਬਾਈਟ"
 msgstr[1] "%d ਬਾਈਟ"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f ਕੇ"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f ਮੈ"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f ਗੈ"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "ਅਣਪਛਾਤਾ"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "ਅੱਜ"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "ਕੱਲ੍ਹ"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "ਫੋ_ਲਡਰ ਵਿੱਚ ਬਣਾਉ:"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 #, fuzzy
 msgid "The folder you specified is an invalid path."
 msgstr "ਫੋਲਡਰ ਨੂੰ ਤਬਦੀਲ਼ ਨਹੀ ਕਰ ਸਕਿਆ, ਕਿਉਕਿ ਇਹ ਮਾਰਗ ਸਹੀ ਨਹੀ ਹੈ।"
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, fuzzy, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 "'%s' ਅਤੇ '%s' ਤੋ ਫਾਇਲ ਨਾਂ ਬਣਾ ਨਹੀ ਸਕਿਆ:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "%s ਚੁਣਿਆ ਜਾ ਸਕਿਆ:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "ਸਥਿਤੀ ਖੋਲ੍ਹੋ"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "ਸਥਿਤੀ ਤੇ ਸੰਭਾਲੋ"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_ਸਥਿਤੀ:"
 
@@ -1740,7 +1756,8 @@ msgid "This file system does not support mounting"
 msgstr "ਇਹ ਫਾਇਲ ਸਿਸਟਮ ਮਾਊਟਿੰਗ ਲਈ ਸਹਾਇਕ ਨਹੀ ਹੈ"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "ਫਾਇਲ ਸਿਸਟਮ"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1842,7 +1859,7 @@ msgstr "_ਗਾਮਾ ਮੁੱਲ"
 msgid "Error loading icon: %s"
 msgstr "ਗਲਤੀ ਆਈਕਾਨ ਲੋਡ ਕਰਨ ਵਿੱਚ: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1855,7 +1872,7 @@ msgstr ""
 "ਤੁਸੀ ਇਸ ਦੀ ਨਕਲ ਇਥੋਂ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦੇ ਹੋ:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "ਸਰੂਪ ਵਿੱਚ ਆਈਕਾਨ '%s' ਮੌਜੂਦ ਨਹੀ ਹੈ"
@@ -1943,7 +1960,7 @@ msgstr "(ਅਣਪਛਾਤਾ)"
 msgid "clear"
 msgstr "ਸਾਫ਼"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "ਸਭ ਚੁਣੋ"
 
@@ -2380,43 +2397,43 @@ msgstr "ਅਕਾਰ _ਵੱਡਾ"
 msgid "Zoom _Out"
 msgstr "ਅਕਾਰ ਛੋ_ਟਾ"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM ਖੱਬੇ ਤੋ ਸੱਜਾ ਮਾਰਕ"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM ਸੱਜੇ ਤੋ ਖੱਬਾ ਮਾਰਕ"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE ਖੱਬੇ ਤੋ ਸੱਜਾ ਚਿਣਨਾ"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE ਸੱਜੇ ਤੋ ਖੱਬਾ ਚਿਣਨਾ"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO ਖੱਬੇ ਤੋ ਸੱਜਾ ਉਪੱਰ"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO ਸੱਜੇ ਤੋ ਖੱਬਾ ਉਪੱਰ"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _ਪਾਪ ਦਿਸ਼ਾ ਫਾਰਮਿਟਿੰਗ"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS ਸਿਫ਼ਰ ਚੌੜਾਈ ਥਾਂ"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ ਸਿਫ਼ਰ ਚੌੜਾਈ ਦਾਖਲਾ"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ ਸਿਫ਼ਰ ਚੌੜਾਈ ਨਾ-ਦਾਖਲਾ"
 
@@ -2498,7 +2515,7 @@ msgstr "ਵੀਅਤਨਾਮੀ (VIQR)"
 msgid "X Input Method"
 msgstr "X ਇੰਪੁੱਟ ਢੰਗ"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "ਫਾਇਲ '%s' ਲਈ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ਼: %s"
diff --git a/po/pl.po b/po/pl.po
index 17bc15704b..12e331c559 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2003-11-18 11:32+0100\n"
 "Last-Translator: Gnome PL Team <translators@gnomepl.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Nie można otworzyć pliku \"%s\": %s"
@@ -32,7 +32,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Plik z obrazem \"%s\" nie zawiera danych"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1271,20 +1271,20 @@ msgstr "Koło kolorów"
 msgid "Color Selection"
 msgstr "Wybór koloru"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Zaznacz w_szystko"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Metody wejściowe"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Wstaw znak kontrolny Unicode"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Niepoprawna nazwa pliku: %s"
@@ -1293,12 +1293,12 @@ msgstr "Niepoprawna nazwa pliku: %s"
 msgid "Select A File"
 msgstr "Wybór pliku"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Domowy"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Biurko"
@@ -1311,186 +1311,202 @@ msgstr "(brak)"
 msgid "Other..."
 msgstr "Inne..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Nie można pobrać informacji o pliku"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Nie można dodać zakładki"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Nie można usunąć zakładki"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Nie można utworzyć folderu"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Niepoprawna nazwa pliku"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Nie można wyświetlić zawartości folderu"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Nie można pobrać informacji o \"%s\": %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Dodaje folder \"%s\" do zakładek"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Dodaje bieżący folder do zakładek"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Dodaje zaznaczone foldery do zakładek"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Usuwa zakładkę \"%s\""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Nie można dodać zakładki dla \"%s\" ponieważ jest to niepoprawna nazwa "
 "ścieżki."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Usuń"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "Zmień _nazwę"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Skróty"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Folder"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 #, fuzzy
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Dodaje zaznaczony folder do zakładek"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Usuwa zaznaczoną zakładkę"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Nie można zaznaczyć elementu"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "Nie można dodać zakładki dla \"%s\" ponieważ jest to niepoprawna nazwa "
 "ścieżki."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "_Dodaj do skrótów"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "O_twórz położenie"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Wyświetl u_kryte pliki"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Pliki"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Nazwa"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Rozmiar"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Zmodyfikowany"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Wybiera jakie rodzaje plików są wyświetlane"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Utwórz fo_lder"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Nazwa:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Przeglądaj inne foldery"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Zapis w f_olderze:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Utwórz w fold_erze:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Nie można przejść do folderu, ponieważ nie jest on lokalny"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Skrót %s nie istnieje"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "Zmień _nazwę"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Nie można zamontować %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Podaj nazwę nowego folderu"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
@@ -1498,59 +1514,59 @@ msgstr[0] "%d bajt"
 msgstr[1] "%d bajty"
 msgstr[2] "%d bajtów"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Dzisiaj"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Wczoraj"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Nie można zmienić folderu"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Podany folder jest niepoprawną ścieżką."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Nie można utworzyć nazwy pliku z \"%s\" i \"%s\""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Nie można zaznaczyć elementu"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Otwarcie położenia"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Zapis w położeniu"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "Położ_enie:"
 
@@ -1755,7 +1771,8 @@ msgid "This file system does not support mounting"
 msgstr "Ten system plików nie obsługuje montowania"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "System plików"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1858,7 +1875,7 @@ msgstr "Wartość g_amma"
 msgid "Error loading icon: %s"
 msgstr "Błąd przy odczytywaniu ikony: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1871,7 +1888,7 @@ msgstr ""
 "Ich kopię można pobrać z:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Ikona \"%s\" jest nieobecna w motywie"
@@ -1959,7 +1976,7 @@ msgstr "(nieznane)"
 msgid "clear"
 msgstr "wyczyść"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Zaznacz wszystko"
 
@@ -2397,43 +2414,43 @@ msgstr "Po_większ"
 msgid "Zoom _Out"
 msgstr "Po_mniejsz"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM - znacznik kierunku od _lewej do prawej"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM - znacznik kierunku od p_rawej do lewej"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE - _osadzenie od lewej do prawej"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE - o_sadzenie od prawej do lewej"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO - _nałożenie od lewej do prawej"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO - n_ałożenie od prawej do lewej"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF - _zdjęcie kierunku formatowania"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS - spacja o z_erowej szerokości"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWN - łączn_ik znaków o zerowej szerokości"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ - rozłączni_k znaków o zerowej szerokości"
 
@@ -2515,7 +2532,7 @@ msgstr "Wietnamska ((VIQR)"
 msgid "X Input Method"
 msgstr "Metoda wejściowa X"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Nie można pobrać informacji dla pliku \"%s\": %s"
diff --git a/po/pt.po b/po/pt.po
index 6619cb7656..65c1bef205 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-01-10 23:50+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Falha ao abrir ficheiro '%s': %s"
@@ -29,7 +29,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Ficheiro de imagem '%s' não contém dados"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1268,20 +1268,20 @@ msgstr "Roda de Cores"
 msgid "Color Selection"
 msgstr "Selecção de Fonte"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Seleccionar _Tudo"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Métodos de Introdução"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Inserir Caracter de Controlo Unicode"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Nome de ficheiro inválido: %s"
@@ -1290,12 +1290,12 @@ msgstr "Nome de ficheiro inválido: %s"
 msgid "Select A File"
 msgstr "Seleccionar Um Ficheiro"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Pasta Pessoal"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Ambiente de Trabalho"
@@ -1308,245 +1308,261 @@ msgstr "(Nenhum)"
 msgid "Other..."
 msgstr "Outro..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Incapaz de obter informação sobre o ficheiro"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Incapaz de adicionar um marcador"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Incapaz de remover o marcador"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Incapaz de criar a pasta"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Nome de ficheiro inválido"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Incapaz de apresentar o conteúdo da pasta"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Incapaz de obter informação sobre '%s': %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Adicionar a pasta '%s' aos marcadores"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Adicionar a pasta actual aos marcadores"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Adicionar as pastas seleccionadas aos marcadores"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Remover o marcador '%s'"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Incapaz de adicionar um marcador para '%s' por ser um nome de caminho "
 "inválido."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Remover"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Renomear"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Pasta"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 #, fuzzy
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Adicionar a pasta seleccionada aos marcadores"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Remover"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Remover o marcador seleccionado"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Incapaz de seleccionar o item"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "Incapaz de adicionar um marcador para '%s' por ser um nome de caminho "
 "inválido."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "_Adicionar aos Atalhos"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Abrir _Localização"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Apresentar os Ficheiros _Escondidos"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Ficheiros"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Nome"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Tamanho"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Alterado"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Seleccionar que tipos de ficheiros são apresentados"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Criar _Pasta"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "Procurar _outras pastas"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Gravar na _pasta:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Criar na _pasta:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Incapaz de ir para a pasta por não ser local"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Atalho %s não existe"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Renomear"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Incapaz de montar %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Introduza o nome da nova pasta"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d byte"
 msgstr[1] "%d bytes"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Hoje"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Ontem"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Incapaz de ir para a pasta"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "A pasta especificada é um caminho inválido."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Incapaz de construir o nome do ficheiro a partir de '%s' e '%s'"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Incapaz de seleccionar o item"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Abrir Localização"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Gravar na Localização"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Localização:"
 
@@ -1752,7 +1768,8 @@ msgid "This file system does not support mounting"
 msgstr "Este sistema de ficheiros não suporta ser montado"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Sistema de ficheiros"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1854,7 +1871,7 @@ msgstr "Valor _Gama"
 msgid "Error loading icon: %s"
 msgstr "Erro ao ler o ícone: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1867,7 +1884,7 @@ msgstr ""
 "Poderá obter uma cópia em:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Ícone '%s' não existe no tema"
@@ -1955,7 +1972,7 @@ msgstr "(desconhecido)"
 msgid "clear"
 msgstr "limpar"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Seleccionar Tudo"
 
@@ -2392,43 +2409,43 @@ msgstr "_Aum Zoom"
 msgid "Zoom _Out"
 msgstr "_Dim Zoom"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "Marca Esquerda-para-direita (_LRM)"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "Marca Direita-para-esquerda (_RLM)"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "Embebido _Esquerda-para-direita (LRE)"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "E_mbebido Direita-para-esquerda (RLE)"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "S_obreposição Esquerda-para-direita (LRO)"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "Sobreposição Direita-para-es_querda (RLO)"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "Apresentar formatação direccional (_PDF)"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "Largura de espaçamento _zero (ZWS)"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "Largura de _junção zero (ZWJ)"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "Largura de _não-junção zero (ZWNJ)"
 
@@ -2510,7 +2527,7 @@ msgstr "Vietnamita (VIQR)"
 msgid "X Input Method"
 msgstr "Método de Introdução X"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Incapaz de obter informação para o ficheiro '%s': %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 54880a315f..86c03796e5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-05-27 15:29-0300\n"
 "Last-Translator: Afonso Celso Medina <medina@maua.br>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Falha ao abrir o arquivo '%s': %s"
@@ -31,7 +31,7 @@ msgid "Image file '%s' contains no data"
 msgstr "O arquivo de imagem '%s' não contém dados"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1270,20 +1270,20 @@ msgstr "Roda de Cores"
 msgid "Color Selection"
 msgstr "Seleção de Cor"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Selecionar _Tudo"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Métodos de Entrada"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Inserir Caracter de Controle Unicode"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Nome de arquivo inválido: %s"
@@ -1292,12 +1292,12 @@ msgstr "Nome de arquivo inválido: %s"
 msgid "Select A File"
 msgstr "Selecione um Arquivo"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Pasta Pessoal"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Desktop"
@@ -1310,242 +1310,258 @@ msgstr "(Nenhum)"
 msgid "Other..."
 msgstr "Outra..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Impossível obter informações sobre o arquivo"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Impossível adicionar um marcador"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Impossível remover o marcador"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "A pasta não pôde ser criada"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Nome de arquivo inválido"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Os conteúdos da pasta não puderam ser mostrados"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Impossível obter informações sobre '%s': %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Adiciona a pasta '%s' aos marcadores"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Adiciona a pasta atual aos marcadores"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Adiciona as pastas selecionadas aos marcadores"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Remove o marcador '%s'"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Impossível adicionar um marcador para '%s' porque ele não é um caminho "
 "válido."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Remover"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Renomear..."
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Pasta"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Adiciona a pasta selecionada aos Marcadores"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Remover"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Remove o marcador selecionado"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Impossível selecionar o item"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "Impossível adicionar um marcador para '%s' porque ele não é um caminho "
 "válido."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "_Adicionar aos Marcadores"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Abrir _Localização"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Mostrar Arquivos _Ocultos"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Arquivos"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Nome"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Tamanho"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Modificado"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Seleciona quais tipos de arquivos são mostrados"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Criar _Pasta"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Navegar em outras pastas"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Salvar na _pasta:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Criar na _pasta:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Impossível ir para a pasta porque ela não é local"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "O atalho %s não existe"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Renomear"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Impossível montar %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Digite o nome da nova pasta"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d byte"
 msgstr[1] "%d bytes"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Hoje"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Ontem"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Impossível alterar a pasta"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "A pasta que você especificou tem um caminho inválido."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Impossível construir o nome do arquivo a partir de '%s' e '%s'"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Impossível selecionar o item"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Abrir Localização"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Salvar na Localização"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Localização:"
 
@@ -1751,7 +1767,8 @@ msgid "This file system does not support mounting"
 msgstr "Esse sistema de arquivos não suporta montagem"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Sistema de Arquivos"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1854,7 +1871,7 @@ msgstr "Valor _Gamma"
 msgid "Error loading icon: %s"
 msgstr "Erro ao carregar o ícone: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1867,7 +1884,7 @@ msgstr ""
 "Você pode obter uma cópia a partir de:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "O ícone '%s' não está presente no tema"
@@ -1955,7 +1972,7 @@ msgstr "(desconhecido)"
 msgid "clear"
 msgstr "limpar"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Selecionar Tudo"
 
@@ -2382,43 +2399,43 @@ msgstr "_Ampliar"
 msgid "Zoom _Out"
 msgstr "_Reduzir"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM Marca da _esquerda para a direita"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM Marca da _direita para a esquerda"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE _Embutido da esquerda para a direita"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE E_mbutido da direita para a esquerda"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO _Sobrepor da esquerda para a direita"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO S_obrepor da direita para a esquerda"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "_PDF Mostrar formatação direcional"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "_ZWS Espaço de largura zero"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ _União de largura zero"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ _Não-união de largura zero"
 
@@ -2500,7 +2517,7 @@ msgstr "Vietnamita (VIQR)"
 msgid "X Input Method"
 msgstr "Método de Entrada do X"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Impossível obter informações sobre o arquivo '%s': %s"
diff --git a/po/ro.po b/po/ro.po
index 40ab110482..125b4a887c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk-2-6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-03-06 00:58+0200\n"
 "Last-Translator: Mişu Moldovan <dumol@go.ro>\n"
 "Language-Team: Română <gnomero-list@lists.sourceforge.net>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Nu am reuşit să deschid fişierul „%s”: %s"
@@ -29,7 +29,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Fişierul imagine „%s” nu conţine date"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1265,20 +1265,20 @@ msgstr "Cercul culorilor"
 msgid "Color Selection"
 msgstr "Selecţie culoare"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Selectează t_ot"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Metode de intrare"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Inserare control Unicode"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Nume invalid de fişier: %s"
@@ -1287,12 +1287,12 @@ msgstr "Nume invalid de fişier: %s"
 msgid "Select A File"
 msgstr "Selectaţi un fişier"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Acasă"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Desktop"
@@ -1305,244 +1305,260 @@ msgstr "(Niciunul)"
 msgid "Other..."
 msgstr "Altul..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Nu am reuşit să obţin informaţii despre fişier"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Nu am reuşit să adaug favoritul"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Nu am reuşit să şterg favoritul"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Directorul nu a putut fi recreat"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Nume invalid de fişier"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Conţinutul directorului nu a putut fi afişat"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Nu am reuşit să obţin informaţii despre „%s”: %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Adaugă directorul „%s” la favorite"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Adaugă directorul „%s” la favorite"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Adaugă directoarele selectate la favorite"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Şterge favoritul „%s”"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Nu am reuşit să adăug un favorit pentru „%s” deoarece are o cale invalidă."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Elimină"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "Re_denumeşte"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Scurtături"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Director"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "A_daugă"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 #, fuzzy
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Adaugă directorul selectat la favorite"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Elimină"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Şterge favoritul selectat"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Nu am putut selecta itemul"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "Nu am reuşit să adăug un favorit pentru „%s” deoarece are o cale invalidă."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "_Adaugă la combinaţiile de taste"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Deschide _locaţia"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Arată fişierele _ascunse"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Fişiere"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Nume"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Mărime"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Modificat"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Selectaţi ce tipuri de fişiere să fie afişate"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Creea_ză director"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Nume:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "Navigare în al_te directoare"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Salvează în _director:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Creează în _director:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Nu pot deschide directorul deoarece nu este local"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Combinaţia de taste %s nu există"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "Re_denumeşte"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Nu am reuşit să montez %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Introduceţi numele noului director"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d octet"
 msgstr[1] "%d octeţi"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f O"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Nu se ştie"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Azi"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Ieri"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Nu pot schimba directorul"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Directorul specificat este o cale invalidă."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Nu am putut construi un nume de fişier din „%s” şi „%s”"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Nu am putut selecta itemul"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Deschide locaţia"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Salvează în locaţia"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Locaţie: "
 
@@ -1744,7 +1760,8 @@ msgid "This file system does not support mounting"
 msgstr "Acest sistem de fişiere nu suportă „mount”"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Sistem de fişiere"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1847,7 +1864,7 @@ msgstr "Valoare _gamma"
 msgid "Error loading icon: %s"
 msgstr "Eroare la încărcarea iconiţei: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1858,7 +1875,7 @@ msgstr ""
 "Nu am găsit iconiţa „%s”. Nici tema „%s” nu a fost găsită, s-ar putea să "
 "trebuiască să o reinstalaţi. Puteţi obţine o copie de la: \t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Iconiţa „%s” nu e prezentă în temă"
@@ -1946,7 +1963,7 @@ msgstr "(necunoscut)"
 msgid "clear"
 msgstr "şterge"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Selectează tot"
 
@@ -2383,43 +2400,43 @@ msgstr "Mă_reşte"
 msgid "Zoom _Out"
 msgstr "Mi_cşorează"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "Semn _Stânga-Dreapta LRM"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "Semn _Dreapta-Stânga RLM"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "Î_ncapsulare Stânga-Dreapta LRE"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "În_capsulare Dreapta-Stânga RLE"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "S_uprascriere Stânga-Dreapta LRO"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "Supr_ascriere Dreapta-Stânga RLO"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "Formatare direcţională _Pop PDF"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "Spaţiu de lungime _zero ZWS"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "_Legătură de lungime zero ZWJ"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "Non-le_gătură de lungime zero ZWNJ"
 
@@ -2501,7 +2518,7 @@ msgstr "Vietnameză (VIQR)"
 msgid "X Input Method"
 msgstr "Metodă de intrare X"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Nu putut obţine detalii despre fişierul „%s”: %s"
diff --git a/po/ru.po b/po/ru.po
index ca0a2cffcc..7d58fa3f25 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-04-22 23:51+0400\n"
 "Last-Translator: Dan Korostelev <nadako@gmail.com>\n"
 "Language-Team: <gnome-cyr@gnome.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Произошёл сбой при открытии файла \"%s\": %s"
@@ -34,7 +34,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Файл изображения \"%s\" не содержит никаких данных"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1292,20 +1292,20 @@ msgstr "Цветовой круг"
 msgid "Color Selection"
 msgstr "Выбор цвета"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Выделить вс_е"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Использовать _методы ввода"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "Вст_авить управляющий символ набора Юникод"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Недопустимое имя файла: %s"
@@ -1314,12 +1314,12 @@ msgstr "Недопустимое имя файла: %s"
 msgid "Select A File"
 msgstr "Выберите файл"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Домашняя папка"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Рабочий стол"
@@ -1332,183 +1332,199 @@ msgstr "(Нет)"
 msgid "Other..."
 msgstr "Другой..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Не удалось получить информацию о \"%s\""
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Не удалось добавить закладку"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Не удалось удалить закладку"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Невозиожно создать папку"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Недопустимое имя файла"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Невозможно отобразить содержимое папки"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Не удалось получить информацию о \"%s\": %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Добавить папку \"%s\" к закладкам"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Добавить текущую папку к закладкам"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Добавить выделенные папки к закладкам"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Удалить закладку \"%s\""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "Не удалось добавить закладку для \"%s\", так как этот путь недопустим."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Удалить"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Переименовать"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Ярлыки"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Папка"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Добавить"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 #, fuzzy
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Добавить выбранную папку к закладкам"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Удалить выделенную закладку"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Не удалось выбрать элемент"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "Не удалось добавить закладку для \"%s\", так как этот путь недопустим."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "_Добавить к ярлыкам"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Открыть _адрес"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Показывать _скрытые файлы"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Файлы"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Имя"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Размер"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Изменён"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Выбрать отображаемые типы файлов"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Создать п_апку"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Имя:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "П_росмотреть другие папки"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Сохранить в _папке"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Создать в _папке:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Невозможно перейти в папку, так как она не является локальной"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Ярлык %s не существует"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Переименовать"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Невозможно подключить %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Введите имя новой папки"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
@@ -1516,59 +1532,59 @@ msgstr[0] "%d байт"
 msgstr[1] "%d байта"
 msgstr[2] "%d байт"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f Кб"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f Мб"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f Гб"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Неизвестен"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Сегодня"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Вчера"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Невозможно сменить папку"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Не удалось перейти в указанную папку, так как этот путь недопустим."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Не удалось построить имя файла из \"%s\" и \"%s\""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Не удалось выбрать элемент"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Открыть адрес"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Сохранить в местоположении"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Адрес:"
 
@@ -1767,7 +1783,8 @@ msgid "This file system does not support mounting"
 msgstr "Эта файловая система не поддерживает подсоединение"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Файловая система"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1870,7 +1887,7 @@ msgstr "_Гамма-значение"
 msgid "Error loading icon: %s"
 msgstr "Произошла ошибка загрузки значка: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1883,7 +1900,7 @@ msgstr ""
 "Загрузить тему можно с\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Значок \"%s\" не присутствует в теме"
@@ -1971,7 +1988,7 @@ msgstr "(неизвестен)"
 msgid "clear"
 msgstr "очистить"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Выделить все"
 
@@ -2408,43 +2425,43 @@ msgstr "У_величить"
 msgid "Zoom _Out"
 msgstr "У_меньшить"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM Метка с_лева направо"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM Метка с_права налево"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Вс_тавка слева направо"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Вст_авка справа налево"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO П_ерекрывание слева направо"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Пере_крывание справа налево"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Расположение по вертикали"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _Нулевой пробел"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Нулевой о_бъединитель"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Нулевой ра_зъединитель"
 
@@ -2526,7 +2543,7 @@ msgstr "Вьетнамский (VIQR)"
 msgid "X Input Method"
 msgstr "Метод XInput"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Не удалось получить информацию о файле \"%s\": %s"
diff --git a/po/rw.po b/po/rw.po
index d116ce7a08..357a3f4e12 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-11-16 14:57-0700\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -23,7 +23,7 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, fuzzy, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Kuri Gufungura IDOSIYE"
@@ -34,7 +34,7 @@ msgid "Image file '%s' contains no data"
 msgstr "IDOSIYE Kirimo Oya Ibyatanzwe"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, fuzzy, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1416,21 +1416,21 @@ msgstr "gutoranya ibara"
 # padmin/source\padialog.src:RID_FONTIMPORT_DIALOG.RID_FIMP_BTN_SELECTALL.text
 # #-#-#-#-#  padmin.pot (Gnome 2.12)  #-#-#-#-#
 # padmin/source\padialog.src:RID_ADDP_PAGE_OLDPRINTERS.RID_ADDP_OLD_BTN_SELECTALL.text
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 #, fuzzy
 msgid "Select _All"
 msgstr "Hitamo byose"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr ""
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr ""
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, fuzzy, c-format
 msgid "Invalid filename: %s"
 msgstr "Izina ry'idosiye:"
@@ -1440,13 +1440,13 @@ msgstr "Izina ry'idosiye:"
 msgid "Select A File"
 msgstr "Hitamo Byose"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "home"
 
 # sfx2/source\explorer\explorer.src:STR_SFX_DESKTOP.text
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Ibiro"
@@ -1460,211 +1460,228 @@ msgstr "(ntacyo)"
 msgid "Other..."
 msgstr "Ikindi..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr "OYA Ibisobanuro Ibyerekeye IDOSIYE"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 #, fuzzy
 msgid "Could not add a bookmark"
 msgstr "OYA Kongeramo a Akamenyetso"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 #, fuzzy
 msgid "Could not remove bookmark"
 msgstr "OYA Gukuraho... Akamenyetso"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 #, fuzzy
 msgid "The folder could not be created"
 msgstr "Ububiko OYA Byaremwe"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
 # svtools/source\misc\errtxt.src:RID_ERRHDL.ERRCODE_IO_MISPLACEDCHAR.text
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Izina ry'idosiye siryo"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 #, fuzzy
 msgid "The folder contents could not be displayed"
 msgstr "Ububiko Ibigize OYA"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "OYA Kubona Ibisobanuro Ibyerekeye"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, fuzzy, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Ububiko Kuri Ibirango"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 #, fuzzy
 msgid "Add the current folder to the bookmarks"
 msgstr "KIGEZWEHO Ububiko Kuri Ibirango"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 #, fuzzy
 msgid "Add the selected folders to the bookmarks"
 msgstr "Byahiswemo Kuri Ibirango"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, fuzzy, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Akamenyetso"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, fuzzy, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "OYA Kongeramo a Akamenyetso kugirango ni Sibyo Inzira Izina:"
 
 # sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.BTN_REMOVE.text
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Gukuraho"
 
 # sfx2/source\appl\newhelp.src:MENU_HELP_BOOKMARKS.MID_RENAME.text
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Guhindura Izina"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
 # sfx2/source\explorer\explorer.src:STR_SFX_FOLDER.text
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Ububiko"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 #, fuzzy
 msgid "_Add"
 msgstr "Kongeramo"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 #, fuzzy
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Byahiswemo Ububiko Kuri Ibirango"
 
 # sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.BTN_REMOVE.text
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 #, fuzzy
 msgid "_Remove"
 msgstr "Gukuraho"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 #, fuzzy
 msgid "Remove the selected bookmark"
 msgstr "Byahiswemo Akamenyetso"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "gutoranya ibara"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "OYA Kongeramo a Akamenyetso kugirango ni Sibyo Inzira Izina:"
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "Kuri"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "amadosiye"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "izina"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Ingano"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "cya/byahinduwe"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 #, fuzzy
 msgid "Select which types of files are shown"
 msgstr "Bya Idosiye"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "Guhimba idosiye:%s"
 
 # basctl/source\basicide\moduldlg.src:RID_DLG_NEWLIB.RID_FT_NEWLIB.text
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 #, fuzzy
 msgid "_Name:"
 msgstr "Izina:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 #, fuzzy
 msgid "_Browse for other folders"
 msgstr "kugirango Ikindi"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 #, fuzzy
 msgid "Save in _folder:"
 msgstr "Kubika in Ububiko"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 #, fuzzy
 msgid "Create in _folder:"
 msgstr "in Ububiko"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 #, fuzzy
 msgid "Cannot change to folder because it is not local"
 msgstr "Guhindura>> Kuri Ububiko ni OYA"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "OYA"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+# basctl/source\basicide\basidesh.src:RID_POPUP_TABBAR.SID_BASICIDE_RENAMECURRENT.text
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "Guhindura izina"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr "OYA"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 #, fuzzy
 msgid "Type name of new folder"
 msgstr "Izina: Bya Gishya Ububiko"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, fuzzy, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, fuzzy, c-format
 msgid "%.1f K"
 msgstr ""
@@ -1677,7 +1694,7 @@ msgstr ""
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, fuzzy, c-format
 msgid "%.1f M"
 msgstr ""
@@ -1690,7 +1707,7 @@ msgstr ""
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, fuzzy, c-format
 msgid "%.1f G"
 msgstr ""
@@ -1703,49 +1720,49 @@ msgstr ""
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Itazwi"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "UYUMUNSI"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Ejo"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Guhindura>> Ububiko"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 #, fuzzy
 msgid "The folder you specified is an invalid path."
 msgstr "Ububiko ni Sibyo Inzira"
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, fuzzy, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "OYA IDOSIYE Izina: Bivuye Na"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr "gutoranya ibara"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "Kubika in"
 
 # padmin/source\padialog.src:RID_PADIALOG.RID_PA_TXT_LOCATION.text
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 #, fuzzy
 msgid "_Location:"
 msgstr "Intaho:"
@@ -1950,7 +1967,8 @@ msgid "This file system does not support mounting"
 msgstr "IDOSIYE Sisitemu OYA Gushigikira"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "imiterere ya dosiye"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -2060,7 +2078,7 @@ msgstr "Agaciro"
 msgid "Error loading icon: %s"
 msgstr "Itangira... Agashushondanga"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, fuzzy, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -2071,7 +2089,7 @@ msgstr ""
 "OYA Gushaka Agashushondanga OYA Byabonetse Kuri Kwinjiza porogaramu Kubona a "
 "Gukoporora Bivuye"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, fuzzy, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "OYA in"
@@ -2180,7 +2198,7 @@ msgstr "(Itazwi>"
 msgid "clear"
 msgstr "bigaragara,kigaragara"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Hitamo Byose"
 
@@ -2777,52 +2795,52 @@ msgstr "Ihindurangano wongera"
 msgid "Zoom _Out"
 msgstr "Ihindurangano ugabanya"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 #, fuzzy
 msgid "LRM _Left-to-right mark"
 msgstr "Kuri Iburyo: Ikimenyetso"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 #, fuzzy
 msgid "RLM _Right-to-left mark"
 msgstr "Kuri Ibumoso: Ikimenyetso"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 #, fuzzy
 msgid "LRE Left-to-right _embedding"
 msgstr "Kuri Iburyo:"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 #, fuzzy
 msgid "RLE Right-to-left e_mbedding"
 msgstr "Kuri Ibumoso:"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 #, fuzzy
 msgid "LRO Left-to-right _override"
 msgstr "Kuri Iburyo:"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 #, fuzzy
 msgid "RLO Right-to-left o_verride"
 msgstr "Kuri Ibumoso:"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 #, fuzzy
 msgid "PDF _Pop directional formatting"
 msgstr "Ihinduramiterere"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 #, fuzzy
 msgid "ZWS _Zero width space"
 msgstr "Ubugari Umwanya"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 #, fuzzy
 msgid "ZWJ Zero width _joiner"
 msgstr "Ubugari"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 #, fuzzy
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "Ubugari"
@@ -2906,7 +2924,7 @@ msgstr ""
 msgid "X Input Method"
 msgstr ""
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, fuzzy, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "OYA Kubona Ibisobanuro kugirango IDOSIYE"
diff --git a/po/sk.po b/po/sk.po
index 441d806146..1b2e9e0067 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-13 07:04+0200\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-07-13 07:05+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -21,26 +21,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:153 ../gdk-pixbuf/gdk-pixbuf-io.c:838
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1089 ../tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Nepodarilo sa otvoriť súbor '%s': %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:166 ../gdk-pixbuf/gdk-pixbuf-io.c:850
+#: gdk-pixbuf/gdk-pixbuf-animation.c:166 gdk-pixbuf/gdk-pixbuf-io.c:850
 #, c-format
 msgid "Image file '%s' contains no data"
 msgstr "Súbor obrázku '%s' nič neobsahuje"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:208 ../gdk-pixbuf/gdk-pixbuf-io.c:887
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1130 ../tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 "Nepodarilo sa načítať obrázok '%s': príčina neznáma, asi poškodený súbor"
 
-#: ../gdk-pixbuf/gdk-pixbuf-animation.c:241
+#: gdk-pixbuf/gdk-pixbuf-animation.c:241
 #, c-format
 msgid ""
 "Failed to load animation '%s': reason not known, probably a corrupt "
@@ -48,12 +48,12 @@ msgid ""
 msgstr ""
 "Nepodarilo sa načítať animáciu '%s': príčina neznáma, asi poškodený súbor"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:444
+#: gdk-pixbuf/gdk-pixbuf-io.c:444
 #, c-format
 msgid "Unable to load image-loading module: %s: %s"
 msgstr "Nepodarilo sa načítať modul pre načítanie obrázkov: %s: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:459
+#: gdk-pixbuf/gdk-pixbuf-io.c:459
 #, c-format
 msgid ""
 "Image-loading module %s does not export the proper interface; perhaps it's "
@@ -62,53 +62,53 @@ msgstr ""
 "Modul pre načítanie obrázku %s neexportuje správne rozhranie, možno je z "
 "inej verzie GTK?"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:628 ../gdk-pixbuf/gdk-pixbuf-io.c:680
+#: gdk-pixbuf/gdk-pixbuf-io.c:628 gdk-pixbuf/gdk-pixbuf-io.c:680
 #, c-format
 msgid "Image type '%s' is not supported"
 msgstr "Typ obrázku '%s' nie je podporovaný"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:720
+#: gdk-pixbuf/gdk-pixbuf-io.c:720
 #, c-format
 msgid "Couldn't recognize the image file format for file '%s'"
 msgstr "Nepodarilo sa určiť formát súboru obrázku pre '%s'"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:728
+#: gdk-pixbuf/gdk-pixbuf-io.c:728
 msgid "Unrecognized image file format"
 msgstr "Nerozpoznaný formát súboru obrázku"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:896
+#: gdk-pixbuf/gdk-pixbuf-io.c:896
 #, c-format
 msgid "Failed to load image '%s': %s"
 msgstr "Nepodarilo sa načítať obrázok '%s': %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1357
+#: gdk-pixbuf/gdk-pixbuf-io.c:1357
 #, c-format
 msgid "Error writing to image file: %s"
 msgstr "Chyba pri zápise obrázku: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1403 ../gdk-pixbuf/gdk-pixbuf-io.c:1532
+#: gdk-pixbuf/gdk-pixbuf-io.c:1403 gdk-pixbuf/gdk-pixbuf-io.c:1532
 #, c-format
 msgid "This build of gdk-pixbuf does not support saving the image format: %s"
 msgstr "Táto verzia gdk-pixbuf nepodporuje ukladanie vo formáte: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1437
+#: gdk-pixbuf/gdk-pixbuf-io.c:1437
 msgid "Insufficient memory to save image to callback"
 msgstr "Nedostatok pamäti pre uloženie obrázku pre spätné volanie"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1449
+#: gdk-pixbuf/gdk-pixbuf-io.c:1449
 msgid "Failed to open temporary file"
 msgstr "Nepodarilo sa otvoriť dočasný súbor"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1474
+#: gdk-pixbuf/gdk-pixbuf-io.c:1474
 msgid "Failed to read from temporary file"
 msgstr "Nepodarilo sa prečítať dočasný súbor"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1708
+#: gdk-pixbuf/gdk-pixbuf-io.c:1708
 #, c-format
 msgid "Failed to open '%s' for writing: %s"
 msgstr "Nepodarilo sa otvoriť pre zápis '%s': %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1732
+#: gdk-pixbuf/gdk-pixbuf-io.c:1732
 #, c-format
 msgid ""
 "Failed to close '%s' while writing image, all data may not have been saved: %"
@@ -117,16 +117,16 @@ msgstr ""
 "Nepodarilo sa zavrieť '%s' počas zápisu obrázku. Niektoré dáta nemusia byť "
 "uložené: %s"
 
-#: ../gdk-pixbuf/gdk-pixbuf-io.c:1952 ../gdk-pixbuf/gdk-pixbuf-io.c:2002
+#: gdk-pixbuf/gdk-pixbuf-io.c:1952 gdk-pixbuf/gdk-pixbuf-io.c:2002
 msgid "Insufficient memory to save image into a buffer"
 msgstr "Nedostatok pamäti pre uloženie obrázku do dočasnej pamäti"
 
-#: ../gdk-pixbuf/gdk-pixbuf-loader.c:383
+#: gdk-pixbuf/gdk-pixbuf-loader.c:383
 #, c-format
 msgid "Incremental loading of image type '%s' is not supported"
 msgstr "Postupné načítavanie typu obrázku '%s' nie je podporované"
 
-#: ../gdk-pixbuf/gdk-pixbuf-loader.c:411 ../gdk-pixbuf/gdk-pixbuf-loader.c:513
+#: gdk-pixbuf/gdk-pixbuf-loader.c:411 gdk-pixbuf/gdk-pixbuf-loader.c:513
 #, c-format
 msgid ""
 "Internal error: Image loader module '%s' failed to begin loading an image, "
@@ -135,19 +135,19 @@ msgstr ""
 "Interná chyba: Modul pre načítavanie obrázku '%s' nezačal načítavať obrázok, "
 "ale pre toto zlyhanie nepodal žiadny dôvod"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:147
+#: gdk-pixbuf/gdk-pixdata.c:147
 msgid "Image header corrupt"
 msgstr "Hlavička obrázku poškodená"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:152
+#: gdk-pixbuf/gdk-pixdata.c:152
 msgid "Image format unknown"
 msgstr "Neznámy formát obrázku"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:157 ../gdk-pixbuf/gdk-pixdata.c:487
+#: gdk-pixbuf/gdk-pixdata.c:157 gdk-pixbuf/gdk-pixdata.c:487
 msgid "Image pixel data corrupt"
 msgstr "Dáta obrázku poškodené"
 
-#: ../gdk-pixbuf/gdk-pixdata.c:431
+#: gdk-pixbuf/gdk-pixdata.c:431
 #, c-format
 msgid "failed to allocate image buffer of %u byte"
 msgid_plural "failed to allocate image buffer of %u bytes"
@@ -155,117 +155,113 @@ msgstr[0] "nepodarilo sa alokovať pamäť pre obrázok s veľkosťou %u bajtov"
 msgstr[1] "nepodarilo sa alokovať pamäť pre obrázok s veľkosťou %u bajt"
 msgstr[2] "nepodarilo sa alokovať pamäť pre obrázok s veľkosťou %u bajty"
 
-#: ../gdk-pixbuf/io-ani.c:244
+#: gdk-pixbuf/io-ani.c:244
 msgid "Unexpected icon chunk in animation"
 msgstr "Neočakávaný kus ikony v animácii"
 
-#: ../gdk-pixbuf/io-ani.c:337
+#: gdk-pixbuf/io-ani.c:337
 msgid "Unsupported animation type"
 msgstr "Nepodporovaný typ animácie"
 
-#: ../gdk-pixbuf/io-ani.c:348 ../gdk-pixbuf/io-ani.c:538
+#: gdk-pixbuf/io-ani.c:348 gdk-pixbuf/io-ani.c:538
 msgid "Invalid header in animation"
 msgstr "Neplatná hlavička v animácii"
 
-#: ../gdk-pixbuf/io-ani.c:358 ../gdk-pixbuf/io-ani.c:382
-#: ../gdk-pixbuf/io-ani.c:441 ../gdk-pixbuf/io-ani.c:460
-#: ../gdk-pixbuf/io-ani.c:511 ../gdk-pixbuf/io-ani.c:583
+#: gdk-pixbuf/io-ani.c:358 gdk-pixbuf/io-ani.c:382 gdk-pixbuf/io-ani.c:441
+#: gdk-pixbuf/io-ani.c:460 gdk-pixbuf/io-ani.c:511 gdk-pixbuf/io-ani.c:583
 msgid "Not enough memory to load animation"
 msgstr "Nedostatok pamäti pre načítanie animácie"
 
-#: ../gdk-pixbuf/io-ani.c:400 ../gdk-pixbuf/io-ani.c:417
-#: ../gdk-pixbuf/io-ani.c:428
+#: gdk-pixbuf/io-ani.c:400 gdk-pixbuf/io-ani.c:417 gdk-pixbuf/io-ani.c:428
 msgid "Malformed chunk in animation"
 msgstr "Neplatný kus v animácii"
 
-#: ../gdk-pixbuf/io-ani.c:676
+#: gdk-pixbuf/io-ani.c:676
 msgid "The ANI image format"
 msgstr "Formát obrázkov ANI"
 
-#: ../gdk-pixbuf/io-bmp.c:228 ../gdk-pixbuf/io-bmp.c:306
-#: ../gdk-pixbuf/io-bmp.c:338 ../gdk-pixbuf/io-bmp.c:361
-#: ../gdk-pixbuf/io-bmp.c:442
+#: gdk-pixbuf/io-bmp.c:228 gdk-pixbuf/io-bmp.c:306 gdk-pixbuf/io-bmp.c:338
+#: gdk-pixbuf/io-bmp.c:361 gdk-pixbuf/io-bmp.c:442
 msgid "BMP image has bogus header data"
 msgstr "Obrázok BMP má neplatné dáta v hlavičke"
 
-#: ../gdk-pixbuf/io-bmp.c:239 ../gdk-pixbuf/io-bmp.c:401
+#: gdk-pixbuf/io-bmp.c:239 gdk-pixbuf/io-bmp.c:401
 msgid "Not enough memory to load bitmap image"
 msgstr "Nedostatok pamäti pre načítanie obrázku"
 
-#: ../gdk-pixbuf/io-bmp.c:287
+#: gdk-pixbuf/io-bmp.c:287
 msgid "BMP image has unsupported header size"
 msgstr "Obrázok BMP má nepodporovanú veľkosť hlavičky"
 
-#: ../gdk-pixbuf/io-bmp.c:325
+#: gdk-pixbuf/io-bmp.c:325
 msgid "Topdown BMP images cannot be compressed"
 msgstr "BMP obrázky zhora dole nemôžu byť komprimované"
 
-#: ../gdk-pixbuf/io-bmp.c:1203
+#: gdk-pixbuf/io-bmp.c:1203
 msgid "Couldn't allocate memory for saving BMP file"
 msgstr "Nepodarilo sa alokovať pamäť pre uloženie súboru BMP"
 
-#: ../gdk-pixbuf/io-bmp.c:1244
+#: gdk-pixbuf/io-bmp.c:1244
 msgid "Couldn't write to BMP file"
 msgstr "Nepodarilo sa zapísať súbor BMP"
 
-#: ../gdk-pixbuf/io-bmp.c:1293
+#: gdk-pixbuf/io-bmp.c:1293
 msgid "The BMP image format"
 msgstr "Formát obrázkov BMP"
 
-#: ../gdk-pixbuf/io-gif.c:220
+#: gdk-pixbuf/io-gif.c:220
 #, c-format
 msgid "Failure reading GIF: %s"
 msgstr "Chyba pri čítaní GIF: %s"
 
-#: ../gdk-pixbuf/io-gif.c:492 ../gdk-pixbuf/io-gif.c:1463
-#: ../gdk-pixbuf/io-gif.c:1624
+#: gdk-pixbuf/io-gif.c:492 gdk-pixbuf/io-gif.c:1463 gdk-pixbuf/io-gif.c:1624
 msgid "GIF file was missing some data (perhaps it was truncated somehow?)"
 msgstr "Súbor GIF neobsahuje niektoré dáta (možno bola jeho časť odrezaná)"
 
-#: ../gdk-pixbuf/io-gif.c:501
+#: gdk-pixbuf/io-gif.c:501
 #, c-format
 msgid "Internal error in the GIF loader (%s)"
 msgstr "Interná chyba modulu pre GIF (%s)"
 
-#: ../gdk-pixbuf/io-gif.c:575
+#: gdk-pixbuf/io-gif.c:575
 msgid "Stack overflow"
 msgstr "Pretečenie zásobníka"
 
-#: ../gdk-pixbuf/io-gif.c:635
+#: gdk-pixbuf/io-gif.c:635
 msgid "GIF image loader cannot understand this image."
 msgstr "Modul načítavania obrázkov GIF nerozpoznal tento obrázok."
 
-#: ../gdk-pixbuf/io-gif.c:664
+#: gdk-pixbuf/io-gif.c:664
 msgid "Bad code encountered"
 msgstr "Nájdený chybný kód"
 
-#: ../gdk-pixbuf/io-gif.c:674
+#: gdk-pixbuf/io-gif.c:674
 msgid "Circular table entry in GIF file"
 msgstr "Cyklická položka v tabuľke v súbore GIF"
 
-#: ../gdk-pixbuf/io-gif.c:862 ../gdk-pixbuf/io-gif.c:1451
-#: ../gdk-pixbuf/io-gif.c:1497 ../gdk-pixbuf/io-gif.c:1612
+#: gdk-pixbuf/io-gif.c:862 gdk-pixbuf/io-gif.c:1451 gdk-pixbuf/io-gif.c:1497
+#: gdk-pixbuf/io-gif.c:1612
 msgid "Not enough memory to load GIF file"
 msgstr "Nedostatok pamäti pre načítanie obrázku GIF"
 
-#: ../gdk-pixbuf/io-gif.c:947
+#: gdk-pixbuf/io-gif.c:947
 msgid "Not enough memory to composite a frame in GIF file"
 msgstr "Nedostatok pamäti pre zloženie rámca súboru GIF"
 
-#: ../gdk-pixbuf/io-gif.c:1116
+#: gdk-pixbuf/io-gif.c:1116
 msgid "GIF image is corrupt (incorrect LZW compression)"
 msgstr "Obrázok GIF je poškodený (neplatná kompresia LZW)"
 
-#: ../gdk-pixbuf/io-gif.c:1166
+#: gdk-pixbuf/io-gif.c:1166
 msgid "File does not appear to be a GIF file"
 msgstr "Súbor nevyzerá ako GIF"
 
-#: ../gdk-pixbuf/io-gif.c:1178
+#: gdk-pixbuf/io-gif.c:1178
 #, c-format
 msgid "Version %s of the GIF file format is not supported"
 msgstr "Verzia %s formátu GIF nie je podporovaná"
 
-#: ../gdk-pixbuf/io-gif.c:1287
+#: gdk-pixbuf/io-gif.c:1287
 msgid ""
 "GIF image has no global colormap, and a frame inside it has no local "
 "colormap."
@@ -273,67 +269,66 @@ msgstr ""
 "Obrázok GIF neobsahuje globálnu farebnú mapu a rámec v ňom neobsahuje mapu "
 "lokálnu."
 
-#: ../gdk-pixbuf/io-gif.c:1519
+#: gdk-pixbuf/io-gif.c:1519
 msgid "GIF image was truncated or incomplete."
 msgstr "Obrázok GIF bol skrátený alebo nie je úplný."
 
-#: ../gdk-pixbuf/io-gif.c:1671
+#: gdk-pixbuf/io-gif.c:1671
 msgid "The GIF image format"
 msgstr "Formát obrázkov GIF"
 
-#: ../gdk-pixbuf/io-ico.c:219 ../gdk-pixbuf/io-ico.c:271
-#: ../gdk-pixbuf/io-ico.c:340 ../gdk-pixbuf/io-ico.c:403
-#: ../gdk-pixbuf/io-ico.c:433
+#: gdk-pixbuf/io-ico.c:219 gdk-pixbuf/io-ico.c:271 gdk-pixbuf/io-ico.c:340
+#: gdk-pixbuf/io-ico.c:403 gdk-pixbuf/io-ico.c:433
 msgid "Not enough memory to load icon"
 msgstr "Nedostatok pamäti pre načítanie ikony"
 
-#: ../gdk-pixbuf/io-ico.c:256 ../gdk-pixbuf/io-ico.c:330
+#: gdk-pixbuf/io-ico.c:256 gdk-pixbuf/io-ico.c:330
 msgid "Invalid header in icon"
 msgstr "Neplatná hlavička ikony"
 
-#: ../gdk-pixbuf/io-ico.c:293
+#: gdk-pixbuf/io-ico.c:293
 msgid "Icon has zero width"
 msgstr "Ikona má nulovú šírku"
 
-#: ../gdk-pixbuf/io-ico.c:303
+#: gdk-pixbuf/io-ico.c:303
 msgid "Icon has zero height"
 msgstr "Ikona má nulovú výšku"
 
-#: ../gdk-pixbuf/io-ico.c:355
+#: gdk-pixbuf/io-ico.c:355
 msgid "Compressed icons are not supported"
 msgstr "Komprimované ikony nie sú podporované"
 
-#: ../gdk-pixbuf/io-ico.c:388
+#: gdk-pixbuf/io-ico.c:388
 msgid "Unsupported icon type"
 msgstr "Nepodporovaný typ ikony"
 
-#: ../gdk-pixbuf/io-ico.c:482
+#: gdk-pixbuf/io-ico.c:482
 msgid "Not enough memory to load ICO file"
 msgstr "Nedostatok pamäti pre načítanie súboru ICO"
 
-#: ../gdk-pixbuf/io-ico.c:947
+#: gdk-pixbuf/io-ico.c:947
 msgid "Image too large to be saved as ICO"
 msgstr "Obrázok príliš veľký na formát ICO"
 
-#: ../gdk-pixbuf/io-ico.c:958
+#: gdk-pixbuf/io-ico.c:958
 msgid "Cursor hotspot outside image"
 msgstr "Aktívny bod kurzoru mimo obrázok"
 
-#: ../gdk-pixbuf/io-ico.c:981
+#: gdk-pixbuf/io-ico.c:981
 #, c-format
 msgid "Unsupported depth for ICO file: %d"
 msgstr "Nepodporovaná farebná hĺbka pre súbor ICO: %d"
 
-#: ../gdk-pixbuf/io-ico.c:1210
+#: gdk-pixbuf/io-ico.c:1210
 msgid "The ICO image format"
 msgstr "Formát obrázkov ICO"
 
-#: ../gdk-pixbuf/io-jpeg.c:114
+#: gdk-pixbuf/io-jpeg.c:114
 #, c-format
 msgid "Error interpreting JPEG image file (%s)"
 msgstr "Chyba pri interpretácii obrázku JPEG (%s)"
 
-#: ../gdk-pixbuf/io-jpeg.c:349
+#: gdk-pixbuf/io-jpeg.c:349
 msgid ""
 "Insufficient memory to load image, try exiting some applications to free "
 "memory"
@@ -341,17 +336,17 @@ msgstr ""
 "Nedostatočná pamäť pre načítanie obrázku, skúste ukončiť niektoré aplikácie "
 "a tým uvoľniť pamäť"
 
-#: ../gdk-pixbuf/io-jpeg.c:383 ../gdk-pixbuf/io-jpeg.c:749
+#: gdk-pixbuf/io-jpeg.c:383 gdk-pixbuf/io-jpeg.c:749
 #, c-format
 msgid "Unsupported JPEG color space (%s)"
 msgstr "Nepodporovaný priestor farieb JPEG (%s)"
 
-#: ../gdk-pixbuf/io-jpeg.c:481 ../gdk-pixbuf/io-jpeg.c:678
-#: ../gdk-pixbuf/io-jpeg.c:943 ../gdk-pixbuf/io-jpeg.c:952
+#: gdk-pixbuf/io-jpeg.c:481 gdk-pixbuf/io-jpeg.c:678 gdk-pixbuf/io-jpeg.c:943
+#: gdk-pixbuf/io-jpeg.c:952
 msgid "Couldn't allocate memory for loading JPEG file"
 msgstr "Nepodarilo sa alokovať pamäť pre načítanie súboru JPEG"
 
-#: ../gdk-pixbuf/io-jpeg.c:894
+#: gdk-pixbuf/io-jpeg.c:894
 #, c-format
 msgid ""
 "JPEG quality must be a value between 0 and 100; value '%s' could not be "
@@ -359,92 +354,92 @@ msgid ""
 msgstr ""
 "Kvalita JPEG musí byť medzi 0 a 100, hodnotu '%s' nie je možné spracovať."
 
-#: ../gdk-pixbuf/io-jpeg.c:909
+#: gdk-pixbuf/io-jpeg.c:909
 #, c-format
 msgid ""
 "JPEG quality must be a value between 0 and 100; value '%d' is not allowed."
 msgstr "Kvalita JPEG musí byť medzi 0 a 100, hodnota '%d' nie je povolená."
 
-#: ../gdk-pixbuf/io-jpeg.c:1071
+#: gdk-pixbuf/io-jpeg.c:1071
 msgid "The JPEG image format"
 msgstr "Formát obrázkov JPEG"
 
-#: ../gdk-pixbuf/io-pcx.c:191
+#: gdk-pixbuf/io-pcx.c:191
 msgid "Couldn't allocate memory for header"
 msgstr "Nepodarilo sa alokovať pamäť pre hlavičku"
 
-#: ../gdk-pixbuf/io-pcx.c:206 ../gdk-pixbuf/io-pcx.c:566
+#: gdk-pixbuf/io-pcx.c:206 gdk-pixbuf/io-pcx.c:566
 msgid "Couldn't allocate memory for context buffer"
 msgstr "Nepodarilo sa alokovať pamäť pre dočasnú pamäť obsahu"
 
-#: ../gdk-pixbuf/io-pcx.c:607
+#: gdk-pixbuf/io-pcx.c:607
 msgid "Image has invalid width and/or height"
 msgstr "Obrázok má neplatnú šírku alebo výšku"
 
-#: ../gdk-pixbuf/io-pcx.c:619 ../gdk-pixbuf/io-pcx.c:680
+#: gdk-pixbuf/io-pcx.c:619 gdk-pixbuf/io-pcx.c:680
 msgid "Image has unsupported bpp"
 msgstr "Obrázok má nepodporovanú farebnú hĺbku"
 
-#: ../gdk-pixbuf/io-pcx.c:624 ../gdk-pixbuf/io-pcx.c:632
+#: gdk-pixbuf/io-pcx.c:624 gdk-pixbuf/io-pcx.c:632
 #, c-format
 msgid "Image has unsupported number of %d-bit planes"
 msgstr "Obrázok má nepodporovaný počet %d-bitových vrstiev"
 
-#: ../gdk-pixbuf/io-pcx.c:648
+#: gdk-pixbuf/io-pcx.c:648
 msgid "Couldn't create new pixbuf"
 msgstr "Nepodarilo sa vytvoriť nový obrázok"
 
-#: ../gdk-pixbuf/io-pcx.c:656
+#: gdk-pixbuf/io-pcx.c:656
 msgid "Couldn't allocate memory for line data"
 msgstr "Nepodarilo sa alokovať pamäť pre dáta riadku"
 
-#: ../gdk-pixbuf/io-pcx.c:663
+#: gdk-pixbuf/io-pcx.c:663
 msgid "Couldn't allocate memory for paletted data"
 msgstr "Nepodarilo sa alokovať pamäť pre dáta palety"
 
-#: ../gdk-pixbuf/io-pcx.c:710
+#: gdk-pixbuf/io-pcx.c:710
 msgid "Didn't get all lines of PCX image"
 msgstr "Nezískané všetky riadky obrázku PCX"
 
-#: ../gdk-pixbuf/io-pcx.c:717
+#: gdk-pixbuf/io-pcx.c:717
 msgid "No palette found at end of PCX data"
 msgstr "Na konci dát PCX nenájdená paleta"
 
-#: ../gdk-pixbuf/io-pcx.c:758
+#: gdk-pixbuf/io-pcx.c:758
 msgid "The PCX image format"
 msgstr "Formát obrázkov PCX"
 
-#: ../gdk-pixbuf/io-png.c:55
+#: gdk-pixbuf/io-png.c:55
 msgid "Bits per channel of PNG image is invalid."
 msgstr "Počet bitov kanálu obrázku PNG nie je platný."
 
-#: ../gdk-pixbuf/io-png.c:136
+#: gdk-pixbuf/io-png.c:136
 msgid "Transformed PNG has zero width or height."
 msgstr "Transformovaný PNG má nulovú výšku alebo šírku."
 
-#: ../gdk-pixbuf/io-png.c:144
+#: gdk-pixbuf/io-png.c:144
 msgid "Bits per channel of transformed PNG is not 8."
 msgstr "Počet bitov kanálu transformovaného PNG nie je 8."
 
-#: ../gdk-pixbuf/io-png.c:153
+#: gdk-pixbuf/io-png.c:153
 msgid "Transformed PNG not RGB or RGBA."
 msgstr "Transformovaný PNG nie je RGB alebo RGBA."
 
-#: ../gdk-pixbuf/io-png.c:162
+#: gdk-pixbuf/io-png.c:162
 msgid "Transformed PNG has unsupported number of channels, must be 3 or 4."
 msgstr ""
 "Transformovaný PNG má nepodporovaný počet kanálov, musí to byť 3 alebo 4."
 
-#: ../gdk-pixbuf/io-png.c:183
+#: gdk-pixbuf/io-png.c:183
 #, c-format
 msgid "Fatal error in PNG image file: %s"
 msgstr "Fatálna chyba v súbore PNG: %s"
 
-#: ../gdk-pixbuf/io-png.c:301
+#: gdk-pixbuf/io-png.c:301
 msgid "Insufficient memory to load PNG file"
 msgstr "Nedostatok pamäti pre načítanie súboru PNG"
 
-#: ../gdk-pixbuf/io-png.c:618
+#: gdk-pixbuf/io-png.c:618
 #, c-format
 msgid ""
 "Insufficient memory to store a %ld by %ld image; try exiting some "
@@ -453,25 +448,25 @@ msgstr ""
 "Nedostatok pamäti pre uloženie obrázku %ld krát %ld, skúste ukončiť niektoré "
 "aplikácie a tým uvoľniť pamäť"
 
-#: ../gdk-pixbuf/io-png.c:669
+#: gdk-pixbuf/io-png.c:669
 msgid "Fatal error reading PNG image file"
 msgstr "Fatálna chyba pri čítaní súboru PNG"
 
-#: ../gdk-pixbuf/io-png.c:718
+#: gdk-pixbuf/io-png.c:718
 #, c-format
 msgid "Fatal error reading PNG image file: %s"
 msgstr "Fatálna chyba pri čítaní súboru PNG: %s"
 
-#: ../gdk-pixbuf/io-png.c:810
+#: gdk-pixbuf/io-png.c:810
 msgid ""
 "Keys for PNG text chunks must have at least 1 and at most 79 characters."
 msgstr "Kľúče pre kusy PNG textu musia mať aspoň 1 znak a maximálne 79 znakov."
 
-#: ../gdk-pixbuf/io-png.c:818
+#: gdk-pixbuf/io-png.c:818
 msgid "Keys for PNG text chunks must be ASCII characters."
 msgstr "Kľúče pre kusy PNG textu musia byť znaky ASCII."
 
-#: ../gdk-pixbuf/io-png.c:831
+#: gdk-pixbuf/io-png.c:831
 #, c-format
 msgid ""
 "PNG compression level must be a value between 0 and 9; value '%s' could not "
@@ -480,7 +475,7 @@ msgstr ""
 "Úroveň kompresie PNG musí byť hodnota medzi 0 a 9; hodnotu '%s' sa "
 "nepodarilo analyzovať."
 
-#: ../gdk-pixbuf/io-png.c:843
+#: gdk-pixbuf/io-png.c:843
 #, c-format
 msgid ""
 "PNG compression level must be a value between 0 and 9; value '%d' is not "
@@ -489,330 +484,327 @@ msgstr ""
 "Úroveä kompresie PNG musí byť hodnota medzi 0 a 9; hodnota '%d' nie je "
 "povolená."
 
-#: ../gdk-pixbuf/io-png.c:883
+#: gdk-pixbuf/io-png.c:883
 #, c-format
 msgid "Value for PNG text chunk %s cannot be converted to ISO-8859-1 encoding."
 msgstr ""
 "Hodnotu pre kus PNG textu %s nie je možné previesť do kódovania ISO-8859-1."
 
-#: ../gdk-pixbuf/io-png.c:1026
+#: gdk-pixbuf/io-png.c:1026
 msgid "The PNG image format"
 msgstr "Formát obrázkov PNG"
 
-#: ../gdk-pixbuf/io-pnm.c:252
+#: gdk-pixbuf/io-pnm.c:252
 msgid "PNM loader expected to find an integer, but didn't"
 msgstr "Modul pre načítanie PNM očakával celé číslo, ale nenašiel ho"
 
-#: ../gdk-pixbuf/io-pnm.c:284
+#: gdk-pixbuf/io-pnm.c:284
 msgid "PNM file has an incorrect initial byte"
 msgstr "Súbor PNM obsahuje nesprávny počiatočný bajt"
 
-#: ../gdk-pixbuf/io-pnm.c:314
+#: gdk-pixbuf/io-pnm.c:314
 msgid "PNM file is not in a recognized PNM subformat"
 msgstr "Súbor PNM nie je rozpoznaný pod-formát PNM"
 
-#: ../gdk-pixbuf/io-pnm.c:339
+#: gdk-pixbuf/io-pnm.c:339
 msgid "PNM file has an image width of 0"
 msgstr "Súbor PNM obsahuje obrázok so šírkou 0"
 
-#: ../gdk-pixbuf/io-pnm.c:360
+#: gdk-pixbuf/io-pnm.c:360
 msgid "PNM file has an image height of 0"
 msgstr "Súbor PNM obsahuje obrázok s výškou 0"
 
-#: ../gdk-pixbuf/io-pnm.c:383
+#: gdk-pixbuf/io-pnm.c:383
 msgid "Maximum color value in PNM file is 0"
 msgstr "Maximálna hodnota farby v súbore PNM je 0"
 
-#: ../gdk-pixbuf/io-pnm.c:391
+#: gdk-pixbuf/io-pnm.c:391
 msgid "Maximum color value in PNM file is too large"
 msgstr "Maximálna hodnota farby v súbore PNM je príliš veľká"
 
-#: ../gdk-pixbuf/io-pnm.c:399
+#: gdk-pixbuf/io-pnm.c:399
 msgid "Cannot handle PNM files with maximum color values greater than 255"
 msgstr ""
 "Nie je možné spracovať súbory PNM s maximálnymi hodnotami farby väčšími ako "
 "255"
 
-#: ../gdk-pixbuf/io-pnm.c:438 ../gdk-pixbuf/io-pnm.c:466
-#: ../gdk-pixbuf/io-pnm.c:498
+#: gdk-pixbuf/io-pnm.c:438 gdk-pixbuf/io-pnm.c:466 gdk-pixbuf/io-pnm.c:498
 msgid "Raw PNM image type is invalid"
 msgstr "Typ obrázku PNM 'raw' nie je platný"
 
-#: ../gdk-pixbuf/io-pnm.c:562 ../gdk-pixbuf/io-pnm.c:604
+#: gdk-pixbuf/io-pnm.c:562 gdk-pixbuf/io-pnm.c:604
 msgid "PNM image format is invalid"
 msgstr "Formát obrázku PNM nie je platný"
 
-#: ../gdk-pixbuf/io-pnm.c:663
+#: gdk-pixbuf/io-pnm.c:663
 msgid "PNM image loader does not support this PNM subformat"
 msgstr "Modul pre načítanie PNM nepodporuje tento pod-formát PNM"
 
-#: ../gdk-pixbuf/io-pnm.c:718
+#: gdk-pixbuf/io-pnm.c:718
 msgid "Premature end-of-file encountered"
 msgstr "Nájdený predčasný koniec súboru"
 
-#: ../gdk-pixbuf/io-pnm.c:750 ../gdk-pixbuf/io-pnm.c:981
+#: gdk-pixbuf/io-pnm.c:750 gdk-pixbuf/io-pnm.c:981
 msgid "Raw PNM formats require exactly one whitespace before sample data"
 msgstr ""
 "Čisté formáty PNM vyžadujú presne jednu medzeru pred náhľadovými dátami"
 
-#: ../gdk-pixbuf/io-pnm.c:777
+#: gdk-pixbuf/io-pnm.c:777
 msgid "Cannot allocate memory for loading PNM image"
 msgstr "Nepodarilo sa alokovať pamäť pre načítanie obrázku PNM"
 
-#: ../gdk-pixbuf/io-pnm.c:827
+#: gdk-pixbuf/io-pnm.c:827
 msgid "Insufficient memory to load PNM context struct"
 msgstr "Nedostatok pamäti pre načítanie štruktúry kontextu pre PNM"
 
-#: ../gdk-pixbuf/io-pnm.c:878
+#: gdk-pixbuf/io-pnm.c:878
 msgid "Unexpected end of PNM image data"
 msgstr "Neočakávaný koniec dát obrázku PNM"
 
-#: ../gdk-pixbuf/io-pnm.c:1010
+#: gdk-pixbuf/io-pnm.c:1010
 msgid "Insufficient memory to load PNM file"
 msgstr "Nedostatok pamäti pre načítanie súboru PNM"
 
-#: ../gdk-pixbuf/io-pnm.c:1089
+#: gdk-pixbuf/io-pnm.c:1089
 msgid "The PNM/PBM/PGM/PPM image format family"
 msgstr "Rodina formátov obrázkov PNM/PBM/PGM/PPM"
 
-#: ../gdk-pixbuf/io-ras.c:126
+#: gdk-pixbuf/io-ras.c:126
 msgid "RAS image has bogus header data"
 msgstr "Obrázok RAS má neplatné dáta v hlavičke"
 
-#: ../gdk-pixbuf/io-ras.c:148
+#: gdk-pixbuf/io-ras.c:148
 msgid "RAS image has unknown type"
 msgstr "Neznámy typ obrázku RAS"
 
-#: ../gdk-pixbuf/io-ras.c:156
+#: gdk-pixbuf/io-ras.c:156
 msgid "unsupported RAS image variation"
 msgstr "Nepodporovaný variant obrázku RAS"
 
-#: ../gdk-pixbuf/io-ras.c:171 ../gdk-pixbuf/io-ras.c:200
+#: gdk-pixbuf/io-ras.c:171 gdk-pixbuf/io-ras.c:200
 msgid "Not enough memory to load RAS image"
 msgstr "Nedostatok pamäti pre načítanie obrázku RAS"
 
-#: ../gdk-pixbuf/io-ras.c:543
+#: gdk-pixbuf/io-ras.c:543
 msgid "The Sun raster image format"
 msgstr "Formát rastrových obrázkov Sun"
 
-#: ../gdk-pixbuf/io-tga.c:154
+#: gdk-pixbuf/io-tga.c:154
 msgid "Cannot allocate memory for IOBuffer struct"
 msgstr "Nepodarilo sa alokovať pamäť pre štruktúru IOBuffer"
 
-#: ../gdk-pixbuf/io-tga.c:173
+#: gdk-pixbuf/io-tga.c:173
 msgid "Cannot allocate memory for IOBuffer data"
 msgstr "Nepodarilo sa alokovať pamäť pre dáta IOBuffer"
 
-#: ../gdk-pixbuf/io-tga.c:184
+#: gdk-pixbuf/io-tga.c:184
 msgid "Cannot realloc IOBuffer data"
 msgstr "Nepodarilo sa zmeniť alokáciu pre dáta IOBuffer"
 
-#: ../gdk-pixbuf/io-tga.c:214
+#: gdk-pixbuf/io-tga.c:214
 msgid "Cannot allocate temporary IOBuffer data"
 msgstr "Nepodarilo sa alokovať dočasné dáta IOBuffer"
 
-#: ../gdk-pixbuf/io-tga.c:348
+#: gdk-pixbuf/io-tga.c:348
 msgid "Cannot allocate new pixbuf"
 msgstr "Nepodarilo sa alokovať nový pixbuf"
 
-#: ../gdk-pixbuf/io-tga.c:689
+#: gdk-pixbuf/io-tga.c:689
 msgid "Cannot allocate colormap structure"
 msgstr "Nepodarilo sa alokovať štruktúru pre farebnú mapu"
 
-#: ../gdk-pixbuf/io-tga.c:696
+#: gdk-pixbuf/io-tga.c:696
 msgid "Cannot allocate colormap entries"
 msgstr "Nepodarilo sa alokovať položky farebnej mapy"
 
-#: ../gdk-pixbuf/io-tga.c:718
+#: gdk-pixbuf/io-tga.c:718
 msgid "Unexpected bitdepth for colormap entries"
 msgstr "Neočakávaná farebná hĺbka v položkách farebnej mapy"
 
-#: ../gdk-pixbuf/io-tga.c:736
+#: gdk-pixbuf/io-tga.c:736
 msgid "Cannot allocate TGA header memory"
 msgstr "Nepodarilo sa alokovať pamäť pre hlavičku TGA"
 
-#: ../gdk-pixbuf/io-tga.c:769
+#: gdk-pixbuf/io-tga.c:769
 msgid "TGA image has invalid dimensions"
 msgstr "Obrázok TGA má neplatné rozmery"
 
-#: ../gdk-pixbuf/io-tga.c:775 ../gdk-pixbuf/io-tga.c:784
-#: ../gdk-pixbuf/io-tga.c:794 ../gdk-pixbuf/io-tga.c:804
-#: ../gdk-pixbuf/io-tga.c:811
+#: gdk-pixbuf/io-tga.c:775 gdk-pixbuf/io-tga.c:784 gdk-pixbuf/io-tga.c:794
+#: gdk-pixbuf/io-tga.c:804 gdk-pixbuf/io-tga.c:811
 msgid "TGA image type not supported"
 msgstr "Typ obrázku TGA nie je podporovaný"
 
-#: ../gdk-pixbuf/io-tga.c:858
+#: gdk-pixbuf/io-tga.c:858
 msgid "Cannot allocate memory for TGA context struct"
 msgstr "Nepodarilo sa alokovať pamäť pre kontextovú štruktúru TGA"
 
-#: ../gdk-pixbuf/io-tga.c:923
+#: gdk-pixbuf/io-tga.c:923
 msgid "Excess data in file"
 msgstr "Dáta naviac v súbore"
 
-#: ../gdk-pixbuf/io-tga.c:992
+#: gdk-pixbuf/io-tga.c:992
 msgid "The Targa image format"
 msgstr "Formát obrázkov Targa"
 
-#: ../gdk-pixbuf/io-tiff.c:173
+#: gdk-pixbuf/io-tiff.c:173
 msgid "Could not get image width (bad TIFF file)"
 msgstr "Nepodarilo sa získať šírku obrázku (neplatný súbor TIFF)"
 
-#: ../gdk-pixbuf/io-tiff.c:180
+#: gdk-pixbuf/io-tiff.c:180
 msgid "Could not get image height (bad TIFF file)"
 msgstr "Nepodarilo sa získať výšku obrázku (neplatný súbor TIFF)"
 
-#: ../gdk-pixbuf/io-tiff.c:188
+#: gdk-pixbuf/io-tiff.c:188
 msgid "Width or height of TIFF image is zero"
 msgstr "Výška alebo šírka obrázku TIFF je 0"
 
-#: ../gdk-pixbuf/io-tiff.c:197 ../gdk-pixbuf/io-tiff.c:206
+#: gdk-pixbuf/io-tiff.c:197 gdk-pixbuf/io-tiff.c:206
 msgid "Dimensions of TIFF image too large"
 msgstr "Rozmery obrázku TIFF príliš veľké"
 
-#: ../gdk-pixbuf/io-tiff.c:225 ../gdk-pixbuf/io-tiff.c:237
-#: ../gdk-pixbuf/io-tiff.c:286 ../gdk-pixbuf/io-tiff.c:572
+#: gdk-pixbuf/io-tiff.c:225 gdk-pixbuf/io-tiff.c:237 gdk-pixbuf/io-tiff.c:286
+#: gdk-pixbuf/io-tiff.c:572
 msgid "Insufficient memory to open TIFF file"
 msgstr "Nedostatok pamäti pre otvorenie súboru TIFF"
 
-#: ../gdk-pixbuf/io-tiff.c:251 ../gdk-pixbuf/io-tiff.c:294
+#: gdk-pixbuf/io-tiff.c:251 gdk-pixbuf/io-tiff.c:294
 msgid "Failed to load RGB data from TIFF file"
 msgstr "Nepodarilo sa načítať dáta RGB zo súboru TIFF"
 
-#: ../gdk-pixbuf/io-tiff.c:361
+#: gdk-pixbuf/io-tiff.c:361
 msgid "Failed to open TIFF image"
 msgstr "Nepodarilo sa otvoriť obrázok TIFF"
 
-#: ../gdk-pixbuf/io-tiff.c:373
+#: gdk-pixbuf/io-tiff.c:373
 msgid "TIFFClose operation failed"
 msgstr "Operácia TIFFClose zlyhala"
 
-#: ../gdk-pixbuf/io-tiff.c:504 ../gdk-pixbuf/io-tiff.c:517
+#: gdk-pixbuf/io-tiff.c:504 gdk-pixbuf/io-tiff.c:517
 msgid "Failed to load TIFF image"
 msgstr "Nepodarilo sa načítať obrázok TIFF"
 
-#: ../gdk-pixbuf/io-tiff.c:610
+#: gdk-pixbuf/io-tiff.c:610
 msgid "The TIFF image format"
 msgstr "Formát obrázkov TIFF"
 
-#: ../gdk-pixbuf/io-wbmp.c:246
+#: gdk-pixbuf/io-wbmp.c:246
 msgid "Image has zero width"
 msgstr "Obrázok má nulovú šírku"
 
-#: ../gdk-pixbuf/io-wbmp.c:264
+#: gdk-pixbuf/io-wbmp.c:264
 msgid "Image has zero height"
 msgstr "Obrázok má nulovú výšku"
 
-#: ../gdk-pixbuf/io-wbmp.c:275
+#: gdk-pixbuf/io-wbmp.c:275
 msgid "Not enough memory to load image"
 msgstr "Nedostatok pamäti pre načítanie obrázku"
 
-#: ../gdk-pixbuf/io-wbmp.c:334
+#: gdk-pixbuf/io-wbmp.c:334
 msgid "Couldn't save the rest"
 msgstr "Nepodarilo sa uložiť zvyšok"
 
-#: ../gdk-pixbuf/io-wbmp.c:368
+#: gdk-pixbuf/io-wbmp.c:368
 msgid "The WBMP image format"
 msgstr "Formát obrázkov WBMP"
 
-#: ../gdk-pixbuf/io-xbm.c:287
+#: gdk-pixbuf/io-xbm.c:287
 msgid "Invalid XBM file"
 msgstr "Neplatný súbor XBM"
 
-#: ../gdk-pixbuf/io-xbm.c:297
+#: gdk-pixbuf/io-xbm.c:297
 msgid "Insufficient memory to load XBM image file"
 msgstr "Nedostatok pamäti pre načítanie súboru obrázku XBM"
 
-#: ../gdk-pixbuf/io-xbm.c:441
+#: gdk-pixbuf/io-xbm.c:441
 msgid "Failed to write to temporary file when loading XBM image"
 msgstr "Nepodarilo sa zapísať dočasný súbor pri načítavaní obrázku XBM"
 
-#: ../gdk-pixbuf/io-xbm.c:476
+#: gdk-pixbuf/io-xbm.c:476
 msgid "The XBM image format"
 msgstr "Formát obrázkov XBM"
 
-#: ../gdk-pixbuf/io-xpm.c:467
+#: gdk-pixbuf/io-xpm.c:467
 msgid "No XPM header found"
 msgstr "Hlavička XPM nenájdená"
 
-#: ../gdk-pixbuf/io-xpm.c:476
+#: gdk-pixbuf/io-xpm.c:476
 msgid "Invalid XPM header"
 msgstr "Neplatná hlavička XPM"
 
-#: ../gdk-pixbuf/io-xpm.c:484
+#: gdk-pixbuf/io-xpm.c:484
 msgid "XPM file has image width <= 0"
 msgstr "Súbor XPM obsahuje obrázok so šírkou <=0"
 
-#: ../gdk-pixbuf/io-xpm.c:492
+#: gdk-pixbuf/io-xpm.c:492
 msgid "XPM file has image height <= 0"
 msgstr "Súbor XPM obsahuje obrázok s výškou <=0"
 
-#: ../gdk-pixbuf/io-xpm.c:500
+#: gdk-pixbuf/io-xpm.c:500
 msgid "XPM has invalid number of chars per pixel"
 msgstr "XPM obsahuje neplatný počet znakov na bod"
 
-#: ../gdk-pixbuf/io-xpm.c:507
+#: gdk-pixbuf/io-xpm.c:507
 msgid "XPM file has invalid number of colors"
 msgstr "Súbor XPM má neplatný počet farieb"
 
-#: ../gdk-pixbuf/io-xpm.c:519 ../gdk-pixbuf/io-xpm.c:528
-#: ../gdk-pixbuf/io-xpm.c:580
+#: gdk-pixbuf/io-xpm.c:519 gdk-pixbuf/io-xpm.c:528 gdk-pixbuf/io-xpm.c:580
 msgid "Cannot allocate memory for loading XPM image"
 msgstr "Nepodarilo sa alokovať pamäť pre načítanie obrázku XPM"
 
-#: ../gdk-pixbuf/io-xpm.c:542
+#: gdk-pixbuf/io-xpm.c:542
 msgid "Cannot read XPM colormap"
 msgstr "Nepodarilo sa načítať farebnú mapu XPM"
 
-#: ../gdk-pixbuf/io-xpm.c:771
+#: gdk-pixbuf/io-xpm.c:771
 msgid "Failed to write to temporary file when loading XPM image"
 msgstr "Nepodarilo sa zapísať dočasný súbor pri načítavaní obrázku XPM"
 
-#: ../gdk-pixbuf/io-xpm.c:806
+#: gdk-pixbuf/io-xpm.c:806
 msgid "The XPM image format"
 msgstr "Formát obrázkov XPM"
 
 #. Description of --class=CLASS in --help output
-#: ../gdk/gdk.c:115
+#: gdk/gdk.c:115
 msgid "Program class as used by the window manager"
 msgstr "Trieda programu, ako je použitá správcom okien"
 
 #. Placeholder in --class=CLASS in --help output
-#: ../gdk/gdk.c:116
+#: gdk/gdk.c:116
 msgid "CLASS"
 msgstr "TRIEDA"
 
 #. Description of --name=NAME in --help output
-#: ../gdk/gdk.c:118
+#: gdk/gdk.c:118
 msgid "Program name as used by the window manager"
 msgstr "Nízov programu, ako je použitý správcom okien"
 
 #. Placeholder in --name=NAME in --help output
-#: ../gdk/gdk.c:119
+#: gdk/gdk.c:119
 msgid "NAME"
 msgstr "NÁZOV"
 
 #. Description of --display=DISPLAY in --help output
-#: ../gdk/gdk.c:121
+#: gdk/gdk.c:121
 msgid "X display to use"
 msgstr "X displej, ktorý použiť"
 
 #. Placeholder in --display=DISPLAY in --help output
-#: ../gdk/gdk.c:122
+#: gdk/gdk.c:122
 msgid "DISPLAY"
 msgstr "DISPLEJ"
 
 #. Description of --screen=SCREEN in --help output
-#: ../gdk/gdk.c:124
+#: gdk/gdk.c:124
 msgid "X screen to use"
 msgstr "X obrazovka, ktorú použiť"
 
 #. Placeholder in --screen=SCREEN in --help output
-#: ../gdk/gdk.c:125
+#: gdk/gdk.c:125
 msgid "SCREEN"
 msgstr "OBRAZOVKA"
 
 #. Description of --gdk-debug=FLAGS in --help output
-#: ../gdk/gdk.c:128
+#: gdk/gdk.c:128
 msgid "Gdk debugging flags to set"
 msgstr "Ladiace príznaky Gdk, ktoré nastaviť"
 
@@ -820,222 +812,222 @@ msgstr "Ladiace príznaky Gdk, ktoré nastaviť"
 #. Placeholder in --gdk-no-debug=FLAGS in --help output
 #. Placeholder in --gtk-debug=FLAGS in --help output
 #. Placeholder in --gtk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:129 ../gdk/gdk.c:132 ../gtk/gtkmain.c:405 ../gtk/gtkmain.c:408
+#: gdk/gdk.c:129 gdk/gdk.c:132 gtk/gtkmain.c:405 gtk/gtkmain.c:408
 msgid "FLAGS"
 msgstr "PÍZNAKY"
 
 #. Description of --gdk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:131
+#: gdk/gdk.c:131
 msgid "Gdk debugging flags to unset"
 msgstr "Ladiace príznaky Gdk, ktoré vypnúť"
 
-#: ../gdk/keyname-table.h:3940
+#: gdk/keyname-table.h:3940
 msgid "keyboard label|BackSpace"
 msgstr "keyboard label|BackSpace"
 
-#: ../gdk/keyname-table.h:3941
+#: gdk/keyname-table.h:3941
 msgid "keyboard label|Tab"
 msgstr "keyboard label|Tab"
 
-#: ../gdk/keyname-table.h:3942
+#: gdk/keyname-table.h:3942
 msgid "keyboard label|Return"
 msgstr "keyboard label|Enter"
 
-#: ../gdk/keyname-table.h:3943
+#: gdk/keyname-table.h:3943
 msgid "keyboard label|Pause"
 msgstr "keyboard label|Pause"
 
-#: ../gdk/keyname-table.h:3944
+#: gdk/keyname-table.h:3944
 msgid "keyboard label|Scroll_Lock"
 msgstr "keyboard label|Scroll_Lock"
 
-#: ../gdk/keyname-table.h:3945
+#: gdk/keyname-table.h:3945
 msgid "keyboard label|Sys_Req"
 msgstr "keyboard label|Sys_Req"
 
-#: ../gdk/keyname-table.h:3946
+#: gdk/keyname-table.h:3946
 msgid "keyboard label|Escape"
 msgstr "keyboard label|Esc"
 
-#: ../gdk/keyname-table.h:3947
+#: gdk/keyname-table.h:3947
 msgid "keyboard label|Multi_key"
 msgstr "keyboard label|Alt"
 
-#: ../gdk/keyname-table.h:3948
+#: gdk/keyname-table.h:3948
 msgid "keyboard label|Home"
 msgstr "keyboard label|Home"
 
-#: ../gdk/keyname-table.h:3949
+#: gdk/keyname-table.h:3949
 msgid "keyboard label|Page_Up"
 msgstr "keyboard label|Page_Up"
 
-#: ../gdk/keyname-table.h:3950
+#: gdk/keyname-table.h:3950
 msgid "keyboard label|Page_Down"
 msgstr "keyboard label|Page_Down"
 
-#: ../gdk/keyname-table.h:3951
+#: gdk/keyname-table.h:3951
 msgid "keyboard label|End"
 msgstr "keyboard label|End"
 
-#: ../gdk/keyname-table.h:3952
+#: gdk/keyname-table.h:3952
 msgid "keyboard label|Begin"
 msgstr "keyboard label|Begin"
 
-#: ../gdk/keyname-table.h:3953
+#: gdk/keyname-table.h:3953
 msgid "keyboard label|Print"
 msgstr "keyboard label|Print"
 
-#: ../gdk/keyname-table.h:3954
+#: gdk/keyname-table.h:3954
 msgid "keyboard label|Insert"
 msgstr "keyboard label|Insert"
 
-#: ../gdk/keyname-table.h:3955
+#: gdk/keyname-table.h:3955
 msgid "keyboard label|Num_Lock"
 msgstr "keyboard label|Num_Lock"
 
-#: ../gdk/keyname-table.h:3956
+#: gdk/keyname-table.h:3956
 msgid "keyboard label|KP_Space"
 msgstr "keyboard label|KP_Medzera"
 
-#: ../gdk/keyname-table.h:3957
+#: gdk/keyname-table.h:3957
 msgid "keyboard label|KP_Tab"
 msgstr "keyboard label|KP_Tab"
 
-#: ../gdk/keyname-table.h:3958
+#: gdk/keyname-table.h:3958
 msgid "keyboard label|KP_Enter"
 msgstr "keyboard label|KP_Enter"
 
-#: ../gdk/keyname-table.h:3959
+#: gdk/keyname-table.h:3959
 msgid "keyboard label|KP_Home"
 msgstr "keyboard label|KP_Home"
 
-#: ../gdk/keyname-table.h:3960
+#: gdk/keyname-table.h:3960
 msgid "keyboard label|KP_Left"
 msgstr "keyboard label|KP_Left"
 
-#: ../gdk/keyname-table.h:3961
+#: gdk/keyname-table.h:3961
 msgid "keyboard label|KP_Up"
 msgstr "keyboard label|KP_Up"
 
-#: ../gdk/keyname-table.h:3962
+#: gdk/keyname-table.h:3962
 msgid "keyboard label|KP_Right"
 msgstr "keyboard label|KP_Right"
 
-#: ../gdk/keyname-table.h:3963
+#: gdk/keyname-table.h:3963
 msgid "keyboard label|KP_Down"
 msgstr "keyboard label|KP_Down"
 
-#: ../gdk/keyname-table.h:3964
+#: gdk/keyname-table.h:3964
 msgid "keyboard label|KP_Page_Up"
 msgstr "keyboard label|KP_Page_Up"
 
-#: ../gdk/keyname-table.h:3965
+#: gdk/keyname-table.h:3965
 msgid "keyboard label|KP_Prior"
 msgstr "keyboard label|KP_Prior"
 
-#: ../gdk/keyname-table.h:3966
+#: gdk/keyname-table.h:3966
 msgid "keyboard label|KP_Page_Down"
 msgstr "keyboard label|KP_Page_Down"
 
-#: ../gdk/keyname-table.h:3967
+#: gdk/keyname-table.h:3967
 msgid "keyboard label|KP_Next"
 msgstr "keyboard label|KP_Next"
 
-#: ../gdk/keyname-table.h:3968
+#: gdk/keyname-table.h:3968
 msgid "keyboard label|KP_End"
 msgstr "keyboard label|KP_End"
 
-#: ../gdk/keyname-table.h:3969
+#: gdk/keyname-table.h:3969
 msgid "keyboard label|KP_Begin"
 msgstr "keyboard label|KP_Begin"
 
-#: ../gdk/keyname-table.h:3970
+#: gdk/keyname-table.h:3970
 msgid "keyboard label|KP_Insert"
 msgstr "keyboard label|KP_Insert"
 
-#: ../gdk/keyname-table.h:3971
+#: gdk/keyname-table.h:3971
 msgid "keyboard label|KP_Delete"
 msgstr "keyboard label|KP_Delete"
 
-#: ../gdk/keyname-table.h:3972
+#: gdk/keyname-table.h:3972
 msgid "keyboard label|Delete"
 msgstr "keyboard label|Delete"
 
 #. Description of --sync in --help output
-#: ../gdk/win32/gdkmain-win32.c:60
+#: gdk/win32/gdkmain-win32.c:60
 msgid "Don't batch GDI requests"
 msgstr "Nedávkovať GDI požiadavky"
 
 #. Description of --no-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:62
+#: gdk/win32/gdkmain-win32.c:62
 msgid "Don't use the Wintab API for tablet support"
 msgstr "Nepoužiť Wintab API pre podporu tabletu"
 
 #. Description of --ignore-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:64
+#: gdk/win32/gdkmain-win32.c:64
 msgid "Same as --no-wintab"
 msgstr "Také isté ako --no-wintab"
 
 #. Description of --use-wintab in --help output
-#: ../gdk/win32/gdkmain-win32.c:66
+#: gdk/win32/gdkmain-win32.c:66
 msgid "Do use the Wintab API [default]"
 msgstr "Nepoužívať API Wintab [štandardné]"
 
 #. Description of --max-colors=COLORS in --help output
-#: ../gdk/win32/gdkmain-win32.c:68
+#: gdk/win32/gdkmain-win32.c:68
 msgid "Size of the palette in 8 bit mode"
 msgstr "Veľkosť palety v režime 8 bitov"
 
 #. Placeholder in --max-colors=COLORS in --help output
-#: ../gdk/win32/gdkmain-win32.c:69
+#: gdk/win32/gdkmain-win32.c:69
 msgid "COLORS"
 msgstr "FARBY"
 
 #. Description of --sync in --help output
-#: ../gdk/x11/gdkmain-x11.c:92
+#: gdk/x11/gdkmain-x11.c:92
 msgid "Make X calls synchronous"
 msgstr "Spraviť volania X synchrónnymi"
 
-#: ../gtk/gtkaboutdialog.c:273 ../gtk/gtkaboutdialog.c:2103
+#: gtk/gtkaboutdialog.c:273 gtk/gtkaboutdialog.c:2103
 msgid "License"
 msgstr "Licencia"
 
-#: ../gtk/gtkaboutdialog.c:274
+#: gtk/gtkaboutdialog.c:274
 msgid "The license of the program"
 msgstr "Licencia programu"
 
 #. Add the credits button
-#: ../gtk/gtkaboutdialog.c:509
+#: gtk/gtkaboutdialog.c:509
 msgid "C_redits"
 msgstr "_Poďakovanie"
 
 #. Add the license button
-#: ../gtk/gtkaboutdialog.c:519
+#: gtk/gtkaboutdialog.c:519
 msgid "_License"
 msgstr "_Licencia"
 
-#: ../gtk/gtkaboutdialog.c:756
+#: gtk/gtkaboutdialog.c:756
 #, c-format
 msgid "About %s"
 msgstr "O programe %s"
 
-#: ../gtk/gtkaboutdialog.c:2031
+#: gtk/gtkaboutdialog.c:2031
 msgid "Credits"
 msgstr "Poďakovanie"
 
-#: ../gtk/gtkaboutdialog.c:2057
+#: gtk/gtkaboutdialog.c:2057
 msgid "Written by"
 msgstr "Napísal"
 
-#: ../gtk/gtkaboutdialog.c:2060
+#: gtk/gtkaboutdialog.c:2060
 msgid "Documented by"
 msgstr "Zdokumentoval"
 
-#: ../gtk/gtkaboutdialog.c:2072
+#: gtk/gtkaboutdialog.c:2072
 msgid "Translated by"
 msgstr "Preložil"
 
-#: ../gtk/gtkaboutdialog.c:2076
+#: gtk/gtkaboutdialog.c:2076
 msgid "Artwork by"
 msgstr "Grafika od"
 
@@ -1045,7 +1037,7 @@ msgstr "Grafika od"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:121
+#: gtk/gtkaccellabel.c:121
 msgid "keyboard label|Shift"
 msgstr "keyboard label|Shift"
 
@@ -1055,7 +1047,7 @@ msgstr "keyboard label|Shift"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:128
+#: gtk/gtkaccellabel.c:128
 msgid "keyboard label|Ctrl"
 msgstr "keyboard label|Ctrl"
 
@@ -1065,17 +1057,17 @@ msgstr "keyboard label|Ctrl"
 #. * this.
 #. * And do not translate the part before the |.
 #.
-#: ../gtk/gtkaccellabel.c:135
+#: gtk/gtkaccellabel.c:135
 msgid "keyboard label|Alt"
 msgstr "keyboard label|Alt"
 
 #. do not translate the part before the |
-#: ../gtk/gtkaccellabel.c:577
+#: gtk/gtkaccellabel.c:577
 msgid "keyboard label|Space"
 msgstr "keyboard label|Medzera"
 
 #. do not translate the part before the |
-#: ../gtk/gtkaccellabel.c:581
+#: gtk/gtkaccellabel.c:581
 msgid "keyboard label|Backslash"
 msgstr "keyboard label|Backslash"
 
@@ -1088,7 +1080,7 @@ msgstr "keyboard label|Backslash"
 #. * so if you have a default text direction of RTL and YM, then
 #. * the year will appear on the right.
 #.
-#: ../gtk/gtkcalendar.c:647
+#: gtk/gtkcalendar.c:647
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
@@ -1096,7 +1088,7 @@ msgstr "calendar:MY"
 #. * first day of the week to calendar:week_start:1 if you want Monday
 #. * to be the first day of the week, and so on.
 #.
-#: ../gtk/gtkcalendar.c:661
+#: gtk/gtkcalendar.c:661
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:1"
 
@@ -1108,7 +1100,7 @@ msgstr "calendar:week_start:1"
 #. *
 #. * If you don't understand this, leave it as "2000"
 #.
-#: ../gtk/gtkcalendar.c:1549
+#: gtk/gtkcalendar.c:1549
 msgid "year measurement template|2000"
 msgstr "2000"
 
@@ -1123,25 +1115,25 @@ msgstr "2000"
 #. * Don't include the prefix "calendar year format|" in the
 #. * translation. "%Y" is appropriate for most locales.
 #.
-#: ../gtk/gtkcalendar.c:1826
+#: gtk/gtkcalendar.c:1826
 msgid "calendar year format|%Y"
 msgstr "%Y"
 
 #. do not translate the part before the |
-#: ../gtk/gtkcellrendererprogress.c:237 ../gtk/gtkcellrendererprogress.c:295
+#: gtk/gtkcellrendererprogress.c:237 gtk/gtkcellrendererprogress.c:295
 #, c-format
 msgid "progress bar label|%d %%"
 msgstr "progress bar label|%d %%"
 
-#: ../gtk/gtkcolorbutton.c:221 ../gtk/gtkcolorbutton.c:576
+#: gtk/gtkcolorbutton.c:221 gtk/gtkcolorbutton.c:576
 msgid "Pick a Color"
 msgstr "Vyberte farbu"
 
-#: ../gtk/gtkcolorbutton.c:467
+#: gtk/gtkcolorbutton.c:467
 msgid "Received invalid color data\n"
 msgstr "Prijaté neplatné dáta o farbe.\n"
 
-#: ../gtk/gtkcolorsel.c:565
+#: gtk/gtkcolorsel.c:565
 msgid ""
 "The previously-selected color, for comparison to the color you're selecting "
 "now. You can drag this color to a palette entry, or select this color as "
@@ -1151,7 +1143,7 @@ msgstr ""
 "ťahať do palety alebo na miesto aktuálnej farby a tak túto farbu vybrať ako "
 "aktuálnu."
 
-#: ../gtk/gtkcolorsel.c:570
+#: gtk/gtkcolorsel.c:570
 msgid ""
 "The color you've chosen. You can drag this color to a palette entry to save "
 "it for use in the future."
@@ -1159,11 +1151,11 @@ msgstr ""
 "Vybraná farba. Túto farbu môžete ťahať do palety a tím ju uložiť pre budúce "
 "použitie."
 
-#: ../gtk/gtkcolorsel.c:961
+#: gtk/gtkcolorsel.c:961
 msgid "_Save color here"
 msgstr "_Sem uložiť farbu"
 
-#: ../gtk/gtkcolorsel.c:1166
+#: gtk/gtkcolorsel.c:1166
 msgid ""
 "Click this palette entry to make it the current color. To change this entry, "
 "drag a color swatch here or right-click it and select \"Save color here.\""
@@ -1172,7 +1164,7 @@ msgstr ""
 "zmenili, pretiahnite na jej miesto vybranú farbu, alebo kliknite pravým "
 "tlačidlom myši a vyberte \"Sem uložiť farbu\"."
 
-#: ../gtk/gtkcolorsel.c:1953
+#: gtk/gtkcolorsel.c:1953
 msgid ""
 "Select the color you want from the outer ring. Select the darkness or "
 "lightness of that color using the inner triangle."
@@ -1180,7 +1172,7 @@ msgstr ""
 "Vyberte farbu z vonkajšieho kruhu. Tmavosť farby vyberte pomocou vnútorného "
 "trojuholníka."
 
-#: ../gtk/gtkcolorsel.c:1978
+#: gtk/gtkcolorsel.c:1978
 msgid ""
 "Click the eyedropper, then click a color anywhere on your screen to select "
 "that color."
@@ -1188,67 +1180,67 @@ msgstr ""
 "Stlačte kvapátko a potom kliknite na farbu kdekoľvek na obrazovke a tak "
 "vyberte farbu."
 
-#: ../gtk/gtkcolorsel.c:1987
+#: gtk/gtkcolorsel.c:1987
 msgid "_Hue:"
 msgstr "_Odtieň:"
 
-#: ../gtk/gtkcolorsel.c:1988
+#: gtk/gtkcolorsel.c:1988
 msgid "Position on the color wheel."
 msgstr "Pozícia na farebnom kotúči."
 
-#: ../gtk/gtkcolorsel.c:1990
+#: gtk/gtkcolorsel.c:1990
 msgid "_Saturation:"
 msgstr "_Sýtosť:"
 
-#: ../gtk/gtkcolorsel.c:1991
+#: gtk/gtkcolorsel.c:1991
 msgid "\"Deepness\" of the color."
 msgstr "\"Hĺbka\" farby."
 
-#: ../gtk/gtkcolorsel.c:1992
+#: gtk/gtkcolorsel.c:1992
 msgid "_Value:"
 msgstr "_Hodnota:"
 
-#: ../gtk/gtkcolorsel.c:1993
+#: gtk/gtkcolorsel.c:1993
 msgid "Brightness of the color."
 msgstr "Jas farby."
 
-#: ../gtk/gtkcolorsel.c:1994
+#: gtk/gtkcolorsel.c:1994
 msgid "_Red:"
 msgstr "Če_rvená:"
 
-#: ../gtk/gtkcolorsel.c:1995
+#: gtk/gtkcolorsel.c:1995
 msgid "Amount of red light in the color."
 msgstr "Množstvo červeného svetla vo farbe."
 
-#: ../gtk/gtkcolorsel.c:1996
+#: gtk/gtkcolorsel.c:1996
 msgid "_Green:"
 msgstr "_Zelená:"
 
-#: ../gtk/gtkcolorsel.c:1997
+#: gtk/gtkcolorsel.c:1997
 msgid "Amount of green light in the color."
 msgstr "Množstvo zeleného svetla vo farbe."
 
-#: ../gtk/gtkcolorsel.c:1998
+#: gtk/gtkcolorsel.c:1998
 msgid "_Blue:"
 msgstr "_Modrá:"
 
-#: ../gtk/gtkcolorsel.c:1999
+#: gtk/gtkcolorsel.c:1999
 msgid "Amount of blue light in the color."
 msgstr "Množstvo modrého svetla vo farbe."
 
-#: ../gtk/gtkcolorsel.c:2002
+#: gtk/gtkcolorsel.c:2002
 msgid "_Opacity:"
 msgstr "_Nepriehľadnosť:"
 
-#: ../gtk/gtkcolorsel.c:2010 ../gtk/gtkcolorsel.c:2021
+#: gtk/gtkcolorsel.c:2010 gtk/gtkcolorsel.c:2021
 msgid "Transparency of the color."
 msgstr "Priehľadnosť farby."
 
-#: ../gtk/gtkcolorsel.c:2028
+#: gtk/gtkcolorsel.c:2028
 msgid "Color _Name:"
 msgstr "_Meno farby: "
 
-#: ../gtk/gtkcolorsel.c:2043
+#: gtk/gtkcolorsel.c:2043
 msgid ""
 "You can enter an HTML-style hexadecimal color value, or simply a color name "
 "such as 'orange' in this entry."
@@ -1256,75 +1248,75 @@ msgstr ""
 "Môžete zadať hexadecimálnu hodnotu farby v štýle HTML alebo jednoducho meno "
 "farby, napríklad 'orange'."
 
-#: ../gtk/gtkcolorsel.c:2062
+#: gtk/gtkcolorsel.c:2062
 msgid "_Palette"
 msgstr "_Paleta"
 
-#: ../gtk/gtkcolorsel.c:2094
+#: gtk/gtkcolorsel.c:2094
 msgid "Color Wheel"
 msgstr "Farebné koleso"
 
-#: ../gtk/gtkcolorseldialog.c:123
+#: gtk/gtkcolorseldialog.c:123
 msgid "Color Selection"
 msgstr "Výber farby"
 
-#: ../gtk/gtkentry.c:4552 ../gtk/gtktextview.c:7125
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Vybrať _všetko"
 
-#: ../gtk/gtkentry.c:4562 ../gtk/gtktextview.c:7135
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Metódy vstupu"
 
-#: ../gtk/gtkentry.c:4573 ../gtk/gtktextview.c:7146
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Vložiť ovládací znak Unicode"
 
-#: ../gtk/gtkfilechooser.c:1588 ../gtk/gtkfilechooser.c:1632
-#: ../gtk/gtkfilechooser.c:1707 ../gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Neplatné meno súboru: %s"
 
-#: ../gtk/gtkfilechooserbutton.c:67
+#: gtk/gtkfilechooserbutton.c:67
 msgid "Select A File"
 msgstr "Vybrať súbor"
 
-#: ../gtk/gtkfilechooserbutton.c:68 ../gtk/gtkfilechooserdefault.c:1316
-#: ../gtk/gtkpathbar.c:1020
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
+#: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Domovský priečinok"
 
-#: ../gtk/gtkfilechooserbutton.c:69 ../gtk/gtkfilechooserdefault.c:1343
-#: ../gtk/gtkpathbar.c:1022
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
+#: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Plocha"
 
-#: ../gtk/gtkfilechooserbutton.c:70
+#: gtk/gtkfilechooserbutton.c:70
 msgid "(None)"
 msgstr "(žiadny)"
 
-#: ../gtk/gtkfilechooserbutton.c:1523
+#: gtk/gtkfilechooserbutton.c:1523
 msgid "Other..."
 msgstr "Iný..."
 
-#: ../gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Nepodarilo sa získať informácie o súbore"
 
-#: ../gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Nepodarilo sa pridať záložku"
 
-#: ../gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Nepodarilo sa odstrániť záložku"
 
-#: ../gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Priečinok nemohol byť vytvorený"
 
-#: ../gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1333,157 +1325,173 @@ msgstr ""
 "existuje. Skúste použiť iný názov pre priečinok, alebo najskôr premenovať "
 "súbor."
 
-#: ../gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Neplatné meno súboru"
 
-#: ../gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Obsah priečinka nemohol byť zobrazený"
 
-#: ../gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Nepodarilo sa získať informácie o '%s': %s"
 
-#: ../gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Pridať priečinok '%s' do záložiek"
 
-#: ../gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Pridať aktuálny priečinok do záložiek"
 
-#: ../gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Pridať zvolené priečinky do záložiek"
 
-#: ../gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Odstrániť záložku '%s'"
 
-#: ../gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Nepodarilo sa pridať záložku pre '%s', pretože je to neplatné meno cesty."
 
-#: ../gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Odstrániť"
 
-#: ../gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Premenovať..."
 
-#: ../gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Skratky"
 
-#: ../gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Priečinok"
 
-#: ../gtk/gtkfilechooserdefault.c:3193 ../gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Pridať"
 
-#: ../gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Pridať zvolený priečinok do Záložiek"
 
-#: ../gtk/gtkfilechooserdefault.c:3205 ../gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Odstrániť"
 
-#: ../gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Odstrániť zvolnú záložku"
 
-#: ../gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 msgid "Could not select file"
 msgstr "Nepodarilo sa vybrať súbor"
 
-#: ../gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "Nepodarilo sa vybrať súbor '%s', pretože je to neplatné meno cesty."
 
-#: ../gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "_Pridať do Záložiek"
 
-#: ../gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Otvoriť _umiestnenie"
 
-#: ../gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Zobraziť _skryté súbory"
 
-#: ../gtk/gtkfilechooserdefault.c:3586 ../gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Súbory"
 
-#: ../gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Meno"
 
-#: ../gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Veľkosť"
 
-#: ../gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Zmenený"
 
-#: ../gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Vybrať, ktoré typy súborov sú zobrazené"
 
 #. Create Folder
-#: ../gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Vytvoriť _priečinok"
 
 #. Name entry
-#: ../gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Meno:"
 
-#: ../gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Prechádzať ostatné priečinky"
 
-#: ../gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Uložiť do _priečinka:"
 
-#: ../gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Vytvoriť v _priečinku:"
 
-#: ../gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Nepodarilo sa zmeniť priečinok, pretože nie je lokálny"
 
-#: ../gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Skratka %s neexistuje"
 
-#: ../gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "Pre_menovať"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Nepodarilo sa pripojiť %s"
 
-#: ../gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Zadajte meno nového priečinku"
 
-#: ../gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
@@ -1491,80 +1499,80 @@ msgstr[0] "%d bajtov"
 msgstr[1] "%d bajt"
 msgstr[2] "%d bajty"
 
-#: ../gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: ../gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: ../gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: ../gtk/gtkfilechooserdefault.c:6604 ../gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Neznáme"
 
-#: ../gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Dnes"
 
-#: ../gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Včera"
 
-#: ../gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Nepodarilo sa zmeniť priečinok"
 
-#: ../gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Priečinok, ktorý ste zadali má neplatnú cestu."
 
-#: ../gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Nepodarilo sa vytvoriť meno súboru z '%s' a '%s'"
 
-#: ../gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Nepodarilo sa vybrať položku"
 
-#: ../gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Otvoriť umiestnenie"
 
-#: ../gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Uložiť na umiestnenie"
 
-#: ../gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Umiestnenie:"
 
-#: ../gtk/gtkfilesel.c:727
+#: gtk/gtkfilesel.c:727
 msgid "Folders"
 msgstr "Priečinky"
 
-#: ../gtk/gtkfilesel.c:731
+#: gtk/gtkfilesel.c:731
 msgid "Fol_ders"
 msgstr "_Priečinky"
 
-#: ../gtk/gtkfilesel.c:767
+#: gtk/gtkfilesel.c:767
 msgid "_Files"
 msgstr "_Súbory"
 
-#: ../gtk/gtkfilesel.c:855 ../gtk/gtkfilesel.c:2242
+#: gtk/gtkfilesel.c:855 gtk/gtkfilesel.c:2242
 #, c-format
 msgid "Folder unreadable: %s"
 msgstr "Nečitateľný priečinok: %s"
 
-#: ../gtk/gtkfilesel.c:984
+#: gtk/gtkfilesel.c:984
 #, c-format
 msgid ""
 "The file \"%s\" resides on another machine (called %s) and may not be "
@@ -1575,25 +1583,25 @@ msgstr ""
 "pre tento program.\n"
 "Naozaj ho chcete vybrať?"
 
-#: ../gtk/gtkfilesel.c:1114
+#: gtk/gtkfilesel.c:1114
 msgid "_New Folder"
 msgstr "_Nový priečinok"
 
-#: ../gtk/gtkfilesel.c:1125
+#: gtk/gtkfilesel.c:1125
 msgid "De_lete File"
 msgstr "_Odstrániť súbor"
 
-#: ../gtk/gtkfilesel.c:1136
+#: gtk/gtkfilesel.c:1136
 msgid "_Rename File"
 msgstr "Pre_menovať súbor"
 
-#: ../gtk/gtkfilesel.c:1438
+#: gtk/gtkfilesel.c:1438
 #, c-format
 msgid ""
 "The folder name \"%s\" contains symbols that are not allowed in filenames"
 msgstr "Meno priečinku \"%s\" obsahuje znaky, ktoré nie sú povolené."
 
-#: ../gtk/gtkfilesel.c:1440
+#: gtk/gtkfilesel.c:1440
 #, c-format
 msgid ""
 "Error creating folder \"%s\": %s\n"
@@ -1602,34 +1610,34 @@ msgstr ""
 "Chyba pri vytváraní priečinku \"%s\": %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1441 ../gtk/gtkfilesel.c:1677
+#: gtk/gtkfilesel.c:1441 gtk/gtkfilesel.c:1677
 msgid "You probably used symbols not allowed in filenames."
 msgstr "Asi ste použili znaky, ktoré nie je možné použiť v menách súborov."
 
-#: ../gtk/gtkfilesel.c:1449
+#: gtk/gtkfilesel.c:1449
 #, c-format
 msgid "Error creating folder \"%s\": %s\n"
 msgstr "Chyba pri vytváraní priečinku \"%s\": %s\n"
 
-#: ../gtk/gtkfilesel.c:1483
+#: gtk/gtkfilesel.c:1483
 msgid "New Folder"
 msgstr "Nový priečinok"
 
-#: ../gtk/gtkfilesel.c:1498
+#: gtk/gtkfilesel.c:1498
 msgid "_Folder name:"
 msgstr "_Meno priečinku:"
 
-#: ../gtk/gtkfilesel.c:1522
+#: gtk/gtkfilesel.c:1522
 msgid "C_reate"
 msgstr "_Vytvoriť"
 
-#: ../gtk/gtkfilesel.c:1565
+#: gtk/gtkfilesel.c:1565
 #, c-format
 msgid "The filename \"%s\" contains symbols that are not allowed in filenames"
 msgstr ""
 "Meno súboru \"%s\" obsahuje znaky, ktoré v mene súboru nie sú povolené."
 
-#: ../gtk/gtkfilesel.c:1568
+#: gtk/gtkfilesel.c:1568
 #, c-format
 msgid ""
 "Error deleting file \"%s\": %s\n"
@@ -1638,31 +1646,31 @@ msgstr ""
 "Chyba pri odstraňovaní súboru \"%s\": %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1570 ../gtk/gtkfilesel.c:1691
+#: gtk/gtkfilesel.c:1570 gtk/gtkfilesel.c:1691
 msgid "It probably contains symbols not allowed in filenames."
 msgstr "Asi obsahuje znaky, ktoré nie sú povolené v menách súborov."
 
-#: ../gtk/gtkfilesel.c:1579
+#: gtk/gtkfilesel.c:1579
 #, c-format
 msgid "Error deleting file \"%s\": %s"
 msgstr "Chyba pri odstraňovaní súboru \"%s\": %s"
 
-#: ../gtk/gtkfilesel.c:1622
+#: gtk/gtkfilesel.c:1622
 #, c-format
 msgid "Really delete file \"%s\"?"
 msgstr "Naozaj odstrániť súbor \"%s\"?"
 
-#: ../gtk/gtkfilesel.c:1627
+#: gtk/gtkfilesel.c:1627
 msgid "Delete File"
 msgstr "Zmazať súbor"
 
-#: ../gtk/gtkfilesel.c:1673 ../gtk/gtkfilesel.c:1687
+#: gtk/gtkfilesel.c:1673 gtk/gtkfilesel.c:1687
 #, c-format
 msgid "The file name \"%s\" contains symbols that are not allowed in filenames"
 msgstr ""
 "Meno súboru \"%s\" obsahuje znaky, ktoré v mene súboru nie sú povolené."
 
-#: ../gtk/gtkfilesel.c:1675
+#: gtk/gtkfilesel.c:1675
 #, c-format
 msgid ""
 "Error renaming file to \"%s\": %s\n"
@@ -1671,7 +1679,7 @@ msgstr ""
 "Chyba pri premenovaní súboru \"%s\": %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1689
+#: gtk/gtkfilesel.c:1689
 #, c-format
 msgid ""
 "Error renaming file \"%s\": %s\n"
@@ -1680,29 +1688,29 @@ msgstr ""
 "Chyba pri premenovaní súboru \"%s\": %s\n"
 "%s"
 
-#: ../gtk/gtkfilesel.c:1699
+#: gtk/gtkfilesel.c:1699
 #, c-format
 msgid "Error renaming file \"%s\" to \"%s\": %s"
 msgstr "Chyba pri premenovaní súboru \"%s\" na \"%s\": %s"
 
-#: ../gtk/gtkfilesel.c:1746
+#: gtk/gtkfilesel.c:1746
 msgid "Rename File"
 msgstr "Premenovať súbor"
 
-#: ../gtk/gtkfilesel.c:1761
+#: gtk/gtkfilesel.c:1761
 #, c-format
 msgid "Rename file \"%s\" to:"
 msgstr "Premenovať súbor \"%s\" na:"
 
-#: ../gtk/gtkfilesel.c:1790
+#: gtk/gtkfilesel.c:1790
 msgid "_Rename"
 msgstr "Pre_menovať"
 
-#: ../gtk/gtkfilesel.c:2222
+#: gtk/gtkfilesel.c:2222
 msgid "_Selection: "
 msgstr "_Výber: "
 
-#: ../gtk/gtkfilesel.c:3147
+#: gtk/gtkfilesel.c:3147
 #, c-format
 msgid ""
 "The filename \"%s\" couldn't be converted to UTF-8. (try setting the "
@@ -1711,48 +1719,48 @@ msgstr ""
 "Meno súboru \"%s\" nie je možné previesť do UTF-8. (Skúste nastaviť premennú "
 "prostredia G_BROKEN_FILENAMES): %s"
 
-#: ../gtk/gtkfilesel.c:3150
+#: gtk/gtkfilesel.c:3150
 msgid "Invalid UTF-8"
 msgstr "Neplatné UTF-8"
 
-#: ../gtk/gtkfilesel.c:4027
+#: gtk/gtkfilesel.c:4027
 msgid "Name too long"
 msgstr "Meno príliš dlhé"
 
-#: ../gtk/gtkfilesel.c:4029
+#: gtk/gtkfilesel.c:4029
 msgid "Couldn't convert filename"
 msgstr "Nie je možné previesť meno súboru"
 
-#: ../gtk/gtkfilesystemmodel.c:1267
+#: gtk/gtkfilesystemmodel.c:1267
 msgid "(Empty)"
 msgstr "(Prázdne)"
 
-#: ../gtk/gtkfilesystemunix.c:476 ../gtk/gtkfilesystemunix.c:682
-#: ../gtk/gtkfilesystemunix.c:1858 ../gtk/gtkfilesystemwin32.c:482
-#: ../gtk/gtkfilesystemwin32.c:495 ../gtk/gtkfilesystemwin32.c:1487
+#: gtk/gtkfilesystemunix.c:476 gtk/gtkfilesystemunix.c:682
+#: gtk/gtkfilesystemunix.c:1858 gtk/gtkfilesystemwin32.c:482
+#: gtk/gtkfilesystemwin32.c:495 gtk/gtkfilesystemwin32.c:1487
 #, c-format
 msgid "Error getting information for '%s': %s"
 msgstr "Chyba pri získavaní informácie pre '%s': %s"
 
-#: ../gtk/gtkfilesystemunix.c:551 ../gtk/gtkfilesystemwin32.c:537
+#: gtk/gtkfilesystemunix.c:551 gtk/gtkfilesystemwin32.c:537
 #, c-format
 msgid "Error creating directory '%s': %s"
 msgstr "Chyba pri vytváraní priečinka '%s': %s"
 
-#: ../gtk/gtkfilesystemunix.c:631 ../gtk/gtkfilesystemwin32.c:597
+#: gtk/gtkfilesystemunix.c:631 gtk/gtkfilesystemwin32.c:597
 msgid "This file system does not support mounting"
 msgstr "Tento systém súborov nepodporuje pripojenie"
 
-#: ../gtk/gtkfilesystemunix.c:639
+#: gtk/gtkfilesystemunix.c:639
 msgid "File System"
 msgstr "Súborový systém"
 
-#: ../gtk/gtkfilesystemunix.c:796
+#: gtk/gtkfilesystemunix.c:796
 #, c-format
 msgid "Could not get a stock icon for %s"
 msgstr "Nepodarilo sa získať ikonu zo zásobníka pre %s"
 
-#: ../gtk/gtkfilesystemunix.c:891
+#: gtk/gtkfilesystemunix.c:891
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"%s\". "
@@ -1761,93 +1769,93 @@ msgstr ""
 "Názov \"%s\" nie je platný, pretože obsahuje znak \"%s\". Prosím, použite "
 "iný názov."
 
-#: ../gtk/gtkfilesystemunix.c:1463 ../gtk/gtkfilesystemwin32.c:1032
+#: gtk/gtkfilesystemunix.c:1463 gtk/gtkfilesystemwin32.c:1032
 #, c-format
 msgid "Bookmark saving failed: %s"
 msgstr "Uloženie záložky zlyhalo: %s"
 
-#: ../gtk/gtkfilesystemunix.c:1518
+#: gtk/gtkfilesystemunix.c:1518
 #, c-format
 msgid "'%s' already exists in the bookmarks list"
 msgstr "'%s' už existuje v zozname záložiek"
 
-#: ../gtk/gtkfilesystemunix.c:1590
+#: gtk/gtkfilesystemunix.c:1590
 #, c-format
 msgid "'%s' does not exist in the bookmarks list"
 msgstr "'%s' neexistuje v zozname záložiek"
 
-#: ../gtk/gtkfilesystemunix.c:1818
+#: gtk/gtkfilesystemunix.c:1818
 #, c-format
 msgid "Error getting information for '/': %s"
 msgstr "Chyba pri získavaní informácie pre '/': %s"
 
-#: ../gtk/gtkfilesystemwin32.c:611
+#: gtk/gtkfilesystemwin32.c:611
 #, c-format
 msgid "Network Drive (%s)"
 msgstr "Sieťové zariadenie (%s)"
 
-#: ../gtk/gtkfilesystemwin32.c:650
+#: gtk/gtkfilesystemwin32.c:650
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../gtk/gtkfontbutton.c:179 ../gtk/gtkfontbutton.c:292
+#: gtk/gtkfontbutton.c:179 gtk/gtkfontbutton.c:292
 msgid "Pick a Font"
 msgstr "Vyberte písmo"
 
 #. Initialize fields
-#: ../gtk/gtkfontbutton.c:286
+#: gtk/gtkfontbutton.c:286
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: ../gtk/gtkfontbutton.c:804
+#: gtk/gtkfontbutton.c:804
 msgid "Font"
 msgstr "Písmo"
 
 #. This is the default text shown in the preview entry, though the user
 #. can set it. Remember that some fonts only have capital letters.
-#: ../gtk/gtkfontsel.c:74
+#: gtk/gtkfontsel.c:74
 msgid "abcdefghijk ABCDEFGHIJK"
 msgstr "aáäbcčdďeéfghiíjklĺľ AÁÄBCČDĎEÉFGHIÍJKLĹĽ"
 
-#: ../gtk/gtkfontsel.c:361
+#: gtk/gtkfontsel.c:361
 msgid "_Family:"
 msgstr "_Rodina:"
 
-#: ../gtk/gtkfontsel.c:367
+#: gtk/gtkfontsel.c:367
 msgid "_Style:"
 msgstr "Š_týl:"
 
-#: ../gtk/gtkfontsel.c:373
+#: gtk/gtkfontsel.c:373
 msgid "Si_ze:"
 msgstr "_Veľkosť:"
 
 #. create the text entry widget
-#: ../gtk/gtkfontsel.c:549
+#: gtk/gtkfontsel.c:549
 msgid "_Preview:"
 msgstr "_Náhľad:"
 
-#: ../gtk/gtkfontsel.c:1383
+#: gtk/gtkfontsel.c:1383
 msgid "Font Selection"
 msgstr "Výber písma"
 
-#: ../gtk/gtkgamma.c:401
+#: gtk/gtkgamma.c:401
 msgid "Gamma"
 msgstr "Gama"
 
-#: ../gtk/gtkgamma.c:411
+#: gtk/gtkgamma.c:411
 msgid "_Gamma value"
 msgstr "Hodnota _gama"
 
 #. Remove this icon source so we don't keep trying to
 #. * load it.
 #.
-#: ../gtk/gtkiconfactory.c:1656
+#: gtk/gtkiconfactory.c:1656
 #, c-format
 msgid "Error loading icon: %s"
 msgstr "Chyba pri načítaní ikony: %s"
 
-#: ../gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1860,120 +1868,120 @@ msgstr ""
 "Môžete ju získať z:\n"
 "\t%s"
 
-#: ../gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Ikona '%s' nie je súčasťou témy"
 
-#: ../gtk/gtkimmodule.c:427
+#: gtk/gtkimmodule.c:427
 msgid "Default"
 msgstr "Štandardné"
 
-#: ../gtk/gtkinputdialog.c:235
+#: gtk/gtkinputdialog.c:235
 msgid "Input"
 msgstr "Vstup"
 
-#: ../gtk/gtkinputdialog.c:244
+#: gtk/gtkinputdialog.c:244
 msgid "No extended input devices"
 msgstr "Žiadne rozšírené vstupné zariadenia"
 
-#: ../gtk/gtkinputdialog.c:256
+#: gtk/gtkinputdialog.c:256
 msgid "_Device:"
 msgstr "_Zariadenie:"
 
-#: ../gtk/gtkinputdialog.c:273
+#: gtk/gtkinputdialog.c:273
 msgid "Disabled"
 msgstr "Zablokované"
 
-#: ../gtk/gtkinputdialog.c:280
+#: gtk/gtkinputdialog.c:280
 msgid "Screen"
 msgstr "Obrazovka"
 
-#: ../gtk/gtkinputdialog.c:287
+#: gtk/gtkinputdialog.c:287
 msgid "Window"
 msgstr "Okno"
 
-#: ../gtk/gtkinputdialog.c:294
+#: gtk/gtkinputdialog.c:294
 msgid "_Mode: "
 msgstr "_Mód: "
 
 #. The axis listbox
-#: ../gtk/gtkinputdialog.c:325
+#: gtk/gtkinputdialog.c:325
 msgid "_Axes"
 msgstr "_Osy"
 
 #. Keys listbox
-#: ../gtk/gtkinputdialog.c:342
+#: gtk/gtkinputdialog.c:342
 msgid "_Keys"
 msgstr "_Klávesy"
 
-#: ../gtk/gtkinputdialog.c:562
+#: gtk/gtkinputdialog.c:562
 msgid "X"
 msgstr "X"
 
-#: ../gtk/gtkinputdialog.c:563
+#: gtk/gtkinputdialog.c:563
 msgid "Y"
 msgstr "Y"
 
-#: ../gtk/gtkinputdialog.c:564
+#: gtk/gtkinputdialog.c:564
 msgid "Pressure"
 msgstr "Tlak"
 
-#: ../gtk/gtkinputdialog.c:565
+#: gtk/gtkinputdialog.c:565
 msgid "X Tilt"
 msgstr "Sklon X"
 
-#: ../gtk/gtkinputdialog.c:566
+#: gtk/gtkinputdialog.c:566
 msgid "Y Tilt"
 msgstr "Sklon Y"
 
-#: ../gtk/gtkinputdialog.c:567
+#: gtk/gtkinputdialog.c:567
 msgid "Wheel"
 msgstr "Koliesko"
 
-#: ../gtk/gtkinputdialog.c:607
+#: gtk/gtkinputdialog.c:607
 msgid "none"
 msgstr "žiadny"
 
-#: ../gtk/gtkinputdialog.c:643 ../gtk/gtkinputdialog.c:679
+#: gtk/gtkinputdialog.c:643 gtk/gtkinputdialog.c:679
 msgid "(disabled)"
 msgstr "(zablokované)"
 
-#: ../gtk/gtkinputdialog.c:672
+#: gtk/gtkinputdialog.c:672
 msgid "(unknown)"
 msgstr "(neznámy)"
 
 #. and clear button
-#: ../gtk/gtkinputdialog.c:759
+#: gtk/gtkinputdialog.c:759
 msgid "clear"
 msgstr "Vyčistiť"
 
-#: ../gtk/gtklabel.c:3985
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Vybrať všetko"
 
 #. Description of --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:398
+#: gtk/gtkmain.c:398
 msgid "Load additional GTK+ modules"
 msgstr "Načítať prídavné module GTK+"
 
 #. Placeholder in --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:399
+#: gtk/gtkmain.c:399
 msgid "MODULES"
 msgstr "MODULY"
 
 #. Description of --g-fatal-warnings in --help output
-#: ../gtk/gtkmain.c:401
+#: gtk/gtkmain.c:401
 msgid "Make all warnings fatal"
 msgstr "Zmeniť všetky upozornenia na závažné"
 
 #. Description of --gtk-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:404
+#: gtk/gtkmain.c:404
 msgid "GTK+ debugging flags to set"
 msgstr "Ladiace príznaky GTK+, ktoré nastaviť"
 
 #. Description of --gtk-no-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:407
+#: gtk/gtkmain.c:407
 msgid "GTK+ debugging flags to unset"
 msgstr "Ladiace príznaky GTK+, ktoré vypnúť"
 
@@ -1982,517 +1990,517 @@ msgstr "Ladiace príznaky GTK+, ktoré vypnúť"
 #. * Do *not* translate it to "predefinito:LTR", if it
 #. * it isn't default:LTR or default:RTL it will not work
 #.
-#: ../gtk/gtkmain.c:476
+#: gtk/gtkmain.c:476
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../gtk/gtkmain.c:559
+#: gtk/gtkmain.c:559
 msgid "GTK+ Options"
 msgstr "Voľby GTK+"
 
-#: ../gtk/gtkmain.c:559
+#: gtk/gtkmain.c:559
 msgid "Show GTK+ Options"
 msgstr "Zobraziť voľby GTK+"
 
-#: ../gtk/gtknotebook.c:2718 ../gtk/gtknotebook.c:5064
+#: gtk/gtknotebook.c:2718 gtk/gtknotebook.c:5064
 #, c-format
 msgid "Page %u"
 msgstr "Stránka %u"
 
-#: ../gtk/gtkradiotoolbutton.c:92
+#: gtk/gtkradiotoolbutton.c:92
 msgid "Group"
 msgstr "Skupina"
 
-#: ../gtk/gtkradiotoolbutton.c:93
+#: gtk/gtkradiotoolbutton.c:93
 msgid "The radio tool button whose group this button belongs to."
 msgstr "Prepínacie tlačidlo, do ktorého skupiny toto tlačidlo patrí."
 
-#: ../gtk/gtkrc.c:2400
+#: gtk/gtkrc.c:2400
 #, c-format
 msgid "Unable to find include file: \"%s\""
 msgstr "Nepodarilo sa nájsť vkladaný súbor: \"%s\""
 
-#: ../gtk/gtkrc.c:3042 ../gtk/gtkrc.c:3045
+#: gtk/gtkrc.c:3042 gtk/gtkrc.c:3045
 #, c-format
 msgid "Unable to locate image file in pixmap_path: \"%s\""
 msgstr "Obrázok nebol nájdený v pixmap_path: \"%s\""
 
-#: ../gtk/gtkrc.c:3480
+#: gtk/gtkrc.c:3480
 #, c-format
 msgid "Pixmap path element: \"%s\" must be absolute, %s, line %d"
 msgstr "Element cesty k pixmap: \"%s\" musí byť absolútny, %s, riadok %d"
 
 #. KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate
-#: ../gtk/gtkstock.c:308
+#: gtk/gtkstock.c:308
 msgid "Information"
 msgstr "Informácia"
 
-#: ../gtk/gtkstock.c:309
+#: gtk/gtkstock.c:309
 msgid "Warning"
 msgstr "Varovanie"
 
-#: ../gtk/gtkstock.c:310
+#: gtk/gtkstock.c:310
 msgid "Error"
 msgstr "Chyba"
 
-#: ../gtk/gtkstock.c:311
+#: gtk/gtkstock.c:311
 msgid "Question"
 msgstr "Otázka"
 
 #. FIXME these need accelerators when appropriate, and
 #. * need the mnemonics to be rationalized
 #.
-#: ../gtk/gtkstock.c:316
+#: gtk/gtkstock.c:316
 msgid "_About"
 msgstr "_O programe"
 
-#: ../gtk/gtkstock.c:318
+#: gtk/gtkstock.c:318
 msgid "_Apply"
 msgstr "_Použiť"
 
-#: ../gtk/gtkstock.c:319
+#: gtk/gtkstock.c:319
 msgid "_Bold"
 msgstr "_Tučné"
 
-#: ../gtk/gtkstock.c:320
+#: gtk/gtkstock.c:320
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
-#: ../gtk/gtkstock.c:321
+#: gtk/gtkstock.c:321
 msgid "_CD-Rom"
 msgstr "_CD-Rom"
 
-#: ../gtk/gtkstock.c:322
+#: gtk/gtkstock.c:322
 msgid "_Clear"
 msgstr "_Vymazať"
 
-#: ../gtk/gtkstock.c:323
+#: gtk/gtkstock.c:323
 msgid "_Close"
 msgstr "Za_vrieť"
 
-#: ../gtk/gtkstock.c:324
+#: gtk/gtkstock.c:324
 msgid "_Convert"
 msgstr "_Previesť"
 
-#: ../gtk/gtkstock.c:325
+#: gtk/gtkstock.c:325
 msgid "_Copy"
 msgstr "_Kopírovať"
 
-#: ../gtk/gtkstock.c:326
+#: gtk/gtkstock.c:326
 msgid "Cu_t"
 msgstr "Vystri_hnúť"
 
-#: ../gtk/gtkstock.c:327
+#: gtk/gtkstock.c:327
 msgid "_Delete"
 msgstr "_Odstrániť"
 
-#: ../gtk/gtkstock.c:328
+#: gtk/gtkstock.c:328
 msgid "_Execute"
 msgstr "_Vykonať"
 
-#: ../gtk/gtkstock.c:329
+#: gtk/gtkstock.c:329
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: ../gtk/gtkstock.c:330
+#: gtk/gtkstock.c:330
 msgid "_Find"
 msgstr "_Nájsť"
 
-#: ../gtk/gtkstock.c:331
+#: gtk/gtkstock.c:331
 msgid "Find and _Replace"
 msgstr "Nájsť a n_ahradiť"
 
-#: ../gtk/gtkstock.c:332
+#: gtk/gtkstock.c:332
 msgid "_Floppy"
 msgstr "_Disketa"
 
-#: ../gtk/gtkstock.c:333
+#: gtk/gtkstock.c:333
 msgid "_Fullscreen"
 msgstr "_Celá obrazovka"
 
-#: ../gtk/gtkstock.c:334
+#: gtk/gtkstock.c:334
 msgid "_Leave Fullscreen"
 msgstr "_Opustiť celú obrazovku"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:336
+#: gtk/gtkstock.c:336
 msgid "Navigation|_Bottom"
 msgstr "_Spodný"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:338
+#: gtk/gtkstock.c:338
 msgid "Navigation|_First"
 msgstr "_Prvý"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:340
+#: gtk/gtkstock.c:340
 msgid "Navigation|_Last"
 msgstr "_Posledný"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:342
+#: gtk/gtkstock.c:342
 msgid "Navigation|_Top"
 msgstr "_Vrchný"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:344
+#: gtk/gtkstock.c:344
 msgid "Navigation|_Back"
 msgstr "_Späť"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:346
+#: gtk/gtkstock.c:346
 msgid "Navigation|_Down"
 msgstr "_Dole"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:348
+#: gtk/gtkstock.c:348
 msgid "Navigation|_Forward"
 msgstr "_Vpred"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:350
+#: gtk/gtkstock.c:350
 msgid "Navigation|_Up"
 msgstr "_Hore"
 
-#: ../gtk/gtkstock.c:351
+#: gtk/gtkstock.c:351
 msgid "_Harddisk"
 msgstr "_Pevný disk"
 
-#: ../gtk/gtkstock.c:352
+#: gtk/gtkstock.c:352
 msgid "_Help"
 msgstr "_Pomocník"
 
-#: ../gtk/gtkstock.c:353
+#: gtk/gtkstock.c:353
 msgid "_Home"
 msgstr "_Domov"
 
-#: ../gtk/gtkstock.c:354
+#: gtk/gtkstock.c:354
 msgid "Increase Indent"
 msgstr "Zväčšiť odsadenie"
 
-#: ../gtk/gtkstock.c:355
+#: gtk/gtkstock.c:355
 msgid "Decrease Indent"
 msgstr "Zmenšiť odsadenie"
 
-#: ../gtk/gtkstock.c:356
+#: gtk/gtkstock.c:356
 msgid "_Index"
 msgstr "_Index"
 
-#: ../gtk/gtkstock.c:357
+#: gtk/gtkstock.c:357
 msgid "_Information"
 msgstr "_Informácie"
 
-#: ../gtk/gtkstock.c:358
+#: gtk/gtkstock.c:358
 msgid "_Italic"
 msgstr "_Kurzíva"
 
-#: ../gtk/gtkstock.c:359
+#: gtk/gtkstock.c:359
 msgid "_Jump to"
 msgstr "_Prejsť na"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:361
+#: gtk/gtkstock.c:361
 msgid "Justify|_Center"
 msgstr "Na _stred"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:363
+#: gtk/gtkstock.c:363
 msgid "Justify|_Fill"
 msgstr "_Vyplniť"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:365
+#: gtk/gtkstock.c:365
 msgid "Justify|_Left"
 msgstr "_Vľavo"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:367
+#: gtk/gtkstock.c:367
 msgid "Justify|_Right"
 msgstr "Do_prava"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:370
+#: gtk/gtkstock.c:370
 msgid "Media|_Forward"
 msgstr "Do_predu"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:372
+#: gtk/gtkstock.c:372
 msgid "Media|_Next"
 msgstr "_Nasledujúci"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:374
+#: gtk/gtkstock.c:374
 msgid "Media|P_ause"
 msgstr "P_auza"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:376
+#: gtk/gtkstock.c:376
 msgid "Media|_Play"
 msgstr "_Hrať"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:378
+#: gtk/gtkstock.c:378
 msgid "Media|Pre_vious"
 msgstr "Pre_dchádzajúci"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:380
+#: gtk/gtkstock.c:380
 msgid "Media|_Record"
 msgstr "_Záznam"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:382
+#: gtk/gtkstock.c:382
 msgid "Media|R_ewind"
 msgstr "Pr_evinúť"
 
 #. translators, strip the prefix up to and including the first |
-#: ../gtk/gtkstock.c:384
+#: gtk/gtkstock.c:384
 msgid "Media|_Stop"
 msgstr "_Zastaviť"
 
-#: ../gtk/gtkstock.c:385
+#: gtk/gtkstock.c:385
 msgid "_Network"
 msgstr "_Sieť"
 
-#: ../gtk/gtkstock.c:386
+#: gtk/gtkstock.c:386
 msgid "_New"
 msgstr "_Nový"
 
-#: ../gtk/gtkstock.c:387
+#: gtk/gtkstock.c:387
 msgid "_No"
 msgstr "_Nie"
 
-#: ../gtk/gtkstock.c:388
+#: gtk/gtkstock.c:388
 msgid "_OK"
 msgstr "_Ok"
 
-#: ../gtk/gtkstock.c:389
+#: gtk/gtkstock.c:389
 msgid "_Open"
 msgstr "_Otvoriť"
 
-#: ../gtk/gtkstock.c:390
+#: gtk/gtkstock.c:390
 msgid "_Paste"
 msgstr "_Vložiť"
 
-#: ../gtk/gtkstock.c:391
+#: gtk/gtkstock.c:391
 msgid "_Preferences"
 msgstr "Nas_tavenie"
 
-#: ../gtk/gtkstock.c:392
+#: gtk/gtkstock.c:392
 msgid "_Print"
 msgstr "_Tlačiť"
 
-#: ../gtk/gtkstock.c:393
+#: gtk/gtkstock.c:393
 msgid "Print Pre_view"
 msgstr "Ná_hľad pred tlačou"
 
-#: ../gtk/gtkstock.c:394
+#: gtk/gtkstock.c:394
 msgid "_Properties"
 msgstr "_Vlastnosti"
 
-#: ../gtk/gtkstock.c:395
+#: gtk/gtkstock.c:395
 msgid "_Quit"
 msgstr "_Koniec"
 
-#: ../gtk/gtkstock.c:396
+#: gtk/gtkstock.c:396
 msgid "_Redo"
 msgstr "_Opakovať vrátené"
 
-#: ../gtk/gtkstock.c:397
+#: gtk/gtkstock.c:397
 msgid "_Refresh"
 msgstr "_Aktualizovať"
 
-#: ../gtk/gtkstock.c:399
+#: gtk/gtkstock.c:399
 msgid "_Revert"
 msgstr "_Vrátiť"
 
-#: ../gtk/gtkstock.c:400
+#: gtk/gtkstock.c:400
 msgid "_Save"
 msgstr "_Uložiť"
 
-#: ../gtk/gtkstock.c:401
+#: gtk/gtkstock.c:401
 msgid "Save _As"
 msgstr "Uložiť _ako"
 
-#: ../gtk/gtkstock.c:402
+#: gtk/gtkstock.c:402
 msgid "_Color"
 msgstr "_Farba"
 
-#: ../gtk/gtkstock.c:403
+#: gtk/gtkstock.c:403
 msgid "_Font"
 msgstr "_Písmo"
 
-#: ../gtk/gtkstock.c:404
+#: gtk/gtkstock.c:404
 msgid "_Ascending"
 msgstr "_Vzostupne"
 
-#: ../gtk/gtkstock.c:405
+#: gtk/gtkstock.c:405
 msgid "_Descending"
 msgstr "_Zostupne"
 
-#: ../gtk/gtkstock.c:406
+#: gtk/gtkstock.c:406
 msgid "_Spell Check"
 msgstr "_Kontrola pravopisu"
 
-#: ../gtk/gtkstock.c:407
+#: gtk/gtkstock.c:407
 msgid "_Stop"
 msgstr "_Zastaviť"
 
-#: ../gtk/gtkstock.c:408
+#: gtk/gtkstock.c:408
 msgid "_Strikethrough"
 msgstr "_Prečiarknuté"
 
-#: ../gtk/gtkstock.c:409
+#: gtk/gtkstock.c:409
 msgid "_Undelete"
 msgstr "_Zrušiť odstránenie"
 
-#: ../gtk/gtkstock.c:410
+#: gtk/gtkstock.c:410
 msgid "_Underline"
 msgstr "Po_dčiarknuté"
 
-#: ../gtk/gtkstock.c:411
+#: gtk/gtkstock.c:411
 msgid "_Undo"
 msgstr "_Vrátiť späť"
 
-#: ../gtk/gtkstock.c:412
+#: gtk/gtkstock.c:412
 msgid "_Yes"
 msgstr "_Ano"
 
-#: ../gtk/gtkstock.c:413
+#: gtk/gtkstock.c:413
 msgid "_Normal Size"
 msgstr "_Normálna veľkosť"
 
-#: ../gtk/gtkstock.c:414
+#: gtk/gtkstock.c:414
 msgid "Best _Fit"
 msgstr "_Prispôsobiť"
 
-#: ../gtk/gtkstock.c:415
+#: gtk/gtkstock.c:415
 msgid "Zoom _In"
 msgstr "Z_väčšiť"
 
-#: ../gtk/gtkstock.c:416
+#: gtk/gtkstock.c:416
 msgid "Zoom _Out"
 msgstr "Z_menšiť"
 
-#: ../gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM značka _Left-to-right"
 
-#: ../gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM značka _Right-to-left"
 
-#: ../gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Left-to-right _vkladanie"
 
-#: ../gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Right-to-left v_kladanie"
 
-#: ../gtk/gtktextutil.c:58
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Left-to-right _prepisovanie"
 
-#: ../gtk/gtktextutil.c:59
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Right-to-left pr_episovanie"
 
-#: ../gtk/gtktextutil.c:60
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF Smerované formátovanie _pop"
 
-#: ../gtk/gtktextutil.c:61
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _Nulová šírka medzery"
 
-#: ../gtk/gtktextutil.c:62
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Nulová šírka _so spojením"
 
-#: ../gtk/gtktextutil.c:63
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Nulová šírka _bez spojenia"
 
-#: ../gtk/gtkthemes.c:71
+#: gtk/gtkthemes.c:71
 #, c-format
 msgid "Unable to locate theme engine in module_path: \"%s\","
 msgstr "Nepodarilo sa nájsť knižnicu pre témy v module_path: \"%s\","
 
-#: ../gtk/gtktipsquery.c:186
+#: gtk/gtktipsquery.c:186
 msgid "--- No Tip ---"
 msgstr "--- Bez rady ---"
 
-#: ../gtk/gtkuimanager.c:1154
+#: gtk/gtkuimanager.c:1154
 #, c-format
 msgid "Unknown attribute '%s' on line %d char %d"
 msgstr "Neznámy atribút '%s' na riadku %d znaku %d"
 
-#: ../gtk/gtkuimanager.c:1371
+#: gtk/gtkuimanager.c:1371
 #, c-format
 msgid "Unexpected start tag '%s' on line %d char %d"
 msgstr "Neočakávaná začiatočná značka '%s' na riadku %d znaku %d"
 
-#: ../gtk/gtkuimanager.c:1461
+#: gtk/gtkuimanager.c:1461
 #, c-format
 msgid "Unexpected character data on line %d char %d"
 msgstr "Neočakávané znakové dáta na riadku %d znaku %d"
 
-#: ../gtk/gtkuimanager.c:2272
+#: gtk/gtkuimanager.c:2272
 msgid "Empty"
 msgstr "Prázdne"
 
 #. ID
-#: ../modules/input/imam-et.c:454
+#: modules/input/imam-et.c:454
 msgid "Amharic (EZ+)"
 msgstr "Amharický (EZ+)"
 
 #. ID
-#: ../modules/input/imcedilla.c:91
+#: modules/input/imcedilla.c:91
 msgid "Cedilla"
 msgstr "Cedilla"
 
 #. ID
-#: ../modules/input/imcyrillic-translit.c:217
+#: modules/input/imcyrillic-translit.c:217
 msgid "Cyrillic (Transliterated)"
 msgstr "Azbuka (Transliterated)"
 
 #. ID
-#: ../modules/input/iminuktitut.c:127
+#: modules/input/iminuktitut.c:127
 msgid "Inuktitut (Transliterated)"
 msgstr "Inuktitut (Transliterated)"
 
 #. ID
-#: ../modules/input/imipa.c:145
+#: modules/input/imipa.c:145
 msgid "IPA"
 msgstr "IPA"
 
 #. ID
-#: ../modules/input/imthai-broken.c:178
+#: modules/input/imthai-broken.c:178
 msgid "Thai (Broken)"
 msgstr "Thajský (Nefunkčný)"
 
 #. ID
-#: ../modules/input/imti-er.c:453
+#: modules/input/imti-er.c:453
 msgid "Tigrigna-Eritrean (EZ+)"
 msgstr "Tigrigna-Eritrejský (EZ+)"
 
 #. ID
-#: ../modules/input/imti-et.c:453
+#: modules/input/imti-et.c:453
 msgid "Tigrigna-Ethiopian (EZ+)"
 msgstr "Tigrigna-Ethiópsky (EZ+)"
 
 #. ID
-#: ../modules/input/imviqr.c:244
+#: modules/input/imviqr.c:244
 msgid "Vietnamese (VIQR)"
 msgstr "Vietnamský (VIQR)"
 
 #. ID
-#: ../modules/input/imxim.c:28
+#: modules/input/imxim.c:28
 msgid "X Input Method"
 msgstr "Metóda vstupu X"
 
-#: ../tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Nepodarilo sa určiť formát súboru obrázku pre '%s': %s"
diff --git a/po/sl.po b/po/sl.po
index abc5fc6cad..770bfe8afa 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GTK+ 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2002-02-26 00:23+0100\n"
 "Last-Translator: Andraž Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: slovenian <sl@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Nisem uspel odpreti datoteke '%s': %s"
@@ -25,7 +25,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Slikovna datoteka '%s' ne vsebuje podatkov"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1287,22 +1287,22 @@ msgstr "Kolešček"
 msgid "Color Selection"
 msgstr "Izbor pisave"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 #, fuzzy
 msgid "Select _All"
 msgstr "Izberi vse"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Načini vnosa"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 #, fuzzy
 msgid "_Insert Unicode Control Character"
 msgstr "_Vstavi kontrolni znak Unicode"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, fuzzy, c-format
 msgid "Invalid filename: %s"
 msgstr "Neveljavna datoteka XBM"
@@ -1312,13 +1312,13 @@ msgstr "Neveljavna datoteka XBM"
 msgid "Select A File"
 msgstr "Zbriši datoteko"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 #, fuzzy
 msgid "Home"
 msgstr "_Dom"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr ""
@@ -1332,261 +1332,277 @@ msgstr "nič"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr "Nisem uspel prepoznati oblike zapisa slike v datoteki '%s'"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Neveljavna datoteka XBM"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Nisem uspel prepoznati oblike zapisa slike v datoteki '%s'"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "Od_strani"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "P_reimenuj"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 #, fuzzy
 msgid "Folder"
 msgstr "Mape"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "Od_strani"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "Napaka ob ustvarjanju mape \"%s\": %s\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "_Izbira: "
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Datoteke"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 #, fuzzy
 msgid "Name"
 msgstr "_Ime barve:"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Velikost"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 #, fuzzy
 msgid "Modified"
 msgstr "Način"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "Nova mapa"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 #, fuzzy
 msgid "_Name:"
 msgstr "_Ime barve:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 #, fuzzy
 msgid "Save in _folder:"
 msgstr "Nova mapa"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 #, fuzzy
 msgid "Create in _folder:"
 msgstr "Nova mapa"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "P_reimenuj"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "Napaka ob ustvarjanju mape \"%s\": %s\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 #, fuzzy
 msgid "Unknown"
 msgstr "(neznano)"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 #, fuzzy
 msgid "Today"
 msgstr "Modalni"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Nova mapa"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "Napaka ob ustvarjanju mape \"%s\": %s\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "_Izbira: "
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 #, fuzzy
 msgid "_Location:"
 msgstr "_Izbira: "
@@ -1790,7 +1806,7 @@ msgstr ""
 
 #: gtk/gtkfilesystemunix.c:639
 #, fuzzy
-msgid "Filesystem"
+msgid "File System"
 msgstr "Datoteke"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1891,7 +1907,7 @@ msgstr "Vrednost _gama"
 msgid "Error loading icon: %s"
 msgstr "Napaka ob nalaganju ikone: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1900,7 +1916,7 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr ""
@@ -1990,7 +2006,7 @@ msgstr "(neznano)"
 msgid "clear"
 msgstr "izprazni"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Izberi vse"
 
@@ -2427,43 +2443,43 @@ msgstr "Po_večaj"
 msgid "Zoom _Out"
 msgstr "Po_manjšaj"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM _Leva-proti-desni oznaka"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM _Desna-proti-levi oznaka"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE _Leva-proti-desni _vgradnja"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Desna-proti-levi v_gradnja"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Leva-proti-desni _prepis"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Desna-proti-levi p_repis"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Odprto usmerjeno oblikovanje"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS Presledek _nične dolžine"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ _Združevalec nične širine"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ _Nezdruževalec nične širine"
 
@@ -2546,7 +2562,7 @@ msgstr "Vietnamski (VIQR)"
 msgid "X Input Method"
 msgstr "Vnosni način X"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, fuzzy, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Nisem uspel prepoznati oblike zapisa slike v datoteki '%s'"
diff --git a/po/sq.po b/po/sq.po
index 57853a1841..b33e17a972 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-01-08 18:14+0100\n"
 "Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "E pamundur hapja e file '%s': %s"
@@ -30,7 +30,7 @@ msgid "Image file '%s' contains no data"
 msgstr "File '%s' nuk përmban të dhëna"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1271,20 +1271,20 @@ msgstr "Rrethi i ngjyrave"
 msgid "Color Selection"
 msgstr "Zgjedhja e ngjyrës"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Zgjidh _gjithçka"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Metodat e Dhënies"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Shkruaj simbolin Unicode të kontrollit"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Emër file jo korrekt: %s"
@@ -1293,12 +1293,12 @@ msgstr "Emër file jo korrekt: %s"
 msgid "Select A File"
 msgstr "Zgjidh një file"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Shtëpia"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Hapësira e punës"
@@ -1311,246 +1311,262 @@ msgstr "(Asnjë)"
 msgid "Other..."
 msgstr "Tjetër..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "E pamundur marrja e informacioneve në lidhje me file"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "I pamundur shtimi i një libërshënuesi"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "E pamundur fshirja e libërshënuesit"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "I pamundur krijimi i kartelës"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Emër i pavlefshëm file"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "E pamundur shfaqja e pëmbajtjes së kartelës"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "E pamundur marrja e informacioneve në lidhje me '%s': %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Shto në libërshënues kartelën '%s'"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Shto në libërshënues kartelën aktuale"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Shto në libërshënues kartelat e zgjedhura"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Hiq libërshënuesin '%s'"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "I pamundur krijimi i një libërshënuesi për '%s' pasi është një emër i "
 "pavlefshëm pozicioni."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Hiqe"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Riemërto"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Kombinime përshpejtuese"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Kartelë"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Shto"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 #, fuzzy
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Shto në libërshënues kartelën e zgjedhur"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Hiqe"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Hiq libërshënuesin e zgjedhur"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "E pamundur zgjedhja e elementit"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "I pamundur krijimi i një libërshënuesi për '%s' pasi është një emër i "
 "pavlefshëm pozicioni."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "_Shto tek kombinimet përshpejtues"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Hap _pozicionin"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Shfaq Files e _Padukshëm"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Files"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Emri"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Madhësia"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Ndryshuar"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Zgjidh llojet e files që duhen shfaqur"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Krijo Karte_lë"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Emri:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Shfleto për kartelat e tjera"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Ruaje tek _kartela:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Krijoje tek _kartela:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "I pamundur kalimi tek kartela pasi nuk është lokale"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Shtegu %s nuk ekziston"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Riemërto"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "I pamundur montimi i %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Shkruaj emrin e kartelës së re"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d byte"
 msgstr[1] "%d bytes"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Nuk njihet"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Sot"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Dje"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "I pamundur ndryshimi i kartelës"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Kartela e dhënë nga ju është një pozicion i pavlefshëm."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "I pamundur krijimi i emrit të file nga '%s' dhe '%s'"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "E pamundur zgjedhja e elementit"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Hap pozicionin"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Ruaje tek Pozicioni"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Pozicioni:"
 
@@ -1749,7 +1765,8 @@ msgid "This file system does not support mounting"
 msgstr "Ky file sistemi nuk suporton montimin"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "File i sistemit"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1852,7 +1869,7 @@ msgstr "Vlera _gamma"
 msgid "Error loading icon: %s"
 msgstr "Gabim gjatë ngarkimit të ikonës: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1865,7 +1882,7 @@ msgstr ""
 "Mund të merrni një kopje nga:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Ikonë '%s' jo e pranishme në temë"
@@ -1953,7 +1970,7 @@ msgstr "(nuk njihet)"
 msgid "clear"
 msgstr "pastro"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Zgjidh gjithçka"
 
@@ -2391,43 +2408,43 @@ msgstr "Z_madho"
 msgid "Zoom _Out"
 msgstr "Z_vogëlo"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "MMD markimi nga e _Majta-në-të-djathtë"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "MDM markimi nga e _Djathta-në-të-majtë"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "SMD _shtim nga e majta-në-të djathtë"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "SDM sh_tim nga e djathta-në-të majtë"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "MMD _mbishkruaj nga e majta-në-të djathtë"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "MDM m_bishkruaj nga e djathta-në-të majtë"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "FFD _fshi formatimin drejtimor"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "HGZ _Hapësirë me gjerësi zero"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "HBGZ hapësirë _bashkimi me gjerësi zero"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "HJBGZ hapësirë _jo bashkimi me gjerësi zero"
 
@@ -2509,7 +2526,7 @@ msgstr "Vietnameze (VIQR)"
 msgid "X Input Method"
 msgstr "Metodë Futjeje për X"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "E pamundur marrja e informacioneve për file '%s': %s"
diff --git a/po/sr.po b/po/sr.po
index 09b0d8f8de..a5b92b993a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-07-08 08:55+0200\n"
 "Last-Translator: Данило Шеган <danilo@prevod.org>\n"
 "Language-Team: Serbian (sr) <gnom@prevod.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Не могу да отворим датотеку „%s“: %s"
@@ -34,7 +34,7 @@ msgstr "Слика „%s“ не садржи податке"
 
 # ово има највише смисла
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1284,20 +1284,20 @@ msgstr "Точак боја"
 msgid "Color Selection"
 msgstr "Избор боје"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Изабери _све"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Начини уноса"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Убаци контролни Уникод знак"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Неисправно име датотеке: %s"
@@ -1307,12 +1307,12 @@ msgid "Select A File"
 msgstr "Изабери датотеку"
 
 # ako je za "home directory", onda bi bilo dobro "licni direktorijum", ako je za "home page", onda za "licna stranica"
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Лично"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Радна површ"
@@ -1325,23 +1325,23 @@ msgstr "(ништа)"
 msgid "Other..."
 msgstr "Нека друга..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Не могу да сазнам податке о датотеци"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Не могу да додам обележивач"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Не могу да уклоним обележивач"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Не могу да направим фасциклу"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1349,159 +1349,175 @@ msgstr ""
 "Фасцикла се не може направити, пошто већ постоји датотека истог имена.  "
 "Користите друго име за фасциклу, или прво преименујте датотеку."
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Неисправно име датотеке"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Не могу да прикажем садржај фасцикле"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Не могу да сазнам податке о „%s“: %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Додај фасциклу „%s“ у обележиваче"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Додај текућу фасциклу међу обележиваче"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Додај изабране фасцикле међу обележиваче"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Уклони обележивач „%s“"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Не могу да додам обележивач за „%s“ зато што представља неисправно име "
 "путање."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Уклони"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Преименуј..."
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Пречице"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Фасцикла"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Додај"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Додај изабрану фасциклу у обележиваче"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Уклони изабрани обележивач"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 msgid "Could not select file"
 msgstr "Не могу да изаберем датотеку"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "Не могу да изаберем датотеку „%s“ зато што представља неисправно име путање."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "_Додај међу обележиваче"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Отвори _путању"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Прикажи са_кривене датотеке"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Датотеке"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Име:"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Величина"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Измењена"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Изабери које врста датотека се приказују"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Направи _фасциклу"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Име:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Разгледај остале фасцикле"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Сачувај у _фасцикли:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Направи у _фасцикли:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Не могу да уђем у фасциклу зато што није локална"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Пречица %s не постоји"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Преименуј"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Не могу да прикључим %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Унесите име нове фасцикле"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
@@ -1509,59 +1525,59 @@ msgstr[0] "%d бајт"
 msgstr[1] "%d бајта"
 msgstr[2] "%d бајтова"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Непознато"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Данас"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Јуче"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Не могу да променим фасциклу"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Фасцикла коју сте навели представља неисправну путању."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Не могу да саставим име датотеке из „%s“ и „%s“"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Не могу да изаберем ставку"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Отвори путању"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Сачувај на путањи"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Путања: "
 
@@ -1762,7 +1778,8 @@ msgid "This file system does not support mounting"
 msgstr "Овај систем датотека не подржава прикључивање"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Систем датотека"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1864,7 +1881,7 @@ msgstr "_Гама вредност"
 msgid "Error loading icon: %s"
 msgstr "Грешка при учитавању иконе: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1877,7 +1894,7 @@ msgstr ""
 "Можете набавити примерак са:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Икона „%s“ није присутна у теми"
@@ -1965,7 +1982,7 @@ msgstr "(непознато)"
 msgid "clear"
 msgstr "очистити"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Изабери све"
 
@@ -2396,43 +2413,43 @@ msgstr "У_већај"
 msgid "Zoom _Out"
 msgstr "У_мањи"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM Обележивач за с_лева-на-десно"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM Обележивач за с_десна-на-лево"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE _убацивање слева-на-десно"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE у_бацивање сдесна-на-лево"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO пр_иморавање слева-на-десно"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO приморава_ње сдесна-на-лево"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Почни усмерен запис"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _размак без ширине"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ _спојница без ширине"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ _неспојница без ширине"
 
@@ -2514,7 +2531,7 @@ msgstr "Вијетнамски (VIQR)"
 msgid "X Input Method"
 msgstr "Иксов начин уноса (XIM)"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Не могу да сазнам податке о датотеци „%s“: %s"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index eefc72bf6d..1cd7415620 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-07-08 08:55+0200\n"
 "Last-Translator: Danilo Šegan <danilo@prevod.org>\n"
 "Language-Team: Serbian (sr) <gnom@prevod.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Ne mogu da otvorim datoteku „%s“: %s"
@@ -34,7 +34,7 @@ msgstr "Slika „%s“ ne sadrži podatke"
 
 # ovo ima najviše smisla
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1287,20 +1287,20 @@ msgstr "Točak boja"
 msgid "Color Selection"
 msgstr "Izbor boje"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Izaberi _sve"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Načini unosa"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Ubaci kontrolni Unikod znak"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Neispravno ime datoteke: %s"
@@ -1310,12 +1310,12 @@ msgid "Select A File"
 msgstr "Izaberi datoteku"
 
 # ako je za "home directory", onda bi bilo dobro "licni direktorijum", ako je za "home page", onda za "licna stranica"
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Lično"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Radna površ"
@@ -1328,23 +1328,23 @@ msgstr "(ništa)"
 msgid "Other..."
 msgstr "Neka druga..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Ne mogu da saznam podatke o datoteci"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Ne mogu da dodam obeleživač"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Ne mogu da uklonim obeleživač"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Ne mogu da napravim fasciklu"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1352,160 +1352,176 @@ msgstr ""
 "Fascikla se ne može napraviti, pošto već postoji datoteka istog imena.  "
 "Koristite drugo ime za fasciklu, ili prvo preimenujte datoteku."
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Neispravno ime datoteke"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Ne mogu da prikažem sadržaj fascikle"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Ne mogu da saznam podatke o „%s“: %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Dodaj fasciklu „%s“ u obeleživače"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Dodaj tekuću fasciklu među obeleživače"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Dodaj izabrane fascikle među obeleživače"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Ukloni obeleživač „%s“"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Ne mogu da dodam obeleživač za „%s“ zato što predstavlja neispravno ime "
 "putanje."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Ukloni"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Preimenuj..."
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Prečice"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Fascikla"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Dodaj izabranu fasciklu u obeleživače"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Ukloni izabrani obeleživač"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 msgid "Could not select file"
 msgstr "Ne mogu da izaberem datoteku"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "Ne mogu da izaberem datoteku „%s“ zato što predstavlja neispravno ime "
 "putanje."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "_Dodaj među obeleživače"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Otvori _putanju"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Prikaži sa_krivene datoteke"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Datoteke"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Ime:"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Veličina"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Izmenjena"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Izaberi koje vrsta datoteka se prikazuju"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Napravi _fasciklu"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Razgledaj ostale fascikle"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Sačuvaj u _fascikli:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Napravi u _fascikli:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Ne mogu da uđem u fasciklu zato što nije lokalna"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Prečica %s ne postoji"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Preimenuj"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Ne mogu da priključim %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Unesite ime nove fascikle"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
@@ -1513,59 +1529,59 @@ msgstr[0] "%d bajt"
 msgstr[1] "%d bajta"
 msgstr[2] "%d bajtova"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Danas"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Juče"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Ne mogu da promenim fasciklu"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Fascikla koju ste naveli predstavlja neispravnu putanju."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Ne mogu da sastavim ime datoteke iz „%s“ i „%s“"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Ne mogu da izaberem stavku"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Otvori putanju"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Sačuvaj na putanji"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Putanja: "
 
@@ -1766,7 +1782,8 @@ msgid "This file system does not support mounting"
 msgstr "Ovaj sistem datoteka ne podržava priključivanje"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Sistem datoteka"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1868,7 +1885,7 @@ msgstr "_Gama vrednost"
 msgid "Error loading icon: %s"
 msgstr "Greška pri učitavanju ikone: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1881,7 +1898,7 @@ msgstr ""
 "Možete nabaviti primerak sa:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Ikona „%s“ nije prisutna u temi"
@@ -1969,7 +1986,7 @@ msgstr "(nepoznato)"
 msgid "clear"
 msgstr "očistiti"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Izaberi sve"
 
@@ -2400,43 +2417,43 @@ msgstr "U_većaj"
 msgid "Zoom _Out"
 msgstr "U_manji"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM Obeleživač za s_leva-na-desno"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM Obeleživač za s_desna-na-levo"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE _ubacivanje sleva-na-desno"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE u_bacivanje sdesna-na-levo"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO pr_imoravanje sleva-na-desno"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO primorava_nje sdesna-na-levo"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Počni usmeren zapis"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _razmak bez širine"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ _spojnica bez širine"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ _nespojnica bez širine"
 
@@ -2518,7 +2535,7 @@ msgstr "Vijetnamski (VIQR)"
 msgid "X Input Method"
 msgstr "Iksov način unosa (XIM)"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Ne mogu da saznam podatke o datoteci „%s“: %s"
diff --git a/po/sr@ije.po b/po/sr@ije.po
index 2552c730f1..26afcef179 100644
--- a/po/sr@ije.po
+++ b/po/sr@ije.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-04-17 19:11+0200\n"
 "Last-Translator: Bojan Suzic <bojans@teol.net>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Не могу да отворим датотеку „%s“: %s"
@@ -33,7 +33,7 @@ msgstr "Слика „%s“ не садржи податке"
 
 # ово има највише смисла
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1306,20 +1306,20 @@ msgstr "Точак боја"
 msgid "Color Selection"
 msgstr "Избор боје"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Изабери _све"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Начини уноса"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Убаци контролни Уникод знак"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Неисправно име датотеке: %s"
@@ -1330,12 +1330,12 @@ msgid "Select A File"
 msgstr "Обриши датотеку"
 
 # ako je za "home directory", onda bi bilo dobro "licni direktorijum", ako je za "home page", onda za "licna stranica"
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Лично"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Радна површ"
@@ -1349,200 +1349,216 @@ msgstr "ништа"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr ""
 "Не могу да сазнам податке о %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 #, fuzzy
 msgid "Could not add a bookmark"
 msgstr ""
 "Не могу да додам обележивач за %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 #, fuzzy
 msgid "Could not remove bookmark"
 msgstr ""
 "Не могу да уклоним обележивач за %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Неисправно име датотеке: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 "Не могу да сазнам податке о %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, fuzzy, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Не могу да додам обележивач за %s зато што представља неисправно име путање."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Уклони"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Преименуј"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Директоријум"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Додај"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "Не могу да изаберем %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "Не могу да додам обележивач за %s зато што представља неисправно име путање."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "Отвори путању"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Прикажи са_кривене датотеке"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Датотеке"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Име:"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Величина"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Измјењен"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Направи _директоријум"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Име:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Разгледај остале директоријуме"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Сачувај у _директоријуму:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Направи у _директоријуму:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 #, fuzzy
 msgid "Cannot change to folder because it is not local"
 msgstr "Не могу да уђем у директоријум зато што није локални"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "пречица %s не постоји"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Преименуј"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "Не могу да изаберем %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Унесите име новог директоријума"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
@@ -1550,68 +1566,68 @@ msgstr[0] "%d бајт"
 msgstr[1] "%d бајта"
 msgstr[2] "%d бајтова"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Непознато"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Данас"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Јуче"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Направи у _директоријуму:"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 #, fuzzy
 msgid "The folder you specified is an invalid path."
 msgstr ""
 "Не могу да уђем у директоријум који сте навели зато што он представља "
 "неисправну путању."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, fuzzy, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 "Не могу да саставим име датотеке из „%s“ и „%s“:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "Не могу да изаберем %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Отвори путању"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Сачувај на путањи"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Путања: "
 
@@ -1812,7 +1828,8 @@ msgid "This file system does not support mounting"
 msgstr "Овај систем датотека не подржава прикључивање"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Систем датотека"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1914,7 +1931,7 @@ msgstr "_Гама вриједност"
 msgid "Error loading icon: %s"
 msgstr "Грешка при учитавању иконе: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1927,7 +1944,7 @@ msgstr ""
 "Можете набавити примерак са:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Икона „%s“ није присутна у теми"
@@ -2015,7 +2032,7 @@ msgstr "(непознато)"
 msgid "clear"
 msgstr "очистити"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Изабери све"
 
@@ -2455,43 +2472,43 @@ msgstr "У_већај"
 msgid "Zoom _Out"
 msgstr "У_мањи"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM Обележивач за с_лијева-на-десно"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM Обележивач за с_десна-на-лијево"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE _убацивање слијева-на-десно"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE у_бацивање сдесна-на-лијево"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO пр_иморавање слијева-на-десно"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO приморава_ње сдесна-на-лијево"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Почни усмјерен запис"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _размак без ширине"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ _спојница без ширине"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ _неспојница без ширине"
 
@@ -2574,7 +2591,7 @@ msgstr "Вијетнамски (VIQR)"
 msgid "X Input Method"
 msgstr "Иксов начин уноса (XIM)"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Не могу да сазнам податке о датотеци „%s“: %s"
diff --git a/po/sv.po b/po/sv.po
index 6b08de59ee..4b0d93ab70 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-01-23 16:55+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Misslyckades med att öppna filen \"%s\": %s"
@@ -31,7 +31,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Bildfilen \"%s\" innehåller inga data"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1268,20 +1268,20 @@ msgstr "Färghjul"
 msgid "Color Selection"
 msgstr "Färgval"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Markera _allt"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Inmatnings_metoder"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Infoga Unicode-styrtecken"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Ogiltigt filnamn: %s"
@@ -1290,12 +1290,12 @@ msgstr "Ogiltigt filnamn: %s"
 msgid "Select A File"
 msgstr "Välj en fil"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Hem"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Skrivbord"
@@ -1308,245 +1308,261 @@ msgstr "(Ingen)"
 msgid "Other..."
 msgstr "Annan..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Kunde inte hämta information om filen"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Kunde inte lägga till ett bokmärke"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Kunde inte ta bort bokmärke"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Mappen kunde inte skapas"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Ogiltigt filnamn"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Mappinnehållet kunde inte visas"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Kunde inte hämta information om \"%s\": %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Lägg till mappen \"%s\" till bokmärkena"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "LÄgg till den aktuella mappen till bokmärkena"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Lägg till de valda mapparna till bokmärkena"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Ta bort bokmärket \"%s\""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 "Kunde inte lägga till ett bokmärke för \"%s\" eftersom det är ett ogiltigt "
 "namn på en sökväg."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Ta bort"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Byt namn"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Genvägar"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Mapp"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Lägg till"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 #, fuzzy
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Lägg till den valda mappen till bokmärkena"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Ta bort markerat bokmärke"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Kunde inte välja objekt"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 "Kunde inte lägga till ett bokmärke för \"%s\" eftersom det är ett ogiltigt "
 "namn på en sökväg."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "_Lägg till i genvägar"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Öppna _plats"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Visa _dolda filer"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Filer"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Namn"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Storlek"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Ändrad"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Välj vilka typer av filer som visas"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Skapa mapp"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Bläddra efter andra mappar"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Spara i _mappen:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Skapa i _mappen:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Kan inte byta till mappen eftersom den inte är lokal"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Genvägen %s finns inte"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Byt namn"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Kunde inte montera %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Ange namnet på den nya mappen"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d byte"
 msgstr[1] "%d byte"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f kB"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f MB"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f GB"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Okänd"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Idag"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Igår"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Kan inte byta mapp"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Mappen du angav är en ogiltig sökväg."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Kunde inte bygga filnamnet från \"%s\" och \"%s\""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Kunde inte välja objekt"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Öppna plats"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Spara på plats"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Plats:"
 
@@ -1745,7 +1761,8 @@ msgid "This file system does not support mounting"
 msgstr "Detta filsystem stöder inte montering"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Filsystem"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1848,7 +1865,7 @@ msgstr "_Gammavärde"
 msgid "Error loading icon: %s"
 msgstr "Fel vid inläsning av ikonen: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1861,7 +1878,7 @@ msgstr ""
 "Du kan få tag i en kopia från:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Ikonen \"%s\" finns inte i temat"
@@ -1951,7 +1968,7 @@ msgstr "(okänd)"
 msgid "clear"
 msgstr "töm"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Markera allt"
 
@@ -2388,43 +2405,43 @@ msgstr "Zooma _in"
 msgid "Zoom _Out"
 msgstr "Zooma _ut"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM-märke för _vänster-till-höger"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM-märke för _höger-till-vänster"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE-inbäddning för vänster-till-höger"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE-inbäddning för höger-till-vänster"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO-åsidosättning för vänster-till-höger"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO-åsidosättning för höger-till-vänster"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF-_popriktningsformatering"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS-blanksteg _utan bredd"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ-_sammanslagare utan bredd"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ-_ickesammanslagare utan bredd"
 
@@ -2506,7 +2523,7 @@ msgstr "Vietnamesisk (VIQR)"
 msgid "X Input Method"
 msgstr "X-inmatningsmetod"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Kunde inte hämta information för filen \"%s\": %s"
diff --git a/po/ta.po b/po/ta.po
index 21d6942ab6..939d300846 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tamil Gtk 2.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-02-21 18:51-0600\n"
 "Last-Translator: Dinesh Nadarajah <dinesh_list@sbcglobal.net>\n"
 "Language-Team: Tamil <tamilinix@yahoogroups.com>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "'%s' கோப்பு திறக்க முடியவில்லை: %s"
@@ -26,7 +26,7 @@ msgid "Image file '%s' contains no data"
 msgstr "'%s' உருவக் கோப்பில் தரவு ஏதும் கிடையாது"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1260,20 +1260,20 @@ msgstr "சக்கரம்"
 msgid "Color Selection"
 msgstr "வண்ணம் தேர்ந்தெடுத்தல்"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "«¨Éò¨¾Ôõ ¦¾Ã¢× ¦ºö¸"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "உள்ளீட்பு _முறைகள்"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "யூனிகோட் கட்டுப்பாட்டு வரியுரு _சொருகவும்"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "செல்லுபடியாகாத கோப்பு பெயர்: %s"
@@ -1283,12 +1283,12 @@ msgstr "செல்லுபடியாகாத கோப்பு பெய�
 msgid "Select A File"
 msgstr "கோப்பை நீக்கு"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "இல்லம்"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "கணிமேசை"
@@ -1302,256 +1302,272 @@ msgstr "ஒன்றுமில்லை"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr "'%s' கோப்பின் தகவல் பெற முடியவில்லை: %s"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "செல்லுபடியாகாத கோப்பு பெயர்: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "'%s' கோப்பின் தகவல் பெற முடியவில்லை: %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "கழட்டுக"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_பெயர் மாற்று"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "அடைவு"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_சேர்"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_கழட்டுக"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "%s அடைவு உருவாக்க முடியவில்லை:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "தெரிவு _செய்தது:"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "கோப்புகள்"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 #, fuzzy
 msgid "Name"
 msgstr "வண்ணத்தின் பெயர்:"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "அளவு"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "மாற்றப்பட்டது"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "புதிய அடைவு"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 #, fuzzy
 msgid "_Name:"
 msgstr "வண்ணத்தின் பெயர்:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 #, fuzzy
 msgid "Save in _folder:"
 msgstr "புதிய அடைவு"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 #, fuzzy
 msgid "Create in _folder:"
 msgstr "புதிய அடைவு"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "%s குறுக்கு வழி கிடையாது"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_பெயர் மாற்று"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "%s அடைவு உருவாக்க முடியவில்லை:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "புதிய அடைவின் பெயரை உள்ளீடுக"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "தெரியாதது"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "இன்று"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "நேற்று"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "புதிய அடைவு"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "%s அடைவு உருவாக்க முடியவில்லை:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "தெரிவு _செய்தது:"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 #, fuzzy
 msgid "_Location:"
 msgstr "தெரிவு _செய்தது:"
@@ -1746,7 +1762,8 @@ msgid "This file system does not support mounting"
 msgstr ""
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "கோப்பு அமைப்பு"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1847,7 +1864,7 @@ msgstr "Gamma மதிப்பு"
 msgid "Error loading icon: %s"
 msgstr "குறுபடம் ஏற்றும்போது பிழை: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1856,7 +1873,7 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr ""
@@ -1944,7 +1961,7 @@ msgstr "(தெரியாதது)"
 msgid "clear"
 msgstr "துப்பரவாக்கு"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "அனைத்தையும் தெரிவுசெய்க"
 
@@ -2380,43 +2397,43 @@ msgstr "பெரிதாக்கு"
 msgid "Zoom _Out"
 msgstr "சிறிதாக்கு"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM _இடதிலிருந்து-வலதுவரை குறிப்பிடு"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM _வலதிலிருந்து-இடதுவரை குறிப்பிடு"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr ""
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr ""
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr ""
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr ""
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr ""
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr ""
 
@@ -2499,7 +2516,7 @@ msgstr "Vietnamese (VIQR)"
 msgid "X Input Method"
 msgstr "X உள்ளீட்டு முறை"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "'%s' கோப்பின் தகவல் பெற முடியவில்லை: %s"
diff --git a/po/th.po b/po/th.po
index 531aa5e531..ea4f7497e1 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-06-28 17:11+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <L10n@opentle.net>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "เปิดแฟ้ม '%s' ไม่สำเร็จ: %s"
@@ -28,7 +28,7 @@ msgid "Image file '%s' contains no data"
 msgstr "แฟ้มรูป '%s' ไม่มีข้อมูล"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1223,20 +1223,20 @@ msgstr "วงสี"
 msgid "Color Selection"
 msgstr "เลือกสี"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "เลือกทั้ง_หมด"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Input _Methods"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "แ_ทรกตัวอักษรควบคุมของยูนิโค้ด"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "ชื่อแฟ้มใช้ไม่ได้: %s"
@@ -1245,12 +1245,12 @@ msgstr "ชื่อแฟ้มใช้ไม่ได้: %s"
 msgid "Select A File"
 msgstr "เลือกแฟ้ม"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "บ้าน"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "พื้นโต๊ะ"
@@ -1263,23 +1263,23 @@ msgstr "(ไม่มี)"
 msgid "Other..."
 msgstr "อื่นๆ ..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "ไม่สามารถอ่านข้อมูลเกี่ยวกับแฟ้มนี้"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "ไม่สามารถเพิ่มที่คั่นหน้า"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "ไม่สามารถลบที่คั่นหน้า"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "ไม่สามารถสร้างโฟลเดอร์ได้"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1287,216 +1287,232 @@ msgstr ""
 "ไม่สามารถสร้างโฟลเดอร์ที่กำหนดได้ เนื่องจากมีแฟ้มชื่อซ้ำกันอยู่ก่อนแล้ว "
 "กรุณาลองใช้ชื่ออื่นตั้งชื่อโฟลเดอร์ หรือมิฉะนั้นก็เปลี่ยนชื่อแฟ้มดังกล่าวเสียก่อน"
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "ชื่อแฟ้มใช้ไม่ได้"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "ไม่สามารถแสดงเนื้อหาของโฟลเดอร์ได้"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "ไม่สามารถอ่านข้อมูลเกี่ยวกับ '%s': %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "เพิ่มโฟลเดอร์ '%s' ลงในที่คั่นหน้า"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "เพิ่มโฟลเดอร์ปัจจุบันลงในที่คั่นหน้า"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "เพิ่มโฟลเดอร์ที่เลือกอยู่ลงในที่คั่นหน้า"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "ลบที่คั่นหน้า '%s'"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "ไม่สามารถเพิ่มที่คั่นหน้าให้กับ '%s' ได้ เพราะไม่ใช่ตำแหน่งที่ใช้ได้"
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "เอา_ออก"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "เปลี่ยนชื่อ..."
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "จุดเชื่อม"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "โฟลเดอร์"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "เ_พิ่ม"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "เพิ่มโฟลเดอร์ที่เลือกอยู่ลงในที่คั่นหน้า"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "เ_อาออก"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "ลบที่คั่นหน้าที่เลือกอยู่"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "เลือกรายการไม่สำเร็จ"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "ไม่สามารถเพิ่มที่คั่นหน้าให้กับ '%s' ได้ เพราะไม่ใช่ตำแหน่งที่ใช้ได้"
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "เ_พิ่มลงในที่คั่นหน้า"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "เปิด_ตำแหน่ง"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "แสดงแฟ้ม_ซ่อน"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "แฟ้ม"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "ชื่อ"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "ขนาด"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "แก้ไขเมื่อ"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "เลือกชนิดของแฟ้มที่จะแสดง"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "สร้างโฟ_ลเดอร์"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_ชื่อ:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "เรียกดูโฟลเดอร์อื่น"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "บันทึกในโ_ฟลเดอร์:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "สร้างในโ_ฟลเดอร์:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "ไปโฟลเดอร์ที่กำหนดไม่สำเร็จ เพราะไม่ใช่โฟลเดอร์ในเครื่องนี้"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "จุดเชื่อม %s ไม่มีอยู่จริง"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "เ_ปลี่ยนชื่อ"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "เมานท์ %s ไม่สำเร็จ"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "พิมพ์ชื่อของโฟลเดอร์ใหม่"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d ไบต์"
 msgstr[1] "%d ไบต์"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "ไม่รู้จัก"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "วันนี้"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "เมื่อวาน"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "เปลี่ยนโฟลเดอร์ไม่สำเร็จ"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "โฟลเดอร์ที่กำหนด เป็นพาธที่ใช้ไม่ได้"
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "ไม่สามารถสร้างชื่อแฟ้มจาก '%s' และ '%s'"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "เลือกรายการไม่สำเร็จ"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "เปิดตำแหน่ง"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "บันทึกลงในตำแหน่ง"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "ตำ_แหน่ง:"
 
@@ -1694,7 +1710,8 @@ msgid "This file system does not support mounting"
 msgstr "ระบบแฟ้มนี้ไม่รองรับการเมานท์"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "ระบบแฟ้ม"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1795,7 +1812,7 @@ msgstr "ค่าแ_กมมา"
 msgid "Error loading icon: %s"
 msgstr "ไม่สามารถโหลดไอคอน: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1807,7 +1824,7 @@ msgstr ""
 "คุณอาจจะต้องติดตั้งมัน คุณสามารถคัดลอกมันมาจาก\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "ชุดตกแต่งไม่มีไอคอน '%s'"
@@ -1895,7 +1912,7 @@ msgstr "(ไม่รู้จัก)"
 msgid "clear"
 msgstr "ล้างออก"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "เลือกทั้งหมด"
 
@@ -2321,43 +2338,43 @@ msgstr "ขย_าย"
 msgid "Zoom _Out"
 msgstr "_ย่อ"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM _Left-to-right mark"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM _Right-to-left mark"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Left-to-right _embedding"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Right-to-left e_mbedding"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Left-to-right _override"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Right-to-left o_verride"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Pop directional formatting"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _Zero width space"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Zero width _joiner"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Zero width _non-joiner"
 
@@ -2440,7 +2457,7 @@ msgstr "เวียดนาม (VIQR)"
 msgid "X Input Method"
 msgstr "X Input Method"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "ไม่สามารถเรียกข้อมูลสำหรับแฟ้ม '%s': %s"
diff --git a/po/tk.po b/po/tk.po
index faf0fb8b06..bf92a7ffd8 100644
--- a/po/tk.po
+++ b/po/tk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-05-25 17:46+0330\n"
 "Last-Translator: Gurban Mühemmet Tewekgeli <gmtavakkoli@yahoo.com>\n"
 "Language-Team: Turkmen <kakilikgroup@yahoo.com>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr ""
@@ -31,7 +31,7 @@ msgid "Image file '%s' contains no data"
 msgstr ""
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1222,20 +1222,20 @@ msgstr "Renk Saýlawy"
 msgid "Color Selection"
 msgstr "Renk Saýlawy"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "_Ehlini Saýla"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr ""
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "Uniköd kontrol karakterni _girdir"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Maýyp faýl ady: %s"
@@ -1245,12 +1245,12 @@ msgstr "Maýyp faýl ady: %s"
 msgid "Select A File"
 msgstr "Faýly Poz"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Öý"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Desktap"
@@ -1264,247 +1264,263 @@ msgstr "hiç"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Maýyp faýl ady: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Çykar"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Adyny Ewez Et"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Halta"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Ekle"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Çykar"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Renk Saýlawy"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "Ýeri Aç"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Faýllar"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Ad"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Ululyk"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Üýtgän"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "_Halta Bejer"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Ad:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "Haltalar üçin _ahtar"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Bu haltaniň içinde gaýd etň:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Bu haltaniň içinde bejer:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 #, fuzzy
 msgid "Cannot change to folder because it is not local"
 msgstr "Haltany ýerly bolmansaň ony üýtgedip bolmaýar"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "%s gysga ýoly ýok"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Adyny Ewez Et"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Haltnyň adyny ýazyň"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d baýt"
 msgstr[1] "%d baýt"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Natanyş"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Bugun"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Düýn"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Bu haltaniň içinde bejer:"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr "Renk Saýlawy"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Ýeri Aç"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "Ýeri Aç"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Ýer"
 
@@ -1690,8 +1706,9 @@ msgid "This file system does not support mounting"
 msgstr ""
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
-msgstr ""
+#, fuzzy
+msgid "File System"
+msgstr "Faýllar"
 
 #: gtk/gtkfilesystemunix.c:796
 #, c-format
@@ -1791,7 +1808,7 @@ msgstr "_Gamma mykdary"
 msgid "Error loading icon: %s"
 msgstr "%s tymsaly ýüklemekde hata boldy"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1800,7 +1817,7 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "%s tymsaly temde ýok"
@@ -1888,7 +1905,7 @@ msgstr "(natanyş)"
 msgid "clear"
 msgstr "durla"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Ehlini Saýla"
 
@@ -2323,43 +2340,43 @@ msgstr "_Ulalt"
 msgid "Zoom _Out"
 msgstr "_Kiçelt"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM _Soldan-saga alamat"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM _Sagdan sola alamat"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Soldan saga _geýdirme"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLKE Sagdan sola g_eýdirme"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr ""
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr ""
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr ""
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr ""
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr ""
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr ""
 
@@ -2441,7 +2458,7 @@ msgstr ""
 msgid "X Input Method"
 msgstr ""
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index a852b68020..3eadab8a5e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-04-09 17:33+0300\n"
 "Last-Translator: Baris Cicek <baris@teamforce.name.tr>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 # gdk-pixbuf/gdk-pixbuf-animation.c:144 gdk-pixbuf/gdk-pixbuf-io.c:516
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "'%s' dosyası açılamadı: %s"
@@ -34,7 +34,7 @@ msgstr "Resim dosyası '%s' hiç bilgi içermiyor."
 
 # gdk-pixbuf/gdk-pixbuf-animation.c:205 gdk-pixbuf/gdk-pixbuf-io.c:571
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1421,22 +1421,22 @@ msgid "Color Selection"
 msgstr "Renk Seçimi"
 
 # gtk/gtklabel.c:251
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "_Tümünü Seç"
 
 # gtk/gtkentry.c:3653 gtk/gtktextview.c:5336
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Girdi _Yöntemleri"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Unikod Kontrol Karakteri Yerleştir"
 
 # gdk-pixbuf/io-xbm.c:284
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Geçersiz dosya adı: %s"
@@ -1448,12 +1448,12 @@ msgid "Select A File"
 msgstr "Dosya Sil"
 
 # gtk/gtkstock.c:287
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Başlangıç"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Masaüstü"
@@ -1468,278 +1468,295 @@ msgstr "yok"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr ""
 "%s hakkında bilgi alınamadı:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 #, fuzzy
 msgid "Could not add a bookmark"
 msgstr ""
 "%s için yer imi eklenemedi:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 #, fuzzy
 msgid "Could not remove bookmark"
 msgstr ""
 "%s için yer imi silinemedi:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
 # gdk-pixbuf/io-xbm.c:284
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Geçersiz dosya adı: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 "%s hakkında bilgi alınamadı:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, fuzzy, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "%s için yer imi eklenemedi çünkü o geçerli bir yol adı değil."
 
 # gtk/gtkstock.c:303
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Kaldır"
 
 # gtk/gtkfilesel.c:1351
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "Ye_niden adlandır"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
 # gtk/gtkfilesel.c:651
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Klasör"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Ekle"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
 # gtk/gtkstock.c:303
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Kaldır"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "%s seçilemedi:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "%s için yer imi eklenemedi çünkü o geçerli bir yol adı değil."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "Konum Aç"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "_Gizli Dosyaları Göster"
 
 # gtk/gtkfilesel.c:651
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Dosyalar"
 
 # gtk/gtkcolorsel.c:1833
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "İsim"
 
 # gtk/gtkfontsel.c:310
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Boyut"
 
 # gtk/gtksizegroup.c:241
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Değiştirilmiş"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "_Klasör Oluştur"
 
 # gtk/gtkcolorsel.c:1833
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_İsim:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "Diğer klasörler için _gözat:"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "_Klasör içine kaydet:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "_Klasör içinde oluştur:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 #, fuzzy
 msgid "Cannot change to folder because it is not local"
 msgstr "Belirttiğiniz klasör yerel olmadığı için değiştirilemiyor"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "%s kısayolu bulunmuyor"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+# gtk/gtkfilesel.c:1351
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "Ye_niden adlandır"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "%s seçilemedi:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Yeni klasörün adını girin"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d bayt"
 msgstr[1] "%d bayt"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
 # gtk/gtkinputdialog.c:577
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
 # gtk/gtkwindow.c:372
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Bugün"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Dün"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "_Klasör içinde oluştur:"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 #, fuzzy
 msgid "The folder you specified is an invalid path."
 msgstr "Belirttiğiniz klasör geçerli bir yol olmadığı için değiştirilemiyor."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, fuzzy, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 "'%s' ile '%s' kullanılarak dosya ismi oluşturulamadı:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "%s seçilemedi:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Konum Aç"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Konum içine Kaydet"
 
 # gtk/gtkfilesel.c:1795
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Konum:"
 
@@ -1974,7 +1991,8 @@ msgstr "Bu dosya sistemi bağlama işlemini desteklemiyor"
 
 # gtk/gtkfilesel.c:651
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Dosya sistemi"
 
 # gdk-pixbuf/gdk-pixbuf-io.c:473
@@ -2089,7 +2107,7 @@ msgstr "_Gama değeri"
 msgid "Error loading icon: %s"
 msgstr "Simge yüklenirken hata: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -2102,7 +2120,7 @@ msgstr ""
 "Kopyasını buradan temin edebilirsiniz:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "'%s' simgesi tema içinde bulunmuyor"
@@ -2211,7 +2229,7 @@ msgid "clear"
 msgstr "temiz"
 
 # gtk/gtklabel.c:251
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Tümünü Seç"
 
@@ -2705,43 +2723,43 @@ msgstr "_Yakınlaştır"
 msgid "Zoom _Out"
 msgstr "_Uzaklaştır"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM Soldan sağa işar_etleme"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM Sağdan sola işa_retleme"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Soldan sağa gö_mme"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Sağdan sola g_ömme"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Soldan sağa z_orlama"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Sağdan sola _zorlama"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Pop yön biçimleme"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _Sıfır genişlik alanı"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWN sıfır genişlikte b_ağlantılı"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ sıfır genişlikte _bağlantısız"
 
@@ -2833,7 +2851,7 @@ msgid "X Input Method"
 msgstr "X Girdi Yöntemi"
 
 # gdk-pixbuf/gdk-pixbuf-io.c:473
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "'%s' dosyası için bilgiler alınamadı: %s"
diff --git a/po/uk.po b/po/uk.po
index c8df9ab72d..1c38d5c3b5 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 1.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-02-09 14:03+0300\n"
 "Last-Translator: Maxim Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <linux@linux.org.ua>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Не вдається відкрити файл \"%s\": %s"
@@ -29,7 +29,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Файл зображення \"%s\" не містить даних"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1272,20 +1272,20 @@ msgstr "Колірний круг"
 msgid "Color Selection"
 msgstr "Вибір кольору"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Виді_лити все"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "М_етоди вводу"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "Вс_тавити керівний символ Юнікоду"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Неправильна назва файлу: %s"
@@ -1294,12 +1294,12 @@ msgstr "Неправильна назва файлу: %s"
 msgid "Select A File"
 msgstr "Виберіть файл"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Домашній каталог"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Стільниця"
@@ -1312,181 +1312,197 @@ msgstr "(Немає)"
 msgid "Other..."
 msgstr "Інший..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Не вдається отримати інформацію про файл"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Не вдається додати закладку"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Не вдається видалити закладку"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Не вдається створити теку"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Неправильна назва файлу"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Не вдається відобразити вміст теки"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Не вдається отримати інформацію про '%s': %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Додати теку '%s' до закладок"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Додати поточну теку до закладок"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Додати виділені теки до закладок"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Видалити закладку '%s'"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "Не вдається додати закладку для '%s', тому що цей шлях - неправильний."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Видалити"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Перейменувати..."
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Ярлики"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Тека"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Додати"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 #, fuzzy
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Додати вибрану теку до закладок"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "В_идалити"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Видалити виділену закладку"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Не вдається виділити елемент"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "Не вдається додати закладку для '%s', тому що цей шлях - неправильний."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "_Додати до ярликів"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Відкрити за _адресою"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Показати при_ховані файли"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Файли"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Назва"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Розмір"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Змінено"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Виберіть типи файлів, що відображаються"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Створити _теку"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Назва:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "О_глянути інші теки"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Зберегти у _теку:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Створити у _теці:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Не вдається перейти у вказану теку, тому що вона не локальна"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Ярлика %s не існує"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "Перей_менувати"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Не вдається підключити %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Введіть назву нової теки"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
@@ -1494,59 +1510,59 @@ msgstr[0] "%d байт"
 msgstr[1] "%d байти"
 msgstr[2] "%d байтів"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f Кб"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f Мб"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f Гб"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Невідомо"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Сьогодні"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Вчора"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Не вдається змінити теку"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Вказана вами тека не є правильним шляхом."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Не вдається утворити назву файлу з '%s' та '%s'"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Не вдається виділити елемент"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Відкрити за адресою"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Зберегти за адресою"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Адреса:"
 
@@ -1754,7 +1770,8 @@ msgid "This file system does not support mounting"
 msgstr "Ця файлова система не підтримує монтування"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Файлова система"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1857,7 +1874,7 @@ msgstr "_Гама-значення"
 msgid "Error loading icon: %s"
 msgstr "Помилка завантаження значка: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1870,7 +1887,7 @@ msgstr ""
 "Завантажити тему можна з:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Значок \"%s\" відсутній у темі"
@@ -1958,7 +1975,7 @@ msgstr "(невідомо)"
 msgid "clear"
 msgstr "очистити"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Виділити все"
 
@@ -2385,43 +2402,43 @@ msgstr "З_більшити"
 msgid "Zoom _Out"
 msgstr "З_меншити"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM Позначка з_ліва направо"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM Позначка с_права наліво"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Вс_тавка зліва направо"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "LRE Вст_авка справа наліво"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO Пе_рекривання зліва направо"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Пере_кривання справа наліво"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF П_опередній напрям"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS _Нульовий пропуск"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Нульовий _з'єднувач"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Нульовий _роз'єднувач"
 
@@ -2503,7 +2520,7 @@ msgstr "В'єтнамська (VIQR)"
 msgid "X Input Method"
 msgstr "Метод XInput"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Не вдається отримати інформацію про файл '%s': %s"
diff --git a/po/uz.po b/po/uz.po
index a7a66d50c8..f4e2854a3a 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+.gtk-2-4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-07-19 18:54+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <kmashrab@uni-bremen.de>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr ""
@@ -27,7 +27,7 @@ msgid "Image file '%s' contains no data"
 msgstr ""
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1217,20 +1217,20 @@ msgstr ""
 msgid "Color Selection"
 msgstr ""
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr ""
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr ""
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr ""
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr ""
@@ -1240,12 +1240,12 @@ msgstr ""
 msgid "Select A File"
 msgstr "Файллни ўчириш"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Уй"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr ""
@@ -1258,241 +1258,257 @@ msgstr ""
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Fayl nomi"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "Olib _tashlash"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Номини ўзгартириш"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Жилд"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "Қў_шиш"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "Олиб _ташлаш"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 msgid "Could not select file"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Файллар"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Номи"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "_Жилд яратиш"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Номи:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Ж_илдга сақлаш:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Ж_илдда яратиш:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Номини ўзгартириш"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Ж_илдда яратиш:"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr ""
 
@@ -1678,7 +1694,8 @@ msgid "This file system does not support mounting"
 msgstr ""
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Файл тизими"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1779,7 +1796,7 @@ msgstr ""
 msgid "Error loading icon: %s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1788,7 +1805,7 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr ""
@@ -1876,7 +1893,7 @@ msgstr ""
 msgid "clear"
 msgstr "тозалаш"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr ""
 
@@ -2312,43 +2329,43 @@ msgstr "К_атталаштириш"
 msgid "Zoom _Out"
 msgstr "К_ичиклаштириш"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr ""
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr ""
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr ""
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr ""
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr ""
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr ""
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr ""
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr ""
 
@@ -2430,7 +2447,7 @@ msgstr ""
 msgid "X Input Method"
 msgstr ""
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr ""
diff --git a/po/uz@Latn.po b/po/uz@Latn.po
index c2b06b51ff..276e74ef22 100644
--- a/po/uz@Latn.po
+++ b/po/uz@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk20\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2003-09-06 00:29+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr ""
@@ -28,7 +28,7 @@ msgid "Image file '%s' contains no data"
 msgstr ""
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1219,20 +1219,20 @@ msgstr ""
 msgid "Color Selection"
 msgstr ""
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr ""
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr ""
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr ""
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr ""
@@ -1242,13 +1242,13 @@ msgstr ""
 msgid "Select A File"
 msgstr "Fayllni o'chirish"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 #, fuzzy
 msgid "Home"
 msgstr "_Uy"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr ""
@@ -1261,247 +1261,263 @@ msgstr ""
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "Fayl nomi"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "Olib _tashlash"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Nomini o'zgartirish"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 #, fuzzy
 msgid "Folder"
 msgstr "Fayllar"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Qo'shish"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "Olib _tashlash"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 msgid "Could not select file"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Fayllar"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 #, fuzzy
 msgid "Name"
 msgstr "Fayl nomi"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "Fayllar"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 #, fuzzy
 msgid "_Name:"
 msgstr "Fayl nomi"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 #, fuzzy
 msgid "Save in _folder:"
 msgstr "Fayllar"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 #, fuzzy
 msgid "Create in _folder:"
 msgstr "Fayllar"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Nomini o'zgartirish"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Fayllar"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr ""
 
@@ -1691,7 +1707,7 @@ msgstr ""
 
 #: gtk/gtkfilesystemunix.c:639
 #, fuzzy
-msgid "Filesystem"
+msgid "File System"
 msgstr "Fayllar"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1792,7 +1808,7 @@ msgstr ""
 msgid "Error loading icon: %s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1801,7 +1817,7 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr ""
@@ -1892,7 +1908,7 @@ msgstr ""
 msgid "clear"
 msgstr "_Tozalash"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr ""
 
@@ -2333,43 +2349,43 @@ msgstr "K_attalashtirish"
 msgid "Zoom _Out"
 msgstr "K_ichiklashtirish"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr ""
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr ""
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr ""
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr ""
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr ""
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr ""
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr ""
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr ""
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr ""
 
@@ -2451,7 +2467,7 @@ msgstr ""
 msgid "X Input Method"
 msgstr ""
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 48a90c56c6..d8752c47a1 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gtk+ VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-07-08 15:17+0700\n"
 "Last-Translator: pclouds <pclouds@vnlinux.org>\n"
 "Language-Team: GnomeVN <gnomevi-list@users.sourceforge.net>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Lỗi mở tập tin '%s': %s"
@@ -27,7 +27,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Tập tin ảnh '%s' không chứa dữ liệu"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1245,20 +1245,20 @@ msgstr "Vòng màu"
 msgid "Color Selection"
 msgstr "Chọn màu"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Chọn _Tất cả"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Kiểu gõ"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Chèn ký tự điều khiển unicode"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Tên tập tin không hợp lệ: %s"
@@ -1267,12 +1267,12 @@ msgstr "Tên tập tin không hợp lệ: %s"
 msgid "Select A File"
 msgstr "Chọn tập tin"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Home"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Desktop"
@@ -1285,23 +1285,23 @@ msgstr "(không)"
 msgid "Other..."
 msgstr "Khác..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Không thể lấy thông tin về tập tin này"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Không thể thêm đánh dấu"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Không thể loại bỏ đánh dấu"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Không thể tạo thư mục"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1309,215 +1309,231 @@ msgstr ""
 "Không thể tạo thư mục, vì đã có một tập tin với tên đó rồi. Vui lòng dùng "
 "tên khác hoặc đổi tên tập tin trước."
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Tên tập tin không hợp lệ"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Không thể xem nội dung thư mục"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Không thể lấy thông tin về '%s': %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Thêm thư mục '%s' thành Đánh dấu"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Thêm thư mục hiện thời thành Đánh dấu"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Thêm thư mục được chọn thành Đánh dấu"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Bỏ đánh dấu '%s'"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "Không thể thêm đánh dấu cho '%s' vì nó không phải là đường dẫn hợp lệ."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "Loại bỏ"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "Đổi tên..."
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Lối tắt"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Thư mục"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "T_hêm"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Thêm thư mục được chọn làm đánh dấu"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Loại bỏ"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Loại bỏ đánh dấu được chọn"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 msgid "Could not select file"
 msgstr "Không thể chọn tập tin"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "Không thể chọn tập tin '%s' vì nó không phải là đường dẫn hợp lệ."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "Thêm đánh dấu"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "_Mở địa chỉ"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "_Hiện tập tin ẩn"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Tập tin"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Tên"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Kích thước"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Hiệu chỉnh"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Chọn loại tập tin cần xem"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Tạo _Thư mục"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Tên:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Duyệt thư mục khác"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Lưu trong _thư mục:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Tạo trong _thư mục:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Không thể đổi thư mục vì nó không phải là thư mục cục bộ"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Lối tắt %s không tồn tại"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "Đổi _tên"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Không thể gắn kết %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Hãy nhập tên cho thư mục mới"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d byte"
 msgstr[1] "%d byte"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Hôm nay"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Hôm qua"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Không thể đổi thư mục"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Thư mục bạn yêu cầu không hợp lệ."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Không thể tạo tên tập tin từ '%s' và '%s'"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Không thể chọn"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Mở Địa chỉ"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Lưu vào Địa chỉ"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "Đị_a chỉ:"
 
@@ -1716,7 +1732,8 @@ msgid "This file system does not support mounting"
 msgstr "Hệ thống tập tin này không hỗ trợ gắn kết"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Hệ thống Tập tin"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1817,7 +1834,7 @@ msgstr "Giá trị _Gamma"
 msgid "Error loading icon: %s"
 msgstr "Lỗi nạp biểu tượng: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1830,7 +1847,7 @@ msgstr ""
 "Bạn có thể lấy từ:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Biểu tượng '%s' không có trong sắc thái"
@@ -1918,7 +1935,7 @@ msgstr "(không biết)"
 msgid "clear"
 msgstr "xoá"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Chọn tất cả"
 
@@ -2344,43 +2361,43 @@ msgstr "Phóng _to"
 msgid "Zoom _Out"
 msgstr "Thu _nhỏ"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "_LRM Đánh dấu Phải-sang-trái"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "_RLM Đánh dấu Trái-sang-phải"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE _Nhúng Trái-sang-phải"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE N_húng Phải-sang-trái"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "Ghi đè LRO Trái-sang-phải"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "Ghi đè RLO Phải-sang-trái"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "a"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr ""
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr ""
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr ""
 
@@ -2462,7 +2479,7 @@ msgstr "Việt Nam (VIQR)"
 msgid "X Input Method"
 msgstr "Phương thức nhập XIM"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Không thể lấy thông tin cho tập tin '%s': %s"
diff --git a/po/wa.po b/po/wa.po
index 5b029676e1..deb9d0317f 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk20 1.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2004-08-05 22:42+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Dji n' a savou drovi li fitchî «%s»: %s"
@@ -33,7 +33,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Li fitchî imådje «%s» n' a nole dinêye dvins."
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1258,20 +1258,20 @@ msgstr "Rowe des coleurs"
 msgid "Color Selection"
 msgstr "Tchoezixhaedje del coleur"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Tchoezi _totafwait"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "_Metôdes d' intrêye"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Sititchî caractere di contrôle unicôde"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "No d' fitchî nén valide: %s"
@@ -1281,12 +1281,12 @@ msgstr "No d' fitchî nén valide: %s"
 msgid "Select A File"
 msgstr "Disfacer li fitchî"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Måjhon"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "Sicribanne"
@@ -1300,265 +1300,281 @@ msgstr "nole"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr ""
 "Dji n' sai nén aveur des informåcions so %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 #, fuzzy
 msgid "Could not add a bookmark"
 msgstr ""
 "Dji n' sai radjouter ene rimåke po %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 #, fuzzy
 msgid "Could not remove bookmark"
 msgstr ""
 "Dji n' sai oister l' rimåke po %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "No d' fitchî nén valide: %s"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr ""
 "Dji n' sai nén aveur des informåcions so %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, fuzzy, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "Dji n' sai radjouter ene rimåke po %s ca c' est on tchmin nén valide."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Oister"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Rilomer"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Rascourtis"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Ridant"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Radjouter"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Oister"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "Dji n' a nén savou tchoezi %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "Dji n' sai radjouter ene rimåke po %s ca c' est on tchmin nén valide."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "Drovi eplaeçmint"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Mostrer les fitchîs _catchîs"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "Fitchîs"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "No"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Grandeu"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Candjî"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Ahiver _ridant"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_No:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Foyter dins ds ôtes ridants"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Schaper e _ridant:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Ahiver e _ridant:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Nén possibe di candjî viè l' ridant, ca c' est nén on ridant locå"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, fuzzy, c-format
 msgid "Shortcut %s does not exist"
 msgstr "li rascourti %s n' egzistêye nén"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Rilomer"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "Dji n' a nén savou tchoezi %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Tapez l' no do novea ridant"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d octet"
 msgstr[1] "%d octets"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f Ko"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f Mo"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f Go"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Nén cnoxhou"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Ouy"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Ayir"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "Ahiver e _ridant:"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 #, fuzzy
 msgid "The folder you specified is an invalid path."
 msgstr ""
 "Dji n' sai aler sol ridant ki vos dmandez ca c' est nén on tchmin valide."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, fuzzy, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 "Dji n' sai nén fé on no d' fitchî avou «%s» eyet «%s»:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "Dji n' a nén savou tchoezi %s:\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Drovi eplaeçmint"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Schaper e l' eplaeçmint"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Eplaeçmint:"
 
@@ -1763,7 +1779,8 @@ msgid "This file system does not support mounting"
 msgstr "Ci sistinme di fitchîs chal èn sopoite nén l' montaedje"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Sistinme di fitchîs"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1866,7 +1883,7 @@ msgstr "Valixhance _gama"
 msgid "Error loading icon: %s"
 msgstr "Åk n' a nén stî come dji sayive di tcherdjî l' imådjete: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1879,7 +1896,7 @@ msgstr ""
 "Vos ndè ploz aveur ene copeye di:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "L' imådjete «%s» n' est nén prezinte dins l' tinme"
@@ -1967,7 +1984,7 @@ msgstr "(nén cnoxhou)"
 msgid "clear"
 msgstr "netyî"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr ""
 "Tchoezi\n"
@@ -2403,45 +2420,45 @@ msgstr "_Zoumer"
 msgid "Zoom _Out"
 msgstr "_Diszoumer"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "_LRM - måke di scrijhaedje di hintche-a-droete"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "_RLM - måke di scrijhaedje di droete-a-hintche"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LR_E - måke di ravalé scrijhaedje di hintche-a-droete"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE - _måke di ravalé scrijhaedje di droete-a-hintche"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr ""
 "LR_O - måke di foirçaedje (override) do scrijhaedje di hintche-a-droete"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr ""
 "RLO - måke di foirçaedje (o_verride) do scrijhaedje di droete-a-hintche"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr ""
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "_ZWS - blanc sins lårdjeu"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZW_J - måke di djondaedje sins lårdjeu"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZW_NJ - måke di nén-djondaedje sins lårdjeu"
 
@@ -2524,7 +2541,7 @@ msgstr "Vietnamyin (VIQR)"
 msgid "X Input Method"
 msgstr "Intrêye viè on sierveu XIM"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Dji n' a nén savou aveur des informåcions pol fitchî «%s»: %s"
diff --git a/po/xh.po b/po/xh.po
index e642d4eb59..99f9614278 100644
--- a/po/xh.po
+++ b/po/xh.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-02-08 13:20+0200\n"
 "Last-Translator: Canonical Ltd <translations@canonical.com>\n"
 "Language-Team: Xhosa <xh-translate@ubuntu.com>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Akuphumelelanga ukuvula ifayili '%s': %s"
@@ -29,7 +29,7 @@ msgid "Image file '%s' contains no data"
 msgstr "Ifayili yemifanekiso '%s' ayiqulathanga data"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1283,20 +1283,20 @@ msgstr "Ivili lemibala"
 msgid "Color Selection"
 msgstr "Khetha Umbala"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "Khetha _Yonke"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "Iindlela _zolwazi olungenisiweyo"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "_Faka i- Unicode Control Character"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "Igama lefayili elingavumelekanga: %s"
@@ -1305,12 +1305,12 @@ msgstr "Igama lefayili elingavumelekanga: %s"
 msgid "Select A File"
 msgstr "Khetha Ifayili"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "Ekhaya"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "I-Desktop"
@@ -1323,242 +1323,258 @@ msgstr "(Nanye)"
 msgid "Other..."
 msgstr "Enye..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "Alufumaneki ulwazi ngale fayili"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "Asinakuyongeza le bookmark"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "Asinako ukuyisusa le-bookmark"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "Esi siqulathi sefayili asinakwenzeka"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "Igama lefayili alisebenzi"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "Okuqulethwe sisiqulathi seefayili akuvelanga"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "Alufumaneki ulwazi nge- '%s': %s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Yongeza isiqulathi sefayili '%s' kwi-bookmarks"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "Yongeza esi siqulathi sefayili osenzayo kwi-bookmarks"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "Yongeza iziqulathi zeefayili ezikhethiweyo kwii-bookmarks"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Susa i-bookmark '%s'"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "Akunakongeza i-bookmark ye- '%s' kuba asilogama lendlela evunyiweyo."
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "_Susa"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "_Yinike elinye igama"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "Izinqumlisi"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "Isiqulathi seefayili"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "_Yongeza"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 #, fuzzy
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Yongeza isiqulathi seefayili esikhethileyo kwi-Bookmarks"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "_Susa"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "Susa i-bookmark ekhethiweyo"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "Ayikwazanga ukukhetha into"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "Akunakongeza i-bookmark ye- '%s' kuba asilogama lendlela evunyiweyo."
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 #, fuzzy
 msgid "_Add to Bookmarks"
 msgstr "_Yongeza izinqumlisi"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "Vula _Indawo"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "Bonisa _iiFayili eziFihliweyo"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "iiFayili"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "Igama"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "Ubungakanani"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "Elungisiweyo"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "Khetha iindidi zeefayili ezibonisiweyo"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "Dala isiqulathi_seefayili"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "_Igama:"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "_Khangela kwezinye iziqulathi zeefayili"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "Gcina kwi _siqulathi seefayili:"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "Dalela kwi _siqulathi seefayili:"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "Awunakuguqukela kwisiqulathi seefayili kuba asinakufikeleleka ngqo"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Isinqumlisi %s asikho"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "_Yinike elinye igama"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "Akunakuyifaka kwisakhelo %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "Bhala igama lesiqulathi seefayili esitsha"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "i-%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "i-%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "i-%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "Ayaziwa"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "Namhlanje"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "Izolo"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "Akunakusitshintsha esi siqulathi seefayili"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "Isiqulathi seefayili osibalulayo asisebenzi."
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "Akunakwakha gama lefayili kwi- '%s' and '%s'"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "Ayikwazanga ukukhetha into"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "Vula indawo"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "Yigcine kule ndawo"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "_Indawo:"
 
@@ -1762,7 +1778,8 @@ msgid "This file system does not support mounting"
 msgstr "Esi sixokelelwano sefayili asikuxhasi ukufakwa kwisakhelo"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "Isixokelelwano seefayili"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1865,7 +1882,7 @@ msgstr "Ixabiso le_Gamma"
 msgid "Error loading icon: %s"
 msgstr "Kwenzeke impazamo xa kufakwa umqondiso: %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1878,7 +1895,7 @@ msgstr ""
 "ikopi ungayifumana kwa-:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Umqondiso '%s' awukho emxholweni"
@@ -1966,7 +1983,7 @@ msgstr "(engaziwayo)"
 msgid "clear"
 msgstr "cima"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "Khetha Zonke"
 
@@ -2394,43 +2411,43 @@ msgstr "Nciphisa _Umfanekiso"
 msgid "Zoom _Out"
 msgstr "Andisa _Umfanekiso"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "Uphawu lwe-LRM olusuka ek_hohlo-luye-ekunene"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "Uphawu lwe-RLM olusuka ek_unene-luye-ekhohlo"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "I-LRE esuka ekhohlo-iye-ekunene _ezinzileyo"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "I-RLE esuka ekunene-iye-ekhohlo e_zinzileyo"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "I-LRO esuka ekhohlo-iye-ekunene inga _nanzwanga"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "I-RLO esuka ekunene-iye-ekhohlo inga n_anzwanga "
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "I-PDF _Pop yokwenza ubume bolawulo"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "I-ZWS _indawo ebubanzi obuliqanda"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "i-ZWJ Zero edibanisa _ububanzi"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "I-ZWNJ Zero engadibanisi _bubanzi"
 
@@ -2512,7 +2529,7 @@ msgstr "I-Vietnamese (VIQR)"
 msgid "X Input Method"
 msgstr "Indlela ye-X Yokungenisa"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Ayilufumani ulwazi lwefayili '%s': %s"
diff --git a/po/yi.po b/po/yi.po
index 056c7b3638..0c0dc4db7b 100644
--- a/po/yi.po
+++ b/po/yi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2003-02-11\n"
 "Last-Translator: Raphael Finkel <raphael@cs.uky.edu>\n"
 "Language-Team: None <>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "ניט געקענט עפֿענען טעקע '%s': %s"
@@ -26,7 +26,7 @@ msgid "Image file '%s' contains no data"
 msgstr "בילדטעקע '%s' האָט קײן דאַטן ניט"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1291,22 +1291,22 @@ msgstr "ראָד"
 msgid "Color Selection"
 msgstr "שריפֿט סעלעקציע"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 #, fuzzy
 msgid "Select _All"
 msgstr "קלײַב אַלץ אױס"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "אַרײַנשרײַב־מיטלען"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 #, fuzzy
 msgid "_Insert Unicode Control Character"
 msgstr "לײג אַרײַן אוניקאָד קאָנטראָל־שריפֿטצײכן"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, fuzzy, c-format
 msgid "Invalid filename: %s"
 msgstr "אומלעקסיקע XBM טעקע"
@@ -1316,13 +1316,13 @@ msgstr "אומלעקסיקע XBM טעקע"
 msgid "Select A File"
 msgstr "מעק אָפּ טעקע"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 #, fuzzy
 msgid "Home"
 msgstr "אַהײם"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr ""
@@ -1336,261 +1336,277 @@ msgstr "קײנע"
 msgid "Other..."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 #, fuzzy
 msgid "Could not retrieve information about the file"
 msgstr "ניט געקענט דערקענען בילד־טעקע פֿאָרמאַטירונג אין טעקע '%s'"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 #, fuzzy
 msgid "Invalid file name"
 msgstr "אומלעקסיקע XBM טעקע"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, fuzzy, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "ניט געקענט דערקענען בילד־טעקע פֿאָרמאַטירונג אין טעקע '%s'"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 #, fuzzy
 msgid "Remove"
 msgstr "נעם אַװעק"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 #, fuzzy
 msgid "Rename..."
 msgstr "פֿאַרװאַנדל נאָמען"
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 #, fuzzy
 msgid "Folder"
 msgstr "פּאַפּקעס"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "לײג צו"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "נעם אַװעק"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr ""
 "דורכפֿאַל אין שאַפֿן פּאַפּקע %s: %s\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 #, fuzzy
 msgid "Open _Location"
 msgstr "סעלעקציע: "
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "טעקעס"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 #, fuzzy
 msgid "Name"
 msgstr "פֿאַרב נאָמען"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "גרײס"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 #, fuzzy
 msgid "Modified"
 msgstr "מאָדע"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr ""
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 #, fuzzy
 msgid "Create Fo_lder"
 msgstr "נײַע פּאַפּקע"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 #, fuzzy
 msgid "_Name:"
 msgstr "פֿאַרב נאָמען"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 #, fuzzy
 msgid "Save in _folder:"
 msgstr "נײַע פּאַפּקע"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 #, fuzzy
 msgid "Create in _folder:"
 msgstr "נײַע פּאַפּקע"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "פֿאַרװאַנדל נאָמען"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, fuzzy, c-format
 msgid "Could not mount %s"
 msgstr ""
 "דורכפֿאַל אין שאַפֿן פּאַפּקע %s: %s\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 #, fuzzy
 msgid "Unknown"
 msgstr "(ניט באַקאַנט)"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 #, fuzzy
 msgid "Today"
 msgstr "מאָדאַל"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 #, fuzzy
 msgid "Cannot change folder"
 msgstr "נײַע פּאַפּקע"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 #, fuzzy
 msgid "Could not select item"
 msgstr ""
 "דורכפֿאַל אין שאַפֿן פּאַפּקע %s: %s\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr ""
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 #, fuzzy
 msgid "Save in Location"
 msgstr "סעלעקציע: "
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 #, fuzzy
 msgid "_Location:"
 msgstr "סעלעקציע: "
@@ -1793,7 +1809,7 @@ msgstr ""
 
 #: gtk/gtkfilesystemunix.c:639
 #, fuzzy
-msgid "Filesystem"
+msgid "File System"
 msgstr "טעקעס"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1894,7 +1910,7 @@ msgstr "γ (גאַמאַ)"
 msgid "Error loading icon: %s"
 msgstr "דורכפֿאַל אין אַרײַנשטעלן בילדל %s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1903,7 +1919,7 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr ""
@@ -1993,7 +2009,7 @@ msgstr "(ניט באַקאַנט)"
 msgid "clear"
 msgstr "באַזײַטיק"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "קלײַב אַלץ אױס"
 
@@ -2430,43 +2446,43 @@ msgstr "פֿאַרגרעסער"
 msgid "Zoom _Out"
 msgstr "פֿאַרקלענער"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "לר”ס לינקס־ביז־רעכטס סימן"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "רל”ס רעכטס־ביז־לינקס סימן"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "לר”א לינקס־ביז־רעכטס אײַנבאַק"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "רל”א רעכטס־ביז־לינקס אײַנבאַק"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "לר”ב לינקס־ביז־רעכטס בײַקום"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "רל”ב רעכטס־ביז־לינקס בײַקום"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "קר”ף קאָרטשע ריכטונג־פֿאָרמאַטירונג אױס"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "נב”ל נוליקע־ברײט לאָך"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "נב”ץ נוליקע־ברײט צולײגער"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "נבנ”ץ נוליקע־ברײט ניט־צולײגער"
 
@@ -2549,7 +2565,7 @@ msgstr "װיִעטנאַמעזיש (VIQR)"
 msgid "X Input Method"
 msgstr "X אַרײַנשרײַב־אופֿן"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, fuzzy, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "ניט געקענט דערקענען בילד־טעקע פֿאָרמאַטירונג אין טעקע '%s'"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 91c3aff5f2..a8cfe1881d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-06-12 01:59+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "无法打开文件“%s”：%s"
@@ -32,7 +32,7 @@ msgid "Image file '%s' contains no data"
 msgstr "图像文件“%s”没有内容"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1225,20 +1225,20 @@ msgstr "着色轮"
 msgid "Color Selection"
 msgstr "颜色选择"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "全选(_A)"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "输入法(_M)"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "插入 Unicode 控制字符(_I)"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "无效的文件名：%s"
@@ -1247,12 +1247,12 @@ msgstr "无效的文件名：%s"
 msgid "Select A File"
 msgstr "选择文件"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "主文件夹"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "桌面"
@@ -1265,23 +1265,23 @@ msgstr "(无)"
 msgid "Other..."
 msgstr "其它..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "无法获取关于文件的信息"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "无法添加书签"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "无法删除书签"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "无法创建文件夹"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1289,215 +1289,231 @@ msgstr ""
 "无法创建文件夹，因为已经存在同名文件。请试着为文件夹使用不同的名称，或者先重"
 "命名文件。"
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "无效的文件名"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "无法显示文件夹内容"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "无法获得文件“%s”的信息：%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "将文件夹“%s”添加到书签"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "将当前文件夹添加到书签"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "将选中文件夹添加到书签"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "删除书签“%s”"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "无法为“%s”添加书签，因为其路径名称无效。"
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "删除"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "重命名..."
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "快捷方式"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "文件夹"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "添加(_A)"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "将选中的文件夹添加到书签"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "删除选中的书签"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "无法选择项目"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "无法为“%s”添加书签，因为其路径名称无效。"
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "添加到书签(_A)"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "打开位置(_L)"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "显示隐藏文件(_H)"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "文件"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "名称"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "大小"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "修改日期"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "选择要显示的文件类型"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "创建文件夹(_L)"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "名称(_N)："
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "浏览其它文件夹(_B)"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "保存于文件夹(_F)："
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "创建于文件夹(_F)："
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "无法更改为文件夹，因为该文件夹并非本地"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "快捷方式 %s 不存在"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "重命名(_R)"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "无法挂载 %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "输入新建文件夹的名称"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d 字节"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "未知"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "今天"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "昨天"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "无法更改文件夹"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "您所指定的文件夹路径无效。"
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "无法根据“%s”和“%s”生成文件名"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "无法选择项目"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "打开位置"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "保存于位置"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "位置(_L)："
 
@@ -1694,7 +1710,8 @@ msgid "This file system does not support mounting"
 msgstr "文件系统不支持挂载"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "文件系统"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1795,7 +1812,7 @@ msgstr "Gamma 值(_G)"
 msgid "Error loading icon: %s"
 msgstr "载入图标时出错：%s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1807,7 +1824,7 @@ msgstr ""
 "您可以从下面的位置获得一个副本：\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "图标“%s”未出现在主题中"
@@ -1895,7 +1912,7 @@ msgstr "(未知)"
 msgid "clear"
 msgstr "清除"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "全选"
 
@@ -2322,43 +2339,43 @@ msgstr "放大(_I)"
 msgid "Zoom _Out"
 msgstr "缩小(_O)"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM 从左至右记号(_L)"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM 从右至左记号(_R)"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE 从左至右嵌入(_E)"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE 从右至左嵌入(_M)"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO 从左至右覆盖(_O)"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO 从右至左覆盖(_V)"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF 弹出方向格式化(_P)"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS 零宽度空格(_Z)"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ 零宽度接合(_J)"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ 零宽度非接合(_N)"
 
@@ -2440,7 +2457,7 @@ msgstr "越南语(VIQR)"
 msgid "X Input Method"
 msgstr "X 输入法"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "无法获得文件“%s”的信息：%s"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 701f40340c..1a3d69b5f5 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-06-29 01:36+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (traditional) <community@linuxhall.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "無法開啟檔案‘%s’：%s"
@@ -31,7 +31,7 @@ msgid "Image file '%s' contains no data"
 msgstr "圖片檔‘%s’沒有內容"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1233,20 +1233,20 @@ msgstr "色彩圓盤"
 msgid "Color Selection"
 msgstr "色彩選擇"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "全部選取(_A)"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "輸入法(_M)"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "插入統一碼控制字元(_I)"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "無效的檔案名稱：%s"
@@ -1255,12 +1255,12 @@ msgstr "無效的檔案名稱：%s"
 msgid "Select A File"
 msgstr "選取檔案"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "個人資料夾"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "桌面"
@@ -1273,23 +1273,23 @@ msgstr "(沒有)"
 msgid "Other..."
 msgstr "其它..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "無法取得關於檔案的資訊"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "無法加入書籤"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "無法移除書籤"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "無法建立資料夾"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1297,215 +1297,231 @@ msgstr ""
 "此資料夾無法建立，因為已有相同名稱的檔案存在。試著使用不同的資料夾名稱，或者"
 "先重新命名該檔案。"
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "無效的檔案名稱"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "無法顯示資料夾內容"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "無法取得關於‘%s’的資訊：%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "將資料夾‘%s’加入書籤"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "將目前的資料夾加入書籤"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "將已選的資料夾加入書籤"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "移除書籤‘%s’"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "無法加入‘%s’為書籤，因為它是無效的路徑名稱。"
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "移除"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "更改名稱..."
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "捷徑"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "資料夾"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "新增(_A)"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "將已選的資料夾加入書籤"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "移除已選的書籤"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "無法選取項目"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "無法加入‘%s’為書籤，因為它是無效的路徑名稱。"
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "加入書籤(_A)"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "開啟位置(_L)"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "顯示隱藏檔案(_H)"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "檔案"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "名稱"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "大小"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "最後更改"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "選擇顯示那種類型的檔案"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "建立資料夾(_L)"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "名稱(_N):"
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "瀏覽其他資料夾(_B)"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "儲存於資料夾(_F):"
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "新增於資料夾(_F):"
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "無法切換資料夾，因為其不是本地資料夾"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "捷徑 %s 不存在"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "更改名稱(_R)"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "無法掛載 %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "請輸入新資料夾名稱"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d 位元組"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "未知"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "今天"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "昨天"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "無法切換資料夾"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "您所指定的資料夾的路徑無效。"
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "無法從‘%s’及‘%s’建立檔案名稱"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "無法選取項目"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "開啟位置"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "存入位置"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "位置(_L):"
 
@@ -1702,7 +1718,8 @@ msgid "This file system does not support mounting"
 msgstr "本檔案系統並不支援掛載"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "檔案系統"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1803,7 +1820,7 @@ msgstr "_Gamma 值"
 msgid "Error loading icon: %s"
 msgstr "載入圖示時發生錯誤：%s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1816,7 +1833,7 @@ msgstr ""
 "您可以從下列地方取得：\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "圖示‘%s’不存在於佈景主題中"
@@ -1904,7 +1921,7 @@ msgstr "(未知)"
 msgid "clear"
 msgstr "清除"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "選擇全部"
 
@@ -2330,43 +2347,43 @@ msgstr "拉近(_I)"
 msgid "Zoom _Out"
 msgstr "拉遠(_O)"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "_LRM 左至右標記"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "_RLM 右至左標記"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LR_E 左至右內嵌"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE 右至左內嵌(_M)"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LR_O 強制左至右"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO 強制右至左(_V)"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "_PDF 回復以往格式"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "_ZWS 零寬度空格"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZW_J 零寬度合併"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZW_NJ 零寬度非合併"
 
@@ -2448,7 +2465,7 @@ msgstr "越南文 (VIQR)"
 msgid "X Input Method"
 msgstr "X 輸入法"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "無法為檔案‘%s’取得資訊：%s"