Merge tag 'upstream/0.25.1'

Upstream version 0.25.1

1 files changed, 19 insertions, 125 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4c0ef0d..4d7e209 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,20 +7,8 @@ misc/org.yorba.shotwell-extras.gschema.xml
 misc/org.yorba.shotwell.gschema.xml
 plugins/common/Resources.vala
 plugins/common/RESTSupport.vala
-plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala
-plugins/shotwell-data-imports/FSpotDatabaseTable.vala
-plugins/shotwell-data-imports/FSpotDatabase.vala
 plugins/shotwell-data-imports/FSpotImporter.vala
-plugins/shotwell-data-imports/FSpotMetaTable.vala
-plugins/shotwell-data-imports/FSpotPhotosTable.vala
-plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala
-plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala
-plugins/shotwell-data-imports/FSpotRollsTable.vala
-plugins/shotwell-data-imports/FSpotTableBehavior.vala
-plugins/shotwell-data-imports/FSpotTagsTable.vala
 plugins/shotwell-data-imports/shotwell-data-imports.vala
-plugins/shotwell-data-imports/SqliteSupport.vala
-plugins/shotwell-data-imports/VersionNumber.vala
 plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui
 plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui
 plugins/shotwell-publishing-extras/GalleryConnector.vala
@@ -59,64 +47,20 @@ plugins/shotwell-transitions/SlideEffect.vala
 plugins/shotwell-transitions/SquaresEffect.vala
 plugins/shotwell-transitions/StripesEffect.vala
 src/AppDirs.vala
-src/Application.vala
 src/AppWindow.vala
 src/BatchImport.vala
-src/Box.vala
 src/camera/Branch.vala
-src/camera/CameraTable.vala
-src/camera/Camera.vala
-src/camera/GPhoto.vala
 src/camera/ImportPage.vala
-src/CheckerboardLayout.vala
 src/CollectionPage.vala
-src/ColorTransformation.vala
-src/CommandManager.vala
 src/Commands.vala
-src/config/ConfigurationInterfaces.vala
-src/config/Config.vala
-src/config/GSettingsEngine.vala
-src/core/Alteration.vala
-src/core/ContainerSourceCollection.vala
-src/core/Core.vala
-src/core/DatabaseSourceCollection.vala
-src/core/DataCollection.vala
-src/core/DataObject.vala
-src/core/DataSet.vala
-src/core/DataSourceTypes.vala
-src/core/DataSource.vala
-src/core/DataViewTypes.vala
-src/core/DataView.vala
-src/core/SourceCollection.vala
-src/core/SourceHoldingTank.vala
-src/core/SourceInterfaces.vala
-src/core/Tracker.vala
-src/core/util.vala
-src/core/ViewCollection.vala
-src/CustomComponents.vala
-src/data_imports/DataImportJob.vala
-src/data_imports/DataImportSource.vala
 src/data_imports/DataImportsPluginHost.vala
 src/data_imports/DataImportsUI.vala
 src/data_imports/DataImports.vala
 src/db/DatabaseTable.vala
-src/db/Db.vala
-src/db/EventTable.vala
-src/db/PhotoTable.vala
-src/db/SavedSearchDBTable.vala
-src/db/TagTable.vala
-src/db/TombstoneTable.vala
-src/db/VersionTable.vala
-src/db/VideoTable.vala
-src/Debug.vala
 src/DesktopIntegration.vala
 src/Dialogs.vala
 src/Dimensions.vala
 src/direct/DirectPhotoPage.vala
-src/direct/DirectPhoto.vala
-src/direct/Direct.vala
-src/direct/DirectView.vala
-src/direct/DirectWindow.vala
 src/DirectoryMonitor.vala
 src/editing_tools/EditingTools.vala
 src/editing_tools/StraightenTool.vala
@@ -124,64 +68,29 @@ src/events/Branch.vala
 src/events/EventDirectoryItem.vala
 src/events/EventPage.vala
 src/events/EventsDirectoryPage.vala
-src/events/Events.vala
 src/Event.vala
 src/Exporter.vala
 src/folders/Branch.vala
-src/folders/Folders.vala
-src/folders/Page.vala
-src/International.vala
 src/library/Branch.vala
-src/LibraryFiles.vala
 src/library/FlaggedPage.vala
