1 files changed, 942 insertions, 1008 deletions
diff --git a/po/yo.po b/po/yo.po
index 465b4716..0d1bf58f 100644
--- a/po/yo.po
+++ b/po/yo.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-11 14:07+0300\n"
-"PO-Revision-Date: 2016-11-11 11:07+0000\n"
+"POT-Creation-Date: 2016-12-06 00:34+0300\n"
+"PO-Revision-Date: 2016-12-05 21:34+0000\n"
 "Last-Translator: monsta <[email protected]>\n"
 "Language-Team: Yoruba (http://www.transifex.com/mate/MATE/language/yo/)\n"
 "MIME-Version: 1.0\n"
@@ -52,31 +52,31 @@ msgstr ""
 msgid "Not a launchable item"
 msgstr ""
 
-#: ../cut-n-paste-code/libegg/eggsmclient.c:239
+#: ../cut-n-paste-code/libegg/eggsmclient.c:237
 msgid "Disable connection to session manager"
 msgstr ""
 
-#: ../cut-n-paste-code/libegg/eggsmclient.c:244
+#: ../cut-n-paste-code/libegg/eggsmclient.c:242
 msgid "Specify file containing saved configuration"
 msgstr ""
 
-#: ../cut-n-paste-code/libegg/eggsmclient.c:244
+#: ../cut-n-paste-code/libegg/eggsmclient.c:242
 msgid "FILE"
 msgstr ""
 
-#: ../cut-n-paste-code/libegg/eggsmclient.c:249
+#: ../cut-n-paste-code/libegg/eggsmclient.c:247
 msgid "Specify session management ID"
 msgstr ""
 
-#: ../cut-n-paste-code/libegg/eggsmclient.c:249
+#: ../cut-n-paste-code/libegg/eggsmclient.c:247
 msgid "ID"
 msgstr ""
 
-#: ../cut-n-paste-code/libegg/eggsmclient.c:275
+#: ../cut-n-paste-code/libegg/eggsmclient.c:273
 msgid "Session management options:"
 msgstr ""
 
-#: ../cut-n-paste-code/libegg/eggsmclient.c:276
+#: ../cut-n-paste-code/libegg/eggsmclient.c:274
 msgid "Show session management options"
 msgstr ""
 
@@ -349,8 +349,8 @@ msgid "Drag an emblem to an object to add it to the object"
 msgstr "Wọ́ àmì àpẹẹrẹ lọ sí nǹkan láti fi kún nǹkan"
 
 #. translators: this is the name of an emblem
-#: ../data/browser.xml.h:69 ../src/caja-emblem-sidebar.c:990
-#: ../src/caja-property-browser.c:2004
+#: ../data/browser.xml.h:69 ../src/caja-emblem-sidebar.c:982
+#: ../src/caja-property-browser.c:1938
 msgid "Erase"
 msgstr "Paárẹ́"
 
@@ -372,67 +372,67 @@ msgstr ""
 msgid "Saved search"
 msgstr ""
 
-#: ../eel/eel-canvas.c:1446 ../eel/eel-canvas.c:1447
+#: ../eel/eel-canvas.c:1379 ../eel/eel-canvas.c:1380
 msgid "X"
 msgstr ""
 
-#: ../eel/eel-canvas.c:1453 ../eel/eel-canvas.c:1454
+#: ../eel/eel-canvas.c:1386 ../eel/eel-canvas.c:1387
 msgid "Y"
 msgstr ""
 
-#: ../eel/eel-editable-label.c:372
+#: ../eel/eel-editable-label.c:331
 msgid "Text"
 msgstr ""
 
-#: ../eel/eel-editable-label.c:373
+#: ../eel/eel-editable-label.c:332
 msgid "The text of the label."
 msgstr ""
 
-#: ../eel/eel-editable-label.c:379
+#: ../eel/eel-editable-label.c:338
 msgid "Justification"
 msgstr ""
 
-#: ../eel/eel-editable-label.c:380
+#: ../eel/eel-editable-label.c:339
 msgid ""
 "The alignment of the lines in the text of the label relative to each other. "
 "This does NOT affect the alignment of the label within its allocation. See "
 "GtkMisc::xalign for that."
 msgstr ""
 
-#: ../eel/eel-editable-label.c:388
+#: ../eel/eel-editable-label.c:347
 msgid "Line wrap"
 msgstr ""
 
-#: ../eel/eel-editable-label.c:389
+#: ../eel/eel-editable-label.c:348
 msgid "If set, wrap lines if the text becomes too wide."
 msgstr ""
 
-#: ../eel/eel-editable-label.c:396
+#: ../eel/eel-editable-label.c:355
 msgid "Cursor Position"
 msgstr ""
 
-#: ../eel/eel-editable-label.c:397
+#: ../eel/eel-editable-label.c:356
 msgid "The current position of the insertion cursor in chars."
 msgstr ""
 
-#: ../eel/eel-editable-label.c:406
+#: ../eel/eel-editable-label.c:365
 msgid "Selection Bound"
 msgstr ""
 
-#: ../eel/eel-editable-label.c:407
+#: ../eel/eel-editable-label.c:366
 msgid ""
 "The position of the opposite end of the selection from the cursor in chars."
 msgstr ""
 
-#: ../eel/eel-editable-label.c:3486
+#: ../eel/eel-editable-label.c:3119
 msgid "Select All"
 msgstr ""
 
-#: ../eel/eel-editable-label.c:3497
+#: ../eel/eel-editable-label.c:3130
 msgid "Input Methods"
 msgstr ""
 
-#: ../eel/eel-gtk-extensions.c:483
+#: ../eel/eel-gtk-extensions.c:445
 msgid "Show more _details"
 msgstr ""
 
@@ -444,129 +444,129 @@ msgstr ""
 msgid " (invalid Unicode)"
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:522
+#: ../libcaja-private/caja-autorun.c:517
 msgid "No applications found"
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:541
+#: ../libcaja-private/caja-autorun.c:536
 msgid "Ask what to do"
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:557
+#: ../libcaja-private/caja-autorun.c:552
 msgid "Do Nothing"
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:572
+#: ../libcaja-private/caja-autorun.c:567
 #: ../data/caja-folder-handler.desktop.in.in.h:2
 msgid "Open Folder"
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:605 ../src/caja-x-content-bar.c:152
+#: ../libcaja-private/caja-autorun.c:600 ../src/caja-x-content-bar.c:148
 #, c-format
 msgid "Open %s"
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:647
+#: ../libcaja-private/caja-autorun.c:642
 msgid "Open with other Application..."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1037
+#: ../libcaja-private/caja-autorun.c:1024
 msgid "You have just inserted an Audio CD."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1041
+#: ../libcaja-private/caja-autorun.c:1028
 msgid "You have just inserted an Audio DVD."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1045
+#: ../libcaja-private/caja-autorun.c:1032
 msgid "You have just inserted a Video DVD."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1049
+#: ../libcaja-private/caja-autorun.c:1036
 msgid "You have just inserted a Video CD."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1053
+#: ../libcaja-private/caja-autorun.c:1040
 msgid "You have just inserted a Super Video CD."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1057
+#: ../libcaja-private/caja-autorun.c:1044
 msgid "You have just inserted a blank CD."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1061
+#: ../libcaja-private/caja-autorun.c:1048
 msgid "You have just inserted a blank DVD."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1065
+#: ../libcaja-private/caja-autorun.c:1052
 msgid "You have just inserted a blank Blu-Ray disc."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1069
+#: ../libcaja-private/caja-autorun.c:1056
 msgid "You have just inserted a blank HD DVD."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1073
+#: ../libcaja-private/caja-autorun.c:1060
 msgid "You have just inserted a Photo CD."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1077
+#: ../libcaja-private/caja-autorun.c:1064
 msgid "You have just inserted a Picture CD."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1081
+#: ../libcaja-private/caja-autorun.c:1068
 msgid "You have just inserted a medium with digital photos."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1085
+#: ../libcaja-private/caja-autorun.c:1072
 msgid "You have just inserted a digital audio player."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1089
+#: ../libcaja-private/caja-autorun.c:1076
 msgid ""
 "You have just inserted a medium with software intended to be automatically "
 "started."
 msgstr ""
 
 #. fallback to generic greeting
-#: ../libcaja-private/caja-autorun.c:1094
+#: ../libcaja-private/caja-autorun.c:1081
 msgid "You have just inserted a medium."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1096
+#: ../libcaja-private/caja-autorun.c:1083
 msgid "Choose what application to launch."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1112
+#: ../libcaja-private/caja-autorun.c:1097
 #, c-format
 msgid ""
 "Select how to open \"%s\" and whether to perform this action in the future "
 "for other media of type \"%s\"."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1146
+#: ../libcaja-private/caja-autorun.c:1129
 msgid "_Always perform this action"
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
 #. add the "Eject" menu item
-#: ../libcaja-private/caja-autorun.c:1163
-#: ../src/file-manager/fm-directory-view.c:7500
-#: ../src/file-manager/fm-directory-view.c:7528
-#: ../src/file-manager/fm-directory-view.c:7609
-#: ../src/file-manager/fm-tree-view.c:1382 ../src/caja-places-sidebar.c:2761
+#: ../libcaja-private/caja-autorun.c:1146
+#: ../src/file-manager/fm-directory-view.c:7424
+#: ../src/file-manager/fm-directory-view.c:7452
+#: ../src/file-manager/fm-directory-view.c:7533
+#: ../src/file-manager/fm-tree-view.c:1382 ../src/caja-places-sidebar.c:2740
 msgid "_Eject"
 msgstr "_Yọkúrò"
 
 #. name, stock id
 #. label, accelerator
 #. add the "Unmount" menu item
-#: ../libcaja-private/caja-autorun.c:1176
-#: ../src/file-manager/fm-directory-view.c:7496
-#: ../src/file-manager/fm-directory-view.c:7524
-#: ../src/file-manager/fm-directory-view.c:7605
-#: ../src/file-manager/fm-tree-view.c:1373 ../src/caja-places-sidebar.c:2754
+#: ../libcaja-private/caja-autorun.c:1159
+#: ../src/file-manager/fm-directory-view.c:7420
+#: ../src/file-manager/fm-directory-view.c:7448
+#: ../src/file-manager/fm-directory-view.c:7529
+#: ../src/file-manager/fm-tree-view.c:1373 ../src/caja-places-sidebar.c:2733
 msgid "_Unmount"
 msgstr ""
 
@@ -594,7 +594,7 @@ msgstr "Le ayọkà tí a fi pamọ́ sórí agbàròyìn dúró náa�
 #. name, stock id
 #. label, accelerator
 #: ../libcaja-private/caja-clipboard.c:470
-#: ../src/file-manager/fm-directory-view.c:7429
+#: ../src/file-manager/fm-directory-view.c:7353
 msgid "Select _All"
 msgstr "Yan _Gbogbo wọn"
 
@@ -603,21 +603,21 @@ msgstr "Yan _Gbogbo wọn"
 msgid "Select all the text in a text field"
 msgstr "Yan gbogbo àyọkà ní pápá àyọkà"
 
-#: ../libcaja-private/caja-column-chooser.c:386
+#: ../libcaja-private/caja-column-chooser.c:378
 msgid "Move _Up"
 msgstr "Lọ _Sókè"
 
-#: ../libcaja-private/caja-column-chooser.c:396
+#: ../libcaja-private/caja-column-chooser.c:388
 msgid "Move Dow_n"
 msgstr ""
 
-#: ../libcaja-private/caja-column-chooser.c:413
+#: ../libcaja-private/caja-column-chooser.c:401
 msgid "Use De_fault"
 msgstr ""
 
 #: ../libcaja-private/caja-column-utilities.c:44
-#: ../libcaja-private/caja-mime-application-chooser.c:278
-#: ../src/file-manager/fm-list-view.c:1805
+#: ../libcaja-private/caja-mime-application-chooser.c:274
+#: ../src/file-manager/fm-list-view.c:1773
 msgid "Name"
 msgstr "Orúkọ"
 
@@ -642,7 +642,7 @@ msgid "The type of the file."
 msgstr "Irúfẹ́ fáìlì náà."
 
 #: ../libcaja-private/caja-column-utilities.c:66
-#: ../src/caja-image-properties-page.c:296
+#: ../src/caja-image-properties-page.c:288
 msgid "Date Modified"
 msgstr "A tún Déètì Tò"
 
@@ -675,8 +675,7 @@ msgid "The group of the file."
 msgstr "Ẹgbẹ́ fáìlì náà."
 
 #: ../libcaja-private/caja-column-utilities.c:98
-#: ../src/file-manager/fm-properties-window.c:5751
-#: ../src/file-manager/fm-properties-window.c:5811
+#: ../src/file-manager/fm-properties-window.c:4734
 msgid "Permissions"
 msgstr "Àwọn Ìyànda"
 
@@ -709,7 +708,7 @@ msgid "The SELinux security context of the file."
 msgstr ""
 
 #: ../libcaja-private/caja-column-utilities.c:130
-#: ../src/caja-image-properties-page.c:377 ../src/caja-query-editor.c:129
+#: ../src/caja-image-properties-page.c:369 ../src/caja-query-editor.c:124
 msgid "Location"
 msgstr ""
 
@@ -734,9 +733,9 @@ msgid "Original location of file before moved to the Trash"
 msgstr ""
 
 #: ../libcaja-private/caja-customization-data.c:431
-#: ../libcaja-private/caja-file-conflict-dialog.c:678
-#: ../libcaja-private/caja-mime-application-chooser.c:449
-#: ../src/caja-property-browser.c:2051
+#: ../libcaja-private/caja-file-conflict-dialog.c:631
+#: ../libcaja-private/caja-mime-application-chooser.c:441
+#: ../src/caja-property-browser.c:1985
 msgid "Reset"
 msgstr ""
 
@@ -758,7 +757,7 @@ msgid "%s's Home"
 msgstr "Ilé %s"
 
 #: ../libcaja-private/caja-desktop-link.c:113
-#: ../data/caja-computer.desktop.in.in.h:1 ../src/caja-places-sidebar.c:506
+#: ../data/caja-computer.desktop.in.in.h:1 ../src/caja-places-sidebar.c:493
 msgid "Computer"
 msgstr "Kọ̀ǹpútà"
 
@@ -767,8 +766,8 @@ msgid "Network Servers"
 msgstr ""
 
 #: ../libcaja-private/caja-desktop-link.c:119
-#: ../src/file-manager/fm-tree-view.c:1441 ../src/caja-places-sidebar.c:610
-#: ../src/caja-trash-bar.c:194
+#: ../src/file-manager/fm-tree-view.c:1441 ../src/caja-places-sidebar.c:597
+#: ../src/caja-trash-bar.c:190
 msgid "Trash"
 msgstr "Pàǹtí"
 
@@ -838,155 +837,153 @@ msgstr "Dákun, kò lè fi àmì àpẹẹre àkànṣe pamọ́."
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Dákun, kò lè fi orúkọ àmì àpẹẹre àkànṣe pamọ́."
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:153
+#: ../libcaja-private/caja-file-conflict-dialog.c:144
 #, c-format
 msgid "Merge folder \"%s\"?"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:157
+#: ../libcaja-private/caja-file-conflict-dialog.c:148
 msgid ""
 "Merging will ask for confirmation before replacing any files in the folder "
 "that conflict with the files being copied."
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:163
+#: ../libcaja-private/caja-file-conflict-dialog.c:154
 #, c-format
 msgid "An older folder with the same name already exists in \"%s\"."
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:169
+#: ../libcaja-private/caja-file-conflict-dialog.c:160
 #, c-format
 msgid "A newer folder with the same name already exists in \"%s\"."
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:175
+#: ../libcaja-private/caja-file-conflict-dialog.c:166
 #, c-format
 msgid "Another folder with the same name already exists in \"%s\"."
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:182
+#: ../libcaja-private/caja-file-conflict-dialog.c:173
 msgid "Replacing it will remove all files in the folder."
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:184
+#: ../libcaja-private/caja-file-conflict-dialog.c:175
 #, c-format
 msgid "Replace folder \"%s\"?"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:186
+#: ../libcaja-private/caja-file-conflict-dialog.c:177
 #, c-format
 msgid "A folder with the same name already exists in \"%s\"."
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:193
+#: ../libcaja-private/caja-file-conflict-dialog.c:184
 #, c-format
 msgid "Replace file \"%s\"?"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:195
+#: ../libcaja-private/caja-file-conflict-dialog.c:186
 msgid "Replacing it will overwrite its content."
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:200
+#: ../libcaja-private/caja-file-conflict-dialog.c:191
 #, c-format
 msgid "An older file with the same name already exists in \"%s\"."
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:206
+#: ../libcaja-private/caja-file-conflict-dialog.c:197
 #, c-format
 msgid "A newer file with the same name already exists in \"%s\"."
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:212
+#: ../libcaja-private/caja-file-conflict-dialog.c:203
 #, c-format
 msgid "Another file with the same name already exists in \"%s\"."
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:310
+#: ../libcaja-private/caja-file-conflict-dialog.c:279
 msgid "Original folder"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:311
-#: ../libcaja-private/caja-file-conflict-dialog.c:350
+#: ../libcaja-private/caja-file-conflict-dialog.c:280
+#: ../libcaja-private/caja-file-conflict-dialog.c:319
 msgid "Items:"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:314
+#: ../libcaja-private/caja-file-conflict-dialog.c:283
 msgid "Original file"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:315
-#: ../libcaja-private/caja-file-conflict-dialog.c:354
-#: ../src/file-manager/fm-properties-window.c:3791
-#: ../src/file-manager/fm-properties-window.c:3868
+#: ../libcaja-private/caja-file-conflict-dialog.c:284
+#: ../libcaja-private/caja-file-conflict-dialog.c:323
+#: ../src/file-manager/fm-properties-window.c:3264
 msgid "Size:"
 msgstr "Ìwọ̀n:"
 
 #. second row: type combobox
-#: ../libcaja-private/caja-file-conflict-dialog.c:320
-#: ../libcaja-private/caja-file-conflict-dialog.c:359
-#: ../src/file-manager/fm-properties-window.c:3773
-#: ../src/file-manager/fm-properties-window.c:3850
-#: ../src/caja-connect-server-dialog.c:992
+#: ../libcaja-private/caja-file-conflict-dialog.c:289
+#: ../libcaja-private/caja-file-conflict-dialog.c:328
+#: ../src/file-manager/fm-properties-window.c:3246
+#: ../src/caja-connect-server-dialog.c:942
 msgid "Type:"
 msgstr "Irúfẹ́:"
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:323
-#: ../libcaja-private/caja-file-conflict-dialog.c:362
+#: ../libcaja-private/caja-file-conflict-dialog.c:292
+#: ../libcaja-private/caja-file-conflict-dialog.c:331
 msgid "Last modified:"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:349
+#: ../libcaja-private/caja-file-conflict-dialog.c:318
 msgid "Merge with"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:349
-#: ../libcaja-private/caja-file-conflict-dialog.c:353
+#: ../libcaja-private/caja-file-conflict-dialog.c:318
+#: ../libcaja-private/caja-file-conflict-dialog.c:322
 msgid "Replace with"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:385
+#: ../libcaja-private/caja-file-conflict-dialog.c:354
 msgid "Merge"
 msgstr ""
 
 #. Setup the expander for the rename action
-#: ../libcaja-private/caja-file-conflict-dialog.c:664
+#: ../libcaja-private/caja-file-conflict-dialog.c:617
 msgid "Select a new name for the _destination"
 msgstr ""
 
 #. Setup the diff button for text files
-#: ../libcaja-private/caja-file-conflict-dialog.c:693
+#: ../libcaja-private/caja-file-conflict-dialog.c:642
 msgid "Differences..."
 msgstr ""
 
 #. Setup the checkbox to apply the action to all files
-#: ../libcaja-private/caja-file-conflict-dialog.c:703
+#: ../libcaja-private/caja-file-conflict-dialog.c:652
 msgid "Apply this action to all files and folders"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:715
+#: ../libcaja-private/caja-file-conflict-dialog.c:664
 #: ../libcaja-private/caja-file-operations.c:185
 msgid "_Skip"
 msgstr "_Fòó"
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:720
+#: ../libcaja-private/caja-file-conflict-dialog.c:669
 msgid "Re_name"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:726
+#: ../libcaja-private/caja-file-conflict-dialog.c:675
 msgid "Replace"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:810
+#: ../libcaja-private/caja-file-conflict-dialog.c:759
 msgid "Merge Folder"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:810
-#: ../libcaja-private/caja-file-conflict-dialog.c:815
+#: ../libcaja-private/caja-file-conflict-dialog.c:759
+#: ../libcaja-private/caja-file-conflict-dialog.c:764
 msgid "File and Folder conflict"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:815
+#: ../libcaja-private/caja-file-conflict-dialog.c:764
 msgid "File conflict"
 msgstr ""
 
@@ -1057,7 +1054,7 @@ msgstr[1] ""
 #. * to that kind of file (e.g. "link to folder").
 #: ../libcaja-private/caja-file-operations.c:406
 #: ../libcaja-private/caja-file.c:6408
-#: ../src/file-manager/fm-directory-view.c:10622
+#: ../src/file-manager/fm-directory-view.c:10546
 #, c-format
 msgid "Link to %s"
 msgstr ""
@@ -1222,7 +1219,7 @@ msgstr ""
 #. Empty Trash menu item
 #: ../libcaja-private/caja-file-operations.c:1381
 #: ../libcaja-private/caja-file-operations.c:2255
-#: ../src/caja-places-sidebar.c:2798 ../src/caja-trash-bar.c:201
+#: ../src/caja-places-sidebar.c:2777 ../src/caja-trash-bar.c:197
 msgid "Empty _Trash"
 msgstr "Da _Pàǹtí Nù"
 
@@ -1919,7 +1916,7 @@ msgid "Specified group '%s' doesn't exist"
 msgstr ""
 
 #: ../libcaja-private/caja-file.c:5889
-#: ../src/file-manager/fm-directory-view.c:2450
+#: ../src/file-manager/fm-directory-view.c:2374
 #, c-format
 msgid "%'u item"
 msgid_plural "%'u items"
@@ -1972,7 +1969,7 @@ msgstr "irúfẹ̀ MIME àìmọ̀"
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #: ../libcaja-private/caja-file.c:6332
-#: ../src/file-manager/fm-properties-window.c:1359
+#: ../src/file-manager/fm-properties-window.c:1286
 msgid "unknown"
 msgstr "àìmọ̀"
 
@@ -1988,8 +1985,7 @@ msgstr "líǹkì"
 msgid "link (broken)"
 msgstr "líǹkì (dàrú)"
 
-#: ../libcaja-private/caja-icon-container.c:2999
-#: ../libcaja-private/caja-icon-container.c:3090
+#: ../libcaja-private/caja-icon-container.c:2931
 msgid "The selection rectangle"
 msgstr "Oníhàmẹ́rìn gígùn ẹ̀yàn náà"
 
