1 files changed, 1359 insertions, 1146 deletions
diff --git a/po/yo.po b/po/yo.po
index 654f580c..2ccf31ee 100644
--- a/po/yo.po
+++ b/po/yo.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: MATE Desktop Environment\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-15 13:19+0300\n"
-"PO-Revision-Date: 2018-01-09 15:11+0000\n"
-"Last-Translator: Vlad Orlov <[email protected]>\n"
-"Language-Team: Yoruba (http://www.transifex.com/mate/MATE/language/yo/)\n"
+"POT-Creation-Date: 2018-03-12 16:49+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>, 2018\n"
+"Language-Team: Yoruba (https://www.transifex.com/mate/teams/13566/yo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -283,7 +284,7 @@ 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:68 ../src/caja-emblem-sidebar.c:982
-#: ../src/caja-property-browser.c:1948
+#: ../src/caja-property-browser.c:1935
 msgid "Erase"
 msgstr "Paárẹ́"
 
@@ -309,7 +310,7 @@ msgstr ""
 #: ../data/caja-browser.desktop.in.in.h:1 ../data/caja.desktop.in.in.h:1
 #: ../data/caja-folder-handler.desktop.in.in.h:1
 #: ../src/caja-spatial-window.c:373 ../src/caja-window-menus.c:535
-#: ../src/caja-window.c:172
+#: ../src/caja-window.c:163
 msgid "Caja"
 msgstr "Caja"
 
@@ -327,7 +328,7 @@ msgid "Computer"
 msgstr "Kọ̀ǹpútà"
 
 #. tooltip
-#: ../data/caja-computer.desktop.in.in.h:2 ../src/caja-window-menus.c:905
+#: ../data/caja-computer.desktop.in.in.h:2 ../src/caja-window-menus.c:897
 msgid ""
 "Browse all local and remote disks and folders accessible from this computer"
 msgstr ""
@@ -345,7 +346,7 @@ msgid "Change the behaviour and appearance of file manager windows"
 msgstr ""
 
 #: ../data/caja-folder-handler.desktop.in.in.h:2
-#: ../libcaja-private/caja-autorun.c:567
+#: ../libcaja-private/caja-autorun.c:568
 msgid "Open Folder"
 msgstr ""
 
@@ -355,7 +356,7 @@ msgstr "Fódà Ilé"
 
 #. tooltip
 #: ../data/caja-home.desktop.in.in.h:2 ../src/caja-places-sidebar.c:504
-#: ../src/caja-window-menus.c:900
+#: ../src/caja-window-menus.c:892
 msgid "Open your personal folder"
 msgstr ""
 
@@ -363,63 +364,86 @@ msgstr ""
 msgid "Saved search"
 msgstr ""
 
-#: ../eel/eel-canvas.c:1389 ../eel/eel-canvas.c:1390
+#: ../eel/eel-canvas.c:1310 ../eel/eel-canvas.c:1311
 msgid "X"
 msgstr ""
 
-#: ../eel/eel-canvas.c:1396 ../eel/eel-canvas.c:1397
+#: ../eel/eel-canvas.c:1317 ../eel/eel-canvas.c:1318
 msgid "Y"
 msgstr ""
 
-#: ../eel/eel-editable-label.c:332
+#: ../eel/eel-editable-label.c:327
 msgid "Text"
 msgstr ""
 
-#: ../eel/eel-editable-label.c:333
+#: ../eel/eel-editable-label.c:328
 msgid "The text of the label."
 msgstr ""
 
-#: ../eel/eel-editable-label.c:339
+#: ../eel/eel-editable-label.c:334
 msgid "Justification"
 msgstr ""
 
-#: ../eel/eel-editable-label.c:340
+#: ../eel/eel-editable-label.c:335
 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:348
+#: ../eel/eel-editable-label.c:343
 msgid "Line wrap"
 msgstr ""
 
-#: ../eel/eel-editable-label.c:349
+#: ../eel/eel-editable-label.c:344
 msgid "If set, wrap lines if the text becomes too wide."
 msgstr ""
 
-#: ../eel/eel-editable-label.c:356
+#: ../eel/eel-editable-label.c:351
 msgid "Cursor Position"
 msgstr ""
 
-#: ../eel/eel-editable-label.c:357
+#: ../eel/eel-editable-label.c:352
 msgid "The current position of the insertion cursor in chars."
 msgstr ""
 
-#: ../eel/eel-editable-label.c:366
+#: ../eel/eel-editable-label.c:361
 msgid "Selection Bound"
 msgstr ""
 
-#: ../eel/eel-editable-label.c:367
+#: ../eel/eel-editable-label.c:362
 msgid ""
 "The position of the opposite end of the selection from the cursor in chars."
 msgstr ""
 
-#: ../eel/eel-editable-label.c:3120
+#. name, icon name
+#. label, accelerator
+#: ../eel/eel-editable-label.c:3135 ../libcaja-private/caja-clipboard.c:455
+#: ../src/file-manager/fm-directory-view.c:7306
+#: ../src/file-manager/fm-directory-view.c:7473
+msgid "Cu_t"
+msgstr ""
+
+#. name, icon name
+#. label, accelerator
+#: ../eel/eel-editable-label.c:3137 ../libcaja-private/caja-clipboard.c:460
+#: ../src/file-manager/fm-directory-view.c:7310
+#: ../src/file-manager/fm-directory-view.c:7477
+msgid "_Copy"
+msgstr ""
+
+#. name, icon name
+#. label, accelerator
+#: ../eel/eel-editable-label.c:3139 ../libcaja-private/caja-clipboard.c:465
+#: ../src/file-manager/fm-directory-view.c:7314
+msgid "_Paste"
+msgstr ""
+
+#: ../eel/eel-editable-label.c:3142
 msgid "Select All"
 msgstr ""
 
-#: ../eel/eel-editable-label.c:3131
+#: ../eel/eel-editable-label.c:3153
 msgid "Input Methods"
 msgstr ""
 
@@ -427,160 +451,176 @@ msgstr ""
 msgid "Show more _details"
 msgstr ""
 
-#: ../eel/eel-stock-dialogs.c:213
+#: ../eel/eel-stock-dialogs.c:233
 msgid "You can stop this operation by clicking cancel."
 msgstr ""
 
+#: ../eel/eel-stock-dialogs.c:237 ../eel/eel-stock-dialogs.c:392
+#: ../eel/eel-stock-dialogs.c:593 ../libcaja-private/caja-autorun.c:1131
+#: ../libcaja-private/caja-file-conflict-dialog.c:655
+#: ../libcaja-private/caja-file-operations.c:186
+#: ../libcaja-private/caja-mime-actions.c:819
+#: ../libcaja-private/caja-mime-actions.c:1726
+#: ../libcaja-private/caja-open-with-dialog.c:944
+#: ../src/file-manager/fm-directory-view.c:10276
+#: ../src/caja-connect-server-dialog.c:1122 ../src/caja-location-dialog.c:194
+msgid "_Cancel"
+msgstr ""
+
+#: ../eel/eel-stock-dialogs.c:239 ../eel/eel-stock-dialogs.c:394
+#: ../eel/eel-stock-dialogs.c:598 ../libcaja-private/caja-autorun.c:1136
+#: ../libcaja-private/caja-mime-actions.c:1370
+msgid "_OK"
+msgstr ""
+
+#: ../eel/eel-stock-dialogs.c:600
+msgid "_Clear"
+msgstr ""
+
 #: ../eel/eel-vfs-extensions.c:96
 msgid " (invalid Unicode)"
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:517
+#: ../libcaja-private/caja-autorun.c:518
 msgid "No applications found"
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:536
+#: ../libcaja-private/caja-autorun.c:537
 msgid "Ask what to do"
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:552
+#: ../libcaja-private/caja-autorun.c:553
 msgid "Do Nothing"
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:600 ../src/caja-x-content-bar.c:148
+#: ../libcaja-private/caja-autorun.c:601 ../src/caja-x-content-bar.c:148
 #, c-format
 msgid "Open %s"
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:642
+#: ../libcaja-private/caja-autorun.c:643
 msgid "Open with other Application..."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1024
+#: ../libcaja-private/caja-autorun.c:1025
 msgid "You have just inserted an Audio CD."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1028
+#: ../libcaja-private/caja-autorun.c:1029
 msgid "You have just inserted an Audio DVD."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1032
+#: ../libcaja-private/caja-autorun.c:1033
 msgid "You have just inserted a Video DVD."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1036
+#: ../libcaja-private/caja-autorun.c:1037
 msgid "You have just inserted a Video CD."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1040
+#: ../libcaja-private/caja-autorun.c:1041
 msgid "You have just inserted a Super Video CD."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1044
+#: ../libcaja-private/caja-autorun.c:1045
 msgid "You have just inserted a blank CD."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1048
+#: ../libcaja-private/caja-autorun.c:1049
 msgid "You have just inserted a blank DVD."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1052
+#: ../libcaja-private/caja-autorun.c:1053
 msgid "You have just inserted a blank Blu-Ray disc."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1056
+#: ../libcaja-private/caja-autorun.c:1057
 msgid "You have just inserted a blank HD DVD."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1060
+#: ../libcaja-private/caja-autorun.c:1061
 msgid "You have just inserted a Photo CD."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1064
+#: ../libcaja-private/caja-autorun.c:1065
 msgid "You have just inserted a Picture CD."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1068
+#: ../libcaja-private/caja-autorun.c:1069
 msgid "You have just inserted a medium with digital photos."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1072
+#: ../libcaja-private/caja-autorun.c:1073
 msgid "You have just inserted a digital audio player."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1076
+#: ../libcaja-private/caja-autorun.c:1077
 msgid ""
 "You have just inserted a medium with software intended to be automatically "
 "started."
 msgstr ""
 
 #. fallback to generic greeting
-#: ../libcaja-private/caja-autorun.c:1081
+#: ../libcaja-private/caja-autorun.c:1082
 msgid "You have just inserted a medium."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1083
+#: ../libcaja-private/caja-autorun.c:1084
 msgid "Choose what application to launch."
 msgstr ""
 
-#: ../libcaja-private/caja-autorun.c:1097
+#: ../libcaja-private/caja-autorun.c:1094
 #, 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:1129
+#: ../libcaja-private/caja-autorun.c:1122
 msgid "_Always perform this action"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
 #. add the "Eject" menu item
-#: ../libcaja-private/caja-autorun.c:1146
-#: ../src/file-manager/fm-directory-view.c:7411
-#: ../src/file-manager/fm-directory-view.c:7439
-#: ../src/file-manager/fm-directory-view.c:7520
+#: ../libcaja-private/caja-autorun.c:1145
+#: ../src/file-manager/fm-directory-view.c:7397
+#: ../src/file-manager/fm-directory-view.c:7425
+#: ../src/file-manager/fm-directory-view.c:7506
 #: ../src/file-manager/fm-tree-view.c:1382 ../src/caja-places-sidebar.c:2714
 msgid "_Eject"
 msgstr "_Yọkúrò"
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
 #. add the "Unmount" menu item
-#: ../libcaja-private/caja-autorun.c:1159
-#: ../src/file-manager/fm-directory-view.c:7407
-#: ../src/file-manager/fm-directory-view.c:7435
-#: ../src/file-manager/fm-directory-view.c:7516
+#: ../libcaja-private/caja-autorun.c:1158
+#: ../src/file-manager/fm-directory-view.c:7393
+#: ../src/file-manager/fm-directory-view.c:7421
+#: ../src/file-manager/fm-directory-view.c:7502
 #: ../src/file-manager/fm-tree-view.c:1373 ../src/caja-places-sidebar.c:2707
 msgid "_Unmount"
 msgstr ""
 
-#. name, stock id
-#. label, accelerator
 #. tooltip
 #: ../libcaja-private/caja-clipboard.c:456
 msgid "Cut the selected text to the clipboard"
 msgstr "Gé àyọkà tí a yàn náà lọ sí agbàròyìn dúró"
 
-#. name, stock id
-#. label, accelerator
 #. tooltip
 #: ../libcaja-private/caja-clipboard.c:461
 msgid "Copy the selected text to the clipboard"
 msgstr "Ṣẹ̀dà àyọkà tí a ti yàn náà lọ sí agbàròyìn dúró"
 
-#. name, stock id
-#. label, accelerator
 #. tooltip
 #: ../libcaja-private/caja-clipboard.c:466
 msgid "Paste the text stored on the clipboard"
 msgstr "Le ayọkà tí a fi pamọ́ sórí agbàròyìn dúró náà"
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
 #: ../libcaja-private/caja-clipboard.c:470
-#: ../src/file-manager/fm-directory-view.c:7340
+#: ../src/file-manager/fm-directory-view.c:7326
 msgid "Select _All"
 msgstr "Yan _Gbogbo wọn"
 
@@ -589,15 +629,15 @@ 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:381
+#: ../libcaja-private/caja-column-chooser.c:380
 msgid "Move _Up"
 msgstr "Lọ _Sókè"
 
-#: ../libcaja-private/caja-column-chooser.c:391
+#: ../libcaja-private/caja-column-chooser.c:390
 msgid "Move Dow_n"
 msgstr ""
 
-#: ../libcaja-private/caja-column-chooser.c:404
+#: ../libcaja-private/caja-column-chooser.c:403
 msgid "Use De_fault"
 msgstr ""
 
@@ -636,7 +676,7 @@ msgid "The type of the file."
 msgstr "Irúfẹ́ fáìlì náà."
 
 #: ../libcaja-private/caja-column-utilities.c:74
-#: ../src/caja-image-properties-page.c:288
+#: ../src/caja-image-properties-page.c:284
 msgid "Date Modified"
 msgstr "A tún Déètì Tò"
 
@@ -669,7 +709,7 @@ msgid "The group of the file."
 msgstr "Ẹgbẹ́ fáìlì náà."
 
 #: ../libcaja-private/caja-column-utilities.c:106
-#: ../src/file-manager/fm-properties-window.c:4750
+#: ../src/file-manager/fm-properties-window.c:4746
 msgid "Permissions"
 msgstr "Àwọn Ìyànda"
 
@@ -702,7 +742,7 @@ msgid "The SELinux security context of the file."
 msgstr ""
 
 #: ../libcaja-private/caja-column-utilities.c:138
-#: ../src/caja-image-properties-page.c:369 ../src/caja-query-editor.c:135
+#: ../src/caja-image-properties-page.c:365 ../src/caja-query-editor.c:135
 msgid "Location"
 msgstr ""
 
@@ -727,9 +767,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:631
-#: ../libcaja-private/caja-mime-application-chooser.c:444
-#: ../src/caja-property-browser.c:1995
+#: ../libcaja-private/caja-file-conflict-dialog.c:624
+#: ../libcaja-private/caja-mime-application-chooser.c:442
+#: ../src/caja-property-browser.c:1982
 msgid "Reset"
 msgstr ""
 
@@ -752,7 +792,7 @@ msgstr "Ilé %s"
 
 #: ../libcaja-private/caja-desktop-link.c:116
 msgid "Network Servers"
-msgstr ""
+msgstr "Àwọn Sáfà Alátagbà"
 
 #: ../libcaja-private/caja-desktop-link.c:119
 #: ../src/file-manager/fm-tree-view.c:1441 ../src/caja-places-sidebar.c:594
@@ -798,12 +838,16 @@ msgstr "A kò lè fi àmì àpẹẹrẹ náà sípò."
 
 #: ../libcaja-private/caja-emblem-utils.c:228
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
-msgstr "Dákun, ó ni láti sọ ní pàtó kókó-ọ̀rọ̀ tí kò ṣófo fún àmì àpẹẹrẹ tuntun."
+msgstr ""
+"Dákun, ó ni láti sọ ní pàtó kókó-ọ̀rọ̀ tí kò ṣófo fún àmì "
+"àpẹẹrẹ tuntun."
 
 #: ../libcaja-private/caja-emblem-utils.c:235
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
-msgstr "Dákun, àwọn lẹ́tà,àwọn ààyè àti àwọn nọ́ńbà nìkan ni àwọn kókó-ọ̀rọ̀ àmì àpẹẹrẹ lè gbà."
+msgstr ""
+"Dákun, àwọn lẹ́tà,àwọn ààyè àti àwọn nọ́ńbà nìkan ni àwọn "
+"kókó-ọ̀rọ̀ àmì àpẹẹrẹ lè gbà."
 
 #. this really should never happen, as a user has no idea
 #. * what a keyword is, and people should be passing a unique
@@ -826,211 +870,221 @@ 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:144
+#: ../libcaja-private/caja-file-conflict-dialog.c:145
 #, c-format
 msgid "Merge folder \"%s\"?"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:148
+#: ../libcaja-private/caja-file-conflict-dialog.c:149
 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:154
+#: ../libcaja-private/caja-file-conflict-dialog.c:155
 #, c-format
 msgid "An older folder with the same name already exists in \"%s\"."
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:160
+#: ../libcaja-private/caja-file-conflict-dialog.c:161
 #, c-format
 msgid "A newer folder with the same name already exists in \"%s\"."
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:166
+#: ../libcaja-private/caja-file-conflict-dialog.c:167
 #, c-format
 msgid "Another folder with the same name already exists in \"%s\"."
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:173
+#: ../libcaja-private/caja-file-conflict-dialog.c:174
 msgid "Replacing it will remove all files in the folder."
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:175
+#: ../libcaja-private/caja-file-conflict-dialog.c:176
 #, c-format
 msgid "Replace folder \"%s\"?"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:177
+#: ../libcaja-private/caja-file-conflict-dialog.c:178
 #, c-format
 msgid "A folder with the same name already exists in \"%s\"."
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:184
+#: ../libcaja-private/caja-file-conflict-dialog.c:185
 #, c-format
 msgid "Replace file \"%s\"?"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:186
+#: ../libcaja-private/caja-file-conflict-dialog.c:187
 msgid "Replacing it will overwrite its content."
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:191
+#: ../libcaja-private/caja-file-conflict-dialog.c:192
 #, c-format
 msgid "An older file with the same name already exists in \"%s\"."
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:197
+#: ../libcaja-private/caja-file-conflict-dialog.c:198
 #, c-format
 msgid "A newer file with the same name already exists in \"%s\"."
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:203
+#: ../libcaja-private/caja-file-conflict-dialog.c:204
 #, c-format
 msgid "Another file with the same name already exists in \"%s\"."
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:279
+#: ../libcaja-private/caja-file-conflict-dialog.c:272
 msgid "Original folder"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:280
-#: ../libcaja-private/caja-file-conflict-dialog.c:319
+#: ../libcaja-private/caja-file-conflict-dialog.c:273
+#: ../libcaja-private/caja-file-conflict-dialog.c:312
 msgid "Items:"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:283
+#: ../libcaja-private/caja-file-conflict-dialog.c:276
 msgid "Original file"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:284
-#: ../libcaja-private/caja-file-conflict-dialog.c:323
-#: ../src/file-manager/fm-properties-window.c:3276
+#: ../libcaja-private/caja-file-conflict-dialog.c:277
+#: ../libcaja-private/caja-file-conflict-dialog.c:316
+#: ../src/file-manager/fm-properties-window.c:3272
 msgid "Size:"
 msgstr "Ìwọ̀n:"
 
 #. second row: type combobox
-#: ../libcaja-private/caja-file-conflict-dialog.c:289
-#: ../libcaja-private/caja-file-conflict-dialog.c:328
-#: ../src/file-manager/fm-properties-window.c:3258
-#: ../src/caja-connect-server-dialog.c:948
+#: ../libcaja-private/caja-file-conflict-dialog.c:282
+#: ../libcaja-private/caja-file-conflict-dialog.c:321
+#: ../src/file-manager/fm-properties-window.c:3254
+#: ../src/caja-connect-server-dialog.c:930
 msgid "Type:"
 msgstr "Irúfẹ́:"
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:292
-#: ../libcaja-private/caja-file-conflict-dialog.c:331
+#: ../libcaja-private/caja-file-conflict-dialog.c:285
+#: ../libcaja-private/caja-file-conflict-dialog.c:324
 msgid "Last modified:"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:318
+#: ../libcaja-private/caja-file-conflict-dialog.c:311
 msgid "Merge with"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:318
-#: ../libcaja-private/caja-file-conflict-dialog.c:322
+#: ../libcaja-private/caja-file-conflict-dialog.c:311
+#: ../libcaja-private/caja-file-conflict-dialog.c:315
 msgid "Replace with"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:354
+#: ../libcaja-private/caja-file-conflict-dialog.c:347
 msgid "Merge"
 msgstr ""
 
 #. Setup the expander for the rename action
-#: ../libcaja-private/caja-file-conflict-dialog.c:617
+#: ../libcaja-private/caja-file-conflict-dialog.c:610
 msgid "Select a new name for the _destination"
 msgstr ""
 
 #. Setup the diff button for text files
-#: ../libcaja-private/caja-file-conflict-dialog.c:642
+#: ../libcaja-private/caja-file-conflict-dialog.c:635
 msgid "Differences..."
 msgstr ""
 
 #. Setup the checkbox to apply the action to all files
-#: ../libcaja-private/caja-file-conflict-dialog.c:652
+#: ../libcaja-private/caja-file-conflict-dialog.c:645
 msgid "Apply this action to all files and folders"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:664
-#: ../libcaja-private/caja-file-operations.c:186
+#: ../libcaja-private/caja-file-conflict-dialog.c:660
+#: ../libcaja-private/caja-file-operations.c:187
 msgid "_Skip"
 msgstr "_Fòó"
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:669
+#: ../libcaja-private/caja-file-conflict-dialog.c:665
 msgid "Re_name"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:675
+#: ../libcaja-private/caja-file-conflict-dialog.c:671
 msgid "Replace"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:759
+#: ../libcaja-private/caja-file-conflict-dialog.c:755
 msgid "Merge Folder"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:759
-#: ../libcaja-private/caja-file-conflict-dialog.c:764
+#: ../libcaja-private/caja-file-conflict-dialog.c:755
+#: ../libcaja-private/caja-file-conflict-dialog.c:760
 msgid "File and Folder conflict"
 msgstr ""
 
-#: ../libcaja-private/caja-file-conflict-dialog.c:764
+#: ../libcaja-private/caja-file-conflict-dialog.c:760
 msgid "File conflict"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:187
+#: ../libcaja-private/caja-file-operations.c:188
 msgid "S_kip All"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:188
+#: ../libcaja-private/caja-file-operations.c:189
 msgid "_Retry"
 msgstr "_Tun gbèyẹ̀wò"
 
-#: ../libcaja-private/caja-file-operations.c:189
+#. name, icon name
+#. label, accelerator
+#: ../libcaja-private/caja-file-operations.c:190
+#: ../src/file-manager/fm-directory-view.c:7358
+#: ../src/file-manager/fm-directory-view.c:7490
+#: ../src/file-manager/fm-directory-view.c:8931
+#: ../src/file-manager/fm-tree-view.c:1360
+msgid "_Delete"
+msgstr "_Pajẹ"
+
+#: ../libcaja-private/caja-file-operations.c:191
 msgid "Delete _All"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:190
+#: ../libcaja-private/caja-file-operations.c:192
 msgid "_Replace"
 msgstr "_Pààrọ̀"
 
-#: ../libcaja-private/caja-file-operations.c:191
+#: ../libcaja-private/caja-file-operations.c:193
 msgid "Replace _All"
 msgstr "Pààrọ̀ _Gbogbo Wọn"
 
-#: ../libcaja-private/caja-file-operations.c:192
+#: ../libcaja-private/caja-file-operations.c:194
 msgid "_Merge"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:193
+#: ../libcaja-private/caja-file-operations.c:195
 msgid "Merge _All"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:194
+#: ../libcaja-private/caja-file-operations.c:196
 msgid "Copy _Anyway"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:308
+#: ../libcaja-private/caja-file-operations.c:310
 #, c-format
 msgid "%'d second"
 msgid_plural "%'d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-file-operations.c:313
-#: ../libcaja-private/caja-file-operations.c:324
+#: ../libcaja-private/caja-file-operations.c:315
+#: ../libcaja-private/caja-file-operations.c:326
 #, c-format
 msgid "%'d minute"
 msgid_plural "%'d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-file-operations.c:323
