Merge lp:~junrrein/pantheon-files/fix-1022934 into lp:~elementary-apps/pantheon-files/trunk

[Julián Unrrein]

Use the existing DirectoryNotFound class to display a nice message when trying to access a non-existent directory, and offer options to create said directory, and to go back to the most inmediate existing parent.

This is a collaboration between Jeremy Wootten and me.

[Julián Unrrein (junrrein)]

There is a bug left in this that I am aware of, and I need some help with it.

Basically, I never free the memory I allocate in marlin_file_operations_new_folder_with_name_recursive (http://bazaar.launchpad.net/~junrrein/pantheon-files/fix-1022934/view/head:/libcore/marlin-file-operations.c#L6363).

I should free that memory after that struct is no longer used, in new_folder_with_name_callback (http://bazaar.launchpad.net/~junrrein/pantheon-files/fix-1022934/view/head:/libcore/marlin-file-operations.c#L6339).

When the parent folder was created sucesfully ( "(if (new_folder != NULL)" in the code) then I can safely free that memory after calling marlin_file_operations_new_folder_with_name.

The problem is when the parent folder couldn't be created. I can safely free the memory of the struct, but user_data->done_callback data is just a pointer. If that points to another NewFolderWithNameArgs, I need to free that too. How can I check if done_callback_data is a NewFolderWithNameArgs?

[lp:~junrrein/pantheon-files/fix-1022934]

1108. By Julián Unrrein on 2013-06-06

Partially fix a memory leak.

1109. By Jeremy Wootten on 2013-06-07

[DirectoryNotFound] Make the browser history don't record the directory again when it is created.

1110. By Jeremy Wootten on 2013-06-07

[DirectoryNotFound] Provide an option to go to the inmediate existing parent folder.

1111. By Julián Unrrein on 2013-06-07

[DirectoryNotFound] Don't display full paths. Modify the window title.

[Julián Unrrein (junrrein)]

Look into the comments of the bug for my conversation with Jeremey Wootter. In particular, I would like your opinion about these issues:

- Show the full path for directories?
- Use asynchronous operations?

[Cody Garver (codygarver)]

Design team says "Cancel" should not exist, there should only be "Create" choice.

review: Needs Fixing

[Cody Garver (codygarver)]

"Folder does not exist" should be "Folder does not exist."

"Files can't find the folder "blah"" should instead be "The folder "blah" can't be found."

review: Needs Fixing

[lp:~junrrein/pantheon-files/fix-1022934]

1112. By Julián Unrrein on 2013-06-08

[DirectoryNotFound] Remove the option to go to an existing parent folder.

1113. By Julián Unrrein on 2013-06-08

Change some strings.

1114. By Julián Unrrein on 2013-06-08

Change a string.

[Julián Unrrein (junrrein)]

Do i need to run "make pot" since there are new strings?

[Cody Garver (codygarver)]

Yeah, make pot too

Sent from my iPhone

On Jun 8, 2013, at 8:04 PM, "Julián Unrrein" <email address hidden> wrote:

> Do i need to run "make pot" since there are new strings?
> --
> https://code.launchpad.net/~junrrein/pantheon-files/fix-1022934/+merge/167861
> You are reviewing the proposed merge of lp:~junrrein/pantheon-files/fix-1022934 into lp:pantheon-files.

[lp:~junrrein/pantheon-files/fix-1022934]

1115. By Julián Unrrein on 2013-06-09

Update translation templates.

[Julián Unrrein (junrrein)]

About the memory leak issue:

There is no way to completely solve that in C, since there is no "typeof" of any kind... unless I turn NewFolderWithNameArgs into a G class, and that would be overkill.

Alternatives:

- Move that mess to DirectoryNotFound.vala . Programming that in Vala could be done with no problems.
- Scrape that altogether and use GFile.create_with_parents. Very simple, but I don't know if it fits our requirements since we will be changing from an asynchronous method to a synchronous one.

[lp:~junrrein/pantheon-files/fix-1022934]

1116. By Jeremy Wootten on 2013-06-13

Use GLib.File.make_directory_with_parents instead of a custom method.

[Julián Unrrein (junrrein)]

I settled down for the second alternative since porting the custom method to Vala didn't automagically fix anything.

Please comment on the strings for the new error dialog, since I need to run "make pot" again.

[Cody Garver (codygarver)]

"Folder does not exist." should be "This Folder Does Not Exist"

That should be good enough for now.

[lp:~junrrein/pantheon-files/fix-1022934]

1117. By Julián Unrrein on 2013-06-13

Merge changes from trunk.

1118. By Julián Unrrein on 2013-06-13

Change strings and update the translation template.

[Julián Unrrein (junrrein)]

Done!

[Julián Unrrein (junrrein)]

When commiting to trunk, remember to give credit to Jeremy Wootten too.

[Cody Garver (codygarver)]

Great work guys!

review: Approve

=== modified file 'libcore/gof-directory-async.vala'
--- libcore/gof-directory-async.vala	2013-03-07 04:19:41 +0000
+++ libcore/gof-directory-async.vala	2013-06-13 15:17:25 +0000
@@ -486,9 +486,11 @@
        
         if (directory_cache != null)
             cached_dir = directory_cache.lookup (file);
-        if (cached_dir != null)
-            debug ("found cached dir %s", cached_dir.file.uri);
-
+        if (cached_dir != null) {
+            debug ("found cached dir %s\n", cached_dir.file.uri);
+            if (cached_dir.file.info == null)
+                cached_dir.file.query_update ();
+        }
         return cached_dir;
     }
 

=== modified file 'libcore/marlin-file-operations.h'
--- libcore/marlin-file-operations.h	2012-05-31 17:19:38 +0000
+++ libcore/marlin-file-operations.h	2013-06-13 15:17:25 +0000
@@ -62,6 +62,12 @@
                                              gchar* folder_name,
                                              MarlinCreateCallback done_callback,
                                              gpointer done_callback_data);