@@ -2015,10 +2011,10 @@ msgstr ""
 #. name, stock id
 #. label, accelerator
 #: ../libcaja-private/caja-mime-actions.c:744
-#: ../src/file-manager/fm-directory-view.c:7457
-#: ../src/file-manager/fm-directory-view.c:7589
-#: ../src/file-manager/fm-directory-view.c:8690
-#: ../src/file-manager/fm-directory-view.c:9015
+#: ../src/file-manager/fm-directory-view.c:7381
+#: ../src/file-manager/fm-directory-view.c:7513
+#: ../src/file-manager/fm-directory-view.c:8614
+#: ../src/file-manager/fm-directory-view.c:8939
 #: ../src/file-manager/fm-tree-view.c:1346
 msgid "Mo_ve to Trash"
 msgstr "Gb_e lọ sínú Pàǹtí"
@@ -2042,12 +2038,12 @@ msgid "_Display"
 msgstr "_Ìṣàfihàn"
 
 #: ../libcaja-private/caja-mime-actions.c:818
-#: ../src/caja-autorun-software.c:258
+#: ../src/caja-autorun-software.c:253
 msgid "_Run"
 msgstr "_Rọ́ọ̀nù"
 
 #: ../libcaja-private/caja-mime-actions.c:1172
-#: ../src/file-manager/fm-directory-view.c:660
+#: ../src/file-manager/fm-directory-view.c:656
 msgid "Are you sure you want to open all files?"
 msgstr "Ṣé ó dá ẹ lójú pé o fẹ́ ṣí gbogbo àwọn fáìlì?"
 
@@ -2066,12 +2062,12 @@ msgstr[0] "Èyí á ṣí fèrèsé %d mìíràn."
 msgstr[1] "Èyí á ṣí fèrèsé %d mìíràn."
 
 #: ../libcaja-private/caja-mime-actions.c:1258
-#: ../src/caja-window-manage-views.c:2128
-#: ../src/caja-window-manage-views.c:2136
-#: ../src/caja-window-manage-views.c:2156
-#: ../src/caja-window-manage-views.c:2170
-#: ../src/caja-window-manage-views.c:2176
-#: ../src/caja-window-manage-views.c:2203
+#: ../src/caja-window-manage-views.c:2115
+#: ../src/caja-window-manage-views.c:2123
+#: ../src/caja-window-manage-views.c:2143
+#: ../src/caja-window-manage-views.c:2157
+#: ../src/caja-window-manage-views.c:2163
+#: ../src/caja-window-manage-views.c:2190
 #, c-format
 msgid "Could not display \"%s\"."
 msgstr ""
@@ -2125,12 +2121,12 @@ msgstr ""
 
 #: ../libcaja-private/caja-mime-actions.c:2012
 #: ../libcaja-private/caja-mime-actions.c:2318
-#: ../src/file-manager/fm-directory-view.c:6475
+#: ../src/file-manager/fm-directory-view.c:6399
 msgid "Unable to mount location"
 msgstr ""
 
 #: ../libcaja-private/caja-mime-actions.c:2406
-#: ../src/file-manager/fm-directory-view.c:6649
+#: ../src/file-manager/fm-directory-view.c:6573
 msgid "Unable to start location"
 msgstr ""
 
@@ -2146,154 +2142,154 @@ msgid_plural "Opening %d items."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-mime-application-chooser.c:166
-#: ../libcaja-private/caja-open-with-dialog.c:304
+#: ../libcaja-private/caja-mime-application-chooser.c:162
+#: ../libcaja-private/caja-open-with-dialog.c:299
 #, c-format
 msgid "Could not set application as the default: %s"
 msgstr ""
 
-#: ../libcaja-private/caja-mime-application-chooser.c:167
-#: ../libcaja-private/caja-open-with-dialog.c:305
+#: ../libcaja-private/caja-mime-application-chooser.c:163
+#: ../libcaja-private/caja-open-with-dialog.c:300
 msgid "Could not set as default application"
 msgstr ""
 
-#: ../libcaja-private/caja-mime-application-chooser.c:260
+#: ../libcaja-private/caja-mime-application-chooser.c:256
 msgid "Default"
 msgstr ""
 
-#: ../libcaja-private/caja-mime-application-chooser.c:270
+#: ../libcaja-private/caja-mime-application-chooser.c:266
 msgid "Icon"
 msgstr "Áíkànnù"
 
-#: ../libcaja-private/caja-mime-application-chooser.c:336
+#: ../libcaja-private/caja-mime-application-chooser.c:332
 msgid "Could not remove application"
 msgstr ""
 
-#: ../libcaja-private/caja-mime-application-chooser.c:566
+#: ../libcaja-private/caja-mime-application-chooser.c:558
 msgid "No applications selected"
 msgstr ""
 
-#: ../libcaja-private/caja-mime-application-chooser.c:596
+#: ../libcaja-private/caja-mime-application-chooser.c:588
 #, c-format
 msgid "%s document"
 msgstr ""
 
-#: ../libcaja-private/caja-mime-application-chooser.c:606
-#: ../libcaja-private/caja-open-with-dialog.c:1096
+#: ../libcaja-private/caja-mime-application-chooser.c:598
+#: ../libcaja-private/caja-open-with-dialog.c:1077
 msgid "Unknown"
 msgstr ""
 
-#: ../libcaja-private/caja-mime-application-chooser.c:639
+#: ../libcaja-private/caja-mime-application-chooser.c:631
 #, c-format
 msgid "Select an application to open %s and other files of type \"%s\""
 msgstr ""
 
-#: ../libcaja-private/caja-mime-application-chooser.c:711
+#: ../libcaja-private/caja-mime-application-chooser.c:703
 #, c-format
 msgid "Open all files of type \"%s\" with:"
 msgstr ""
 
-#: ../libcaja-private/caja-open-with-dialog.c:156
+#: ../libcaja-private/caja-open-with-dialog.c:151
 msgid "Could not run application"
 msgstr ""
 
-#: ../libcaja-private/caja-open-with-dialog.c:169
+#: ../libcaja-private/caja-open-with-dialog.c:164
 #, c-format
 msgid "Could not find '%s'"
 msgstr ""
 
-#: ../libcaja-private/caja-open-with-dialog.c:172
+#: ../libcaja-private/caja-open-with-dialog.c:167
 msgid "Could not find application"
 msgstr ""
 
-#: ../libcaja-private/caja-open-with-dialog.c:256
+#: ../libcaja-private/caja-open-with-dialog.c:251
 #, c-format
 msgid "Could not add application to the application database: %s"
 msgstr ""
 
-#: ../libcaja-private/caja-open-with-dialog.c:257
+#: ../libcaja-private/caja-open-with-dialog.c:252
 msgid "Could not add application"
 msgstr ""
 
-#: ../libcaja-private/caja-open-with-dialog.c:455
+#: ../libcaja-private/caja-open-with-dialog.c:450
 msgid "Select an Application"
 msgstr ""
 
-#: ../libcaja-private/caja-open-with-dialog.c:848
-#: ../src/file-manager/fm-properties-window.c:6148
+#: ../libcaja-private/caja-open-with-dialog.c:840
+#: ../src/file-manager/fm-properties-window.c:5058
 msgid "Open With"
 msgstr "ṣí Pẹ̀lú"
 
-#: ../libcaja-private/caja-open-with-dialog.c:888
+#: ../libcaja-private/caja-open-with-dialog.c:880
 msgid "Select an application to view its description."
 msgstr ""
 
-#: ../libcaja-private/caja-open-with-dialog.c:917
+#: ../libcaja-private/caja-open-with-dialog.c:909
 msgid "_Use a custom command"
 msgstr ""
 
-#: ../libcaja-private/caja-open-with-dialog.c:934
+#: ../libcaja-private/caja-open-with-dialog.c:926
 msgid "_Browse..."
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
-#: ../libcaja-private/caja-open-with-dialog.c:970
-#: ../src/file-manager/fm-directory-view.c:7373
-#: ../src/file-manager/fm-directory-view.c:8884
-#: ../src/file-manager/fm-tree-view.c:1267 ../src/caja-places-sidebar.c:2703
+#: ../libcaja-private/caja-open-with-dialog.c:962
+#: ../src/file-manager/fm-directory-view.c:7297
+#: ../src/file-manager/fm-directory-view.c:8808
+#: ../src/file-manager/fm-tree-view.c:1267 ../src/caja-places-sidebar.c:2682
 msgid "_Open"
 msgstr "_Ṣi"
 
 #. first %s is a filename and second %s is a file extension
-#: ../libcaja-private/caja-open-with-dialog.c:1066
+#: ../libcaja-private/caja-open-with-dialog.c:1047
 #, c-format
 msgid "Open %s and other %s document with:"
 msgstr ""
 
 #. the %s here is a file name
 #. %s is a filename
-#: ../libcaja-private/caja-open-with-dialog.c:1072
-#: ../libcaja-private/caja-open-with-dialog.c:1112
+#: ../libcaja-private/caja-open-with-dialog.c:1053
+#: ../libcaja-private/caja-open-with-dialog.c:1093
 #, c-format
 msgid "Open %s with:"
 msgstr ""
 
-#: ../libcaja-private/caja-open-with-dialog.c:1073
+#: ../libcaja-private/caja-open-with-dialog.c:1054
 #, c-format
 msgid "_Remember this application for %s documents"
 msgstr ""
 
 #. Only in add mode - the %s here is a file extension
-#: ../libcaja-private/caja-open-with-dialog.c:1084
+#: ../libcaja-private/caja-open-with-dialog.c:1065
 #, c-format
 msgid "Open all %s documents with:"
 msgstr ""
 
 #. First %s is a filename, second is a description
 #. * of the type, eg "plain text document"
-#: ../libcaja-private/caja-open-with-dialog.c:1106
+#: ../libcaja-private/caja-open-with-dialog.c:1087
 #, c-format
 msgid "Open %s and other \"%s\" files with:"
 msgstr ""
 
 #. %s is a file type description
-#: ../libcaja-private/caja-open-with-dialog.c:1114
+#: ../libcaja-private/caja-open-with-dialog.c:1095
 #, c-format
 msgid "_Remember this application for \"%s\" files"
 msgstr ""
 
 #. Only in add mode
-#: ../libcaja-private/caja-open-with-dialog.c:1125
+#: ../libcaja-private/caja-open-with-dialog.c:1106
 #, c-format
 msgid "Open all \"%s\" files with:"
 msgstr ""
 
-#: ../libcaja-private/caja-open-with-dialog.c:1137
+#: ../libcaja-private/caja-open-with-dialog.c:1118
 msgid "_Add"
 msgstr ""
 
-#: ../libcaja-private/caja-open-with-dialog.c:1138
+#: ../libcaja-private/caja-open-with-dialog.c:1119
 msgid "Add Application"
 msgstr ""
 
@@ -2331,69 +2327,69 @@ msgid ""
 " your computer, you may be able to open it."
 msgstr ""
 
-#: ../libcaja-private/caja-program-choosing.c:533
+#: ../libcaja-private/caja-program-choosing.c:458
 msgid "Sorry, but you cannot execute commands from a remote site."
 msgstr ""
 
-#: ../libcaja-private/caja-program-choosing.c:535
+#: ../libcaja-private/caja-program-choosing.c:460
 msgid "This is disabled due to security considerations."
 msgstr "A kò mu èyí ṣiṣẹ́ nítiorí ọ̀rọ̀ ìdáàbòbò."
 
-#: ../libcaja-private/caja-program-choosing.c:547
-#: ../libcaja-private/caja-program-choosing.c:617
+#: ../libcaja-private/caja-program-choosing.c:472
+#: ../libcaja-private/caja-program-choosing.c:540
 msgid "There was an error launching the application."
 msgstr "Àṣìṣe kán wà nípa fífí ìṣàmúlò-ètò lọ́lẹ̀."
 
-#: ../libcaja-private/caja-program-choosing.c:576
-#: ../libcaja-private/caja-program-choosing.c:589
+#: ../libcaja-private/caja-program-choosing.c:501
+#: ../libcaja-private/caja-program-choosing.c:514
 msgid "This drop target only supports local files."
 msgstr "Àwọn fáìlì agbègbè nìkan ni òsùnsùn awálẹ̀ yìí tì lẹ́yìn."
 
-#: ../libcaja-private/caja-program-choosing.c:577
+#: ../libcaja-private/caja-program-choosing.c:502
 msgid ""
 "To open non-local files copy them to a local folder and then drop them "
 "again."
 msgstr "Láti ṣí àwọn fáìlì tí kìí ṣe ti agbègbè, ṣẹ̀dà wọn lọ sí fódà agbègbè kí o sì jù wọ́n sílẹ̀ lẹ́ẹ̀kan si."
 
-#: ../libcaja-private/caja-program-choosing.c:590
+#: ../libcaja-private/caja-program-choosing.c:515
 msgid ""
 "To open non-local files copy them to a local folder and then drop them "
 "again. The local files you dropped have already been opened."
 msgstr "Láti ṣí àwọn fáìlì tí kìí ṣe ti agbègbè, ṣẹ̀dà wọn lọ sí fódà agbègbè kí o sì jù wọ́n sílẹ̀ lẹ́ẹ̀kan si. Àwọn fáìlì agbègbè tí o jù sílẹ̀ ti ṣí."
 
-#: ../libcaja-private/caja-program-choosing.c:615
+#: ../libcaja-private/caja-program-choosing.c:538
 msgid "Details: "
 msgstr "Àwọn Àlàyé: "
 
-#: ../libcaja-private/caja-progress-info.c:246
+#: ../libcaja-private/caja-progress-info.c:241
 msgid "File Operations"
 msgstr ""
 
-#: ../libcaja-private/caja-progress-info.c:318
+#: ../libcaja-private/caja-progress-info.c:313
 msgid "paused"
 msgstr ""
 
-#: ../libcaja-private/caja-progress-info.c:321
+#: ../libcaja-private/caja-progress-info.c:316
 msgid "pausing"
 msgstr ""
 
-#: ../libcaja-private/caja-progress-info.c:324
+#: ../libcaja-private/caja-progress-info.c:319
 msgid "queued"
 msgstr ""
 
-#: ../libcaja-private/caja-progress-info.c:327
+#: ../libcaja-private/caja-progress-info.c:322
 msgid "queuing"
 msgstr ""
 
-#: ../libcaja-private/caja-progress-info.c:604
+#: ../libcaja-private/caja-progress-info.c:599
 #, c-format
 msgid "%'d file operation active"
 msgid_plural "%'d file operations active"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../libcaja-private/caja-progress-info.c:983
 #: ../libcaja-private/caja-progress-info.c:1004
-#: ../libcaja-private/caja-progress-info.c:1025
 msgid "Preparing"
 msgstr ""
 
@@ -2804,7 +2800,7 @@ msgstr ""
 msgid ""
 "If set to true, then Caja will exit when all windows are destroyed. This is "
 "the default setting. If set to false, it can be started without any window, "
-"so caja can serve as a daemon to monitor media automount, or similar tasks."
+"so Caja can serve as a daemon to monitor media automount, or similar tasks."
 msgstr ""
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:5
@@ -2897,12 +2893,12 @@ msgid ""
 msgstr "Ohun tí a lè ṣe pẹ̀lú àwon fáìlì àyọkà tó lè ṣiṣẹ́ nígbà tí a bá mu ṣiṣẹ́ (tí a bá tẹ̀ẹ́ lẹ́ẹ̀kan tàbí ẹ̀ẹ̀mejì). Àwọn fálù tó lè jẹ́ ni \"fi lọ́lẹ̀\" láti fi wọ́n lọ́lẹ̀ gẹ́gẹ́ bí àwọn àtòjọ-ètò, \"bèrè\" láti bèrè ohun tó yẹ ká ṣe nípasẹ̀ onísọ̀rọ̀gbèsì àti \"ìṣàfihàn\" láti ṣàfihàn wọn gẹ́gẹ́ bí àwọn fáìlì àyọkà."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:21
-msgid "Show the package installer for unknown mime types"
+msgid "Show the package installer for unknown MIME types"
 msgstr ""
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:22
 msgid ""
-"Whether to show the user a package installer dialog in case an unknown mime "
+"Whether to show the user a package installer dialog in case an unknown MIME "
 "type is opened, in order to search for an application to handle it."
 msgstr ""
 
@@ -3128,7 +3124,7 @@ msgid "Whether to show desktop notifications"
 msgstr ""
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:66
-msgid "If set to true, caja will show desktop notifications for eject events"
+msgid "If set to true, Caja will show desktop notifications for eject events"
 msgstr ""
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:67
@@ -3495,8 +3491,8 @@ msgstr ""
 #. Set initial window title
 #: ../data/caja-browser.desktop.in.in.h:1
 #: ../data/caja-folder-handler.desktop.in.in.h:1
-#: ../data/caja.desktop.in.in.h:1 ../src/caja-spatial-window.c:384
-#: ../src/caja-window-menus.c:535 ../src/caja-window.c:191
+#: ../data/caja.desktop.in.in.h:1 ../src/caja-spatial-window.c:373
+#: ../src/caja-window-menus.c:535 ../src/caja-window.c:172
 msgid "Caja"
 msgstr "Caja"
 
@@ -3527,7 +3523,7 @@ msgid "Home Folder"
 msgstr "Fódà Ilé"
 
 #. tooltip
-#: ../data/caja-home.desktop.in.in.h:2 ../src/caja-places-sidebar.c:522
+#: ../data/caja-home.desktop.in.in.h:2 ../src/caja-places-sidebar.c:509
 #: ../src/caja-window-menus.c:892
 msgid "Open your personal folder"
 msgstr ""
@@ -3536,124 +3532,124 @@ msgstr ""
 msgid "File Manager"
 msgstr "Alábòójútó Fáìlì"
 
-#: ../src/file-manager/fm-desktop-icon-view.c:722
+#: ../src/file-manager/fm-desktop-icon-view.c:708
 msgid "Background"
 msgstr "Ẹ̀yìn"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:799
-#: ../src/file-manager/fm-directory-view.c:7405
-#: ../src/file-manager/fm-directory-view.c:9084
+#: ../src/file-manager/fm-desktop-icon-view.c:785
+#: ../src/file-manager/fm-directory-view.c:7329
+#: ../src/file-manager/fm-directory-view.c:9008
 msgid "E_mpty Trash"
 msgstr "P_àǹtí Òfìfo"
 
 #. label, accelerator
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:813
-#: ../src/file-manager/fm-directory-view.c:7369
+#: ../src/file-manager/fm-desktop-icon-view.c:799
+#: ../src/file-manager/fm-directory-view.c:7293
 msgid "Create L_auncher..."
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-desktop-icon-view.c:815
-#: ../src/file-manager/fm-directory-view.c:7370
+#: ../src/file-manager/fm-desktop-icon-view.c:801
+#: ../src/file-manager/fm-directory-view.c:7294
 msgid "Create a new launcher"
 msgstr "Ṣẹ̀dá àṣàfilọ́lẹ̀ tuntun"
 
 #. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:822
+#: ../src/file-manager/fm-desktop-icon-view.c:808
 msgid "Change Desktop _Background"
 msgstr "Yí Ẹ̀yìn _Ojú-iṣẹ́ Padà"
 
 #. tooltip
-#: ../src/file-manager/fm-desktop-icon-view.c:824
+#: ../src/file-manager/fm-desktop-icon-view.c:810
 msgid ""
 "Show a window that lets you set your desktop background's pattern or color"
 msgstr "Fi fèrèsé tí ó ń jẹ́ kí o ṣàgbékalẹ̀ bátànì tàbí àwọ̀ ẹ̀yìn ojú-iṣẹ́ rẹ hàn"
 
 #. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:831
+#: ../src/file-manager/fm-desktop-icon-view.c:817
 msgid "Empty Trash"
 msgstr "Pàǹtí Òfìfo"
 
 #. tooltip
-#: ../src/file-manager/fm-desktop-icon-view.c:833
-#: ../src/file-manager/fm-directory-view.c:7406 ../src/caja-trash-bar.c:208
+#: ../src/file-manager/fm-desktop-icon-view.c:819
+#: ../src/file-manager/fm-directory-view.c:7330 ../src/caja-trash-bar.c:204
 msgid "Delete all items in the Trash"
 msgstr "Pa gbogbo àwọn wúnrẹ̀n inú pàǹtí jẹ"
 
-#: ../src/file-manager/fm-desktop-icon-view.c:933
+#: ../src/file-manager/fm-desktop-icon-view.c:919
 msgid "The desktop view encountered an error."
 msgstr ""
 
-#: ../src/file-manager/fm-desktop-icon-view.c:934
+#: ../src/file-manager/fm-desktop-icon-view.c:920
 msgid "The desktop view encountered an error while starting up."
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:662
+#: ../src/file-manager/fm-directory-view.c:658
 #, c-format
 msgid "This will open %'d separate tab."
 msgid_plural "This will open %'d separate tabs."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:665
+#: ../src/file-manager/fm-directory-view.c:661
 #, c-format
 msgid "This will open %'d separate window."
 msgid_plural "This will open %'d separate windows."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:1184
-#: ../src/file-manager/fm-properties-window.c:6491
-#: ../src/caja-connect-server-dialog.c:731 ../src/caja-location-dialog.c:106
+#: ../src/file-manager/fm-directory-view.c:1180
+#: ../src/file-manager/fm-properties-window.c:5398
+#: ../src/caja-connect-server-dialog.c:718 ../src/caja-location-dialog.c:102
 msgid "There was an error displaying help."
 msgstr "Àṣìṣe wà nípa ìṣàfihàn ìrànwọ́."
 
-#: ../src/file-manager/fm-directory-view.c:1208
+#: ../src/file-manager/fm-directory-view.c:1200
 msgid "Select Items Matching"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:1223
+#: ../src/file-manager/fm-directory-view.c:1215
 msgid "_Pattern:"
 msgstr "_Bátànì:"
 
-#: ../src/file-manager/fm-directory-view.c:1234
+#: ../src/file-manager/fm-directory-view.c:1222
 msgid "Examples: "
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:1381
+#: ../src/file-manager/fm-directory-view.c:1338
 msgid "Save Search as"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:1413
+#: ../src/file-manager/fm-directory-view.c:1361
 msgid "Search _name:"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:1441
+#: ../src/file-manager/fm-directory-view.c:1381
 msgid "_Folder:"
 msgstr "_Fódà:"
 
-#: ../src/file-manager/fm-directory-view.c:1454
+#: ../src/file-manager/fm-directory-view.c:1390
 msgid "Select Folder to Save Search In"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:2363
-#: ../src/file-manager/fm-directory-view.c:2400
+#: ../src/file-manager/fm-directory-view.c:2287
+#: ../src/file-manager/fm-directory-view.c:2324
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" tí a yàn"
 
-#: ../src/file-manager/fm-directory-view.c:2365
+#: ../src/file-manager/fm-directory-view.c:2289
 #, c-format
 msgid "%'d folder selected"
 msgid_plural "%'d folders selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:2375
+#: ../src/file-manager/fm-directory-view.c:2299
 #, c-format
 msgid " (containing %'d item)"
 msgid_plural " (containing %'d items)"
