diff commited package against linked revision 3988256066ac5849eca68740a760ad01 Index: bnc-721350-translations.patch =================================================================== --- bnc-721350-translations.patch (revision 3988256066ac5849eca68740a760ad01) +++ bnc-721350-translations.patch (revision f1e3b0f8a821cf499dc76dd3928ba1ee) @@ -76,7 +76,7 @@ diff -ur f-spot-0.8.2.orig/po/POTFILES.in f-spot-0.8.2/po/POTFILES.in --- f-spot-0.8.2.orig/po/POTFILES.in 2010-12-19 07:34:40.000000000 -0600 +++ f-spot-0.8.2/po/POTFILES.in 2011-11-18 10:30:17.440383743 -0600 -@@ -87,6 +87,8 @@ +@@ -88,6 +88,8 @@ [type: gettext/glade]src/Clients/MainApp/ui/single_view.ui [type: gettext/glade]src/Clients/MainApp/ui/tag_selection_dialog.ui [type: gettext/glade]src/Clients/MainApp/ui/viewer_preferences.ui @@ -85,9 +85,9 @@ src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs src/Extensions/Editors/FSpot.Editors.Blackout/FSpot.Addins.Editors/BlackoutEditor.cs -@@ -143,4 +145,5 @@ - [type: gettext/glade]src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui - [type: gettext/glade]src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/pickfolder_dialog.ui +@@ -160,4 +162,5 @@ + src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/Resources/RetroactiveRoll.addin.xml + src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfig.addin.xml [type: gettext/glade]src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfigDialog.ui +src/Extensions/Transitions/FSpot.Transitions.Cover/FSpot.Addins.Transitions/Cover.cs tools/f-spot-screensaver.desktop.in Index: f-spot.changes =================================================================== --- f-spot.changes (revision 3988256066ac5849eca68740a760ad01) +++ f-spot.changes (revision f1e3b0f8a821cf499dc76dd3928ba1ee) @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri May 17 15:56:46 CEST 2013 - sbrabec@suse.cz + +- Add files with translatable strings + (f-spot-potfiles.patch, bnc#808272). + +------------------------------------------------------------------- Tue Jun 26 11:42:13 UTC 2012 - rlmu@suse.com - Fix failed to show thumbnails after rotate. (bnc#738740) Index: f-spot.spec =================================================================== --- f-spot.spec (revision 3988256066ac5849eca68740a760ad01) +++ f-spot.spec (revision f1e3b0f8a821cf499dc76dd3928ba1ee) @@ -38,6 +38,8 @@ # PATCH-FIX-UPSTREAM bnc-746296-export-cd-crash.patch bnc745199 glin@suse.com -- Fix crash when exporting photo to CD Patch6: bnc-746296-export-cd-crash.patch Patch7: bnc-738740-Fix-failed-to-show-thumbnails-after-rotate.patch +# PATCH-FIX-SLE f-spot-potfiles.patch bnc808272 sbrabec@suse.cz -- Add files with translatable strings. +Patch8: f-spot-potfiles.patch BuildRequires: beagle-devel BuildRequires: fdupes BuildRequires: flickrnet @@ -123,6 +125,8 @@ %prep %setup -q install -m 755 %{S:1} ./autogen.sh +# We need the POTFILES.in patch here: Upstream translation contain needed strings, but exclude them from pot file. +%patch8 -p1 translation-update-upstream gnome-patch-translation-prepare %patch0 Index: f-spot-potfiles.patch =================================================================== --- f-spot-potfiles.patch (added) +++ f-spot-potfiles.patch (revision f1e3b0f8a821cf499dc76dd3928ba1ee) @@ -0,0 +1,111 @@ +Index: f-spot-0.8.2/po/POTFILES.in +=================================================================== +--- f-spot-0.8.2.orig/po/POTFILES.in ++++ f-spot-0.8.2/po/POTFILES.in +@@ -23,6 +23,7 @@ src/Clients/MainApp/FSpot.Editors/TiltEd + src/Clients/MainApp/FSpot/FullScreenView.cs + src/Clients/MainApp/FSpot/GroupSelector.cs + src/Clients/MainApp/FSpot.Import/ImportController.cs ++src/Clients/MainApp/FSpot.Extensions/MenuNode.cs + src/Clients/MainApp/FSpot.Import/MetadataImporter.cs + src/Clients/MainApp/FSpot/ItemAction.cs + src/Clients/MainApp/FSpot.Jobs/SyncMetadataJob.cs +@@ -95,13 +96,17 @@ src/Extensions/Editors/FSpot.Editors.Fli + src/Extensions/Editors/FSpot.Editors.Pixelate/FSpot.Addins.Editors/PixelateEditor.cs + src/Extensions/Editors/FSpot.Editors.Resize/FSpot.Addins.Editors/ResizeEditor.cs + src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs ++src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.addin.xml + [type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.ui + src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs + src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs ++src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.addin.xml + [type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui + src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs ++src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/FlickrExport.addin.xml + [type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui + src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs ++src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/FolderExport.addin.xml + [type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui + src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs + src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/FormClient.cs +@@ -109,6 +114,7 @@ src/Extensions/Exporters/FSpot.Exporters + src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryAddAlbum.cs + src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs + src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryRemote.cs ++src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/GalleryExport.addin.xml + [type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_album_dialog.ui + [type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_dialog.ui + [type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui +@@ -117,6 +123,7 @@ src/Extensions/Exporters/FSpot.Exporters + src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccountManager.cs + src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAddAlbum.cs + src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs ++src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/PicasaWebExport.addin.xml + [type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_album_dialog.ui + [type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_dialog.ui + [type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui +@@ -125,22 +132,32 @@ src/Extensions/Exporters/FSpot.Exporters + src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccountManager.cs + src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAddAlbum.cs + src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs ++src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/SmugMugExport.addin.xml + [type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_add_album_dialog.ui + [type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_add_dialog.ui + [type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui + src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExport.cs ++src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/TabbloExport.addin.xml + [type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui + [type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TrustError.ui + src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs ++src/Extensions/Exporters/FSpot.Exporters.Zip/Resources/ZipExport.addin.xml + [type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.Zip/Resources/zip_export.ui ++src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/Resources/ChangePhotoPath.addin.xml + [type: gettext/glade]src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/Resources/ChangePhotoPath.ui + src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRawBatch.cs ++src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/Resources/DevelopInUFRaw.addin.xml + src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs + src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs ++src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/LiveWebGallery.addin.xml + [type: gettext/glade]src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui + src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDb.cs + src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/PickFolderDialog.cs ++src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/MergeDb.addin.xml + [type: gettext/glade]src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui + [type: gettext/glade]src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/pickfolder_dialog.ui ++src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/Resources/RawPlusJpeg.addin.xml ++src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/Resources/RetroactiveRoll.addin.xml ++src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfig.addin.xml + [type: gettext/glade]src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfigDialog.ui + tools/f-spot-screensaver.desktop.in +Index: f-spot-0.8.2/po/POTFILES.skip +=================================================================== +--- f-spot-0.8.2.orig/po/POTFILES.skip ++++ f-spot-0.8.2/po/POTFILES.skip +@@ -21,27 +21,11 @@ lib/Hyena/Hyena/Hyena.Query/RelativeTime + lib/Hyena/Hyena/Hyena.Query/StringQueryValue.cs + lib/Hyena/Mono.Data.Sqlite/Mono.Data.Sqlite/SR.Designer.cs + src/Core/FSpot.Gui/FSpot.Widgets/DateEdit.cs +-src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/Resources/ChangePhotoPath.addin.xml +-src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/Resources/DevelopInUFRaw.addin.xml +-src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/LiveWebGallery.addin.xml +-src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/MergeDb.addin.xml + src/Extensions/Tools/FSpot.Tools.MetaPixel/MetaPixel.addin.xml + src/Extensions/Tools/FSpot.Tools.MetaPixel/MetaPixel.cs + src/Extensions/Tools/FSpot.Tools.MetaPixel/MetaPixel.glade + src/Extensions/Tools/FSpot.Tools.PictureTile/PictureTile.addin.xml + src/Extensions/Tools/FSpot.Tools.PictureTile/PictureTile.cs + src/Extensions/Tools/FSpot.Tools.PictureTile/PictureTile.glade +-src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/Resources/RawPlusJpeg.addin.xml +-src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/Resources/RetroactiveRoll.addin.xml +-src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfig.addin.xml + src/Extensions/Tools/FSpot.Tools.SyncCatalog/SyncCatalog.addin.xml + src/Extensions/Tools/FSpot.Tools.SyncCatalog/SyncCatalog.cs +-src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.addin.xml +-src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.addin.xml +-src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/FlickrExport.addin.xml +-src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/FolderExport.addin.xml +-src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/GalleryExport.addin.xml +-src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/PicasaWebExport.addin.xml +-src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/SmugMugExport.addin.xml +-src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/TabbloExport.addin.xml +-src/Extensions/Exporters/FSpot.Exporters.Zip/Resources/ZipExport.addin.xml