+#: ../libcaja-private/caja-file-operations.c:325
 #, c-format
 msgid "%'d hour"
 msgid_plural "%'d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-file-operations.c:331
+#: ../libcaja-private/caja-file-operations.c:333
 #, c-format
 msgid "approximately %'d hour"
 msgid_plural "approximately %'d hours"
@@ -1041,15 +1095,15 @@ msgstr[1] ""
 #. Note to localizers: convert file type string for file
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
-#: ../libcaja-private/caja-file-operations.c:407
+#: ../libcaja-private/caja-file-operations.c:409
 #: ../libcaja-private/caja-file.c:6526
-#: ../src/file-manager/fm-directory-view.c:10531
+#: ../src/file-manager/fm-directory-view.c:10520
 #, c-format
 msgid "Link to %s"
 msgstr ""
 
 #. appended to new link file
-#: ../libcaja-private/caja-file-operations.c:411
+#: ../libcaja-private/caja-file-operations.c:413
 #, c-format
 msgid "Another link to %s"
 msgstr ""
@@ -1057,25 +1111,25 @@ msgstr ""
 #. Localizers: Feel free to leave out the "st" suffix
 #. * if there's no way to do that nicely for a
 #. * particular language.
-#: ../libcaja-private/caja-file-operations.c:427
+#: ../libcaja-private/caja-file-operations.c:429
 #, c-format
 msgid "%'dst link to %s"
 msgstr ""
 
 #. appended to new link file
-#: ../libcaja-private/caja-file-operations.c:431
+#: ../libcaja-private/caja-file-operations.c:433
 #, c-format
 msgid "%'dnd link to %s"
 msgstr ""
 
 #. appended to new link file
-#: ../libcaja-private/caja-file-operations.c:435
+#: ../libcaja-private/caja-file-operations.c:437
 #, c-format
 msgid "%'drd link to %s"
 msgstr ""
 
 #. appended to new link file
-#: ../libcaja-private/caja-file-operations.c:439
+#: ../libcaja-private/caja-file-operations.c:441
 #, c-format
 msgid "%'dth link to %s"
 msgstr ""
@@ -1084,12 +1138,12 @@ msgstr ""
 #. * Feel free to leave out the st, nd, rd and th suffix or
 #. * make some or all of them match.
 #. localizers: tag used to detect the first copy of a file
-#: ../libcaja-private/caja-file-operations.c:478
+#: ../libcaja-private/caja-file-operations.c:480
 msgid " (copy)"
 msgstr " (ẹ̀dà)"
 
 #. localizers: tag used to detect the second copy of a file
-#: ../libcaja-private/caja-file-operations.c:480
+#: ../libcaja-private/caja-file-operations.c:482
 msgid " (another copy)"
 msgstr " (ẹ̀dà mìíràn)"
 
@@ -1097,36 +1151,36 @@ msgstr " (ẹ̀dà mìíràn)"
 #. localizers: tag used to detect the x12th copy of a file
 #. localizers: tag used to detect the x13th copy of a file
 #. localizers: tag used to detect the xxth copy of a file
-#: ../libcaja-private/caja-file-operations.c:483
 #: ../libcaja-private/caja-file-operations.c:485
 #: ../libcaja-private/caja-file-operations.c:487
-#: ../libcaja-private/caja-file-operations.c:497
+#: ../libcaja-private/caja-file-operations.c:489
+#: ../libcaja-private/caja-file-operations.c:499
 msgid "th copy)"
 msgstr "ẹ̀dà th)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: ../libcaja-private/caja-file-operations.c:490
+#: ../libcaja-private/caja-file-operations.c:492
 msgid "st copy)"
 msgstr "ẹ̀dà st)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: ../libcaja-private/caja-file-operations.c:492
+#: ../libcaja-private/caja-file-operations.c:494
 msgid "nd copy)"
 msgstr "ẹ̀dà nd)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: ../libcaja-private/caja-file-operations.c:494
+#: ../libcaja-private/caja-file-operations.c:496
 msgid "rd copy)"
 msgstr "ẹ̀dà rd)"
 
 #. localizers: appended to first file copy
-#: ../libcaja-private/caja-file-operations.c:511
+#: ../libcaja-private/caja-file-operations.c:513
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (ẹ̀dà)%s"
 
 #. localizers: appended to second file copy
-#: ../libcaja-private/caja-file-operations.c:513
+#: ../libcaja-private/caja-file-operations.c:515
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (ẹ̀dà mìíràn)%s"
@@ -1135,10 +1189,10 @@ msgstr "%s (ẹ̀dà mìíràn)%s"
 #. localizers: appended to x12th file copy
 #. localizers: appended to x13th file copy
 #. localizers: appended to xxth file copy
-#: ../libcaja-private/caja-file-operations.c:516
 #: ../libcaja-private/caja-file-operations.c:518
 #: ../libcaja-private/caja-file-operations.c:520
-#: ../libcaja-private/caja-file-operations.c:534
+#: ../libcaja-private/caja-file-operations.c:522
+#: ../libcaja-private/caja-file-operations.c:536
 #, c-format
 msgid "%s (%'dth copy)%s"
 msgstr ""
@@ -1149,39 +1203,39 @@ msgstr ""
 #. translated
 #. * strings look like "%s (copy %'d)%s".
 #. localizers: appended to x1st file copy
-#: ../libcaja-private/caja-file-operations.c:528
+#: ../libcaja-private/caja-file-operations.c:530
 #, c-format
 msgid "%s (%'dst copy)%s"
 msgstr ""
 
 #. localizers: appended to x2nd file copy
-#: ../libcaja-private/caja-file-operations.c:530
+#: ../libcaja-private/caja-file-operations.c:532
 #, c-format
 msgid "%s (%'dnd copy)%s"
 msgstr ""
 
 #. localizers: appended to x3rd file copy
-#: ../libcaja-private/caja-file-operations.c:532
+#: ../libcaja-private/caja-file-operations.c:534
 #, c-format
 msgid "%s (%'drd copy)%s"
 msgstr ""
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: ../libcaja-private/caja-file-operations.c:632
+#: ../libcaja-private/caja-file-operations.c:634
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: ../libcaja-private/caja-file-operations.c:640
+#: ../libcaja-private/caja-file-operations.c:642
 #, c-format
 msgid " (%'d"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:1354
+#: ../libcaja-private/caja-file-operations.c:1362
 msgid "Are you sure you want to permanently delete \"%B\" from the trash?"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:1357
+#: ../libcaja-private/caja-file-operations.c:1365
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %'d selected item from the "
@@ -1192,31 +1246,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-file-operations.c:1367
-#: ../libcaja-private/caja-file-operations.c:1433
+#: ../libcaja-private/caja-file-operations.c:1375
+#: ../libcaja-private/caja-file-operations.c:1441
 msgid "If you delete an item, it will be permanently lost."
 msgstr "Tí o bá pa wúnrẹ̀n kan je, ó máa sọnù ráúráú."
 
-#: ../libcaja-private/caja-file-operations.c:1387
+#: ../libcaja-private/caja-file-operations.c:1395
 msgid "Empty all items from Trash?"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:1391
+#: ../libcaja-private/caja-file-operations.c:1399
 msgid "All items in the Trash will be permanently deleted."
 msgstr ""
 
 #. Empty Trash menu item
-#: ../libcaja-private/caja-file-operations.c:1394
-#: ../libcaja-private/caja-file-operations.c:2320
+#: ../libcaja-private/caja-file-operations.c:1402
+#: ../libcaja-private/caja-file-operations.c:2333
 #: ../src/caja-places-sidebar.c:2751 ../src/caja-trash-bar.c:197
 msgid "Empty _Trash"
 msgstr "Da _Pàǹtí Nù"
 
-#: ../libcaja-private/caja-file-operations.c:1421
+#: ../libcaja-private/caja-file-operations.c:1429
 msgid "Are you sure you want to permanently delete \"%B\"?"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:1424
+#: ../libcaja-private/caja-file-operations.c:1432
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
 msgid_plural ""
@@ -1224,289 +1278,290 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-file-operations.c:1463
+#: ../libcaja-private/caja-file-operations.c:1471
 msgid "Are you sure you want to trash \"%B\"?"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:1466
+#: ../libcaja-private/caja-file-operations.c:1474
 #, c-format
 msgid "Are you sure you want to trash the %'d selected item?"
 msgid_plural "Are you sure you want to trash the %'d selected items?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-file-operations.c:1475
+#: ../libcaja-private/caja-file-operations.c:1483
 msgid "Items moved to the trash may be recovered until the trash is emptied."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:1478
+#: ../libcaja-private/caja-file-operations.c:1486
 msgid "Move to _Trash"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:1509
+#: ../libcaja-private/caja-file-operations.c:1517
 #, c-format
 msgid "%'d file left to delete"
 msgid_plural "%'d files left to delete"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-file-operations.c:1515
+#: ../libcaja-private/caja-file-operations.c:1523
 msgid "Deleting files"
 msgstr "Ìpa àwọn fáìlì jẹ"
 
 #. To translators: %T will expand to a time like "2 minutes".
 #. * The singular/plural form will be used depending on the remaining time
 #. (i.e. the %T argument).
-#: ../libcaja-private/caja-file-operations.c:1529
+#: ../libcaja-private/caja-file-operations.c:1537
 msgid "%T left"
 msgid_plural "%T left"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-file-operations.c:1596
-#: ../libcaja-private/caja-file-operations.c:1630
-#: ../libcaja-private/caja-file-operations.c:1669
-#: ../libcaja-private/caja-file-operations.c:1746
-#: ../libcaja-private/caja-file-operations.c:2565
+#: ../libcaja-private/caja-file-operations.c:1604
+#: ../libcaja-private/caja-file-operations.c:1638
+#: ../libcaja-private/caja-file-operations.c:1677
+#: ../libcaja-private/caja-file-operations.c:1754
+#: ../libcaja-private/caja-file-operations.c:2579
 msgid "Error while deleting."
 msgstr "Àṣìṣe nígbà ìpajẹ."
 
-#: ../libcaja-private/caja-file-operations.c:1600
+#: ../libcaja-private/caja-file-operations.c:1608
 msgid ""
 "Files in the folder \"%B\" cannot be deleted because you do not have "
 "permissions to see them."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:1603
-#: ../libcaja-private/caja-file-operations.c:2625
-#: ../libcaja-private/caja-file-operations.c:3607
+#: ../libcaja-private/caja-file-operations.c:1611
+#: ../libcaja-private/caja-file-operations.c:2639
+#: ../libcaja-private/caja-file-operations.c:3621
 msgid ""
 "There was an error getting information about the files in the folder \"%B\"."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:1612
-#: ../libcaja-private/caja-file-operations.c:3616
+#: ../libcaja-private/caja-file-operations.c:1620
+#: ../libcaja-private/caja-file-operations.c:3630
 msgid "_Skip files"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:1633
+#: ../libcaja-private/caja-file-operations.c:1641
 msgid ""
 "The folder \"%B\" cannot be deleted because you do not have permissions to "
 "read it."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:1636
-#: ../libcaja-private/caja-file-operations.c:2664
-#: ../libcaja-private/caja-file-operations.c:3652
+#: ../libcaja-private/caja-file-operations.c:1644
+#: ../libcaja-private/caja-file-operations.c:2678
+#: ../libcaja-private/caja-file-operations.c:3666
 msgid "There was an error reading the folder \"%B\"."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:1670
+#: ../libcaja-private/caja-file-operations.c:1678
 msgid "Could not remove the folder %B."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:1747
+#: ../libcaja-private/caja-file-operations.c:1755
 msgid "There was an error deleting %B."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:1827
+#: ../libcaja-private/caja-file-operations.c:1835
 msgid "Moving files to trash"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:1829
+#: ../libcaja-private/caja-file-operations.c:1837
 #, c-format
 msgid "%'d file left to trash"
 msgid_plural "%'d files left to trash"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-file-operations.c:1886
+#: ../libcaja-private/caja-file-operations.c:1894
 msgid "Cannot move file to trash, do you want to delete immediately?"
-msgstr "Kò lè gbé fáì́lì lọ sínú pàǹtí, ṣé o fẹ́ pa wọ́n jẹ kíákíá?"
+msgstr ""
+"Kò lè gbé fáì́lì lọ sínú pàǹtí, ṣé o fẹ́ pa wọ́n jẹ kíákíá?"
 
-#: ../libcaja-private/caja-file-operations.c:1887
+#: ../libcaja-private/caja-file-operations.c:1895
 msgid "The file \"%B\" cannot be moved to the trash."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:2071
+#: ../libcaja-private/caja-file-operations.c:2079
 msgid "Trashing Files"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:2073
+#: ../libcaja-private/caja-file-operations.c:2081
 msgid "Deleting Files"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:2150
+#: ../libcaja-private/caja-file-operations.c:2158
 msgid "Unable to eject %V"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:2152
+#: ../libcaja-private/caja-file-operations.c:2160
 msgid "Unable to unmount %V"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:2310
+#: ../libcaja-private/caja-file-operations.c:2318
 msgid "Do you want to empty the trash before you unmount?"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:2312
+#: ../libcaja-private/caja-file-operations.c:2320
 msgid ""
 "In order to regain the free space on this volume the trash must be emptied. "
 "All trashed items on the volume will be permanently lost."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:2318
+#: ../libcaja-private/caja-file-operations.c:2327
 msgid "Do _not Empty Trash"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:2434
+#: ../libcaja-private/caja-file-operations.c:2448
 #, c-format
 msgid "Unable to mount %s"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:2512
+#: ../libcaja-private/caja-file-operations.c:2526
 #, c-format
 msgid "Preparing to copy %'d file (%S)"
 msgid_plural "Preparing to copy %'d files (%S)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-file-operations.c:2518
+#: ../libcaja-private/caja-file-operations.c:2532
 #, c-format
 msgid "Preparing to move %'d file (%S)"
 msgid_plural "Preparing to move %'d files (%S)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-file-operations.c:2524
+#: ../libcaja-private/caja-file-operations.c:2538
 #, c-format
 msgid "Preparing to delete %'d file (%S)"
 msgid_plural "Preparing to delete %'d files (%S)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-file-operations.c:2530
+#: ../libcaja-private/caja-file-operations.c:2544
 #, c-format
 msgid "Preparing to trash %'d file"
 msgid_plural "Preparing to trash %'d files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-file-operations.c:2561
-#: ../libcaja-private/caja-file-operations.c:3459
-#: ../libcaja-private/caja-file-operations.c:3599
-#: ../libcaja-private/caja-file-operations.c:3644
+#: ../libcaja-private/caja-file-operations.c:2575
+#: ../libcaja-private/caja-file-operations.c:3473
+#: ../libcaja-private/caja-file-operations.c:3613
+#: ../libcaja-private/caja-file-operations.c:3658
 msgid "Error while copying."
 msgstr "Àṣìṣe nígbà ìṣẹ̀dà."
 
-#: ../libcaja-private/caja-file-operations.c:2563
-#: ../libcaja-private/caja-file-operations.c:3597
-#: ../libcaja-private/caja-file-operations.c:3642
+#: ../libcaja-private/caja-file-operations.c:2577
+#: ../libcaja-private/caja-file-operations.c:3611
+#: ../libcaja-private/caja-file-operations.c:3656
 msgid "Error while moving."
 msgstr "Àṣìṣe nígbà gbígbé."
 
-#: ../libcaja-private/caja-file-operations.c:2567
+#: ../libcaja-private/caja-file-operations.c:2581
 msgid "Error while moving files to trash."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:2622
+#: ../libcaja-private/caja-file-operations.c:2636
 msgid ""
 "Files in the folder \"%B\" cannot be handled because you do not have "
 "permissions to see them."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:2661
+#: ../libcaja-private/caja-file-operations.c:2675
 msgid ""
 "The folder \"%B\" cannot be handled because you do not have permissions to "
 "read it."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:2739
+#: ../libcaja-private/caja-file-operations.c:2753
 msgid ""
 "The file \"%B\" cannot be handled because you do not have permissions to "
 "read it."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:2742
+#: ../libcaja-private/caja-file-operations.c:2756
 msgid "There was an error getting information about \"%B\"."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:2842
-#: ../libcaja-private/caja-file-operations.c:2884
-#: ../libcaja-private/caja-file-operations.c:2917
-#: ../libcaja-private/caja-file-operations.c:2947
+#: ../libcaja-private/caja-file-operations.c:2856
+#: ../libcaja-private/caja-file-operations.c:2898
+#: ../libcaja-private/caja-file-operations.c:2931
+#: ../libcaja-private/caja-file-operations.c:2961
 msgid "Error while copying to \"%B\"."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:2846
+#: ../libcaja-private/caja-file-operations.c:2860
 msgid "You do not have permissions to access the destination folder."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:2848
+#: ../libcaja-private/caja-file-operations.c:2862
 msgid "There was an error getting information about the destination."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:2885
+#: ../libcaja-private/caja-file-operations.c:2899
 msgid "The destination is not a folder."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:2918
+#: ../libcaja-private/caja-file-operations.c:2932
 msgid ""
 "There is not enough space on the destination. Try to remove files to make "
 "space."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:2920
+#: ../libcaja-private/caja-file-operations.c:2934
 #, c-format
 msgid "There is %S available, but %S is required."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:2948
+#: ../libcaja-private/caja-file-operations.c:2962
 msgid "The destination is read-only."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:3007
+#: ../libcaja-private/caja-file-operations.c:3021
 msgid "Moving \"%B\" to \"%B\""
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:3008
+#: ../libcaja-private/caja-file-operations.c:3022
 msgid "Copying \"%B\" to \"%B\""
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:3013
+#: ../libcaja-private/caja-file-operations.c:3027
 msgid "Duplicating \"%B\""
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:3021
+#: ../libcaja-private/caja-file-operations.c:3035
 msgid "Moving %'d file (in \"%B\") to \"%B\""
 msgid_plural "Moving %'d files (in \"%B\") to \"%B\""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-file-operations.c:3025
+#: ../libcaja-private/caja-file-operations.c:3039
 msgid "Copying %'d file (in \"%B\") to \"%B\""
 msgid_plural "Copying %'d files (in \"%B\") to \"%B\""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-file-operations.c:3033
+#: ../libcaja-private/caja-file-operations.c:3047
 msgid "Duplicating %'d file (in \"%B\")"
 msgid_plural "Duplicating %'d files (in \"%B\")"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-file-operations.c:3043
+#: ../libcaja-private/caja-file-operations.c:3057
 msgid "Moving %'d file to \"%B\""
 msgid_plural "Moving %'d files to \"%B\""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-file-operations.c:3047
+#: ../libcaja-private/caja-file-operations.c:3061
 msgid "Copying %'d file to \"%B\""
 msgid_plural "Copying %'d files to \"%B\""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-file-operations.c:3053
+#: ../libcaja-private/caja-file-operations.c:3067
 #, c-format
 msgid "Duplicating %'d file"
 msgid_plural "Duplicating %'d files"
@@ -1515,7 +1570,7 @@ msgstr[1] ""
 
 #. To translators: %S will expand to a size like "2 bytes" or "3 MB", so
 #. something like "4 kb of 4 MB"
-#: ../libcaja-private/caja-file-operations.c:3073
+#: ../libcaja-private/caja-file-operations.c:3087
 #, c-format
 msgid "%S of %S"
 msgstr ""
@@ -1527,187 +1582,187 @@ msgstr ""
 #. *
 #. * The singular/plural form will be used depending on the remaining time
 #. (i.e. the %T argument).
-#: ../libcaja-private/caja-file-operations.c:3084
+#: ../libcaja-private/caja-file-operations.c:3098
 msgid "%S of %S — %T left (%S/sec)"
 msgid_plural "%S of %S — %T left (%S/sec)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-file-operations.c:3463
+#: ../libcaja-private/caja-file-operations.c:3477
 msgid ""
 "The folder \"%B\" cannot be copied because you do not have permissions to "
 "create it in the destination."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:3466
+#: ../libcaja-private/caja-file-operations.c:3480
 msgid "There was an error creating the folder \"%B\"."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:3604
+#: ../libcaja-private/caja-file-operations.c:3618
 msgid ""
 "Files in the folder \"%B\" cannot be copied because you do not have "
 "permissions to see them."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:3649
+#: ../libcaja-private/caja-file-operations.c:3663
 msgid ""
 "The folder \"%B\" cannot be copied because you do not have permissions to "
 "read it."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:3694
-#: ../libcaja-private/caja-file-operations.c:4388
-#: ../libcaja-private/caja-file-operations.c:4980
+#: ../libcaja-private/caja-file-operations.c:3708
+#: ../libcaja-private/caja-file-operations.c:4402
+#: ../libcaja-private/caja-file-operations.c:4994
 msgid "Error while moving \"%B\"."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:3695
+#: ../libcaja-private/caja-file-operations.c:3709
 msgid "Could not remove the source folder."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:3780
-#: ../libcaja-private/caja-file-operations.c:3821
-#: ../libcaja-private/caja-file-operations.c:4390
-#: ../libcaja-private/caja-file-operations.c:4462
+#: ../libcaja-private/caja-file-operations.c:3794
+#: ../libcaja-private/caja-file-operations.c:3835
+#: ../libcaja-private/caja-file-operations.c:4404
+#: ../libcaja-private/caja-file-operations.c:4476
 msgid "Error while copying \"%B\"."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:3781
+#: ../libcaja-private/caja-file-operations.c:3795
 #, c-format
 msgid "Could not remove files from the already existing folder %F."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:3822
+#: ../libcaja-private/caja-file-operations.c:3836
 #, c-format
 msgid "Could not remove the already existing file %F."
 msgstr ""
 
 #. the run_warning() frees all strings passed in automatically
-#: ../libcaja-private/caja-file-operations.c:4141
-#: ../libcaja-private/caja-file-operations.c:4826
+#: ../libcaja-private/caja-file-operations.c:4155
+#: ../libcaja-private/caja-file-operations.c:4840
 msgid "You cannot move a folder into itself."
 msgstr "O kò lè gbé fódà sínú ara rẹ̀."
 
-#: ../libcaja-private/caja-file-operations.c:4142
-#: ../libcaja-private/caja-file-operations.c:4827
+#: ../libcaja-private/caja-file-operations.c:4156
+#: ../libcaja-private/caja-file-operations.c:4841
 msgid "You cannot copy a folder into itself."
 msgstr "O kò lè ṣẹ̀dà fódà sínú ara rẹ̀."
 
-#: ../libcaja-private/caja-file-operations.c:4143
-#: ../libcaja-private/caja-file-operations.c:4828
+#: ../libcaja-private/caja-file-operations.c:4157
+#: ../libcaja-private/caja-file-operations.c:4842
 msgid "The destination folder is inside the source folder."
 msgstr "Inú fódà orísun ni fódà ibi tí wọ́n ń lọ wà."
 
 #. the run_warning() frees all strings passed in automatically
-#: ../libcaja-private/caja-file-operations.c:4174
+#: ../libcaja-private/caja-file-operations.c:4188
 msgid "You cannot move a file over itself."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:4175
+#: ../libcaja-private/caja-file-operations.c:4189
 msgid "You cannot copy a file over itself."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:4176
+#: ../libcaja-private/caja-file-operations.c:4190
 msgid "The source file would be overwritten by the destination."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:4392
+#: ../libcaja-private/caja-file-operations.c:4406
 #, c-format
 msgid "Could not remove the already existing file with the same name in %F."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:4463
+#: ../libcaja-private/caja-file-operations.c:4477
 #, c-format
 msgid "There was an error copying the file into %F."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:4709
+#: ../libcaja-private/caja-file-operations.c:4723
 msgid "Copying Files"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:4736
+#: ../libcaja-private/caja-file-operations.c:4750
 msgid "Preparing to Move to \"%B\""
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:4740
+#: ../libcaja-private/caja-file-operations.c:4754
 #, c-format
 msgid "Preparing to move %'d file"
 msgid_plural "Preparing to move %'d files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-file-operations.c:4981
+#: ../libcaja-private/caja-file-operations.c:4995
 #, c-format
 msgid "There was an error moving the file into %F."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:5251
+#: ../libcaja-private/caja-file-operations.c:5265
 msgid "Moving Files"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:5282