@@ -3662,14 +3658,14 @@ msgstr[1] ""
 
 #. translators: this is preceded with a string of form 'N folders' (N more
 #. than 1)
-#: ../src/file-manager/fm-directory-view.c:2386
+#: ../src/file-manager/fm-directory-view.c:2310
 #, c-format
 msgid " (containing a total of %'d item)"
 msgid_plural " (containing a total of %'d items)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:2403
+#: ../src/file-manager/fm-directory-view.c:2327
 #, c-format
 msgid "%'d item selected"
 msgid_plural "%'d items selected"
@@ -3677,7 +3673,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. Folders selected also, use "other" terminology
-#: ../src/file-manager/fm-directory-view.c:2410
+#: ../src/file-manager/fm-directory-view.c:2334
 #, c-format
 msgid "%'d other item selected"
 msgid_plural "%'d other items selected"
@@ -3688,17 +3684,17 @@ msgstr[1] ""
 #. * needs to use something other than parentheses. The
 #. * first message gives the number of items selected;
 #. * the message in parentheses the size of those items.
-#: ../src/file-manager/fm-directory-view.c:2429
+#: ../src/file-manager/fm-directory-view.c:2353
 #, c-format
 msgid "%s (%s)"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:2442
+#: ../src/file-manager/fm-directory-view.c:2366
 #, c-format
 msgid "Free space: %s"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:2453
+#: ../src/file-manager/fm-directory-view.c:2377
 #, c-format
 msgid "%s, Free space: %s"
 msgstr "%s,Àyè òfìfo: %s"
@@ -3707,7 +3703,7 @@ msgstr "%s,Àyè òfìfo: %s"
 #. * might want to change "," to something else.
 #. * After the comma the amount of free space will
 #. * be shown.
-#: ../src/file-manager/fm-directory-view.c:2468
+#: ../src/file-manager/fm-directory-view.c:2392
 #, c-format
 msgid "%s, %s"
 msgstr ""
@@ -3722,8 +3718,8 @@ msgstr ""
 #. * and the number of items in those folders and the
 #. * message about the number of other items and the
 #. * total size of those items.
-#: ../src/file-manager/fm-directory-view.c:2487
-#: ../src/file-manager/fm-directory-view.c:2501
+#: ../src/file-manager/fm-directory-view.c:2411
+#: ../src/file-manager/fm-directory-view.c:2425
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -3735,53 +3731,53 @@ msgstr "%s%s, %s"
 #. * message about the number of other items and the
 #. * total size of those items. After the second comma
 #. * the free space is written.
-#: ../src/file-manager/fm-directory-view.c:2514
+#: ../src/file-manager/fm-directory-view.c:2438
 #, c-format
 msgid "%s%s, %s, %s"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:4560
-#: ../src/caja-information-panel.c:922
+#: ../src/file-manager/fm-directory-view.c:4484
+#: ../src/caja-information-panel.c:905
 #, c-format
 msgid "Open With %s"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:4562
+#: ../src/file-manager/fm-directory-view.c:4486
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgid_plural "Use \"%s\" to open the selected items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:4651
+#: ../src/file-manager/fm-directory-view.c:4575
 msgid "Open parent location"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:4652
+#: ../src/file-manager/fm-directory-view.c:4576
 msgid "Open parent location for the selected item"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:5510
+#: ../src/file-manager/fm-directory-view.c:5434
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Rọ́ọ̀nù \"%s\" lórí àwọn wúnrẹ̀n tí a yàn"
 
-#: ../src/file-manager/fm-directory-view.c:5761
+#: ../src/file-manager/fm-directory-view.c:5685
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "Ṣẹ̀dá Àkọsílẹ̀ láti inú tẹ́ńpílètì \"%s\""
 
-#: ../src/file-manager/fm-directory-view.c:6011
+#: ../src/file-manager/fm-directory-view.c:5935
 msgid "All executable files in this folder will appear in the Scripts menu."
 msgstr "Gbogbo àwọn fáìlì tí a lè mú siṣẹ́ nínú fódà yìí á farahàn nínú àtòjọ-ẹ̀yàn àwọn Ìwé."
 
-#: ../src/file-manager/fm-directory-view.c:6013
+#: ../src/file-manager/fm-directory-view.c:5937
 msgid ""
 "Choosing a script from the menu will run that script with any selected items"
 " as input."
 msgstr "Yíyan ìwé láti inú àtòjọ-ẹ̀yàn á rọ́ọ̀nù ìwé yen pẹ̀lú àwọn wúnrẹ̀n tí a yàn gẹ́gẹ́ bíi ìmúwọlé."
 
-#: ../src/file-manager/fm-directory-view.c:6015
+#: ../src/file-manager/fm-directory-view.c:5939
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. Choosing a script from the menu will run that script.\n"
 "\n"
@@ -3804,19 +3800,19 @@ msgid ""
 "CAJA_SCRIPT_NEXT_PANE_CURRENT_URI: URI for current location in the inactive pane of a split-view window"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:6083
+#: ../src/file-manager/fm-directory-view.c:6007
 #: ../src/file-manager/fm-tree-view.c:1009
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste command"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:6087
+#: ../src/file-manager/fm-directory-view.c:6011
 #: ../src/file-manager/fm-tree-view.c:1015
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste command"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:6094
+#: ../src/file-manager/fm-directory-view.c:6018
 #, c-format
 msgid "The %'d selected item will be moved if you select the Paste command"
 msgid_plural ""
@@ -3824,7 +3820,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:6101
+#: ../src/file-manager/fm-directory-view.c:6025
 #, c-format
 msgid "The %'d selected item will be copied if you select the Paste command"
 msgid_plural ""
@@ -3832,98 +3828,98 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:6281
+#: ../src/file-manager/fm-directory-view.c:6205
 #: ../src/file-manager/fm-tree-view.c:1055
 msgid "There is nothing on the clipboard to paste."
 msgstr "Kò sí nǹkankan lórí àgbàròyìn dúró láti l̀ẹ̀."
 
-#: ../src/file-manager/fm-directory-view.c:6496
+#: ../src/file-manager/fm-directory-view.c:6420
 msgid "Unable to unmount location"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:6517
+#: ../src/file-manager/fm-directory-view.c:6441
 msgid "Unable to eject location"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:6532
+#: ../src/file-manager/fm-directory-view.c:6456
 msgid "Unable to stop drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:7089
+#: ../src/file-manager/fm-directory-view.c:7013
 #, c-format
 msgid "Connect to Server %s"
 msgstr "Darapọ̀ mọ́ Sáfà %s"
 
-#: ../src/file-manager/fm-directory-view.c:7094
-#: ../src/file-manager/fm-directory-view.c:8303
-#: ../src/file-manager/fm-directory-view.c:8395
-#: ../src/file-manager/fm-directory-view.c:8505
+#: ../src/file-manager/fm-directory-view.c:7018
+#: ../src/file-manager/fm-directory-view.c:8227
+#: ../src/file-manager/fm-directory-view.c:8319
+#: ../src/file-manager/fm-directory-view.c:8429
 msgid "_Connect"
 msgstr "_Darapọ̀"
 
-#: ../src/file-manager/fm-directory-view.c:7108
+#: ../src/file-manager/fm-directory-view.c:7032
 msgid "Link _name:"
 msgstr "Orúkọ _líǹkì:"
 
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:7347
+#: ../src/file-manager/fm-directory-view.c:7271
 msgid "Create _Document"
 msgstr "Ṣẹ̀dá _Àkọsílẹ̀"
 
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:7348
+#: ../src/file-manager/fm-directory-view.c:7272
 msgid "Open Wit_h"
 msgstr "Ṣi Pẹ̀l_ú"
 
-#: ../src/file-manager/fm-directory-view.c:7349
+#: ../src/file-manager/fm-directory-view.c:7273
 msgid "Choose a program with which to open the selected item"
 msgstr "Yan àtòjọ-ètò tí a lè fi ṣí wúnrẹ̀n tí a yàn"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7351
-#: ../src/file-manager/fm-directory-view.c:7630
+#: ../src/file-manager/fm-directory-view.c:7275
+#: ../src/file-manager/fm-directory-view.c:7554
 msgid "_Properties"
 msgstr "_Àwọn Àbùdá"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7352
-#: ../src/file-manager/fm-directory-view.c:9071
+#: ../src/file-manager/fm-directory-view.c:7276
+#: ../src/file-manager/fm-directory-view.c:8995
 msgid "View or modify the properties of each selected item"
 msgstr "Wòye tàbí kí o tún àwọn àbùdá wúnrẹ̀n kọ̀ọ̀kan tí a ti yàn tò"
 
 #. name, stock id
 #. label, accelerator
 #. add the "create folder" menu item
-#: ../src/file-manager/fm-directory-view.c:7359
+#: ../src/file-manager/fm-directory-view.c:7283
 #: ../src/file-manager/fm-tree-view.c:1298
 msgid "Create _Folder"
 msgstr "Ṣẹ̀dá _Fódà"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7360
+#: ../src/file-manager/fm-directory-view.c:7284
 msgid "Create a new empty folder inside this folder"
 msgstr "Ṣẹ̀dá fódà òfìfo tuntun kan nínú fódà yìí"
 
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:7362
+#: ../src/file-manager/fm-directory-view.c:7286
 msgid "No templates installed"
 msgstr ""
 
 #. name, stock id
 #. translators: this is used to indicate that a file doesn't contain anything
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7365
+#: ../src/file-manager/fm-directory-view.c:7289
 msgid "_Empty File"
 msgstr "_Fáìlì Òfìfo"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7366
+#: ../src/file-manager/fm-directory-view.c:7290
 msgid "Create a new empty file inside this folder"
 msgstr "Ṣẹ̀dá fáìlì òfìfo tuntun nínú fódà yìí"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7374
+#: ../src/file-manager/fm-directory-view.c:7298
 msgid "Open the selected item in this window"
 msgstr "Ṣí wúnrẹ̀n tí a yàn nínú fèrèsé yìí"
 
@@ -3932,91 +3928,91 @@ msgstr "Ṣí wúnrẹ̀n tí a yàn nínú fèrèsé yìí"
 #. Location-specific actions
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7381
-#: ../src/file-manager/fm-directory-view.c:7562
+#: ../src/file-manager/fm-directory-view.c:7305
+#: ../src/file-manager/fm-directory-view.c:7486
 msgid "Open in Navigation Window"
 msgstr "Ṣí nínú Fèrèsé Ìtọpa"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7382
+#: ../src/file-manager/fm-directory-view.c:7306
 msgid "Open each selected item in a navigation window"
 msgstr "Ṣí wúnrẹ̀n kọ̀ọọkan tí a yàn nínú fèrèsé ìtọpa"
 
 #. name, stock id
 #. label, accelerator
 #. add the "open in new tab" menu item
-#: ../src/file-manager/fm-directory-view.c:7385
-#: ../src/file-manager/fm-directory-view.c:7566
-#: ../src/file-manager/fm-directory-view.c:8635
-#: ../src/file-manager/fm-directory-view.c:8961
-#: ../src/file-manager/fm-tree-view.c:1278 ../src/caja-places-sidebar.c:2711
+#: ../src/file-manager/fm-directory-view.c:7309
+#: ../src/file-manager/fm-directory-view.c:7490
+#: ../src/file-manager/fm-directory-view.c:8559
+#: ../src/file-manager/fm-directory-view.c:8885
+#: ../src/file-manager/fm-tree-view.c:1278 ../src/caja-places-sidebar.c:2690
 msgid "Open in New _Tab"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7386
+#: ../src/file-manager/fm-directory-view.c:7310
 msgid "Open each selected item in a new tab"
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7389
-#: ../src/file-manager/fm-directory-view.c:7571
+#: ../src/file-manager/fm-directory-view.c:7313
+#: ../src/file-manager/fm-directory-view.c:7495
 msgid "Open in _Folder Window"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7390
+#: ../src/file-manager/fm-directory-view.c:7314
 msgid "Open each selected item in a folder window"
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7393
+#: ../src/file-manager/fm-directory-view.c:7317
 msgid "Other _Application..."
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7394
-#: ../src/file-manager/fm-directory-view.c:7398
+#: ../src/file-manager/fm-directory-view.c:7318
+#: ../src/file-manager/fm-directory-view.c:7322
 msgid "Choose another application with which to open the selected item"
 msgstr "Yan ìṣàmúlò-ètò mìíràn tí wàá fi ṣi wúnrẹ̀n tí a yàn"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7397
+#: ../src/file-manager/fm-directory-view.c:7321
 msgid "Open With Other _Application..."
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7401
+#: ../src/file-manager/fm-directory-view.c:7325
 msgid "_Open Scripts Folder"
 msgstr "_Ṣí Fódà Àwọn Ìwé"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7402
+#: ../src/file-manager/fm-directory-view.c:7326
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Fi fódà tó ní àwọn ìwé tó ń farahàn nínú àtòjọ-ẹ̀yàn yìí hàn"
 
 #. name, stock id
 #. label, accelerator
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7410
+#: ../src/file-manager/fm-directory-view.c:7334
 msgid "Prepare the selected files to be moved with a Paste command"
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7414
+#: ../src/file-manager/fm-directory-view.c:7338
 msgid "Prepare the selected files to be copied with a Paste command"
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7418
+#: ../src/file-manager/fm-directory-view.c:7342
 msgid "Move or copy files previously selected by a Cut or Copy command"
 msgstr ""
 
@@ -4024,140 +4020,140 @@ msgstr ""
 #. accelerator for paste
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7423
-#: ../src/file-manager/fm-directory-view.c:7584
+#: ../src/file-manager/fm-directory-view.c:7347
+#: ../src/file-manager/fm-directory-view.c:7508
 #: ../src/file-manager/fm-tree-view.c:1330
 msgid "_Paste Into Folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7424
+#: ../src/file-manager/fm-directory-view.c:7348
 msgid ""
 "Move or copy files previously selected by a Cut or Copy command into the "
 "selected folder"
 msgstr ""
 
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:7426
+#: ../src/file-manager/fm-directory-view.c:7350
 msgid "Cop_y to"
 msgstr ""
 
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:7427
+#: ../src/file-manager/fm-directory-view.c:7351
 msgid "M_ove to"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7430
+#: ../src/file-manager/fm-directory-view.c:7354
 msgid "Select all items in this window"
 msgstr "Yan gbogbo àwọn wúnrẹ̀n inú fèrèsé yìí"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7433
+#: ../src/file-manager/fm-directory-view.c:7357
 msgid "Select I_tems Matching..."
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7434
+#: ../src/file-manager/fm-directory-view.c:7358
 msgid "Select items in this window matching a given pattern"
 msgstr "Yan àwọn wúnrẹ̀n nínú fèrèsé yìí tí yóò bá bátànì kan mu"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7437
+#: ../src/file-manager/fm-directory-view.c:7361
 msgid "_Invert Selection"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7438
+#: ../src/file-manager/fm-directory-view.c:7362
 msgid "Select all and only the items that are not currently selected"
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7441
+#: ../src/file-manager/fm-directory-view.c:7365
 msgid "D_uplicate"
 msgstr "Ẹ̀_dà"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7442
+#: ../src/file-manager/fm-directory-view.c:7366
 msgid "Duplicate each selected item"
 msgstr "Ṣẹ̀dà wúnrẹ̀n kọ̀ọ̀kan tí a yàn"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7445
-#: ../src/file-manager/fm-directory-view.c:9055
+#: ../src/file-manager/fm-directory-view.c:7369
+#: ../src/file-manager/fm-directory-view.c:8979
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
 msgstr[1] ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7446
+#: ../src/file-manager/fm-directory-view.c:7370
 msgid "Create a symbolic link for each selected item"
 msgstr "Ṣẹ̀dá líǹkì alámì fún wúnrẹ̀n kọ̀ọ̀kan tí a yàn"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7449
+#: ../src/file-manager/fm-directory-view.c:7373
 msgid "_Rename..."
 msgstr "_Tun orúkọ sọ..."
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7450
+#: ../src/file-manager/fm-directory-view.c:7374
 msgid "Rename selected item"
 msgstr "Tun orúkọ wúnrẹ̀n tí a yàn sọ"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7458
-#: ../src/file-manager/fm-directory-view.c:9016
+#: ../src/file-manager/fm-directory-view.c:7382
+#: ../src/file-manager/fm-directory-view.c:8940
 msgid "Move each selected item to the Trash"
 msgstr "Gbé wúnrẹ̀n kọ̀ọ̀kan tí a yàn lọ sínú Pàǹtí"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7461
-#: ../src/file-manager/fm-directory-view.c:7593
-#: ../src/file-manager/fm-directory-view.c:9036
+#: ../src/file-manager/fm-directory-view.c:7385
+#: ../src/file-manager/fm-directory-view.c:7517
+#: ../src/file-manager/fm-directory-view.c:8960
 #: ../src/file-manager/fm-tree-view.c:1360
 msgid "_Delete"
 msgstr "_Pajẹ"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7462
+#: ../src/file-manager/fm-directory-view.c:7386
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Pa wúnrẹ̀n kọ̀ọ̀kan tí a yàn jẹ láì gbe lọ sínú Pàǹtí"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7465
-#: ../src/file-manager/fm-directory-view.c:7597
+#: ../src/file-manager/fm-directory-view.c:7389
+#: ../src/file-manager/fm-directory-view.c:7521
 msgid "_Restore"
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7469
+#: ../src/file-manager/fm-directory-view.c:7393
 msgid "_Undo"
 msgstr "_Padà Sípò"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7470
-#: ../src/file-manager/fm-directory-view.c:11227
+#: ../src/file-manager/fm-directory-view.c:7394
+#: ../src/file-manager/fm-directory-view.c:11146
 msgid "Undo the last action"
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7473
+#: ../src/file-manager/fm-directory-view.c:7397
 msgid "_Redo"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7474
-#: ../src/file-manager/fm-directory-view.c:11245
+#: ../src/file-manager/fm-directory-view.c:7398
+#: ../src/file-manager/fm-directory-view.c:11164
 msgid "Redo the last undone action"
 msgstr ""
 
@@ -4167,633 +4163,633 @@ msgstr ""
 #. * it is a mixture of both ATM.
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7484
+#: ../src/file-manager/fm-directory-view.c:7408
 msgid "Reset View to _Defaults"
 msgstr "Tún Òye sí _Àwọn Ìpéwọ̀n Tò"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7485
+#: ../src/file-manager/fm-directory-view.c:7409
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr "Tún ètò ìṣàtò àti ìpele ìfẹ̀ tò kó lè bá àwọn ìkúndùn fún òye yìí mu"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7488
+#: ../src/file-manager/fm-directory-view.c:7412
 msgid "Connect To This Server"
 msgstr "Darapọ̀ Mọ́ Sáfà Yìí"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7489
+#: ../src/file-manager/fm-directory-view.c:7413
 msgid "Make a permanent connection to this server"
 msgstr "Darapọ̀ mọ́ sáfà yìí ráúráú"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7492
-#: ../src/file-manager/fm-directory-view.c:7520
-#: ../src/file-manager/fm-directory-view.c:7601
-#: ../src/caja-places-sidebar.c:2747
+#: ../src/file-manager/fm-directory-view.c:7416
+#: ../src/file-manager/fm-directory-view.c:7444
+#: ../src/file-manager/fm-directory-view.c:7525
+#: ../src/caja-places-sidebar.c:2726
 msgid "_Mount"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7493
+#: ../src/file-manager/fm-directory-view.c:7417
 msgid "Mount the selected volume"
 msgstr "Fi ìgbóhùnsókè-sódò tí a yàn lọ́lẹ̀"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7497
+#: ../src/file-manager/fm-directory-view.c:7421
 msgid "Unmount the selected volume"
 msgstr "Má fi ìgbóhùnsókè-sódò tí a yàn lọ́lẹ̀ mọ́"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7501
+#: ../src/file-manager/fm-directory-view.c:7425
 msgid "Eject the selected volume"
 msgstr "Yọ ìgbóhùnsókè-sódò tí a yàn kúrò"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7504
-#: ../src/file-manager/fm-directory-view.c:7532
-#: ../src/file-manager/fm-directory-view.c:7613
-#: ../src/caja-places-sidebar.c:2775
+#: ../src/file-manager/fm-directory-view.c:7428
+#: ../src/file-manager/fm-directory-view.c:7456
+#: ../src/file-manager/fm-directory-view.c:7537
+#: ../src/caja-places-sidebar.c:2754
 msgid "_Format"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7505
+#: ../src/file-manager/fm-directory-view.c:7429
 msgid "Format the selected volume"
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
 #. Adjust start/stop items to reflect the type of the drive
-#: ../src/file-manager/fm-directory-view.c:7508
-#: ../src/file-manager/fm-directory-view.c:7536
-#: ../src/file-manager/fm-directory-view.c:7617
-#: ../src/file-manager/fm-directory-view.c:8295
-#: ../src/file-manager/fm-directory-view.c:8299
-#: ../src/file-manager/fm-directory-view.c:8387
-#: ../src/file-manager/fm-directory-view.c:8391
-#: ../src/file-manager/fm-directory-view.c:8497
-#: ../src/file-manager/fm-directory-view.c:8501
-#: ../src/caja-places-sidebar.c:1823 ../src/caja-places-sidebar.c:2782
+#: ../src/file-manager/fm-directory-view.c:7432
+#: ../src/file-manager/fm-directory-view.c:7460
+#: ../src/file-manager/fm-directory-view.c:7541
+#: ../src/file-manager/fm-directory-view.c:8219
+#: ../src/file-manager/fm-directory-view.c:8223
+#: ../src/file-manager/fm-directory-view.c:8311
+#: ../src/file-manager/fm-directory-view.c:8315
+#: ../src/file-manager/fm-directory-view.c:8421
+#: ../src/file-manager/fm-directory-view.c:8425
+#: ../src/caja-places-sidebar.c:1808 ../src/caja-places-sidebar.c:2761
 msgid "_Start"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7509
+#: ../src/file-manager/fm-directory-view.c:7433
 msgid "Start the selected volume"
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7512
-#: ../src/file-manager/fm-directory-view.c:7540
-#: ../src/file-manager/fm-directory-view.c:7621
-#: ../src/file-manager/fm-directory-view.c:8324
-#: ../src/file-manager/fm-directory-view.c:8416
-#: ../src/file-manager/fm-directory-view.c:8526
-#: ../src/caja-places-sidebar.c:1824 ../src/caja-places-sidebar.c:2789
+#: ../src/file-manager/fm-directory-view.c:7436
+#: ../src/file-manager/fm-directory-view.c:7464
+#: ../src/file-manager/fm-directory-view.c:7545
+#: ../src/file-manager/fm-directory-view.c:8248
+#: ../src/file-manager/fm-directory-view.c:8340
+#: ../src/file-manager/fm-directory-view.c:8450
+#: ../src/caja-places-sidebar.c:1809 ../src/caja-places-sidebar.c:2768
 #: ../src/caja-window-menus.c:836
 msgid "_Stop"
 msgstr "_Dúró"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7513
