nautilus r14329 - in tags/MULTIVIEW_MERGE_TO_TRUNK: . libnautilus-private po src src/file-manager

[cneumair svn gnome org]

Author: cneumair
Date: Tue Jul  8 21:07:27 2008
New Revision: 14329
URL: http://svn.gnome.org/viewvc/nautilus?rev=14329&view=rev

Log:
Tagged multiview merge point.


Added:
   tags/MULTIVIEW_MERGE_TO_TRUNK/
      - copied from r14327, /trunk/
   tags/MULTIVIEW_MERGE_TO_TRUNK/ChangeLog
      - copied unchanged from r14328, /trunk/ChangeLog
   tags/MULTIVIEW_MERGE_TO_TRUNK/libnautilus-private/Makefile.am
      - copied unchanged from r14328, /trunk/libnautilus-private/Makefile.am
   tags/MULTIVIEW_MERGE_TO_TRUNK/libnautilus-private/apps_nautilus_preferences.schemas.in
      - copied unchanged from r14328, /trunk/libnautilus-private/apps_nautilus_preferences.schemas.in
   tags/MULTIVIEW_MERGE_TO_TRUNK/libnautilus-private/nautilus-global-preferences.c
      - copied unchanged from r14328, /trunk/libnautilus-private/nautilus-global-preferences.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/libnautilus-private/nautilus-global-preferences.h
      - copied unchanged from r14328, /trunk/libnautilus-private/nautilus-global-preferences.h
   tags/MULTIVIEW_MERGE_TO_TRUNK/libnautilus-private/nautilus-icon-container.c
      - copied unchanged from r14328, /trunk/libnautilus-private/nautilus-icon-container.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/libnautilus-private/nautilus-icon-dnd.c
      - copied unchanged from r14328, /trunk/libnautilus-private/nautilus-icon-dnd.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/libnautilus-private/nautilus-mime-actions.c
      - copied unchanged from r14328, /trunk/libnautilus-private/nautilus-mime-actions.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/libnautilus-private/nautilus-mime-actions.h
      - copied unchanged from r14328, /trunk/libnautilus-private/nautilus-mime-actions.h
   tags/MULTIVIEW_MERGE_TO_TRUNK/libnautilus-private/nautilus-view-factory.c
      - copied unchanged from r14328, /trunk/libnautilus-private/nautilus-view-factory.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/libnautilus-private/nautilus-view-factory.h
      - copied unchanged from r14328, /trunk/libnautilus-private/nautilus-view-factory.h
   tags/MULTIVIEW_MERGE_TO_TRUNK/libnautilus-private/nautilus-view.c
      - copied unchanged from r14328, /trunk/libnautilus-private/nautilus-view.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/libnautilus-private/nautilus-view.h
      - copied unchanged from r14328, /trunk/libnautilus-private/nautilus-view.h
   tags/MULTIVIEW_MERGE_TO_TRUNK/libnautilus-private/nautilus-window-info.c
      - copied unchanged from r14328, /trunk/libnautilus-private/nautilus-window-info.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/libnautilus-private/nautilus-window-info.h
      - copied unchanged from r14328, /trunk/libnautilus-private/nautilus-window-info.h
   tags/MULTIVIEW_MERGE_TO_TRUNK/libnautilus-private/nautilus-window-slot-info.c
      - copied unchanged from r14328, /trunk/libnautilus-private/nautilus-window-slot-info.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/Makefile.am
      - copied unchanged from r14328, /trunk/src/Makefile.am
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/ephy-spinner.c
      - copied unchanged from r14328, /trunk/src/ephy-spinner.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/ephy-spinner.h
      - copied unchanged from r14328, /trunk/src/ephy-spinner.h
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/file-manager/fm-actions.h
      - copied unchanged from r14328, /trunk/src/file-manager/fm-actions.h
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/file-manager/fm-desktop-icon-view.c
      - copied unchanged from r14328, /trunk/src/file-manager/fm-desktop-icon-view.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/file-manager/fm-directory-view.c
      - copied unchanged from r14328, /trunk/src/file-manager/fm-directory-view.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/file-manager/fm-directory-view.h
      - copied unchanged from r14328, /trunk/src/file-manager/fm-directory-view.h
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/file-manager/fm-empty-view.c
      - copied unchanged from r14328, /trunk/src/file-manager/fm-empty-view.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/file-manager/fm-icon-view.c
      - copied unchanged from r14328, /trunk/src/file-manager/fm-icon-view.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/file-manager/fm-list-view.c
      - copied unchanged from r14328, /trunk/src/file-manager/fm-list-view.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/file-manager/fm-tree-model.c
      - copied unchanged from r14328, /trunk/src/file-manager/fm-tree-model.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/file-manager/fm-tree-model.h
      - copied unchanged from r14328, /trunk/src/file-manager/fm-tree-model.h
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/file-manager/fm-tree-view.c
      - copied unchanged from r14328, /trunk/src/file-manager/fm-tree-view.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/file-manager/nautilus-directory-view-ui.xml
      - copied unchanged from r14328, /trunk/src/file-manager/nautilus-directory-view-ui.xml
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-actions.h
      - copied unchanged from r14328, /trunk/src/nautilus-actions.h
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-application.c
      - copied unchanged from r14328, /trunk/src/nautilus-application.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-desktop-window.c
      - copied unchanged from r14328, /trunk/src/nautilus-desktop-window.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-history-sidebar.c
      - copied unchanged from r14328, /trunk/src/nautilus-history-sidebar.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-information-panel.c
      - copied unchanged from r14328, /trunk/src/nautilus-information-panel.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-location-bar.c
      - copied unchanged from r14328, /trunk/src/nautilus-location-bar.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-location-dialog.c
      - copied unchanged from r14328, /trunk/src/nautilus-location-dialog.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-navigation-action.c
      - copied unchanged from r14328, /trunk/src/nautilus-navigation-action.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-navigation-window-menus.c
      - copied unchanged from r14328, /trunk/src/nautilus-navigation-window-menus.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-navigation-window-slot.c
      - copied unchanged from r14328, /trunk/src/nautilus-navigation-window-slot.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-navigation-window-slot.h
      - copied unchanged from r14328, /trunk/src/nautilus-navigation-window-slot.h
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-navigation-window-ui.xml
      - copied unchanged from r14328, /trunk/src/nautilus-navigation-window-ui.xml
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-navigation-window.c
      - copied unchanged from r14328, /trunk/src/nautilus-navigation-window.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-navigation-window.h
      - copied unchanged from r14328, /trunk/src/nautilus-navigation-window.h
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-notebook.c
      - copied unchanged from r14328, /trunk/src/nautilus-notebook.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-notebook.h
      - copied unchanged from r14328, /trunk/src/nautilus-notebook.h
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-notes-viewer.c
      - copied unchanged from r14328, /trunk/src/nautilus-notes-viewer.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-pathbar.c
      - copied unchanged from r14328, /trunk/src/nautilus-pathbar.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-places-sidebar.c
      - copied unchanged from r14328, /trunk/src/nautilus-places-sidebar.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-query-editor.c
      - copied unchanged from r14328, /trunk/src/nautilus-query-editor.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-query-editor.h
      - copied unchanged from r14328, /trunk/src/nautilus-query-editor.h
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-spatial-window.c
      - copied unchanged from r14328, /trunk/src/nautilus-spatial-window.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-window-bookmarks.c
      - copied unchanged from r14328, /trunk/src/nautilus-window-bookmarks.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-window-manage-views.c
      - copied unchanged from r14328, /trunk/src/nautilus-window-manage-views.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-window-manage-views.h
      - copied unchanged from r14328, /trunk/src/nautilus-window-manage-views.h
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-window-menus.c
      - copied unchanged from r14328, /trunk/src/nautilus-window-menus.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-window-private.h
      - copied unchanged from r14328, /trunk/src/nautilus-window-private.h
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-window-slot.c
      - copied unchanged from r14328, /trunk/src/nautilus-window-slot.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-window-slot.h
      - copied unchanged from r14328, /trunk/src/nautilus-window-slot.h
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-window-toolbars.c
      - copied unchanged from r14328, /trunk/src/nautilus-window-toolbars.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-window.c
      - copied unchanged from r14328, /trunk/src/nautilus-window.c
   tags/MULTIVIEW_MERGE_TO_TRUNK/src/nautilus-window.h
      - copied unchanged from r14328, /trunk/src/nautilus-window.h
Modified:
   tags/MULTIVIEW_MERGE_TO_TRUNK/po/de.po