+#: ../libcaja-private/caja-file-operations.c:5296
 msgid "Creating links in \"%B\""
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:5286
+#: ../libcaja-private/caja-file-operations.c:5300
 #, c-format
 msgid "Making link to %'d file"
 msgid_plural "Making links to %'d files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-file-operations.c:5418
+#: ../libcaja-private/caja-file-operations.c:5432
 msgid "Error while creating link to %B."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:5420
+#: ../libcaja-private/caja-file-operations.c:5434
 msgid "Symbolic links only supported for local files"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:5423
+#: ../libcaja-private/caja-file-operations.c:5437
 msgid "The target doesn't support symbolic links."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:5426
+#: ../libcaja-private/caja-file-operations.c:5440
 #, c-format
 msgid "There was an error creating the symlink in %F."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:5742
+#: ../libcaja-private/caja-file-operations.c:5756
 msgid "Setting permissions"
 msgstr ""
 
 #. localizers: the initial name of a new folder
-#: ../libcaja-private/caja-file-operations.c:6001
+#: ../libcaja-private/caja-file-operations.c:6015
 msgid "untitled folder"
 msgstr "fódà tí kò ní àkọ́lé"
 
 #. localizers: the initial name of a new empty file
-#: ../libcaja-private/caja-file-operations.c:6009
+#: ../libcaja-private/caja-file-operations.c:6023
 msgid "new file"
 msgstr "fáìlì tuntun"
 
-#: ../libcaja-private/caja-file-operations.c:6181
+#: ../libcaja-private/caja-file-operations.c:6195
 msgid "Error while creating directory %B."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:6183
+#: ../libcaja-private/caja-file-operations.c:6197
 msgid "Error while creating file %B."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:6185
+#: ../libcaja-private/caja-file-operations.c:6199
 #, c-format
 msgid "There was an error creating the directory in %F."
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:6463
+#: ../libcaja-private/caja-file-operations.c:6477
 msgid "Emptying Trash"
 msgstr ""
 
-#: ../libcaja-private/caja-file-operations.c:6512
-#: ../libcaja-private/caja-file-operations.c:6553
-#: ../libcaja-private/caja-file-operations.c:6588
-#: ../libcaja-private/caja-file-operations.c:6623
+#: ../libcaja-private/caja-file-operations.c:6526
+#: ../libcaja-private/caja-file-operations.c:6567
+#: ../libcaja-private/caja-file-operations.c:6602
+#: ../libcaja-private/caja-file-operations.c:6637
 msgid "Unable to mark launcher trusted (executable)"
 msgstr ""
 
@@ -1784,7 +1839,7 @@ msgid "today at 00:00:00 PM"
 msgstr "lónìí ní 00:00:00 PM"
 
 #: ../libcaja-private/caja-file.c:4509
-#: ../src/caja-file-management-properties.c:527
+#: ../src/caja-file-management-properties.c:521
 msgid "today at %-I:%M:%S %p"
 msgstr "lónìí ní %-I:%M:%S %p"
 
@@ -1924,7 +1979,7 @@ msgid "Specified group '%s' doesn't exist"
 msgstr ""
 
 #: ../libcaja-private/caja-file.c:5950
-#: ../src/file-manager/fm-directory-view.c:2371
+#: ../src/file-manager/fm-directory-view.c:2357
 #, c-format
 msgid "%'u item"
 msgid_plural "%'u items"
@@ -1993,7 +2048,7 @@ msgstr "líǹkì"
 msgid "link (broken)"
 msgstr "líǹkì (dàrú)"
 
-#: ../libcaja-private/caja-icon-container.c:2920
+#: ../libcaja-private/caja-icon-container.c:2910
 msgid "The selection rectangle"
 msgstr "Oníhàmẹ́rìn gígùn ẹ̀yàn náà"
 
@@ -2016,13 +2071,13 @@ msgstr ""
 msgid "This link cannot be used, because its target \"%s\" doesn't exist."
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
 #: ../libcaja-private/caja-mime-actions.c:744
-#: ../src/file-manager/fm-directory-view.c:7368
-#: ../src/file-manager/fm-directory-view.c:7500
-#: ../src/file-manager/fm-directory-view.c:8599
-#: ../src/file-manager/fm-directory-view.c:8924
+#: ../src/file-manager/fm-directory-view.c:7354
+#: ../src/file-manager/fm-directory-view.c:7486
+#: ../src/file-manager/fm-directory-view.c:8585
+#: ../src/file-manager/fm-directory-view.c:8910
 #: ../src/file-manager/fm-tree-view.c:1346
 msgid "Mo_ve to Trash"
 msgstr "Gb_e lọ sínú Pàǹtí"
@@ -2045,31 +2100,31 @@ msgstr "Rọ́ọ̀nù nínú _Támínà"
 msgid "_Display"
 msgstr "_Ìṣàfihàn"
 
-#: ../libcaja-private/caja-mime-actions.c:818
+#: ../libcaja-private/caja-mime-actions.c:823
 #: ../src/caja-autorun-software.c:253
 msgid "_Run"
 msgstr "_Rọ́ọ̀nù"
 
-#: ../libcaja-private/caja-mime-actions.c:1170
+#: ../libcaja-private/caja-mime-actions.c:1175
 #: ../src/file-manager/fm-directory-view.c:653
 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̀?"
 
-#: ../libcaja-private/caja-mime-actions.c:1173
+#: ../libcaja-private/caja-mime-actions.c:1178
 #, c-format
 msgid "This will open %d separate tab."
 msgid_plural "This will open %d separate tabs."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libcaja-private/caja-mime-actions.c:1178 ../src/caja-location-bar.c:194
+#: ../libcaja-private/caja-mime-actions.c:1183 ../src/caja-location-bar.c:194
 #, c-format
 msgid "This will open %d separate window."
 msgid_plural "This will open %d separate windows."
-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."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../libcaja-private/caja-mime-actions.c:1256
+#: ../libcaja-private/caja-mime-actions.c:1261
 #: ../src/caja-window-manage-views.c:2101
 #: ../src/caja-window-manage-views.c:2109
 #: ../src/caja-window-manage-views.c:2129
@@ -2080,70 +2135,70 @@ msgstr[1] "Èyí á ṣí fèrèsé %d mìíràn."
 msgid "Could not display \"%s\"."
 msgstr ""
 
-#: ../libcaja-private/caja-mime-actions.c:1343
+#: ../libcaja-private/caja-mime-actions.c:1348
 msgid "The file is of an unknown type"
 msgstr ""
 
-#: ../libcaja-private/caja-mime-actions.c:1347
+#: ../libcaja-private/caja-mime-actions.c:1352
 #, c-format
 msgid "There is no application installed for %s files"
 msgstr ""
 
-#: ../libcaja-private/caja-mime-actions.c:1362
+#: ../libcaja-private/caja-mime-actions.c:1367
 msgid "_Select Application"
 msgstr ""
 
-#: ../libcaja-private/caja-mime-actions.c:1400
+#: ../libcaja-private/caja-mime-actions.c:1408
 msgid "There was an internal error trying to search for applications:"
 msgstr ""
 
-#: ../libcaja-private/caja-mime-actions.c:1402
+#: ../libcaja-private/caja-mime-actions.c:1410
 msgid "Unable to search for application"
 msgstr ""
 
-#: ../libcaja-private/caja-mime-actions.c:1528
+#: ../libcaja-private/caja-mime-actions.c:1536
 #, c-format
 msgid ""
 "There is no application installed for %s files.\n"
 "Do you want to search for an application to open this file?"
 msgstr ""
 
-#: ../libcaja-private/caja-mime-actions.c:1692
+#: ../libcaja-private/caja-mime-actions.c:1700
 msgid "Untrusted application launcher"
 msgstr ""
 
-#: ../libcaja-private/caja-mime-actions.c:1695
+#: ../libcaja-private/caja-mime-actions.c:1703
 #, c-format
 msgid ""
 "The application launcher \"%s\" has not been marked as trusted. If you do "
 "not know the source of this file, launching it may be unsafe."
 msgstr ""
 
-#: ../libcaja-private/caja-mime-actions.c:1710
+#: ../libcaja-private/caja-mime-actions.c:1718
 msgid "_Launch Anyway"
 msgstr ""
 
-#: ../libcaja-private/caja-mime-actions.c:1714
+#: ../libcaja-private/caja-mime-actions.c:1722
 msgid "Mark as _Trusted"
 msgstr ""
 
-#: ../libcaja-private/caja-mime-actions.c:2010
-#: ../libcaja-private/caja-mime-actions.c:2316
-#: ../src/file-manager/fm-directory-view.c:6386
+#: ../libcaja-private/caja-mime-actions.c:2022
+#: ../libcaja-private/caja-mime-actions.c:2328
+#: ../src/file-manager/fm-directory-view.c:6372
 msgid "Unable to mount location"
 msgstr ""
 
-#: ../libcaja-private/caja-mime-actions.c:2404
-#: ../src/file-manager/fm-directory-view.c:6560
+#: ../libcaja-private/caja-mime-actions.c:2416
+#: ../src/file-manager/fm-directory-view.c:6546
 msgid "Unable to start location"
 msgstr ""
 
-#: ../libcaja-private/caja-mime-actions.c:2497
+#: ../libcaja-private/caja-mime-actions.c:2509
 #, c-format
 msgid "Opening \"%s\"."
 msgstr "Ń Ṣí \"%s\"."
 
-#: ../libcaja-private/caja-mime-actions.c:2502
+#: ../libcaja-private/caja-mime-actions.c:2514
 #, c-format
 msgid "Opening %d item."
 msgid_plural "Opening %d items."
@@ -2173,26 +2228,37 @@ msgstr "Áíkànnù"
 msgid "Could not remove application"
 msgstr ""
 
-#: ../libcaja-private/caja-mime-application-chooser.c:561
+#: ../libcaja-private/caja-mime-application-chooser.c:420
+#: ../libcaja-private/caja-open-with-dialog.c:1116
+msgid "_Add"
+msgstr ""
+
+#: ../libcaja-private/caja-mime-application-chooser.c:430
+#: ../libcaja-private/caja-open-with-dialog.c:935
+#: ../src/caja-bookmarks-window.ui.h:4
+msgid "_Remove"
+msgstr ""
+
+#: ../libcaja-private/caja-mime-application-chooser.c:559
 msgid "No applications selected"
 msgstr ""
 
-#: ../libcaja-private/caja-mime-application-chooser.c:591
+#: ../libcaja-private/caja-mime-application-chooser.c:589
 #, c-format
 msgid "%s document"
 msgstr ""
 
-#: ../libcaja-private/caja-mime-application-chooser.c:601
-#: ../libcaja-private/caja-open-with-dialog.c:1081
+#: ../libcaja-private/caja-mime-application-chooser.c:599
+#: ../libcaja-private/caja-open-with-dialog.c:1075
 msgid "Unknown"
-msgstr ""
+msgstr "Àìmọ̀"
 
-#: ../libcaja-private/caja-mime-application-chooser.c:634
+#: ../libcaja-private/caja-mime-application-chooser.c:632
 #, c-format
 msgid "Select an application to open %s and other files of type \"%s\""
 msgstr ""
 
-#: ../libcaja-private/caja-mime-application-chooser.c:706
+#: ../libcaja-private/caja-mime-application-chooser.c:704
 #, c-format
 msgid "Open all files of type \"%s\" with:"
 msgstr ""
@@ -2224,80 +2290,77 @@ msgid "Select an Application"
 msgstr ""
 
 #: ../libcaja-private/caja-open-with-dialog.c:840
-#: ../src/file-manager/fm-properties-window.c:5073
+#: ../src/file-manager/fm-properties-window.c:5069
 msgid "Open With"
 msgstr "ṣí Pẹ̀lú"
 
-#: ../libcaja-private/caja-open-with-dialog.c:883
+#: ../libcaja-private/caja-open-with-dialog.c:878
 msgid "Select an application to view its description."
-msgstr ""
+msgstr "Yan ìṣàmúlò-ètò láti wòye àpèjúwe rẹ̀."
 
-#: ../libcaja-private/caja-open-with-dialog.c:913
+#: ../libcaja-private/caja-open-with-dialog.c:904
 msgid "_Use a custom command"
 msgstr ""
 
-#: ../libcaja-private/caja-open-with-dialog.c:930
+#: ../libcaja-private/caja-open-with-dialog.c:921
 msgid "_Browse..."
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../libcaja-private/caja-open-with-dialog.c:966
-#: ../src/file-manager/fm-directory-view.c:7284
-#: ../src/file-manager/fm-directory-view.c:8793
-#: ../src/file-manager/fm-tree-view.c:1267 ../src/caja-places-sidebar.c:2656
+#: ../libcaja-private/caja-open-with-dialog.c:960
+#: ../src/file-manager/fm-directory-view.c:7270
+#: ../src/file-manager/fm-directory-view.c:8779
+#: ../src/file-manager/fm-tree-view.c:1267 ../src/caja-location-dialog.c:199
+#: ../src/caja-places-sidebar.c:2656
 msgid "_Open"
 msgstr "_Ṣi"
 
 #. first %s is a filename and second %s is a file extension
-#: ../libcaja-private/caja-open-with-dialog.c:1051
+#: ../libcaja-private/caja-open-with-dialog.c:1045
 #, 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:1057
-#: ../libcaja-private/caja-open-with-dialog.c:1097
+#: ../libcaja-private/caja-open-with-dialog.c:1051
+#: ../libcaja-private/caja-open-with-dialog.c:1091
 #, c-format
 msgid "Open %s with:"
 msgstr ""
 
-#: ../libcaja-private/caja-open-with-dialog.c:1058
+#: ../libcaja-private/caja-open-with-dialog.c:1052
 #, 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:1069
+#: ../libcaja-private/caja-open-with-dialog.c:1063
 #, 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:1091
+#: ../libcaja-private/caja-open-with-dialog.c:1085
 #, c-format
 msgid "Open %s and other \"%s\" files with:"
 msgstr ""
 
 #. %s is a file type description
-#: ../libcaja-private/caja-open-with-dialog.c:1099
+#: ../libcaja-private/caja-open-with-dialog.c:1093
 #, c-format
 msgid "_Remember this application for \"%s\" files"
 msgstr ""
 
 #. Only in add mode
-#: ../libcaja-private/caja-open-with-dialog.c:1110
+#: ../libcaja-private/caja-open-with-dialog.c:1104
 #, c-format
 msgid "Open all \"%s\" files with:"
 msgstr ""
 
-#: ../libcaja-private/caja-open-with-dialog.c:1122
-msgid "_Add"
-msgstr ""
-
-#: ../libcaja-private/caja-open-with-dialog.c:1123
+#: ../libcaja-private/caja-open-with-dialog.c:1117
 msgid "Add Application"
 msgstr ""
 
@@ -2306,7 +2369,7 @@ msgid "Open Failed, would you like to choose another application?"
 msgstr "Ṣísí kùnà, ṣé wàá fẹ́ láti yan ìṣàmúlò-ètò mìíràn?"
 
 #: ../libcaja-private/caja-program-choosing.c:80
-#: ../libcaja-private/caja-program-choosing.c:117
+#: ../libcaja-private/caja-program-choosing.c:118
 #, c-format
 msgid "\"%s\" cannot open \"%s\" because \"%s\" cannot access files at \"%s\" locations."
 msgstr ""
@@ -2316,56 +2379,62 @@ msgid "Open Failed, would you like to choose another action?"
 msgstr "Ṣísí kùnà, ṣé wàá fẹ́ láti yan iṣẹ́ mìíràn?"
 
 #: ../libcaja-private/caja-program-choosing.c:88
-#: ../libcaja-private/caja-program-choosing.c:126
+#: ../libcaja-private/caja-program-choosing.c:127
 #, c-format
 msgid ""
 "The default action cannot open \"%s\" because it cannot access files at "
 "\"%s\" locations."
 msgstr ""
 
-#: ../libcaja-private/caja-program-choosing.c:120
+#: ../libcaja-private/caja-program-choosing.c:121
 msgid ""
 "No other applications are available to view this file. If you copy this file"
 " onto your computer, you may be able to open it."
 msgstr ""
 
-#: ../libcaja-private/caja-program-choosing.c:128
+#: ../libcaja-private/caja-program-choosing.c:129
 msgid ""
 "No other actions are available to view this file. If you copy this file onto"
 " your computer, you may be able to open it."
 msgstr ""
 
-#: ../libcaja-private/caja-program-choosing.c:458
+#: ../libcaja-private/caja-program-choosing.c:459
 msgid "Sorry, but you cannot execute commands from a remote site."
 msgstr ""
 
-#: ../libcaja-private/caja-program-choosing.c:460
+#: ../libcaja-private/caja-program-choosing.c:461
 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:472
-#: ../libcaja-private/caja-program-choosing.c:540
+#: ../libcaja-private/caja-program-choosing.c:473
+#: ../libcaja-private/caja-program-choosing.c:541
 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:501
-#: ../libcaja-private/caja-program-choosing.c:514
+#: ../libcaja-private/caja-program-choosing.c:502
+#: ../libcaja-private/caja-program-choosing.c:515
 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."
+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:502
+#: ../libcaja-private/caja-program-choosing.c:503
 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."
+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:515
+#: ../libcaja-private/caja-program-choosing.c:516
 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́."
+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:538
+#: ../libcaja-private/caja-program-choosing.c:539
 msgid "Details: "
 msgstr "Àwọn Àlàyé: "
 
@@ -2396,8 +2465,8 @@ 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:975
+#: ../libcaja-private/caja-progress-info.c:996
 msgid "Preparing"
 msgstr ""
 
@@ -2813,7 +2882,9 @@ msgstr ""
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:5
 msgid "Enables the classic Caja behavior, where all windows are browsers"
-msgstr "Ń mú ìṣesí Caja agbógoyọ ṣiṣẹ́, níbi tí gbogbo àwọn fèrèsé yóò jẹ́ àwọn awáròyìn"
+msgstr ""
+"Ń mú ìṣesí Caja agbógoyọ ṣiṣẹ́, níbi tí gbogbo àwọn fèrèsé yóò "
+"jẹ́ àwọn awáròyìn"
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:6
 msgid ""
@@ -2861,11 +2932,15 @@ msgid ""
 "If set to true, then Caja will have a feature allowing you to delete a file "
 "immediately and in-place, instead of moving it to the trash. This feature "
 "can be dangerous, so use caution."
-msgstr "Tí a bá gbekalẹ̀ sí òótọ́, a jẹ́ pé Caja máa ní àbùdá kan tí yóò máa fàyè gbà ẹ́ láti pa fáìlì jẹ kíákíá dípò gbígbe lọ sí inú pàǹtí. Àbùdá yìí lè ní ewu, kí o fẹ̀sọ̀ ṣe."
+msgstr ""
+"Tí a bá gbekalẹ̀ sí òótọ́, a jẹ́ pé Caja máa ní àbùdá kan tí "
+"yóò máa fàyè gbà ẹ́ láti pa fáìlì jẹ kíákíá dípò gbígbe lọ "
+"sí inú pàǹtí. Àbùdá yìí lè ní ewu, kí o fẹ̀sọ̀ ṣe."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:15
 msgid "When to show preview text in icons"
-msgstr "Ìgbà tí a ó fi àyọkà àkọ́gbéyẹ̀wò inú àwọn áíkànnù hàn"
+msgstr ""
+"Ìgbà tí a ó fi àyọkà àkọ́gbéyẹ̀wò inú àwọn áíkànnù hàn"
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:16
 msgid ""
@@ -2896,11 +2971,15 @@ msgstr "Irúfẹ́ ìtẹ̀ tí à ń lò láti fi àwọn fáìlì l
 msgid ""
 "Possible values are \"single\" to launch files on a single click, or "
 "\"double\" to launch them on a double click."
-msgstr "Àwọn fálù tó lè jẹ́ ni \"ẹyọ kan\" láti fi àwọn fáìlì lórí ìtẹ̀ kan lọ́lẹ̀ tàbí \"méjì\" láti fi wọn lọ́lẹ̀ lórí ìtẹ̀ méjì."
+msgstr ""
+"Àwọn fálù tó lè jẹ́ ni \"ẹyọ kan\" láti fi àwọn fáìlì lórí ìtẹ̀"
+" kan lọ́lẹ̀ tàbí \"méjì\" láti fi wọn lọ́lẹ̀ lórí ìtẹ̀ méjì."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:21
 msgid "What to do with executable text files when activated"
-msgstr "Ohun tí a ó ṣe pẹ̀lú àwọn fáìlì àyọkà tó lè ṣiṣẹ́ nígbà tí a bá mu ṣiṣẹ́"
+msgstr ""
+"Ohun tí a ó ṣe pẹ̀lú àwọn fáìlì àyọkà tó lè ṣiṣẹ́ nígbà tí a "
+"bá mu ṣiṣẹ́"
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:22
 msgid ""
@@ -2908,7 +2987,13 @@ msgid ""
 "double clicked). Possible values are \"launch\" to launch them as programs, "
 "\"ask\" to ask what to do via a dialog, and \"display\" to display them as "
 "text files."
-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̀."
+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:23
 msgid "Show the package installer for unknown MIME types"
@@ -2954,7 +3039,9 @@ msgstr ""
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:31
 msgid "When to show thumbnails of image files"
-msgstr "Ìgbà tí a ó fi àwọn àpẹẹrẹ ojú-ìwé rébété àwọn fáìlì àwòrán hàn"
+msgstr ""
+"Ìgbà tí a ó fi àwọn àpẹẹrẹ ojú-ìwé rébété àwọn fáìlì "
+"àwòrán hàn"
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:32
 msgid ""
@@ -2974,11 +3061,17 @@ msgid ""
 "Images over this size (in bytes) won't be thumbnailed. The purpose of this "
 "setting is to avoid thumbnailing large images that may take a long time to "
 "load or use lots of memory."
-msgstr "A kò ní ṣe àpẹẹrẹ ojú-ìwé rébété àwọn àwòrán tí o bá ti kọ́ja ìwọ̀n (ní àwọn ikin kọ̀ǹpútà) yìí. Ìdí pàtàkí ààtò yìí ni láti dẹ́kun ìṣàpẹẹrẹ ojú-ìwé rébété àwọn àwòrán ńlá tó lè gba àkíkò púpọ̀ láti kìí tàbí lo ọpọlọ kọ̀ǹpútà púpọ."
+msgstr ""
+"A kò ní ṣe àpẹẹrẹ ojú-ìwé rébété àwọn àwòrán tí o bá ti kọ́ja"
+" ìwọ̀n (ní àwọn ikin kọ̀ǹpútà) yìí. Ìdí pàtàkí ààtò yìí ni"
+" láti dẹ́kun ìṣàpẹẹrẹ ojú-ìwé rébété àwọn àwòrán ńlá tó lè "
+"gba àkíkò púpọ̀ láti kìí tàbí lo ọpọlọ kọ̀ǹpútà púpọ."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:35
 msgid "Whether to preview sounds when mousing over an icon"
-msgstr "Bóyá ká ṣàkọ́gbéyẹ̀wò àwọn ìró nígbà tí a bá ń rábàbà lórí áíkànnù kàn"
+msgstr ""
+"Bóyá ká ṣàkọ́gbéyẹ̀wò àwọn ìró nígbà tí a bá ń rábàbà "
+"lórí áíkànnù kàn"
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:36
 msgid ""
@@ -3006,7 +3099,10 @@ msgstr "Àwọn fódà ni ki o kọ́kọ́ fihàn nínú àwọn fère�
 msgid ""
 "If set to true, then Caja shows folders prior to showing files in the icon "
 "and list views."
-msgstr "Tí a bá gbekalẹ̀ sí òótọ́,a jẹ́ pé Caja máa fi àwọn fódà hàn ṣíwájú fífi àwọn fáìlì inú áíkànnù àti àwọn òye àtòjọ hàn."
+msgstr ""
+"Tí a bá gbekalẹ̀ sí òótọ́,a jẹ́ pé Caja máa fi àwọn fódà hàn "
+"ṣíwájú fífi àwọn fáìlì inú áíkànnù àti àwọn òye àtòjọ "
+"hàn."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:41
 msgid "Default sort order"
@@ -3028,7 +3124,12 @@ msgid ""
 " by name, then instead of sorting the files from \"a\" to \"z\", they will "
 "be sorted from \"z\" to \"a\"; if sorted by size, instead of being "
 "incrementally they will be sorted decrementally."