-#: ../src/file-manager/fm-directory-view.c:8527
+#: ../src/file-manager/fm-directory-view.c:7437
+#: ../src/file-manager/fm-directory-view.c:8451
 msgid "Stop the selected volume"
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7516
-#: ../src/file-manager/fm-directory-view.c:7544
-#: ../src/file-manager/fm-directory-view.c:7625
-#: ../src/caja-places-sidebar.c:2768
+#: ../src/file-manager/fm-directory-view.c:7440
+#: ../src/file-manager/fm-directory-view.c:7468
+#: ../src/file-manager/fm-directory-view.c:7549
+#: ../src/caja-places-sidebar.c:2747
 msgid "_Detect Media"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7517
-#: ../src/file-manager/fm-directory-view.c:7545
-#: ../src/file-manager/fm-directory-view.c:7626
+#: ../src/file-manager/fm-directory-view.c:7441
+#: ../src/file-manager/fm-directory-view.c:7469
+#: ../src/file-manager/fm-directory-view.c:7550
 msgid "Detect media in the selected drive"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7521
+#: ../src/file-manager/fm-directory-view.c:7445
 msgid "Mount the volume associated with the open folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7525
+#: ../src/file-manager/fm-directory-view.c:7449
 msgid "Unmount the volume associated with the open folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7529
+#: ../src/file-manager/fm-directory-view.c:7453
 msgid "Eject the volume associated with the open folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7533
+#: ../src/file-manager/fm-directory-view.c:7457
 msgid "Format the volume associated with the open folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7537
+#: ../src/file-manager/fm-directory-view.c:7461
 msgid "Start the volume associated with the open folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7541
+#: ../src/file-manager/fm-directory-view.c:7465
 msgid "Stop the volume associated with the open folder"
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7548
+#: ../src/file-manager/fm-directory-view.c:7472
 msgid "Open File and Close window"
 msgstr "Ṣí Fáìlì kí o sì Ti fèrèsé"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7552
+#: ../src/file-manager/fm-directory-view.c:7476
 msgid "Sa_ve Search"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7553
+#: ../src/file-manager/fm-directory-view.c:7477
 msgid "Save the edited search"
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7556
+#: ../src/file-manager/fm-directory-view.c:7480
 msgid "Sa_ve Search As..."
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7557
+#: ../src/file-manager/fm-directory-view.c:7481
 msgid "Save the current search as a file"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7563
+#: ../src/file-manager/fm-directory-view.c:7487
 msgid "Open this folder in a navigation window"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7567
+#: ../src/file-manager/fm-directory-view.c:7491
 msgid "Open this folder in a new tab"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7572
+#: ../src/file-manager/fm-directory-view.c:7496
 msgid "Open this folder in a folder window"
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7577
+#: ../src/file-manager/fm-directory-view.c:7501
 msgid "Prepare this folder to be moved with a Paste command"
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7581
+#: ../src/file-manager/fm-directory-view.c:7505
 msgid "Prepare this folder to be copied with a Paste command"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7585
+#: ../src/file-manager/fm-directory-view.c:7509
 msgid ""
 "Move or copy files previously selected by a Cut or Copy command into this "
 "folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7590
+#: ../src/file-manager/fm-directory-view.c:7514
 msgid "Move this folder to the Trash"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7594
+#: ../src/file-manager/fm-directory-view.c:7518
 msgid "Delete this folder, without moving to the Trash"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7602
+#: ../src/file-manager/fm-directory-view.c:7526
 msgid "Mount the volume associated with this folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7606
+#: ../src/file-manager/fm-directory-view.c:7530
 msgid "Unmount the volume associated with this folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7610
+#: ../src/file-manager/fm-directory-view.c:7534
 msgid "Eject the volume associated with this folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7614
+#: ../src/file-manager/fm-directory-view.c:7538
 msgid "Format the volume associated with this folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7618
+#: ../src/file-manager/fm-directory-view.c:7542
 msgid "Start the volume associated with this folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7622
+#: ../src/file-manager/fm-directory-view.c:7546
 msgid "Stop the volume associated with this folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7631
+#: ../src/file-manager/fm-directory-view.c:7555
 msgid "View or modify the properties of this folder"
 msgstr ""
 
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:7634
-#: ../src/file-manager/fm-directory-view.c:7637
+#: ../src/file-manager/fm-directory-view.c:7558
+#: ../src/file-manager/fm-directory-view.c:7561
 msgid "_Other pane"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:7635
+#: ../src/file-manager/fm-directory-view.c:7559
 msgid "Copy the current selection to the other pane in the window"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:7638
+#: ../src/file-manager/fm-directory-view.c:7562
 msgid "Move the current selection to the other pane in the window"
 msgstr ""
 
 #. name, stock id, label
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7641
-#: ../src/file-manager/fm-directory-view.c:7645 ../src/caja-window-menus.c:891
+#: ../src/file-manager/fm-directory-view.c:7565
+#: ../src/file-manager/fm-directory-view.c:7569 ../src/caja-window-menus.c:891
 msgid "_Home Folder"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:7642
+#: ../src/file-manager/fm-directory-view.c:7566
 msgid "Copy the current selection to the home folder"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:7646
+#: ../src/file-manager/fm-directory-view.c:7570
 msgid "Move the current selection to the home folder"
 msgstr ""
 
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:7649
-#: ../src/file-manager/fm-directory-view.c:7653
+#: ../src/file-manager/fm-directory-view.c:7573
+#: ../src/file-manager/fm-directory-view.c:7577
 msgid "_Desktop"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:7650
+#: ../src/file-manager/fm-directory-view.c:7574
 msgid "Copy the current selection to the desktop"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:7654
+#: ../src/file-manager/fm-directory-view.c:7578
 msgid "Move the current selection to the desktop"
 msgstr ""
 
 #. Translators: %s is a directory
-#: ../src/file-manager/fm-directory-view.c:7734
+#: ../src/file-manager/fm-directory-view.c:7658
 #, c-format
 msgid "Run or manage scripts from %s"
 msgstr ""
 
 #. Create a script action here specially because its tooltip is dynamic
-#: ../src/file-manager/fm-directory-view.c:7736
+#: ../src/file-manager/fm-directory-view.c:7660
 msgid "_Scripts"
 msgstr "_Àwọn Ìwé"
 
-#: ../src/file-manager/fm-directory-view.c:8143
+#: ../src/file-manager/fm-directory-view.c:8067
 #, c-format
 msgid "Move the open folder out of the trash to \"%s\""
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8146
+#: ../src/file-manager/fm-directory-view.c:8070
 #, c-format
 msgid "Move the selected folder out of the trash to \"%s\""
 msgid_plural "Move the selected folders out of the trash to \"%s\""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:8150
+#: ../src/file-manager/fm-directory-view.c:8074
 #, c-format
 msgid "Move the selected folder out of the trash"
 msgid_plural "Move the selected folders out of the trash"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:8156
+#: ../src/file-manager/fm-directory-view.c:8080
 #, c-format
 msgid "Move the selected file out of the trash to \"%s\""
 msgid_plural "Move the selected files out of the trash to \"%s\""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:8160
+#: ../src/file-manager/fm-directory-view.c:8084
 #, c-format
 msgid "Move the selected file out of the trash"
 msgid_plural "Move the selected files out of the trash"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:8166
+#: ../src/file-manager/fm-directory-view.c:8090
 #, c-format
 msgid "Move the selected item out of the trash to \"%s\""
 msgid_plural "Move the selected items out of the trash to \"%s\""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:8170
+#: ../src/file-manager/fm-directory-view.c:8094
 #, c-format
 msgid "Move the selected item out of the trash"
 msgid_plural "Move the selected items out of the trash"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:8296
-#: ../src/file-manager/fm-directory-view.c:8300
-#: ../src/file-manager/fm-directory-view.c:8498
-#: ../src/file-manager/fm-directory-view.c:8502
+#: ../src/file-manager/fm-directory-view.c:8220
+#: ../src/file-manager/fm-directory-view.c:8224
+#: ../src/file-manager/fm-directory-view.c:8422
+#: ../src/file-manager/fm-directory-view.c:8426
 msgid "Start the selected drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8304
-#: ../src/file-manager/fm-directory-view.c:8506
+#: ../src/file-manager/fm-directory-view.c:8228
+#: ../src/file-manager/fm-directory-view.c:8430
 msgid "Connect to the selected drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8307
-#: ../src/file-manager/fm-directory-view.c:8399
-#: ../src/file-manager/fm-directory-view.c:8509
+#: ../src/file-manager/fm-directory-view.c:8231
+#: ../src/file-manager/fm-directory-view.c:8323
+#: ../src/file-manager/fm-directory-view.c:8433
 msgid "_Start Multi-disk Drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8308
-#: ../src/file-manager/fm-directory-view.c:8510
+#: ../src/file-manager/fm-directory-view.c:8232
+#: ../src/file-manager/fm-directory-view.c:8434
 msgid "Start the selected multi-disk drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8311
+#: ../src/file-manager/fm-directory-view.c:8235
 msgid "U_nlock Drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8312
-#: ../src/file-manager/fm-directory-view.c:8514
+#: ../src/file-manager/fm-directory-view.c:8236
+#: ../src/file-manager/fm-directory-view.c:8438
 msgid "Unlock the selected drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8325
+#: ../src/file-manager/fm-directory-view.c:8249
 msgid "Stop the selected drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8328
-#: ../src/file-manager/fm-directory-view.c:8420
-#: ../src/file-manager/fm-directory-view.c:8530
-#: ../src/caja-places-sidebar.c:1832
+#: ../src/file-manager/fm-directory-view.c:8252
+#: ../src/file-manager/fm-directory-view.c:8344
+#: ../src/file-manager/fm-directory-view.c:8454
+#: ../src/caja-places-sidebar.c:1817
 msgid "_Safely Remove Drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8329
-#: ../src/file-manager/fm-directory-view.c:8531
+#: ../src/file-manager/fm-directory-view.c:8253
+#: ../src/file-manager/fm-directory-view.c:8455
 msgid "Safely remove the selected drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8332
-#: ../src/file-manager/fm-directory-view.c:8424
-#: ../src/file-manager/fm-directory-view.c:8534
+#: ../src/file-manager/fm-directory-view.c:8256
+#: ../src/file-manager/fm-directory-view.c:8348
+#: ../src/file-manager/fm-directory-view.c:8458
 msgid "_Disconnect"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8333
-#: ../src/file-manager/fm-directory-view.c:8535
+#: ../src/file-manager/fm-directory-view.c:8257
+#: ../src/file-manager/fm-directory-view.c:8459
 msgid "Disconnect the selected drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8336
-#: ../src/file-manager/fm-directory-view.c:8428
-#: ../src/file-manager/fm-directory-view.c:8538
+#: ../src/file-manager/fm-directory-view.c:8260
+#: ../src/file-manager/fm-directory-view.c:8352
+#: ../src/file-manager/fm-directory-view.c:8462
 msgid "_Stop Multi-disk Drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8337
-#: ../src/file-manager/fm-directory-view.c:8539
+#: ../src/file-manager/fm-directory-view.c:8261
+#: ../src/file-manager/fm-directory-view.c:8463
 msgid "Stop the selected multi-disk drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8340
-#: ../src/file-manager/fm-directory-view.c:8432
-#: ../src/file-manager/fm-directory-view.c:8542
-#: ../src/caja-places-sidebar.c:1845
+#: ../src/file-manager/fm-directory-view.c:8264
+#: ../src/file-manager/fm-directory-view.c:8356
+#: ../src/file-manager/fm-directory-view.c:8466
+#: ../src/caja-places-sidebar.c:1830
 msgid "_Lock Drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8341
-#: ../src/file-manager/fm-directory-view.c:8543
+#: ../src/file-manager/fm-directory-view.c:8265
+#: ../src/file-manager/fm-directory-view.c:8467
 msgid "Lock the selected drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8388
-#: ../src/file-manager/fm-directory-view.c:8392
+#: ../src/file-manager/fm-directory-view.c:8312
+#: ../src/file-manager/fm-directory-view.c:8316
 msgid "Start the drive associated with the open folder"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8396
+#: ../src/file-manager/fm-directory-view.c:8320
 msgid "Connect to the drive associated with the open folder"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8400
+#: ../src/file-manager/fm-directory-view.c:8324
 msgid "Start the multi-disk drive associated with the open folder"
 msgstr ""
 
 #. stop() for type G_DRIVE_START_STOP_TYPE_PASSWORD is normally not used
-#: ../src/file-manager/fm-directory-view.c:8403
-#: ../src/file-manager/fm-directory-view.c:8513
-#: ../src/caja-places-sidebar.c:1844
+#: ../src/file-manager/fm-directory-view.c:8327
+#: ../src/file-manager/fm-directory-view.c:8437
+#: ../src/caja-places-sidebar.c:1829
 msgid "_Unlock Drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8404
+#: ../src/file-manager/fm-directory-view.c:8328
 msgid "Unlock the drive associated with the open folder"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8417
+#: ../src/file-manager/fm-directory-view.c:8341
 msgid "_Stop the drive associated with the open folder"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8421
+#: ../src/file-manager/fm-directory-view.c:8345
 msgid "Safely remove the drive associated with the open folder"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8425
+#: ../src/file-manager/fm-directory-view.c:8349
 msgid "Disconnect the drive associated with the open folder"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8429
+#: ../src/file-manager/fm-directory-view.c:8353
 msgid "Stop the multi-disk drive associated with the open folder"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8433
+#: ../src/file-manager/fm-directory-view.c:8357
 msgid "Lock the drive associated with the open folder"
 msgstr ""
 
 #. add the "open in new window" menu item
-#: ../src/file-manager/fm-directory-view.c:8612
-#: ../src/file-manager/fm-directory-view.c:8922
-#: ../src/file-manager/fm-tree-view.c:1287 ../src/caja-places-sidebar.c:2718
+#: ../src/file-manager/fm-directory-view.c:8536
+#: ../src/file-manager/fm-directory-view.c:8846
+#: ../src/file-manager/fm-tree-view.c:1287 ../src/caja-places-sidebar.c:2697
 msgid "Open in New _Window"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8614
-#: ../src/file-manager/fm-directory-view.c:8931
+#: ../src/file-manager/fm-directory-view.c:8538
+#: ../src/file-manager/fm-directory-view.c:8855
 msgid "Browse in New _Window"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8620
-#: ../src/file-manager/fm-directory-view.c:8941
+#: ../src/file-manager/fm-directory-view.c:8544
+#: ../src/file-manager/fm-directory-view.c:8865
 msgid "_Browse Folder"
 msgid_plural "_Browse Folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:8637
-#: ../src/file-manager/fm-directory-view.c:8970
+#: ../src/file-manager/fm-directory-view.c:8561
+#: ../src/file-manager/fm-directory-view.c:8894
 msgid "Browse in New _Tab"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8686
-#: ../src/file-manager/fm-directory-view.c:9011
+#: ../src/file-manager/fm-directory-view.c:8610
+#: ../src/file-manager/fm-directory-view.c:8935
 msgid "_Delete Permanently"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8687
+#: ../src/file-manager/fm-directory-view.c:8611
 msgid "Delete the open folder permanently"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8691
+#: ../src/file-manager/fm-directory-view.c:8615
 msgid "Move the open folder to the Trash"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8871
+#: ../src/file-manager/fm-directory-view.c:8795
 #, c-format
 msgid "_Open With %s"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8924
+#: ../src/file-manager/fm-directory-view.c:8848
 #, c-format
 msgid "Open in %'d New _Window"
 msgid_plural "Open in %'d New _Windows"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:8933
+#: ../src/file-manager/fm-directory-view.c:8857
 #, c-format
 msgid "Browse in %'d New _Window"
 msgid_plural "Browse in %'d New _Windows"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:8963
+#: ../src/file-manager/fm-directory-view.c:8887
 #, c-format
 msgid "Open in %'d New _Tab"
 msgid_plural "Open in %'d New _Tabs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:8972
+#: ../src/file-manager/fm-directory-view.c:8896
 #, c-format
 msgid "Browse in %'d New _Tab"
 msgid_plural "Browse in %'d New _Tabs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:9012
+#: ../src/file-manager/fm-directory-view.c:8936
 msgid "Delete all selected items permanently"
 msgstr "Pa gbogbo àwọn wúnrẹ̀n jẹ ráúráú"
 
-#: ../src/file-manager/fm-directory-view.c:9069
+#: ../src/file-manager/fm-directory-view.c:8993
 msgid "View or modify the properties of the open folder"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:10372
+#: ../src/file-manager/fm-directory-view.c:10296
 msgid "Download location?"
 msgstr "Àyè à̀gbéwọlè?"
 
-#: ../src/file-manager/fm-directory-view.c:10375
+#: ../src/file-manager/fm-directory-view.c:10299
 msgid "You can download it or make a link to it."
 msgstr "O lè ṣàgbéwọlé rẹ̀ tàbí kí o líǹkì rẹ̀."
 
-#: ../src/file-manager/fm-directory-view.c:10378
+#: ../src/file-manager/fm-directory-view.c:10302
 msgid "Make a _Link"
 msgstr "Ṣe _Líǹkì kan"
 
-#: ../src/file-manager/fm-directory-view.c:10382
+#: ../src/file-manager/fm-directory-view.c:10306
 msgid "_Download"
 msgstr "_Àgbéwọlé"
 
-#: ../src/file-manager/fm-directory-view.c:10543
-#: ../src/file-manager/fm-directory-view.c:10602
-#: ../src/file-manager/fm-directory-view.c:10707
+#: ../src/file-manager/fm-directory-view.c:10467
+#: ../src/file-manager/fm-directory-view.c:10526
+#: ../src/file-manager/fm-directory-view.c:10631
 msgid "Drag and drop is not supported."
 msgstr "Kò sí àtìlẹ́yìn fún wíwọ́ àti ìjùsílẹ̀."
 
-#: ../src/file-manager/fm-directory-view.c:10544
+#: ../src/file-manager/fm-directory-view.c:10468
 msgid "Drag and drop is only supported on local file systems."
 msgstr "Orí àwọn ètò kọ̀ǹpútà fáìlì agbègbè nìkan ni wíwọ́ àti ìjùsílẹ̀ ti ní àtìlẹ́yìn."
 
-#: ../src/file-manager/fm-directory-view.c:10603
-#: ../src/file-manager/fm-directory-view.c:10708
+#: ../src/file-manager/fm-directory-view.c:10527
+#: ../src/file-manager/fm-directory-view.c:10632
 msgid "An invalid drag type was used."
 msgstr "A lo irúfẹ́ wíwọ́ tí kò fẹsẹ̀múlẹ̀."
 
 #. Translator: This is the filename used for when you dnd text to a directory
-#: ../src/file-manager/fm-directory-view.c:10785
+#: ../src/file-manager/fm-directory-view.c:10709
 msgid "dropped text.txt"
 msgstr ""
 
 #. Translator: This is the filename used for when you dnd raw
 #. * data to a directory, if the source didn't supply a name.
-#: ../src/file-manager/fm-directory-view.c:10830
+#: ../src/file-manager/fm-directory-view.c:10754
 msgid "dropped data"
 msgstr ""
 
 #. Reset to default info
-#: ../src/file-manager/fm-directory-view.c:11226
+#: ../src/file-manager/fm-directory-view.c:11145
 msgid "Undo"
 msgstr ""
 
 #. Reset to default info
-#: ../src/file-manager/fm-directory-view.c:11244
+#: ../src/file-manager/fm-directory-view.c:11163
 msgid "Redo"
 msgstr ""
 
-#: ../src/file-manager/fm-ditem-page.c:486
-#: ../src/file-manager/fm-ditem-page.c:498
+#: ../src/file-manager/fm-ditem-page.c:437
+#: ../src/file-manager/fm-ditem-page.c:449
 msgid "Comment"
 msgstr "Ìdáásí"
 
-#: ../src/file-manager/fm-ditem-page.c:489
+#: ../src/file-manager/fm-ditem-page.c:440
 msgid "URL"
 msgstr "URL"
 
-#: ../src/file-manager/fm-ditem-page.c:492
-#: ../src/file-manager/fm-ditem-page.c:504
-#: ../src/caja-image-properties-page.c:378
+#: ../src/file-manager/fm-ditem-page.c:443
+#: ../src/file-manager/fm-ditem-page.c:455
+#: ../src/caja-image-properties-page.c:370
 msgid "Description"
 msgstr "Àpèjúwe"
 
-#: ../src/file-manager/fm-ditem-page.c:501
+#: ../src/file-manager/fm-ditem-page.c:452
 msgid "Command"
 msgstr "Àṣẹ"
 
@@ -4894,8 +4890,8 @@ msgstr "Títún \"%s\" sọ lórúkọ sí \"%s\"."
 
 #. translators: this is used in the view selection dropdown
 #. * of navigation windows and in the preferences dialog
-#: ../src/file-manager/fm-icon-container.c:613
-#: ../src/file-manager/fm-icon-view.c:3429
+#: ../src/file-manager/fm-icon-container.c:611
+#: ../src/file-manager/fm-icon-view.c:3402
 #: ../src/caja-file-management-properties.ui.h:1
 msgid "Icon View"
 msgstr "Òye Áíkànnù"
@@ -4905,7 +4901,7 @@ msgid "by _Name"
 msgstr "nípa _Orúkọ"
 
 #: ../src/file-manager/fm-icon-view.c:133
-#: ../src/file-manager/fm-icon-view.c:1749
+#: ../src/file-manager/fm-icon-view.c:1741
 msgid "Keep icons sorted by name in rows"
 msgstr "Jẹ́kí àwọn áíkànnù tí a ṣètò nípa orúkọ wà ní àwọn róòlù"
 
@@ -4914,7 +4910,7 @@ msgid "by _Size"
 msgstr "nípa _Ìwọ̀n"
 
 #: ../src/file-manager/fm-icon-view.c:140
-#: ../src/file-manager/fm-icon-view.c:1755
+#: ../src/file-manager/fm-icon-view.c:1747
 msgid "Keep icons sorted by size in rows"
 msgstr "Jẹ́kí àwọn áíkànnù tí a ṣètò nípa ìwọ̀n wà ní àwọn róòlù"
 
@@ -4923,7 +4919,7 @@ msgid "by _Type"
 msgstr "nípa _Irúfẹ́"
 
 #: ../src/file-manager/fm-icon-view.c:147
-#: ../src/file-manager/fm-icon-view.c:1761
+#: ../src/file-manager/fm-icon-view.c:1753
 msgid "Keep icons sorted by type in rows"
 msgstr "Jẹ́kí àwọn áíkànnù tí a ṣètò nípa irúfẹ́ wà ní àwọn róòlù"
 
@@ -4932,7 +4928,7 @@ msgid "by Modification _Date"
 msgstr "nípa Déètì _Àtúntò"
 
 #: ../src/file-manager/fm-icon-view.c:154
