Merge tag 'upstream/0.23.5'

Upstream version 0.23.5

1 files changed, 97 insertions, 91 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index d83fed1..5f96f0a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,45 +1,51 @@
-[encoding: UTF-8]
-plugins/common/RESTSupport.vala
+# List of source files containing translatable strings.
+# Please keep this file sorted alphabetically.
+misc/shotwell.appdata.xml.in
+misc/shotwell.desktop.in.in
+misc/shotwell-viewer.desktop.in.in
+misc/org.yorba.shotwell-extras.gschema.xml
+misc/org.yorba.shotwell.gschema.xml
 plugins/common/Resources.vala
-plugins/shotwell-data-imports/FSpotDatabase.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/FSpotPhotosTable.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
+plugins/shotwell-publishing-extras/rajce_authentication_pane.ui
+plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui
 plugins/shotwell-publishing-extras/RajcePublishing.vala
+plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
+plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
+plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui
 plugins/shotwell-publishing-extras/TumblrPublishing.vala
 plugins/shotwell-publishing-extras/YandexPublishing.vala
-plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
-[type: gettext/glade]plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade
-[type: gettext/glade]plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade
-[type: gettext/glade]plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade
-[type: gettext/glade]plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade
-[type: gettext/glade]plugins/shotwell-publishing-extras/rajce_authentication_pane.glade
-[type: gettext/glade]plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade
-[type: gettext/glade]plugins/shotwell-publishing-extras/yandex_publish_model.glade
+plugins/shotwell-publishing-extras/yandex_publish_model.ui
+plugins/shotwell-publishing/facebook_publishing_options_pane.ui
 plugins/shotwell-publishing/FacebookPublishing.vala
+plugins/shotwell-publishing/flickr_pin_entry_pane.ui
+plugins/shotwell-publishing/flickr_publishing_options_pane.ui
 plugins/shotwell-publishing/FlickrPublishing.vala
+plugins/shotwell-publishing/picasa_publishing_options_pane.ui
 plugins/shotwell-publishing/PicasaPublishing.vala
+plugins/shotwell-publishing/piwigo_authentication_pane.ui
+plugins/shotwell-publishing/piwigo_publishing_options_pane.ui
 plugins/shotwell-publishing/PiwigoPublishing.vala
-plugins/shotwell-publishing/YouTubePublishing.vala
-[type: gettext/glade]plugins/shotwell-publishing/facebook_publishing_options_pane.glade
-[type: gettext/glade]plugins/shotwell-publishing/flickr_pin_entry_pane.glade
-[type: gettext/glade]plugins/shotwell-publishing/flickr_publishing_options_pane.glade
-[type: gettext/glade]plugins/shotwell-publishing/picasa_publishing_options_pane.glade
-[type: gettext/glade]plugins/shotwell-publishing/piwigo_authentication_pane.glade
-[type: gettext/glade]plugins/shotwell-publishing/piwigo_publishing_options_pane.glade
 plugins/shotwell-publishing/shotwell-publishing.vala
-[type: gettext/glade]plugins/shotwell-publishing/youtube_publishing_options_pane.glade
+plugins/shotwell-publishing/youtube_publishing_options_pane.ui
+plugins/shotwell-publishing/YouTubePublishing.vala
 plugins/shotwell-transitions/BlindsEffect.vala
 plugins/shotwell-transitions/ChessEffect.vala
 plugins/shotwell-transitions/CircleEffect.vala
@@ -47,91 +53,51 @@ plugins/shotwell-transitions/CirclesEffect.vala
 plugins/shotwell-transitions/ClockEffect.vala
 plugins/shotwell-transitions/CrumbleEffect.vala
 plugins/shotwell-transitions/FadeEffect.vala
+plugins/shotwell-transitions/shotwell-transitions.vala
 plugins/shotwell-transitions/SlideEffect.vala
 plugins/shotwell-transitions/SquaresEffect.vala
 plugins/shotwell-transitions/StripesEffect.vala