-msgstr "Tó bá jẹ́ òótọ́, a óò ṣàtò àwọn fáìlì nínú àwọn fèrèsé tuntun ní àṣewásẹ́yìn tó túmọ̀ pé tí a bá ṣàtò nípa orúkọ, dípò ká ṣe ìṣàtò àwọn fáìlì náà láti \"a\" dé \"z\" a óò ṣeé láti \"z\" dé \"a\"; tí a bá ṣeé nípa ìwọ̀n, dípò kó jẹ́ aláfikún díndínkù ni yóò jẹ́."
+msgstr ""
+"Tó bá jẹ́ òótọ́, a óò ṣàtò àwọn fáìlì nínú àwọn fèrèsé "
+"tuntun ní àṣewásẹ́yìn tó túmọ̀ pé tí a bá ṣàtò nípa orúkọ, "
+"dípò ká ṣe ìṣàtò àwọn fáìlì náà láti \"a\" dé \"z\" a óò "
+"ṣeé láti \"z\" dé \"a\"; tí a bá ṣeé nípa ìwọ̀n, dípò kó jẹ́ "
+"aláfikún díndínkù ni yóò jẹ́."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:45
 msgid "Caja uses the users home folder as the desktop"
@@ -3038,7 +3139,10 @@ msgstr "Caja ń lo fódà ilé àwọn òǹlò gẹ́gẹ́ bíi ojú-
 msgid ""
 "If set to true, then Caja will use the user's home folder as the desktop. If"
 " it is false, then it will use ~/Desktop as the desktop."
-msgstr "Tí a bá gbekalẹ̀ sí òótọ́, a jẹ́ pé Caja máa lo fódà ilé òǹlò gẹ́gẹ́ bíi ojú-iṣẹ́. Tó bá jẹ́ irọ́, yóò lo ~/Ojú-iṣẹ́ bíi ojú-iṣẹ́ náà."
+msgstr ""
+"Tí a bá gbekalẹ̀ sí òótọ́, a jẹ́ pé Caja máa lo fódà ilé òǹlò "
+"gẹ́gẹ́ bíi ojú-iṣẹ́. Tó bá jẹ́ irọ́, yóò lo ~/Ojú-iṣẹ́ bíi ojú-iṣẹ́"
+" náà."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:47
 msgid "Custom Background"
@@ -3083,7 +3187,9 @@ msgstr "Àwọ̀ Ẹ̀yìn Péènì Ẹ̀gbẹ́ Ìpéwọ̀n"
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
-msgstr "Orúkọ-fáìlì fún ẹ̀yìn péènì ẹ̀gbẹ́ ìpéwọ̀n. ìgbà tí àgbékalẹ̀_ẹ̀yìn_péènì_ẹ̀gbẹ́ bá jẹ́ òótọ́ nìkan là ń lòó."
+msgstr ""
+"Orúkọ-fáìlì fún ẹ̀yìn péènì ẹ̀gbẹ́ ìpéwọ̀n. ìgbà tí "
+"àgbékalẹ̀_ẹ̀yìn_péènì_ẹ̀gbẹ́ bá jẹ́ òótọ́ nìkan là ń lòó."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:57
 msgid "Default Side Pane Background Filename"
@@ -3114,7 +3220,9 @@ msgstr "Ìgúnrégé Déètì"
 msgid ""
 "The format of file dates. Possible values are \"locale\", \"iso\", and "
 "\"informal\"."
-msgstr "Ìgúnrégé àwọn déètì fáìlì. Àwọn fálù tó lè jẹ́ ni \"locale\", \"iso\", àti \"informal\"."
+msgstr ""
+"Ìgúnrégé àwọn déètì fáìlì. Àwọn fálù tó lè jẹ́ ni "
+"\"locale\", \"iso\", àti \"informal\"."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:63
 msgid "Whether to show hidden files"
@@ -3164,7 +3272,9 @@ msgstr "Lo ìlàálẹ̀ tó le nínú àwọn fèrèsé tuntun"
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:72
 msgid "If true, icons will be laid out tighter by default in new windows."
-msgstr "Tó bá jẹ́ òótọ́, a óò to àwọn áíkànnù náà síta nípa ìpéwọ̀n inú àwọn fèrèsé tuntun."
+msgstr ""
+"Tó bá jẹ́ òótọ́, a óò to àwọn áíkànnù náà síta nípa ìpéwọ̀n"
+" inú àwọn fèrèsé tuntun."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:73
 msgid "Put labels beside icons"
@@ -3173,7 +3283,9 @@ msgstr "Fi àwon ìwé ìsàmì sẹ́gbẹ̀ẹ́ àwọn áíkànnu�
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:74
 msgid ""
 "If true, labels will be placed beside icons rather than underneath them."
-msgstr "Tó bá jẹ́ òótọ́, ẹ̀gbẹ́ àwọn áíkànnù ni a óò àwọn ìwé ìsàmí sí dípò kó wà lábẹ́ wọn."
+msgstr ""
+"Tó bá jẹ́ òótọ́, ẹ̀gbẹ́ àwọn áíkànnù ni a óò àwọn ìwé ìsàmí"
+" sí dípò kó wà lábẹ́ wọn."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:75
 msgid "Default icon zoom level"
@@ -3253,7 +3365,10 @@ msgstr ""
 msgid ""
 "If set to true, Caja will only show folders in the tree side pane. Otherwise"
 " it will show both folders and files."
-msgstr "Tí a bá gbekalẹ̀ sí òótọ́, Caja á kàn fi àwọn fódà inú péènì ẹ̀gbẹ́ igi hàn ni. Láì jẹ́ bẹ́ẹ̀, á fi àwọn fódà àti àwọn fáìlì hàn."
+msgstr ""
+"Tí a bá gbekalẹ̀ sí òótọ́, Caja á kàn fi àwọn fódà inú péènì "
+"ẹ̀gbẹ́ igi hàn ni. Láì jẹ́ bẹ́ẹ̀, á fi àwọn fódà àti àwọn fáìlì "
+"hàn."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:96
 msgid "Desktop font"
@@ -3262,6 +3377,8 @@ msgstr "Ìrísí-lẹ́tà ojú-iṣẹ́"
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:97
 msgid "The font description used for the icons on the desktop."
 msgstr ""
+"Àpèjúwe ìrísí-lẹ́tà tí a lò fún àwọn áíkànnù lórí "
+"ojú-iṣẹ́."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:98
 msgid "Home icon visible on desktop"
@@ -3271,7 +3388,9 @@ msgstr "Áíkànnù ilé tí a lè rí lórí ojú-iṣẹ́"
 msgid ""
 "If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
-msgstr "Tí a bá gbé èyí kalẹ̀ sí òótọ́,a óò gbé áíkànnù tóńlíǹkì sí fódà ilé lórí ojú-iṣẹ́ náà."
+msgstr ""
+"Tí a bá gbé èyí kalẹ̀ sí òótọ́,a óò gbé áíkànnù tóńlíǹkì"
+" sí fódà ilé lórí ojú-iṣẹ́ náà."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:100
 msgid "Computer icon visible on desktop"
@@ -3281,7 +3400,9 @@ msgstr "Áíkànnù kọ̀ǹpútà tí a lè rí lorí ojú-iṣẹ�
 msgid ""
 "If this is set to true, an icon linking to the computer location will be put"
 " on the desktop."
-msgstr "Tí a bá gbé èyí kalẹ̀ sí òótọ́, a óò gbé áíkànnù tó ń líǹkì sí ààyè kọ̀ǹpútà lórí ojú-iṣẹ́ náà."
+msgstr ""
+"Tí a bá gbé èyí kalẹ̀ sí òótọ́, a óò gbé áíkànnù tó ń "
+"líǹkì sí ààyè kọ̀ǹpútà lórí ojú-iṣẹ́ náà."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:102
 msgid "Trash icon visible on desktop"
@@ -3291,17 +3412,23 @@ msgstr "Áíkànnù pàǹtí ṣeé rí lórí ojú-iṣẹ́"
 msgid ""
 "If this is set to true, an icon linking to the trash will be put on the "
 "desktop."
-msgstr "Tí a bá gbé èyí kalẹ̀ sí òótọ́,a óò gbé áíkànnù tó ń líǹkì sí pàǹtí lórí ojú-iṣẹ́ náà."
+msgstr ""
+"Tí a bá gbé èyí kalẹ̀ sí òótọ́,a óò gbé áíkànnù tó ń "
+"líǹkì sí pàǹtí lórí ojú-iṣẹ́ náà."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:104
 msgid "Show mounted volumes on the desktop"
-msgstr "Fi àwọn ìgbóhuǹsókè-sódò tí a fi lọ́lẹ̀ lórí ojú-iṣẹ́ hàn"
+msgstr ""
+"Fi àwọn ìgbóhuǹsókè-sódò tí a fi lọ́lẹ̀ lórí ojú-iṣẹ́ hàn"
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:105
 msgid ""
 "If this is set to true, icons linking to mounted volumes will be put on the "
 "desktop."
-msgstr "Tí a bá gbé èyí kalẹ̀ sí òótọ́,a óò gbé àwọn áíkànnù tó ń líǹkì sí àwọn ìgbóhùnsókè-sódò tí a fi lọ́lẹ̀ lórí ojú-iṣẹ́ náà."
+msgstr ""
+"Tí a bá gbé èyí kalẹ̀ sí òótọ́,a óò gbé àwọn áíkànnù tó ń "
+"líǹkì sí àwọn ìgbóhùnsókè-sódò tí a fi lọ́lẹ̀ lórí ojú-iṣẹ́ "
+"náà."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:106
 msgid "Network Servers icon visible on the desktop"
@@ -3321,7 +3448,9 @@ msgstr "Orúkọ áíkànnù kọ̀ǹpútà ojú-iṣẹ́"
 msgid ""
 "This name can be set if you want a custom name for the computer icon on the "
 "desktop."
-msgstr "A lè ṣàgbékalẹ̀ orúkọ yìí tí o bá fẹ́ àkànṣe orúkọ fún áíkànnù kọ̀ǹpútà náà lórí ojú-iṣẹ́."
+msgstr ""
+"A lè ṣàgbékalẹ̀ orúkọ yìí tí o bá fẹ́ àkànṣe orúkọ fún "
+"áíkànnù kọ̀ǹpútà náà lórí ojú-iṣẹ́."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:110
 msgid "Desktop home icon name"
@@ -3331,7 +3460,9 @@ msgstr "Orúkọ áíkànnù ilé ojú-iṣẹ́"
 msgid ""
 "This name can be set if you want a custom name for the home icon on the "
 "desktop."
-msgstr "A lè ṣàgbékalẹ̀ orúkọ yìí, tí o bá fẹ́ àkànṣe orúkọ fún áíkànnù ilé náà lórí ojú-iṣẹ́."
+msgstr ""
+"A lè ṣàgbékalẹ̀ orúkọ yìí, tí o bá fẹ́ àkànṣe orúkọ fún "
+"áíkànnù ilé náà lórí ojú-iṣẹ́."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:112
 msgid "Desktop trash icon name"
@@ -3341,7 +3472,9 @@ msgstr "Orúkọ áíkànnù pàǹtí ojú-iṣẹ́"
 msgid ""
 "This name can be set if you want a custom name for the trash icon on the "
 "desktop."
-msgstr "A lè ṣàgbékalẹ̀ orúkọ yìí tí o bá fẹ́ àkànṣe orúkọ fún áíkànnù pàǹtí náà lórí ojú-iṣẹ́."
+msgstr ""
+"A lè ṣàgbékalẹ̀ orúkọ yìí tí o bá fẹ́ àkànṣe orúkọ fún "
+"áíkànnù pàǹtí náà lórí ojú-iṣẹ́."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:114
 msgid "Network servers icon name"
@@ -3393,7 +3526,9 @@ msgstr "Fi àká-irinṣẹ́ hàn nínú àwọn fèrèsé"
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:124
 msgid "If set to true, newly opened windows will have toolbars visible."
-msgstr "Tí a bá gbekalẹ̀ sí òótọ́, a óò lè rí àwọn àká-irinṣẹ́ àwọn fèrèsé tuntun tí a ṣẹ̀ ṣí."
+msgstr ""
+"Tí a bá gbekalẹ̀ sí òótọ́, a óò lè rí àwọn àká-irinṣẹ́ àwọn "
+"fèrèsé tuntun tí a ṣẹ̀ ṣí."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:125
 msgid "Show location bar in new windows"
@@ -3402,7 +3537,9 @@ msgstr "Fi áká ààyè hàn nínú àwọn fèrèsé tuntun"
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:126
 msgid ""
 "If set to true, newly opened windows will have the location bar visible."
-msgstr "Tí a bá gbekalẹ̀ sí òótọ́, a óò lè rí àká ààyè àwọn fèrèsé tuntun tí a ṣẹ̀ ṣí."
+msgstr ""
+"Tí a bá gbekalẹ̀ sí òótọ́, a óò lè rí àká ààyè àwọn fèrèsé"
+" tuntun tí a ṣẹ̀ ṣí."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:127
 msgid "Show status bar in new windows"
@@ -3410,7 +3547,9 @@ msgstr "Fi àká ipò hàn nínú àwọn fèrèsé"
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:128
 msgid "If set to true, newly opened windows will have the status bar visible."
-msgstr "Tí a bá gbekalẹ̀ sí òótọ́, a óò lè rí àká ipò àwọn fèrèsé tuntun tí a ṣẹ̀ sí."
+msgstr ""
+"Tí a bá gbekalẹ̀ sí òótọ́, a óò lè rí àká ipò àwọn fèrèsé "
+"tuntun tí a ṣẹ̀ sí."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:129
 msgid "Show side pane in new windows"
@@ -3418,7 +3557,9 @@ msgstr "Fi péènì ẹ̀gbẹ́ hàn nínú àwọn fèrèsé tuntun"
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:130
 msgid "If set to true, newly opened windows will have the side pane visible."
-msgstr "Tí a bá gbekalẹ̀ sí òótọ́, a óò lè rí péènì ẹ̀gbẹ́ àwọn fèrèsé tuntun tí a ṣẹ̀ ṣí."
+msgstr ""
+"Tí a bá gbekalẹ̀ sí òótọ́, a óò lè rí péènì ẹ̀gbẹ́ àwọn "
+"fèrèsé tuntun tí a ṣẹ̀ ṣí."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:131
 msgid "Side pane view"
@@ -3426,7 +3567,9 @@ msgstr "Òye péènì ẹ̀gbẹ́"
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:132
 msgid "The side pane view to show in newly opened windows."
-msgstr "Òye péènì ẹ̀gbẹ́ tí a fẹ́ fihàn nínú àwọn fèrèsé tuntun tí a ṣẹ̀ sí."
+msgstr ""
+"Òye péènì ẹ̀gbẹ́ tí a fẹ́ fihàn nínú àwọn fèrèsé tuntun tí a "
+"ṣẹ̀ sí."
 
 #: ../libcaja-private/org.mate.caja.gschema.xml.h:133
 msgid "List of extensions in disabled state."
@@ -3515,7 +3658,7 @@ msgstr ""
 #: ../libegg/eggdesktopfile.c:958
 #, c-format
 msgid "Starting %s"
-msgstr ""
+msgstr "Ìbẹrẹ %s"
 
 #: ../libegg/eggdesktopfile.c:1100
 #, c-format
@@ -3535,7 +3678,7 @@ msgstr ""
 #: ../libegg/eggdesktopfile.c:1385
 #, c-format
 msgid "Not a launchable item"
-msgstr ""
+msgstr "kìí ṣe irú nkan láti fi bẹrẹ"
 
 #: ../libegg/eggsmclient.c:237
 msgid "Disable connection to session manager"
@@ -3565,59 +3708,61 @@ msgstr ""
 msgid "Show session management options"
 msgstr ""
 
-#: ../src/file-manager/fm-desktop-icon-view.c:709
+#: ../src/file-manager/fm-desktop-icon-view.c:667
 msgid "Background"
 msgstr "Ẹ̀yìn"
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:786
-#: ../src/file-manager/fm-directory-view.c:7316
-#: ../src/file-manager/fm-directory-view.c:8993
+#: ../src/file-manager/fm-desktop-icon-view.c:744
+#: ../src/file-manager/fm-directory-view.c:7302
+#: ../src/file-manager/fm-directory-view.c:8979
 msgid "E_mpty Trash"
 msgstr "P_àǹtí Òfìfo"
 
 #. label, accelerator
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:800
-#: ../src/file-manager/fm-directory-view.c:7280
+#: ../src/file-manager/fm-desktop-icon-view.c:758
+#: ../src/file-manager/fm-directory-view.c:7266
 msgid "Create L_auncher..."
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-desktop-icon-view.c:802
-#: ../src/file-manager/fm-directory-view.c:7281
+#: ../src/file-manager/fm-desktop-icon-view.c:760
+#: ../src/file-manager/fm-directory-view.c:7267
 msgid "Create a new launcher"
-msgstr "Ṣẹ̀dá àṣàfilọ́lẹ̀ tuntun"
+msgstr "Ṣẹ̀dá aṣàfilọ́lẹ̀ tuntun"
 
 #. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:809
+#: ../src/file-manager/fm-desktop-icon-view.c:767
 msgid "Change Desktop _Background"
 msgstr "Yí Ẹ̀yìn _Ojú-iṣẹ́ Padà"
 
 #. tooltip
-#: ../src/file-manager/fm-desktop-icon-view.c:811
+#: ../src/file-manager/fm-desktop-icon-view.c:769
 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"
+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:818
+#: ../src/file-manager/fm-desktop-icon-view.c:776
 msgid "Empty Trash"
 msgstr "Pàǹtí Òfìfo"
 
 #. tooltip
-#: ../src/file-manager/fm-desktop-icon-view.c:820
-#: ../src/file-manager/fm-directory-view.c:7317 ../src/caja-trash-bar.c:204
+#: ../src/file-manager/fm-desktop-icon-view.c:778
+#: ../src/file-manager/fm-directory-view.c:7303 ../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:920
+#: ../src/file-manager/fm-desktop-icon-view.c:878
 msgid "The desktop view encountered an error."
 msgstr ""
 
-#: ../src/file-manager/fm-desktop-icon-view.c:921
+#: ../src/file-manager/fm-desktop-icon-view.c:879
 msgid "The desktop view encountered an error while starting up."
 msgstr ""
 
@@ -3635,54 +3780,58 @@ msgid_plural "This will open %'d separate windows."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:1183
-#: ../src/file-manager/fm-properties-window.c:5420
-#: ../src/caja-connect-server-dialog.c:724 ../src/caja-location-dialog.c:108
+#: ../src/file-manager/fm-directory-view.c:1177
+#: ../src/file-manager/fm-properties-window.c:5414
+#: ../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:1203
+#: ../src/file-manager/fm-directory-view.c:1197
 msgid "Select Items Matching"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:1218
+#: ../src/file-manager/fm-directory-view.c:1212
 msgid "_Pattern:"
 msgstr "_Bátànì:"
 
-#: ../src/file-manager/fm-directory-view.c:1225
+#: ../src/file-manager/fm-directory-view.c:1219
 msgid "Examples: "
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:1341
+#: ../src/file-manager/fm-directory-view.c:1335
 msgid "Save Search as"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:1364
+#: ../src/file-manager/fm-directory-view.c:1341
+msgid "_Save"
+msgstr ""
+
+#: ../src/file-manager/fm-directory-view.c:1360
 msgid "Search _name:"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:1384
+#: ../src/file-manager/fm-directory-view.c:1376
 msgid "_Folder:"
 msgstr "_Fódà:"
 
-#: ../src/file-manager/fm-directory-view.c:1393
+#: ../src/file-manager/fm-directory-view.c:1381
 msgid "Select Folder to Save Search In"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:2284
-#: ../src/file-manager/fm-directory-view.c:2321
+#: ../src/file-manager/fm-directory-view.c:2270
+#: ../src/file-manager/fm-directory-view.c:2307
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" tí a yàn"
 
-#: ../src/file-manager/fm-directory-view.c:2286
+#: ../src/file-manager/fm-directory-view.c:2272
 #, c-format
 msgid "%'d folder selected"
 msgid_plural "%'d folders selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:2296
+#: ../src/file-manager/fm-directory-view.c:2282
 #, c-format
 msgid " (containing %'d item)"
 msgid_plural " (containing %'d items)"
@@ -3691,14 +3840,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:2307
+#: ../src/file-manager/fm-directory-view.c:2293
 #, 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:2324
+#: ../src/file-manager/fm-directory-view.c:2310
 #, c-format
 msgid "%'d item selected"
 msgid_plural "%'d items selected"
@@ -3706,7 +3855,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. Folders selected also, use "other" terminology
-#: ../src/file-manager/fm-directory-view.c:2331
+#: ../src/file-manager/fm-directory-view.c:2317
 #, c-format
 msgid "%'d other item selected"
 msgid_plural "%'d other items selected"
@@ -3717,17 +3866,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:2350
+#: ../src/file-manager/fm-directory-view.c:2336
 #, c-format
 msgid "%s (%s)"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:2363
+#: ../src/file-manager/fm-directory-view.c:2349
 #, c-format
 msgid "Free space: %s"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:2374
+#: ../src/file-manager/fm-directory-view.c:2360
 #, c-format
 msgid "%s, Free space: %s"
 msgstr "%s,Àyè òfìfo: %s"
@@ -3736,7 +3885,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:2389
+#: ../src/file-manager/fm-directory-view.c:2375
 #, c-format
 msgid "%s, %s"
 msgstr ""
@@ -3751,8 +3900,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:2394
 #: ../src/file-manager/fm-directory-view.c:2408
-#: ../src/file-manager/fm-directory-view.c:2422
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -3764,53 +3913,57 @@ 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:2435
+#: ../src/file-manager/fm-directory-view.c:2421
 #, c-format
 msgid "%s%s, %s, %s"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:4480
+#: ../src/file-manager/fm-directory-view.c:4466
 #: ../src/caja-information-panel.c:905
 #, c-format
 msgid "Open With %s"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:4482
+#: ../src/file-manager/fm-directory-view.c:4468
 #, 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:4571
+#: ../src/file-manager/fm-directory-view.c:4557
 msgid "Open parent location"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:4572
+#: ../src/file-manager/fm-directory-view.c:4558
 msgid "Open parent location for the selected item"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:5421
+#: ../src/file-manager/fm-directory-view.c:5407
 #, 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:5672
+#: ../src/file-manager/fm-directory-view.c:5658
 #, 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:5922
+#: ../src/file-manager/fm-directory-view.c:5908
 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́."
+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:5924
+#: ../src/file-manager/fm-directory-view.c:5910
 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́."
+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:5926
+#: ../src/file-manager/fm-directory-view.c:5912
 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"
@@ -3833,19 +3986,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:5994
+#: ../src/file-manager/fm-directory-view.c:5980
 #: ../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:5998
+#: ../src/file-manager/fm-directory-view.c:5984
 #: ../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:6005
+#: ../src/file-manager/fm-directory-view.c:5991
 #, c-format
 msgid "The %'d selected item will be moved if you select the Paste command"
 msgid_plural ""
@@ -3853,7 +4006,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:6012
+#: ../src/file-manager/fm-directory-view.c:5998
 #, c-format
 msgid "The %'d selected item will be copied if you select the Paste command"
 msgid_plural ""
@@ -3861,332 +4014,321 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:6192
+#: ../src/file-manager/fm-directory-view.c:6178
 #: ../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:6407
+#: ../src/file-manager/fm-directory-view.c:6393
 msgid "Unable to unmount location"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:6428
+#: ../src/file-manager/fm-directory-view.c:6414
 msgid "Unable to eject location"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:6443
+#: ../src/file-manager/fm-directory-view.c:6429
 msgid "Unable to stop drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:7000
+#: ../src/file-manager/fm-directory-view.c:6986
 #, c-format
 msgid "Connect to Server %s"
 msgstr "Darapọ̀ mọ́ Sáfà %s"
 