-#: ../src/file-manager/fm-icon-view.c:1767
+#: ../src/file-manager/fm-icon-view.c:1759
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Jẹ́kí àwọn áíkànnù tí a ṣètò nípa déètì àtúntò wà ní àwọn róòlù"
 
@@ -4941,7 +4937,7 @@ msgid "by _Emblems"
 msgstr "nípa _Àwọn Àmì Àpẹẹrẹ"
 
 #: ../src/file-manager/fm-icon-view.c:161
-#: ../src/file-manager/fm-icon-view.c:1773
+#: ../src/file-manager/fm-icon-view.c:1765
 msgid "Keep icons sorted by emblems in rows"
 msgstr "Jẹ́kí àwọn áíkànnù tí ṣètò nípa àwọn àmì àpẹẹrẹ wà ní àwọn róòlù"
 
@@ -4950,294 +4946,294 @@ msgid "by T_rash Time"
 msgstr ""
 
 #: ../src/file-manager/fm-icon-view.c:168
-#: ../src/file-manager/fm-icon-view.c:1779
+#: ../src/file-manager/fm-icon-view.c:1771
 msgid "Keep icons sorted by trash time in rows"
 msgstr ""
 
-#: ../src/file-manager/fm-icon-view.c:785
+#: ../src/file-manager/fm-icon-view.c:777
 msgid "_Organize Desktop by Name"
 msgstr ""
 
 #. name, stock id, label
-#: ../src/file-manager/fm-icon-view.c:1698
+#: ../src/file-manager/fm-icon-view.c:1690
 msgid "Arran_ge Items"
 msgstr "Ṣààt_ò Àwọn Wúnrẹ̀n"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1700
+#: ../src/file-manager/fm-icon-view.c:1692
 msgid "Resize Icon..."
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-icon-view.c:1701
+#: ../src/file-manager/fm-icon-view.c:1693
 msgid "Make the selected icon resizable"
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1705
-#: ../src/file-manager/fm-icon-view.c:1906
+#: ../src/file-manager/fm-icon-view.c:1697
+#: ../src/file-manager/fm-icon-view.c:1898
 msgid "Restore Icons' Original Si_zes"
 msgstr "Dá Àwọn Áíkànnù Pada sí Àwọn Iw_ọ̀n Wọn Gangan"
 
 #. tooltip
-#: ../src/file-manager/fm-icon-view.c:1706
+#: ../src/file-manager/fm-icon-view.c:1698
 msgid "Restore each selected icon to its original size"
 msgstr "Dá áíkànnù kọ̀ọ̀kan tí a yàn padà sí ìwọ̀n rẹ̀ gangan"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1710
+#: ../src/file-manager/fm-icon-view.c:1702
 msgid "_Organize by Name"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-icon-view.c:1711
+#: ../src/file-manager/fm-icon-view.c:1703
 msgid "Reposition icons to better fit in the window and avoid overlapping"
 msgstr "Tún àwọn áíkànnù gbé sípò láti lè bá fèrèsé mu ká sì dènà ìkálura"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1719
+#: ../src/file-manager/fm-icon-view.c:1711
 msgid "Compact _Layout"
 msgstr "Ìlàálẹ̀ _Tó Wàpọ̀"
 
 #. tooltip
-#: ../src/file-manager/fm-icon-view.c:1720
+#: ../src/file-manager/fm-icon-view.c:1712
 msgid "Toggle using a tighter layout scheme"
 msgstr "Tọ́gù lílo ìtọsẹ̀ ìlàálẹ̀ tó le"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1725
+#: ../src/file-manager/fm-icon-view.c:1717
 msgid "Re_versed Order"
 msgstr "Ètò Ìyípadà Sẹ́yìn"
 
 #. tooltip
-#: ../src/file-manager/fm-icon-view.c:1726
+#: ../src/file-manager/fm-icon-view.c:1718
 msgid "Display icons in the opposite order"
 msgstr "Ṣàfihàn àwọn áíkànnù ní ìṣàtò òdì̀"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1731
+#: ../src/file-manager/fm-icon-view.c:1723
 msgid "_Keep Aligned"
 msgstr "_Jẹ́ kí o Dọ́gba"
 
 #. tooltip
-#: ../src/file-manager/fm-icon-view.c:1732
+#: ../src/file-manager/fm-icon-view.c:1724
 msgid "Keep icons lined up on a grid"
 msgstr "Jẹ́kí àwọn áíkànnù tò sóri gíríìdì"
 
-#: ../src/file-manager/fm-icon-view.c:1742
+#: ../src/file-manager/fm-icon-view.c:1734
 msgid "_Manually"
 msgstr "_Ọlọ́wọ́"
 
-#: ../src/file-manager/fm-icon-view.c:1743
+#: ../src/file-manager/fm-icon-view.c:1735
 msgid "Leave icons wherever they are dropped"
 msgstr "Fi àwọn áíkànnù sílẹ̀ níbikíbi tí a bá jù wọ̀n sí"
 
-#: ../src/file-manager/fm-icon-view.c:1748
+#: ../src/file-manager/fm-icon-view.c:1740
 msgid "By _Name"
 msgstr "Nípa _Orúkọ"
 
-#: ../src/file-manager/fm-icon-view.c:1754
+#: ../src/file-manager/fm-icon-view.c:1746
 msgid "By _Size"
 msgstr "Nípa _Ìwọ̀n"
 
-#: ../src/file-manager/fm-icon-view.c:1760
+#: ../src/file-manager/fm-icon-view.c:1752
 msgid "By _Type"
 msgstr "Nípa _Irúfẹ́"
 
-#: ../src/file-manager/fm-icon-view.c:1766
+#: ../src/file-manager/fm-icon-view.c:1758
 msgid "By Modification _Date"
 msgstr "Nípa Déètì _Àtúntò"
 
-#: ../src/file-manager/fm-icon-view.c:1772
+#: ../src/file-manager/fm-icon-view.c:1764
 msgid "By _Emblems"
 msgstr "Nípa _Àwọn Àmì Àpẹẹrẹ"
 
-#: ../src/file-manager/fm-icon-view.c:1778
+#: ../src/file-manager/fm-icon-view.c:1770
 msgid "By T_rash Time"
 msgstr ""
 
-#: ../src/file-manager/fm-icon-view.c:1907
+#: ../src/file-manager/fm-icon-view.c:1899
 msgid "Restore Icon's Original Si_ze"
 msgstr "Dá Ìw_ọn Áíkànnù Gangan Padà Sípò"
 
-#: ../src/file-manager/fm-icon-view.c:2382
+#: ../src/file-manager/fm-icon-view.c:2374
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "ìtọ́ka sí \"%s\""
 
 #. translators: this is used in the view menu
-#: ../src/file-manager/fm-icon-view.c:3431
+#: ../src/file-manager/fm-icon-view.c:3404
 msgid "_Icons"
 msgstr "_Àwọn Áíkànnù"
 
-#: ../src/file-manager/fm-icon-view.c:3432
+#: ../src/file-manager/fm-icon-view.c:3405
 msgid "The icon view encountered an error."
 msgstr ""
 
-#: ../src/file-manager/fm-icon-view.c:3433
+#: ../src/file-manager/fm-icon-view.c:3406
 msgid "The icon view encountered an error while starting up."
 msgstr ""
 
-#: ../src/file-manager/fm-icon-view.c:3434
+#: ../src/file-manager/fm-icon-view.c:3407
 msgid "Display this location with the icon view."
 msgstr ""
 
 #. translators: this is used in the view selection dropdown
 #. * of navigation windows and in the preferences dialog
-#: ../src/file-manager/fm-icon-view.c:3444
+#: ../src/file-manager/fm-icon-view.c:3417
 #: ../src/caja-file-management-properties.ui.h:3
 msgid "Compact View"
 msgstr ""
 
 #. translators: this is used in the view menu
-#: ../src/file-manager/fm-icon-view.c:3446
+#: ../src/file-manager/fm-icon-view.c:3419
 msgid "_Compact"
 msgstr ""
 
-#: ../src/file-manager/fm-icon-view.c:3447
+#: ../src/file-manager/fm-icon-view.c:3420
 msgid "The compact view encountered an error."
 msgstr ""
 
-#: ../src/file-manager/fm-icon-view.c:3448
+#: ../src/file-manager/fm-icon-view.c:3421
 msgid "The compact view encountered an error while starting up."
 msgstr ""
 
-#: ../src/file-manager/fm-icon-view.c:3449
+#: ../src/file-manager/fm-icon-view.c:3422
 msgid "Display this location with the compact view."
 msgstr ""
 
-#: ../src/file-manager/fm-list-model.c:436
-#: ../src/file-manager/fm-tree-model.c:1366
+#: ../src/file-manager/fm-list-model.c:428
+#: ../src/file-manager/fm-tree-model.c:1358
 msgid "(Empty)"
 msgstr "(Òfìfo)"
 
-#: ../src/file-manager/fm-list-model.c:440
-#: ../src/file-manager/fm-tree-model.c:1366 ../src/caja-window-slot.c:211
+#: ../src/file-manager/fm-list-model.c:432
+#: ../src/file-manager/fm-tree-model.c:1358 ../src/caja-window-slot.c:207
 msgid "Loading..."
 msgstr "Kíki..."
 
 #. translators: this is used in the view selection dropdown
 #. * of navigation windows and in the preferences dialog
-#: ../src/file-manager/fm-list-view.c:1865
-#: ../src/file-manager/fm-list-view.c:3517
+#: ../src/file-manager/fm-list-view.c:1833
+#: ../src/file-manager/fm-list-view.c:3448
 #: ../src/caja-file-management-properties.ui.h:2
 msgid "List View"
 msgstr "Òye Àtòjọ"
 
-#: ../src/file-manager/fm-list-view.c:2564
+#: ../src/file-manager/fm-list-view.c:2529
 #, c-format
 msgid "%s Visible Columns"
 msgstr "%s Àwọn Kọ́lọ̀mù Afojúrí"
 
-#: ../src/file-manager/fm-list-view.c:2583
+#: ../src/file-manager/fm-list-view.c:2548
 msgid "Choose the order of information to appear in this folder:"
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-list-view.c:2653
+#: ../src/file-manager/fm-list-view.c:2606
 msgid "Visible _Columns..."
 msgstr "Àwọn _Kọ́lọ̀mù Afojúrí..."
 
 #. tooltip
-#: ../src/file-manager/fm-list-view.c:2654
+#: ../src/file-manager/fm-list-view.c:2607
 msgid "Select the columns visible in this folder"
 msgstr "Yan àwọn kọ́lọ̀mù afojúrí nínú fódà yìí"
 
 #. translators: this is used in the view menu
-#: ../src/file-manager/fm-list-view.c:3519
+#: ../src/file-manager/fm-list-view.c:3450
 msgid "_List"
 msgstr "_Àtòjọ"
 
-#: ../src/file-manager/fm-list-view.c:3520
+#: ../src/file-manager/fm-list-view.c:3451
 msgid "The list view encountered an error."
 msgstr ""
 
-#: ../src/file-manager/fm-list-view.c:3521
+#: ../src/file-manager/fm-list-view.c:3452
 msgid "The list view encountered an error while starting up."
 msgstr ""
 
-#: ../src/file-manager/fm-list-view.c:3522
+#: ../src/file-manager/fm-list-view.c:3453
 msgid "Display this location with the list view."
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:545
+#: ../src/file-manager/fm-properties-window.c:494
 msgid "You cannot assign more than one custom icon at a time!"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:546
-#: ../src/caja-information-panel.c:545
+#: ../src/file-manager/fm-properties-window.c:495
+#: ../src/caja-information-panel.c:528
 msgid "Please drag just one image to set a custom icon."
 msgstr "Jọ̀wọ́ wọ àwòrán kan ṣoṣo láti gbé áíkànnù àkànṣe kalẹ̀."
 
-#: ../src/file-manager/fm-properties-window.c:557
-#: ../src/caja-information-panel.c:572
+#: ../src/file-manager/fm-properties-window.c:506
+#: ../src/caja-information-panel.c:555
 msgid "The file that you dropped is not local."
 msgstr "Fáìlì tí o jù sílẹ̀ kìí ṣe ti agbègbè."
 
-#: ../src/file-manager/fm-properties-window.c:558
-#: ../src/file-manager/fm-properties-window.c:564
-#: ../src/caja-information-panel.c:573
+#: ../src/file-manager/fm-properties-window.c:507
+#: ../src/file-manager/fm-properties-window.c:513
+#: ../src/caja-information-panel.c:556
 msgid "You can only use local images as custom icons."
 msgstr "O kàn lè lo àwọn àwòrán agbègbè nìkan gẹ́gẹ́ bíi àwọn áíkànnù àkànṣe."
 
-#: ../src/file-manager/fm-properties-window.c:563
-#: ../src/caja-information-panel.c:580
+#: ../src/file-manager/fm-properties-window.c:512
+#: ../src/caja-information-panel.c:563
 msgid "The file that you dropped is not an image."
 msgstr "Fáìlì tí o jù sílẹ̀ kìí ṣe àwòrán."
 
-#: ../src/file-manager/fm-properties-window.c:708
+#: ../src/file-manager/fm-properties-window.c:635
 msgid "_Name:"
 msgid_plural "_Names:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-properties-window.c:1064
+#: ../src/file-manager/fm-properties-window.c:991
 #, c-format
 msgid "Properties"
 msgstr "Àwọn Àbùdá"
 
-#: ../src/file-manager/fm-properties-window.c:1072
+#: ../src/file-manager/fm-properties-window.c:999
 #, c-format
 msgid "%s Properties"
 msgstr "%s Àwọn Àbùdá"
 
-#: ../src/file-manager/fm-properties-window.c:1400
+#: ../src/file-manager/fm-properties-window.c:1327
 #, c-format
 msgctxt "MIME type description (MIME type)"
 msgid "%s (%s)"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:1689
+#: ../src/file-manager/fm-properties-window.c:1539
 msgid "Cancel Group Change?"
 msgstr "Pa Ìyípadà Olóhun Rẹ́?"
 
-#: ../src/file-manager/fm-properties-window.c:2131
+#: ../src/file-manager/fm-properties-window.c:1949
 msgid "Cancel Owner Change?"
 msgstr "Pa Ìyípadà Olóhun Rẹ́?"
 
-#: ../src/file-manager/fm-properties-window.c:2476
+#: ../src/file-manager/fm-properties-window.c:2267
 msgid "nothing"
 msgstr "òfo"
 
-#: ../src/file-manager/fm-properties-window.c:2478
+#: ../src/file-manager/fm-properties-window.c:2269
 msgid "unreadable"
 msgstr "kò ṣeé kà"
 
-#: ../src/file-manager/fm-properties-window.c:2493
+#: ../src/file-manager/fm-properties-window.c:2284
 #, c-format
 msgid "%'d item, with size %s"
 msgid_plural "%'d items, totalling %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-properties-window.c:2502
+#: ../src/file-manager/fm-properties-window.c:2293
 msgid "(some contents unreadable)"
 msgstr "(ọ̀pọ̀lọpọ̀ àwọn àkóónú ni kò ṣeé kà)"
 
@@ -5246,279 +5242,243 @@ msgstr "(ọ̀pọ̀lọpọ̀ àwọn àkóónú ni kò ṣeé kà)"
 #. * "Contents:" title to line up with the first line of the
 #. * 2-line value. Maybe there's a better way to do this, but I
 #. * couldn't think of one.
-#: ../src/file-manager/fm-properties-window.c:2519
+#: ../src/file-manager/fm-properties-window.c:2310
 msgid "Contents:"
 msgstr "Àwọn Àkóónú:"
 
 #. Translators: "used" refers to the capacity of the filesystem
-#: ../src/file-manager/fm-properties-window.c:3547
+#: ../src/file-manager/fm-properties-window.c:3086
 msgid "used"
 msgstr ""
 
 #. Translators: "free" refers to the capacity of the filesystem
-#: ../src/file-manager/fm-properties-window.c:3556
+#: ../src/file-manager/fm-properties-window.c:3095
 msgid "free"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:3558
+#: ../src/file-manager/fm-properties-window.c:3097
 msgid "Total capacity:"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:3567
+#: ../src/file-manager/fm-properties-window.c:3106
 msgid "Filesystem type:"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:3687
+#: ../src/file-manager/fm-properties-window.c:3192
 msgid "Basic"
 msgstr "Ìbẹ̀rẹ̀"
 
-#: ../src/file-manager/fm-properties-window.c:3781
-#: ../src/file-manager/fm-properties-window.c:3858
+#: ../src/file-manager/fm-properties-window.c:3254
 msgid "Link target:"
 msgstr "Òsùnsùn líǹkì:"
 
-#: ../src/file-manager/fm-properties-window.c:3800
-#: ../src/file-manager/fm-properties-window.c:3877
+#: ../src/file-manager/fm-properties-window.c:3273
 #: ../src/caja-location-bar.c:57
 msgid "Location:"
 msgstr "Àyè:"
 
-#: ../src/file-manager/fm-properties-window.c:3806
-#: ../src/file-manager/fm-properties-window.c:3883
+#: ../src/file-manager/fm-properties-window.c:3279
 msgid "Volume:"
 msgstr "Ìgbóhùnsókè-sódò:"
 
-#: ../src/file-manager/fm-properties-window.c:3815
-#: ../src/file-manager/fm-properties-window.c:3892
+#: ../src/file-manager/fm-properties-window.c:3288
 msgid "Accessed:"
 msgstr "Ó Ráyè:"
 
-#: ../src/file-manager/fm-properties-window.c:3819
-#: ../src/file-manager/fm-properties-window.c:3896
+#: ../src/file-manager/fm-properties-window.c:3292
 msgid "Modified:"
 msgstr "A Tuntò:"
 
-#: ../src/file-manager/fm-properties-window.c:3828
-#: ../src/file-manager/fm-properties-window.c:3905
+#: ../src/file-manager/fm-properties-window.c:3301
 msgid "Free space:"
 msgstr "Àyè òfìfo:"
 
-#: ../src/file-manager/fm-properties-window.c:4019
-#: ../src/caja-emblem-sidebar.c:1095
+#: ../src/file-manager/fm-properties-window.c:3415
+#: ../src/caja-emblem-sidebar.c:1085
 msgid "Emblems"
 msgstr "Àwọn Àmì Àpẹẹrẹ"
 
-#: ../src/file-manager/fm-properties-window.c:4449
-#: ../src/file-manager/fm-properties-window.c:4475
+#: ../src/file-manager/fm-properties-window.c:3824
 msgid "_Read"
 msgstr "_Kàá"
 
-#: ../src/file-manager/fm-properties-window.c:4451
-#: ../src/file-manager/fm-properties-window.c:4477
+#: ../src/file-manager/fm-properties-window.c:3826
 msgid "_Write"
 msgstr "_Kọ"
 
-#: ../src/file-manager/fm-properties-window.c:4453
-#: ../src/file-manager/fm-properties-window.c:4479
+#: ../src/file-manager/fm-properties-window.c:3828
 msgid "E_xecute"
 msgstr "M_ú Ṣiṣẹ́"
 
 #. translators: this gets concatenated to "no read",
 #. * "no access", etc. (see following strings)
-#: ../src/file-manager/fm-properties-window.c:4748
-#: ../src/file-manager/fm-properties-window.c:4759
-#: ../src/file-manager/fm-properties-window.c:4771
+#: ../src/file-manager/fm-properties-window.c:4096
+#: ../src/file-manager/fm-properties-window.c:4107
+#: ../src/file-manager/fm-properties-window.c:4119
 msgid "no "
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4751
+#: ../src/file-manager/fm-properties-window.c:4099
 msgid "list"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4753
+#: ../src/file-manager/fm-properties-window.c:4101
 msgid "read"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4762
+#: ../src/file-manager/fm-properties-window.c:4110
 msgid "create/delete"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4764
+#: ../src/file-manager/fm-properties-window.c:4112
 msgid "write"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4773
+#: ../src/file-manager/fm-properties-window.c:4121
 msgid "access"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4829
-#: ../src/file-manager/fm-properties-window.c:4835
+#: ../src/file-manager/fm-properties-window.c:4169
 msgid "Access:"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4831
-#: ../src/file-manager/fm-properties-window.c:4837
+#: ../src/file-manager/fm-properties-window.c:4171
 msgid "Folder access:"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4833
-#: ../src/file-manager/fm-properties-window.c:4839
+#: ../src/file-manager/fm-properties-window.c:4173
 msgid "File access:"
 msgstr ""
 
 #. Translators: this is referred to the permissions
 #. * the user has in a directory.
 #. Translators: this is referred to captions under icons.
-#: ../src/file-manager/fm-properties-window.c:4855
-#: ../src/file-manager/fm-properties-window.c:4866
+#: ../src/file-manager/fm-properties-window.c:4188
+#: ../src/file-manager/fm-properties-window.c:4199
 #: ../src/caja-file-management-properties.c:327
 msgid "None"
 msgstr "Kò sí"
 
-#: ../src/file-manager/fm-properties-window.c:4858
+#: ../src/file-manager/fm-properties-window.c:4191
 msgid "List files only"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4860
+#: ../src/file-manager/fm-properties-window.c:4193
 msgid "Access files"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4862
+#: ../src/file-manager/fm-properties-window.c:4195
 msgid "Create and delete files"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4869
+#: ../src/file-manager/fm-properties-window.c:4202
 msgid "Read-only"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4871
+#: ../src/file-manager/fm-properties-window.c:4204
 msgid "Read and write"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4962
-#: ../src/file-manager/fm-properties-window.c:4977
+#: ../src/file-manager/fm-properties-window.c:4269
 msgid "Special flags:"
 msgstr "Àwọn àsíá pàtàkì:"
 
-#: ../src/file-manager/fm-properties-window.c:4964
-#: ../src/file-manager/fm-properties-window.c:4974
+#: ../src/file-manager/fm-properties-window.c:4271
 msgid "Set _user ID"
 msgstr "Ṣàgbékalẹ̀ _ID òǹlò"
 
-#: ../src/file-manager/fm-properties-window.c:4965
-#: ../src/file-manager/fm-properties-window.c:4979
+#: ../src/file-manager/fm-properties-window.c:4272
 msgid "Set gro_up ID"
 msgstr "Ṣàgbékalẹ̀ ID ẹgb_ẹ́"
 
-#: ../src/file-manager/fm-properties-window.c:4966
-#: ../src/file-manager/fm-properties-window.c:4980
+#: ../src/file-manager/fm-properties-window.c:4273
 msgid "_Sticky"
 msgstr "_Lílẹ̀ Mọ́wọ́"
 
-#: ../src/file-manager/fm-properties-window.c:5060
-#: ../src/file-manager/fm-properties-window.c:5163
-#: ../src/file-manager/fm-properties-window.c:5463
-#: ../src/file-manager/fm-properties-window.c:5544
+#: ../src/file-manager/fm-properties-window.c:4348
+#: ../src/file-manager/fm-properties-window.c:4539
 msgid "_Owner:"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:5068