-src/library/FlaggedSidebarEntry.vala
 src/library/ImportQueuePage.vala
-src/library/ImportQueueSidebarEntry.vala
 src/library/LastImportPage.vala
-src/library/LastImportSidebarEntry.vala
-src/library/Library.vala
 src/library/LibraryWindow.vala
-src/LibraryMonitor.vala
 src/library/OfflinePage.vala
-src/library/OfflineSidebarEntry.vala
 src/library/TrashPage.vala
-src/library/TrashSidebarEntry.vala
 src/main.vala
-src/MediaDataRepresentation.vala
-src/MediaInterfaces.vala
-src/MediaMetadata.vala
 src/MediaMonitor.vala
 src/MediaPage.vala
-src/MediaViewTracker.vala
-src/MetadataWriter.vala
-src/Orientation.vala
 src/Page.vala
-src/PhotoMonitor.vala
 src/PhotoPage.vala
 src/photos/BmpSupport.vala
-src/photos/GdkSupport.vala
-src/photos/GRaw.vala
 src/photos/JfifSupport.vala
-src/photos/PhotoFileAdapter.vala
-src/photos/PhotoFileFormat.vala
-src/photos/PhotoFileSniffer.vala
-src/photos/PhotoMetadata.vala
-src/photos/Photos.vala
 src/photos/PngSupport.vala
 src/photos/RawSupport.vala
 src/photos/TiffSupport.vala
 src/Photo.vala
-src/PixbufCache.vala
-src/plugins/DataImportsInterfaces.vala
-src/plugins/ManifestWidget.vala
-src/plugins/Plugins.vala
-src/plugins/PublishingInterfaces.vala
-src/plugins/SpitInterfaces.vala
-src/plugins/StandardHostInterface.vala
-src/plugins/TransitionsInterfaces.vala
 src/Printing.vala
 src/Properties.vala
-src/publishing/APIGlue.vala
 src/publishing/PublishingPluginHost.vala
 src/publishing/PublishingUI.vala
 src/publishing/Publishing.vala
@@ -189,48 +98,33 @@ src/Resources.vala
 src/Screensaver.vala
 src/searches/Branch.vala
 src/searches/SavedSearchDialog.vala
-src/searches/SavedSearchPage.vala
 src/searches/SearchBoolean.vala
-src/searches/Searches.vala
 src/SearchFilter.vala
-src/sidebar/Branch.vala
-src/sidebar/common.vala
-src/sidebar/Entry.vala
-src/sidebar/Sidebar.vala
-src/sidebar/Tree.vala
 src/SlideshowPage.vala
 src/slideshow/Slideshow.vala
 src/slideshow/TransitionEffects.vala
-src/SortedList.vala
 src/tags/Branch.vala
-src/tags/HierarchicalTagIndex.vala
-src/tags/HierarchicalTagUtilities.vala
-src/tags/TagPage.vala
-src/tags/Tags.vala
 src/Tag.vala
-src/threads/BackgroundJob.vala
-src/threads/Semaphore.vala
-src/threads/Threads.vala
-src/threads/Workers.vala
-src/ThumbnailCache.vala
-src/Thumbnail.vala
-src/TimedQueue.vala
-src/Tombstone.vala
-src/unit/rc/template.vala
-src/unit/Unit.vala
-src/UnityProgressBar.vala
-src/Upgrades.vala
-src/util/file.vala
-src/util/image.vala
-src/util/KeyValueMap.vala
-src/util/misc.vala
-src/util/string.vala
-src/util/system.vala
-src/util/ui.vala
-src/util/Util.vala
-src/VideoMetadata.vala
-src/VideoMonitor.vala
 src/VideoSupport.vala
+ui/collection.ui
+ui/direct_context.ui
+ui/direct.ui
+ui/events_directory.ui
+ui/event.ui
+ui/import_queue.ui
+ui/import.ui
+ui/media.ui
+ui/offline.ui
+ui/photo_context.ui
+ui/photo.ui
+ui/savedsearch.ui
+ui/search_bar.ui
+ui/search_sidebar_context.ui
 ui/set_background_dialog.ui
 ui/set_background_slideshow_dialog.ui
 ui/shotwell.ui
+ui/sidebar_default_context.ui
+ui/tag_sidebar_context.ui
+ui/tags.ui
+ui/top.ui
+ui/trash.ui