-#: ../src/file-manager/fm-directory-view.c:7005
-#: ../src/file-manager/fm-directory-view.c:8212
-#: ../src/file-manager/fm-directory-view.c:8304
-#: ../src/file-manager/fm-directory-view.c:8414
+#: ../src/file-manager/fm-directory-view.c:6991
+#: ../src/file-manager/fm-directory-view.c:8198
+#: ../src/file-manager/fm-directory-view.c:8290
+#: ../src/file-manager/fm-directory-view.c:8400
 msgid "_Connect"
 msgstr "_Darapọ̀"
 
-#: ../src/file-manager/fm-directory-view.c:7019
+#: ../src/file-manager/fm-directory-view.c:7005
 msgid "Link _name:"
 msgstr "Orúkọ _líǹkì:"
 
-#. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:7258
+#. name, icon name, label
+#: ../src/file-manager/fm-directory-view.c:7244
 msgid "Create _Document"
 msgstr "Ṣẹ̀dá _Àkọsílẹ̀"
 
-#. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:7259
+#. name, icon name, label
+#: ../src/file-manager/fm-directory-view.c:7245
 msgid "Open Wit_h"
 msgstr "Ṣi Pẹ̀l_ú"
 
-#: ../src/file-manager/fm-directory-view.c:7260
+#: ../src/file-manager/fm-directory-view.c:7246
 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
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7262
-#: ../src/file-manager/fm-directory-view.c:7541
+#: ../src/file-manager/fm-directory-view.c:7248
+#: ../src/file-manager/fm-directory-view.c:7527
 msgid "_Properties"
 msgstr "_Àwọn Àbùdá"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7263
-#: ../src/file-manager/fm-directory-view.c:8980
+#: ../src/file-manager/fm-directory-view.c:7249
+#: ../src/file-manager/fm-directory-view.c:8966
 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̀"
+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
+#. name, icon name
 #. label, accelerator
 #. add the "create folder" menu item
-#: ../src/file-manager/fm-directory-view.c:7270
+#: ../src/file-manager/fm-directory-view.c:7256
 #: ../src/file-manager/fm-tree-view.c:1298
 msgid "Create _Folder"
 msgstr "Ṣẹ̀dá _Fódà"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7271
+#: ../src/file-manager/fm-directory-view.c:7257
 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:7273
+#. name, icon name, label
+#: ../src/file-manager/fm-directory-view.c:7259
 msgid "No templates installed"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. translators: this is used to indicate that a file doesn't contain anything
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7276
+#: ../src/file-manager/fm-directory-view.c:7262
 msgid "_Empty File"
 msgstr "_Fáìlì Òfìfo"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7277
+#: ../src/file-manager/fm-directory-view.c:7263
 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:7285
+#: ../src/file-manager/fm-directory-view.c:7271
 msgid "Open the selected item in this window"
 msgstr "Ṣí wúnrẹ̀n tí a yàn nínú fèrèsé yìí"
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
 #. Location-specific actions
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7292
-#: ../src/file-manager/fm-directory-view.c:7473
+#: ../src/file-manager/fm-directory-view.c:7278
+#: ../src/file-manager/fm-directory-view.c:7459
 msgid "Open in Navigation Window"
 msgstr "Ṣí nínú Fèrèsé Ìtọpa"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7293
+#: ../src/file-manager/fm-directory-view.c:7279
 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
+#. name, icon name
 #. label, accelerator
 #. add the "open in new tab" menu item
-#: ../src/file-manager/fm-directory-view.c:7296
-#: ../src/file-manager/fm-directory-view.c:7477
-#: ../src/file-manager/fm-directory-view.c:8544
-#: ../src/file-manager/fm-directory-view.c:8870
+#: ../src/file-manager/fm-directory-view.c:7282
+#: ../src/file-manager/fm-directory-view.c:7463
+#: ../src/file-manager/fm-directory-view.c:8530
+#: ../src/file-manager/fm-directory-view.c:8856
 #: ../src/file-manager/fm-tree-view.c:1278 ../src/caja-places-sidebar.c:2664
 msgid "Open in New _Tab"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7297
+#: ../src/file-manager/fm-directory-view.c:7283
 msgid "Open each selected item in a new tab"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7300
-#: ../src/file-manager/fm-directory-view.c:7482
+#: ../src/file-manager/fm-directory-view.c:7286
+#: ../src/file-manager/fm-directory-view.c:7468
 msgid "Open in _Folder Window"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7301
+#: ../src/file-manager/fm-directory-view.c:7287
 msgid "Open each selected item in a folder window"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7304
+#: ../src/file-manager/fm-directory-view.c:7290
 msgid "Other _Application..."
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7305
-#: ../src/file-manager/fm-directory-view.c:7309
+#: ../src/file-manager/fm-directory-view.c:7291
+#: ../src/file-manager/fm-directory-view.c:7295
 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
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7308
+#: ../src/file-manager/fm-directory-view.c:7294
 msgid "Open With Other _Application..."
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7312
+#: ../src/file-manager/fm-directory-view.c:7298
 msgid "_Open Scripts Folder"
 msgstr "_Ṣí Fódà Àwọn Ìwé"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7313
+#: ../src/file-manager/fm-directory-view.c:7299
 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"
+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:7321
+#: ../src/file-manager/fm-directory-view.c:7307
 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:7325
+#: ../src/file-manager/fm-directory-view.c:7311
 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:7329
+#: ../src/file-manager/fm-directory-view.c:7315
 msgid "Move or copy files previously selected by a Cut or Copy command"
 msgstr ""
 
 #. We make accelerator "" instead of null here to not inherit the stock
 #. accelerator for paste
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7334
-#: ../src/file-manager/fm-directory-view.c:7495
+#: ../src/file-manager/fm-directory-view.c:7320
+#: ../src/file-manager/fm-directory-view.c:7481
 #: ../src/file-manager/fm-tree-view.c:1330
 msgid "_Paste Into Folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7335
+#: ../src/file-manager/fm-directory-view.c:7321
 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:7337
+#. name, icon name, label
+#: ../src/file-manager/fm-directory-view.c:7323
 msgid "Cop_y to"
 msgstr ""
 
-#. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:7338
+#. name, icon name, label
+#: ../src/file-manager/fm-directory-view.c:7324
 msgid "M_ove to"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7341
+#: ../src/file-manager/fm-directory-view.c:7327
 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
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7344
+#: ../src/file-manager/fm-directory-view.c:7330
 msgid "Select I_tems Matching..."
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7345
+#: ../src/file-manager/fm-directory-view.c:7331
 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"
+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
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7348
+#: ../src/file-manager/fm-directory-view.c:7334
 msgid "_Invert Selection"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7349
+#: ../src/file-manager/fm-directory-view.c:7335
 msgid "Select all and only the items that are not currently selected"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7352
+#: ../src/file-manager/fm-directory-view.c:7338
 msgid "D_uplicate"
 msgstr "Ẹ̀_dà"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7353
+#: ../src/file-manager/fm-directory-view.c:7339
 msgid "Duplicate each selected item"
 msgstr "Ṣẹ̀dà wúnrẹ̀n kọ̀ọ̀kan tí a yàn"
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7356
-#: ../src/file-manager/fm-directory-view.c:8964
+#: ../src/file-manager/fm-directory-view.c:7342
+#: ../src/file-manager/fm-directory-view.c:8950
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
 msgstr[1] ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7357
+#: ../src/file-manager/fm-directory-view.c:7343
 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
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7360
+#: ../src/file-manager/fm-directory-view.c:7346
 msgid "_Rename..."
 msgstr "_Tun orúkọ sọ..."
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7361
+#: ../src/file-manager/fm-directory-view.c:7347
 msgid "Rename selected item"
 msgstr "Tun orúkọ wúnrẹ̀n tí a yàn sọ"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7369
-#: ../src/file-manager/fm-directory-view.c:8925
+#: ../src/file-manager/fm-directory-view.c:7355
+#: ../src/file-manager/fm-directory-view.c:8911
 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:7372
-#: ../src/file-manager/fm-directory-view.c:7504
-#: ../src/file-manager/fm-directory-view.c:8945
-#: ../src/file-manager/fm-tree-view.c:1360
-msgid "_Delete"
-msgstr "_Pajẹ"
-
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7373
+#: ../src/file-manager/fm-directory-view.c:7359
 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
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7376
-#: ../src/file-manager/fm-directory-view.c:7508
+#: ../src/file-manager/fm-directory-view.c:7362
+#: ../src/file-manager/fm-directory-view.c:7494
 msgid "_Restore"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7380
+#: ../src/file-manager/fm-directory-view.c:7366
 msgid "_Undo"
 msgstr "_Padà Sípò"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7381
-#: ../src/file-manager/fm-directory-view.c:11129
+#: ../src/file-manager/fm-directory-view.c:7367
+#: ../src/file-manager/fm-directory-view.c:11118
 msgid "Undo the last action"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7384
+#: ../src/file-manager/fm-directory-view.c:7370
 msgid "_Redo"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7385
-#: ../src/file-manager/fm-directory-view.c:11147
+#: ../src/file-manager/fm-directory-view.c:7371
+#: ../src/file-manager/fm-directory-view.c:11136
 msgid "Redo the last undone action"
 msgstr ""
 
@@ -4194,642 +4336,643 @@ msgstr ""
 #. * be window-wide, and not just view-wide.
 #. * Since this also resets the "Show hidden files" mode,
 #. * it is a mixture of both ATM.
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7395
+#: ../src/file-manager/fm-directory-view.c:7381
 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:7396
+#: ../src/file-manager/fm-directory-view.c:7382
 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"
+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
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7399
+#: ../src/file-manager/fm-directory-view.c:7385
 msgid "Connect To This Server"
 msgstr "Darapọ̀ Mọ́ Sáfà Yìí"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7400
+#: ../src/file-manager/fm-directory-view.c:7386
 msgid "Make a permanent connection to this server"
 msgstr "Darapọ̀ mọ́ sáfà yìí ráúráú"
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7403
-#: ../src/file-manager/fm-directory-view.c:7431
-#: ../src/file-manager/fm-directory-view.c:7512
+#: ../src/file-manager/fm-directory-view.c:7389
+#: ../src/file-manager/fm-directory-view.c:7417
+#: ../src/file-manager/fm-directory-view.c:7498
 #: ../src/caja-places-sidebar.c:2700
 msgid "_Mount"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7404
+#: ../src/file-manager/fm-directory-view.c:7390
 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:7408
+#: ../src/file-manager/fm-directory-view.c:7394
 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:7412
+#: ../src/file-manager/fm-directory-view.c:7398
 msgid "Eject the selected volume"
 msgstr "Yọ ìgbóhùnsókè-sódò tí a yàn kúrò"
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7415
-#: ../src/file-manager/fm-directory-view.c:7443
-#: ../src/file-manager/fm-directory-view.c:7524
+#: ../src/file-manager/fm-directory-view.c:7401
+#: ../src/file-manager/fm-directory-view.c:7429
+#: ../src/file-manager/fm-directory-view.c:7510
 #: ../src/caja-places-sidebar.c:2728
 msgid "_Format"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7416
+#: ../src/file-manager/fm-directory-view.c:7402
 msgid "Format the selected volume"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
 #. Adjust start/stop items to reflect the type of the drive
-#: ../src/file-manager/fm-directory-view.c:7419
-#: ../src/file-manager/fm-directory-view.c:7447
-#: ../src/file-manager/fm-directory-view.c:7528
-#: ../src/file-manager/fm-directory-view.c:8204
-#: ../src/file-manager/fm-directory-view.c:8208
-#: ../src/file-manager/fm-directory-view.c:8296
-#: ../src/file-manager/fm-directory-view.c:8300
-#: ../src/file-manager/fm-directory-view.c:8406
-#: ../src/file-manager/fm-directory-view.c:8410
+#: ../src/file-manager/fm-directory-view.c:7405
+#: ../src/file-manager/fm-directory-view.c:7433
+#: ../src/file-manager/fm-directory-view.c:7514
+#: ../src/file-manager/fm-directory-view.c:8190
+#: ../src/file-manager/fm-directory-view.c:8194
+#: ../src/file-manager/fm-directory-view.c:8282
+#: ../src/file-manager/fm-directory-view.c:8286
+#: ../src/file-manager/fm-directory-view.c:8392
+#: ../src/file-manager/fm-directory-view.c:8396
 #: ../src/caja-places-sidebar.c:1785 ../src/caja-places-sidebar.c:2735
 msgid "_Start"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7420
+#: ../src/file-manager/fm-directory-view.c:7406
 msgid "Start the selected volume"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7423
-#: ../src/file-manager/fm-directory-view.c:7451
-#: ../src/file-manager/fm-directory-view.c:7532
-#: ../src/file-manager/fm-directory-view.c:8233
-#: ../src/file-manager/fm-directory-view.c:8325
-#: ../src/file-manager/fm-directory-view.c:8435
+#: ../src/file-manager/fm-directory-view.c:7409
+#: ../src/file-manager/fm-directory-view.c:7437
+#: ../src/file-manager/fm-directory-view.c:7518
+#: ../src/file-manager/fm-directory-view.c:8219
+#: ../src/file-manager/fm-directory-view.c:8311
+#: ../src/file-manager/fm-directory-view.c:8421
 #: ../src/caja-places-sidebar.c:1786 ../src/caja-places-sidebar.c:2742
-#: ../src/caja-window-menus.c:844
+#: ../src/caja-window-menus.c:836
 msgid "_Stop"
 msgstr "_Dúró"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7424
-#: ../src/file-manager/fm-directory-view.c:8436
+#: ../src/file-manager/fm-directory-view.c:7410
+#: ../src/file-manager/fm-directory-view.c:8422
 msgid "Stop the selected volume"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7427
-#: ../src/file-manager/fm-directory-view.c:7455
-#: ../src/file-manager/fm-directory-view.c:7536
+#: ../src/file-manager/fm-directory-view.c:7413
+#: ../src/file-manager/fm-directory-view.c:7441
+#: ../src/file-manager/fm-directory-view.c:7522
 #: ../src/caja-places-sidebar.c:2721
 msgid "_Detect Media"
 msgstr ""
 
 #. tooltip
-#: ../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/file-manager/fm-directory-view.c:7414
+#: ../src/file-manager/fm-directory-view.c:7442
+#: ../src/file-manager/fm-directory-view.c:7523
 msgid "Detect media in the selected drive"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7432
+#: ../src/file-manager/fm-directory-view.c:7418
 msgid "Mount the volume associated with the open folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7436
+#: ../src/file-manager/fm-directory-view.c:7422
 msgid "Unmount the volume associated with the open folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7440
+#: ../src/file-manager/fm-directory-view.c:7426
 msgid "Eject the volume associated with the open folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7444
+#: ../src/file-manager/fm-directory-view.c:7430
 msgid "Format the volume associated with the open folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7448
+#: ../src/file-manager/fm-directory-view.c:7434
 msgid "Start the volume associated with the open folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7452
+#: ../src/file-manager/fm-directory-view.c:7438
 msgid "Stop the volume associated with the open folder"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7459
+#: ../src/file-manager/fm-directory-view.c:7445
 msgid "Open File and Close window"
 msgstr "Ṣí Fáìlì kí o sì Ti fèrèsé"
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7463
+#: ../src/file-manager/fm-directory-view.c:7449
 msgid "Sa_ve Search"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7464
+#: ../src/file-manager/fm-directory-view.c:7450
 msgid "Save the edited search"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7467
+#: ../src/file-manager/fm-directory-view.c:7453
 msgid "Sa_ve Search As..."
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7468
+#: ../src/file-manager/fm-directory-view.c:7454
 msgid "Save the current search as a file"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7474
+#: ../src/file-manager/fm-directory-view.c:7460
 msgid "Open this folder in a navigation window"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7478
+#: ../src/file-manager/fm-directory-view.c:7464
 msgid "Open this folder in a new tab"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7483
+#: ../src/file-manager/fm-directory-view.c:7469
 msgid "Open this folder in a folder window"
 msgstr ""
 
-#. name, stock id
-#. label, accelerator
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7488
+#: ../src/file-manager/fm-directory-view.c:7474
 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:7492
+#: ../src/file-manager/fm-directory-view.c:7478
 msgid "Prepare this folder to be copied with a Paste command"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7496
+#: ../src/file-manager/fm-directory-view.c:7482
 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:7501
+#: ../src/file-manager/fm-directory-view.c:7487
 msgid "Move this folder to the Trash"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7505
+#: ../src/file-manager/fm-directory-view.c:7491
 msgid "Delete this folder, without moving to the Trash"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7513
+#: ../src/file-manager/fm-directory-view.c:7499
 msgid "Mount the volume associated with this folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7517
+#: ../src/file-manager/fm-directory-view.c:7503
 msgid "Unmount the volume associated with this folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7521
+#: ../src/file-manager/fm-directory-view.c:7507
 msgid "Eject the volume associated with this folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7525
+#: ../src/file-manager/fm-directory-view.c:7511
 msgid "Format the volume associated with this folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7529
+#: ../src/file-manager/fm-directory-view.c:7515
 msgid "Start the volume associated with this folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7533
+#: ../src/file-manager/fm-directory-view.c:7519
 msgid "Stop the volume associated with this folder"
 msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7542
+#: ../src/file-manager/fm-directory-view.c:7528
 msgid "View or modify the properties of this folder"
 msgstr ""
 
-#. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:7545
-#: ../src/file-manager/fm-directory-view.c:7548
+#. name, icon name, label
+#: ../src/file-manager/fm-directory-view.c:7531
+#: ../src/file-manager/fm-directory-view.c:7534
 msgid "_Other pane"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:7546
+#: ../src/file-manager/fm-directory-view.c:7532
 msgid "Copy the current selection to the other pane in the window"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:7549
+#: ../src/file-manager/fm-directory-view.c:7535
 msgid "Move the current selection to the other pane in the window"
 msgstr ""
 
-#. name, stock id, label
-#. name, stock id
+#. name, icon name, label
+#. name, icon name
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7552
-#: ../src/file-manager/fm-directory-view.c:7556 ../src/caja-window-menus.c:899
+#: ../src/file-manager/fm-directory-view.c:7538
+#: ../src/file-manager/fm-directory-view.c:7542 ../src/caja-window-menus.c:891
 msgid "_Home Folder"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:7553
+#: ../src/file-manager/fm-directory-view.c:7539
 msgid "Copy the current selection to the home folder"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:7557
+#: ../src/file-manager/fm-directory-view.c:7543
 msgid "Move the current selection to the home folder"
 msgstr ""
 
-#. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:7560
-#: ../src/file-manager/fm-directory-view.c:7564
+#. name, icon name, label
+#: ../src/file-manager/fm-directory-view.c:7546
+#: ../src/file-manager/fm-directory-view.c:7550
 msgid "_Desktop"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:7561
+#: ../src/file-manager/fm-directory-view.c:7547
 msgid "Copy the current selection to the desktop"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:7565
+#: ../src/file-manager/fm-directory-view.c:7551
 msgid "Move the current selection to the desktop"
 msgstr ""
 
 #. Translators: %s is a directory
-#: ../src/file-manager/fm-directory-view.c:7645
+#: ../src/file-manager/fm-directory-view.c:7631
 #, 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:7647
+#: ../src/file-manager/fm-directory-view.c:7633
 msgid "_Scripts"
 msgstr "_Àwọn Ìwé"
 
-#: ../src/file-manager/fm-directory-view.c:8052
+#: ../src/file-manager/fm-directory-view.c:8038
 #, c-format
 msgid "Move the open folder out of the trash to \"%s\""
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8055
+#: ../src/file-manager/fm-directory-view.c:8041
 #, 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:8059
+#: ../src/file-manager/fm-directory-view.c:8045
 #, 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:8065
+#: ../src/file-manager/fm-directory-view.c:8051
 #, 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:8069
+#: ../src/file-manager/fm-directory-view.c:8055
 #, 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:8075
+#: ../src/file-manager/fm-directory-view.c:8061
 #, 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:8079
+#: ../src/file-manager/fm-directory-view.c:8065
 #, 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:8205
-#: ../src/file-manager/fm-directory-view.c:8209
-#: ../src/file-manager/fm-directory-view.c:8407
-#: ../src/file-manager/fm-directory-view.c:8411
+#: ../src/file-manager/fm-directory-view.c:8191
+#: ../src/file-manager/fm-directory-view.c:8195
+#: ../src/file-manager/fm-directory-view.c:8393
+#: ../src/file-manager/fm-directory-view.c:8397
 msgid "Start the selected drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8213
-#: ../src/file-manager/fm-directory-view.c:8415
+#: ../src/file-manager/fm-directory-view.c:8199
+#: ../src/file-manager/fm-directory-view.c:8401
 msgid "Connect to the selected drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8216
-#: ../src/file-manager/fm-directory-view.c:8308
-#: ../src/file-manager/fm-directory-view.c:8418
+#: ../src/file-manager/fm-directory-view.c:8202
+#: ../src/file-manager/fm-directory-view.c:8294
+#: ../src/file-manager/fm-directory-view.c:8404
 msgid "_Start Multi-disk Drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8217
-#: ../src/file-manager/fm-directory-view.c:8419
+#: ../src/file-manager/fm-directory-view.c:8203
+#: ../src/file-manager/fm-directory-view.c:8405
 msgid "Start the selected multi-disk drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8220
+#: ../src/file-manager/fm-directory-view.c:8206
 msgid "U_nlock Drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8221
-#: ../src/file-manager/fm-directory-view.c:8423
+#: ../src/file-manager/fm-directory-view.c:8207
+#: ../src/file-manager/fm-directory-view.c:8409
 msgid "Unlock the selected drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8234
+#: ../src/file-manager/fm-directory-view.c:8220
 msgid "Stop the selected drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8237
-#: ../src/file-manager/fm-directory-view.c:8329
-#: ../src/file-manager/fm-directory-view.c:8439
+#: ../src/file-manager/fm-directory-view.c:8223
+#: ../src/file-manager/fm-directory-view.c:8315
+#: ../src/file-manager/fm-directory-view.c:8425
 #: ../src/caja-places-sidebar.c:1794
 msgid "_Safely Remove Drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8238
-#: ../src/file-manager/fm-directory-view.c:8440
+#: ../src/file-manager/fm-directory-view.c:8224
+#: ../src/file-manager/fm-directory-view.c:8426
 msgid "Safely remove the selected drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8241
-#: ../src/file-manager/fm-directory-view.c:8333
-#: ../src/file-manager/fm-directory-view.c:8443
+#: ../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 "_Disconnect"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8242
-#: ../src/file-manager/fm-directory-view.c:8444
+#: ../src/file-manager/fm-directory-view.c:8228
+#: ../src/file-manager/fm-directory-view.c:8430
 msgid "Disconnect the selected drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8245
-#: ../src/file-manager/fm-directory-view.c:8337
-#: ../src/file-manager/fm-directory-view.c:8447
+#: ../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 "_Stop Multi-disk Drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8246
-#: ../src/file-manager/fm-directory-view.c:8448
+#: ../src/file-manager/fm-directory-view.c:8232
+#: ../src/file-manager/fm-directory-view.c:8434
 msgid "Stop the selected multi-disk drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8249
-#: ../src/file-manager/fm-directory-view.c:8341
-#: ../src/file-manager/fm-directory-view.c:8451
+#: ../src/file-manager/fm-directory-view.c:8235
+#: ../src/file-manager/fm-directory-view.c:8327
+#: ../src/file-manager/fm-directory-view.c:8437
 #: ../src/caja-places-sidebar.c:1807
 msgid "_Lock Drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8250
-#: ../src/file-manager/fm-directory-view.c:8452
+#: ../src/file-manager/fm-directory-view.c:8236
+#: ../src/file-manager/fm-directory-view.c:8438
 msgid "Lock the selected drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8297
-#: ../src/file-manager/fm-directory-view.c:8301
+#: ../src/file-manager/fm-directory-view.c:8283
+#: ../src/file-manager/fm-directory-view.c:8287
 msgid "Start the drive associated with the open folder"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8305
+#: ../src/file-manager/fm-directory-view.c:8291
 msgid "Connect to the drive associated with the open folder"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8309
+#: ../src/file-manager/fm-directory-view.c:8295
 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:8312
-#: ../src/file-manager/fm-directory-view.c:8422
+#: ../src/file-manager/fm-directory-view.c:8298
+#: ../src/file-manager/fm-directory-view.c:8408
 #: ../src/caja-places-sidebar.c:1806
 msgid "_Unlock Drive"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8313