-#: ../src/file-manager/fm-properties-window.c:5169
-#: ../src/file-manager/fm-properties-window.c:5268
-#: ../src/file-manager/fm-properties-window.c:5361
-#: ../src/file-manager/fm-properties-window.c:5472
-#: ../src/file-manager/fm-properties-window.c:5552
+#: ../src/file-manager/fm-properties-window.c:4356
+#: ../src/file-manager/fm-properties-window.c:4444
+#: ../src/file-manager/fm-properties-window.c:4548
 msgid "Owner:"
 msgstr "Olóhun:"
 
-#: ../src/file-manager/fm-properties-window.c:5090
-#: ../src/file-manager/fm-properties-window.c:5193
-#: ../src/file-manager/fm-properties-window.c:5485
-#: ../src/file-manager/fm-properties-window.c:5564
+#: ../src/file-manager/fm-properties-window.c:4378
+#: ../src/file-manager/fm-properties-window.c:4561
 msgid "_Group:"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:5098
-#: ../src/file-manager/fm-properties-window.c:5202
-#: ../src/file-manager/fm-properties-window.c:5269
-#: ../src/file-manager/fm-properties-window.c:5362
-#: ../src/file-manager/fm-properties-window.c:5493
-#: ../src/file-manager/fm-properties-window.c:5573
+#: ../src/file-manager/fm-properties-window.c:4386
+#: ../src/file-manager/fm-properties-window.c:4445
+#: ../src/file-manager/fm-properties-window.c:4569
 msgid "Group:"
 msgstr "Ẹgbẹ́:"
 
-#: ../src/file-manager/fm-properties-window.c:5122
-#: ../src/file-manager/fm-properties-window.c:5228
+#: ../src/file-manager/fm-properties-window.c:4410
 msgid "Others"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:5137
-#: ../src/file-manager/fm-properties-window.c:5246
+#: ../src/file-manager/fm-properties-window.c:4425
 msgid "Execute:"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:5140
-#: ../src/file-manager/fm-properties-window.c:5250
+#: ../src/file-manager/fm-properties-window.c:4428
 msgid "Allow _executing file as program"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:5270
-#: ../src/file-manager/fm-properties-window.c:5363
+#: ../src/file-manager/fm-properties-window.c:4446
 msgid "Others:"
 msgstr "Àwọn Mìíràn:"
 
-#: ../src/file-manager/fm-properties-window.c:5509
-#: ../src/file-manager/fm-properties-window.c:5592
+#: ../src/file-manager/fm-properties-window.c:4585
 msgid "Folder Permissions:"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:5516
-#: ../src/file-manager/fm-properties-window.c:5605
+#: ../src/file-manager/fm-properties-window.c:4592
 msgid "File Permissions:"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:5525
-#: ../src/file-manager/fm-properties-window.c:5616
+#: ../src/file-manager/fm-properties-window.c:4601
 msgid "Text view:"
 msgstr "Òye Àyọkà:"
 
-#: ../src/file-manager/fm-properties-window.c:5764
-#: ../src/file-manager/fm-properties-window.c:5824
+#: ../src/file-manager/fm-properties-window.c:4747
 msgid "You are not the owner, so you cannot change these permissions."
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:5784
-#: ../src/file-manager/fm-properties-window.c:5849
+#: ../src/file-manager/fm-properties-window.c:4767
 msgid "SELinux context:"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:5789
-#: ../src/file-manager/fm-properties-window.c:5854
+#: ../src/file-manager/fm-properties-window.c:4772
 msgid "Last changed:"
 msgstr "Àyípadà tó kẹ́yìn:"
 
-#: ../src/file-manager/fm-properties-window.c:5873
+#: ../src/file-manager/fm-properties-window.c:4783
 msgid "Apply Permissions to Enclosed Files"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:5883
+#: ../src/file-manager/fm-properties-window.c:4793
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "A kò lè sọ àwọn ìyànda \"%s\"."
 
-#: ../src/file-manager/fm-properties-window.c:5886
+#: ../src/file-manager/fm-properties-window.c:4796
 msgid "The permissions of the selected file could not be determined."
 msgstr "A kò lè so àwọn ìyànda fáìlì tí a ti yàn."
 
-#: ../src/file-manager/fm-properties-window.c:6464
+#: ../src/file-manager/fm-properties-window.c:5371
 msgid "Creating Properties window."
 msgstr "Ń Ṣẹ̀dá Fèrèsé Àwọn Àbùdá."
 
-#: ../src/file-manager/fm-properties-window.c:6766
+#: ../src/file-manager/fm-properties-window.c:5660
 msgid "Select Custom Icon"
 msgstr ""
 
-#: ../src/file-manager/fm-tree-view.c:1438 ../src/caja-places-sidebar.c:551
+#: ../src/file-manager/fm-tree-view.c:1438 ../src/caja-places-sidebar.c:538
 msgid "File System"
 msgstr ""
 
@@ -5530,91 +5490,91 @@ msgstr "Igi"
 msgid "Show Tree"
 msgstr ""
 
-#: ../src/caja-application.c:693
+#: ../src/caja-application.c:502
 #, c-format
 msgid "Caja could not create the required folder \"%s\"."
 msgstr "Caja kò lè ṣẹ̀dá fódà tí a bèrè fún náà \"%s\"."
 
-#: ../src/caja-application.c:695
+#: ../src/caja-application.c:504
 msgid ""
 "Before running Caja, please create the following folder, or set permissions "
 "such that Caja can create it."
 msgstr "Kí o tó máa rọ́ọ̀nù Caja, jọ̀wọ́ kọ́kọ́ ṣẹ̀dá fódà wọ̀nyí, tàbí kí o ṣàgbékalẹ̀ irú àwọn ìyànda tí Caja lè fi ṣẹ̀dá rẹ̀."
 
-#: ../src/caja-application.c:700
+#: ../src/caja-application.c:509
 #, c-format
 msgid "Caja could not create the following required folders: %s."
 msgstr "Caja kò lè ṣẹ̀dá àwọn fódà tí wọ́n ń bèrè fún wọ̀nyí: %s."
 
-#: ../src/caja-application.c:702
+#: ../src/caja-application.c:511
 msgid ""
 "Before running Caja, please create these folders, or set permissions such "
 "that Caja can create them."
 msgstr "Kí o tó máa rọ́ọ̀nù Caja, jọ̀wọ́ kọ́kọ́ ṣẹ̀dá àwọn fódà yìí, tàbí kí o ṣàgbékalẹ̀ irú àwọn ìyànda tí Caja lè fi ṣẹ̀dá wọn."
 
-#: ../src/caja-application.c:1939 ../src/caja-places-sidebar.c:2235
-#: ../src/caja-places-sidebar.c:2269 ../src/caja-places-sidebar.c:2304
+#: ../src/caja-application.c:1285 ../src/caja-places-sidebar.c:2214
+#: ../src/caja-places-sidebar.c:2248 ../src/caja-places-sidebar.c:2283
 #, c-format
 msgid "Unable to eject %s"
 msgstr ""
 
-#: ../src/caja-application.c:2662
+#: ../src/caja-application.c:1956
 msgid "--check cannot be used with other options."
 msgstr ""
 
-#: ../src/caja-application.c:2668
+#: ../src/caja-application.c:1962
 msgid "--quit cannot be used with URIs."
 msgstr ""
 
-#: ../src/caja-application.c:2675
+#: ../src/caja-application.c:1969
 msgid "--geometry cannot be used with more than one URI."
 msgstr ""
 
-#: ../src/caja-application.c:2738 ../src/caja-main.c:430
+#: ../src/caja-application.c:2032
 msgid "Perform a quick set of self-check tests."
 msgstr "Sáré ṣe àwọn àyẹ̀wò ayẹ̀ra-ẹni-wò"
 
-#: ../src/caja-application.c:2741 ../src/caja-main.c:435
+#: ../src/caja-application.c:2035
 msgid "Show the version of the program."
 msgstr ""
 
-#: ../src/caja-application.c:2743 ../src/caja-main.c:439
+#: ../src/caja-application.c:2037
 msgid "Create the initial window with the given geometry."
 msgstr "Ṣẹ̀dá fèrèsé àkọ́kọ́ pẹ̀lú jiọmẹ́tírì tí a fún wa."
 
-#: ../src/caja-application.c:2743 ../src/caja-main.c:439
+#: ../src/caja-application.c:2037
 msgid "GEOMETRY"
 msgstr "JIOMẸ́TÍRÌ"
 
-#: ../src/caja-application.c:2745 ../src/caja-main.c:443
+#: ../src/caja-application.c:2039
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Kàn ṣẹ̀dá àwọn fèrèsé fún àwọn URI tí a sọ ní pàtó."
 
-#: ../src/caja-application.c:2747 ../src/caja-main.c:447
+#: ../src/caja-application.c:2041
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr "Má ṣàbójútó ojú-iṣẹ́ (pa sẹ́ẹ̀tì ìkúndùn náà tì nínú onísọ̀rọ̀gbèsì àwọn ìkúndùn)."
 
-#: ../src/caja-application.c:2749
+#: ../src/caja-application.c:2043
 msgid ""
 "Manage the desktop regardless of set preferences or environment (on new "
 "startup only)"
 msgstr ""
 
-#: ../src/caja-application.c:2751
+#: ../src/caja-application.c:2045
 msgid "Open a browser window."
 msgstr ""
 
-#: ../src/caja-application.c:2753 ../src/caja-main.c:455
+#: ../src/caja-application.c:2047
 msgid "Quit Caja."
 msgstr "Kúrò ní Caja."
 
-#: ../src/caja-application.c:2754 ../src/caja-main.c:457
+#: ../src/caja-application.c:2048
 msgid "[URI...]"
 msgstr ""
 
-#: ../src/caja-application.c:2765 ../src/caja-main.c:516
+#: ../src/caja-application.c:2059
 msgid ""
 "\n"
 "\n"
@@ -5651,7 +5611,7 @@ msgstr ""
 
 #: ../src/caja-bookmarks-window.c:158
 #: ../src/caja-file-management-properties.c:234
-#: ../src/caja-property-browser.c:1733 ../src/caja-window-menus.c:590
+#: ../src/caja-property-browser.c:1667 ../src/caja-window-menus.c:590
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -5680,215 +5640,214 @@ msgstr "<b>_Àyè</b>"
 
 #. Translators: This is the --help description for the connect to server app,
 #. the initial newlines are between the command line arg and the description
-#: ../src/caja-connect-server-dialog-main.c:123
+#: ../src/caja-connect-server-dialog-main.c:121
 msgid ""
 "\n"
 "\n"
 "Add connect to server mount"
 msgstr ""
 
-#: ../src/caja-connect-server-dialog.c:144
+#: ../src/caja-connect-server-dialog.c:135
 msgid "SSH"
 msgstr "SSH"
 
-#: ../src/caja-connect-server-dialog.c:147
+#: ../src/caja-connect-server-dialog.c:138
 msgid "Public FTP"
 msgstr "FTP Gbogbogbò"
 
-#: ../src/caja-connect-server-dialog.c:149
+#: ../src/caja-connect-server-dialog.c:140
 msgid "FTP (with login)"
 msgstr "FTP (pẹ̀lú ìbẹ̀rẹ̀ iṣẹ́)"
 
-#: ../src/caja-connect-server-dialog.c:152
+#: ../src/caja-connect-server-dialog.c:143
 msgid "Windows share"
 msgstr "Ìpín àwọn fèrèsé"
 
-#: ../src/caja-connect-server-dialog.c:154
+#: ../src/caja-connect-server-dialog.c:145
 msgid "WebDAV (HTTP)"
 msgstr "WebDAV (HTTP)"
 
-#: ../src/caja-connect-server-dialog.c:156
+#: ../src/caja-connect-server-dialog.c:147
 msgid "Secure WebDAV (HTTPS)"
 msgstr "Dáábòbo WebDAV (HTTPS)"
 
-#: ../src/caja-connect-server-dialog.c:159
+#: ../src/caja-connect-server-dialog.c:150
 msgid "Apple Filing Protocol (AFP)"
 msgstr ""
 
-#: ../src/caja-connect-server-dialog.c:205
+#: ../src/caja-connect-server-dialog.c:196
 msgid "Connecting..."
 msgstr ""
 
-#: ../src/caja-connect-server-dialog.c:229
+#: ../src/caja-connect-server-dialog.c:220
 msgid ""
 "Can't load the supported server method list.\n"
 "Please check your GVfs installation."
 msgstr ""
 
-#: ../src/caja-connect-server-dialog.c:311
+#: ../src/caja-connect-server-dialog.c:298
 #, c-format
 msgid "The folder \"%s\" cannot be opened on \"%s\"."
 msgstr ""
 
-#: ../src/caja-connect-server-dialog.c:321
+#: ../src/caja-connect-server-dialog.c:308
 #, c-format
 msgid "The server at \"%s\" cannot be found."
 msgstr ""
 
-#: ../src/caja-connect-server-dialog.c:356
+#: ../src/caja-connect-server-dialog.c:343
 msgid "Try Again"
 msgstr ""
 
-#: ../src/caja-connect-server-dialog.c:422
+#: ../src/caja-connect-server-dialog.c:409
 msgid "Please verify your user details."
 msgstr ""
 
-#: ../src/caja-connect-server-dialog.c:452
+#: ../src/caja-connect-server-dialog.c:439
 msgid "Continue"
 msgstr ""
 
-#: ../src/caja-connect-server-dialog.c:749
-#: ../src/caja-connect-server-dialog.c:1323
+#: ../src/caja-connect-server-dialog.c:736
+#: ../src/caja-connect-server-dialog.c:1165
 msgid "C_onnect"
 msgstr "D_arapọ̀"
 
 #. set dialog properties
-#: ../src/caja-connect-server-dialog.c:877
+#: ../src/caja-connect-server-dialog.c:860
 msgid "Connect to Server"
 msgstr "Darapọ̀ mọ́ Sáfà"
 
-#: ../src/caja-connect-server-dialog.c:891
+#: ../src/caja-connect-server-dialog.c:874
 msgid "Server Details"
 msgstr ""
 
 #. first row: server entry + port spinbutton
-#: ../src/caja-connect-server-dialog.c:925
-#: ../src/caja-connect-server-dialog.c:947
+#: ../src/caja-connect-server-dialog.c:898
 msgid "_Server:"
 msgstr "_Sáfà:"
 
 #. port
-#: ../src/caja-connect-server-dialog.c:970
+#: ../src/caja-connect-server-dialog.c:920
 msgid "_Port:"
 msgstr "_Ààlà ìfibọ̀:"
 
 #. third row: share entry
-#: ../src/caja-connect-server-dialog.c:1083
+#: ../src/caja-connect-server-dialog.c:1019
 msgid "Share:"
 msgstr ""
 
 #. fourth row: folder entry
-#: ../src/caja-connect-server-dialog.c:1113
+#: ../src/caja-connect-server-dialog.c:1035
 msgid "Folder:"
 msgstr ""
 
-#: ../src/caja-connect-server-dialog.c:1144
+#: ../src/caja-connect-server-dialog.c:1052
 msgid "User Details"
 msgstr ""
 
 #. first row: domain entry
-#: ../src/caja-connect-server-dialog.c:1185
+#: ../src/caja-connect-server-dialog.c:1076
 msgid "Domain Name:"
 msgstr ""
 
 #. second row: username entry
-#: ../src/caja-connect-server-dialog.c:1215
+#: ../src/caja-connect-server-dialog.c:1092
 msgid "User Name:"
 msgstr ""
 
 #. third row: password entry
-#: ../src/caja-connect-server-dialog.c:1245
+#: ../src/caja-connect-server-dialog.c:1108
 msgid "Password:"
 msgstr ""
 
 #. fourth row: remember checkbox
-#: ../src/caja-connect-server-dialog.c:1276
+#: ../src/caja-connect-server-dialog.c:1125
 msgid "Remember this password"
 msgstr ""
 
-#: ../src/caja-connect-server-dialog.c:1294
+#: ../src/caja-connect-server-dialog.c:1136
 msgid "Add _bookmark"
 msgstr ""
 
-#: ../src/caja-connect-server-dialog.c:1301
+#: ../src/caja-connect-server-dialog.c:1143
 msgid "Bookmark Name:"
 msgstr ""
 
-#: ../src/caja-desktop-window.c:204 ../src/caja-desktop-window.c:393
-#: ../src/caja-pathbar.c:1596 ../src/caja-places-sidebar.c:536
+#: ../src/caja-desktop-window.c:202 ../src/caja-desktop-window.c:387
+#: ../src/caja-pathbar.c:1440 ../src/caja-places-sidebar.c:523
 msgid "Desktop"
 msgstr "Ojú-iṣẹ́"
 
-#: ../src/caja-emblem-sidebar.c:232
+#: ../src/caja-emblem-sidebar.c:224
 #, c-format
 msgid "Could not remove emblem with name '%s'."
 msgstr ""
 
-#: ../src/caja-emblem-sidebar.c:233 ../src/caja-emblem-sidebar.c:273
+#: ../src/caja-emblem-sidebar.c:225 ../src/caja-emblem-sidebar.c:265
 msgid ""
 "This is probably because the emblem is a permanent one, and not one that you"
 " added yourself."
 msgstr "Bóyá nítorí pé àmì àpẹẹrẹ náà jẹ́ àìnípẹ̀kún kìí sì ń ṣe èyí tí o ṣàfikún fún ra rẹ."
 
-#: ../src/caja-emblem-sidebar.c:272
+#: ../src/caja-emblem-sidebar.c:264
 #, c-format
 msgid "Could not rename emblem with name '%s'."
 msgstr ""
 
-#: ../src/caja-emblem-sidebar.c:292
+#: ../src/caja-emblem-sidebar.c:284
 msgid "Rename Emblem"
 msgstr "Tún Orúkọ Àmì Àpẹẹrẹ Sọ"
 
-#: ../src/caja-emblem-sidebar.c:311
+#: ../src/caja-emblem-sidebar.c:303
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Tẹ orúkọ tuntun wọlé fún àmì àpẹẹrẹ tí a ṣàfihàn:"
 
-#: ../src/caja-emblem-sidebar.c:365
+#: ../src/caja-emblem-sidebar.c:357
 msgid "Rename"
 msgstr "Tún Orúkọ Sọ"
 
-#: ../src/caja-emblem-sidebar.c:545
+#: ../src/caja-emblem-sidebar.c:537
 msgid "Add Emblems..."
 msgstr "Ṣàfikún Àwọn Àmì Àpẹẹrẹ..."
 
-#: ../src/caja-emblem-sidebar.c:562
+#: ../src/caja-emblem-sidebar.c:554
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr "Tẹ orúkọ àpèjúwe tókàn lẹ́gbẹ̀ àmì àpẹẹrẹ kọ̀ọ̀kan wọlé.  Orúkọ yìí la ó lò ní àwọn ibò míìràn láti fi dá àmì àpẹẹrẹ náà mọ̀."
 
-#: ../src/caja-emblem-sidebar.c:566
+#: ../src/caja-emblem-sidebar.c:558
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr "Tẹ orúkọ àpèjúwe tókàn lẹ́gbẹ̀ àmì àpẹẹrẹ náà wọlé.  Orúkọ yìí la ó lò ní àwọn ibò míìràn láti fi dá àmì àpẹẹrẹ náà mọ̀."
 
-#: ../src/caja-emblem-sidebar.c:808
+#: ../src/caja-emblem-sidebar.c:800
 msgid "Some of the files could not be added as emblems."
 msgstr "A kò lè ṣàfikún ọ̀pọ̀ àwọn fáìlì náà gẹ́gẹ́ bíi àmì àpẹẹrẹ"
 
-#: ../src/caja-emblem-sidebar.c:808 ../src/caja-emblem-sidebar.c:812
+#: ../src/caja-emblem-sidebar.c:800 ../src/caja-emblem-sidebar.c:804
 msgid "The emblems do not appear to be valid images."
 msgstr "Àwon àmì àpẹẹrẹ náà kò farahàn gẹ́gẹ́ bíi àwọn àwòrán tó fẹsẹ̀múlẹ̀."
 
-#: ../src/caja-emblem-sidebar.c:812
+#: ../src/caja-emblem-sidebar.c:804
 msgid "None of the files could be added as emblems."
 msgstr "Kò sí nínú àwọn fáìlì náà tí a lè fi ṣàfikún gẹ́gẹ́ bíi àwọn àmì àpẹẹrẹ."
 
-#: ../src/caja-emblem-sidebar.c:855 ../src/caja-emblem-sidebar.c:918
+#: ../src/caja-emblem-sidebar.c:847 ../src/caja-emblem-sidebar.c:910
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Fa '%s' náà kò farahàn gẹ́gẹ́ bíi àwòrán tó fẹsẹ̀múlẹ̀."
 
-#: ../src/caja-emblem-sidebar.c:860
+#: ../src/caja-emblem-sidebar.c:852
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Fáìlì tí a wọ́ náà kò farahàn bíi àwòrán tó fẹsẹ̀múlẹ̀."
 
-#: ../src/caja-emblem-sidebar.c:862 ../src/caja-emblem-sidebar.c:919
+#: ../src/caja-emblem-sidebar.c:854 ../src/caja-emblem-sidebar.c:911
 msgid "The emblem cannot be added."
 msgstr "A kò lè ṣàfikún àmì àpẹẹrẹ náà."
 
-#: ../src/caja-emblem-sidebar.c:1101
+#: ../src/caja-emblem-sidebar.c:1091
 msgid "Show Emblems"
 msgstr ""
 
@@ -6298,127 +6257,127 @@ msgstr ""
 msgid "Extensions"
 msgstr ""
 
-#: ../src/caja-history-sidebar.c:344
+#: ../src/caja-history-sidebar.c:335
 msgid "History"
 msgstr "Ìtàn"
 
-#: ../src/caja-history-sidebar.c:350
+#: ../src/caja-history-sidebar.c:341
 msgid "Show History"
 msgstr ""
 
-#: ../src/caja-image-properties-page.c:288
+#: ../src/caja-image-properties-page.c:280
 msgid "Camera Brand"
 msgstr "Àmì-ìyàsọ́tọ̀ Kámẹ́rà"
 
-#: ../src/caja-image-properties-page.c:289
+#: ../src/caja-image-properties-page.c:281
 msgid "Camera Model"
 msgstr "Ìdánimọ̀ Kámẹ́rà"
 
 #. Choose which date to show in order of relevance
-#: ../src/caja-image-properties-page.c:292
+#: ../src/caja-image-properties-page.c:284
 msgid "Date Taken"
 msgstr "Déètì Tí A Yàá"
 
-#: ../src/caja-image-properties-page.c:294
+#: ../src/caja-image-properties-page.c:286
 msgid "Date Digitized"
 msgstr ""
 
-#: ../src/caja-image-properties-page.c:300
+#: ../src/caja-image-properties-page.c:292
 msgid "Exposure Time"
 msgstr "Àkókò Oye-ìmọ́lẹ̀"
 