-plugins/shotwell-transitions/shotwell-transitions.vala
 src/AppDirs.vala
-src/AppWindow.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/CustomComponents.vala
-src/Debug.vala
-src/DesktopIntegration.vala
-src/Dialogs.vala
-src/Dimensions.vala
-src/DirectoryMonitor.vala
-src/Event.vala
-src/Exporter.vala
-src/International.vala
-src/LibraryFiles.vala
-src/LibraryMonitor.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/Photo.vala
-src/PhotoMonitor.vala
-src/PhotoPage.vala
-src/PixbufCache.vala
-src/Printing.vala
-src/Properties.vala
-src/Resources.vala
-src/Screensaver.vala
-src/SearchFilter.vala
-src/SlideshowPage.vala
-src/SortedList.vala
-src/Tag.vala
-src/Thumbnail.vala
-src/ThumbnailCache.vala
-src/TimedQueue.vala
-src/Tombstone.vala
-src/UnityProgressBar.vala
-src/Upgrades.vala
-src/VideoMetadata.vala
-src/VideoMonitor.vala
-src/VideoSupport.vala
-src/camera/Branch.vala
-src/camera/Camera.vala
-src/camera/CameraTable.vala
-src/camera/GPhoto.vala
-src/camera/ImportPage.vala
-src/config/Config.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/DataSource.vala
 src/core/DataSourceTypes.vala
-src/core/DataView.vala
+src/core/DataSource.vala
 src/core/DataViewTypes.vala
-src/core/DatabaseSourceCollection.vala
+src/core/DataView.vala
 src/core/SourceCollection.vala
 src/core/SourceHoldingTank.vala
 src/core/SourceInterfaces.vala
 src/core/Tracker.vala
-src/core/ViewCollection.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/DataImports.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
@@ -141,38 +107,59 @@ src/db/TagTable.vala
 src/db/TombstoneTable.vala
 src/db/VersionTable.vala
 src/db/VideoTable.vala
-src/direct/Direct.vala
-src/direct/DirectPhoto.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
 src/events/Branch.vala
 src/events/EventDirectoryItem.vala
 src/events/EventPage.vala
-src/events/Events.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/library/FlaggedSidebarEntry.vala
+src/LibraryFiles.vala
 src/library/FlaggedPage.vala
-src/library/ImportQueueSidebarEntry.vala
+src/library/FlaggedSidebarEntry.vala
 src/library/ImportQueuePage.vala
-src/library/LastImportSidebarEntry.vala
+src/library/ImportQueueSidebarEntry.vala
 src/library/LastImportPage.vala
+src/library/LastImportSidebarEntry.vala
 src/library/Library.vala
 src/library/LibraryWindow.vala
-src/library/OfflineSidebarEntry.vala
+src/LibraryMonitor.vala
 src/library/OfflinePage.vala
-src/library/TrashSidebarEntry.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/GRaw.vala
 src/photos/GdkSupport.vala
+src/photos/GRaw.vala
 src/photos/JfifSupport.vala
 src/photos/PhotoFileAdapter.vala
 src/photos/PhotoFileFormat.vala
@@ -182,6 +169,8 @@ 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
@@ -189,41 +178,58 @@ 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/Publishing.vala
 src/publishing/PublishingPluginHost.vala
 src/publishing/PublishingUI.vala
+src/publishing/Publishing.vala
+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/sidebar/common.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/unit/Unit.vala
+src/ThumbnailCache.vala
+src/Thumbnail.vala
+src/TimedQueue.vala
+src/Tombstone.vala
 src/unit/rc/template.vala
-src/util/KeyValueMap.vala
-src/util/Util.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
-[type: gettext/glade]ui/set_background_dialog.glade
-[type: gettext/glade]ui/set_background_slideshow_dialog.glade
-[type: gettext/glade]ui/shotwell.glade
+src/util/Util.vala
+src/VideoMetadata.vala
+src/VideoMonitor.vala
+src/VideoSupport.vala
+ui/set_background_dialog.ui
+ui/set_background_slideshow_dialog.ui
+ui/shotwell.ui