+#: ../src/file-manager/fm-directory-view.c:8299
 msgid "Unlock the drive associated with the open folder"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8326
+#: ../src/file-manager/fm-directory-view.c:8312
 msgid "_Stop the drive associated with the open folder"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8330
+#: ../src/file-manager/fm-directory-view.c:8316
 msgid "Safely remove the drive associated with the open folder"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8334
+#: ../src/file-manager/fm-directory-view.c:8320
 msgid "Disconnect the drive associated with the open folder"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8338
+#: ../src/file-manager/fm-directory-view.c:8324
 msgid "Stop the multi-disk drive associated with the open folder"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8342
+#: ../src/file-manager/fm-directory-view.c:8328
 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:8521
-#: ../src/file-manager/fm-directory-view.c:8831
+#: ../src/file-manager/fm-directory-view.c:8507
+#: ../src/file-manager/fm-directory-view.c:8817
 #: ../src/file-manager/fm-tree-view.c:1287 ../src/caja-places-sidebar.c:2671
 msgid "Open in New _Window"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8523
-#: ../src/file-manager/fm-directory-view.c:8840
+#: ../src/file-manager/fm-directory-view.c:8509
+#: ../src/file-manager/fm-directory-view.c:8826
 msgid "Browse in New _Window"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8529
-#: ../src/file-manager/fm-directory-view.c:8850
+#: ../src/file-manager/fm-directory-view.c:8515
+#: ../src/file-manager/fm-directory-view.c:8836
 msgid "_Browse Folder"
 msgid_plural "_Browse Folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-directory-view.c:8546
-#: ../src/file-manager/fm-directory-view.c:8879
+#: ../src/file-manager/fm-directory-view.c:8532
+#: ../src/file-manager/fm-directory-view.c:8865
 msgid "Browse in New _Tab"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8595
-#: ../src/file-manager/fm-directory-view.c:8920
+#: ../src/file-manager/fm-directory-view.c:8581
+#: ../src/file-manager/fm-directory-view.c:8906
 msgid "_Delete Permanently"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8596
+#: ../src/file-manager/fm-directory-view.c:8582
 msgid "Delete the open folder permanently"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8600
+#: ../src/file-manager/fm-directory-view.c:8586
 msgid "Move the open folder to the Trash"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8780
+#: ../src/file-manager/fm-directory-view.c:8766
 #, c-format
 msgid "_Open With %s"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:8833
+#: ../src/file-manager/fm-directory-view.c:8819
 #, 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:8842
+#: ../src/file-manager/fm-directory-view.c:8828
 #, 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:8872
+#: ../src/file-manager/fm-directory-view.c:8858
 #, 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:8881
+#: ../src/file-manager/fm-directory-view.c:8867
 #, 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:8921
+#: ../src/file-manager/fm-directory-view.c:8907
 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:8978
+#: ../src/file-manager/fm-directory-view.c:8964
 msgid "View or modify the properties of the open folder"
 msgstr ""
 
-#: ../src/file-manager/fm-directory-view.c:10281
+#: ../src/file-manager/fm-directory-view.c:10267
 msgid "Download location?"
 msgstr "Àyè à̀gbéwọlè?"
 
-#: ../src/file-manager/fm-directory-view.c:10284
+#: ../src/file-manager/fm-directory-view.c:10270
 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:10287
+#: ../src/file-manager/fm-directory-view.c:10273
 msgid "Make a _Link"
 msgstr "Ṣe _Líǹkì kan"
 
-#: ../src/file-manager/fm-directory-view.c:10291
+#: ../src/file-manager/fm-directory-view.c:10280
 msgid "_Download"
 msgstr "_Àgbéwọlé"
 
-#: ../src/file-manager/fm-directory-view.c:10452
-#: ../src/file-manager/fm-directory-view.c:10511
-#: ../src/file-manager/fm-directory-view.c:10616
+#: ../src/file-manager/fm-directory-view.c:10441
+#: ../src/file-manager/fm-directory-view.c:10500
+#: ../src/file-manager/fm-directory-view.c:10605
 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:10453
+#: ../src/file-manager/fm-directory-view.c:10442
 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."
+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:10512
-#: ../src/file-manager/fm-directory-view.c:10617
+#: ../src/file-manager/fm-directory-view.c:10501
+#: ../src/file-manager/fm-directory-view.c:10606
 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:10694
+#: ../src/file-manager/fm-directory-view.c:10683
 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:10739
+#: ../src/file-manager/fm-directory-view.c:10728
 msgid "dropped data"
 msgstr ""
 
 #. Reset to default info
-#: ../src/file-manager/fm-directory-view.c:11128
+#: ../src/file-manager/fm-directory-view.c:11117
 msgid "Undo"
 msgstr ""
 
 #. Reset to default info
-#: ../src/file-manager/fm-directory-view.c:11146
+#: ../src/file-manager/fm-directory-view.c:11135
 msgid "Redo"
 msgstr ""
 
-#: ../src/file-manager/fm-ditem-page.c:437
-#: ../src/file-manager/fm-ditem-page.c:449
+#: ../src/file-manager/fm-ditem-page.c:433
+#: ../src/file-manager/fm-ditem-page.c:445
 msgid "Comment"
 msgstr "Ìdáásí"
 
-#: ../src/file-manager/fm-ditem-page.c:440
+#: ../src/file-manager/fm-ditem-page.c:436
 msgid "URL"
 msgstr "URL"
 
-#: ../src/file-manager/fm-ditem-page.c:443
-#: ../src/file-manager/fm-ditem-page.c:455
-#: ../src/caja-image-properties-page.c:370
+#: ../src/file-manager/fm-ditem-page.c:439
+#: ../src/file-manager/fm-ditem-page.c:451
+#: ../src/caja-image-properties-page.c:366
 msgid "Description"
 msgstr "Àpèjúwe"
 
-#: ../src/file-manager/fm-ditem-page.c:452
+#: ../src/file-manager/fm-ditem-page.c:448
 msgid "Command"
 msgstr "Àṣẹ"
 
 #: ../src/file-manager/fm-error-reporting.c:69
 #, c-format
 msgid "You do not have the permissions necessary to view the contents of \"%s\"."
-msgstr "O kò ní àwọn ìyànda kòṣemáàní láti wòye àwọn àkóónú \"%s\"."
+msgstr ""
+"O kò ní àwọn ìyànda kòṣemáàní láti wòye àwọn àkóónú \"%s\"."
 
 #: ../src/file-manager/fm-error-reporting.c:73
 #, c-format
@@ -4849,12 +4992,16 @@ msgstr "A kò lè ṣàfihàn àwọn àkóónú fódà náà."
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
-msgstr "A ti lo orúkọ \"%s\" nínú fódà yìí tẹ́lẹ̀. Jọ̀wọ́ lo orúkọ mìíràn."
+msgstr ""
+"A ti lo orúkọ \"%s\" nínú fódà yìí tẹ́lẹ̀. Jọ̀wọ́ lo orúkọ "
+"mìíràn."
 
 #: ../src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
-msgstr "Kò sí \"%s\" nínú fódà yìí. Ó ṣeé ṣe kó jẹ́ pé a ṣẹ̀ gbe tàbí paájẹ ni?"
+msgstr ""
+"Kò sí \"%s\" nínú fódà yìí. Ó ṣeé ṣe kó jẹ́ pé a ṣẹ̀ gbe tàbí "
+"paájẹ ni?"
 
 #: ../src/file-manager/fm-error-reporting.c:127
 #, c-format
@@ -4866,7 +5013,9 @@ msgstr "O kò ní àwọn ìyànda kòsemáàní láti tún \"%s\" s�
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please"
 " use a different name."
-msgstr "Orúkọ \"%s\" kò fesẹ̀múlẹ̀ nítorí pé ó ní àmì-ìkọ \"/\".Jọ̀wọ́ lo orúkọ mìíràn."
+msgstr ""
+"Orúkọ \"%s\" kò fesẹ̀múlẹ̀ nítorí pé ó ní àmì-ìkọ \"/\".Jọ̀wọ́ lo"
+" orúkọ mìíràn."
 
 #: ../src/file-manager/fm-error-reporting.c:139
 #, c-format
@@ -4936,7 +5085,8 @@ msgstr "nípa _Orúkọ"
 #: ../src/file-manager/fm-icon-view.c:129
 #: ../src/file-manager/fm-icon-view.c:1740
 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̀"
+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̀"
 
 #: ../src/file-manager/fm-icon-view.c:135
 msgid "by _Size"
@@ -4945,7 +5095,8 @@ msgstr "nípa _Ìwọ̀n"
 #: ../src/file-manager/fm-icon-view.c:136
 #: ../src/file-manager/fm-icon-view.c:1746
 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̀"
+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̀"
 
 #: ../src/file-manager/fm-icon-view.c:142
 msgid "by Size on Disk"
@@ -4962,7 +5113,8 @@ msgstr "nípa _Irúfẹ́"
 #: ../src/file-manager/fm-icon-view.c:150
 #: ../src/file-manager/fm-icon-view.c:1752
 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̀"
+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̀"
 
 #: ../src/file-manager/fm-icon-view.c:156
 msgid "by Modification _Date"
@@ -4971,7 +5123,9 @@ msgstr "nípa Déètì _Àtúntò"
 #: ../src/file-manager/fm-icon-view.c:157
 #: ../src/file-manager/fm-icon-view.c:1758
 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̀"
+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̀"
 
 #: ../src/file-manager/fm-icon-view.c:163
 msgid "by _Emblems"
@@ -4980,7 +5134,9 @@ msgstr "nípa _Àwọn Àmì Àpẹẹrẹ"
 #: ../src/file-manager/fm-icon-view.c:164
 #: ../src/file-manager/fm-icon-view.c:1764
 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̀"
+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̀"
 
 #: ../src/file-manager/fm-icon-view.c:170
 msgid "by T_rash Time"
@@ -5032,7 +5188,9 @@ msgstr ""
 #. tooltip
 #: ../src/file-manager/fm-icon-view.c:1702
 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"
+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
@@ -5162,7 +5320,7 @@ 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:1837
-#: ../src/file-manager/fm-list-view.c:3454
+#: ../src/file-manager/fm-list-view.c:3450
 #: ../src/caja-file-management-properties.ui.h:2
 msgid "List View"
 msgstr "Òye Àtòjọ"
@@ -5178,29 +5336,29 @@ msgstr ""
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-list-view.c:2608
+#: ../src/file-manager/fm-list-view.c:2604
 msgid "Visible _Columns..."
 msgstr "Àwọn _Kọ́lọ̀mù Afojúrí..."
 
 #. tooltip
-#: ../src/file-manager/fm-list-view.c:2609
+#: ../src/file-manager/fm-list-view.c:2605
 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:3456
+#: ../src/file-manager/fm-list-view.c:3452
 msgid "_List"
 msgstr "_Àtòjọ"
 
-#: ../src/file-manager/fm-list-view.c:3457
+#: ../src/file-manager/fm-list-view.c:3453
 msgid "The list view encountered an error."
 msgstr ""
 
-#: ../src/file-manager/fm-list-view.c:3458
+#: ../src/file-manager/fm-list-view.c:3454
 msgid "The list view encountered an error while starting up."
 msgstr ""
 
-#: ../src/file-manager/fm-list-view.c:3459
+#: ../src/file-manager/fm-list-view.c:3455
 msgid "Display this location with the list view."
 msgstr ""
 
@@ -5222,7 +5380,9 @@ msgstr "Fáìlì tí o jù sílẹ̀ kìí ṣe ti agbègbè."
 #: ../src/file-manager/fm-properties-window.c:514
 #: ../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."
+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:513
 #: ../src/caja-information-panel.c:563
@@ -5251,30 +5411,30 @@ msgctxt "MIME type description (MIME type)"
 msgid "%s (%s)"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:1540
+#: ../src/file-manager/fm-properties-window.c:1536
 msgid "Cancel Group Change?"
 msgstr "Pa Ìyípadà Olóhun Rẹ́?"
 
-#: ../src/file-manager/fm-properties-window.c:1950
+#: ../src/file-manager/fm-properties-window.c:1946
 msgid "Cancel Owner Change?"
 msgstr "Pa Ìyípadà Olóhun Rẹ́?"
 
-#: ../src/file-manager/fm-properties-window.c:2274
+#: ../src/file-manager/fm-properties-window.c:2270
 msgid "nothing"
 msgstr "òfo"
 
-#: ../src/file-manager/fm-properties-window.c:2276
+#: ../src/file-manager/fm-properties-window.c:2272
 msgid "unreadable"
 msgstr "kò ṣeé kà"
 
-#: ../src/file-manager/fm-properties-window.c:2295
+#: ../src/file-manager/fm-properties-window.c:2291
 #, c-format
 msgid "%'d item, with size %s (%s on disk)"
 msgid_plural "%'d items, totalling %s (%s on disk)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file-manager/fm-properties-window.c:2305
+#: ../src/file-manager/fm-properties-window.c:2301
 msgid "(some contents unreadable)"
 msgstr "(ọ̀pọ̀lọpọ̀ àwọn àkóónú ni kò ṣeé kà)"
 
@@ -5283,243 +5443,264 @@ 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:2322
+#: ../src/file-manager/fm-properties-window.c:2318
 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:3098
+#: ../src/file-manager/fm-properties-window.c:3094
 msgid "used"
 msgstr ""
 
 #. Translators: "free" refers to the capacity of the filesystem
-#: ../src/file-manager/fm-properties-window.c:3107
+#: ../src/file-manager/fm-properties-window.c:3103
 msgid "free"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:3109
+#: ../src/file-manager/fm-properties-window.c:3105
 msgid "Total capacity:"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:3118
+#: ../src/file-manager/fm-properties-window.c:3114
 msgid "Filesystem type:"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:3204
+#: ../src/file-manager/fm-properties-window.c:3200
 msgid "Basic"
 msgstr "Ìbẹ̀rẹ̀"
 
-#: ../src/file-manager/fm-properties-window.c:3266
+#: ../src/file-manager/fm-properties-window.c:3262
 msgid "Link target:"
 msgstr "Òsùnsùn líǹkì:"
 
-#: ../src/file-manager/fm-properties-window.c:3280
+#: ../src/file-manager/fm-properties-window.c:3276
 msgid "Size on Disk:"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:3289
+#: ../src/file-manager/fm-properties-window.c:3285
 #: ../src/caja-location-bar.c:57
 msgid "Location:"
 msgstr "Àyè:"
 
-#: ../src/file-manager/fm-properties-window.c:3295
+#: ../src/file-manager/fm-properties-window.c:3291
 msgid "Volume:"
 msgstr "Ìgbóhùnsókè-sódò:"
 
-#: ../src/file-manager/fm-properties-window.c:3304
+#: ../src/file-manager/fm-properties-window.c:3300
 msgid "Accessed:"
 msgstr "Ó Ráyè:"
 
-#: ../src/file-manager/fm-properties-window.c:3308
+#: ../src/file-manager/fm-properties-window.c:3304
 msgid "Modified:"
 msgstr "A Tuntò:"
 
-#: ../src/file-manager/fm-properties-window.c:3317
+#: ../src/file-manager/fm-properties-window.c:3313
 msgid "Free space:"
 msgstr "Àyè òfìfo:"
 
-#: ../src/file-manager/fm-properties-window.c:3431
+#: ../src/file-manager/fm-properties-window.c:3427
 #: ../src/caja-emblem-sidebar.c:1085
 msgid "Emblems"
 msgstr "Àwọn Àmì Àpẹẹrẹ"
 
-#: ../src/file-manager/fm-properties-window.c:3840
+#: ../src/file-manager/fm-properties-window.c:3836
 msgid "_Read"
 msgstr "_Kàá"
 
-#: ../src/file-manager/fm-properties-window.c:3842
+#: ../src/file-manager/fm-properties-window.c:3838
 msgid "_Write"
 msgstr "_Kọ"
 
-#: ../src/file-manager/fm-properties-window.c:3844
+#: ../src/file-manager/fm-properties-window.c:3840
 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:4112
-#: ../src/file-manager/fm-properties-window.c:4123
-#: ../src/file-manager/fm-properties-window.c:4135
+#: ../src/file-manager/fm-properties-window.c:4108
+#: ../src/file-manager/fm-properties-window.c:4119
+#: ../src/file-manager/fm-properties-window.c:4131
 msgid "no "
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4115
+#: ../src/file-manager/fm-properties-window.c:4111
 msgid "list"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4117
+#: ../src/file-manager/fm-properties-window.c:4113
 msgid "read"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4126
+#: ../src/file-manager/fm-properties-window.c:4122
 msgid "create/delete"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4128
+#: ../src/file-manager/fm-properties-window.c:4124
 msgid "write"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4137
+#: ../src/file-manager/fm-properties-window.c:4133
 msgid "access"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4185
+#: ../src/file-manager/fm-properties-window.c:4181
 msgid "Access:"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4187
+#: ../src/file-manager/fm-properties-window.c:4183
 msgid "Folder access:"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4189
+#: ../src/file-manager/fm-properties-window.c:4185
 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:4204
-#: ../src/file-manager/fm-properties-window.c:4215
-#: ../src/caja-file-management-properties.c:335
+#: ../src/file-manager/fm-properties-window.c:4200
+#: ../src/file-manager/fm-properties-window.c:4211
+#: ../src/caja-file-management-properties.c:329
 msgid "None"
 msgstr "Kò sí"
 
-#: ../src/file-manager/fm-properties-window.c:4207
+#: ../src/file-manager/fm-properties-window.c:4203
 msgid "List files only"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4209
+#: ../src/file-manager/fm-properties-window.c:4205
 msgid "Access files"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4211
+#: ../src/file-manager/fm-properties-window.c:4207
 msgid "Create and delete files"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4218
+#: ../src/file-manager/fm-properties-window.c:4214
 msgid "Read-only"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4220
+#: ../src/file-manager/fm-properties-window.c:4216
 msgid "Read and write"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4285
+#: ../src/file-manager/fm-properties-window.c:4281
 msgid "Special flags:"
 msgstr "Àwọn àsíá pàtàkì:"
 
-#: ../src/file-manager/fm-properties-window.c:4287
+#: ../src/file-manager/fm-properties-window.c:4283
 msgid "Set _user ID"
 msgstr "Ṣàgbékalẹ̀ _ID òǹlò"
 
-#: ../src/file-manager/fm-properties-window.c:4288
+#: ../src/file-manager/fm-properties-window.c:4284
 msgid "Set gro_up ID"
 msgstr "Ṣàgbékalẹ̀ ID ẹgb_ẹ́"
 
-#: ../src/file-manager/fm-properties-window.c:4289
+#: ../src/file-manager/fm-properties-window.c:4285
 msgid "_Sticky"
 msgstr "_Lílẹ̀ Mọ́wọ́"
 
-#: ../src/file-manager/fm-properties-window.c:4364
-#: ../src/file-manager/fm-properties-window.c:4555
+#: ../src/file-manager/fm-properties-window.c:4360
+#: ../src/file-manager/fm-properties-window.c:4551
 msgid "_Owner:"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4372
-#: ../src/file-manager/fm-properties-window.c:4460
-#: ../src/file-manager/fm-properties-window.c:4564
+#: ../src/file-manager/fm-properties-window.c:4368
+#: ../src/file-manager/fm-properties-window.c:4456
+#: ../src/file-manager/fm-properties-window.c:4560
 msgid "Owner:"
 msgstr "Olóhun:"
 
-#: ../src/file-manager/fm-properties-window.c:4394
-#: ../src/file-manager/fm-properties-window.c:4577
+#: ../src/file-manager/fm-properties-window.c:4390
+#: ../src/file-manager/fm-properties-window.c:4573
 msgid "_Group:"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4402
-#: ../src/file-manager/fm-properties-window.c:4461
-#: ../src/file-manager/fm-properties-window.c:4585
+#: ../src/file-manager/fm-properties-window.c:4398
+#: ../src/file-manager/fm-properties-window.c:4457
+#: ../src/file-manager/fm-properties-window.c:4581
 msgid "Group:"
 msgstr "Ẹgbẹ́:"
 
-#: ../src/file-manager/fm-properties-window.c:4426
+#: ../src/file-manager/fm-properties-window.c:4422
 msgid "Others"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4441
+#: ../src/file-manager/fm-properties-window.c:4437
 msgid "Execute:"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4444
+#: ../src/file-manager/fm-properties-window.c:4440
 msgid "Allow _executing file as program"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4462
+#: ../src/file-manager/fm-properties-window.c:4458
 msgid "Others:"
 msgstr "Àwọn Mìíràn:"
 
-#: ../src/file-manager/fm-properties-window.c:4601
+#: ../src/file-manager/fm-properties-window.c:4597
 msgid "Folder Permissions:"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4608
+#: ../src/file-manager/fm-properties-window.c:4604
 msgid "File Permissions:"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4617
+#: ../src/file-manager/fm-properties-window.c:4613
 msgid "Text view:"
 msgstr "Òye Àyọkà:"
 
-#: ../src/file-manager/fm-properties-window.c:4763
+#: ../src/file-manager/fm-properties-window.c:4759
 msgid "You are not the owner, so you cannot change these permissions."
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4783
+#: ../src/file-manager/fm-properties-window.c:4779
 msgid "SELinux context:"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4788
+#: ../src/file-manager/fm-properties-window.c:4784
 msgid "Last changed:"
 msgstr "Àyípadà tó kẹ́yìn:"
 
-#: ../src/file-manager/fm-properties-window.c:4799
+#: ../src/file-manager/fm-properties-window.c:4795
 msgid "Apply Permissions to Enclosed Files"
 msgstr ""
 
-#: ../src/file-manager/fm-properties-window.c:4809
+#: ../src/file-manager/fm-properties-window.c:4805
 #, 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:4812
+#: ../src/file-manager/fm-properties-window.c:4808
 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:5386
+#. create the "help" button
+#. name, icon name, label
+#: ../src/file-manager/fm-properties-window.c:5172
+#: ../src/caja-bookmarks-window.ui.h:2
+#: ../src/caja-connect-server-dialog.c:1117
+#: ../src/caja-file-management-properties.ui.h:40
+#: ../src/caja-location-dialog.c:189 ../src/caja-property-browser.c:390
+#: ../src/caja-window-menus.c:809
+msgid "_Help"
+msgstr "_Ìrànwọ́"
+
+#. create the "close" button
+#. name, icon name
+#. label, accelerator
+#: ../src/file-manager/fm-properties-window.c:5177
+#: ../src/caja-bookmarks-window.ui.h:5
+#: ../src/caja-file-management-properties.ui.h:41
+#: ../src/caja-property-browser.c:398 ../src/caja-window-menus.c:811
+msgid "_Close"
+msgstr "_Ti"
+
+#: ../src/file-manager/fm-properties-window.c:5387
 msgid "Creating Properties window."
 msgstr "Ń Ṣẹ̀dá Fèrèsé Àwọn Àbùdá."
 
-#: ../src/file-manager/fm-properties-window.c:5682
+#: ../src/file-manager/fm-properties-window.c:5676
 msgid "Select Custom Icon"
 msgstr ""
 
@@ -5527,11 +5708,11 @@ msgstr ""
 msgid "File System"
 msgstr ""
 
-#: ../src/file-manager/fm-tree-view.c:1729
+#: ../src/file-manager/fm-tree-view.c:1727
 msgid "Tree"
 msgstr "Igi"
 
-#: ../src/file-manager/fm-tree-view.c:1735
+#: ../src/file-manager/fm-tree-view.c:1733
 msgid "Show Tree"
 msgstr ""
 
@@ -5544,7 +5725,9 @@ msgstr "Caja kò lè ṣẹ̀dá fódà tí a bèrè fún náà \"%s\
 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ẹ̀."
+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:488
 #, c-format
@@ -5555,7 +5738,9 @@ msgstr "Caja kò lè ṣẹ̀dá àwọn fódà tí wọ́n ń bèrè
 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."
+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:1264 ../src/caja-places-sidebar.c:2191
 #: ../src/caja-places-sidebar.c:2222 ../src/caja-places-sidebar.c:2257
@@ -5599,7 +5784,9 @@ msgstr "Kàn ṣẹ̀dá àwọn fèrèsé fún àwọn URI tí a sọ
 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)."