-#: ../src/caja-image-properties-page.c:301
+#: ../src/caja-image-properties-page.c:293
 msgid "Aperture Value"
 msgstr "Fálù Ojú-ihò"
 
-#: ../src/caja-image-properties-page.c:302
+#: ../src/caja-image-properties-page.c:294
 msgid "ISO Speed Rating"
 msgstr "Ìyásí Eré ISO"
 
-#: ../src/caja-image-properties-page.c:303
+#: ../src/caja-image-properties-page.c:295
 msgid "Flash Fired"
 msgstr "Fíláàṣì Bú Yàrì"
 
-#: ../src/caja-image-properties-page.c:304
+#: ../src/caja-image-properties-page.c:296
 msgid "Metering Mode"
 msgstr "Ọ̀nà Ìwọn Oye-ìmọ́lẹ̀"
 
-#: ../src/caja-image-properties-page.c:305
+#: ../src/caja-image-properties-page.c:297
 msgid "Exposure Program"
 msgstr "Àtòjọ-ètò Oye-ìmọ́lẹ̀"
 
-#: ../src/caja-image-properties-page.c:306
+#: ../src/caja-image-properties-page.c:298
 msgid "Focal Length"
 msgstr "Ìgùnsí Ojú-ẹ̀ká Nǹkan"
 
-#: ../src/caja-image-properties-page.c:307
+#: ../src/caja-image-properties-page.c:299
 msgid "Software"
 msgstr "Ẹ̀yà-ara kọ̀ǹpútà àìfojúrí"
 
-#: ../src/caja-image-properties-page.c:379
+#: ../src/caja-image-properties-page.c:371
 msgid "Keywords"
 msgstr ""
 
-#: ../src/caja-image-properties-page.c:380
+#: ../src/caja-image-properties-page.c:372
 msgid "Creator"
 msgstr ""
 
-#: ../src/caja-image-properties-page.c:381
+#: ../src/caja-image-properties-page.c:373
 msgid "Copyright"
 msgstr ""
 
-#: ../src/caja-image-properties-page.c:382
+#: ../src/caja-image-properties-page.c:374
 msgid "Rating"
 msgstr ""
 
-#: ../src/caja-image-properties-page.c:413
+#: ../src/caja-image-properties-page.c:405
 msgid "Image Type:"
 msgstr ""
 
-#: ../src/caja-image-properties-page.c:416
+#: ../src/caja-image-properties-page.c:408
 #, c-format
 msgid "<b>Width:</b> %d pixel"
 msgid_plural "<b>Width:</b> %d pixels"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/caja-image-properties-page.c:422
+#: ../src/caja-image-properties-page.c:414
 #, c-format
 msgid "<b>Height:</b> %d pixel"
 msgid_plural "<b>Height:</b> %d pixels"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/caja-image-properties-page.c:441
+#: ../src/caja-image-properties-page.c:433
 msgid "Failed to load image information"
 msgstr "Ó kùnà láti fi ìròyìn àwòrán lọ́lẹ̀"
 
-#: ../src/caja-image-properties-page.c:670
+#: ../src/caja-image-properties-page.c:661
 msgid "loading..."
 msgstr "Kíkì..."
 
-#: ../src/caja-image-properties-page.c:724
+#: ../src/caja-image-properties-page.c:715
 msgid "Image"
 msgstr "Àwòrán"
 
-#: ../src/caja-information-panel.c:167
+#: ../src/caja-information-panel.c:162
 msgid "Information"
 msgstr "Ìròyìn"
 
-#: ../src/caja-information-panel.c:173
+#: ../src/caja-information-panel.c:168
 msgid "Show Information"
 msgstr ""
 
 #. add the reset background item, possibly disabled
-#: ../src/caja-information-panel.c:379
+#: ../src/caja-information-panel.c:362
 msgid "Use _Default Background"
 msgstr "Lo Ẹ̀yìn _Ipéwọ̀n"
 
-#: ../src/caja-information-panel.c:544
+#: ../src/caja-information-panel.c:527
 msgid "You cannot assign more than one custom icon at a time."
 msgstr ""
 
-#: ../src/caja-information-panel.c:581
+#: ../src/caja-information-panel.c:564
 msgid "You can only use images as custom icons."
 msgstr "O kàn lè lo àwọn àwòrán gẹ́gẹ́ bíi àwọn áíkànnù àkànṣe."
 
@@ -6433,320 +6392,295 @@ msgid_plural "Do you want to view %d locations?"
 msgstr[0] "Ṣé o fẹ́ wòye àyè %d?"
 msgstr[1] "Ṣé o fẹ́ wòye ààyè %d?"
 
-#: ../src/caja-location-dialog.c:161
+#: ../src/caja-location-dialog.c:157
 msgid "Open Location"
 msgstr "Ṣí Àyè"
 
-#: ../src/caja-location-dialog.c:171
+#: ../src/caja-location-dialog.c:167
 msgid "_Location:"
 msgstr "_Àyè:"
 
-#: ../src/caja-main.c:451
-msgid "open a browser window."
-msgstr "ṣí fèrèsé awáròyìn."
-
-#. translators: %s is an option (e.g. --check)
-#: ../src/caja-main.c:564 ../src/caja-main.c:575
-#, c-format
-msgid "caja: %s cannot be used with URIs.\n"
-msgstr "caja: --a kò l̀è lo %s pẹ̀lú àwọn URI.\n"
-
-#: ../src/caja-main.c:570
-#, c-format
-msgid "caja: --check cannot be used with other options.\n"
-msgstr "caja: --a kò lè lo yẹ̀ẹ́wò pẹ̀lú ẹ̀yàn kan lọ.\n"
-
-#: ../src/caja-main.c:581
-#, c-format
-msgid "caja: --geometry cannot be used with more than one URI.\n"
-msgstr "caja: --a kò lè lo jiọmẹ́tírì pẹ̀lú URI kan lọ.\n"
-
-#: ../src/caja-main.c:655
-#, c-format
-msgid "caja: set erroneously as default application for '%s' content type.\n"
-msgstr ""
-
-#: ../src/caja-navigation-window-menus.c:139
+#: ../src/caja-navigation-window-menus.c:131
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "Ṣé o dá ẹ ló̀jú pé o fẹ́ pa àtòjọ àwọn àyè tí o ti ṣàbẹ̀wò rẹ́?"
 
-#: ../src/caja-navigation-window-menus.c:416 ../src/caja-window-bookmarks.c:83
+#: ../src/caja-navigation-window-menus.c:408 ../src/caja-window-bookmarks.c:83
 #, c-format
 msgid "The location \"%s\" does not exist."
 msgstr "Àyè \"%s\" kò sí."
 
-#: ../src/caja-navigation-window-menus.c:418
+#: ../src/caja-navigation-window-menus.c:410
 msgid "The history location doesn't exist."
 msgstr ""
 
 #. name, stock id, label
-#: ../src/caja-navigation-window-menus.c:835
+#: ../src/caja-navigation-window-menus.c:824
 msgid "_Go"
 msgstr "_Lọ"
 
 #. name, stock id, label
-#: ../src/caja-navigation-window-menus.c:836
+#: ../src/caja-navigation-window-menus.c:825
 msgid "_Bookmarks"
 msgstr "_Àwọn Àmì-ìwé"
 
 #. name, stock id, label
-#: ../src/caja-navigation-window-menus.c:837
+#: ../src/caja-navigation-window-menus.c:826
 msgid "_Tabs"
 msgstr ""
 
 #. name, stock id, label
-#: ../src/caja-navigation-window-menus.c:838
+#: ../src/caja-navigation-window-menus.c:827
 msgid "New _Window"
 msgstr ""
 
-#: ../src/caja-navigation-window-menus.c:839
+#: ../src/caja-navigation-window-menus.c:828
 msgid "Open another Caja window for the displayed location"
 msgstr "Ṣí fèrèsé Caja mìíràn fún àyè tí a ṣàfihàn"
 
 #. name, stock id, label
-#: ../src/caja-navigation-window-menus.c:842
+#: ../src/caja-navigation-window-menus.c:831
 msgid "New _Tab"
 msgstr ""
 
-#: ../src/caja-navigation-window-menus.c:843
+#: ../src/caja-navigation-window-menus.c:832
 msgid "Open another tab for the displayed location"
 msgstr ""
 
 #. name, stock id, label
-#: ../src/caja-navigation-window-menus.c:846
+#: ../src/caja-navigation-window-menus.c:835
 msgid "Open Folder W_indow"
 msgstr ""
 
-#: ../src/caja-navigation-window-menus.c:847
+#: ../src/caja-navigation-window-menus.c:836
 msgid "Open a folder window for the displayed location"
 msgstr ""
 
 #. name, stock id, label
-#: ../src/caja-navigation-window-menus.c:850
+#: ../src/caja-navigation-window-menus.c:839
 msgid "Close _All Windows"
 msgstr "Ti _Gbogbo Àwọn Fèrèsé"
 
-#: ../src/caja-navigation-window-menus.c:851
+#: ../src/caja-navigation-window-menus.c:840
 msgid "Close all Navigation windows"
 msgstr "Ti Gbogbo àwọn fèrèsé ìtọpa"
 
 #. name, stock id, label
-#: ../src/caja-navigation-window-menus.c:854
+#: ../src/caja-navigation-window-menus.c:843
 msgid "_Location..."
 msgstr "_Àyè..."
 
-#: ../src/caja-navigation-window-menus.c:855 ../src/caja-spatial-window.c:954
+#: ../src/caja-navigation-window-menus.c:844 ../src/caja-spatial-window.c:943
 msgid "Specify a location to open"
 msgstr "Sọ ní pàtó àyè ta fẹ́ ṣí"
 
 #. name, stock id, label
-#: ../src/caja-navigation-window-menus.c:858
+#: ../src/caja-navigation-window-menus.c:847
 msgid "Clea_r History"
 msgstr "Pa_ Ìtàn Rẹ́"
 
-#: ../src/caja-navigation-window-menus.c:859
+#: ../src/caja-navigation-window-menus.c:848
 msgid "Clear contents of Go menu and Back/Forward lists"
 msgstr "Pa àwọn àkóónú àtòjọ-ẹ̀yàn Lọ àti àwọn àtòjọ Ẹ̀yìn/Iwájú rẹ́"
 
 #. name, stock id, label
-#: ../src/caja-navigation-window-menus.c:862
+#: ../src/caja-navigation-window-menus.c:851
 msgid "S_witch to Other Pane"
 msgstr ""
 
-#: ../src/caja-navigation-window-menus.c:863
+#: ../src/caja-navigation-window-menus.c:852
 msgid "Move focus to the other pane in a split view window"
 msgstr ""
 
 #. name, stock id, label
-#: ../src/caja-navigation-window-menus.c:866
+#: ../src/caja-navigation-window-menus.c:855
 msgid "Sa_me Location as Other Pane"
 msgstr ""
 
-#: ../src/caja-navigation-window-menus.c:867
+#: ../src/caja-navigation-window-menus.c:856
 msgid "Go to the same location as in the extra pane"
 msgstr ""
 
 #. name, stock id, label
-#: ../src/caja-navigation-window-menus.c:870 ../src/caja-spatial-window.c:967
+#: ../src/caja-navigation-window-menus.c:859 ../src/caja-spatial-window.c:956
 msgid "_Add Bookmark"
 msgstr "_Ṣàfikún Àmì-ì̀wé"
 
-#: ../src/caja-navigation-window-menus.c:871 ../src/caja-spatial-window.c:968
+#: ../src/caja-navigation-window-menus.c:860 ../src/caja-spatial-window.c:957
 msgid "Add a bookmark for the current location to this menu"
 msgstr "Ṣàfikún àmì-ì̀wé fún àyè lọ́wọ́lọ́wọ́ sí àtòjọ-ẹ̀yàn yìí"
 
 #. name, stock id, label
-#: ../src/caja-navigation-window-menus.c:874 ../src/caja-spatial-window.c:971
+#: ../src/caja-navigation-window-menus.c:863 ../src/caja-spatial-window.c:960
 msgid "_Edit Bookmarks..."
 msgstr ""
 
-#: ../src/caja-navigation-window-menus.c:875 ../src/caja-spatial-window.c:972
+#: ../src/caja-navigation-window-menus.c:864 ../src/caja-spatial-window.c:961
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "Ṣàfihàn fèrèsé tí ó fàyè gbà ìṣàyẹ̀wò àwọn àmì-ìwé nínú àtòjọ-ẹ̀yàn yìí"
 
-#: ../src/caja-navigation-window-menus.c:879
+#: ../src/caja-navigation-window-menus.c:868
 msgid "_Previous Tab"
 msgstr ""
 
-#: ../src/caja-navigation-window-menus.c:880
+#: ../src/caja-navigation-window-menus.c:869
 msgid "Activate previous tab"
 msgstr ""
 
-#: ../src/caja-navigation-window-menus.c:884
+#: ../src/caja-navigation-window-menus.c:873
 msgid "_Next Tab"
 msgstr ""
 
-#: ../src/caja-navigation-window-menus.c:885
+#: ../src/caja-navigation-window-menus.c:874
 msgid "Activate next tab"
 msgstr ""
 
-#: ../src/caja-navigation-window-menus.c:889
-#: ../src/caja-navigation-window-pane.c:469
+#: ../src/caja-navigation-window-menus.c:878
+#: ../src/caja-navigation-window-pane.c:464
 msgid "Move Tab _Left"
 msgstr ""
 
-#: ../src/caja-navigation-window-menus.c:890
+#: ../src/caja-navigation-window-menus.c:879
 msgid "Move current tab to left"
 msgstr ""
 
-#: ../src/caja-navigation-window-menus.c:894
-#: ../src/caja-navigation-window-pane.c:477
+#: ../src/caja-navigation-window-menus.c:883
+#: ../src/caja-navigation-window-pane.c:472
 msgid "Move Tab _Right"
 msgstr ""
 
-#: ../src/caja-navigation-window-menus.c:895
+#: ../src/caja-navigation-window-menus.c:884
 msgid "Move current tab to right"
 msgstr ""
 
-#: ../src/caja-navigation-window-menus.c:899
+#: ../src/caja-navigation-window-menus.c:888
 msgid "S_how Search"
 msgstr ""
 
-#: ../src/caja-navigation-window-menus.c:900
+#: ../src/caja-navigation-window-menus.c:889
 msgid "Show search"
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
-#: ../src/caja-navigation-window-menus.c:908
+#: ../src/caja-navigation-window-menus.c:897
 msgid "_Main Toolbar"
 msgstr ""
 
 #. tooltip
-#: ../src/caja-navigation-window-menus.c:909
+#: ../src/caja-navigation-window-menus.c:898
 msgid "Change the visibility of this window's main toolbar"
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
-#: ../src/caja-navigation-window-menus.c:914
+#: ../src/caja-navigation-window-menus.c:903
 msgid "_Side Pane"
 msgstr "_Péènì Ẹ̀gbẹ́"
 
 #. tooltip
-#: ../src/caja-navigation-window-menus.c:915
+#: ../src/caja-navigation-window-menus.c:904
 msgid "Change the visibility of this window's side pane"
 msgstr ""
 
 #. name, stock id
 #. label, accelerator
-#: ../src/caja-navigation-window-menus.c:920
+#: ../src/caja-navigation-window-menus.c:909
 msgid "Location _Bar"
 msgstr "Àká _Àyè"
 
 #. tooltip
-#: ../src/caja-navigation-window-menus.c:921
+#: ../src/caja-navigation-window-menus.c:910
 msgid "Change the visibility of this window's location bar"
 msgstr "Yí híhàn àká àyè fèrèsé yìí padà"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/caja-navigation-window-menus.c:926
+#: ../src/caja-navigation-window-menus.c:915
 msgid "St_atusbar"
 msgstr "Àk_á-ipò"
 
 #. tooltip
-#: ../src/caja-navigation-window-menus.c:927
+#: ../src/caja-navigation-window-menus.c:916
 msgid "Change the visibility of this window's statusbar"
 msgstr "Yí híhàn àká-ipò fèrèsé yìí padà"
 
 #. name, stock id
 #. label, accelerator
 #. name, stock id, label
-#: ../src/caja-navigation-window-menus.c:932 ../src/caja-spatial-window.c:975
+#: ../src/caja-navigation-window-menus.c:921 ../src/caja-spatial-window.c:964
 msgid "_Search for Files..."
 msgstr ""
 
 #. Accelerator is in ShowSearch
 #. tooltip
-#: ../src/caja-navigation-window-menus.c:934
+#: ../src/caja-navigation-window-menus.c:923
 msgid "Search documents and folders by name"
 msgstr ""
 
 #. label, accelerator
-#: ../src/caja-navigation-window-menus.c:940
+#: ../src/caja-navigation-window-menus.c:929
 msgid "E_xtra Pane"
 msgstr ""
 
 #. tooltip
-#: ../src/caja-navigation-window-menus.c:941
+#: ../src/caja-navigation-window-menus.c:930
 msgid "Open an extra folder view side-by-side"
 msgstr ""
 
-#: ../src/caja-navigation-window-menus.c:967
+#: ../src/caja-navigation-window-menus.c:956
 msgid "_Back"
 msgstr "_Ẹ̀yìn"
 
-#: ../src/caja-navigation-window-menus.c:969
+#: ../src/caja-navigation-window-menus.c:958
 msgid "Go to the previous visited location"
 msgstr "Lọ sí àyè tí a ṣẹ̀ bẹ̀wò tán"
 
-#: ../src/caja-navigation-window-menus.c:970
+#: ../src/caja-navigation-window-menus.c:959
 msgid "Back history"
 msgstr ""
 
-#: ../src/caja-navigation-window-menus.c:984
+#: ../src/caja-navigation-window-menus.c:973
 msgid "_Forward"
 msgstr "_Iwájú"
 
-#: ../src/caja-navigation-window-menus.c:986
+#: ../src/caja-navigation-window-menus.c:975
 msgid "Go to the next visited location"
 msgstr "Lọ sí àyè tókàn tí a fẹ́ bẹ̀wò"
 
-#: ../src/caja-navigation-window-menus.c:987
+#: ../src/caja-navigation-window-menus.c:976
 msgid "Forward history"
 msgstr ""
 
-#: ../src/caja-navigation-window-menus.c:1002
+#: ../src/caja-navigation-window-menus.c:991
 msgid "_Zoom"
 msgstr ""
 
-#: ../src/caja-navigation-window-menus.c:1012
+#: ../src/caja-navigation-window-menus.c:1001
 msgid "_View As"
 msgstr ""
 
-#: ../src/caja-navigation-window-menus.c:1047
+#: ../src/caja-navigation-window-menus.c:1036
 msgid "_Search"
 msgstr ""
 
-#: ../src/caja-navigation-window-pane.c:259
+#: ../src/caja-navigation-window-pane.c:254
 msgid "Toggle between button and text-based location bar"
 msgstr ""
 
-#: ../src/caja-navigation-window-pane.c:459
+#: ../src/caja-navigation-window-pane.c:454
 msgid "_New Tab"
 msgstr ""
 
-#: ../src/caja-navigation-window-pane.c:488
+#: ../src/caja-navigation-window-pane.c:483
 msgid "_Close Tab"
 msgstr ""
 
-#: ../src/caja-navigation-window.c:782
+#: ../src/caja-navigation-window.c:737
 #, c-format
 msgid "%s - File Browser"
 msgstr "%s - Awáròyìn Fáìlì"
 
-#: ../src/caja-notebook.c:357
+#: ../src/caja-notebook.c:337
 msgid "Close tab"
 msgstr ""
 
@@ -6758,398 +6692,398 @@ msgstr "Àwọn Nóòtì"
 msgid "Show Notes"
 msgstr ""
 
-#: ../src/caja-places-sidebar.c:325
+#: ../src/caja-places-sidebar.c:312
 msgid "Devices"
 msgstr ""
 
-#: ../src/caja-places-sidebar.c:333
+#: ../src/caja-places-sidebar.c:320
 msgid "Bookmarks"
 msgstr ""
 
-#: ../src/caja-places-sidebar.c:538
+#: ../src/caja-places-sidebar.c:525
 msgid "Open the contents of your desktop in a folder"
 msgstr ""
 
-#: ../src/caja-places-sidebar.c:553
+#: ../src/caja-places-sidebar.c:540
 msgid "Open the contents of the File System"
 msgstr ""
 
-#: ../src/caja-places-sidebar.c:612
+#: ../src/caja-places-sidebar.c:599
 msgid "Open the trash"
 msgstr ""
 
-#: ../src/caja-places-sidebar.c:667 ../src/caja-places-sidebar.c:695
+#: ../src/caja-places-sidebar.c:654 ../src/caja-places-sidebar.c:682
 #, c-format
 msgid "Mount and open %s"
 msgstr ""
 
-#: ../src/caja-places-sidebar.c:848 ../src/mate-network-scheme.desktop.in.h:1
+#: ../src/caja-places-sidebar.c:835 ../src/mate-network-scheme.desktop.in.h:1
 msgid "Network"
 msgstr "Alátagbà"
 
-#: ../src/caja-places-sidebar.c:880
+#: ../src/caja-places-sidebar.c:867
 msgid "Browse Network"
 msgstr ""
 
-#: ../src/caja-places-sidebar.c:882
+#: ../src/caja-places-sidebar.c:869
 msgid "Browse the contents of the network"
 msgstr ""
 
 #. start() for type G_DRIVE_START_STOP_TYPE_SHUTDOWN is normally not used
-#: ../src/caja-places-sidebar.c:1831
+#: ../src/caja-places-sidebar.c:1816
 msgid "_Power On"
 msgstr ""
 
-#: ../src/caja-places-sidebar.c:1835
+#: ../src/caja-places-sidebar.c:1820
 msgid "_Connect Drive"
 msgstr ""
 
-#: ../src/caja-places-sidebar.c:1836
+#: ../src/caja-places-sidebar.c:1821
 msgid "_Disconnect Drive"
 msgstr ""
 
-#: ../src/caja-places-sidebar.c:1839
+#: ../src/caja-places-sidebar.c:1824
 msgid "_Start Multi-disk Device"
 msgstr ""
 
-#: ../src/caja-places-sidebar.c:1840
+#: ../src/caja-places-sidebar.c:1825
 msgid "_Stop Multi-disk Device"
 msgstr ""
 
-#: ../src/caja-places-sidebar.c:1929 ../src/caja-places-sidebar.c:2524
+#: ../src/caja-places-sidebar.c:1911 ../src/caja-places-sidebar.c:2503
 #, c-format
 msgid "Unable to start %s"
 msgstr ""
 
-#: ../src/caja-places-sidebar.c:2468
+#: ../src/caja-places-sidebar.c:2447
 #, c-format
 msgid "Unable to poll %s for media changes"
 msgstr ""
 
-#: ../src/caja-places-sidebar.c:2584
+#: ../src/caja-places-sidebar.c:2563
 #, c-format
 msgid "Unable to stop %s"
 msgstr ""
 
