From 0baedad387f794b8bb25289739a21bb2f6b3a607 Mon Sep 17 00:00:00 2001
From: Benedikt Meurer <benny@xfce.org>
Date: Sat, 4 Feb 2006 01:49:32 +0000
Subject: [PATCH] 2006-02-04	Benedikt Meurer <benny@xfce.org>

	* thunar/thunar-permissions-chooser.c
	  (thunar_permissions_chooser_file_changed): Display the program check
	  box only for files which we will actually execute.
	* thunar/thunar-permissions-chooser.c: Add a warning text to the
	  permissions chooser for folders, whose exec and read flags are
	  inconsistent. Add a button to allow the user to fix the folder
	  permissions automatically if inconsistent.
	* po/Thunar.pot, po/*.po: Merge new strings.




(Old svn revision: 19736)
---
 ChangeLog                           |  11 +++
 po/Thunar.pot                       |  90 +++++++++++++-------
 po/ca.po                            |  90 +++++++++++++-------
 po/de.po                            |  90 +++++++++++++-------
 po/el.po                            |  90 +++++++++++++-------
 po/es.po                            |  90 +++++++++++++-------
 po/fr.po                            |  90 +++++++++++++-------
 po/hu.po                            |  90 +++++++++++++-------
 po/it.po                            |  90 +++++++++++++-------
 po/ja.po                            |  91 +++++++++++++-------
 po/nl.po                            |  91 +++++++++++++-------
 po/pl.po                            |  90 +++++++++++++-------
 po/pt_BR.po                         |  90 +++++++++++++-------
 po/ru.po                            |  90 +++++++++++++-------
 thunar/thunar-permissions-chooser.c | 127 +++++++++++++++++++++++++++-
 15 files changed, 917 insertions(+), 393 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 44336cfd6..f040cf2f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-02-04	Benedikt Meurer <benny@xfce.org>
+
+	* thunar/thunar-permissions-chooser.c
+	  (thunar_permissions_chooser_file_changed): Display the program check
+	  box only for files which we will actually execute.
+	* thunar/thunar-permissions-chooser.c: Add a warning text to the
+	  permissions chooser for folders, whose exec and read flags are
+	  inconsistent. Add a button to allow the user to fix the folder
+	  permissions automatically if inconsistent.
+	* po/Thunar.pot, po/*.po: Merge new strings.
+
 2006-02-04	Benedikt Meurer <benny@xfce.org>
 
 	* thunar/thunar-file.{c,h}: Add method thunar_file_list_to_path_list(),
diff --git a/po/Thunar.pot b/po/Thunar.pot
index 533a8f692..b72cd59e6 100644
--- a/po/Thunar.pot
+++ b/po/Thunar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 01:23+0100\n"
+"POT-Creation-Date: 2006-02-04 02:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -751,90 +751,104 @@ msgid "The icon size for the path entry"
 msgstr ""
 
 #. 0000
-#: ../thunar/thunar-permissions-chooser.c:240
+#: ../thunar/thunar-permissions-chooser.c:244
 msgid "None"
 msgstr ""
 
 #. 0002
-#: ../thunar/thunar-permissions-chooser.c:242
+#: ../thunar/thunar-permissions-chooser.c:246
 msgid "Write only"
 msgstr ""
 
 #. 0004
-#: ../thunar/thunar-permissions-chooser.c:244
+#: ../thunar/thunar-permissions-chooser.c:248
 msgid "Read only"
 msgstr ""
 
 #. 0006
-#: ../thunar/thunar-permissions-chooser.c:246
+#: ../thunar/thunar-permissions-chooser.c:250
 msgid "Read & Write"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:258
+#: ../thunar/thunar-permissions-chooser.c:262
 msgid "Owner:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:272
+#: ../thunar/thunar-permissions-chooser.c:276
 msgid "Unknown"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:286
-#: ../thunar/thunar-permissions-chooser.c:341
+#: ../thunar/thunar-permissions-chooser.c:290
+#: ../thunar/thunar-permissions-chooser.c:345
 msgid "Access:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:315
+#: ../thunar/thunar-permissions-chooser.c:319
 msgid "Group:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:370
+#: ../thunar/thunar-permissions-chooser.c:374
 msgid "Others:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:399
+#: ../thunar/thunar-permissions-chooser.c:403
 msgid "Program:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:405
+#: ../thunar/thunar-permissions-chooser.c:409
 msgid "Allow this file to _run as a program"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:431
+#: ../thunar/thunar-permissions-chooser.c:435
 msgid ""
-"Allowing untrusted programs to run \n"
+"Allowing untrusted programs to run\n"
 "presents a security risk to your system."
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:442
+#: ../thunar/thunar-permissions-chooser.c:450
+msgid ""
+"The folder permissions are inconsistent, you\n"
+"may not be able to work with files in this folder."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:463
+msgid "Correct folder permissions..."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:464
+msgid "Click here to automatically fix the folder permissions."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:475
 msgid "Please wait..."
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:447
+#: ../thunar/thunar-permissions-chooser.c:480
 msgid "Stop applying permissions recursively."
 msgstr ""
 
 #. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:565
-#: ../thunar/thunar-permissions-chooser.c:1023
+#: ../thunar/thunar-permissions-chooser.c:598
+#: ../thunar/thunar-permissions-chooser.c:1144
 #: ../thunar/thunar-progress-dialog.c:293
 msgid "Question"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:589
+#: ../thunar/thunar-permissions-chooser.c:622
 msgid "Apply recursively?"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:595
+#: ../thunar/thunar-permissions-chooser.c:628
 msgid ""
 "Do you want to apply your changes recursively to\n"
 "all files and subfolder below the selected folder?"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:600
+#: ../thunar/thunar-permissions-chooser.c:633
 msgid "Do _not ask me again"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:601
+#: ../thunar/thunar-permissions-chooser.c:634
 msgid ""
 "If you select this option your choice will be remembered and you won't be "
 "asked again. You can use the preferences dialog to alter your choice "
@@ -842,35 +856,51 @@ msgid ""
 msgstr ""
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:681
+#: ../thunar/thunar-permissions-chooser.c:714
 msgid "Failed to change group"
 msgstr ""
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:734
+#: ../thunar/thunar-permissions-chooser.c:767
+#: ../thunar/thunar-permissions-chooser.c:1103
 msgid "Failed to apply new permissions"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:913
+#: ../thunar/thunar-permissions-chooser.c:946
 msgid "Unknown file owner"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:1052
+#: ../thunar/thunar-permissions-chooser.c:1077
+msgid "Correct folder permissions automatically?"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1079
+msgid "Correct folder permissions"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1081
+msgid ""
+"The folder permissions will be reset to a consistent state. Only users "
+"allowed to read the contents of this folder will be allowed to enter the "
+"folder afterwards."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1173
 #: ../thunar/thunar-progress-dialog.c:319
 msgid "_Yes"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:1056
+#: ../thunar/thunar-permissions-chooser.c:1177
 #: ../thunar/thunar-progress-dialog.c:323
 msgid "Yes to _all"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:1060
+#: ../thunar/thunar-permissions-chooser.c:1181
 #: ../thunar/thunar-progress-dialog.c:327
 msgid "_No"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:1064
+#: ../thunar/thunar-permissions-chooser.c:1185
 #: ../thunar/thunar-progress-dialog.c:331
 msgid "_Cancel"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 9da2c418e..7a5d7c2fb 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 01:23+0100\n"
+"POT-Creation-Date: 2006-02-04 02:49+0100\n"
 "PO-Revision-Date: 2006-01-29 15:14+0900\n"
 "Last-Translator: Pau Rul·lan Ferragut <paurullan@bulma.net>\n"
 "Language-Team: Catalan\n"
@@ -790,106 +790,120 @@ msgid "The icon size for the path entry"
 msgstr "icona mida per"
 
 #. 0000
-#: ../thunar/thunar-permissions-chooser.c:240
+#: ../thunar/thunar-permissions-chooser.c:244
 #, fuzzy
 msgid "None"
 msgstr "Cap"
 
 #. 0002
-#: ../thunar/thunar-permissions-chooser.c:242
+#: ../thunar/thunar-permissions-chooser.c:246
 #, fuzzy
 msgid "Write only"
 msgstr "Escriptura"
 
 #. 0004
-#: ../thunar/thunar-permissions-chooser.c:244
+#: ../thunar/thunar-permissions-chooser.c:248
 #, fuzzy
 msgid "Read only"
 msgstr "Només lectura"
 
 #. 0006
-#: ../thunar/thunar-permissions-chooser.c:246
+#: ../thunar/thunar-permissions-chooser.c:250
 #, fuzzy
 msgid "Read & Write"
 msgstr "Llegit Escriptura"
 
-#: ../thunar/thunar-permissions-chooser.c:258
+#: ../thunar/thunar-permissions-chooser.c:262
 #, fuzzy
 msgid "Owner:"
 msgstr "Propietari:"
 
-#: ../thunar/thunar-permissions-chooser.c:272
+#: ../thunar/thunar-permissions-chooser.c:276
 #, fuzzy
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: ../thunar/thunar-permissions-chooser.c:286
-#: ../thunar/thunar-permissions-chooser.c:341
+#: ../thunar/thunar-permissions-chooser.c:290
+#: ../thunar/thunar-permissions-chooser.c:345
 #, fuzzy
 msgid "Access:"
 msgstr "Accedit:"
 
-#: ../thunar/thunar-permissions-chooser.c:315
+#: ../thunar/thunar-permissions-chooser.c:319
 #, fuzzy
 msgid "Group:"
 msgstr "Grup:"
 
-#: ../thunar/thunar-permissions-chooser.c:370
+#: ../thunar/thunar-permissions-chooser.c:374
 #, fuzzy
 msgid "Others:"
 msgstr "Altres:"
 
-#: ../thunar/thunar-permissions-chooser.c:399
+#: ../thunar/thunar-permissions-chooser.c:403
 #, fuzzy
 msgid "Program:"
 msgstr "Programa:"
 
-#: ../thunar/thunar-permissions-chooser.c:405
+#: ../thunar/thunar-permissions-chooser.c:409
 #, fuzzy
 msgid "Allow this file to _run as a program"
 msgstr "fitxer a programa"
 
-#: ../thunar/thunar-permissions-chooser.c:431
+#: ../thunar/thunar-permissions-chooser.c:435
 #, fuzzy
 msgid ""
-"Allowing untrusted programs to run \n"
+"Allowing untrusted programs to run\n"
 "presents a security risk to your system."
 msgstr "a."
 
-#: ../thunar/thunar-permissions-chooser.c:442
+#: ../thunar/thunar-permissions-chooser.c:450
+msgid ""
+"The folder permissions are inconsistent, you\n"
+"may not be able to work with files in this folder."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:463
+msgid "Correct folder permissions..."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:464
+msgid "Click here to automatically fix the folder permissions."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:475
 msgid "Please wait..."
 msgstr "Espereu..."
 
-#: ../thunar/thunar-permissions-chooser.c:447
+#: ../thunar/thunar-permissions-chooser.c:480
 #, fuzzy
 msgid "Stop applying permissions recursively."
 msgstr "Atura permisos."
 
 #. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:565
-#: ../thunar/thunar-permissions-chooser.c:1023
+#: ../thunar/thunar-permissions-chooser.c:598
+#: ../thunar/thunar-permissions-chooser.c:1144
 #: ../thunar/thunar-progress-dialog.c:293
 msgid "Question"
 msgstr "Pregunta"
 
-#: ../thunar/thunar-permissions-chooser.c:589
+#: ../thunar/thunar-permissions-chooser.c:622
 #, fuzzy
 msgid "Apply recursively?"
 msgstr "Aplica?"
 
-#: ../thunar/thunar-permissions-chooser.c:595
+#: ../thunar/thunar-permissions-chooser.c:628
 #, fuzzy
 msgid ""
 "Do you want to apply your changes recursively to\n"
 "all files and subfolder below the selected folder?"
 msgstr "aplica i seleccionat?"
 
-#: ../thunar/thunar-permissions-chooser.c:600
+#: ../thunar/thunar-permissions-chooser.c:633
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "no"
 
-#: ../thunar/thunar-permissions-chooser.c:601
+#: ../thunar/thunar-permissions-chooser.c:634
 #, fuzzy
 msgid ""
 "If you select this option your choice will be remembered and you won't be "
@@ -898,39 +912,55 @@ msgid ""
 msgstr "Si i preferències diàleg."
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:681
+#: ../thunar/thunar-permissions-chooser.c:714
 #, fuzzy
 msgid "Failed to change group"
 msgstr "Ha fallat grup"
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:734
+#: ../thunar/thunar-permissions-chooser.c:767
+#: ../thunar/thunar-permissions-chooser.c:1103
 #, fuzzy
 msgid "Failed to apply new permissions"
 msgstr "Ha fallat aplica nou permisos"
 
-#: ../thunar/thunar-permissions-chooser.c:913
+#: ../thunar/thunar-permissions-chooser.c:946
 #, fuzzy
 msgid "Unknown file owner"
 msgstr "Desconegut fitxer propietari"
 
-#: ../thunar/thunar-permissions-chooser.c:1052
+#: ../thunar/thunar-permissions-chooser.c:1077
+msgid "Correct folder permissions automatically?"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1079
+msgid "Correct folder permissions"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1081
+msgid ""
+"The folder permissions will be reset to a consistent state. Only users "
+"allowed to read the contents of this folder will be allowed to enter the "
+"folder afterwards."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1173
 #: ../thunar/thunar-progress-dialog.c:319
 msgid "_Yes"
 msgstr "_Sí"
 
-#: ../thunar/thunar-permissions-chooser.c:1056
+#: ../thunar/thunar-permissions-chooser.c:1177
 #: ../thunar/thunar-progress-dialog.c:323
 #, fuzzy
 msgid "Yes to _all"
 msgstr "Sí tot"
 
-#: ../thunar/thunar-permissions-chooser.c:1060
+#: ../thunar/thunar-permissions-chooser.c:1181
 #: ../thunar/thunar-progress-dialog.c:327
 msgid "_No"
 msgstr "_No"
 
-#: ../thunar/thunar-permissions-chooser.c:1064
+#: ../thunar/thunar-permissions-chooser.c:1185
 #: ../thunar/thunar-progress-dialog.c:331
 msgid "_Cancel"
 msgstr "_Cancel·la"
diff --git a/po/de.po b/po/de.po
index 1bc3c3023..ea86667af 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 01:23+0100\n"
+"POT-Creation-Date: 2006-02-04 02:49+0100\n"
 "PO-Revision-Date: 2006-02-01 20:10+0100\n"
 "Last-Translator: Benedikt Meurer <benny@xfce.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -752,91 +752,105 @@ msgid "The icon size for the path entry"
 msgstr ""
 
 #. 0000
-#: ../thunar/thunar-permissions-chooser.c:240
+#: ../thunar/thunar-permissions-chooser.c:244
 msgid "None"
 msgstr "Keine"
 
 #. 0002
-#: ../thunar/thunar-permissions-chooser.c:242
+#: ../thunar/thunar-permissions-chooser.c:246
 msgid "Write only"
 msgstr "Nur Schreiben"
 
 #. 0004
-#: ../thunar/thunar-permissions-chooser.c:244
+#: ../thunar/thunar-permissions-chooser.c:248
 msgid "Read only"
 msgstr "Nur Lesen"
 
 #. 0006
-#: ../thunar/thunar-permissions-chooser.c:246
+#: ../thunar/thunar-permissions-chooser.c:250
 msgid "Read & Write"
 msgstr "Lesen & Schreiben"
 
-#: ../thunar/thunar-permissions-chooser.c:258
+#: ../thunar/thunar-permissions-chooser.c:262
 msgid "Owner:"
 msgstr "Besitzer:"
 
-#: ../thunar/thunar-permissions-chooser.c:272
+#: ../thunar/thunar-permissions-chooser.c:276
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../thunar/thunar-permissions-chooser.c:286
-#: ../thunar/thunar-permissions-chooser.c:341
+#: ../thunar/thunar-permissions-chooser.c:290
+#: ../thunar/thunar-permissions-chooser.c:345
 msgid "Access:"
 msgstr "Zugriff:"
 
-#: ../thunar/thunar-permissions-chooser.c:315
+#: ../thunar/thunar-permissions-chooser.c:319
 msgid "Group:"
 msgstr "Gruppe:"
 
-#: ../thunar/thunar-permissions-chooser.c:370
+#: ../thunar/thunar-permissions-chooser.c:374
 msgid "Others:"
 msgstr "Andere:"
 
-#: ../thunar/thunar-permissions-chooser.c:399
+#: ../thunar/thunar-permissions-chooser.c:403
 msgid "Program:"
 msgstr "Programm:"
 
-#: ../thunar/thunar-permissions-chooser.c:405
+#: ../thunar/thunar-permissions-chooser.c:409
 msgid "Allow this file to _run as a program"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:431
+#: ../thunar/thunar-permissions-chooser.c:435
 msgid ""
-"Allowing untrusted programs to run \n"
+"Allowing untrusted programs to run\n"
 "presents a security risk to your system."
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:442
+#: ../thunar/thunar-permissions-chooser.c:450
+msgid ""
+"The folder permissions are inconsistent, you\n"
+"may not be able to work with files in this folder."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:463
+msgid "Correct folder permissions..."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:464
+msgid "Click here to automatically fix the folder permissions."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:475
 msgid "Please wait..."
 msgstr "Bitte warten..."
 
-#: ../thunar/thunar-permissions-chooser.c:447
+#: ../thunar/thunar-permissions-chooser.c:480
 #, fuzzy
 msgid "Stop applying permissions recursively."
 msgstr "Andere Anwendung..."
 
 #. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:565
-#: ../thunar/thunar-permissions-chooser.c:1023
+#: ../thunar/thunar-permissions-chooser.c:598
+#: ../thunar/thunar-permissions-chooser.c:1144
 #: ../thunar/thunar-progress-dialog.c:293
 msgid "Question"
 msgstr "Frage"
 
-#: ../thunar/thunar-permissions-chooser.c:589
+#: ../thunar/thunar-permissions-chooser.c:622
 msgid "Apply recursively?"
 msgstr "Rekursiv anwenden?"
 
-#: ../thunar/thunar-permissions-chooser.c:595
+#: ../thunar/thunar-permissions-chooser.c:628
 msgid ""
 "Do you want to apply your changes recursively to\n"
 "all files and subfolder below the selected folder?"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:600
+#: ../thunar/thunar-permissions-chooser.c:633
 msgid "Do _not ask me again"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:601
+#: ../thunar/thunar-permissions-chooser.c:634
 msgid ""
 "If you select this option your choice will be remembered and you won't be "
 "asked again. You can use the preferences dialog to alter your choice "
@@ -844,37 +858,53 @@ msgid ""
 msgstr ""
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:681
+#: ../thunar/thunar-permissions-chooser.c:714
 #, fuzzy
 msgid "Failed to change group"
 msgstr "Andere Anwendung..."
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:734
+#: ../thunar/thunar-permissions-chooser.c:767
+#: ../thunar/thunar-permissions-chooser.c:1103
 #, fuzzy
 msgid "Failed to apply new permissions"
 msgstr "Andere Anwendung..."
 
-#: ../thunar/thunar-permissions-chooser.c:913
+#: ../thunar/thunar-permissions-chooser.c:946
 msgid "Unknown file owner"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:1052
+#: ../thunar/thunar-permissions-chooser.c:1077
+msgid "Correct folder permissions automatically?"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1079
+msgid "Correct folder permissions"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1081
+msgid ""
+"The folder permissions will be reset to a consistent state. Only users "
+"allowed to read the contents of this folder will be allowed to enter the "
+"folder afterwards."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1173
 #: ../thunar/thunar-progress-dialog.c:319
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../thunar/thunar-permissions-chooser.c:1056
+#: ../thunar/thunar-permissions-chooser.c:1177
 #: ../thunar/thunar-progress-dialog.c:323
 msgid "Yes to _all"
 msgstr "Ja zu _allen"
 
-#: ../thunar/thunar-permissions-chooser.c:1060
+#: ../thunar/thunar-permissions-chooser.c:1181
 #: ../thunar/thunar-progress-dialog.c:327
 msgid "_No"
 msgstr "_Nein"
 
-#: ../thunar/thunar-permissions-chooser.c:1064
+#: ../thunar/thunar-permissions-chooser.c:1185
 #: ../thunar/thunar-progress-dialog.c:331
 msgid "_Cancel"
 msgstr "_Abbrechen"
diff --git a/po/el.po b/po/el.po
index 279feff57..2f41b8bab 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 01:23+0100\n"
+"POT-Creation-Date: 2006-02-04 02:49+0100\n"
 "PO-Revision-Date: 2005-12-04 23:18+0900\n"
 "Last-Translator: Stavros Giannouris <stavrosg2002@freemail.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -776,93 +776,107 @@ msgid "The icon size for the path entry"
 msgstr "Μέγεθος εικονιδίου για τη διαδρομή"
 
 #. 0000
-#: ../thunar/thunar-permissions-chooser.c:240
+#: ../thunar/thunar-permissions-chooser.c:244
 msgid "None"
 msgstr ""
 
 #. 0002
-#: ../thunar/thunar-permissions-chooser.c:242
+#: ../thunar/thunar-permissions-chooser.c:246
 msgid "Write only"
 msgstr ""
 
 #. 0004
-#: ../thunar/thunar-permissions-chooser.c:244
+#: ../thunar/thunar-permissions-chooser.c:248
 msgid "Read only"
 msgstr ""
 
 #. 0006
-#: ../thunar/thunar-permissions-chooser.c:246
+#: ../thunar/thunar-permissions-chooser.c:250
 msgid "Read & Write"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:258
+#: ../thunar/thunar-permissions-chooser.c:262
 msgid "Owner:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:272
+#: ../thunar/thunar-permissions-chooser.c:276
 msgid "Unknown"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:286
-#: ../thunar/thunar-permissions-chooser.c:341
+#: ../thunar/thunar-permissions-chooser.c:290
+#: ../thunar/thunar-permissions-chooser.c:345
 #, fuzzy
 msgid "Access:"
 msgstr "Προσπελάστηκε:"
 
-#: ../thunar/thunar-permissions-chooser.c:315
+#: ../thunar/thunar-permissions-chooser.c:319
 msgid "Group:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:370
+#: ../thunar/thunar-permissions-chooser.c:374
 #, fuzzy
 msgid "Others:"
 msgstr "_Άλλα Αρχεία"
 
-#: ../thunar/thunar-permissions-chooser.c:399
+#: ../thunar/thunar-permissions-chooser.c:403
 msgid "Program:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:405
+#: ../thunar/thunar-permissions-chooser.c:409
 msgid "Allow this file to _run as a program"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:431
+#: ../thunar/thunar-permissions-chooser.c:435
 msgid ""
-"Allowing untrusted programs to run \n"
+"Allowing untrusted programs to run\n"
 "presents a security risk to your system."
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:442
+#: ../thunar/thunar-permissions-chooser.c:450
+msgid ""
+"The folder permissions are inconsistent, you\n"
+"may not be able to work with files in this folder."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:463
+msgid "Correct folder permissions..."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:464
+msgid "Click here to automatically fix the folder permissions."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:475
 msgid "Please wait..."
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:447
+#: ../thunar/thunar-permissions-chooser.c:480
 #, fuzzy
 msgid "Stop applying permissions recursively."
 msgstr "Η προσθήκη της εφαρμογής `%s' απέτυχε."
 
 #. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:565
-#: ../thunar/thunar-permissions-chooser.c:1023
+#: ../thunar/thunar-permissions-chooser.c:598
+#: ../thunar/thunar-permissions-chooser.c:1144
 #: ../thunar/thunar-progress-dialog.c:293
 msgid "Question"
 msgstr "Ερώτηση"
 
-#: ../thunar/thunar-permissions-chooser.c:589
+#: ../thunar/thunar-permissions-chooser.c:622
 msgid "Apply recursively?"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:595
+#: ../thunar/thunar-permissions-chooser.c:628
 msgid ""
 "Do you want to apply your changes recursively to\n"
 "all files and subfolder below the selected folder?"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:600
+#: ../thunar/thunar-permissions-chooser.c:633
 msgid "Do _not ask me again"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:601
+#: ../thunar/thunar-permissions-chooser.c:634
 msgid ""
 "If you select this option your choice will be remembered and you won't be "
 "asked again. You can use the preferences dialog to alter your choice "
@@ -870,37 +884,53 @@ msgid ""
 msgstr ""
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:681
+#: ../thunar/thunar-permissions-chooser.c:714
 #, fuzzy
 msgid "Failed to change group"
 msgstr "Η προσθήκη νέας συντόμευσης απέτυχε"
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:734
+#: ../thunar/thunar-permissions-chooser.c:767
+#: ../thunar/thunar-permissions-chooser.c:1103
 #, fuzzy
 msgid "Failed to apply new permissions"
 msgstr "Η προσθήκη της εφαρμογής `%s' απέτυχε."
 
-#: ../thunar/thunar-permissions-chooser.c:913
+#: ../thunar/thunar-permissions-chooser.c:946
 msgid "Unknown file owner"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:1052
+#: ../thunar/thunar-permissions-chooser.c:1077
+msgid "Correct folder permissions automatically?"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1079
+msgid "Correct folder permissions"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1081
+msgid ""
+"The folder permissions will be reset to a consistent state. Only users "
+"allowed to read the contents of this folder will be allowed to enter the "
+"folder afterwards."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1173
 #: ../thunar/thunar-progress-dialog.c:319
 msgid "_Yes"
 msgstr "_Ναι"
 
-#: ../thunar/thunar-permissions-chooser.c:1056
+#: ../thunar/thunar-permissions-chooser.c:1177
 #: ../thunar/thunar-progress-dialog.c:323
 msgid "Yes to _all"
 msgstr "Ναι σε ό_λα"
 
-#: ../thunar/thunar-permissions-chooser.c:1060
+#: ../thunar/thunar-permissions-chooser.c:1181
 #: ../thunar/thunar-progress-dialog.c:327
 msgid "_No"
 msgstr "_Όχι"
 
-#: ../thunar/thunar-permissions-chooser.c:1064
+#: ../thunar/thunar-permissions-chooser.c:1185
 #: ../thunar/thunar-progress-dialog.c:331
 msgid "_Cancel"
 msgstr "_Ακύρωση"
diff --git a/po/es.po b/po/es.po
index fd723d68f..ef6c25d1e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 01:23+0100\n"
+"POT-Creation-Date: 2006-02-04 02:49+0100\n"
 "PO-Revision-Date: 2005-10-14 23:57+0900\n"
 "Last-Translator: Pablo Hernández-M. Saiz <homeless3d@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -781,93 +781,107 @@ msgid "The icon size for the path entry"
 msgstr ""
 
 #. 0000
-#: ../thunar/thunar-permissions-chooser.c:240
+#: ../thunar/thunar-permissions-chooser.c:244
 msgid "None"
 msgstr ""
 
 #. 0002
-#: ../thunar/thunar-permissions-chooser.c:242
+#: ../thunar/thunar-permissions-chooser.c:246
 msgid "Write only"
 msgstr ""
 
 #. 0004
-#: ../thunar/thunar-permissions-chooser.c:244
+#: ../thunar/thunar-permissions-chooser.c:248
 msgid "Read only"
 msgstr ""
 
 #. 0006
-#: ../thunar/thunar-permissions-chooser.c:246
+#: ../thunar/thunar-permissions-chooser.c:250
 msgid "Read & Write"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:258
+#: ../thunar/thunar-permissions-chooser.c:262
 msgid "Owner:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:272
+#: ../thunar/thunar-permissions-chooser.c:276
 msgid "Unknown"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:286
-#: ../thunar/thunar-permissions-chooser.c:341
+#: ../thunar/thunar-permissions-chooser.c:290
+#: ../thunar/thunar-permissions-chooser.c:345
 #, fuzzy
 msgid "Access:"
 msgstr "Accedido:"
 
-#: ../thunar/thunar-permissions-chooser.c:315
+#: ../thunar/thunar-permissions-chooser.c:319
 msgid "Group:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:370
+#: ../thunar/thunar-permissions-chooser.c:374
 #, fuzzy
 msgid "Others:"
 msgstr "_Pegar archivos"
 
-#: ../thunar/thunar-permissions-chooser.c:399
+#: ../thunar/thunar-permissions-chooser.c:403
 msgid "Program:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:405
+#: ../thunar/thunar-permissions-chooser.c:409
 msgid "Allow this file to _run as a program"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:431
+#: ../thunar/thunar-permissions-chooser.c:435
 msgid ""
-"Allowing untrusted programs to run \n"
+"Allowing untrusted programs to run\n"
 "presents a security risk to your system."
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:442
+#: ../thunar/thunar-permissions-chooser.c:450
+msgid ""
+"The folder permissions are inconsistent, you\n"
+"may not be able to work with files in this folder."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:463
+msgid "Correct folder permissions..."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:464
+msgid "Click here to automatically fix the folder permissions."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:475
 msgid "Please wait..."
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:447
+#: ../thunar/thunar-permissions-chooser.c:480
 #, fuzzy
 msgid "Stop applying permissions recursively."
 msgstr "Imposible renombrar %s."
 
 #. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:565
-#: ../thunar/thunar-permissions-chooser.c:1023
+#: ../thunar/thunar-permissions-chooser.c:598
+#: ../thunar/thunar-permissions-chooser.c:1144
 #: ../thunar/thunar-progress-dialog.c:293
 msgid "Question"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:589
+#: ../thunar/thunar-permissions-chooser.c:622
 msgid "Apply recursively?"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:595
+#: ../thunar/thunar-permissions-chooser.c:628
 msgid ""
 "Do you want to apply your changes recursively to\n"
 "all files and subfolder below the selected folder?"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:600
+#: ../thunar/thunar-permissions-chooser.c:633
 msgid "Do _not ask me again"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:601
+#: ../thunar/thunar-permissions-chooser.c:634
 msgid ""
 "If you select this option your choice will be remembered and you won't be "
 "asked again. You can use the preferences dialog to alter your choice "
@@ -875,37 +889,53 @@ msgid ""
 msgstr ""
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:681
+#: ../thunar/thunar-permissions-chooser.c:714
 #, fuzzy
 msgid "Failed to change group"
 msgstr "Imposible renombrar %s."
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:734
+#: ../thunar/thunar-permissions-chooser.c:767
+#: ../thunar/thunar-permissions-chooser.c:1103
 #, fuzzy
 msgid "Failed to apply new permissions"
 msgstr "Imposible renombrar %s."
 
-#: ../thunar/thunar-permissions-chooser.c:913
+#: ../thunar/thunar-permissions-chooser.c:946
 msgid "Unknown file owner"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:1052
+#: ../thunar/thunar-permissions-chooser.c:1077
+msgid "Correct folder permissions automatically?"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1079
+msgid "Correct folder permissions"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1081
+msgid ""
+"The folder permissions will be reset to a consistent state. Only users "
+"allowed to read the contents of this folder will be allowed to enter the "
+"folder afterwards."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1173
 #: ../thunar/thunar-progress-dialog.c:319
 msgid "_Yes"
 msgstr "_Si"
 
-#: ../thunar/thunar-permissions-chooser.c:1056
+#: ../thunar/thunar-permissions-chooser.c:1177
 #: ../thunar/thunar-progress-dialog.c:323
 msgid "Yes to _all"
 msgstr "Si a_todo"
 
-#: ../thunar/thunar-permissions-chooser.c:1060
+#: ../thunar/thunar-permissions-chooser.c:1181
 #: ../thunar/thunar-progress-dialog.c:327
 msgid "_No"
 msgstr "_No"
 
-#: ../thunar/thunar-permissions-chooser.c:1064
+#: ../thunar/thunar-permissions-chooser.c:1185
 #: ../thunar/thunar-progress-dialog.c:331
 msgid "_Cancel"
 msgstr "_Cancelar"
diff --git a/po/fr.po b/po/fr.po
index b034277a2..792813abe 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 01:23+0100\n"
+"POT-Creation-Date: 2006-02-04 02:49+0100\n"
 "PO-Revision-Date: 2006-01-01 15:02+0100\n"
 "Last-Translator: Stephane Roy <sroy@j2n.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -773,93 +773,107 @@ msgid "The icon size for the path entry"
 msgstr ""
 
 #. 0000
-#: ../thunar/thunar-permissions-chooser.c:240
+#: ../thunar/thunar-permissions-chooser.c:244
 msgid "None"
 msgstr ""
 
 #. 0002
-#: ../thunar/thunar-permissions-chooser.c:242
+#: ../thunar/thunar-permissions-chooser.c:246
 msgid "Write only"
 msgstr ""
 
 #. 0004
-#: ../thunar/thunar-permissions-chooser.c:244
+#: ../thunar/thunar-permissions-chooser.c:248
 msgid "Read only"
 msgstr ""
 
 #. 0006
-#: ../thunar/thunar-permissions-chooser.c:246
+#: ../thunar/thunar-permissions-chooser.c:250
 msgid "Read & Write"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:258
+#: ../thunar/thunar-permissions-chooser.c:262
 msgid "Owner:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:272
+#: ../thunar/thunar-permissions-chooser.c:276
 msgid "Unknown"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:286
-#: ../thunar/thunar-permissions-chooser.c:341
+#: ../thunar/thunar-permissions-chooser.c:290
+#: ../thunar/thunar-permissions-chooser.c:345
 #, fuzzy
 msgid "Access:"
 msgstr "Accédé :"
 
-#: ../thunar/thunar-permissions-chooser.c:315
+#: ../thunar/thunar-permissions-chooser.c:319
 msgid "Group:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:370
+#: ../thunar/thunar-permissions-chooser.c:374
 #, fuzzy
 msgid "Others:"
 msgstr "Autres _fichiers"
 
-#: ../thunar/thunar-permissions-chooser.c:399
+#: ../thunar/thunar-permissions-chooser.c:403
 msgid "Program:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:405
+#: ../thunar/thunar-permissions-chooser.c:409
 msgid "Allow this file to _run as a program"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:431
+#: ../thunar/thunar-permissions-chooser.c:435
 msgid ""
-"Allowing untrusted programs to run \n"
+"Allowing untrusted programs to run\n"
 "presents a security risk to your system."
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:442
+#: ../thunar/thunar-permissions-chooser.c:450
+msgid ""
+"The folder permissions are inconsistent, you\n"
+"may not be able to work with files in this folder."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:463
+msgid "Correct folder permissions..."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:464
+msgid "Click here to automatically fix the folder permissions."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:475
 msgid "Please wait..."
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:447
+#: ../thunar/thunar-permissions-chooser.c:480
 #, fuzzy
 msgid "Stop applying permissions recursively."
 msgstr "Échec au changement de mode de `%s'"
 
 #. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:565
-#: ../thunar/thunar-permissions-chooser.c:1023
+#: ../thunar/thunar-permissions-chooser.c:598
+#: ../thunar/thunar-permissions-chooser.c:1144
 #: ../thunar/thunar-progress-dialog.c:293
 msgid "Question"
 msgstr "Question"
 
-#: ../thunar/thunar-permissions-chooser.c:589
+#: ../thunar/thunar-permissions-chooser.c:622
 msgid "Apply recursively?"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:595
+#: ../thunar/thunar-permissions-chooser.c:628
 msgid ""
 "Do you want to apply your changes recursively to\n"
 "all files and subfolder below the selected folder?"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:600
+#: ../thunar/thunar-permissions-chooser.c:633
 msgid "Do _not ask me again"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:601
+#: ../thunar/thunar-permissions-chooser.c:634
 msgid ""
 "If you select this option your choice will be remembered and you won't be "
 "asked again. You can use the preferences dialog to alter your choice "
@@ -867,37 +881,53 @@ msgid ""
 msgstr ""
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:681
+#: ../thunar/thunar-permissions-chooser.c:714
 #, fuzzy
 msgid "Failed to change group"
 msgstr "Échec au changement de mode de `%s'"
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:734
+#: ../thunar/thunar-permissions-chooser.c:767
+#: ../thunar/thunar-permissions-chooser.c:1103
 #, fuzzy
 msgid "Failed to apply new permissions"
 msgstr "Échec au changement de mode de `%s'"
 
-#: ../thunar/thunar-permissions-chooser.c:913
+#: ../thunar/thunar-permissions-chooser.c:946
 msgid "Unknown file owner"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:1052
+#: ../thunar/thunar-permissions-chooser.c:1077
+msgid "Correct folder permissions automatically?"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1079
+msgid "Correct folder permissions"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1081
+msgid ""
+"The folder permissions will be reset to a consistent state. Only users "
+"allowed to read the contents of this folder will be allowed to enter the "
+"folder afterwards."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1173
 #: ../thunar/thunar-progress-dialog.c:319
 msgid "_Yes"
 msgstr "_Oui"
 
-#: ../thunar/thunar-permissions-chooser.c:1056
+#: ../thunar/thunar-permissions-chooser.c:1177
 #: ../thunar/thunar-progress-dialog.c:323
 msgid "Yes to _all"
 msgstr "Oui pour _tout"
 
-#: ../thunar/thunar-permissions-chooser.c:1060
+#: ../thunar/thunar-permissions-chooser.c:1181
 #: ../thunar/thunar-progress-dialog.c:327
 msgid "_No"
 msgstr "_Non"
 
-#: ../thunar/thunar-permissions-chooser.c:1064
+#: ../thunar/thunar-permissions-chooser.c:1185
 #: ../thunar/thunar-progress-dialog.c:331
 msgid "_Cancel"
 msgstr "_Annuler"
diff --git a/po/hu.po b/po/hu.po
index d8e34f2a8..152966ed1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 01:23+0100\n"
+"POT-Creation-Date: 2006-02-04 02:49+0100\n"
 "PO-Revision-Date: 2005-10-06 22:02+0900\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -782,93 +782,107 @@ msgid "The icon size for the path entry"
 msgstr "Az ösvényelem ikonmérete"
 
 #. 0000
-#: ../thunar/thunar-permissions-chooser.c:240
+#: ../thunar/thunar-permissions-chooser.c:244
 msgid "None"
 msgstr ""
 
 #. 0002
-#: ../thunar/thunar-permissions-chooser.c:242
+#: ../thunar/thunar-permissions-chooser.c:246
 msgid "Write only"
 msgstr ""
 
 #. 0004
-#: ../thunar/thunar-permissions-chooser.c:244
+#: ../thunar/thunar-permissions-chooser.c:248
 msgid "Read only"
 msgstr ""
 
 #. 0006
-#: ../thunar/thunar-permissions-chooser.c:246
+#: ../thunar/thunar-permissions-chooser.c:250
 msgid "Read & Write"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:258
+#: ../thunar/thunar-permissions-chooser.c:262
 msgid "Owner:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:272
+#: ../thunar/thunar-permissions-chooser.c:276
 msgid "Unknown"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:286
-#: ../thunar/thunar-permissions-chooser.c:341
+#: ../thunar/thunar-permissions-chooser.c:290
+#: ../thunar/thunar-permissions-chooser.c:345
 #, fuzzy
 msgid "Access:"
 msgstr "Megnyitva:"
 
-#: ../thunar/thunar-permissions-chooser.c:315
+#: ../thunar/thunar-permissions-chooser.c:319
 msgid "Group:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:370
+#: ../thunar/thunar-permissions-chooser.c:374
 #, fuzzy
 msgid "Others:"
 msgstr "Fájlok beillesztése"
 
-#: ../thunar/thunar-permissions-chooser.c:399
+#: ../thunar/thunar-permissions-chooser.c:403
 msgid "Program:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:405
+#: ../thunar/thunar-permissions-chooser.c:409
 msgid "Allow this file to _run as a program"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:431
+#: ../thunar/thunar-permissions-chooser.c:435
 msgid ""
-"Allowing untrusted programs to run \n"
+"Allowing untrusted programs to run\n"
 "presents a security risk to your system."
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:442
+#: ../thunar/thunar-permissions-chooser.c:450
+msgid ""
+"The folder permissions are inconsistent, you\n"
+"may not be able to work with files in this folder."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:463
+msgid "Correct folder permissions..."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:464
+msgid "Click here to automatically fix the folder permissions."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:475
 msgid "Please wait..."
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:447
+#: ../thunar/thunar-permissions-chooser.c:480
 #, fuzzy
 msgid "Stop applying permissions recursively."
 msgstr "Nem törölhető: %s"
 
 #. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:565
-#: ../thunar/thunar-permissions-chooser.c:1023
+#: ../thunar/thunar-permissions-chooser.c:598
+#: ../thunar/thunar-permissions-chooser.c:1144
 #: ../thunar/thunar-progress-dialog.c:293
 msgid "Question"
 msgstr "Kérdés"
 
-#: ../thunar/thunar-permissions-chooser.c:589
+#: ../thunar/thunar-permissions-chooser.c:622
 msgid "Apply recursively?"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:595
+#: ../thunar/thunar-permissions-chooser.c:628
 msgid ""
 "Do you want to apply your changes recursively to\n"
 "all files and subfolder below the selected folder?"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:600
+#: ../thunar/thunar-permissions-chooser.c:633
 msgid "Do _not ask me again"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:601
+#: ../thunar/thunar-permissions-chooser.c:634
 msgid ""
 "If you select this option your choice will be remembered and you won't be "
 "asked again. You can use the preferences dialog to alter your choice "
@@ -876,37 +890,53 @@ msgid ""
 msgstr ""
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:681
+#: ../thunar/thunar-permissions-chooser.c:714
 #, fuzzy
 msgid "Failed to change group"
 msgstr "Nem törölhető: %s"
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:734
+#: ../thunar/thunar-permissions-chooser.c:767
+#: ../thunar/thunar-permissions-chooser.c:1103
 #, fuzzy
 msgid "Failed to apply new permissions"
 msgstr "Nem törölhető: %s"
 
-#: ../thunar/thunar-permissions-chooser.c:913
+#: ../thunar/thunar-permissions-chooser.c:946
 msgid "Unknown file owner"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:1052
+#: ../thunar/thunar-permissions-chooser.c:1077
+msgid "Correct folder permissions automatically?"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1079
+msgid "Correct folder permissions"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1081
+msgid ""
+"The folder permissions will be reset to a consistent state. Only users "
+"allowed to read the contents of this folder will be allowed to enter the "
+"folder afterwards."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1173
 #: ../thunar/thunar-progress-dialog.c:319
 msgid "_Yes"
 msgstr "_Igen"
 
-#: ../thunar/thunar-permissions-chooser.c:1056
+#: ../thunar/thunar-permissions-chooser.c:1177
 #: ../thunar/thunar-progress-dialog.c:323
 msgid "Yes to _all"
 msgstr "_Mind"
 
-#: ../thunar/thunar-permissions-chooser.c:1060
+#: ../thunar/thunar-permissions-chooser.c:1181
 #: ../thunar/thunar-progress-dialog.c:327
 msgid "_No"
 msgstr "_Nem"
 
-#: ../thunar/thunar-permissions-chooser.c:1064
+#: ../thunar/thunar-permissions-chooser.c:1185
 #: ../thunar/thunar-progress-dialog.c:331
 msgid "_Cancel"
 msgstr "_Csendet!"
diff --git a/po/it.po b/po/it.po
index bd35a56a3..6938219e9 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 01:23+0100\n"
+"POT-Creation-Date: 2006-02-04 02:49+0100\n"
 "PO-Revision-Date: 2006-01-21 10:58+0100\n"
 "Last-Translator: Roberto Pariset <r.pariset@gmail.com>\n"
 "Language-Team: GUFI <traduzioni@gufi.org>\n"
@@ -780,91 +780,105 @@ msgid "The icon size for the path entry"
 msgstr ""
 
 #. 0000
-#: ../thunar/thunar-permissions-chooser.c:240
+#: ../thunar/thunar-permissions-chooser.c:244
 msgid "None"
 msgstr ""
 
 #. 0002
-#: ../thunar/thunar-permissions-chooser.c:242
+#: ../thunar/thunar-permissions-chooser.c:246
 msgid "Write only"
 msgstr ""
 
 #. 0004
-#: ../thunar/thunar-permissions-chooser.c:244
+#: ../thunar/thunar-permissions-chooser.c:248
 msgid "Read only"
 msgstr ""
 
 #. 0006
-#: ../thunar/thunar-permissions-chooser.c:246
+#: ../thunar/thunar-permissions-chooser.c:250
 msgid "Read & Write"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:258
+#: ../thunar/thunar-permissions-chooser.c:262
 msgid "Owner:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:272
+#: ../thunar/thunar-permissions-chooser.c:276
 msgid "Unknown"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:286
-#: ../thunar/thunar-permissions-chooser.c:341
+#: ../thunar/thunar-permissions-chooser.c:290
+#: ../thunar/thunar-permissions-chooser.c:345
 #, fuzzy
 msgid "Access:"
 msgstr "Acceduto:"
 
-#: ../thunar/thunar-permissions-chooser.c:315
+#: ../thunar/thunar-permissions-chooser.c:319
 msgid "Group:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:370
+#: ../thunar/thunar-permissions-chooser.c:374
 msgid "Others:"
 msgstr "Altri file:"
 
-#: ../thunar/thunar-permissions-chooser.c:399
+#: ../thunar/thunar-permissions-chooser.c:403
 msgid "Program:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:405
+#: ../thunar/thunar-permissions-chooser.c:409
 msgid "Allow this file to _run as a program"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:431
+#: ../thunar/thunar-permissions-chooser.c:435
 msgid ""
-"Allowing untrusted programs to run \n"
+"Allowing untrusted programs to run\n"
 "presents a security risk to your system."
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:442
+#: ../thunar/thunar-permissions-chooser.c:450
+msgid ""
+"The folder permissions are inconsistent, you\n"
+"may not be able to work with files in this folder."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:463
+msgid "Correct folder permissions..."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:464
+msgid "Click here to automatically fix the folder permissions."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:475
 msgid "Please wait..."
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:447
+#: ../thunar/thunar-permissions-chooser.c:480
 msgid "Stop applying permissions recursively."
 msgstr ""
 
 #. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:565
-#: ../thunar/thunar-permissions-chooser.c:1023
+#: ../thunar/thunar-permissions-chooser.c:598
+#: ../thunar/thunar-permissions-chooser.c:1144
 #: ../thunar/thunar-progress-dialog.c:293
 msgid "Question"
 msgstr "Domanda"
 
-#: ../thunar/thunar-permissions-chooser.c:589
+#: ../thunar/thunar-permissions-chooser.c:622
 msgid "Apply recursively?"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:595
+#: ../thunar/thunar-permissions-chooser.c:628
 msgid ""
 "Do you want to apply your changes recursively to\n"
 "all files and subfolder below the selected folder?"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:600
+#: ../thunar/thunar-permissions-chooser.c:633
 msgid "Do _not ask me again"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:601
+#: ../thunar/thunar-permissions-chooser.c:634
 msgid ""
 "If you select this option your choice will be remembered and you won't be "
 "asked again. You can use the preferences dialog to alter your choice "
@@ -872,35 +886,51 @@ msgid ""
 msgstr ""
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:681
+#: ../thunar/thunar-permissions-chooser.c:714
 msgid "Failed to change group"
 msgstr "Impossibile cambiare gruppo"
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:734
+#: ../thunar/thunar-permissions-chooser.c:767
+#: ../thunar/thunar-permissions-chooser.c:1103
 msgid "Failed to apply new permissions"
 msgstr "Impossibile applicare i nuovi permessi"
 
-#: ../thunar/thunar-permissions-chooser.c:913
+#: ../thunar/thunar-permissions-chooser.c:946
 msgid "Unknown file owner"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:1052
+#: ../thunar/thunar-permissions-chooser.c:1077
+msgid "Correct folder permissions automatically?"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1079
+msgid "Correct folder permissions"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1081
+msgid ""
+"The folder permissions will be reset to a consistent state. Only users "
+"allowed to read the contents of this folder will be allowed to enter the "
+"folder afterwards."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1173
 #: ../thunar/thunar-progress-dialog.c:319
 msgid "_Yes"
 msgstr "_Sì"
 
-#: ../thunar/thunar-permissions-chooser.c:1056
+#: ../thunar/thunar-permissions-chooser.c:1177
 #: ../thunar/thunar-progress-dialog.c:323
 msgid "Yes to _all"
 msgstr "Sì _a tutti"
 
-#: ../thunar/thunar-permissions-chooser.c:1060
+#: ../thunar/thunar-permissions-chooser.c:1181
 #: ../thunar/thunar-progress-dialog.c:327
 msgid "_No"
 msgstr "_No"
 
-#: ../thunar/thunar-permissions-chooser.c:1064
+#: ../thunar/thunar-permissions-chooser.c:1185
 #: ../thunar/thunar-progress-dialog.c:331
 msgid "_Cancel"
 msgstr "_Cancella"
diff --git a/po/ja.po b/po/ja.po
index cef9a2322..864321360 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 01:23+0100\n"
+"POT-Creation-Date: 2006-02-04 02:49+0100\n"
 "PO-Revision-Date: 2006-01-29 11:44+0900\n"
 "Last-Translator: Daichi Kawahata <daichi@xfce.org>\n"
 "Language-Team: Japanese <xfce-users-jp@ml.fdiary.net>\n"
@@ -773,82 +773,97 @@ msgid "The icon size for the path entry"
 msgstr "パス・エントリーのアイコン・サイズです"
 
 #. 0000
-#: ../thunar/thunar-permissions-chooser.c:240
+#: ../thunar/thunar-permissions-chooser.c:244
 msgid "None"
 msgstr "無し"
 
 #. 0002
-#: ../thunar/thunar-permissions-chooser.c:242
+#: ../thunar/thunar-permissions-chooser.c:246
 msgid "Write only"
 msgstr "書込のみ"
 
 #. 0004
-#: ../thunar/thunar-permissions-chooser.c:244
+#: ../thunar/thunar-permissions-chooser.c:248
 msgid "Read only"
 msgstr "読込のみ"
 
 #. 0006
-#: ../thunar/thunar-permissions-chooser.c:246
+#: ../thunar/thunar-permissions-chooser.c:250
 msgid "Read & Write"
 msgstr "読込&書込"
 
-#: ../thunar/thunar-permissions-chooser.c:258
+#: ../thunar/thunar-permissions-chooser.c:262
 msgid "Owner:"
 msgstr "ファイル所有者:"
 
-#: ../thunar/thunar-permissions-chooser.c:272
+#: ../thunar/thunar-permissions-chooser.c:276
 msgid "Unknown"
 msgstr "不明"
 
-#: ../thunar/thunar-permissions-chooser.c:286
-#: ../thunar/thunar-permissions-chooser.c:341
+#: ../thunar/thunar-permissions-chooser.c:290
+#: ../thunar/thunar-permissions-chooser.c:345
 msgid "Access:"
 msgstr "アクセス:"
 
-#: ../thunar/thunar-permissions-chooser.c:315
+#: ../thunar/thunar-permissions-chooser.c:319
 msgid "Group:"
 msgstr "所属グループ:"
 
-#: ../thunar/thunar-permissions-chooser.c:370
+#: ../thunar/thunar-permissions-chooser.c:374
 msgid "Others:"
 msgstr "それ以外の人達:"
 
-#: ../thunar/thunar-permissions-chooser.c:399
+#: ../thunar/thunar-permissions-chooser.c:403
 msgid "Program:"
 msgstr "プログラム:"
 
-#: ../thunar/thunar-permissions-chooser.c:405
+#: ../thunar/thunar-permissions-chooser.c:409
 msgid "Allow this file to _run as a program"
 msgstr "プログラムとしての実行を許可する(_R)"
 
-#: ../thunar/thunar-permissions-chooser.c:431
+#: ../thunar/thunar-permissions-chooser.c:435
+#, fuzzy
 msgid ""
-"Allowing untrusted programs to run \n"
+"Allowing untrusted programs to run\n"
 "presents a security risk to your system."
 msgstr ""
 "信用の置けないプログラムの実行を許可すると\n"
 "セキュリティ上の危険をもたらします。"
 
-#: ../thunar/thunar-permissions-chooser.c:442
+#: ../thunar/thunar-permissions-chooser.c:450
+msgid ""
+"The folder permissions are inconsistent, you\n"
+"may not be able to work with files in this folder."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:463
+msgid "Correct folder permissions..."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:464
+msgid "Click here to automatically fix the folder permissions."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:475
 msgid "Please wait..."
 msgstr "お待ち下さい..."
 
-#: ../thunar/thunar-permissions-chooser.c:447
+#: ../thunar/thunar-permissions-chooser.c:480
 msgid "Stop applying permissions recursively."
 msgstr "アクセス権を再帰的に変更していくのを止めます。"
 
 #. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:565
-#: ../thunar/thunar-permissions-chooser.c:1023
+#: ../thunar/thunar-permissions-chooser.c:598
+#: ../thunar/thunar-permissions-chooser.c:1144
 #: ../thunar/thunar-progress-dialog.c:293
 msgid "Question"
 msgstr "質問"
 
-#: ../thunar/thunar-permissions-chooser.c:589
+#: ../thunar/thunar-permissions-chooser.c:622
 msgid "Apply recursively?"
 msgstr "再帰的に変更しますか?"
 
-#: ../thunar/thunar-permissions-chooser.c:595
+#: ../thunar/thunar-permissions-chooser.c:628
 msgid ""
 "Do you want to apply your changes recursively to\n"
 "all files and subfolder below the selected folder?"
@@ -856,11 +871,11 @@ msgstr ""
 "選択したフォルダの中にある全てのファイルや\n"
 "サブフォルダにも変更を適用しますか?"
 
-#: ../thunar/thunar-permissions-chooser.c:600
+#: ../thunar/thunar-permissions-chooser.c:633
 msgid "Do _not ask me again"
 msgstr "再び尋ねない(_N)"
 
-#: ../thunar/thunar-permissions-chooser.c:601
+#: ../thunar/thunar-permissions-chooser.c:634
 msgid ""
 "If you select this option your choice will be remembered and you won't be "
 "asked again. You can use the preferences dialog to alter your choice "
@@ -870,35 +885,51 @@ msgstr ""
 "せん。今後これを変更するには環境設定ダイアログをご使用下さい。"
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:681
+#: ../thunar/thunar-permissions-chooser.c:714
 msgid "Failed to change group"
 msgstr "「%s」のグループを変更するのに失敗しました。"
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:734
+#: ../thunar/thunar-permissions-chooser.c:767
+#: ../thunar/thunar-permissions-chooser.c:1103
 msgid "Failed to apply new permissions"
 msgstr "新しいアクセス権を有効にするのに失敗しました。"
 
-#: ../thunar/thunar-permissions-chooser.c:913
+#: ../thunar/thunar-permissions-chooser.c:946
 msgid "Unknown file owner"
 msgstr "ファイル所有者不明"
 
-#: ../thunar/thunar-permissions-chooser.c:1052
+#: ../thunar/thunar-permissions-chooser.c:1077
+msgid "Correct folder permissions automatically?"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1079
+msgid "Correct folder permissions"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1081
+msgid ""
+"The folder permissions will be reset to a consistent state. Only users "
+"allowed to read the contents of this folder will be allowed to enter the "
+"folder afterwards."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1173
 #: ../thunar/thunar-progress-dialog.c:319
 msgid "_Yes"
 msgstr "はい(_Y)"
 
-#: ../thunar/thunar-permissions-chooser.c:1056
+#: ../thunar/thunar-permissions-chooser.c:1177
 #: ../thunar/thunar-progress-dialog.c:323
 msgid "Yes to _all"
 msgstr "全てにはい(_A)"
 
-#: ../thunar/thunar-permissions-chooser.c:1060
+#: ../thunar/thunar-permissions-chooser.c:1181
 #: ../thunar/thunar-progress-dialog.c:327
 msgid "_No"
 msgstr "いいえ(_N)"
 
-#: ../thunar/thunar-permissions-chooser.c:1064
+#: ../thunar/thunar-permissions-chooser.c:1185
 #: ../thunar/thunar-progress-dialog.c:331
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
diff --git a/po/nl.po b/po/nl.po
index 1d6f11640..bf9f18785 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 01:23+0100\n"
+"POT-Creation-Date: 2006-02-04 02:49+0100\n"
 "PO-Revision-Date: 2006-01-31 14:07+0100\n"
 "Last-Translator: Vincent Tunru <imnotb@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -782,82 +782,97 @@ msgid "The icon size for the path entry"
 msgstr "Icoongrootte voor pad invoer"
 
 #. 0000
-#: ../thunar/thunar-permissions-chooser.c:240
+#: ../thunar/thunar-permissions-chooser.c:244
 msgid "None"
 msgstr "Geen"
 
 #. 0002
-#: ../thunar/thunar-permissions-chooser.c:242
+#: ../thunar/thunar-permissions-chooser.c:246
 msgid "Write only"
 msgstr "Alleen schrijven"
 
 #. 0004
-#: ../thunar/thunar-permissions-chooser.c:244
+#: ../thunar/thunar-permissions-chooser.c:248
 msgid "Read only"
 msgstr "Alleen lezen"
 
 #. 0006
-#: ../thunar/thunar-permissions-chooser.c:246
+#: ../thunar/thunar-permissions-chooser.c:250
 msgid "Read & Write"
 msgstr "Lezen en schrijven"
 
-#: ../thunar/thunar-permissions-chooser.c:258
+#: ../thunar/thunar-permissions-chooser.c:262
 msgid "Owner:"
 msgstr "Eigenaar:"
 
-#: ../thunar/thunar-permissions-chooser.c:272
+#: ../thunar/thunar-permissions-chooser.c:276
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../thunar/thunar-permissions-chooser.c:286
-#: ../thunar/thunar-permissions-chooser.c:341
+#: ../thunar/thunar-permissions-chooser.c:290
+#: ../thunar/thunar-permissions-chooser.c:345
 msgid "Access:"
 msgstr "Toegang :"
 
-#: ../thunar/thunar-permissions-chooser.c:315
+#: ../thunar/thunar-permissions-chooser.c:319
 msgid "Group:"
 msgstr "Groep:"
 
-#: ../thunar/thunar-permissions-chooser.c:370
+#: ../thunar/thunar-permissions-chooser.c:374
 msgid "Others:"
 msgstr "Anderen:"
 
-#: ../thunar/thunar-permissions-chooser.c:399
+#: ../thunar/thunar-permissions-chooser.c:403
 msgid "Program:"
 msgstr "Programma:"
 
-#: ../thunar/thunar-permissions-chooser.c:405
+#: ../thunar/thunar-permissions-chooser.c:409
 msgid "Allow this file to _run as a program"
 msgstr "Dit bestand toestaan om  _uit te voeren als een programma"
 
-#: ../thunar/thunar-permissions-chooser.c:431
+#: ../thunar/thunar-permissions-chooser.c:435
+#, fuzzy
 msgid ""
-"Allowing untrusted programs to run \n"
+"Allowing untrusted programs to run\n"
 "presents a security risk to your system."
 msgstr ""
 "Toestaan van niet-vertrouwde programma's om te draaien \n"
 "is een beveilgingsrisico voor uw systeem."
 
-#: ../thunar/thunar-permissions-chooser.c:442
+#: ../thunar/thunar-permissions-chooser.c:450
+msgid ""
+"The folder permissions are inconsistent, you\n"
+"may not be able to work with files in this folder."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:463
+msgid "Correct folder permissions..."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:464
+msgid "Click here to automatically fix the folder permissions."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:475
 msgid "Please wait..."
 msgstr "Wachten A.U.B..."
 
-#: ../thunar/thunar-permissions-chooser.c:447
+#: ../thunar/thunar-permissions-chooser.c:480
 msgid "Stop applying permissions recursively."
 msgstr "Stop met het recursief toepassen van toestemmingen."
 
 #. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:565
-#: ../thunar/thunar-permissions-chooser.c:1023
+#: ../thunar/thunar-permissions-chooser.c:598
+#: ../thunar/thunar-permissions-chooser.c:1144
 #: ../thunar/thunar-progress-dialog.c:293
 msgid "Question"
 msgstr "Vraag"
 
-#: ../thunar/thunar-permissions-chooser.c:589
+#: ../thunar/thunar-permissions-chooser.c:622
 msgid "Apply recursively?"
 msgstr "Recursief toepassen?"
 
-#: ../thunar/thunar-permissions-chooser.c:595
+#: ../thunar/thunar-permissions-chooser.c:628
 msgid ""
 "Do you want to apply your changes recursively to\n"
 "all files and subfolder below the selected folder?"
@@ -865,11 +880,11 @@ msgstr ""
 "Wilt u de veranderingen recursief toepassen?\n"
 "(Op alle bestanden en mappen in de geselecteerde map)"
 
-#: ../thunar/thunar-permissions-chooser.c:600
+#: ../thunar/thunar-permissions-chooser.c:633
 msgid "Do _not ask me again"
 msgstr "_Niet weer vragen"
 
-#: ../thunar/thunar-permissions-chooser.c:601
+#: ../thunar/thunar-permissions-chooser.c:634
 msgid ""
 "If you select this option your choice will be remembered and you won't be "
 "asked again. You can use the preferences dialog to alter your choice "
@@ -879,35 +894,51 @@ msgstr ""
 "gevraagd. U kund het voorkeursscherm gebruiken om uw keuze later te wijzigen."
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:681
+#: ../thunar/thunar-permissions-chooser.c:714
 msgid "Failed to change group"
 msgstr "Probleem bij het veranderen van de groep"
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:734
+#: ../thunar/thunar-permissions-chooser.c:767
+#: ../thunar/thunar-permissions-chooser.c:1103
 msgid "Failed to apply new permissions"
 msgstr "Probleem bij het toepassen van de nieuwe toestemmingen"
 
-#: ../thunar/thunar-permissions-chooser.c:913
+#: ../thunar/thunar-permissions-chooser.c:946
 msgid "Unknown file owner"
 msgstr "Onbekende eigenaar"
 
-#: ../thunar/thunar-permissions-chooser.c:1052
+#: ../thunar/thunar-permissions-chooser.c:1077
+msgid "Correct folder permissions automatically?"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1079
+msgid "Correct folder permissions"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1081
+msgid ""
+"The folder permissions will be reset to a consistent state. Only users "
+"allowed to read the contents of this folder will be allowed to enter the "
+"folder afterwards."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1173
 #: ../thunar/thunar-progress-dialog.c:319
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../thunar/thunar-permissions-chooser.c:1056
+#: ../thunar/thunar-permissions-chooser.c:1177
 #: ../thunar/thunar-progress-dialog.c:323
 msgid "Yes to _all"
 msgstr "Ja op _alles"
 
-#: ../thunar/thunar-permissions-chooser.c:1060
+#: ../thunar/thunar-permissions-chooser.c:1181
 #: ../thunar/thunar-progress-dialog.c:327
 msgid "_No"
 msgstr "_Nee"
 
-#: ../thunar/thunar-permissions-chooser.c:1064
+#: ../thunar/thunar-permissions-chooser.c:1185
 #: ../thunar/thunar-progress-dialog.c:331
 msgid "_Cancel"
 msgstr "_Annuleren"
diff --git a/po/pl.po b/po/pl.po
index d775ddf04..326f6f5b5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 01:23+0100\n"
+"POT-Creation-Date: 2006-02-04 02:49+0100\n"
 "PO-Revision-Date: 2006-01-13 14:21+0100\n"
 "Last-Translator: Tomasz Michał Łukaszewski <T.Lukaszewski@aster.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -783,92 +783,106 @@ msgid "The icon size for the path entry"
 msgstr "Rozmiar ikony dla elementów ścieżki"
 
 #. 0000
-#: ../thunar/thunar-permissions-chooser.c:240
+#: ../thunar/thunar-permissions-chooser.c:244
 msgid "None"
 msgstr ""
 
 #. 0002
-#: ../thunar/thunar-permissions-chooser.c:242
+#: ../thunar/thunar-permissions-chooser.c:246
 msgid "Write only"
 msgstr ""
 
 #. 0004
-#: ../thunar/thunar-permissions-chooser.c:244
+#: ../thunar/thunar-permissions-chooser.c:248
 msgid "Read only"
 msgstr ""
 
 #. 0006
-#: ../thunar/thunar-permissions-chooser.c:246
+#: ../thunar/thunar-permissions-chooser.c:250
 msgid "Read & Write"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:258
+#: ../thunar/thunar-permissions-chooser.c:262
 msgid "Owner:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:272
+#: ../thunar/thunar-permissions-chooser.c:276
 #, fuzzy
 msgid "Unknown"
 msgstr "data nieznana"
 
-#: ../thunar/thunar-permissions-chooser.c:286
-#: ../thunar/thunar-permissions-chooser.c:341
+#: ../thunar/thunar-permissions-chooser.c:290
+#: ../thunar/thunar-permissions-chooser.c:345
 #, fuzzy
 msgid "Access:"
 msgstr "Ostatnio otwarty:"
 
-#: ../thunar/thunar-permissions-chooser.c:315
+#: ../thunar/thunar-permissions-chooser.c:319
 msgid "Group:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:370
+#: ../thunar/thunar-permissions-chooser.c:374
 msgid "Others:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:399
+#: ../thunar/thunar-permissions-chooser.c:403
 msgid "Program:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:405
+#: ../thunar/thunar-permissions-chooser.c:409
 msgid "Allow this file to _run as a program"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:431
+#: ../thunar/thunar-permissions-chooser.c:435
 msgid ""
-"Allowing untrusted programs to run \n"
+"Allowing untrusted programs to run\n"
 "presents a security risk to your system."
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:442
+#: ../thunar/thunar-permissions-chooser.c:450
+msgid ""
+"The folder permissions are inconsistent, you\n"
+"may not be able to work with files in this folder."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:463
+msgid "Correct folder permissions..."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:464
+msgid "Click here to automatically fix the folder permissions."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:475
 msgid "Please wait..."
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:447
+#: ../thunar/thunar-permissions-chooser.c:480
 msgid "Stop applying permissions recursively."
 msgstr ""
 
 #. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:565
-#: ../thunar/thunar-permissions-chooser.c:1023
+#: ../thunar/thunar-permissions-chooser.c:598
+#: ../thunar/thunar-permissions-chooser.c:1144
 #: ../thunar/thunar-progress-dialog.c:293
 msgid "Question"
 msgstr "Pytanie"
 
-#: ../thunar/thunar-permissions-chooser.c:589
+#: ../thunar/thunar-permissions-chooser.c:622
 msgid "Apply recursively?"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:595
+#: ../thunar/thunar-permissions-chooser.c:628
 msgid ""
 "Do you want to apply your changes recursively to\n"
 "all files and subfolder below the selected folder?"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:600
+#: ../thunar/thunar-permissions-chooser.c:633
 msgid "Do _not ask me again"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:601
+#: ../thunar/thunar-permissions-chooser.c:634
 msgid ""
 "If you select this option your choice will be remembered and you won't be "
 "asked again. You can use the preferences dialog to alter your choice "
@@ -876,37 +890,53 @@ msgid ""
 msgstr ""
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:681
+#: ../thunar/thunar-permissions-chooser.c:714
 #, fuzzy
 msgid "Failed to change group"
 msgstr "Nie udało się zmienić praw dostępu do '%s'"
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:734
+#: ../thunar/thunar-permissions-chooser.c:767
+#: ../thunar/thunar-permissions-chooser.c:1103
 #, fuzzy
 msgid "Failed to apply new permissions"
 msgstr "Nie udało się dodać aplikacji %s."
 
-#: ../thunar/thunar-permissions-chooser.c:913
+#: ../thunar/thunar-permissions-chooser.c:946
 msgid "Unknown file owner"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:1052
+#: ../thunar/thunar-permissions-chooser.c:1077
+msgid "Correct folder permissions automatically?"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1079
+msgid "Correct folder permissions"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1081
+msgid ""
+"The folder permissions will be reset to a consistent state. Only users "
+"allowed to read the contents of this folder will be allowed to enter the "
+"folder afterwards."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1173
 #: ../thunar/thunar-progress-dialog.c:319
 msgid "_Yes"
 msgstr "_Tak"
 
-#: ../thunar/thunar-permissions-chooser.c:1056
+#: ../thunar/thunar-permissions-chooser.c:1177
 #: ../thunar/thunar-progress-dialog.c:323
 msgid "Yes to _all"
 msgstr "_Tak dla _wszystkich"
 
-#: ../thunar/thunar-permissions-chooser.c:1060
+#: ../thunar/thunar-permissions-chooser.c:1181
 #: ../thunar/thunar-progress-dialog.c:327
 msgid "_No"
 msgstr "_Nie"
 
-#: ../thunar/thunar-permissions-chooser.c:1064
+#: ../thunar/thunar-permissions-chooser.c:1185
 #: ../thunar/thunar-progress-dialog.c:331
 msgid "_Cancel"
 msgstr "_Anuluj"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9a2ef31a1..50d224153 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 01:23+0100\n"
+"POT-Creation-Date: 2006-02-04 02:49+0100\n"
 "PO-Revision-Date: 2005-11-17 16:55+0900\n"
 "Last-Translator: Joao Pedrosa <joaopedrosa@gmail.com>\n"
 "Language-Team: os-cillation <info@os-cillation.com>\n"
@@ -771,93 +771,107 @@ msgid "The icon size for the path entry"
 msgstr "O tamanho de ícone para a entrada de caminho"
 
 #. 0000
-#: ../thunar/thunar-permissions-chooser.c:240
+#: ../thunar/thunar-permissions-chooser.c:244
 msgid "None"
 msgstr ""
 
 #. 0002
-#: ../thunar/thunar-permissions-chooser.c:242
+#: ../thunar/thunar-permissions-chooser.c:246
 msgid "Write only"
 msgstr ""
 
 #. 0004
-#: ../thunar/thunar-permissions-chooser.c:244
+#: ../thunar/thunar-permissions-chooser.c:248
 msgid "Read only"
 msgstr ""
 
 #. 0006
-#: ../thunar/thunar-permissions-chooser.c:246
+#: ../thunar/thunar-permissions-chooser.c:250
 msgid "Read & Write"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:258
+#: ../thunar/thunar-permissions-chooser.c:262
 msgid "Owner:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:272
+#: ../thunar/thunar-permissions-chooser.c:276
 msgid "Unknown"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:286
-#: ../thunar/thunar-permissions-chooser.c:341
+#: ../thunar/thunar-permissions-chooser.c:290
+#: ../thunar/thunar-permissions-chooser.c:345
 #, fuzzy
 msgid "Access:"
 msgstr "Acessado:"
 
-#: ../thunar/thunar-permissions-chooser.c:315
+#: ../thunar/thunar-permissions-chooser.c:319
 msgid "Group:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:370
+#: ../thunar/thunar-permissions-chooser.c:374
 #, fuzzy
 msgid "Others:"
 msgstr "C_olar Arquivos"
 
-#: ../thunar/thunar-permissions-chooser.c:399
+#: ../thunar/thunar-permissions-chooser.c:403
 msgid "Program:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:405
+#: ../thunar/thunar-permissions-chooser.c:409
 msgid "Allow this file to _run as a program"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:431
+#: ../thunar/thunar-permissions-chooser.c:435
 msgid ""
-"Allowing untrusted programs to run \n"
+"Allowing untrusted programs to run\n"
 "presents a security risk to your system."
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:442
+#: ../thunar/thunar-permissions-chooser.c:450
+msgid ""
+"The folder permissions are inconsistent, you\n"
+"may not be able to work with files in this folder."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:463
+msgid "Correct folder permissions..."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:464
+msgid "Click here to automatically fix the folder permissions."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:475
 msgid "Please wait..."
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:447
+#: ../thunar/thunar-permissions-chooser.c:480
 #, fuzzy
 msgid "Stop applying permissions recursively."
 msgstr "Falha em trocar modo de `%s'"
 
 #. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:565
-#: ../thunar/thunar-permissions-chooser.c:1023
+#: ../thunar/thunar-permissions-chooser.c:598
+#: ../thunar/thunar-permissions-chooser.c:1144
 #: ../thunar/thunar-progress-dialog.c:293
 msgid "Question"
 msgstr "Questão"
 
-#: ../thunar/thunar-permissions-chooser.c:589
+#: ../thunar/thunar-permissions-chooser.c:622
 msgid "Apply recursively?"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:595
+#: ../thunar/thunar-permissions-chooser.c:628
 msgid ""
 "Do you want to apply your changes recursively to\n"
 "all files and subfolder below the selected folder?"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:600
+#: ../thunar/thunar-permissions-chooser.c:633
 msgid "Do _not ask me again"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:601
+#: ../thunar/thunar-permissions-chooser.c:634
 msgid ""
 "If you select this option your choice will be remembered and you won't be "
 "asked again. You can use the preferences dialog to alter your choice "
@@ -865,37 +879,53 @@ msgid ""
 msgstr ""
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:681
+#: ../thunar/thunar-permissions-chooser.c:714
 #, fuzzy
 msgid "Failed to change group"
 msgstr "Falha em trocar modo de `%s'"
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:734
+#: ../thunar/thunar-permissions-chooser.c:767
+#: ../thunar/thunar-permissions-chooser.c:1103
 #, fuzzy
 msgid "Failed to apply new permissions"
 msgstr "Falha em trocar modo de `%s'"
 
-#: ../thunar/thunar-permissions-chooser.c:913
+#: ../thunar/thunar-permissions-chooser.c:946
 msgid "Unknown file owner"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:1052
+#: ../thunar/thunar-permissions-chooser.c:1077
+msgid "Correct folder permissions automatically?"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1079
+msgid "Correct folder permissions"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1081
+msgid ""
+"The folder permissions will be reset to a consistent state. Only users "
+"allowed to read the contents of this folder will be allowed to enter the "
+"folder afterwards."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1173
 #: ../thunar/thunar-progress-dialog.c:319
 msgid "_Yes"
 msgstr "_Sim"
 
-#: ../thunar/thunar-permissions-chooser.c:1056
+#: ../thunar/thunar-permissions-chooser.c:1177
 #: ../thunar/thunar-progress-dialog.c:323
 msgid "Yes to _all"
 msgstr "Sim para _todos"
 
-#: ../thunar/thunar-permissions-chooser.c:1060
+#: ../thunar/thunar-permissions-chooser.c:1181
 #: ../thunar/thunar-progress-dialog.c:327
 msgid "_No"
 msgstr "_Não"
 
-#: ../thunar/thunar-permissions-chooser.c:1064
+#: ../thunar/thunar-permissions-chooser.c:1185
 #: ../thunar/thunar-progress-dialog.c:331
 msgid "_Cancel"
 msgstr "_Cancelar"
diff --git a/po/ru.po b/po/ru.po
index 526717d1d..0b03c96a5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 01:23+0100\n"
+"POT-Creation-Date: 2006-02-04 02:49+0100\n"
 "PO-Revision-Date: 2006-01-29 17:47+0500\n"
 "Last-Translator: Andrey Fedoseev <andrey.fedoseev@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -772,91 +772,105 @@ msgid "The icon size for the path entry"
 msgstr ""
 
 #. 0000
-#: ../thunar/thunar-permissions-chooser.c:240
+#: ../thunar/thunar-permissions-chooser.c:244
 #, fuzzy
 msgid "None"
 msgstr "Нет"
 
 #. 0002
-#: ../thunar/thunar-permissions-chooser.c:242
+#: ../thunar/thunar-permissions-chooser.c:246
 msgid "Write only"
 msgstr "Только запись"
 
 #. 0004
-#: ../thunar/thunar-permissions-chooser.c:244
+#: ../thunar/thunar-permissions-chooser.c:248
 msgid "Read only"
 msgstr "Только чтение"
 
 #. 0006
-#: ../thunar/thunar-permissions-chooser.c:246
+#: ../thunar/thunar-permissions-chooser.c:250
 msgid "Read & Write"
 msgstr "Чтение/Запись"
 
-#: ../thunar/thunar-permissions-chooser.c:258
+#: ../thunar/thunar-permissions-chooser.c:262
 msgid "Owner:"
 msgstr "Владелец:"
 
-#: ../thunar/thunar-permissions-chooser.c:272
+#: ../thunar/thunar-permissions-chooser.c:276
 msgid "Unknown"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:286
-#: ../thunar/thunar-permissions-chooser.c:341
+#: ../thunar/thunar-permissions-chooser.c:290
+#: ../thunar/thunar-permissions-chooser.c:345
 msgid "Access:"
 msgstr "Доступ:"
 
-#: ../thunar/thunar-permissions-chooser.c:315
+#: ../thunar/thunar-permissions-chooser.c:319
 msgid "Group:"
 msgstr "Группа:"
 
-#: ../thunar/thunar-permissions-chooser.c:370
+#: ../thunar/thunar-permissions-chooser.c:374
 msgid "Others:"
 msgstr "Остальные:"
 
-#: ../thunar/thunar-permissions-chooser.c:399
+#: ../thunar/thunar-permissions-chooser.c:403
 msgid "Program:"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:405
+#: ../thunar/thunar-permissions-chooser.c:409
 msgid "Allow this file to _run as a program"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:431
+#: ../thunar/thunar-permissions-chooser.c:435
 msgid ""
-"Allowing untrusted programs to run \n"
+"Allowing untrusted programs to run\n"
 "presents a security risk to your system."
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:442
+#: ../thunar/thunar-permissions-chooser.c:450
+msgid ""
+"The folder permissions are inconsistent, you\n"
+"may not be able to work with files in this folder."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:463
+msgid "Correct folder permissions..."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:464
+msgid "Click here to automatically fix the folder permissions."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:475
 msgid "Please wait..."
 msgstr "Подождите..."
 
-#: ../thunar/thunar-permissions-chooser.c:447
+#: ../thunar/thunar-permissions-chooser.c:480
 msgid "Stop applying permissions recursively."
 msgstr ""
 
 #. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:565
-#: ../thunar/thunar-permissions-chooser.c:1023
+#: ../thunar/thunar-permissions-chooser.c:598
+#: ../thunar/thunar-permissions-chooser.c:1144
 #: ../thunar/thunar-progress-dialog.c:293
 msgid "Question"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:589
+#: ../thunar/thunar-permissions-chooser.c:622
 msgid "Apply recursively?"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:595
+#: ../thunar/thunar-permissions-chooser.c:628
 msgid ""
 "Do you want to apply your changes recursively to\n"
 "all files and subfolder below the selected folder?"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:600
+#: ../thunar/thunar-permissions-chooser.c:633
 msgid "Do _not ask me again"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:601
+#: ../thunar/thunar-permissions-chooser.c:634
 msgid ""
 "If you select this option your choice will be remembered and you won't be "
 "asked again. You can use the preferences dialog to alter your choice "
@@ -864,35 +878,51 @@ msgid ""
 msgstr ""
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:681
+#: ../thunar/thunar-permissions-chooser.c:714
 msgid "Failed to change group"
 msgstr ""
 
 #. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:734
+#: ../thunar/thunar-permissions-chooser.c:767
+#: ../thunar/thunar-permissions-chooser.c:1103
 msgid "Failed to apply new permissions"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:913
+#: ../thunar/thunar-permissions-chooser.c:946
 msgid "Unknown file owner"
 msgstr ""
 
-#: ../thunar/thunar-permissions-chooser.c:1052
+#: ../thunar/thunar-permissions-chooser.c:1077
+msgid "Correct folder permissions automatically?"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1079
+msgid "Correct folder permissions"
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1081
+msgid ""
+"The folder permissions will be reset to a consistent state. Only users "
+"allowed to read the contents of this folder will be allowed to enter the "
+"folder afterwards."
+msgstr ""
+
+#: ../thunar/thunar-permissions-chooser.c:1173
 #: ../thunar/thunar-progress-dialog.c:319
 msgid "_Yes"
 msgstr "_Да"
 
-#: ../thunar/thunar-permissions-chooser.c:1056
+#: ../thunar/thunar-permissions-chooser.c:1177
 #: ../thunar/thunar-progress-dialog.c:323
 msgid "Yes to _all"
 msgstr "Да для _всех"
 
-#: ../thunar/thunar-permissions-chooser.c:1060
+#: ../thunar/thunar-permissions-chooser.c:1181
 #: ../thunar/thunar-progress-dialog.c:327
 msgid "_No"
 msgstr "_Нет"
 
-#: ../thunar/thunar-permissions-chooser.c:1064
+#: ../thunar/thunar-permissions-chooser.c:1185
 #: ../thunar/thunar-progress-dialog.c:331
 msgid "_Cancel"
 msgstr "_Отменить"
diff --git a/thunar/thunar-permissions-chooser.c b/thunar/thunar-permissions-chooser.c
index 526c11678..7e7d84f23 100644
--- a/thunar/thunar-permissions-chooser.c
+++ b/thunar/thunar-permissions-chooser.c
@@ -86,6 +86,8 @@ static void                             thunar_permissions_chooser_group_changed
                                                                                      GtkWidget                      *combo);
 static void                             thunar_permissions_chooser_program_toggled  (ThunarPermissionsChooser       *chooser,
                                                                                      GtkWidget                      *button);
+static void                             thunar_permissions_chooser_fixperm_clicked  (ThunarPermissionsChooser       *chooser,
+                                                                                     GtkWidget                      *button);
 static ThunarVfsInteractiveJobResponse  thunar_permissions_chooser_job_ask          (ThunarPermissionsChooser       *chooser,
                                                                                      const gchar                    *message,
                                                                                      ThunarVfsInteractiveJobResponse choices,
@@ -128,6 +130,8 @@ struct _ThunarPermissionsChooser
   GtkWidget    *group_combo;
   GtkWidget    *access_combos[3];
   GtkWidget    *program_button;
+  GtkWidget    *fixperm_label;
+  GtkWidget    *fixperm_button;
 
   /* job control stuff */
   ThunarVfsJob *job;
