Merging debian/patches

files/Makefile.in

@@ -4,6 +4,8 @@ clean:
 
 distclean:
 
+check:
+
 install:
 	cd ../data && ./merge_action_strings && cd ../files && find -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)/ \;
 

po/POTFILES.in

@@ -1,20 +1,23 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
+data/action_i18n_strings.py
 data/nemo.xml.in
 data/nemo-autorun-software.desktop.in.in
 data/nemo.desktop.in.in
-debian/mount-archive.desktop.in
 eel/eel-canvas.c
 eel/eel-editable-label.c
 eel/eel-glib-extensions.c
 eel/eel-gnome-extensions.c
 eel/eel-gtk-extensions.c
 eel/eel-stock-dialogs.c
 eel/eel-vfs-extensions.c
+files/usr/share/gtksourceview-2.0/language-specs/nemo_action.lang
+files/usr/share/gtksourceview-3.0/language-specs/nemo_action.lang
 libnemo-extension/nemo-column.c
 libnemo-extension/nemo-menu-item.c
 libnemo-extension/nemo-property-page.c
+libnemo-private/nemo-action.c
 libnemo-private/nemo-bookmark.c
 libnemo-private/nemo-clipboard.c
 libnemo-private/nemo-column-chooser.c
@@ -42,11 +45,11 @@ libnemo-private/nemo-search-directory-file.c
 libnemo-private/nemo-tree-view-drag-dest.c
 libnemo-private/nemo-undo-signal-handlers.c
 libnemo-private/nemo-vfs-file.c
-libnemo-private/org.gnome.nemo.gschema.xml.in
+libnemo-private/org.nemo.gschema.xml.in
 src/nemo-application.c
 src/nemo-autorun-software.c
 src/nemo-bookmarks-window.c
-[type: gettext/glade]src/nemo-bookmarks-window.ui
+[type: gettext/glade]src/nemo-bookmarks-window.glade
 src/nemo-connect-server-dialog.c
 src/nemo-connect-server-dialog-main.c
 src/nemo-desktop-icon-view.c
@@ -56,7 +59,7 @@ src/nemo-desktop-window.c
 src/nemo-directory-view-ui.xml
 src/nemo-error-reporting.c
 src/nemo-file-management-properties.c
-[type: gettext/glade]src/nemo-file-management-properties.ui
+[type: gettext/glade]src/nemo-file-management-properties.glade
 src/nemo-icon-view.c
 src/nemo-icon-view-container.c
 src/nemo-icon-view-ui.xml
@@ -76,6 +79,8 @@ src/nemo-properties-window.c
 src/nemo-query-editor.c
 src/nemo-search-bar.c
 src/nemo-shell-ui.xml
+src/nemo-statusbar.c
+src/nemo-toolbar.c
 src/nemo-trash-bar.c
 src/nemo-tree-sidebar.c
 src/nemo-tree-sidebar-model.c

po/POTFILES.skip

@@ -8,3 +8,4 @@ data/nemo-folder-handler.desktop.in
 data/nemo-home.desktop.in
 data/nemo.desktop.in
 data/nemo-browser.desktop.in
+debian