-#: ../src/caja-places-sidebar.c:2726
+#: ../src/caja-places-sidebar.c:2705
 msgid "Remove"
 msgstr "Yọkúrò"
 
-#: ../src/caja-places-sidebar.c:2735
+#: ../src/caja-places-sidebar.c:2714
 msgid "Rename..."
 msgstr ""
 
-#: ../src/caja-places-sidebar.c:3431
+#: ../src/caja-places-sidebar.c:3406
 msgid "Places"
 msgstr ""
 
-#: ../src/caja-places-sidebar.c:3437
+#: ../src/caja-places-sidebar.c:3412
 msgid "Show Places"
 msgstr ""
 
 #. set the title and standard close accelerator
-#: ../src/caja-property-browser.c:299
+#: ../src/caja-property-browser.c:294
 msgid "Backgrounds and Emblems"
 msgstr "Àwon Ẹ̀yìn àti Àwọn Àmì Àpẹẹrẹ"
 
 #. create the "remove" button
-#: ../src/caja-property-browser.c:412
+#: ../src/caja-property-browser.c:405
 msgid "_Remove..."
 msgstr "_Yọkúrò"
 
 #. now create the "add new" button
-#: ../src/caja-property-browser.c:426
+#: ../src/caja-property-browser.c:419
 msgid "Add new..."
 msgstr ""
 
-#: ../src/caja-property-browser.c:977
+#: ../src/caja-property-browser.c:970
 #, c-format
 msgid "Sorry, but pattern %s could not be deleted."
 msgstr ""
 
-#: ../src/caja-property-browser.c:978
+#: ../src/caja-property-browser.c:971
 msgid "Check that you have permission to delete the pattern."
 msgstr "Yẹ̀ẹ́ wò láti ri pé o ní ìyànda láti pa bátànì jẹ."
 
-#: ../src/caja-property-browser.c:994
+#: ../src/caja-property-browser.c:987
 #, c-format
 msgid "Sorry, but emblem %s could not be deleted."
 msgstr ""
 
-#: ../src/caja-property-browser.c:995
+#: ../src/caja-property-browser.c:988
 msgid "Check that you have permission to delete the emblem."
 msgstr "Yẹ̀ẹ́wò láti lè rí pé o ní ìyànda láti pa àmì àpẹẹrẹ jẹ."
 
-#: ../src/caja-property-browser.c:1067
+#: ../src/caja-property-browser.c:1060
 msgid "Select an Image File for the New Emblem"
 msgstr ""
 
-#: ../src/caja-property-browser.c:1112
+#: ../src/caja-property-browser.c:1101
 msgid "Create a New Emblem"
 msgstr ""
 
 #. make the keyword label and field
-#: ../src/caja-property-browser.c:1145
+#: ../src/caja-property-browser.c:1122
 msgid "_Keyword:"
 msgstr "_Kókó-ọ̀rọ̀:"
 
 #. set up a file chooser to pick the image file
-#: ../src/caja-property-browser.c:1178
+#: ../src/caja-property-browser.c:1145
 msgid "_Image:"
 msgstr "_Àwòrán:"
 
-#: ../src/caja-property-browser.c:1226
+#: ../src/caja-property-browser.c:1181
 msgid "Create a New Color:"
 msgstr "Ṣẹ̀dá Àwọ̀ Tuntun:"
 
 #. make the name label and field
-#: ../src/caja-property-browser.c:1245
+#: ../src/caja-property-browser.c:1195
 msgid "Color _name:"
 msgstr "Orúkọ _àwọ̀:"
 
-#: ../src/caja-property-browser.c:1269
+#: ../src/caja-property-browser.c:1211
 msgid "Color _value:"
 msgstr "Fálù _Àwọ̀:"
 
-#: ../src/caja-property-browser.c:1313
+#: ../src/caja-property-browser.c:1247
 msgid "Sorry, but you cannot replace the reset image."
 msgstr ""
 
-#: ../src/caja-property-browser.c:1314
+#: ../src/caja-property-browser.c:1248
 msgid "Reset is a special image that cannot be deleted."
 msgstr "Àtúntò jẹ́ àkànṣe àwòràn tí a kò lè pajẹ."
 
-#: ../src/caja-property-browser.c:1344
+#: ../src/caja-property-browser.c:1278
 #, c-format
 msgid "Sorry, but the pattern %s could not be installed."
 msgstr ""
 
-#: ../src/caja-property-browser.c:1375
+#: ../src/caja-property-browser.c:1309
 msgid "Select an Image File to Add as a Pattern"
 msgstr ""
 
-#: ../src/caja-property-browser.c:1454 ../src/caja-property-browser.c:1484
+#: ../src/caja-property-browser.c:1388 ../src/caja-property-browser.c:1418
 msgid "The color cannot be installed."
 msgstr "Àwọ̀ náà kò ṣeé fi sípò."
 
-#: ../src/caja-property-browser.c:1455
+#: ../src/caja-property-browser.c:1389
 msgid "Sorry, but you must specify an unused color name for the new color."
 msgstr ""
 
-#: ../src/caja-property-browser.c:1485
+#: ../src/caja-property-browser.c:1419
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Dákun, o gbọ́dọ̀ sọ ní pàtó orúkọ tí kò ṣófo fún àwọ̀ tuntun náà."
 
-#: ../src/caja-property-browser.c:1545
+#: ../src/caja-property-browser.c:1479
 msgid "Select a Color to Add"
 msgstr ""
 
-#: ../src/caja-property-browser.c:1591 ../src/caja-property-browser.c:1609
+#: ../src/caja-property-browser.c:1525 ../src/caja-property-browser.c:1543
 #, c-format
 msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "Dákun, \"%s\" kìí ṣe fáìlì àwòrán tó ṣeé lò."
 
-#: ../src/caja-property-browser.c:1592 ../src/caja-property-browser.c:1610
+#: ../src/caja-property-browser.c:1526 ../src/caja-property-browser.c:1544
 msgid "The file is not an image."
 msgstr "fáìlì náà kìí ṣe àwòrán."
 
-#: ../src/caja-property-browser.c:2351
+#: ../src/caja-property-browser.c:2283
 msgid "Select a Category:"
 msgstr "Yan Ọ̀wọ́ kan:"
 
-#: ../src/caja-property-browser.c:2363
+#: ../src/caja-property-browser.c:2295
 msgid "C_ancel Remove"
 msgstr "P_a Ìyọkúrò Rẹ́"
 
-#: ../src/caja-property-browser.c:2372
+#: ../src/caja-property-browser.c:2304
 msgid "_Add a New Pattern..."
 msgstr "_Ṣàfikún Bátànì Tuntun..."
 
-#: ../src/caja-property-browser.c:2375
+#: ../src/caja-property-browser.c:2307
 msgid "_Add a New Color..."
 msgstr "_Ṣàfikún Àwọ̀ Tuntun..."
 
-#: ../src/caja-property-browser.c:2378
+#: ../src/caja-property-browser.c:2310
 msgid "_Add a New Emblem..."
 msgstr "_Ṣàfikún Àmì Àpẹẹrẹ Tuntun..."
 
-#: ../src/caja-property-browser.c:2404
+#: ../src/caja-property-browser.c:2336
 msgid "Click on a pattern to remove it"
 msgstr "Tẹ̀ lórí bátànì kan láti yọọ́ kúrò"
 
-#: ../src/caja-property-browser.c:2407
+#: ../src/caja-property-browser.c:2339
 msgid "Click on a color to remove it"
 msgstr "Tẹ̀ lórí àwọ̀ láti yọọ́ kúrò"
 
-#: ../src/caja-property-browser.c:2410
+#: ../src/caja-property-browser.c:2342
 msgid "Click on an emblem to remove it"
 msgstr "Tẹ̀ lórí àmì àpẹẹrẹ láti yọọ́ kúrò"
 
-#: ../src/caja-property-browser.c:2422
+#: ../src/caja-property-browser.c:2354
 msgid "Patterns:"
 msgstr "Àwọn Bátànì:"
 
-#: ../src/caja-property-browser.c:2425
+#: ../src/caja-property-browser.c:2357
 msgid "Colors:"
 msgstr "Àwọn Àwọ̀:"
 
-#: ../src/caja-property-browser.c:2428
+#: ../src/caja-property-browser.c:2360
 msgid "Emblems:"
 msgstr "Àwọn Àmì Àpẹẹrẹ:"
 
-#: ../src/caja-property-browser.c:2450
+#: ../src/caja-property-browser.c:2382
 msgid "_Remove a Pattern..."
 msgstr "_Yọ Bátànì Kúrò..."
 
-#: ../src/caja-property-browser.c:2453
+#: ../src/caja-property-browser.c:2385
 msgid "_Remove a Color..."
 msgstr "_Yọ Àwọ̀ Kúrò..."
 
-#: ../src/caja-property-browser.c:2456
+#: ../src/caja-property-browser.c:2388
 msgid "_Remove an Emblem..."
 msgstr "_Yọ Àmì Àpẹẹrẹ Kúrò..."
 
-#: ../src/caja-query-editor.c:136
+#: ../src/caja-query-editor.c:131
 msgid "File Type"
 msgstr ""
 
-#: ../src/caja-query-editor.c:286
+#: ../src/caja-query-editor.c:277
 msgid "Select folder to search in"
 msgstr ""
 
-#: ../src/caja-query-editor.c:382
+#: ../src/caja-query-editor.c:373
 msgid "Documents"
 msgstr "Àwọn Àkọsílẹ̀"
 
-#: ../src/caja-query-editor.c:402
+#: ../src/caja-query-editor.c:393
 msgid "Music"
 msgstr ""
 
-#: ../src/caja-query-editor.c:418
+#: ../src/caja-query-editor.c:409
 msgid "Video"
 msgstr ""
 
-#: ../src/caja-query-editor.c:436
+#: ../src/caja-query-editor.c:427
 msgid "Picture"
 msgstr ""
 
-#: ../src/caja-query-editor.c:458
+#: ../src/caja-query-editor.c:449
 msgid "Illustration"
 msgstr ""
 
-#: ../src/caja-query-editor.c:474
+#: ../src/caja-query-editor.c:465
 msgid "Spreadsheet"
 msgstr ""
 
-#: ../src/caja-query-editor.c:492
+#: ../src/caja-query-editor.c:483
 msgid "Presentation"
 msgstr ""
 
-#: ../src/caja-query-editor.c:503
+#: ../src/caja-query-editor.c:494
 msgid "Pdf / Postscript"
 msgstr ""
 
-#: ../src/caja-query-editor.c:513
+#: ../src/caja-query-editor.c:504
 msgid "Text File"
 msgstr ""
 
-#: ../src/caja-query-editor.c:597
+#: ../src/caja-query-editor.c:588
 msgid "Select type"
 msgstr ""
 
-#: ../src/caja-query-editor.c:684
+#: ../src/caja-query-editor.c:675
 msgid "Any"
 msgstr ""
 
-#: ../src/caja-query-editor.c:700
+#: ../src/caja-query-editor.c:691
 msgid "Other Type..."
 msgstr ""
 
-#: ../src/caja-query-editor.c:1004
+#: ../src/caja-query-editor.c:995
 msgid "Remove this criterion from the search"
 msgstr ""
 
-#: ../src/caja-query-editor.c:1055
+#: ../src/caja-query-editor.c:1042
 msgid "Search Folder"
 msgstr ""
 
-#: ../src/caja-query-editor.c:1061
+#: ../src/caja-query-editor.c:1048
 msgid "Edit"
 msgstr "Ṣàyẹ̀wò"
 
-#: ../src/caja-query-editor.c:1069
+#: ../src/caja-query-editor.c:1056
 msgid "Edit the saved search"
 msgstr ""
 
-#: ../src/caja-query-editor.c:1101
+#: ../src/caja-query-editor.c:1088
 msgid "Add a new criterion to this search"
 msgstr ""
 
-#: ../src/caja-query-editor.c:1107
+#: ../src/caja-query-editor.c:1094
 msgid "Go"
 msgstr ""
 
-#: ../src/caja-query-editor.c:1111
+#: ../src/caja-query-editor.c:1098
 msgid "Reload"
 msgstr ""
 
-#: ../src/caja-query-editor.c:1116
+#: ../src/caja-query-editor.c:1103
 msgid "Perform or update the search"
 msgstr ""
 
-#: ../src/caja-query-editor.c:1137
+#: ../src/caja-query-editor.c:1124
 msgid "_Search for:"
 msgstr ""
 
-#: ../src/caja-query-editor.c:1166
+#: ../src/caja-query-editor.c:1153
 msgid "Search results"
 msgstr ""
 
-#: ../src/caja-search-bar.c:193
+#: ../src/caja-search-bar.c:170
 msgid "Search:"
 msgstr ""
 
-#: ../src/caja-side-pane.c:425
+#: ../src/caja-side-pane.c:405
 msgid "Close the side pane"
 msgstr "Ti péènì ẹgbẹ́ náà"
 
 #. name, stock id, label
-#: ../src/caja-spatial-window.c:951
+#: ../src/caja-spatial-window.c:940
 msgid "_Places"
 msgstr "_Àwọn Ibi"
 
 #. name, stock id, label
-#: ../src/caja-spatial-window.c:953
+#: ../src/caja-spatial-window.c:942
 msgid "Open _Location..."
 msgstr "Ṣí _Àyè..."
 
 #. name, stock id, label
-#: ../src/caja-spatial-window.c:958
+#: ../src/caja-spatial-window.c:947
 msgid "Close P_arent Folders"
 msgstr "Ti Àwọn Fódà Ò_bí"
 
-#: ../src/caja-spatial-window.c:959
+#: ../src/caja-spatial-window.c:948
 msgid "Close this folder's parents"
 msgstr "Ti àwọn òbí fódà yìí"
 
 #. name, stock id, label
-#: ../src/caja-spatial-window.c:963
+#: ../src/caja-spatial-window.c:952
 msgid "Clos_e All Folders"
 msgstr "Ti_ Gbogbo Àwọn Fódà"
 
-#: ../src/caja-spatial-window.c:964
+#: ../src/caja-spatial-window.c:953
 msgid "Close all folder windows"
 msgstr "Ti gbogbo àwọn fèrèsé fódà"
 
-#: ../src/caja-spatial-window.c:976
+#: ../src/caja-spatial-window.c:965
 msgid "Locate documents and folders on this computer by name or content"
 msgstr ""
 
-#: ../src/caja-trash-bar.c:215
+#: ../src/caja-trash-bar.c:211
 msgid "Restore Selected Items"
 msgstr ""
 
-#: ../src/caja-trash-bar.c:221
+#: ../src/caja-trash-bar.c:217
 msgid "Restore selected items to their original position"
 msgstr ""
 
@@ -7163,53 +7097,53 @@ msgstr "Ṣé o fẹ́ yọ àwọn àmi-ìwé tí kò ní sí ní à
 msgid "Bookmark for Nonexistent Location"
 msgstr "Àmì-ìwé fún Àyè Tí Kò Sí"
 
-#: ../src/caja-window-manage-views.c:824
+#: ../src/caja-window-manage-views.c:818
 msgid "You can choose another view or go to a different location."
 msgstr "O lè yan òye mìíràn tàbí kí o lọ sí àyè mìíràn."
 
-#: ../src/caja-window-manage-views.c:843
+#: ../src/caja-window-manage-views.c:837
 msgid "The location cannot be displayed with this viewer."
 msgstr "A kò lè ṣàfihàn àyè pẹ̀lú awòye yìí."
 
-#: ../src/caja-window-manage-views.c:1439
+#: ../src/caja-window-manage-views.c:1426
 msgid "Content View"
 msgstr "Òye Àkóónú"
 
-#: ../src/caja-window-manage-views.c:1440
+#: ../src/caja-window-manage-views.c:1427
 msgid "View of the current folder"
 msgstr "Òye fódà lọ́wọ́lọ́wọ́"
 
-#: ../src/caja-window-manage-views.c:2131
+#: ../src/caja-window-manage-views.c:2118
 msgid "Caja has no installed viewer capable of displaying the folder."
 msgstr "Caja kò ní awòye kankan nípò tí ó lágbára láti ṣàfihàn fódà náà."
 
-#: ../src/caja-window-manage-views.c:2139
+#: ../src/caja-window-manage-views.c:2126
 msgid "The location is not a folder."
 msgstr "Àyè náà kìí ṣe fódà."
 
-#: ../src/caja-window-manage-views.c:2148
+#: ../src/caja-window-manage-views.c:2135
 #, c-format
 msgid "Could not find \"%s\"."
 msgstr ""
 
-#: ../src/caja-window-manage-views.c:2151
+#: ../src/caja-window-manage-views.c:2138
 msgid "Please check the spelling and try again."
 msgstr "Jọ̀wọ́ yẹ sípẹ́lì wò kí o sì gbìyànjú lẹ́ẹ̀kan si."
 
-#: ../src/caja-window-manage-views.c:2160
+#: ../src/caja-window-manage-views.c:2147
 #, c-format
 msgid "Caja cannot handle \"%s\" locations."
 msgstr ""
 
-#: ../src/caja-window-manage-views.c:2165
+#: ../src/caja-window-manage-views.c:2152
 msgid "Caja cannot handle this kind of location."
 msgstr ""
 
-#: ../src/caja-window-manage-views.c:2172
+#: ../src/caja-window-manage-views.c:2159
 msgid "Unable to mount the location."
 msgstr ""
 
-#: ../src/caja-window-manage-views.c:2178
+#: ../src/caja-window-manage-views.c:2165
 msgid "Access was denied."
 msgstr "Kàn fun láyè"
 
@@ -7217,17 +7151,17 @@ msgstr "Kàn fun láyè"
 #. * the code that guesses web addresses when there's no initial "/".
 #. * But this case is also hit for legitimate web addresses when
 #. * the proxy is set up wrong.
-#: ../src/caja-window-manage-views.c:2187
+#: ../src/caja-window-manage-views.c:2174
 #, c-format
 msgid "Could not display \"%s\", because the host could not be found."
 msgstr ""
 
-#: ../src/caja-window-manage-views.c:2189
+#: ../src/caja-window-manage-views.c:2176
 msgid ""
 "Check that the spelling is correct and that your proxy settings are correct."
 msgstr "Yẹ̀ẹ́wò kóo ri pé sípẹ́lì náà tọ̀nà kí àwọn ààtò adúrófún rẹ náà sì tọ̀nà."
 
-#: ../src/caja-window-manage-views.c:2205
+#: ../src/caja-window-manage-views.c:2192
 #, c-format
 msgid ""
 "Error: %s\n"
@@ -7386,8 +7320,8 @@ msgid "Zoom _In"
 msgstr "Fẹ̀ẹ́ _Sínú"
 
 #. tooltip
-#: ../src/caja-window-menus.c:857 ../src/caja-zoom-control.c:102
-#: ../src/caja-zoom-control.c:398
+#: ../src/caja-window-menus.c:857 ../src/caja-zoom-control.c:96
+#: ../src/caja-zoom-control.c:384
 msgid "Increase the view size"
 msgstr ""
 
@@ -7398,8 +7332,8 @@ msgid "Zoom _Out"
 msgstr "Fẹ̀ẹ́ _Síta"
 
 #. tooltip
-#: ../src/caja-window-menus.c:872 ../src/caja-zoom-control.c:103
-#: ../src/caja-zoom-control.c:336
+#: ../src/caja-window-menus.c:872 ../src/caja-zoom-control.c:97
+#: ../src/caja-zoom-control.c:322
 msgid "Decrease the view size"
 msgstr ""
 
@@ -7410,8 +7344,8 @@ msgid "Normal Si_ze"
 msgstr "Ìw_ọ̀n Déédéé"
 
 #. tooltip
-#: ../src/caja-window-menus.c:882 ../src/caja-zoom-control.c:104
-#: ../src/caja-zoom-control.c:356
+#: ../src/caja-window-menus.c:882 ../src/caja-zoom-control.c:98
+#: ../src/caja-zoom-control.c:342
 msgid "Use the normal view size"
 msgstr ""
 
@@ -7484,68 +7418,68 @@ msgstr "_Òkè"
 msgid "_Home"
 msgstr "_Ilé"
 
-#: ../src/caja-x-content-bar.c:74
+#: ../src/caja-x-content-bar.c:70
 msgid "These files are on an Audio CD."
 msgstr ""
 
-#: ../src/caja-x-content-bar.c:78
+#: ../src/caja-x-content-bar.c:74
 msgid "These files are on an Audio DVD."
 msgstr ""
 
-#: ../src/caja-x-content-bar.c:82
+#: ../src/caja-x-content-bar.c:78
 msgid "These files are on a Video DVD."
 msgstr ""
 
-#: ../src/caja-x-content-bar.c:86
+#: ../src/caja-x-content-bar.c:82
 msgid "These files are on a Video CD."
 msgstr ""
 
-#: ../src/caja-x-content-bar.c:90
+#: ../src/caja-x-content-bar.c:86
 msgid "These files are on a Super Video CD."
 msgstr ""
 
-#: ../src/caja-x-content-bar.c:94
+#: ../src/caja-x-content-bar.c:90
 msgid "These files are on a Photo CD."
 msgstr ""
 
-#: ../src/caja-x-content-bar.c:98
+#: ../src/caja-x-content-bar.c:94
 msgid "These files are on a Picture CD."
 msgstr ""
 
-#: ../src/caja-x-content-bar.c:102
+#: ../src/caja-x-content-bar.c:98
 msgid "The media contains digital photos."
 msgstr ""
 
-#: ../src/caja-x-content-bar.c:106
+#: ../src/caja-x-content-bar.c:102
 msgid "These files are on a digital audio player."
 msgstr ""
 
-#: ../src/caja-x-content-bar.c:110
+#: ../src/caja-x-content-bar.c:106
 msgid "The media contains software."
 msgstr ""
 
 #. fallback to generic greeting
-#: ../src/caja-x-content-bar.c:115
+#: ../src/caja-x-content-bar.c:111
 #, c-format
 msgid "The media has been detected as \"%s\"."
 msgstr ""
 
-#: ../src/caja-zoom-control.c:88
+#: ../src/caja-zoom-control.c:82
 msgid "Zoom In"
 msgstr "Fẹ̀ẹ́ Sinú"
 
-#: ../src/caja-zoom-control.c:89
+#: ../src/caja-zoom-control.c:83
 msgid "Zoom Out"
 msgstr "Fẹ̀ẹ́ Síta"
 
-#: ../src/caja-zoom-control.c:90
+#: ../src/caja-zoom-control.c:84
 msgid "Zoom to Default"
 msgstr "Fẹ̀ẹ́ sí Ìpéwọ̀n"
 
-#: ../src/caja-zoom-control.c:962
+#: ../src/caja-zoom-control.c:926
 msgid "Zoom"
 msgstr "Fẹ̀ẹ́"
 
-#: ../src/caja-zoom-control.c:967
+#: ../src/caja-zoom-control.c:931
 msgid "Set the zoom level of the current view"
 msgstr "Ṣàgbékalẹ̀ ìpele ìfẹ òye lọ́wọ́lọ́wọ́"