@@ -428,12 +432,41 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
   gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
   gtk_widget_show (image);
 
-  label = gtk_label_new (_("Allowing untrusted programs to run \npresents a security risk to your system."));
+  label = gtk_label_new (_("Allowing untrusted programs to run\npresents a security risk to your system."));
   gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
   gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_small_italic ());
   gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
   gtk_widget_show (label);
 
+  hbox = gtk_hbox_new (FALSE, 6);
+  exo_binding_new (G_OBJECT (chooser), "mutable", G_OBJECT (hbox), "sensitive");
+  gtk_table_attach (GTK_TABLE (chooser->table), hbox, 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
+  gtk_widget_show (hbox);
+
+  image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_LARGE_TOOLBAR);
+  gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+  gtk_widget_show (image);
+
+  chooser->fixperm_label = gtk_label_new (_("The folder permissions are inconsistent, you\nmay not be able to work with files in this folder."));
+  gtk_misc_set_alignment (GTK_MISC (chooser->fixperm_label), 0.0f, 0.5f);
+  gtk_label_set_attributes (GTK_LABEL (chooser->fixperm_label), thunar_pango_attr_list_small_italic ());
+  exo_binding_new (G_OBJECT (chooser->fixperm_label), "visible", G_OBJECT (hbox), "visible");
+  gtk_box_pack_start (GTK_BOX (hbox), chooser->fixperm_label, TRUE, TRUE, 0);
+  gtk_widget_show (chooser->fixperm_label);
+
+  row += 1;
+
+  hbox = gtk_hbox_new (FALSE, 6);
+  gtk_table_attach (GTK_TABLE (chooser->table), hbox, 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
+  gtk_widget_show (hbox);
+
+  chooser->fixperm_button = gtk_button_new_with_mnemonic (_("Correct folder permissions..."));
+  gtk_tooltips_set_tip (chooser->tooltips, chooser->fixperm_button, _("Click here to automatically fix the folder permissions."), NULL);
+  g_signal_connect_swapped (G_OBJECT (chooser->fixperm_button), "clicked", G_CALLBACK (thunar_permissions_chooser_fixperm_clicked), chooser);
+  exo_binding_new (G_OBJECT (chooser->fixperm_button), "visible", G_OBJECT (hbox), "visible");
+  gtk_box_pack_end (GTK_BOX (hbox), chooser->fixperm_button, FALSE, FALSE, 0);
+  gtk_widget_show (chooser->fixperm_button);
+
   /* the job control stuff */
   hbox = gtk_hbox_new (FALSE, 6);
   gtk_box_pack_start (GTK_BOX (chooser), hbox, FALSE, FALSE, 0);
@@ -922,12 +955,30 @@ thunar_permissions_chooser_file_changed (ThunarPermissionsChooser *chooser,
       g_signal_handlers_unblock_by_func (G_OBJECT (chooser->access_combos[n]), thunar_permissions_chooser_access_changed, chooser);
     }
 
-  /* update the program setting based on the mode (only visible for regular files) */
+  /* update the program setting based on the mode (only visible for regular files, allowed for execution) */
   g_signal_handlers_block_by_func (G_OBJECT (chooser->program_button), thunar_permissions_chooser_program_toggled, chooser);
-  g_object_set (G_OBJECT (chooser->program_button), "visible", thunar_file_is_regular (file), NULL);
+  g_object_set (G_OBJECT (chooser->program_button), "visible", thunar_file_is_regular (file)
+      && (thunarx_file_info_has_mime_type (THUNARX_FILE_INFO (file), "application/x-executable")
+       || thunarx_file_info_has_mime_type (THUNARX_FILE_INFO (file), "application/x-shellscript")), NULL);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chooser->program_button), (mode & 0111) != 0);
   g_signal_handlers_unblock_by_func (G_OBJECT (chooser->program_button), thunar_permissions_chooser_program_toggled, chooser);
 