+void marlin_file_operations_new_folder_with_name_recursive (GtkWidget *parent_view, 
+                                             GdkPoint *target_point,
+                                             GFile *parent_dir,
+                                             gchar* folder_name,
+                                             MarlinCreateCallback done_callback,
+                                             gpointer done_callback_data);                                             
 void marlin_file_operations_new_file    (GtkWidget                 *parent_view,
                                          GdkPoint                  *target_point,
                                          const char                *parent_dir,

=== modified file 'po/pantheon-files.pot'
--- po/pantheon-files.pot	2013-05-27 23:24:59 +0000
+++ po/pantheon-files.pot	2013-06-13 15:17:25 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-27 23:24+0000\n"
+"POT-Creation-Date: 2013-06-13 12:12-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,1437 +18,1755 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:73
-msgid "Properties"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:126
-msgid "General"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:134
-msgid "More"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:146
-msgid "Preview"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:333
-msgid "Created"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:335
-#: /home/cody/files/po/../src/fm-list-view.c:59
-msgid "Modified"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:338
-msgid "Last Access"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:344
-msgid "Deleted"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:349
-msgid "MimeType"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:357
-msgid "MimeTypes"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:361
-msgid "Location"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:363
-msgid "Target"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:369
-msgid "Origin Location"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:379
-msgid "Info:"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:414
-msgid "Other application..."
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:438
-msgid "Open with:"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:459
-msgid "Usage:"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:464
-msgid "Device usage:"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:471
-#, c-format
-msgid "%s free of %s (%d%% used)"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:610
-msgid "Read"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:615
-msgid "Write"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:620
-msgid "Execute"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:838
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:851
-msgid "Owner"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:843
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:855
-msgid "Group"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:859
-msgid "Everyone"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/PropertiesWindow.vala:1115
-msgid "Select an aplication to open "
-msgstr ""
-
-#: /home/cody/files/po/../src/View/OverlayBar.vala:247
-#, c-format
-msgid "%u items selected (%s)"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/ViewContainer.vala:144
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:300
-msgid "Home"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/ViewContainer.vala:146
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:370
-msgid "File System"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/ViewContainer.vala:151
-msgid "(as Administrator)"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/DirectoryNotFound.vala:72
-#, c-format
-msgid "Folder does not exist"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/DirectoryNotFound.vala:75
-#, c-format
-msgid "Files can't find the folder %s"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/DirectoryNotFound.vala:80
-msgid "Create"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/DirectoryNotFound.vala:80
-#, c-format
-msgid "Create the folder %s"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/LocationBar.vala:108
-msgid "AFP"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/LocationBar.vala:109
-msgid "DAV"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/LocationBar.vala:110
-msgid "DAVS"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/LocationBar.vala:111
-msgid "FTP"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/LocationBar.vala:112
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:564
-msgid "Network"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/LocationBar.vala:113
-msgid "SFTP"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/LocationBar.vala:114
-msgid "SMB"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/LocationBar.vala:115
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:346
-msgid "Trash"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/LocationBar.vala:289
-msgid "Open in New Tab"
-msgstr ""
-
-#: /home/cody/files/po/../src/View/Window.vala:126
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:126
 msgid "Files isn't your default file manager."
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:132
-#: /home/cody/files/po/../src/fm-directory-view.c:3426
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:132
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3426
 msgid "Set as default"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:137
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:137
 msgid "Ignore"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:400
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:401
 msgid "Undo"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:401
-#: /home/cody/files/po/../src/View/Window.vala:646
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:402
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:647
 msgid "Undo the last action"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:410
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:411
 msgid "Redo"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:411
-#: /home/cody/files/po/../src/View/Window.vala:649
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:412
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:650
 msgid "Redo the last action"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:624
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:625
 msgid "_File"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:625
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:626
 msgid "_Edit"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:626
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:627
 msgid "_View"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:627
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:628
 msgid "_Go"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:628
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:629
 msgid "_Help"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:630
-#: /home/cody/files/po/../src/DesktopLauncher.vala:9
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:631
+#: /home/julian/elementary-projects/fix-1022934/po/../src/DesktopLauncher.vala:9
 msgid "New _Window"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:631
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:632
 msgid "Open another Files window for the displayed location"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:634
-#: /home/cody/files/po/../src/DesktopLauncher.vala:8
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:635
+#: /home/julian/elementary-projects/fix-1022934/po/../src/DesktopLauncher.vala:8
 msgid "New _Tab"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:635
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:636
 msgid "Open another tab for the displayed location"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:639
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:640
 msgid "_Close"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:640
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:641
 msgid "Close this folder"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:645
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:646
 msgid "_Undo"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:648
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:649
 msgid "_Redo"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:651
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:652
 msgid "Open _Parent"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:652
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:653
 msgid "Open the parent folder"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:654
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:655
 msgid "_Back"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:655
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:656
 msgid "Go to the previous visited location"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:658
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:659
 msgid "_Forward"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:659
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:660
 msgid "Go to the next visited location"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:661
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:662
 msgid "_Reload"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:662
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:663
 msgid "Reload the current location"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:665
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:666
 msgid "_Home Folder"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:666
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:305
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:667
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:305
 msgid "Open your personal folder"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:669
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:670
 msgid "_Trash"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:670
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:671
 msgid "Open your personal trash folder"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:673
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:674
 msgid "_Network"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:674
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:675
 msgid "Browse bookmarked and local network locations"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:677
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:678
 msgid "Zoom _In"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:678
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:679
 msgid "Increase the view size"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:689
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:690
 msgid "Zoom _Out"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:690
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:691
 msgid "Decrease the view size"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:697
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:698
 msgid "Normal Si_ze"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:698
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:699
 msgid "Use the normal view size"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:701
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:702
 msgid "Next Tab"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:705
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:706
 msgid "Previous Tab"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:709
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:710
 msgid "Connect to _Server..."
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:710
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:711
 msgid "Connect to a remote computer or shared disk"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:713
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:714
 msgid "_About"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:714
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:715
 msgid "Display credits"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:717
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:718
 msgid "Report a Problem..."
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:718
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:719
 msgid "File a bug on Launchpad"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:721
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:722
 msgid "Get Help Online..."
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:725
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:726
 msgid "Translate This Application..."
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:734
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:735
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:735
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:736
 msgid "Toggle the display of hidden files in the current window"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:739
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:740
 msgid "_Places"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:740
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:741
 msgid "Change the visibility of this window's side pane"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:748
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:749
 msgid "Icon"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:751
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:752
 msgid "List"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Window.vala:754
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Window.vala:755
 msgid "Columns"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-abstract-icon-view.c:139
-#: /home/cody/files/po/../src/fm-columns-view.c:186
-#: /home/cody/files/po/../src/fm-list-view.c:199
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr ""
-
-#: /home/cody/files/po/../src/fm-abstract-icon-view.c:283
-msgid "Arran_ge Items"
-msgstr ""
-
-#: /home/cody/files/po/../src/fm-abstract-icon-view.c:288
-msgid "Re_versed Order"
-msgstr ""
-
-#: /home/cody/files/po/../src/fm-abstract-icon-view.c:289
-msgid "Display icons in the opposite order"
-msgstr ""
-
-#: /home/cody/files/po/../src/fm-abstract-icon-view.c:296
-msgid "By _Name"
-msgstr ""
-
-#: /home/cody/files/po/../src/fm-abstract-icon-view.c:297
-msgid "Keep icons sorted by name in rows"
-msgstr ""
-
-#: /home/cody/files/po/../src/fm-abstract-icon-view.c:300
-msgid "By _Size"
-msgstr ""
-
-#: /home/cody/files/po/../src/fm-abstract-icon-view.c:301
-msgid "Keep icons sorted by size in rows"
-msgstr ""
-
-#: /home/cody/files/po/../src/fm-abstract-icon-view.c:304
-msgid "By _Type"
-msgstr ""
-
-#: /home/cody/files/po/../src/fm-abstract-icon-view.c:305
-msgid "Keep icons sorted by type in rows"
-msgstr ""
-
-#: /home/cody/files/po/../src/fm-abstract-icon-view.c:308
-msgid "By Modification _Date"
-msgstr ""
-
-#: /home/cody/files/po/../src/fm-abstract-icon-view.c:309
-msgid "Keep icons sorted by modification date in rows"
-msgstr ""
-
-#: /home/cody/files/po/../src/fm-abstract-icon-view.c:573
-#: /home/cody/files/po/../src/fm-columns-view.c:82
-#: /home/cody/files/po/../src/fm-list-view.c:616
-msgid "This folder is empty."
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-toolbar-editor.c:445
-msgid "Customize Toolbar"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-toolbar-editor.c:464
-msgid ""
-"Select items to be displayed on the toolbar. Items can be reordered by drag "
-"and drop."
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-toolbar-editor.c:478
-msgid "Available Items"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-toolbar-editor.c:497
-msgid "Displayed Items"
-msgstr ""
-
-#: /home/cody/files/po/../src/eel-editable-label.c:3190
-#: /home/cody/files/po/../src/fm-directory-view.c:3540
-msgid "Select All"
-msgstr ""
-
-#: /home/cody/files/po/../src/eel-editable-label.c:3201
-msgid "Input Methods"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:286
-msgid "Personal"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:291
-msgid "Your common places and bookmarks"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:348
-msgid "Open the trash"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:358
-msgid "Devices"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:363
-msgid "Your local partitions and devices"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:372
-msgid "Open the contents of the File System"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:431
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:456
-#, c-format
-msgid "Mount and open %s"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:569
-msgid "Your network places"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:600
-msgid "Entire network"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:602
-msgid "Browse the contents of the network"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:1590
-msgid "_Start"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:1591
-msgid "_Stop"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:1596
-msgid "_Power On"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:1597
-msgid "_Safely Remove Drive"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:1600
-msgid "_Connect Drive"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:1601
-msgid "_Disconnect Drive"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:1604
-msgid "_Start Multi-disk Device"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:1605
-msgid "_Stop Multi-disk Device"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:1609
-msgid "_Unlock Drive"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:1610
-msgid "_Lock Drive"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:1684
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:2231
-#, c-format
-msgid "Unable to start %s"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:1974
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:2003
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:2032
-#, c-format
-msgid "Unable to eject %s"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:2177
-#, c-format
-msgid "Unable to poll %s for media changes"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:2287
-#, c-format
-msgid "Unable to stop %s"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:2385
-#: /home/cody/files/po/../src/fm-directory-view.c:1978
-#: /home/cody/files/po/../src/fm-directory-view.c:3506
-msgid "_Open"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:2393
-#: /home/cody/files/po/../src/fm-directory-view.c:1998
-#: /home/cody/files/po/../src/fm-directory-view.c:3518
-msgid "Open in New _Tab"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:2400
-#: /home/cody/files/po/../src/fm-directory-view.c:2007
-msgid "Open in New _Window"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:2409
-msgid "Remove"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:2418
-msgid "Rename..."
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:2431
-msgid "_Mount"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:2438
-msgid "_Unmount"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:2445
-msgid "_Eject"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:2453
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1422
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2312
-msgid "Empty _Trash"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-places-sidebar.c:2463
-msgid "Connect to Server…"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:125
-msgid "SSH"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:128
-msgid "Public FTP"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:130
-msgid "FTP (with login)"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:133
-msgid "AFP (Apple Filing Protocol)"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:135
-msgid "Windows share"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:137
-msgid "WebDAV (HTTP)"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:139
-msgid "Secure WebDAV (HTTPS)"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:186
-msgid "Connecting..."
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:210
-msgid ""
-"Can't load the supported server method list.\n"
-"Please check your gvfs installation."
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:288
-#, c-format
-msgid "The folder \"%s\" cannot be opened on \"%s\"."
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:298
-#, c-format
-msgid "The server at \"%s\" cannot be found."
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:333
-msgid "Try Again"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:398
-msgid "Please verify your user details."
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:428
-msgid "Continue"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:766
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:1156
-msgid "C_onnect"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:891
-msgid "Connect to Server"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:909
-msgid "Server Details"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:933
-msgid "_Server:"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:953
-msgid "_Port:"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:971
-msgid "_Type:"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:1040
-msgid "Sh_are:"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:1055
-msgid "_Folder:"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:1073
-msgid "User Details"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:1096
-msgid "_Domain name:"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:1111
-msgid "_User name:"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:1126
-msgid "Pass_word:"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:1142
-msgid "_Remember this password"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-connect-server-dialog.c:1245
-msgid "Operation cancelled"
-msgstr ""
-
-#: /home/cody/files/po/../src/exo-tree-view.c:167
-msgid "Single Click"
-msgstr ""
-
-#: /home/cody/files/po/../src/exo-tree-view.c:168
-msgid "Whether the items in the view can be activated with single clicks"
-msgstr ""
-
-#: /home/cody/files/po/../src/exo-tree-view.c:184
-msgid "Single Click Timeout"
-msgstr ""
-
-#: /home/cody/files/po/../src/exo-tree-view.c:185
-msgid ""
-"The amount of time after which the item under the mouse cursor will be "
-"selected automatically in single click mode"
-msgstr ""
-
-#: /home/cody/files/po/../src/exo-icon-view.c:887
-msgid "Layout mode"
-msgstr ""
-
-#: /home/cody/files/po/../src/exo-icon-view.c:888
-msgid "The layout mode"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-application.c:423
-msgid "Show the version of the program."
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-application.c:427
-msgid "Open uri(s) in new tab"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-application.c:429
-msgid "Quit Files."
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-application.c:431
-msgid "Enable debug logging"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-application.c:432
-msgid "[URI...]"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-application.c:441
-msgid ""
-"\n"
-"\n"
-"Browse the file system with the file manager"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-application.c:461
-msgid "--quit cannot be used with URIs."
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-clipboard-manager.c:369
-msgid "There is nothing on the clipboard to paste"
-msgstr ""
-
-#: /home/cody/files/po/../src/fm-directory-view.c:1177
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/OverlayBar.vala:249
+#, c-format
+msgid "%u items selected (%s)"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/DirectoryNotFound.vala:39
+msgid "This folder does not exist."
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/DirectoryNotFound.vala:39
+#, c-format
+msgid "The folder \"%s\" can't be found."
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/DirectoryNotFound.vala:41
+msgid "Create"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/DirectoryNotFound.vala:41
+#, c-format
+msgid "Create the folder \"%s\""
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/DirectoryNotFound.vala:55
+#, c-format
+msgid ""
+"Failed to create the folder\n"
+"\n"
+"%s"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/ViewContainer.vala:144
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:300
+msgid "Home"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/ViewContainer.vala:146
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:370
+msgid "File System"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/ViewContainer.vala:150
+msgid "This folder does not exist"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/ViewContainer.vala:153
+msgid "(as Administrator)"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:73
+msgid "Properties"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:126
+msgid "General"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:134
+msgid "More"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:146
+msgid "Preview"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:333
+msgid "Created"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:335
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-list-view.c:59
+msgid "Modified"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:338
+msgid "Last Access"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:344
+msgid "Deleted"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:349
+msgid "MimeType"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:357
+msgid "MimeTypes"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:361
+msgid "Location"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:363
+msgid "Target"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:369
+msgid "Origin Location"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:379
+msgid "Info:"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:414
+msgid "Other application..."
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:438
+msgid "Open with:"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:459
+msgid "Usage:"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:464
+msgid "Device usage:"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:471
+#, c-format
+msgid "%s free of %s (%d%% used)"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:610
+msgid "Read"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:615
+msgid "Write"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:620
+msgid "Execute"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:838
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:851
+msgid "Owner"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:843
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:855
+msgid "Group"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:859
+msgid "Everyone"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/PropertiesWindow.vala:1115
+msgid "Select an aplication to open "
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/LocationBar.vala:116
+msgid "AFP"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/LocationBar.vala:117
+msgid "DAV"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/LocationBar.vala:118
+msgid "DAVS"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/LocationBar.vala:119
+msgid "FTP"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/LocationBar.vala:120
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:564
+msgid "Network"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/LocationBar.vala:121
+msgid "SFTP"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/LocationBar.vala:122
+msgid "SMB"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/LocationBar.vala:123
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:346
+msgid "Trash"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/LocationBar.vala:302
+msgid "Open in New Tab"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:1177
 msgid "Invalid filename provided by XDS drag site"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:1335
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:1335
 #, c-format
 msgid "Failed to create a link for the URL \"%s\""
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:1820
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:1820
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgid_plural "Use \"%s\" to open the selected items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:1972
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:1972
 #, c-format
 msgid "_Open With %s"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:1994
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:1978
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3506
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:2385
+msgid "_Open"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:1994
 #, c-format
 msgid "Open in %'d New _Tabs"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:2003
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:1998
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3518
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:2393
+msgid "Open in New _Tab"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:2003
 #, c-format
 msgid "Open in %'d New _Windows"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3478
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:2007
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:2400
+msgid "Open in New _Window"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3478
 msgid "Prepare the selected files to be moved with a Paste command"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3482
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3482
 msgid "Prepare the selected files to be copied with a Paste command"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3486
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3486
 msgid "Move or copy files previously selected by a Cut or Copy command"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3489
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3489
 msgid "Paste Into Folder"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3490
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3490
 msgid ""
 "Move or copy files previously selected by a Cut or Copy command into "
 "selected folder"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3493
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3493
 msgid "_Rename..."
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3494
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3494
 msgid "Rename selected item"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3497
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3497
 msgid "Create New _Folder"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3498
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3498
 msgid "Create a new empty folder inside this folder"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3500
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3500
 msgid "Create New _File"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3502
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3502
 msgid "_Empty File"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3503
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3503
 msgid "Create a new empty file inside this folder"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3507
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3507
 msgid "Open the selected item"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3514
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3514
 msgid "Open in new Window"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3515
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3515
 msgid "Open each selected item in a new window"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3519
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3519
 msgid "Open each selected item in a new tab"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3521
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3521
 msgid "Open Wit_h"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3522
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3522
 msgid "Choose a program with which to open the selected item"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3524
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3524
 msgid "Other _Application..."
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3525
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3525
 msgid "Choose another application with which to open the selected item"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3528
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3528
 msgid "Mo_ve to Trash"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3529
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3529
 msgid "Move each selected item to the Trash"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3532
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3532
 msgid "_Delete Permanently"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3533
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3533
 msgid "Delete each selected item, without moving to the Trash"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3536
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3536
 msgid "_Restore"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3544
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3540
+#: /home/julian/elementary-projects/fix-1022934/po/../src/eel-editable-label.c:3190
+msgid "Select All"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3544
 msgid "_Properties"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3545
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3545
 msgid "View or modify the properties of each selected item"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-directory-view.c:3651
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-directory-view.c:3651
 msgid "Set Color:"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-list-view.c:59
-msgid "Filename"
-msgstr ""
-
-#: /home/cody/files/po/../src/fm-list-view.c:59
-msgid "Size"
-msgstr ""
-
-#: /home/cody/files/po/../src/fm-list-view.c:59
-msgid "Type"
-msgstr ""
-
-#: /home/cody/files/po/../src/marlin-progress-ui-handler.c:114
-#: /home/cody/files/po/../src/marlin-progress-ui-handler.c:164
-#: /home/cody/files/po/../src/marlin-progress-ui-handler.c:419
-#: /home/cody/files/po/../src/marlin-progress-ui-handler.c:475
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-application.c:423
+msgid "Show the version of the program."
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-application.c:427
+msgid "Open uri(s) in new tab"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-application.c:429
+msgid "Quit Files."
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-application.c:431
+msgid "Enable debug logging"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-application.c:432
+msgid "[URI...]"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-application.c:441
+msgid ""
+"\n"
+"\n"
+"Browse the file system with the file manager"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-application.c:461
+msgid "--quit cannot be used with URIs."
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:125
+msgid "SSH"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:128
+msgid "Public FTP"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:130
+msgid "FTP (with login)"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:133
+msgid "AFP (Apple Filing Protocol)"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:135
+msgid "Windows share"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:137
+msgid "WebDAV (HTTP)"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:139
+msgid "Secure WebDAV (HTTPS)"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:186
+msgid "Connecting..."
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:210
+msgid ""
+"Can't load the supported server method list.\n"
+"Please check your gvfs installation."
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:288
+#, c-format
+msgid "The folder \"%s\" cannot be opened on \"%s\"."
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:298
+#, c-format
+msgid "The server at \"%s\" cannot be found."
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:333
+msgid "Try Again"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:398
+msgid "Please verify your user details."
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:428
+msgid "Continue"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:766
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:1156
+msgid "C_onnect"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:891
+msgid "Connect to Server"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:909
+msgid "Server Details"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:933
+msgid "_Server:"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:953
+msgid "_Port:"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:971
+msgid "_Type:"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:1040
+msgid "Sh_are:"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:1055
+msgid "_Folder:"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:1073
+msgid "User Details"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:1096
+msgid "_Domain name:"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:1111
+msgid "_User name:"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:1126
+msgid "Pass_word:"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:1142
+msgid "_Remember this password"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-connect-server-dialog.c:1245
+msgid "Operation cancelled"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-columns-view.c:82
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-list-view.c:616
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-abstract-icon-view.c:573
+msgid "This folder is empty."
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-columns-view.c:186
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-list-view.c:199
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-abstract-icon-view.c:139
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-progress-ui-handler.c:114
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-progress-ui-handler.c:164
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-progress-ui-handler.c:419
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-progress-ui-handler.c:475
 msgid "File Operations"
 msgstr ""
 
-#: /home/cody/files/po/../src/marlin-progress-ui-handler.c:123
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-progress-ui-handler.c:123
 msgid "Show Details"
 msgstr ""
 
-#: /home/cody/files/po/../src/marlin-progress-ui-handler.c:158
-#: /home/cody/files/po/../src/marlin-progress-ui-handler.c:180
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-progress-ui-handler.c:158
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-progress-ui-handler.c:180
 #, c-format
 msgid "%'d file operation active"
 msgid_plural "%'d file operations active"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../src/marlin-progress-ui-handler.c:286
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-progress-ui-handler.c:286
 msgid "Show Copy Dialog"
 msgstr ""
 
-#: /home/cody/files/po/../src/marlin-progress-ui-handler.c:298
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-progress-ui-handler.c:298
 msgid "Cancel All In-progress Actions"
 msgstr ""
 
-#: /home/cody/files/po/../src/marlin-progress-ui-handler.c:476
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-progress-ui-handler.c:476
 msgid "All file operations have been successfully completed"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-icon-view.c:86
+#: /home/julian/elementary-projects/fix-1022934/po/../src/eel-editable-label.c:3201
+msgid "Input Methods"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/exo-tree-view.c:159
+msgid "Single Click"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/exo-tree-view.c:160
+msgid "Whether the items in the view can be activated with single clicks"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:286
+msgid "Personal"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:291
+msgid "Your common places and bookmarks"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:348
+msgid "Open the trash"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:358
+msgid "Devices"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:363
+msgid "Your local partitions and devices"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:372
+msgid "Open the contents of the File System"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:431
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:456
+#, c-format
+msgid "Mount and open %s"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:569
+msgid "Your network places"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:600
+msgid "Entire network"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:602
+msgid "Browse the contents of the network"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:1590
+msgid "_Start"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:1591
+msgid "_Stop"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:1596
+msgid "_Power On"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:1597
+msgid "_Safely Remove Drive"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:1600
+msgid "_Connect Drive"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:1601
+msgid "_Disconnect Drive"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:1604
+msgid "_Start Multi-disk Device"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:1605
+msgid "_Stop Multi-disk Device"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:1609
+msgid "_Unlock Drive"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:1610
+msgid "_Lock Drive"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:1684
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:2231
+#, c-format
+msgid "Unable to start %s"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:1974
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:2003
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:2032
+#, c-format
+msgid "Unable to eject %s"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:2177
+#, c-format
+msgid "Unable to poll %s for media changes"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:2287
+#, c-format
+msgid "Unable to stop %s"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:2409
+msgid "Remove"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:2418
+msgid "Rename..."
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:2431
+msgid "_Mount"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:2438
+msgid "_Unmount"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:2445
+msgid "_Eject"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:2453
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1422
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2312
+msgid "Empty _Trash"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-places-sidebar.c:2463
+msgid "Connect to Server…"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-icon-view.c:86
 msgid "Icon directory listing"
 msgstr ""
 
-#: /home/cody/files/po/../src/fm-icon-view.c:87
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-icon-view.c:87
 msgid "Icon view"
 msgstr ""
 
-#: /home/cody/files/po/../src/marlin-dnd.c:103
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-clipboard-manager.c:369
+msgid "There is nothing on the clipboard to paste"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-dnd.c:103
 msgid "_Move Here"
 msgstr ""
 
-#: /home/cody/files/po/../src/marlin-dnd.c:108
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-dnd.c:108
 msgid "_Copy Here"
 msgstr ""
 
-#: /home/cody/files/po/../src/marlin-dnd.c:113
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-dnd.c:113
 msgid "_Link Here"
 msgstr ""
 
-#: /home/cody/files/po/../src/marlin-dnd.c:118
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-dnd.c:118
 msgid "Set as _Background"
 msgstr ""
 
-#: /home/cody/files/po/../src/marlin-dnd.c:125
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-dnd.c:125
 msgid "Cancel"
 msgstr ""
 
-#: /home/cody/files/po/../src/marlin-dnd.c:217
+#: /home/julian/elementary-projects/fix-1022934/po/../src/marlin-dnd.c:217
 #, c-format
 msgid "Failed to execute file \"%s\""
 msgstr ""
 
-#: /home/cody/files/po/../src/DesktopLauncher.vala:6
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-list-view.c:59
+msgid "Filename"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-list-view.c:59
+msgid "Size"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-list-view.c:59
+msgid "Type"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/exo-icon-view.c:857
+msgid "Layout mode"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/exo-icon-view.c:858
+msgid "The layout mode"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-abstract-icon-view.c:283
+msgid "Arran_ge Items"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-abstract-icon-view.c:288
+msgid "Re_versed Order"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-abstract-icon-view.c:289
+msgid "Display icons in the opposite order"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-abstract-icon-view.c:296
+msgid "By _Name"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-abstract-icon-view.c:297
+msgid "Keep icons sorted by name in rows"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-abstract-icon-view.c:300
+msgid "By _Size"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-abstract-icon-view.c:301
+msgid "Keep icons sorted by size in rows"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-abstract-icon-view.c:304
+msgid "By _Type"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-abstract-icon-view.c:305
+msgid "Keep icons sorted by type in rows"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-abstract-icon-view.c:308
+msgid "By Modification _Date"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/fm-abstract-icon-view.c:309
+msgid "Keep icons sorted by modification date in rows"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../src/DesktopLauncher.vala:6
 msgid "Browse your files"
 msgstr ""
 
-#: /home/cody/files/po/../src/DesktopLauncher.vala:7
+#: /home/julian/elementary-projects/fix-1022934/po/../src/DesktopLauncher.vala:7
 msgid "File Manager"
 msgstr ""
 
-#: /home/cody/files/po/../src/DesktopLauncher.vala:10
+#: /home/julian/elementary-projects/fix-1022934/po/../src/DesktopLauncher.vala:10
 msgid "New Window As _Administrator"
 msgstr ""
 
-#: /home/cody/files/po/../src/DesktopLauncher.vala:11
+#: /home/julian/elementary-projects/fix-1022934/po/../src/DesktopLauncher.vala:11
 msgid "Files"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:146
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:361
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-progress-info.c:192
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-progress-info.c:210
+msgid "Preparing"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/eel-vfs-extensions.c:72
+msgid " (invalid Unicode)"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:146
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:361
 #, c-format
 msgid "Merge folder \"%s\"?"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:150
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:364
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:150
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:364
 msgid ""
 "Merging will ask for confirmation before replacing any files in the folder "
 "that conflict with the files being copied."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:155
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:369
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:155
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:369
 #, c-format
 msgid "An older folder with the same name already exists in \"%s\"."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:159
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:373
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:159
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:373
 #, c-format
 msgid "A newer folder with the same name already exists in \"%s\"."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:163
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:377
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:163
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:377
 #, c-format
 msgid "Another folder with the same name already exists in \"%s\"."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:168
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:382
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:168
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:382
 msgid "Replacing it will remove all files in the folder."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:170
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:384
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:170
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:384
 #, c-format
 msgid "Replace folder \"%s\"?"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:172
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:386
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:172
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:386
 #, c-format
 msgid "A folder with the same name already exists in \"%s\"."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:177
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:391
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:177
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:391
 #, c-format
 msgid "Replace file \"%s\"?"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:179
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:393
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:179
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:393
 msgid "Replacing it will overwrite its content."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:183
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:397
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:183
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:397
 #, c-format
 msgid "An older file with the same name already exists in \"%s\"."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:187
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:401
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:187
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:401
 #, c-format
 msgid "A newer file with the same name already exists in \"%s\"."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:191
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:405
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:191
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:405
 #, c-format
 msgid "Another file with the same name already exists in \"%s\"."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:253
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:460
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:253
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:460
 msgid "Original file"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:254
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:285
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:461
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:482
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:254
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:285
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:461
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:482
 msgid "Size:"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:257
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:288
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:464
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:485
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:257
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:288
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:464
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:485
 msgid "Type:"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:260
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:291
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:467
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:488
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:260
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:291
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:467
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:488
 msgid "Last modified:"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:284
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:481
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:284
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:481
 msgid "Replace with"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:313
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:506
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:313
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:506
 msgid "Merge"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:700
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:700
 msgid "_Select a new name for the destination"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:714
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:714
 msgid "Reset"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:726
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:726
 msgid "Apply this action to all files"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:737
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:200
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:737
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:200
 msgid "_Skip"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:742
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:742
 msgid "Re_name"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:748
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:748
 msgid "Replace"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-conflict-dialog.c:821
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-conflict-dialog.c:821
 msgid "File conflict"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/gof-file.c:280
-#, c-format
-msgid "link to %s"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/gof-file.c:1739
-#, c-format
-msgid "Failed to parse the desktop file: %s"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/gof-file.c:1777
-msgid "No Exec field specified"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/gof-file.c:1797
-msgid "No URL field specified"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/gof-file.c:1803
-msgid "Invalid desktop file"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/gof-file.c:2093
-msgid "Slashes are not allowed in filenames"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/gof-file.c:2113
-msgid "Toplevel files cannot be renamed"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/eel-fcts.c:81
-msgid "Today at %-I:%M %p"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/eel-fcts.c:85
-msgid "Yesterday at %-I:%M %p"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/eel-fcts.c:89
-msgid "%a %-d %b %Y at %-I:%M %p"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/eel-vfs-extensions.c:72
-msgid " (invalid Unicode)"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-file-utilities.c:119
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1202
+#, c-format
+msgid "Delete %d copied items"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1205
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1215
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1246
+#, c-format
+msgid "Delete '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1212
+#, c-format
+msgid "Delete %d duplicated items"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1223
+#, c-format
+msgid "Move %d items back to '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1227
+#, c-format
+msgid "Move '%s' back to '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1236
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1403
+#, c-format
+msgid "Rename '%s' as '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1255
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1450
+#, c-format
+msgid "Restore %d items from trash"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1263
+#, c-format
+msgid "Restore '%s' to '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1274
+#, c-format
+msgid "Move %d items back to trash"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1277
+#, c-format
+msgid "Move '%s' back to trash"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1286
+#, c-format
+msgid "Delete links to %d items"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1289
+#, c-format
+msgid "Delete link to '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1299
+#, c-format
+msgid "Restore original permissions of items enclosed in '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1307
+#, c-format
+msgid "Restore original permissions of '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1316
+#, c-format
+msgid "Restore group of '%s' to '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1326
+#, c-format
+msgid "Restore owner of '%s' to '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1365
+#, c-format
+msgid "Copy %d items to '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1369
+#, c-format
+msgid "Copy '%s' to '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1377
+#, c-format
+msgid "Duplicate of %d items in '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1382
+#, c-format
+msgid "Duplicate '%s' in '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1390
+#, c-format
+msgid "Move %d items to '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1394
+#, c-format
+msgid "Move '%s' to '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1412
+#, c-format
+msgid "Create new file '%s' from template "
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1419
+#, c-format
+msgid "Create an empty file '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1426
+#, c-format
+msgid "Create a new folder '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1434
+#, c-format
+msgid "Move %d items to trash"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1440
+#, c-format
+msgid "Move '%s' to trash"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1453
+#, c-format
+msgid "Restore '%s' from trash"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1462
+#, c-format
+msgid "Create links to %d items"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1465
+#, c-format
+msgid "Create link to '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1474
+#, c-format
+msgid "Set permissions of items enclosed in '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1482
+#, c-format
+msgid "Set permissions of '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1491
+#, c-format
+msgid "Set group of '%s' to '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1501
+#, c-format
+msgid "Set owner of '%s' to '%s'"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1533
+#, c-format
+msgid "_Undo copy of %d item"
+msgid_plural "_Undo copy of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1538
+#, c-format
+msgid "_Undo duplicate of %d item"
+msgid_plural "_Undo duplicate of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1543
+#, c-format
+msgid "_Undo move of %d item"
+msgid_plural "_Undo move of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1548
+#, c-format
+msgid "_Undo rename of %d item"
+msgid_plural "_Undo rename of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1552
+msgid "_Undo creation of an empty file"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1555
+msgid "_Undo creation of a file from template"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1559
+#, c-format
+msgid "_Undo creation of %d folder"
+msgid_plural "_Undo creation of %d folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1564
+#, c-format
+msgid "_Undo move to trash of %d item"
+msgid_plural "_Undo move to trash of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1569
+#, c-format
+msgid "_Undo restore from trash of %d item"
+msgid_plural "_Undo restore from trash of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1574
+#, c-format
+msgid "_Undo create link to %d item"
+msgid_plural "_Undo create link to %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1579
+#, c-format
+msgid "_Undo delete of %d item"
+msgid_plural "_Undo delete of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1584
+#, c-format
+msgid "Undo recursive change permissions of %d item"
+msgid_plural "Undo recursive change permissions of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1590
+#, c-format
+msgid "Undo change permissions of %d item"
+msgid_plural "Undo change permissions of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1595
+#, c-format
+msgid "Undo change group of %d item"
+msgid_plural "Undo change group of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1600
+#, c-format
+msgid "Undo change owner of %d item"
+msgid_plural "Undo change owner of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1628
+#, c-format
+msgid "_Redo copy of %d item"
+msgid_plural "_Redo copy of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1633
+#, c-format
+msgid "_Redo duplicate of %d item"
+msgid_plural "_Redo duplicate of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1638
+#, c-format
+msgid "_Redo move of %d item"
+msgid_plural "_Redo move of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1643
+#, c-format
+msgid "_Redo rename of %d item"
+msgid_plural "_Redo rename of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1647
+msgid "_Redo creation of an empty file"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1650
+msgid "_Redo creation of a file from template"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1654
+#, c-format
+msgid "_Redo creation of %d folder"
+msgid_plural "_Redo creation of %d folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1659
+#, c-format
+msgid "_Redo move to trash of %d item"
+msgid_plural "_Redo move to trash of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1664
+#, c-format
+msgid "_Redo restore from trash of %d item"
+msgid_plural "_Redo restore from trash of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1669
+#, c-format
+msgid "_Redo create link to %d item"
+msgid_plural "_Redo create link to %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1674
+#, c-format
+msgid "_Redo delete of %d item"
+msgid_plural "_Redo delete of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1679
+#, c-format
+msgid "Redo recursive change permissions of %d item"
+msgid_plural "Redo recursive change permissions of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1685
+#, c-format
+msgid "Redo change permissions of %d item"
+msgid_plural "Redo change permissions of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1690
+#, c-format
+msgid "Redo change group of %d item"
+msgid_plural "Redo change group of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-undostack-manager.c:1695
+#, c-format
+msgid "Redo change owner of %d item"
+msgid_plural "Redo change owner of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-utilities.c:119
 #, c-format
 msgid "Could not determine original location of \"%s\" "
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-utilities.c:122
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-utilities.c:122
 msgid "The item cannot be restored from trash"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:201
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:201
 msgid "S_kip All"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:202
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:202
 msgid "_Retry"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:203
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:203
 msgid "Delete _All"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:204
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:204
 msgid "_Replace"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:205
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:205
 msgid "Replace _All"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:206
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:206
 msgid "_Merge"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:207
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:207
 msgid "Merge _All"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:208
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:208
 msgid "Copy _Anyway"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:294
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:294
 #, c-format
 msgid "%'d second"
 msgid_plural "%'d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:299
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:310
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:299
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:310
 #, c-format
 msgid "%'d minute"
 msgid_plural "%'d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:309
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:309
 #, c-format
 msgid "%'d hour"
 msgid_plural "%'d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:317
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:317
 #, c-format
 msgid "approximately %'d hour"
 msgid_plural "approximately %'d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:393
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:393
 #, c-format
 msgid "Link to %s"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:397
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:397
 #, c-format
 msgid "Another link to %s"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:413
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:413
 #, c-format
 msgid "%'dst link to %s"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:417
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:417
 #, c-format
 msgid "%'dnd link to %s"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:421
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:421
 #, c-format
 msgid "%'drd link to %s"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:425
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:425
 #, c-format
 msgid "%'dth link to %s"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:463
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:463
 msgid " (copy)"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:465
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:465
 msgid " (another copy)"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:468
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:470
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:472
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:482
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:468
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:470
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:472
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:482
 msgid "th copy)"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:475
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:475
 msgid "st copy)"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:477
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:477
 msgid "nd copy)"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:479
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:479
 msgid "rd copy)"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:496
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:496
 #, c-format
 msgid "%s (copy)%s"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:498
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:498
 #, c-format
 msgid "%s (another copy)%s"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:501
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:503
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:505
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:519
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:501
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:503
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:505
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:519
 #, c-format
 msgid "%s (%'dth copy)%s"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:513
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:513
 #, c-format
 msgid "%s (%'dst copy)%s"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:515
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:515
 #, c-format
 msgid "%s (%'dnd copy)%s"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:517
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:517
 #, c-format
 msgid "%s (%'drd copy)%s"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:617
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:617
 msgid " ("
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:625
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:625
 #, c-format
 msgid " (%'d"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1381
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1381
 msgid "Are you sure you want to permanently delete \"%B\" from the trash?"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1384
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1384
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %'d selected item from the "
@@ -1459,24 +1777,24 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1394
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1462
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1394
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1462
 msgid "If you delete an item, it will be permanently lost."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1415
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1415
 msgid "Empty all items from Trash?"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1419
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1419
 msgid "All items in the Trash will be permanently deleted."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1450
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1450
 msgid "Are you sure you want to permanently delete \"%B\"?"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1453
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1453
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
 msgid_plural ""
@@ -1484,875 +1802,540 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1478
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1510
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1478
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1510
 msgid "Deleting files"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1504
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1504
 #, c-format
 msgid "%'d file left to delete"
 msgid_plural "%'d files left to delete"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1524
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1524
 msgid "%T left"
 msgid_plural "%T left"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1592
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1626
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1665
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1742
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2575
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1592
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1626
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1665
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1742
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2575
 msgid "Error while deleting."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1596
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1596
 msgid ""
 "Files in the folder \"%B\" cannot be deleted because you do not have "
 "permissions to see them."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1599
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2634
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3630
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1599
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2634
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3630
 msgid ""
 "There was an error getting information about the files in the folder \"%B\"."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1608
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3639
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1608
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3639
 msgid "_Skip files"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1629
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1629
 msgid ""
 "The folder \"%B\" cannot be deleted because you do not have permissions to "
 "read it."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1632
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2673
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3675
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1632
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2673
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3675
 msgid "There was an error reading the folder \"%B\"."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1666
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1666
 msgid "Could not remove the folder %B."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1743
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1743
 msgid "There was an error deleting %B."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1819
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1831
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1819
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1831
 msgid "Moving files to trash"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1833
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1833
 #, c-format
 msgid "%'d file left to trash"
 msgid_plural "%'d files left to trash"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1888
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1888
 msgid "Cannot move file to trash. Delete Immediately?"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:1889
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:1889
 msgid ""
 "This file is located on an external media and cannot be moved to the trash. "
 "Once deleted, it cannot be restored."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2071
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2071
 msgid "Trashing Files"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2073
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2073
 msgid "Deleting Files"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2145
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2145
 msgid "Unable to eject %V"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2147
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2147
 msgid "Unable to unmount %V"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2302
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2302
 msgid "Do you want to empty the trash before you unmount?"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2304
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2304
 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 ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2310
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2310
 msgid "Do _not Empty Trash"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2365
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2365
 msgid "Emptying the trash"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2432
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2432
 #, c-format
 msgid "Unable to mount %s"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2510
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2510
 #, c-format
 msgid "Preparing to copy %'d file (%S)"
 msgid_plural "Preparing to copy %'d files (%S)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2516
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2516
 #, c-format
 msgid "Preparing to move %'d file (%S)"
 msgid_plural "Preparing to move %'d files (%S)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2522
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2522
 #, c-format
 msgid "Preparing to delete %'d file (%S)"
 msgid_plural "Preparing to delete %'d files (%S)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2528
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2528
 #, c-format
 msgid "Preparing to trash %'d file"
 msgid_plural "Preparing to trash %'d files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2571
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3491
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3622
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3667
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2571
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3491
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3622
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3667
 msgid "Error while copying."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2573
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3620
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3665
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2573
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3620
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3665
 msgid "Error while moving."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2577
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2577
 msgid "Error while moving files to trash."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2631
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2631
 msgid ""
 "Files in the folder \"%B\" cannot be handled because you do not have "
 "permissions to see them."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2670
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2670
 msgid ""
 "The folder \"%B\" cannot be handled because you do not have permissions to "
 "read it."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2747
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2747
 msgid ""
 "The file \"%B\" cannot be handled because you do not have permissions to "
 "read it."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2750
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2750
 msgid "There was an error getting information about \"%B\"."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2850
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2892
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2925
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2955
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2850
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2892
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2925
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2955
 msgid "Error while copying to \"%B\"."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2854
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2854
 msgid "You do not have permissions to access the destination folder."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2856
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2856
 msgid "There was an error getting information about the destination."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2893
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2893
 msgid "The destination is not a folder."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2926
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2926
 msgid ""
 "There is not enough space on the destination. Try to remove files to make "
 "space."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2928
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2928
 #, c-format
 msgid "There is %S available, but %S is required."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:2956
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:2956
 msgid "The destination is read-only."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3017
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3017
 msgid "Moving \"%B\" to \"%B\""
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3018
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3018
 msgid "Copying \"%B\" to \"%B\""
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3022
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3022
 msgid "Duplicating \"%B\""
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3026
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3026
 msgid "Moving %'d file (in \"%B\") to \"%B\""
 msgid_plural "Moving %'d files (in \"%B\") to \"%B\""
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3029
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3029
 msgid "Copying %'d file (in \"%B\") to \"%B\""
 msgid_plural "Copying %'d files (in \"%B\") to \"%B\""
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3036
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3036
 msgid "Duplicating %'d file (in \"%B\")"
 msgid_plural "Duplicating %'d files (in \"%B\")"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3045
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3045
 msgid "Moving %'d file to \"%B\""
 msgid_plural "Moving %'d files to \"%B\""
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3049
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3049
 msgid "Copying %'d file to \"%B\""
 msgid_plural "Copying %'d files to \"%B\""
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3054
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3054
 #, c-format
 msgid "Duplicating %'d file"
 msgid_plural "Duplicating %'d files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3105
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3105
 #, c-format
 msgid "%S of %S"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3116
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3116
 msgid "%S of %S — %T left (%S/sec)"
 msgid_plural "%S of %S — %T left (%S/sec)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3495
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3495
 msgid ""
 "The folder \"%B\" cannot be copied because you do not have permissions to "
 "create it in the destination."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3498
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3498
 msgid "There was an error creating the folder \"%B\"."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3627
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3627
 msgid ""
 "Files in the folder \"%B\" cannot be copied because you do not have "
 "permissions to see them."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3672
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3672
 msgid ""
 "The folder \"%B\" cannot be copied because you do not have permissions to "
 "read it."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3717
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:4418
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:5006
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3717
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:4418
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:5006
 msgid "Error while moving \"%B\"."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3718
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3718
 msgid "Could not remove the source folder."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3803
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3844
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:4420
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:4491
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3803
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3844
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:4420
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:4491
 msgid "Error while copying \"%B\"."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3804
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3804
 #, c-format
 msgid "Could not remove files from the already existing folder %F."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:3845
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:3845
 #, c-format
 msgid "Could not remove the already existing file %F."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:4174
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:4846
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:4174
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:4846
 msgid "You cannot move a folder into itself."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:4175
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:4847
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:4175
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:4847
 msgid "You cannot copy a folder into itself."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:4176
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:4848
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:4176
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:4848
 msgid "The destination folder is inside the source folder."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:4207
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:4207
 msgid "You cannot move a file over itself."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:4208
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:4208
 msgid "You cannot copy a file over itself."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:4209
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:4209
 msgid "The source file would be overwritten by the destination."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:4422
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:4422
 #, c-format
 msgid "Could not remove the already existing file with the same name in %F."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:4492
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:4492
 #, c-format
 msgid "There was an error copying the file into %F."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:4720
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:4720
 msgid "Copying Files"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:4746
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:4746
 msgid "Preparing to move to \"%B\""
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:4758
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:4758
 #, c-format
 msgid "Preparing to move %'d file"
 msgid_plural "Preparing to move %'d files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:5007
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:5007
 #, c-format
 msgid "There was an error moving the file into %F."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:5270
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:5270
 msgid "Moving Files"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:5300
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:5300
 msgid "Creating links in \"%B\""
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:5311
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:5311
 #, c-format
 msgid "Making link to %'d file"
 msgid_plural "Making links to %'d files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:5446
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:5446
 msgid "Error while creating link to %B."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:5448
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:5448
 msgid "Symbolic links only supported for local files"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:5451
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:5451
 msgid "The target doesn't support symbolic links."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:5454
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:5454
 #, c-format
 msgid "There was an error creating the symlink in %F."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:5782
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:5785
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:5782
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:5785
 msgid "Setting permissions"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:6036
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:6036
 msgid "untitled folder"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:6044
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:6044
 msgid "new file"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:6215
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:6215
 msgid "Error while creating directory %B."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:6217
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:6217
 msgid "Error while creating file %B."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:6219
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:6219
 #, c-format
 msgid "There was an error creating the directory in %F."
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-file-operations.c:6536
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/marlin-file-operations.c:6536
 msgid "Emptying Trash"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/eel-stock-dialogs.c:35
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/gof-file.c:302
+#, c-format
+msgid "link to %s"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/gof-file.c:1761
+#, c-format
+msgid "Failed to parse the desktop file: %s"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/gof-file.c:1799
+msgid "No Exec field specified"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/gof-file.c:1819
+msgid "No URL field specified"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/gof-file.c:1825
+msgid "Invalid desktop file"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/gof-file.c:2115
+msgid "Slashes are not allowed in filenames"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/gof-file.c:2135
+msgid "Toplevel files cannot be renamed"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/eel-fcts.c:81
+msgid "Today at %-I:%M %p"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/eel-fcts.c:85
+msgid "Yesterday at %-I:%M %p"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/eel-fcts.c:89
+msgid "%a %-d %b %Y at %-I:%M %p"
+msgstr ""
+
+#: /home/julian/elementary-projects/fix-1022934/po/../libcore/eel-stock-dialogs.c:35
 msgid "Show more _details"
 msgstr ""
 
-#: /home/cody/files/po/../libcore/marlin-progress-info.c:192
-#: /home/cody/files/po/../libcore/marlin-progress-info.c:210
-msgid "Preparing"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1202
-#, c-format
-msgid "Delete %d copied items"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1205
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1215
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1246
-#, c-format
-msgid "Delete '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1212
-#, c-format
-msgid "Delete %d duplicated items"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1223
-#, c-format
-msgid "Move %d items back to '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1227
-#, c-format
-msgid "Move '%s' back to '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1236
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1403
-#, c-format
-msgid "Rename '%s' as '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1255
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1450
-#, c-format
-msgid "Restore %d items from trash"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1263
-#, c-format
-msgid "Restore '%s' to '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1274
-#, c-format
-msgid "Move %d items back to trash"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1277
-#, c-format
-msgid "Move '%s' back to trash"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1286
-#, c-format
-msgid "Delete links to %d items"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1289
-#, c-format
-msgid "Delete link to '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1299
-#, c-format
-msgid "Restore original permissions of items enclosed in '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1307
-#, c-format
-msgid "Restore original permissions of '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1316
-#, c-format
-msgid "Restore group of '%s' to '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1326
-#, c-format
-msgid "Restore owner of '%s' to '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1365
-#, c-format
-msgid "Copy %d items to '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1369
-#, c-format
-msgid "Copy '%s' to '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1377
-#, c-format
-msgid "Duplicate of %d items in '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1382
-#, c-format
-msgid "Duplicate '%s' in '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1390
-#, c-format
-msgid "Move %d items to '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1394
-#, c-format
-msgid "Move '%s' to '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1412
-#, c-format
-msgid "Create new file '%s' from template "
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1419
-#, c-format
-msgid "Create an empty file '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1426
-#, c-format
-msgid "Create a new folder '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1434
-#, c-format
-msgid "Move %d items to trash"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1440
-#, c-format
-msgid "Move '%s' to trash"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1453
-#, c-format
-msgid "Restore '%s' from trash"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1462
-#, c-format
-msgid "Create links to %d items"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1465
-#, c-format
-msgid "Create link to '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1474
-#, c-format
-msgid "Set permissions of items enclosed in '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1482
-#, c-format
-msgid "Set permissions of '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1491
-#, c-format
-msgid "Set group of '%s' to '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1501
-#, c-format
-msgid "Set owner of '%s' to '%s'"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1533
-#, c-format
-msgid "_Undo copy of %d item"
-msgid_plural "_Undo copy of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1538
-#, c-format
-msgid "_Undo duplicate of %d item"
-msgid_plural "_Undo duplicate of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1543
-#, c-format
-msgid "_Undo move of %d item"
-msgid_plural "_Undo move of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1548
-#, c-format
-msgid "_Undo rename of %d item"
-msgid_plural "_Undo rename of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1552
-msgid "_Undo creation of an empty file"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1555
-msgid "_Undo creation of a file from template"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1559
-#, c-format
-msgid "_Undo creation of %d folder"
-msgid_plural "_Undo creation of %d folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1564
-#, c-format
-msgid "_Undo move to trash of %d item"
-msgid_plural "_Undo move to trash of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1569
-#, c-format
-msgid "_Undo restore from trash of %d item"
-msgid_plural "_Undo restore from trash of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1574
-#, c-format
-msgid "_Undo create link to %d item"
-msgid_plural "_Undo create link to %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1579
-#, c-format
-msgid "_Undo delete of %d item"
-msgid_plural "_Undo delete of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1584
-#, c-format
-msgid "Undo recursive change permissions of %d item"
-msgid_plural "Undo recursive change permissions of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1590
-#, c-format
-msgid "Undo change permissions of %d item"
-msgid_plural "Undo change permissions of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1595
-#, c-format
-msgid "Undo change group of %d item"
-msgid_plural "Undo change group of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1600
-#, c-format
-msgid "Undo change owner of %d item"
-msgid_plural "Undo change owner of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1628
-#, c-format
-msgid "_Redo copy of %d item"
-msgid_plural "_Redo copy of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1633
-#, c-format
-msgid "_Redo duplicate of %d item"
-msgid_plural "_Redo duplicate of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1638
-#, c-format
-msgid "_Redo move of %d item"
-msgid_plural "_Redo move of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1643
-#, c-format
-msgid "_Redo rename of %d item"
-msgid_plural "_Redo rename of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1647
-msgid "_Redo creation of an empty file"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1650
-msgid "_Redo creation of a file from template"
-msgstr ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1654
-#, c-format
-msgid "_Redo creation of %d folder"
-msgid_plural "_Redo creation of %d folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1659
-#, c-format
-msgid "_Redo move to trash of %d item"
-msgid_plural "_Redo move to trash of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1664
-#, c-format
-msgid "_Redo restore from trash of %d item"
-msgid_plural "_Redo restore from trash of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1669
-#, c-format
-msgid "_Redo create link to %d item"
-msgid_plural "_Redo create link to %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1674
-#, c-format
-msgid "_Redo delete of %d item"
-msgid_plural "_Redo delete of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1679
-#, c-format
-msgid "Redo recursive change permissions of %d item"
-msgid_plural "Redo recursive change permissions of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1685
-#, c-format
-msgid "Redo change permissions of %d item"
-msgid_plural "Redo change permissions of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1690
-#, c-format
-msgid "Redo change group of %d item"
-msgid_plural "Redo change group of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libcore/marlin-undostack-manager.c:1695
-#, c-format
-msgid "Redo change owner of %d item"
-msgid_plural "Redo change owner of %d items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /home/cody/files/po/../libwidgets/LocationBar.vala:321
+#: /home/julian/elementary-projects/fix-1022934/po/../libwidgets/LocationBar.vala:321
 msgid "Cut the selected text to the clipboard"
 msgstr ""
 
-#: /home/cody/files/po/../libwidgets/LocationBar.vala:325
+#: /home/julian/elementary-projects/fix-1022934/po/../libwidgets/LocationBar.vala:325
 msgid "Copy the selected text to the clipboard"
 msgstr ""
 
-#: /home/cody/files/po/../libwidgets/LocationBar.vala:329
-#: /home/cody/files/po/../libwidgets/LocationBar.vala:333
+#: /home/julian/elementary-projects/fix-1022934/po/../libwidgets/LocationBar.vala:329
+#: /home/julian/elementary-projects/fix-1022934/po/../libwidgets/LocationBar.vala:333
 msgid "Paste the text stored on the clipboard"
 msgstr ""
 
-#: /home/cody/files/po/../libwidgets/LocationBar.vala:812
+#: /home/julian/elementary-projects/fix-1022934/po/../libwidgets/LocationBar.vala:812
 #, c-format
 msgid "Go to %s"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Chrome/ViewSwicher.vala:82
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Chrome/ViewSwicher.vala:82
 msgid "View as Grid"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Chrome/ViewSwicher.vala:85
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Chrome/ViewSwicher.vala:85
 msgid "View as List"
 msgstr ""
 
-#: /home/cody/files/po/../src/View/Chrome/ViewSwicher.vala:88
+#: /home/julian/elementary-projects/fix-1022934/po/../src/View/Chrome/ViewSwicher.vala:88
 msgid "View in Columns"
 msgstr ""
 
-#: /home/cody/files/po/../plugins/marlin-trash/plugin.vala:46
+#: /home/julian/elementary-projects/fix-1022934/po/../plugins/marlin-trash/plugin.vala:46
 msgid "These items may be deleted by emptying the trash."
 msgstr ""
 
-#: /home/cody/files/po/../plugins/marlin-trash/plugin.vala:47
+#: /home/julian/elementary-projects/fix-1022934/po/../plugins/marlin-trash/plugin.vala:47
 msgid "Empty the Trash"
 msgstr ""

=== modified file 'src/View/Browser.vala'
--- src/View/Browser.vala	2011-05-31 00:39:42 +0000
+++ src/View/Browser.vala	2013-06-13 15:17:25 +0000
@@ -45,7 +45,7 @@
          */
         public void record_uri (string uri)
         {
-            if (current_uri != null)
+            if (current_uri != null && current_uri != uri)
             {
                 back_stack.push (current_uri);
                 forward_stack.clear ();

=== modified file 'src/View/Chrome/TopMenu.vala'
--- src/View/Chrome/TopMenu.vala	2013-05-13 00:20:59 +0000
+++ src/View/Chrome/TopMenu.vala	2013-06-13 15:17:25 +0000
@@ -85,7 +85,12 @@
                         //debug ("topmenu test path %s", location_bar.path);
                     }
 
-                    location_bar.escape.connect( () => { ((FM.Directory.View) win.current_tab.slot.view_box).grab_focus(); });
+                    location_bar.escape.connect( () => {
+                        if (win.current_tab.slot.directory.file.exists)
+                            win.current_tab.slot.view_box.grab_focus();
+                        else
+                            win.current_tab.content.grab_focus();
+                    });
                     location_bar.activate.connect(() => { win.current_tab.path_changed(File.new_for_commandline_arg(location_bar.path)); });
                     location_bar.activate_alternate.connect((a) => { win.add_tab(File.new_for_commandline_arg(a)); });
                     location_bar.show_all();

=== modified file 'src/View/DirectoryNotFound.vala'
--- src/View/DirectoryNotFound.vala	2012-11-06 20:18:52 +0000
+++ src/View/DirectoryNotFound.vala	2013-06-13 15:17:25 +0000
@@ -18,75 +18,49 @@
  *
  */
 
-using Gtk;
 namespace Marlin.View
 {
-    class ImageButton : Button
-    {
-        public ImageButton(string title, string subtitle, string icon_name)
-        {
-            var hbox = new Box(Orientation.HORIZONTAL, 15);
-            
-            /* Image */
-            hbox.pack_start(new Image.from_icon_name (icon_name, Gtk.IconSize.DIALOG), false, false);
-            var vbox = new Box(Orientation.VERTICAL, 0);
-            
-            /* Title */
-            var label = new Label(title);
-            label.set_alignment(0, 0.5f);
-            vbox.pack_start(label);
-            
-            /* Subtitle */
-            label = new Label(subtitle);
-            label.set_sensitive(false);
-            label.set_alignment(0, 0.5f);
-            
-            /* Pack all */
-            vbox.pack_start(label);
-            hbox.pack_start(vbox);
-
-            set_relief(Gtk.ReliefStyle.NONE);
-            add(hbox);
-        }
-    }
-
-    static void make_and_jump_to_new_dir (File new_folder, void *data) {
-        ViewContainer tab = (ViewContainer) data;
-        //message ("make and jump %s", new_folder.get_uri ());
-        tab.path_changed (new_folder);
-    }
-
-    public class DirectoryNotFound : Alignment
-    {
+    
+    public static int show_dialog (string message, Gtk.MessageType type, Gtk.ButtonsType buttons) {
+        var dialog = new Gtk.MessageDialog (null, Gtk.DialogFlags.MODAL,
+                                            type, buttons, "%s", message);
+                                            
+        dialog.set_position (Gtk.WindowPosition.MOUSE);
+        var response = dialog.run ();
+        dialog.destroy ();
+        return response;
+    }
+    
+    public class DirectoryNotFound : Granite.Widgets.Welcome {
         public GOF.Directory.Async dir_saved;
         public ViewContainer ctab;
 
-        public DirectoryNotFound(GOF.Directory.Async dir, ViewContainer tab)
-        {
-            set(0.5f,0.4f,0,0.1f);
+        public DirectoryNotFound(GOF.Directory.Async dir, ViewContainer tab) {
+            base (_("This folder does not exist."), _("The folder \"%s\" can't be found.").printf (dir.location.get_basename ()));           
+            
+            append ("folder-new", _("Create"), _("Create the folder \"%s\"").printf (dir.location.get_basename ()));
+            
             dir_saved = dir;
             ctab = tab;
-            var box = new Box(Orientation.VERTICAL, 5);
-            var label = new Label("");
-
-            label.set_markup("<span size=\"x-large\">%s</span>".printf(_("Folder does not exist")));
-            box.pack_start(label, false, false);
-
-            label = new Label(_("Files can't find the folder %s").printf(dir.location.get_basename()));
-            label.set_sensitive(false);
-            label.set_alignment(0.5f, 0.0f);
-            box.pack_start(label, true, true);
-
-            var create_button = new ImageButton(_("Create"), _("Create the folder %s").printf(dir.location.get_basename()), "folder-new");
-            create_button.clicked.connect( () => {
-                Marlin.FileOperations.new_folder_with_name(null, null,
-                                                           dir_saved.location.get_parent(),
-                                                           dir_saved.location.get_basename(),
-                                                           (void *) make_and_jump_to_new_dir, tab);
+
+            this.activated.connect ((index) => {
+                bool success = false;
+                
+                try {
+                    success = dir.location.make_directory_with_parents (null);
+                } catch (Error e) {
+                    if (e is IOError.EXISTS)
+                        success = true;
+                    else
+                        show_dialog (_("Failed to create the folder\n\n%s").printf (e.message),
+                                     Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE);
+                }
+                
+                if (success)
+                    ctab.path_changed (dir_saved.location);
             });
-            box.pack_start(create_button, false, false);
-            
-            add(box);
+
+            show_all ();
         }
     }
 }

=== modified file 'src/View/LocationBar.vala'
--- src/View/LocationBar.vala	2013-05-20 08:12:59 +0000
+++ src/View/LocationBar.vala	2013-06-13 15:17:25 +0000
@@ -68,13 +68,21 @@
             add(bread);
         }
         
-        private void on_bread_changed(string changed)
-        {
+        private void on_bread_changed (string changed) {
             /* focus back the view */
-            ((FM.Directory.View) win.current_tab.slot.view_box).grab_focus(); 
+            if (win.current_tab.slot.directory.file.exists)
+                win.current_tab.slot.view_box.grab_focus ();
+            else
+                win.current_tab.content.grab_focus ();
+            
             //_path = changed;
             path = changed;
             activate();
+            
+            /* This prevents that the location bar is left in a weird state
+             * when going from a non-existent folder to another one underneath. */
+            bread.entry.reset ();
+            bread.change_breadcrumbs (changed);
         }
     }
 
@@ -184,9 +192,14 @@
             icon.exploded = {"/"};
             add_icon(icon);
 
-            entry.down.connect(() => {
-                ((FM.Directory.View) win.current_tab.slot.view_box).grab_focus(); 
+            entry.down.connect (() => {
+                /* focus back the view */
+                if (win.current_tab.slot.directory.file.exists)
+                    win.current_tab.slot.view_box.grab_focus ();
+                else
+                    win.current_tab.content.grab_focus ();
             });
+            
             entry.completed.connect(() => {
                 string path = get_elements_path ();
                 update_breadcrumbs (entry.text, path);

=== modified file 'src/View/OverlayBar.vala'
--- src/View/OverlayBar.vala	2013-05-29 09:59:12 +0000
+++ src/View/OverlayBar.vala	2013-06-13 15:17:25 +0000
@@ -180,7 +180,7 @@
                 real_update (list);
             } else {
                 GOF.Window.Slot slot = window.current_tab.slot;
-                if (slot != null) {
+                if (slot != null && slot.directory.file.exists) {
                     unowned List<GOF.File> list = ((FM.Directory.View) slot.view_box).get_selection ();
                     real_update (list);
                 }

=== modified file 'src/View/ViewContainer.vala'
--- src/View/ViewContainer.vala	2013-05-12 05:27:30 +0000
+++ src/View/ViewContainer.vala	2013-06-13 15:17:25 +0000
@@ -144,17 +144,19 @@
                 tab_name = _("Home");
             else if (slot_path == "/")
                 tab_name = _("File System");
+            else if (slot.directory.file.exists && (aslot.directory.file.info is FileInfo))
+                tab_name = aslot.directory.file.info.get_attribute_string (FileAttribute.STANDARD_DISPLAY_NAME);
             else
-                tab_name = aslot.directory.file.info.get_attribute_string(FileAttribute.STANDARD_DISPLAY_NAME);
+                tab_name = _("This folder does not exist");
 
             if (Posix.getuid() == 0)
                 tab_name = tab_name + " " + _("(as Administrator)");
 
             /* update window title */
-            if(window.current_tab == this) {
-                window.set_title(tab_name);
+            if (window.current_tab == this) {
+                window.set_title (tab_name);
                 if (window.top_menu.location_bar != null)
-                    window.top_menu.location_bar.path = aslot.directory.file.location.get_parse_name();
+                    window.top_menu.location_bar.path = aslot.directory.file.location.get_parse_name ();
             }
 
         }
@@ -181,7 +183,7 @@
                 /* we re just changing view keep the same location */
                 location = get_active_slot ().location;
                 /* store the old selection to restore it */
-                if (slot != null) {
+                if (slot != null && slot.directory.file.exists) {
                     unowned List<GOF.File> list = ((FM.Directory.View) slot.view_box).get_selection ();
                     foreach (var elem in list)
                         select_childs.prepend (elem.location);
@@ -216,7 +218,7 @@
                 window.top_menu.view_switcher.mode = (ViewMode) view_mode;
 
             connect_available_info();
-            if (slot != null && slot.directory.file.exists) {
+            if (slot != null) {
                 slot.directory.done_loading.connect (directory_done_loading);
                 slot.directory.need_reload.connect (reload);
             }

=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2013-05-25 06:23:09 +0000
+++ src/View/Window.vala	2013-06-13 15:17:25 +0000
@@ -276,7 +276,8 @@
         }
 
         public void colorize_current_tab_selection (int n) {
-            ((FM.Directory.View) current_tab.slot.view_box).colorize_selection(n);
+            if (current_tab.slot.directory.file.exists)
+                ((FM.Directory.View) current_tab.slot.view_box).colorize_selection(n);
         }
 
 
@@ -310,7 +311,7 @@
                     /* update radio action view state */
                     update_action_radio_view(current_tab.view_mode);
                     /* sync selection */
-                    if (cur_slot.view_box != null)
+                    if (cur_slot.view_box != null && cur_slot.directory.file.exists)
                         ((FM.Directory.View) cur_slot.view_box).sync_selection();
                     /* sync sidebar selection */
                     loading_uri (current_tab.slot.directory.file.uri, sidebar);

=== modified file 'src/exo-tree-view.c'
--- src/exo-tree-view.c	2013-06-01 20:18:10 +0000
+++ src/exo-tree-view.c	2013-06-13 15:17:25 +0000
@@ -298,7 +298,7 @@
      * remember the selected paths here and restore them later.
      */
     if (event->type == GDK_BUTTON_PRESS && (event->state & gtk_accelerator_get_default_mod_mask ()) == 0
-        && path != NULL && gtk_tree_selection_path_is_selected (selection, path))
+        && path != NULL && GTK_IS_TREE_SELECTION (selection) && gtk_tree_selection_path_is_selected (selection, path))
     {
         /* if no custom select function is set, we simply use exo_noop_false here,
          * to tell the tree view that it may not alter the selection.
@@ -349,7 +349,7 @@
 
     /* restore previous selection if the path is still selected */
     if (event->type == GDK_BUTTON_PRESS && (event->state & gtk_accelerator_get_default_mod_mask ()) == 0
-        && path != NULL && gtk_tree_selection_path_is_selected (selection, path))
+        && path != NULL && GTK_IS_TREE_SELECTION (selection) && gtk_tree_selection_path_is_selected (selection, path))
     {
         /* check if we have to restore paths */
         if (G_LIKELY (gtk_tree_selection_get_select_function (selection) != (GtkTreeSelectionFunc) exo_noop_false))
@@ -361,7 +361,7 @@
     }
 
     /* see bug http://bugzilla.xfce.org/show_bug.cgi?id=6230 for more information */
-    if (G_LIKELY (gtk_tree_selection_get_select_function (selection) == (GtkTreeSelectionFunc) exo_noop_false))
+    if (G_LIKELY (GTK_IS_TREE_SELECTION (selection) && gtk_tree_selection_get_select_function (selection) == (GtkTreeSelectionFunc) exo_noop_false))
     {
         /* just reset the select function (previously set to exo_noop_false),
          * there's no clean way to do this, so what the heck.

=== modified file 'src/marlin.vapi'
--- src/marlin.vapi	2012-05-30 18:28:41 +0000
+++ src/marlin.vapi	2013-06-13 15:17:25 +0000
@@ -106,6 +106,8 @@
         public void new_folder(Gtk.Widget? parent_view, Gdk.Point? target_point, File file, void* callback, void* data_callback);
         [CCode (cheader_filename = "marlin-file-operations.h")]
         public void new_folder_with_name(Gtk.Widget? parent_view, Gdk.Point? target_point, File file, string name, void* callback, void* data_callback);
+        [CCode (cheader_filename = "marlin-file-operations.h")]
+        public void new_folder_with_name_recursive(Gtk.Widget? parent_view, Gdk.Point? target_point, File file, string name, void* callback, void* data_callback);
     }
 }