+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:2024
 msgid ""
@@ -5654,16 +5841,18 @@ msgid ""
 "If in doubt, press Cancel."
 msgstr ""
 
-#: ../src/caja-bookmarks-window.c:164
-#: ../src/caja-file-management-properties.c:242
-#: ../src/caja-property-browser.c:1677 ../src/caja-window-menus.c:598
+#: ../src/caja-bookmarks-window.c:158
+#: ../src/caja-file-management-properties.c:236
+#: ../src/caja-property-browser.c:1664 ../src/caja-window-menus.c:590
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
 "%s"
-msgstr "Àṣìṣe wà nínú ìṣàfihàn ìrànwọ́: \n%s"
+msgstr ""
+"Àṣìṣe wà nínú ìṣàfihàn ìrànwọ́: \n"
+"%s"
 
-#: ../src/caja-bookmarks-window.c:200
+#: ../src/caja-bookmarks-window.c:194
 msgid "No bookmarks defined"
 msgstr "Kò sí soríkì àwọn àmì-ìwé kankan"
 
@@ -5671,15 +5860,19 @@ msgstr "Kò sí soríkì àwọn àmì-ìwé kankan"
 msgid "Edit Bookmarks"
 msgstr "Ṣàyẹ̀wò Àwọn Àmì-ìwé"
 
-#: ../src/caja-bookmarks-window.ui.h:2
+#: ../src/caja-bookmarks-window.ui.h:3
+msgid "_Jump to"
+msgstr ""
+
+#: ../src/caja-bookmarks-window.ui.h:6
 msgid "<b>_Bookmarks</b>"
 msgstr "<b>_Àwọn Àmì-ìwé</b>"
 
-#: ../src/caja-bookmarks-window.ui.h:3
+#: ../src/caja-bookmarks-window.ui.h:7
 msgid "<b>_Name</b>"
 msgstr "<b>_Orúkọ</b>"
 
-#: ../src/caja-bookmarks-window.ui.h:4
+#: ../src/caja-bookmarks-window.ui.h:8
 msgid "<b>_Location</b>"
 msgstr "<b>_Àyè</b>"
 
@@ -5752,74 +5945,74 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
-#: ../src/caja-connect-server-dialog.c:742
-#: ../src/caja-connect-server-dialog.c:1171
+#: ../src/caja-connect-server-dialog.c:736
+#: ../src/caja-connect-server-dialog.c:1127
 msgid "C_onnect"
 msgstr "D_arapọ̀"
 
 #. set dialog properties
-#: ../src/caja-connect-server-dialog.c:866
+#: ../src/caja-connect-server-dialog.c:860
 msgid "Connect to Server"
 msgstr "Darapọ̀ mọ́ Sáfà"
 
-#: ../src/caja-connect-server-dialog.c:880
+#: ../src/caja-connect-server-dialog.c:874
 msgid "Server Details"
 msgstr ""
 
 #. first row: server entry + port spinbutton
-#: ../src/caja-connect-server-dialog.c:904
+#: ../src/caja-connect-server-dialog.c:894
 msgid "_Server:"
 msgstr "_Sáfà:"
 
 #. port
-#: ../src/caja-connect-server-dialog.c:926
+#: ../src/caja-connect-server-dialog.c:912
 msgid "_Port:"
 msgstr "_Ààlà ìfibọ̀:"
 
 #. third row: share entry
-#: ../src/caja-connect-server-dialog.c:1025
+#: ../src/caja-connect-server-dialog.c:1003
 msgid "Share:"
 msgstr ""
 
 #. fourth row: folder entry
-#: ../src/caja-connect-server-dialog.c:1041
+#: ../src/caja-connect-server-dialog.c:1015
 msgid "Folder:"
 msgstr ""
 
-#: ../src/caja-connect-server-dialog.c:1058
+#: ../src/caja-connect-server-dialog.c:1028
 msgid "User Details"
 msgstr ""
 
 #. first row: domain entry
-#: ../src/caja-connect-server-dialog.c:1082
+#: ../src/caja-connect-server-dialog.c:1048
 msgid "Domain Name:"
 msgstr ""
 
 #. second row: username entry
-#: ../src/caja-connect-server-dialog.c:1098
+#: ../src/caja-connect-server-dialog.c:1060
 msgid "User Name:"
 msgstr ""
 
 #. third row: password entry
-#: ../src/caja-connect-server-dialog.c:1114
+#: ../src/caja-connect-server-dialog.c:1072
 msgid "Password:"
 msgstr ""
 
 #. fourth row: remember checkbox
-#: ../src/caja-connect-server-dialog.c:1131
+#: ../src/caja-connect-server-dialog.c:1085
 msgid "Remember this password"
 msgstr ""
 
-#: ../src/caja-connect-server-dialog.c:1142
+#: ../src/caja-connect-server-dialog.c:1096
 msgid "Add _bookmark"
 msgstr ""
 
-#: ../src/caja-connect-server-dialog.c:1149
+#: ../src/caja-connect-server-dialog.c:1103
 msgid "Bookmark Name:"
 msgstr ""
 
-#: ../src/caja-desktop-window.c:87 ../src/caja-desktop-window.c:267
-#: ../src/caja-pathbar.c:1403 ../src/caja-places-sidebar.c:519
+#: ../src/caja-desktop-window.c:87 ../src/caja-desktop-window.c:264
+#: ../src/caja-pathbar.c:1399 ../src/caja-places-sidebar.c:519
 msgid "Desktop"
 msgstr "Ojú-iṣẹ́"
 
@@ -5832,7 +6025,9 @@ msgstr ""
 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ẹ."
+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:264
 #, c-format
@@ -5859,25 +6054,36 @@ msgstr "Ṣàfikún Àwọn Àmì Àpẹẹrẹ..."
 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ọ̀."
+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: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ọ̀."
+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: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ẹ"
+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: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ẹ̀."
+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: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ẹ."
+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:847 ../src/caja-emblem-sidebar.c:910
 #, c-format
@@ -5896,7 +6102,7 @@ msgstr "A kò lè ṣàfikún àmì àpẹẹrẹ náà."
 msgid "Show Emblems"
 msgstr ""
 
-#: ../src/caja-file-management-properties.c:638
+#: ../src/caja-file-management-properties.c:632
 msgid "About Extension"
 msgstr ""
 
@@ -6023,389 +6229,392 @@ msgstr ""
 msgid "File Management Preferences"
 msgstr "Àwọn ìkúndùn Àbájútó Fáìlì"
 
-#: ../src/caja-file-management-properties.ui.h:40
+#: ../src/caja-file-management-properties.ui.h:42
 msgid "<b>Default View</b>"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:41
+#: ../src/caja-file-management-properties.ui.h:43
 msgid "View _new folders using:"
 msgstr "Wòye _àwọn fódà tuntun tó ń lo:"
 
-#: ../src/caja-file-management-properties.ui.h:42
+#: ../src/caja-file-management-properties.ui.h:44
 msgid "_Arrange items:"
 msgstr "_To àwọn wúnrẹ̀n:"
 
-#: ../src/caja-file-management-properties.ui.h:43
+#: ../src/caja-file-management-properties.ui.h:45
 msgid "Sort _folders before files"
 msgstr "Ìṣàtò àwọn fódà ṣaájú àwọn fáìlì"
 
-#: ../src/caja-file-management-properties.ui.h:44
+#: ../src/caja-file-management-properties.ui.h:46
 msgid "Show hidden and _backup files"
 msgstr "Fí àwọn fáìlì tí a fi pamọ́ àti _aṣàtìlẹ́yìn hàn"
 
-#: ../src/caja-file-management-properties.ui.h:45
+#: ../src/caja-file-management-properties.ui.h:47
 msgid "<b>Icon View Defaults</b>"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:46
+#: ../src/caja-file-management-properties.ui.h:48
 msgid "Default _zoom level:"
 msgstr "Ìpele _ìfẹ̀ ìpéwọ̀n:"
 
-#: ../src/caja-file-management-properties.ui.h:47
+#: ../src/caja-file-management-properties.ui.h:49
 msgid "_Use compact layout"
 msgstr "_Lo ìlàálẹ̀ tó wàpọ̀"
 
-#: ../src/caja-file-management-properties.ui.h:48
+#: ../src/caja-file-management-properties.ui.h:50
 msgid "_Text beside icons"
 msgstr "_Àyọkà ẹ̀gbẹ́ àwọn áíkànnù"
 
-#: ../src/caja-file-management-properties.ui.h:49
+#: ../src/caja-file-management-properties.ui.h:51
 msgid "<b>Compact View Defaults</b>"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:50
+#: ../src/caja-file-management-properties.ui.h:52
 msgid "_Default zoom level:"
 msgstr "_Ìpelè ìfẹ̀ ìpéwọ̀n:"
 
-#: ../src/caja-file-management-properties.ui.h:51
+#: ../src/caja-file-management-properties.ui.h:53
 msgid "A_ll columns have the same width"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:52
+#: ../src/caja-file-management-properties.ui.h:54
 msgid "<b>List View Defaults</b>"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:53
+#: ../src/caja-file-management-properties.ui.h:55
 msgid "D_efault zoom level:"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:54
+#: ../src/caja-file-management-properties.ui.h:56
 msgid "<b>Tree View Defaults</b>"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:55
+#: ../src/caja-file-management-properties.ui.h:57
 msgid "Show _only folders"
 msgstr "Fi àwọn fódà _nìkan hàn"
 
-#: ../src/caja-file-management-properties.ui.h:56
+#: ../src/caja-file-management-properties.ui.h:58
 msgid "Views"
 msgstr "Àwọn Òye"
 
-#: ../src/caja-file-management-properties.ui.h:57
+#: ../src/caja-file-management-properties.ui.h:59
 msgid "<b>Behavior</b>"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:58
+#: ../src/caja-file-management-properties.ui.h:60
 msgid "_Single click to open items"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:59
+#: ../src/caja-file-management-properties.ui.h:61
 msgid "_Double click to open items"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:60
+#: ../src/caja-file-management-properties.ui.h:62
 msgid "Open each _folder in its own window"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:61
+#: ../src/caja-file-management-properties.ui.h:63
 msgid "<b>Executable Text Files</b>"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:62
+#: ../src/caja-file-management-properties.ui.h:64
 msgid "_Run executable text files when they are opened"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:63
+#: ../src/caja-file-management-properties.ui.h:65
 msgid "_View executable text files when they are opened"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:64
+#: ../src/caja-file-management-properties.ui.h:66
 msgid "_Ask each time"
 msgstr "_Bère àkókò kọ̀ọ̀kan"
 
-#: ../src/caja-file-management-properties.ui.h:65
+#: ../src/caja-file-management-properties.ui.h:67
 msgid "<b>Trash</b>"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:66
+#: ../src/caja-file-management-properties.ui.h:68
 msgid "Ask before _emptying the Trash or deleting files"
 msgstr "Bèrè kí o tó da Pàǹtí nù tàbí pa àwọn fáìlì jẹ"
 
-#: ../src/caja-file-management-properties.ui.h:67
+#: ../src/caja-file-management-properties.ui.h:69
 msgid "Ask before moving files to the _Trash"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:68
+#: ../src/caja-file-management-properties.ui.h:70
 msgid "I_nclude a Delete command that bypasses Trash"
 msgstr "F_i àṣẹ Ìpajẹ tí yóò kọ́ja Pàǹtí"
 
-#: ../src/caja-file-management-properties.ui.h:69
+#: ../src/caja-file-management-properties.ui.h:71
 msgid "Behavior"
 msgstr "Ìṣesí"
 
-#: ../src/caja-file-management-properties.ui.h:70
+#: ../src/caja-file-management-properties.ui.h:72
 msgid "<b>Icon Captions</b>"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:71
+#: ../src/caja-file-management-properties.ui.h:73
 msgid ""
 "Choose the order of information to appear beneath icon names. More "
 "information will appear when zooming in closer."
-msgstr "Yan ètò ìròyìn tí yóò farahàn nísàlẹ̀ àwọn orúkọ áíkànnù. Ìròyìn á sì tún farahàn nígbà tí o bá ń fẹ̀ẹ́ si."
+msgstr ""
+"Yan ètò ìròyìn tí yóò farahàn nísàlẹ̀ àwọn orúkọ áíkànnù. "
+"Ìròyìn á sì tún farahàn nígbà tí o bá ń fẹ̀ẹ́ si."
 
-#: ../src/caja-file-management-properties.ui.h:72
+#: ../src/caja-file-management-properties.ui.h:74
 msgid "<b>Date</b>"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:73
+#: ../src/caja-file-management-properties.ui.h:75
 msgid "_Format:"
 msgstr "_Ìgúnrégé:"
 
-#: ../src/caja-file-management-properties.ui.h:74
+#: ../src/caja-file-management-properties.ui.h:76
 msgid "<b>Size</b>"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:75
+#: ../src/caja-file-management-properties.ui.h:77
 msgid "_Show file sizes with IEC units"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:76
+#: ../src/caja-file-management-properties.ui.h:78
 msgid "Display"
 msgstr "Ìṣàfihàn"
 
-#: ../src/caja-file-management-properties.ui.h:77
+#: ../src/caja-file-management-properties.ui.h:79
 msgid "<b>List Columns</b>"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:78
+#: ../src/caja-file-management-properties.ui.h:80
 msgid "Choose the order of information to appear in the list view."
-msgstr "Yan ètò ìròyìn tí o fẹ́ kí o farahàn nínú òye àtòjọ náà."
+msgstr ""
+"Yan ètò ìròyìn tí o fẹ́ kí o farahàn nínú òye àtòjọ náà."
 
-#: ../src/caja-file-management-properties.ui.h:79
+#: ../src/caja-file-management-properties.ui.h:81
 msgid "List Columns"
 msgstr "Ṣàtòjọ Àwọn Kọ́lọ̀mù"
 
-#: ../src/caja-file-management-properties.ui.h:80
+#: ../src/caja-file-management-properties.ui.h:82
 msgid "<b>Text Files</b>"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:81
+#: ../src/caja-file-management-properties.ui.h:83
 msgid "Show te_xt in icons:"
 msgstr "Fi ày_ọkà hàn nínú àwọn áíkànnù:"
 
-#: ../src/caja-file-management-properties.ui.h:82
+#: ../src/caja-file-management-properties.ui.h:84
 msgid "<b>Other Previewable Files</b>"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:83
+#: ../src/caja-file-management-properties.ui.h:85
 msgid "Show _thumbnails:"
 msgstr "Fí àwọn _àpẹẹrẹ ojú-ìwé rébété hàn:"
 
-#: ../src/caja-file-management-properties.ui.h:84
+#: ../src/caja-file-management-properties.ui.h:86
 msgid "_Only for files smaller than:"
 msgstr "_Àwọn fáìlì tí ó kéré ju èyí lọ nìkan ló wà fún:"
 
-#: ../src/caja-file-management-properties.ui.h:85
+#: ../src/caja-file-management-properties.ui.h:87
 msgid "<b>Sound Files</b>"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:86
+#: ../src/caja-file-management-properties.ui.h:88
 msgid "Preview _sound files:"
 msgstr "Ṣàkọ́gbéyẹ̀wò _àwọn fáìlì ìró:"
 
-#: ../src/caja-file-management-properties.ui.h:87
+#: ../src/caja-file-management-properties.ui.h:89
 msgid "<b>Folders</b>"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:88
+#: ../src/caja-file-management-properties.ui.h:90
 msgid "Count _number of items:"
 msgstr "Ka _oye àwọn wúnrẹ̀n:"
 
-#: ../src/caja-file-management-properties.ui.h:89
+#: ../src/caja-file-management-properties.ui.h:91
 msgid "Preview"
 msgstr "Àkọ́gbéyẹ̀wò"
 
-#: ../src/caja-file-management-properties.ui.h:90
+#: ../src/caja-file-management-properties.ui.h:92
 msgid "<b>Media Handling</b>"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:91
+#: ../src/caja-file-management-properties.ui.h:93
 msgid ""
 "Choose what happens when inserting media or connecting devices to the system"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:92
+#: ../src/caja-file-management-properties.ui.h:94
 msgid "CD _Audio:"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:93
+#: ../src/caja-file-management-properties.ui.h:95
 msgid "_DVD Video:"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:94
+#: ../src/caja-file-management-properties.ui.h:96
 msgid "_Music Player:"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:95
+#: ../src/caja-file-management-properties.ui.h:97
 msgid "_Photos:"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:96
+#: ../src/caja-file-management-properties.ui.h:98
 msgid "_Software:"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:97
+#: ../src/caja-file-management-properties.ui.h:99
 msgid "<b>Other Media</b>"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:98
+#: ../src/caja-file-management-properties.ui.h:100
 msgid "Less common media formats can be configured here"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:99
+#: ../src/caja-file-management-properties.ui.h:101
 msgid "Acti_on:"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:100
+#: ../src/caja-file-management-properties.ui.h:102
 msgid "_Type:"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:101
+#: ../src/caja-file-management-properties.ui.h:103
 msgid "_Never prompt or start programs on media insertion"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:102
+#: ../src/caja-file-management-properties.ui.h:104
 msgid "B_rowse media when inserted"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:103
+#: ../src/caja-file-management-properties.ui.h:105
 msgid "Media"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:104
+#: ../src/caja-file-management-properties.ui.h:106
 msgid "<b>Available _Extensions:</b>"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:105
+#: ../src/caja-file-management-properties.ui.h:107
 msgid "column"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:106
+#: ../src/caja-file-management-properties.ui.h:108
 msgid "Extension"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:107
+#: ../src/caja-file-management-properties.ui.h:109
 msgid "_About Extension"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:108
+#: ../src/caja-file-management-properties.ui.h:110
 msgid "C_onfigure Extension"
 msgstr ""
 
-#: ../src/caja-file-management-properties.ui.h:109
+#: ../src/caja-file-management-properties.ui.h:111
 msgid "Extensions"
 msgstr ""
 
-#: ../src/caja-history-sidebar.c:338
+#: ../src/caja-history-sidebar.c:337
 msgid "History"
 msgstr "Ìtàn"
 
-#: ../src/caja-history-sidebar.c:344
+#: ../src/caja-history-sidebar.c:343
 msgid "Show History"
 msgstr ""
 
-#: ../src/caja-image-properties-page.c:280
+#: ../src/caja-image-properties-page.c:276
 msgid "Camera Brand"
 msgstr "Àmì-ìyàsọ́tọ̀ Kámẹ́rà"
 
-#: ../src/caja-image-properties-page.c:281
+#: ../src/caja-image-properties-page.c:277
 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:284
+#: ../src/caja-image-properties-page.c:280
 msgid "Date Taken"
 msgstr "Déètì Tí A Yàá"
 
-#: ../src/caja-image-properties-page.c:286
+#: ../src/caja-image-properties-page.c:282
 msgid "Date Digitized"
 msgstr ""
 
-#: ../src/caja-image-properties-page.c:292
+#: ../src/caja-image-properties-page.c:288
 msgid "Exposure Time"
 msgstr "Àkókò Oye-ìmọ́lẹ̀"
 
-#: ../src/caja-image-properties-page.c:293
+#: ../src/caja-image-properties-page.c:289
 msgid "Aperture Value"
 msgstr "Fálù Ojú-ihò"
 
-#: ../src/caja-image-properties-page.c:294
+#: ../src/caja-image-properties-page.c:290
 msgid "ISO Speed Rating"
 msgstr "Ìyásí Eré ISO"
 
-#: ../src/caja-image-properties-page.c:295
+#: ../src/caja-image-properties-page.c:291
 msgid "Flash Fired"
 msgstr "Fíláàṣì Bú Yàrì"
 
-#: ../src/caja-image-properties-page.c:296
+#: ../src/caja-image-properties-page.c:292
 msgid "Metering Mode"
 msgstr "Ọ̀nà Ìwọn Oye-ìmọ́lẹ̀"
 
-#: ../src/caja-image-properties-page.c:297
+#: ../src/caja-image-properties-page.c:293
 msgid "Exposure Program"
 msgstr "Àtòjọ-ètò Oye-ìmọ́lẹ̀"
 
-#: ../src/caja-image-properties-page.c:298
+#: ../src/caja-image-properties-page.c:294
 msgid "Focal Length"
 msgstr "Ìgùnsí Ojú-ẹ̀ká Nǹkan"
 
-#: ../src/caja-image-properties-page.c:299
+#: ../src/caja-image-properties-page.c:295
 msgid "Software"
 msgstr "Ẹ̀yà-ara kọ̀ǹpútà àìfojúrí"
 
-#: ../src/caja-image-properties-page.c:371
+#: ../src/caja-image-properties-page.c:367
 msgid "Keywords"
 msgstr ""
 
-#: ../src/caja-image-properties-page.c:372
+#: ../src/caja-image-properties-page.c:368
 msgid "Creator"
 msgstr ""
 
-#: ../src/caja-image-properties-page.c:373
+#: ../src/caja-image-properties-page.c:369
 msgid "Copyright"
 msgstr ""
 
-#: ../src/caja-image-properties-page.c:374
+#: ../src/caja-image-properties-page.c:370
 msgid "Rating"
 msgstr ""
 
-#: ../src/caja-image-properties-page.c:405
+#: ../src/caja-image-properties-page.c:401
 msgid "Image Type:"
 msgstr ""
 
-#: ../src/caja-image-properties-page.c:408
+#: ../src/caja-image-properties-page.c:404
 #, 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:414
+#: ../src/caja-image-properties-page.c:410
 #, 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:433
+#: ../src/caja-image-properties-page.c:429
 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:661
+#: ../src/caja-image-properties-page.c:657
 msgid "loading..."
 msgstr "Kíkì..."
 
-#: ../src/caja-image-properties-page.c:715
+#: ../src/caja-image-properties-page.c:711
 msgid "Image"
 msgstr "Àwòrán"
 
@@ -6438,20 +6647,21 @@ msgstr "Lọ Sí:"
 #, c-format
 msgid "Do you want to view %d location?"
 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?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/caja-location-dialog.c:163
+#: ../src/caja-location-dialog.c:157
 msgid "Open Location"
 msgstr "Ṣí Àyè"
 
-#: ../src/caja-location-dialog.c:173
+#: ../src/caja-location-dialog.c:167
 msgid "_Location:"
 msgstr "_Àyè:"
 
 #: ../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ẹ́?"
+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:408 ../src/caja-window-bookmarks.c:83
 #, c-format
@@ -6462,22 +6672,22 @@ msgstr "Àyè \"%s\" kò sí."
 msgid "The history location doesn't exist."
 msgstr ""
 
-#. name, stock id, label
+#. name, icon name, label
 #: ../src/caja-navigation-window-menus.c:824
 msgid "_Go"
 msgstr "_Lọ"
 
-#. name, stock id, label
+#. name, icon name, label
 #: ../src/caja-navigation-window-menus.c:825
 msgid "_Bookmarks"
 msgstr "_Àwọn Àmì-ìwé"
 
-#. name, stock id, label
+#. name, icon name, label
 #: ../src/caja-navigation-window-menus.c:826
 msgid "_Tabs"
 msgstr ""
 
-#. name, stock id, label
+#. name, icon name, label
 #: ../src/caja-navigation-window-menus.c:827
 msgid "New _Window"
 msgstr ""
@@ -6486,7 +6696,7 @@ msgstr ""
 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
+#. name, icon name, label
 #: ../src/caja-navigation-window-menus.c:831
 msgid "New _Tab"
 msgstr ""
@@ -6495,7 +6705,7 @@ msgstr ""
 msgid "Open another tab for the displayed location"
 msgstr ""
 
-#. name, stock id, label
+#. name, icon name, label
 #: ../src/caja-navigation-window-menus.c:835
 msgid "Open Folder W_indow"
 msgstr ""
@@ -6504,7 +6714,7 @@ msgstr ""
 msgid "Open a folder window for the displayed location"
 msgstr ""
 
-#. name, stock id, label
+#. name, icon name, label
 #: ../src/caja-navigation-window-menus.c:839
 msgid "Close _All Windows"
 msgstr "Ti _Gbogbo Àwọn Fèrèsé"
@@ -6513,7 +6723,7 @@ msgstr "Ti _Gbogbo Àwọn Fèrèsé"
 msgid "Close all Navigation windows"
 msgstr "Ti Gbogbo àwọn fèrèsé ìtọpa"
 