+  /* update the "inconsistent folder permissions" warning and the "fix permissions" button based on the mode */
+  if (thunar_file_is_directory (file) && ((mode & 0111) != ((mode >> 2) & 0111)))
+    {
+      /* display the "fix permissions" button if we can modify the file */
+      g_object_set (G_OBJECT (chooser->fixperm_button), "visible", thunar_file_is_chmodable (file), NULL);
+
+      /* always display the warning even if we cannot fix it */
+      gtk_widget_show (chooser->fixperm_label);
+    }
+  else
+    {
+      /* hide both the warning text and the fix button */
+      gtk_widget_hide (chooser->fixperm_button);
+      gtk_widget_hide (chooser->fixperm_label);
+    }
+
   /* release our reference on the new combo store and unblock the combo */
   g_signal_handlers_unblock_by_func (G_OBJECT (chooser->group_combo), thunar_permissions_chooser_group_changed, chooser);
   g_object_unref (G_OBJECT (store));
@@ -993,6 +1044,76 @@ thunar_permissions_chooser_program_toggled (ThunarPermissionsChooser *chooser,
 
 
 
+static void
+thunar_permissions_chooser_fixperm_clicked (ThunarPermissionsChooser *chooser,
+                                            GtkWidget                *button)
+{
+  ThunarVfsFileMode mode;
+  ThunarVfsJob     *job;
+  GtkWidget        *dialog;
+  GtkWidget        *window;
+  GError           *error = NULL;
+  gint              response;
+
+  g_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
+  g_return_if_fail (chooser->fixperm_button == button);
+  g_return_if_fail (GTK_IS_BUTTON (button));
+
+  /* verify that we have a valid file */
+  if (G_UNLIKELY (chooser->file == NULL))
+    return;
+
+  /* determine the toplevel widget */
+  window = gtk_widget_get_toplevel (GTK_WIDGET (chooser));
+  if (G_UNLIKELY (window == NULL))
+    return;
+
+  /* popup a confirm dialog */
+  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+                                   GTK_DIALOG_DESTROY_WITH_PARENT
+                                   | GTK_DIALOG_MODAL,
+                                   GTK_MESSAGE_QUESTION,
+                                   GTK_BUTTONS_NONE,
+                                   _("Correct folder permissions automatically?"));
+  gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+  gtk_dialog_add_button (GTK_DIALOG (dialog), _("Correct folder permissions"), GTK_RESPONSE_OK);
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("The folder permissions will be reset to a consistent state. Only users "
+                                                                           "allowed to read the contents of this folder will be allowed to enter the "
+                                                                           "folder afterwards."));
+  response = gtk_dialog_run (GTK_DIALOG (dialog));
+  gtk_widget_destroy (dialog);
+
+  /* check if we should apply the changes */
+  if (G_LIKELY (chooser->file != NULL && response == GTK_RESPONSE_OK))
+    {
+      /* determine the current mode */
+      mode = thunar_file_get_mode (chooser->file);
+
+      /* determine the new mode */
+      mode = (((mode & THUNAR_VFS_FILE_MODE_USR_READ) != 0) ? THUNAR_VFS_FILE_MODE_USR_EXEC : 0)
+           | (((mode & THUNAR_VFS_FILE_MODE_GRP_READ) != 0) ? THUNAR_VFS_FILE_MODE_GRP_EXEC : 0)
+           | (((mode & THUNAR_VFS_FILE_MODE_OTH_READ) != 0) ? THUNAR_VFS_FILE_MODE_OTH_EXEC : 0);
+
+      /* try to allocate the new job */
+      job = thunar_vfs_change_mode (thunar_file_get_path (chooser->file), 0111, mode, 0000, 0000, FALSE, &error);
+      if (G_UNLIKELY (job == NULL))
+        {
+          /* display an error to the user */
+          thunar_dialogs_show_error (GTK_WIDGET (chooser), error, _("Failed to apply new permissions"));
+          g_error_free (error);
+        }
+      else
+        {
+          /* handle the job */
+          thunar_permissions_chooser_job_start (chooser, job, FALSE);
+          g_object_unref (G_OBJECT (job));
+        }
+    }
+}
+
+
+
 static ThunarVfsInteractiveJobResponse
 thunar_permissions_chooser_job_ask (ThunarPermissionsChooser       *chooser,
                                     const gchar                    *message,
-- 
GitLab