-#. name, stock id, label
+#. name, icon name, label
 #: ../src/caja-navigation-window-menus.c:843
 msgid "_Location..."
 msgstr "_Àyè..."
@@ -6522,16 +6732,17 @@ msgstr "_Àyè..."
 msgid "Specify a location to open"
 msgstr "Sọ ní pàtó àyè ta fẹ́ ṣí"
 
-#. name, stock id, label
+#. name, icon name, label
 #: ../src/caja-navigation-window-menus.c:847
 msgid "Clea_r History"
 msgstr "Pa_ Ìtàn Rẹ́"
 
 #: ../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ẹ́"
+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
+#. name, icon name, label
 #: ../src/caja-navigation-window-menus.c:851
 msgid "S_witch to Other Pane"
 msgstr ""
@@ -6540,7 +6751,7 @@ msgstr ""
 msgid "Move focus to the other pane in a split view window"
 msgstr ""
 
-#. name, stock id, label
+#. name, icon name, label
 #: ../src/caja-navigation-window-menus.c:855
 msgid "Sa_me Location as Other Pane"
 msgstr ""
@@ -6549,23 +6760,26 @@ msgstr ""
 msgid "Go to the same location as in the extra pane"
 msgstr ""
 
-#. name, stock id, label
+#. name, icon name, label
 #: ../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: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́"
+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
+#. name, icon name, label
 #: ../src/caja-navigation-window-menus.c:863 ../src/caja-spatial-window.c:960
 msgid "_Edit Bookmarks..."
 msgstr ""
 
 #: ../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́"
+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:868
 msgid "_Previous Tab"
@@ -6609,7 +6823,7 @@ msgstr ""
 msgid "Show search"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
 #: ../src/caja-navigation-window-menus.c:897
 msgid "_Main Toolbar"
@@ -6620,7 +6834,7 @@ msgstr ""
 msgid "Change the visibility of this window's main toolbar"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
 #: ../src/caja-navigation-window-menus.c:903
 msgid "_Side Pane"
@@ -6631,7 +6845,7 @@ msgstr "_Péènì Ẹ̀gbẹ́"
 msgid "Change the visibility of this window's side pane"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
 #: ../src/caja-navigation-window-menus.c:909
 msgid "Location _Bar"
@@ -6642,7 +6856,7 @@ msgstr "Àká _Àyè"
 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
+#. name, icon name
 #. label, accelerator
 #: ../src/caja-navigation-window-menus.c:915
 msgid "St_atusbar"
@@ -6653,9 +6867,9 @@ msgstr "Àk_á-ipò"
 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
+#. name, icon name
 #. label, accelerator
-#. name, stock id, label
+#. name, icon name, label
 #: ../src/caja-navigation-window-menus.c:921 ../src/caja-spatial-window.c:964
 msgid "_Search for Files..."
 msgstr ""
@@ -6729,15 +6943,15 @@ msgstr ""
 msgid "%s - File Browser"
 msgstr "%s - Awáròyìn Fáìlì"
 
-#: ../src/caja-notebook.c:337
+#: ../src/caja-notebook.c:330
 msgid "Close tab"
 msgstr ""
 
-#: ../src/caja-notes-viewer.c:399 ../src/caja-notes-viewer.c:503
+#: ../src/caja-notes-viewer.c:398 ../src/caja-notes-viewer.c:502
 msgid "Notes"
 msgstr "Àwọn Nóòtì"
 
-#: ../src/caja-notes-viewer.c:405
+#: ../src/caja-notes-viewer.c:404
 msgid "Show Notes"
 msgstr ""
 
@@ -6747,7 +6961,7 @@ msgstr ""
 
 #: ../src/caja-places-sidebar.c:317
 msgid "Bookmarks"
-msgstr ""
+msgstr "Àwọn Àmì-ìwé"
 
 #: ../src/caja-places-sidebar.c:521
 msgid "Open the contents of your desktop in a folder"
@@ -6822,11 +7036,11 @@ msgstr "Yọkúrò"
 msgid "Rename..."
 msgstr ""
 
-#: ../src/caja-places-sidebar.c:3382
+#: ../src/caja-places-sidebar.c:3381
 msgid "Places"
-msgstr ""
+msgstr "Àwọn Ibi"
 
-#: ../src/caja-places-sidebar.c:3388
+#: ../src/caja-places-sidebar.c:3387
 msgid "Show Places"
 msgstr ""
 
@@ -6836,159 +7050,161 @@ 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:409
+#: ../src/caja-property-browser.c:410
 msgid "_Remove..."
 msgstr "_Yọkúrò"
 
 #. now create the "add new" button
-#: ../src/caja-property-browser.c:423
+#: ../src/caja-property-browser.c:424
 msgid "Add new..."
 msgstr ""
 
-#: ../src/caja-property-browser.c:974
+#: ../src/caja-property-browser.c:975
 #, c-format
 msgid "Sorry, but pattern %s could not be deleted."
 msgstr ""
 
-#: ../src/caja-property-browser.c:975
+#: ../src/caja-property-browser.c:976
 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:991
+#: ../src/caja-property-browser.c:992
 #, c-format
 msgid "Sorry, but emblem %s could not be deleted."
 msgstr ""
 
-#: ../src/caja-property-browser.c:992
+#: ../src/caja-property-browser.c:993
 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:1064
+#: ../src/caja-property-browser.c:1065
 msgid "Select an Image File for the New Emblem"
 msgstr ""
 
-#: ../src/caja-property-browser.c:1105
+#: ../src/caja-property-browser.c:1106
 msgid "Create a New Emblem"
 msgstr ""
 
 #. make the keyword label and field
-#: ../src/caja-property-browser.c:1126
+#: ../src/caja-property-browser.c:1127
 msgid "_Keyword:"
 msgstr "_Kókó-ọ̀rọ̀:"
 
 #. set up a file chooser to pick the image file
-#: ../src/caja-property-browser.c:1149
+#: ../src/caja-property-browser.c:1146
 msgid "_Image:"
 msgstr "_Àwòrán:"
 
-#: ../src/caja-property-browser.c:1185
+#: ../src/caja-property-browser.c:1178
 msgid "Create a New Color:"
 msgstr "Ṣẹ̀dá Àwọ̀ Tuntun:"
 
 #. make the name label and field
-#: ../src/caja-property-browser.c:1199
+#: ../src/caja-property-browser.c:1192
 msgid "Color _name:"
 msgstr "Orúkọ _àwọ̀:"
 
-#: ../src/caja-property-browser.c:1215
+#: ../src/caja-property-browser.c:1208
 msgid "Color _value:"
 msgstr "Fálù _Àwọ̀:"
 
-#: ../src/caja-property-browser.c:1251
+#: ../src/caja-property-browser.c:1244
 msgid "Sorry, but you cannot replace the reset image."
 msgstr ""
 
-#: ../src/caja-property-browser.c:1252
+#: ../src/caja-property-browser.c:1245
 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:1282
+#: ../src/caja-property-browser.c:1275
 #, c-format
 msgid "Sorry, but the pattern %s could not be installed."
 msgstr ""
 
-#: ../src/caja-property-browser.c:1313
+#: ../src/caja-property-browser.c:1306
 msgid "Select an Image File to Add as a Pattern"
 msgstr ""
 
-#: ../src/caja-property-browser.c:1392 ../src/caja-property-browser.c:1422
+#: ../src/caja-property-browser.c:1385 ../src/caja-property-browser.c:1415
 msgid "The color cannot be installed."
 msgstr "Àwọ̀ náà kò ṣeé fi sípò."
 
-#: ../src/caja-property-browser.c:1393
+#: ../src/caja-property-browser.c:1386
 msgid "Sorry, but you must specify an unused color name for the new color."
 msgstr ""
 
-#: ../src/caja-property-browser.c:1423
+#: ../src/caja-property-browser.c:1416
 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̀."
+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:1483
+#: ../src/caja-property-browser.c:1476
 msgid "Select a Color to Add"
 msgstr ""
 
-#: ../src/caja-property-browser.c:1529 ../src/caja-property-browser.c:1547
+#: ../src/caja-property-browser.c:1522 ../src/caja-property-browser.c:1540
 #, 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:1530 ../src/caja-property-browser.c:1548
+#: ../src/caja-property-browser.c:1523 ../src/caja-property-browser.c:1541
 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:2299
+#: ../src/caja-property-browser.c:2284
 msgid "Select a Category:"
 msgstr "Yan Ọ̀wọ́ kan:"
 
-#: ../src/caja-property-browser.c:2311
+#: ../src/caja-property-browser.c:2296
 msgid "C_ancel Remove"
 msgstr "P_a Ìyọkúrò Rẹ́"
 
-#: ../src/caja-property-browser.c:2320
+#: ../src/caja-property-browser.c:2305
 msgid "_Add a New Pattern..."
 msgstr "_Ṣàfikún Bátànì Tuntun..."
 
-#: ../src/caja-property-browser.c:2323
+#: ../src/caja-property-browser.c:2308
 msgid "_Add a New Color..."
 msgstr "_Ṣàfikún Àwọ̀ Tuntun..."
 
-#: ../src/caja-property-browser.c:2326
+#: ../src/caja-property-browser.c:2311
 msgid "_Add a New Emblem..."
 msgstr "_Ṣàfikún Àmì Àpẹẹrẹ Tuntun..."
 
-#: ../src/caja-property-browser.c:2352
+#: ../src/caja-property-browser.c:2337
 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:2355
+#: ../src/caja-property-browser.c:2340
 msgid "Click on a color to remove it"
 msgstr "Tẹ̀ lórí àwọ̀ láti yọọ́ kúrò"
 
-#: ../src/caja-property-browser.c:2358
+#: ../src/caja-property-browser.c:2343
 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:2370
+#: ../src/caja-property-browser.c:2355
 msgid "Patterns:"
 msgstr "Àwọn Bátànì:"
 
-#: ../src/caja-property-browser.c:2373
+#: ../src/caja-property-browser.c:2358
 msgid "Colors:"
 msgstr "Àwọn Àwọ̀:"
 
-#: ../src/caja-property-browser.c:2376
+#: ../src/caja-property-browser.c:2361
 msgid "Emblems:"
 msgstr "Àwọn Àmì Àpẹẹrẹ:"
 
-#: ../src/caja-property-browser.c:2398
+#: ../src/caja-property-browser.c:2383
 msgid "_Remove a Pattern..."
 msgstr "_Yọ Bátànì Kúrò..."
 
-#: ../src/caja-property-browser.c:2401
+#: ../src/caja-property-browser.c:2386
 msgid "_Remove a Color..."
 msgstr "_Yọ Àwọ̀ Kúrò..."
 
-#: ../src/caja-property-browser.c:2404
+#: ../src/caja-property-browser.c:2389
 msgid "_Remove an Emblem..."
 msgstr "_Yọ Àmì Àpẹẹrẹ Kúrò..."
 
@@ -7049,55 +7265,55 @@ msgstr ""
 msgid "Select type"
 msgstr ""
 
-#: ../src/caja-query-editor.c:804
+#: ../src/caja-query-editor.c:802
 msgid "Any"
 msgstr ""
 
-#: ../src/caja-query-editor.c:820
+#: ../src/caja-query-editor.c:818
 msgid "Other Type..."
 msgstr ""
 
-#: ../src/caja-query-editor.c:1124
+#: ../src/caja-query-editor.c:1122
 msgid "Remove this criterion from the search"
 msgstr ""
 
-#: ../src/caja-query-editor.c:1171
+#: ../src/caja-query-editor.c:1169
 msgid "Search Folder"
 msgstr ""
 
-#: ../src/caja-query-editor.c:1177
+#: ../src/caja-query-editor.c:1175
 msgid "Edit"
 msgstr "Ṣàyẹ̀wò"
 
-#: ../src/caja-query-editor.c:1185
+#: ../src/caja-query-editor.c:1183
 msgid "Edit the saved search"
 msgstr ""
 
-#: ../src/caja-query-editor.c:1217
+#: ../src/caja-query-editor.c:1215
 msgid "Add a new criterion to this search"
 msgstr ""
 
-#: ../src/caja-query-editor.c:1223
+#: ../src/caja-query-editor.c:1221
 msgid "Go"
 msgstr ""
 
-#: ../src/caja-query-editor.c:1227
+#: ../src/caja-query-editor.c:1225
 msgid "Reload"
 msgstr ""
 
-#: ../src/caja-query-editor.c:1232
+#: ../src/caja-query-editor.c:1230
 msgid "Perform or update the search"
 msgstr ""
 
-#: ../src/caja-query-editor.c:1253
+#: ../src/caja-query-editor.c:1251
 msgid "_Search for:"
 msgstr ""
 
-#: ../src/caja-query-editor.c:1282
+#: ../src/caja-query-editor.c:1280
 msgid "Search results"
 msgstr ""
 
-#: ../src/caja-search-bar.c:170
+#: ../src/caja-search-bar.c:171
 msgid "Search:"
 msgstr ""
 
@@ -7105,17 +7321,17 @@ msgstr ""
 msgid "Close the side pane"
 msgstr "Ti péènì ẹgbẹ́ náà"
 
-#. name, stock id, label
+#. name, icon name, label
 #: ../src/caja-spatial-window.c:940
 msgid "_Places"
 msgstr "_Àwọn Ibi"
 
-#. name, stock id, label
+#. name, icon name, label
 #: ../src/caja-spatial-window.c:942
 msgid "Open _Location..."
 msgstr "Ṣí _Àyè..."
 
-#. name, stock id, label
+#. name, icon name, label
 #: ../src/caja-spatial-window.c:947
 msgid "Close P_arent Folders"
 msgstr "Ti Àwọn Fódà Ò_bí"
@@ -7124,7 +7340,7 @@ msgstr "Ti Àwọn Fódà Ò_bí"
 msgid "Close this folder's parents"
 msgstr "Ti àwọn òbí fódà yìí"
 
-#. name, stock id, label
+#. name, icon name, label
 #: ../src/caja-spatial-window.c:952
 msgid "Clos_e All Folders"
 msgstr "Ti_ Gbogbo Àwọn Fódà"
@@ -7149,7 +7365,9 @@ msgstr ""
 msgid ""
 "Do you want to remove any bookmarks with the non-existing location from your"
 " list?"
-msgstr "Ṣé o fẹ́ yọ àwọn àmi-ìwé tí kò ní sí ní àyè tó ti wà nílẹ̀ tẹ́lẹ̀ kúrò nínú àtòjọ rẹ ni?"
+msgstr ""
+"Ṣé o fẹ́ yọ àwọn àmi-ìwé tí kò ní sí ní àyè tó ti wà nílẹ̀ "
+"tẹ́lẹ̀ kúrò nínú àtòjọ rẹ ni?"
 
 #: ../src/caja-window-bookmarks.c:86
 msgid "Bookmark for Nonexistent Location"
@@ -7173,7 +7391,9 @@ msgstr "Òye fódà lọ́wọ́lọ́wọ́"
 
 #: ../src/caja-window-manage-views.c:2104
 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̀."
+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:2112
 msgid "The location is not a folder."
@@ -7217,7 +7437,9 @@ msgstr ""
 #: ../src/caja-window-manage-views.c:2162
 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̀."
+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:2178
 #, c-format
@@ -7269,210 +7491,201 @@ msgstr ""
 #. * box to give credit to the translator(s).
 #: ../src/caja-window-menus.c:550
 msgid "translator-credits"
-msgstr "Abigail Brady <[email protected]>\nBastien Nocera <[email protected]>\nGareth Owen <[email protected]>\nDavid Lodge <[email protected]>"
+msgstr "ìgbóríyìn òǹgbufọ̀"
 
 #: ../src/caja-window-menus.c:553
 msgid "MATE Web Site"
 msgstr ""
 
-#. name, stock id, label
-#: ../src/caja-window-menus.c:814
+#. name, icon name, label
+#: ../src/caja-window-menus.c:806
 msgid "_File"
 msgstr "_Fáìlì"
 
-#. name, stock id, label
-#: ../src/caja-window-menus.c:815
+#. name, icon name, label
+#: ../src/caja-window-menus.c:807
 msgid "_Edit"
 msgstr "_Ṣàyẹ̀wò"
 
-#. name, stock id, label
-#: ../src/caja-window-menus.c:816
+#. name, icon name, label
+#: ../src/caja-window-menus.c:808
 msgid "_View"
 msgstr "_Òye"
 
-#. name, stock id, label
-#: ../src/caja-window-menus.c:817
-msgid "_Help"
-msgstr "_Ìrànwọ́"
-
-#. name, stock id
-#. label, accelerator
-#: ../src/caja-window-menus.c:819
-msgid "_Close"
-msgstr "_Tìí"
-
 #. tooltip
-#: ../src/caja-window-menus.c:820
+#: ../src/caja-window-menus.c:812
 msgid "Close this folder"
 msgstr "Ti fódà yìí"
 
-#: ../src/caja-window-menus.c:825
+#: ../src/caja-window-menus.c:817
 msgid "_Backgrounds and Emblems..."
 msgstr "_Àwọn Ẹ̀yìn àti Àwọn Àmì Àpẹẹrẹ..."
 
-#: ../src/caja-window-menus.c:826
+#: ../src/caja-window-menus.c:818
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
-msgstr "Ṣàfihàn àwọn bátànì, àwọn àwọ̀, àti àwọn àmì àpẹẹrẹ tí a lè lò láti sọ ìrísí di rẹ́gí"
+msgstr ""
+"Ṣàfihàn àwọn bátànì, àwọn àwọ̀, àti àwọn àmì àpẹẹrẹ tí a lè "
+"lò láti sọ ìrísí di rẹ́gí"
 
-#: ../src/caja-window-menus.c:831
+#: ../src/caja-window-menus.c:823
 msgid "Prefere_nces"
 msgstr "Àwọn Ìkúnd_ùn"
 
-#: ../src/caja-window-menus.c:832
+#: ../src/caja-window-menus.c:824
 msgid "Edit Caja preferences"
 msgstr "Ṣàyẹ̀wò àwọn ìkúndùn Caja"
 
-#. name, stock id, label
-#: ../src/caja-window-menus.c:835
+#. name, icon name, label
+#: ../src/caja-window-menus.c:827
 msgid "Open _Parent"
 msgstr "Ṣí _Òbí"
 
-#: ../src/caja-window-menus.c:836
+#: ../src/caja-window-menus.c:828
 msgid "Open the parent folder"
 msgstr "Ṣí fódà òbí náà"
 
 #. tooltip
-#: ../src/caja-window-menus.c:845
+#: ../src/caja-window-menus.c:837
 msgid "Stop loading the current location"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/caja-window-menus.c:849
+#: ../src/caja-window-menus.c:841
 msgid "_Reload"
 msgstr "_Tunkì"
 
 #. tooltip
-#: ../src/caja-window-menus.c:850
+#: ../src/caja-window-menus.c:842
 msgid "Reload the current location"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/caja-window-menus.c:854
+#: ../src/caja-window-menus.c:846
 msgid "_Contents"
 msgstr "_Àwọn Àkóónú"
 
 #. tooltip
-#: ../src/caja-window-menus.c:855
+#: ../src/caja-window-menus.c:847
 msgid "Display Caja help"
 msgstr "Ṣàfihàn ìrànwọ́ Caja"
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/caja-window-menus.c:859
+#: ../src/caja-window-menus.c:851
 msgid "_About"
 msgstr "_Nípa"
 
 #. tooltip
-#: ../src/caja-window-menus.c:860
+#: ../src/caja-window-menus.c:852
 msgid "Display credits for the creators of Caja"
 msgstr "Ṣàfihàn ìgbóríyìn fún àwọn tó dá Caja"
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/caja-window-menus.c:864
+#: ../src/caja-window-menus.c:856
 msgid "Zoom _In"
 msgstr "Fẹ̀ẹ́ _Sínú"
 
 #. tooltip
-#: ../src/caja-window-menus.c:865 ../src/caja-zoom-control.c:96
-#: ../src/caja-zoom-control.c:398
+#: ../src/caja-window-menus.c:857 ../src/caja-zoom-control.c:96
+#: ../src/caja-zoom-control.c:371
 msgid "Increase the view size"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/caja-window-menus.c:879
+#: ../src/caja-window-menus.c:871
 msgid "Zoom _Out"
 msgstr "Fẹ̀ẹ́ _Síta"
 
 #. tooltip
-#: ../src/caja-window-menus.c:880 ../src/caja-zoom-control.c:97
-#: ../src/caja-zoom-control.c:335
+#: ../src/caja-window-menus.c:872 ../src/caja-zoom-control.c:97
+#: ../src/caja-zoom-control.c:316
 msgid "Decrease the view size"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/caja-window-menus.c:889
+#: ../src/caja-window-menus.c:881
 msgid "Normal Si_ze"
 msgstr "Ìw_ọ̀n Déédéé"
 
 #. tooltip
-#: ../src/caja-window-menus.c:890 ../src/caja-zoom-control.c:98
-#: ../src/caja-zoom-control.c:355
+#: ../src/caja-window-menus.c:882 ../src/caja-zoom-control.c:98
+#: ../src/caja-zoom-control.c:332
 msgid "Use the normal view size"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/caja-window-menus.c:894
+#: ../src/caja-window-menus.c:886
 msgid "Connect to _Server..."
 msgstr "Darapọ̀ mọ́ _Sáfà..."
 
 #. tooltip
-#: ../src/caja-window-menus.c:895
+#: ../src/caja-window-menus.c:887
 msgid "Connect to a remote computer or shared disk"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/caja-window-menus.c:904
+#: ../src/caja-window-menus.c:896
 msgid "_Computer"
 msgstr "_Kọ̀ǹpútà"
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/caja-window-menus.c:909
+#: ../src/caja-window-menus.c:901
 msgid "_Network"
 msgstr ""
 
 #. tooltip
-#: ../src/caja-window-menus.c:910 ../src/mate-network-scheme.desktop.in.h:2
+#: ../src/caja-window-menus.c:902 ../src/mate-network-scheme.desktop.in.h:2
 msgid "Browse bookmarked and local network locations"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/caja-window-menus.c:914
+#: ../src/caja-window-menus.c:906
 msgid "T_emplates"
 msgstr "Àwọn T_ẹ́ńpílètì"
 
 #. tooltip
-#: ../src/caja-window-menus.c:915
+#: ../src/caja-window-menus.c:907
 msgid "Open your personal templates folder"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/caja-window-menus.c:919
+#: ../src/caja-window-menus.c:911
 msgid "_Trash"
 msgstr "_Pàǹtí"
 
 #. tooltip
-#: ../src/caja-window-menus.c:920
+#: ../src/caja-window-menus.c:912
 msgid "Open your personal trash folder"
 msgstr ""
 
-#. name, stock id
+#. name, icon name
 #. label, accelerator
-#: ../src/caja-window-menus.c:928
+#: ../src/caja-window-menus.c:920
 msgid "Show _Hidden Files"
 msgstr "Fi _Àwọn Fáìlì Tí A Fi Pamọ́ Hàn"
 
 #. tooltip
-#: ../src/caja-window-menus.c:929
+#: ../src/caja-window-menus.c:921
 msgid "Toggle the display of hidden files in the current window"
 msgstr ""
 
-#: ../src/caja-window-menus.c:960
+#: ../src/caja-window-menus.c:952
 msgid "_Up"
 msgstr "_Òkè"
 
-#: ../src/caja-window-menus.c:963
+#: ../src/caja-window-menus.c:955
 msgid "_Home"
 msgstr "_Ilé"
 
@@ -7534,10 +7747,10 @@ msgstr "Fẹ̀ẹ́ Síta"
 msgid "Zoom to Default"
 msgstr "Fẹ̀ẹ́ sí Ìpéwọ̀n"
 
-#: ../src/caja-zoom-control.c:940
+#: ../src/caja-zoom-control.c:913
 msgid "Zoom"
 msgstr "Fẹ̀ẹ́"
 
-#: ../src/caja-zoom-control.c:945
+#: ../src/caja-zoom-control.c:918
 msgid "Set the zoom level of the current view"
 msgstr "Ṣàgbékalẹ̀ ìpele ìfẹ òye lọ́wọ́lọ́wọ́"