diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-06-03 08:54:49 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-06-03 08:54:49 +0200 |
| commit | 7dec5f41b2cffafe4d743273600e2868d116166d (patch) | |
| tree | 1ea5e30103db6e2e8454f5c5c2e885008dc7d99d | |
| parent | 9e7cd144725a270e0460b21747619f447ca87684 (diff) | |
New upstream version 0.26.2upstream/0.26.2
36 files changed, 18146 insertions, 17810 deletions
@@ -1,6 +1,113 @@ +commit 4f0174c855ca28b2b1f51e51120333de89edf994 +Author: Jens Georg <mail@jensge.org> +Date: Thu Jun 1 18:52:56 2017 +0200 + + Prepare Shotwell 0.26.2 + +M NEWS +M configure.ac +M debian/changelog + +commit e54216f18f6984a78c9a07f1b150a1c72cfc49a1 +Author: Jens Georg <mail@jensge.org> +Date: Thu Jun 1 18:42:47 2017 +0200 + + Fix crash when no import plugin is enabled + + https://bugzilla.gnome.org/show_bug.cgi?id=783250 + +M src/data_imports/DataImportsUI.vala + +commit 56d69796770c5b8f29930224f851b2b445ca1863 +Author: Jens Georg <mail@jensge.org> +Date: Mon May 1 18:29:34 2017 +0200 + + Do not strip newlines from comments on write-back + + Stripping newlines makes sense for titles etc, but it makes sense + to keep them + for comments. + + https://bugzilla.gnome.org/show_bug.cgi?id=781897 + +M src/photos/PhotoMetadata.vala + +commit d822571fd8529d931c5740b402c18e9ce2962b42 +Author: Jens Georg <mail@jensge.org> +Date: Sun Apr 2 19:52:30 2017 +0200 + + Fix browsing on gvfs filesystems + + Signed-off-by: Jens Georg <mail@jensge.org> + + https://bugzilla.gnome.org/show_bug.cgi?id=733652 + +M src/DirectoryMonitor.vala + +commit c01a8b79df0f10b5d206b70d508c322c830962ac +Author: Jens Georg <mail@jensge.org> +Date: Fri Mar 24 19:47:52 2017 +0100 + + Disable minimize button on Unity + + Signed-off-by: Jens Georg <mail@jensge.org> + + https://bugzilla.gnome.org/show_bug.cgi?id=719240 + +M src/publishing/PublishingUI.vala + +commit 5674371e83b382bf1db5b5df246068b5a6e076b2 +Author: Мирослав Николић <miroslavnikolic@rocketmail.com> +Date: Fri May 5 07:00:25 2017 +0200 + + Updated Serbian translation + +M po/sr.po +M po/sr@latin.po + +commit 8bb3e2be9bac5519aa183beeca70c3a796b5c821 +Author: Rafael Fontenelle <rafaelff@gnome.org> +Date: Sun Apr 30 21:44:51 2017 +0000 + + Update Brazilian Portuguese translation + +M po/pt_BR.po + +commit 0c23fdd826e9330c254b2b5293c1458980e3a91d +Author: Andika Triwidada <atriwidada@gnome.org> +Date: Sun Apr 30 10:04:31 2017 +0000 + + Update Indonesian translation + +M po/id.po + +commit 85d55e4b6b68aa02dff4da7f0a3081f9c82687a4 +Author: Andika Triwidada <atriwidada@gnome.org> +Date: Sat Apr 29 10:59:45 2017 +0000 + + Update Indonesian translation + +M po/id.po + +commit ce5e8576276481f15b015017283afa8d0f119646 +Author: Daniel Mustieles <daniel.mustieles@gmail.com> +Date: Tue Apr 18 10:17:32 2017 +0000 + + Update Spanish translation + +M po/es.po + +commit 0860f8657c1bf69c04fc37bac0901faf57022ce6 +Author: Dušan Kazik <prescott66@gmail.com> +Date: Sat Apr 15 17:29:54 2017 +0000 + + Update Slovak translation + +M po/sk.po + commit 23f098ffa0b6fb7586829ff171c57dfa74f2d7f6 Author: Jens Georg <mail@jensge.org> -Date: Tue Apr 11 22:34:52 2017 +0200 +Date: Tue Apr 11 22:34:52 2017 +0200 Prepare 0.26.1 @@ -19011,7 +19118,7 @@ M src/photos/PhotoMetadata.vala M src/tags/HierarchicalTagUtilities.vala commit 22f8b1fdf900d0e10cbcc430b6845d13179bf40a -Merge: 2b98be9 eb47fe1 +Merge: 2b98be9b eb47fe1e Author: Clint Rogers <clinton@oneiric-sandbox.(none)> Date: Fri Sep 2 17:55:49 2011 -0700 @@ -19584,7 +19691,7 @@ Date: Mon Aug 22 12:09:50 2011 -0700 M src/config/HybridEngine.vala commit 2111b2e46324e12511143b6a1683dc71e1be3451 -Merge: 949612a 8303d2c +Merge: 949612a6 8303d2cb Author: Clint Rogers <clinton@oneiric-sandbox.(none)> Date: Mon Aug 22 12:08:40 2011 -0700 @@ -20430,7 +20537,7 @@ Date: Mon Jun 27 12:35:03 2011 -0700 M plugins/shotwell-publishing-extras/YandexPublishing.vala commit efe7d92b4d1a177dc29f6c3bb1f23e308c606bc1 -Merge: a30225a 86624e8 +Merge: a30225a8 86624e84 Author: Clint Rogers <clinton@yorba.org> Date: Fri Jun 24 13:05:38 2011 -0700 @@ -20818,7 +20925,7 @@ Date: Thu May 26 16:49:38 2011 -0700 M Makefile commit 8d39a139b7f9fdea1dfa3dc266884528706eb6bc -Merge: 6b8e5da 80750b1 +Merge: 6b8e5dae 80750b13 Author: Eric Gregory <eric@yorba.org> Date: Thu May 26 16:44:50 2011 -0700 @@ -21174,7 +21281,7 @@ Date: Thu May 19 13:23:00 2011 -0700 M src/publishing/PublishingUI.vala commit 3d646abb99f2a506b63487bc8d78d1aaaf488e7d -Merge: 8cb6c4f fbf5893 +Merge: 8cb6c4fd fbf5893c Author: Eric Gregory <eric@yorba.org> Date: Thu May 19 12:45:00 2011 -0700 @@ -21576,7 +21683,7 @@ M src/sidebar/Tree.vala A ui/sidebar_default.ui commit 5c8cbb87df1562c165c020ae310c45753352b4e2 -Merge: e70cbd0 17cc617 +Merge: e70cbd0d 17cc6173 Author: Clint Rogers <clinton@yorba.org> Date: Thu May 12 16:22:10 2011 -0700 @@ -21691,7 +21798,7 @@ M Makefile M configure commit d847941a826b481e6f49317aadaa9d70fe1cfa74 -Merge: 8932d5f 5034bcd +Merge: 8932d5fa 5034bcd4 Author: Clint Rogers <clinton@yorba.org> Date: Mon May 9 11:30:30 2011 -0700 @@ -22215,7 +22322,7 @@ Date: Mon May 2 18:18:34 2011 -0700 M src/db/DatabaseTable.vala commit 96fe5e59724bd3592add9ebcf073f6c464d77ff0 -Merge: ed6a2f1 7c4d4ee +Merge: ed6a2f1f 7c4d4ee5 Author: Eric Gregory <eric@polaris.(none)> Date: Mon May 2 17:50:33 2011 -0700 @@ -22461,7 +22568,7 @@ M debian/changelog M po/shotwell.pot commit f7e761752fa61b0afb94583c835738c86b997068 -Merge: 0e810be be61743 +Merge: 0e810be0 be61743b Author: Lucas Beeler <lucas@yorba.org> Date: Thu Apr 21 13:12:00 2011 -0700 @@ -22476,7 +22583,7 @@ Date: Thu Apr 21 12:54:17 2011 -0700 M src/Config.vala commit 0e810be0f45757842686af5e82ab3d332a0c7458 -Merge: 60c59ae 56da5c0 +Merge: 60c59ae4 56da5c08 Author: Eric Gregory <eric@polaris.(none)> Date: Wed Apr 20 16:31:32 2011 -0700 @@ -22516,7 +22623,7 @@ Date: Wed Apr 20 10:04:26 2011 -0700 M po/ru.po commit d4cd7fbd59e02403ce331eec0719756956af0cee -Merge: bad6f3d a1f2d40 +Merge: bad6f3d4 a1f2d406 Author: Vera Yin <vera@yorba.org> Date: Tue Apr 19 19:54:57 2011 -0700 @@ -22585,7 +22692,7 @@ Date: Tue Apr 19 16:29:55 2011 -0700 M src/searches/SavedSearchDialog.vala commit 9bae9f9d3f95eeaf825013ecd487f517b35b8fce -Merge: 8d3bc46 a1f2d40 +Merge: 8d3bc465 a1f2d406 Author: Eric Gregory <eric@polaris.(none)> Date: Tue Apr 19 16:16:51 2011 -0700 @@ -22661,7 +22768,7 @@ Date: Mon Apr 18 16:42:56 2011 -0700 M src/searches/SearchBoolean.vala commit 22bdb60e88140f3b1b4878788d6ef9630aaf3dab -Merge: 350d7ce 23a8a0a +Merge: 350d7ce6 23a8a0ab Author: Eric Gregory <eric@yorba-laptop.(none)> Date: Mon Apr 18 12:53:09 2011 -0700 @@ -23214,7 +23321,7 @@ M src/unit/rc/unitize_entry.m4 M units.mk commit 8783510f20d3f86b77a0a85a68879894909aeb42 -Merge: 6d6c06c f0a4651 +Merge: 6d6c06ca f0a46515 Author: Jim Nelson <jim@yorba.org> Date: Tue Mar 22 21:47:51 2011 +0000 @@ -23245,7 +23352,7 @@ Date: Tue Mar 22 20:47:24 2011 +0000 M Makefile commit e625748ef4e32081d12ff46c3f373ba1ad26b78a -Merge: a5321df 85206d1 +Merge: a5321df6 85206d1e Author: Eric Gregory <eric@yorba.org> Date: Tue Mar 22 20:45:50 2011 +0000 @@ -26264,7 +26371,7 @@ Date: Mon Jan 10 23:11:48 2011 +0000 M src/Dialogs.vala commit 30fb90b3f6a53f84bc4a178cefeb7ca03c18b4a9 -Merge: dcda7c9 3434f5c +Merge: dcda7c93 3434f5c6 Author: Jim Nelson <jim@yorba.org> Date: Fri Jan 7 23:10:44 2011 +0000 @@ -26289,7 +26396,7 @@ M THANKS M ui/video.ui commit dcda7c9344f4cb21ef16a63617d225fdcaf78c9b -Merge: 678e772 e893015 +Merge: 678e772b e8930156 Author: Jim Nelson <jim@yorba.org> Date: Fri Jan 7 00:58:08 2011 +0000 @@ -26333,7 +26440,7 @@ M src/MetadataWriter.vala M src/PhotoMetadata.vala commit 4d27bbf23c7757cfcba6e8685ebf99b98ee0de9c -Merge: 25f0eb5 31333fe +Merge: 25f0eb52 31333fee Author: Jim Nelson <jim@yorba.org> Date: Wed Jan 5 02:17:11 2011 +0000 @@ -29405,7 +29512,7 @@ M po/sr.po M po/sv.po commit 192ca547af59c965113904e2c062a097c7909d9a -Merge: b9ae51a c5bd728 +Merge: b9ae51a7 c5bd728d Author: Jim Nelson <jim@yorba.org> Date: Sat Sep 11 01:20:50 2010 +0000 @@ -29669,7 +29776,7 @@ Date: Wed Sep 8 00:25:12 2010 +0000 M src/WebConnectors.vala commit 7b2de4180264d97631d5fe36cd49e472a06d663f -Merge: 0f499a2 af61ecf +Merge: 0f499a29 af61ecfc Author: Jim Nelson <jim@yorba.org> Date: Wed Sep 8 00:21:20 2010 +0000 @@ -29724,7 +29831,7 @@ Date: Fri Sep 3 18:25:40 2010 +0000 M po/ko.po commit 0f499a29fe52c2fbcf772d39ab71f6bda80601fd -Merge: 9ad4f31 6024a6e +Merge: 9ad4f31d 6024a6e1 Author: Jim Nelson <jim@yorba.org> Date: Thu Sep 2 20:29:46 2010 +0000 @@ -29933,7 +30040,7 @@ Date: Fri Aug 27 00:06:35 2010 +0000 A po/kk.po commit 28ef3d0109f86e0c53c70cf0390b4d14b5fe2e0b -Merge: 66ac9e9 f065768 +Merge: 66ac9e94 f065768b Author: Jim Nelson <jim@yorba.org> Date: Fri Aug 27 00:03:03 2010 +0000 @@ -30186,7 +30293,7 @@ M src/image_util.vala M src/util.vala commit 787e50875e3901eba6a864f920054928e59075ee -Merge: 5f2f05d 72b6b52 +Merge: 5f2f05d9 72b6b52e Author: Jim Nelson <jim@yorba.org> Date: Tue Aug 24 23:05:27 2010 +0000 @@ -30308,7 +30415,7 @@ M po/ru.po M po/zh_TW.po commit 9d37b9449966a3507e18b0d9173a78985a16233f -Merge: 2b8b515 4bfac1e +Merge: 2b8b5158 4bfac1e7 Author: Adam Dingle <adam@yorba.org> Date: Sat Aug 21 10:25:20 2010 +0000 @@ -32541,7 +32648,7 @@ Date: Thu Jul 1 18:20:45 2010 +0000 M po/es.po commit dabe06104126412ec5eb62267534736b45f1db39 -Merge: b59d046 7bb2969 +Merge: b59d0461 7bb29693 Author: Allison Barlow <allison@yorba.org> Date: Wed Jun 30 22:09:29 2010 +0000 @@ -32696,7 +32803,7 @@ Date: Tue Jun 29 01:16:51 2010 +0000 M Makefile commit b9ea83f46efae43c960a5dca96e09fb85b7d5034 -Merge: 42daba6 4608a46 +Merge: 42daba67 4608a461 Author: Allison Barlow <allison@yorba.org> Date: Tue Jun 29 00:29:47 2010 +0000 @@ -36081,7 +36188,7 @@ Date: Thu Mar 18 18:37:06 2010 +0000 M debian/control commit e8b6640d7c020d044fb20442a6602487232ee413 -Merge: b9270b3 d9b9e58 +Merge: b9270b3d d9b9e584 Author: Lucas Beeler <lucas@yorba.org> Date: Wed Mar 17 23:11:47 2010 +0000 @@ -38060,7 +38167,7 @@ M ui/direct.ui M ui/photo.ui commit cd883d802a35841924b9da6abd31589d6cf8ac74 -Merge: 2bd7dbd 02720bd +Merge: 2bd7dbd4 02720bde Author: Jim Nelson <jim@yorba.org> Date: Mon Jan 18 22:59:44 2010 +0000 @@ -38220,7 +38327,7 @@ M ui/collection.ui M ui/photo.ui commit 411da615e8694a2667b7fe04292d007b3ddf65e6 -Merge: a46fd2b 4b2d878 +Merge: a46fd2b8 4b2d8784 Author: Jim Nelson <jim@yorba.org> Date: Thu Jan 7 22:38:53 2010 +0000 @@ -38254,7 +38361,7 @@ Date: Wed Jan 6 22:34:44 2010 +0000 M src/SortedList.vala commit 579a2f522053e64bfcf6bc083c55a8f13fb1e807 -Merge: e60183e 74235cf +Merge: e60183ea 74235cf8 Author: Jim Nelson <jim@yorba.org> Date: Wed Jan 6 02:34:20 2010 +0000 @@ -38299,7 +38406,7 @@ Date: Tue Jan 5 19:49:33 2010 +0000 M Makefile commit cd9a204a3114a63482725439072df6ac1067c972 -Merge: 9296063 8b5cc75 +Merge: 9296063c 8b5cc758 Author: Jim Nelson <jim@yorba.org> Date: Tue Jan 5 00:31:52 2010 +0000 @@ -38454,7 +38561,7 @@ M src/Photo.vala M src/PhotoPage.vala commit 171b030e74ac7e2c815281e45b7b6e2517ed16a2 -Merge: 19107f1 ae7a8eb +Merge: 19107f19 ae7a8ebd Author: Jim Nelson <jim@yorba.org> Date: Tue Dec 29 19:11:12 2009 +0000 @@ -38480,7 +38587,7 @@ Date: Thu Dec 24 12:39:02 2009 +0000 M Makefile commit 19107f19907e7d70f6b35975f15c6e2aa874ee3b -Merge: 2ea50d0 8035f57 +Merge: 2ea50d0a 8035f57a Author: Jim Nelson <jim@yorba.org> Date: Thu Dec 24 01:21:38 2009 +0000 @@ -38509,7 +38616,7 @@ M debian/control M debian/copyright commit 2ea50d0a866e5407313a52478090d7dcf4378c70 -Merge: d57c15e 39583c7 +Merge: d57c15e5 39583c73 Author: Jim Nelson <jim@yorba.org> Date: Wed Dec 23 22:28:12 2009 +0000 @@ -38772,7 +38879,7 @@ Date: Fri Dec 18 18:23:46 2009 +0000 M misc/shotwell.schemas commit 670a708d5fc380e6ffb1b292cdd6690cb625d40e -Merge: 201d857 e44d0ff +Merge: 201d8572 e44d0ffa Author: Jim Nelson <jim@yorba.org> Date: Fri Dec 18 01:31:56 2009 +0000 @@ -40134,7 +40241,7 @@ M ui/events_directory.ui M ui/photo.ui commit 7649c34c185200712a58cb06c816759499330dc0 -Merge: a33ec8f ed7fb71 +Merge: a33ec8f5 ed7fb71c Author: Jim Nelson <jim@yorba.org> Date: Thu Nov 12 19:56:16 2009 +0000 @@ -40149,7 +40256,7 @@ Date: Thu Nov 12 19:55:19 2009 +0000 M Makefile commit a33ec8f5da69873d95d0c3977f05b5a0b05d45f6 -Merge: 9bb87f0 166ccb5 +Merge: 9bb87f0c 166ccb58 Author: Jim Nelson <jim@yorba.org> Date: Thu Nov 12 00:08:37 2009 +0000 @@ -40239,7 +40346,7 @@ M src/SortedList.vala M ui/collection.ui commit fba1e5ada30c803312e073d41d07ada28251931f -Merge: 4f2830d 8634ac0 +Merge: 4f2830dc 8634ac02 Author: Jim Nelson <jim@yorba.org> Date: Mon Nov 9 23:55:16 2009 +0000 @@ -40260,7 +40367,7 @@ M debian/control M debian/copyright commit 4f2830dcd570a2788b092749edc89d9744e16586 -Merge: 71b7914 5613559 +Merge: 71b7914f 56135595 Author: Jim Nelson <jim@yorba.org> Date: Mon Nov 9 23:28:08 2009 +0000 @@ -40369,7 +40476,7 @@ Date: Tue Nov 3 20:32:19 2009 +0000 M src/EventsDirectoryPage.vala commit 1b379f71b4b1826481d84426a41a8fc49da58be8 -Merge: 574cce1 f9b19cf +Merge: 574cce1b f9b19cf5 Author: Jim Nelson <jim@yorba.org> Date: Tue Nov 3 19:32:46 2009 +0000 @@ -40455,7 +40562,7 @@ Date: Mon Nov 2 19:45:15 2009 +0000 M po/shotwell.pot commit 9a9544bb6ca9ec883ed6271a94d1294b95c42e56 -Merge: 0ce4554 b9a5300 +Merge: 0ce4554f b9a5300b Author: Jim Nelson <jim@yorba.org> Date: Mon Nov 2 19:14:32 2009 +0000 @@ -40471,7 +40578,7 @@ M src/Dialogs.vala M src/ImportPage.vala commit 0ce4554f314cae170fbbff9bca6f98aa7383ad78 -Merge: 05ab194 bc7951b +Merge: 05ab1943 bc7951bb Author: Jim Nelson <jim@yorba.org> Date: Mon Nov 2 18:59:23 2009 +0000 diff --git a/Makefile.in b/Makefile.in index 09a2e2c..6b5f525 100644 --- a/Makefile.in +++ b/Makefile.in @@ -6126,6 +6126,15 @@ thumbnailer/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.ob @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='thumbnailer/shotwell-video-thumbnailer.c' object='thumbnailer/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thumbnailer_shotwell_video_thumbnailer_CFLAGS) $(CFLAGS) -c -o thumbnailer/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.obj `if test -f 'thumbnailer/shotwell-video-thumbnailer.c'; then $(CYGPATH_W) 'thumbnailer/shotwell-video-thumbnailer.c'; else $(CYGPATH_W) '$(srcdir)/thumbnailer/shotwell-video-thumbnailer.c'; fi` +$(srcdir)/thumbnailer/shotwell-video-thumbnailer.c: $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp; \ + fi +$(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp: thumbnailer/shotwell-video-thumbnailer.vala + $(AM_V_at)rm -f $@ && echo stamp > $@-t + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(thumbnailer_shotwell_video_thumbnailer_VALAFLAGS) $(VALAFLAGS) -C thumbnailer/shotwell-video-thumbnailer.vala + $(AM_V_at)mv -f $@-t $@ $(srcdir)/src/unit/Unit.c: $(srcdir)/shotwell_vala.stamp @if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi @if test -f $@; then :; else \ @@ -7085,74 +7094,6 @@ $(srcdir)/shotwell_vala.stamp: src/unit/Unit.vala src/util/Util.vala src/util/fi $(AM_V_at)rm -f $@ && echo stamp > $@-t $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(shotwell_VALAFLAGS) $(VALAFLAGS) -C src/unit/Unit.vala src/util/Util.vala src/util/file.vala src/util/image.vala src/util/misc.vala src/util/string.vala src/util/system.vala src/util/KeyValueMap.vala src/util/ui.vala src/threads/Threads.vala src/threads/Workers.vala src/threads/BackgroundJob.vala src/threads/Semaphore.vala src/db/Db.vala src/db/DatabaseTable.vala src/db/PhotoTable.vala src/db/EventTable.vala src/db/TagTable.vala src/db/TombstoneTable.vala src/db/VideoTable.vala src/db/VersionTable.vala src/db/SavedSearchDBTable.vala src/editing_tools/EditingTools.vala src/editing_tools/StraightenTool.vala src/slideshow/Slideshow.vala src/slideshow/TransitionEffects.vala src/photos/Photos.vala src/photos/PhotoFileAdapter.vala src/photos/PhotoFileFormat.vala src/photos/PhotoFileSniffer.vala src/photos/PhotoMetadata.vala src/photos/GRaw.vala src/photos/GdkSupport.vala src/photos/JfifSupport.vala src/photos/BmpSupport.vala src/photos/RawSupport.vala src/photos/PngSupport.vala src/photos/TiffSupport.vala src/plugins/Plugins.vala src/plugins/StandardHostInterface.vala src/plugins/ManifestWidget.vala src/publishing/Publishing.vala src/publishing/PublishingUI.vala src/publishing/PublishingPluginHost.vala src/publishing/APIGlue.vala src/library/Library.vala src/library/LibraryWindow.vala src/library/Branch.vala src/library/TrashSidebarEntry.vala src/library/OfflineSidebarEntry.vala src/library/FlaggedSidebarEntry.vala src/library/LastImportSidebarEntry.vala src/library/ImportQueueSidebarEntry.vala src/library/FlaggedPage.vala src/library/ImportQueuePage.vala src/library/LastImportPage.vala src/library/OfflinePage.vala src/library/TrashPage.vala src/direct/Direct.vala src/direct/DirectWindow.vala src/direct/DirectPhoto.vala src/direct/DirectPhotoPage.vala src/direct/DirectView.vala src/core/Core.vala src/core/DataCollection.vala src/core/DataSet.vala src/core/util.vala src/core/SourceCollection.vala src/core/SourceHoldingTank.vala src/core/DatabaseSourceCollection.vala src/core/ContainerSourceCollection.vala src/core/ViewCollection.vala src/core/DataObject.vala src/core/Alteration.vala src/core/DataSource.vala src/core/DataSourceTypes.vala src/core/DataView.vala src/core/DataViewTypes.vala src/core/Tracker.vala src/core/SourceInterfaces.vala src/sidebar/Sidebar.vala src/sidebar/Branch.vala src/sidebar/Entry.vala src/sidebar/Tree.vala src/sidebar/common.vala src/events/Events.vala src/events/Branch.vala src/events/EventsDirectoryPage.vala src/events/EventPage.vala src/events/EventDirectoryItem.vala src/tags/Tags.vala src/tags/Branch.vala src/tags/TagPage.vala src/tags/HierarchicalTagIndex.vala src/tags/HierarchicalTagUtilities.vala src/camera/Camera.vala src/camera/Branch.vala src/camera/CameraTable.vala src/camera/GPhoto.vala src/camera/ImportPage.vala src/searches/Searches.vala src/searches/Branch.vala src/searches/SearchBoolean.vala src/searches/SavedSearchPage.vala src/searches/SavedSearchDialog.vala src/config/Config.vala src/config/ConfigurationInterfaces.vala src/config/GSettingsEngine.vala src/data_imports/DataImports.vala src/data_imports/DataImportsPluginHost.vala src/data_imports/DataImportsUI.vala src/data_imports/DataImportJob.vala src/data_imports/DataImportSource.vala src/folders/Folders.vala src/folders/Branch.vala src/folders/Page.vala src/main.vala src/AppWindow.vala src/CollectionPage.vala src/NaturalCollate.vala src/Thumbnail.vala src/ThumbnailCache.vala src/CheckerboardLayout.vala src/PhotoPage.vala src/Page.vala src/SortedList.vala src/Dimensions.vala src/Box.vala src/Photo.vala src/Orientation.vala src/BatchImport.vala src/Dialogs.vala src/Resources.vala src/Debug.vala src/ColorTransformation.vala src/Properties.vala src/CustomComponents.vala src/Event.vala src/International.vala src/AppDirs.vala src/PixbufCache.vala src/CommandManager.vala src/Commands.vala src/SlideshowPage.vala src/LibraryFiles.vala src/Printing.vala src/Tag.vala src/Screensaver.vala src/Exporter.vala src/DirectoryMonitor.vala src/LibraryMonitor.vala src/VideoSupport.vala src/Tombstone.vala src/MetadataWriter.vala src/Application.vala src/TimedQueue.vala src/MediaPage.vala src/MediaDataRepresentation.vala src/DesktopIntegration.vala src/MediaInterfaces.vala src/MediaMetadata.vala src/VideoMetadata.vala src/MediaMonitor.vala src/PhotoMonitor.vala src/VideoMonitor.vala src/SearchFilter.vala src/MediaViewTracker.vala src/UnityProgressBar.vala src/Upgrades.vala src/.unitize/_UnitInternals.vala src/.unitize/_UtilInternals.vala src/.unitize/_ThreadsInternals.vala src/.unitize/_DbInternals.vala src/.unitize/_EditingToolsInternals.vala src/.unitize/_PluginsInternals.vala src/.unitize/_SlideshowInternals.vala src/.unitize/_PhotosInternals.vala src/.unitize/_PublishingInternals.vala src/.unitize/_LibraryInternals.vala src/.unitize/_DirectInternals.vala src/.unitize/_CoreInternals.vala src/.unitize/_SidebarInternals.vala src/.unitize/_EventsInternals.vala src/.unitize/_TagsInternals.vala src/.unitize/_CameraInternals.vala src/.unitize/_SearchesInternals.vala src/.unitize/_ConfigInternals.vala src/.unitize/_DataImportsInternals.vala src/.unitize/_FoldersInternals.vala src/.unitize/_Library_unitize_entry.vala src/.unitize/_Direct_unitize_entry.vala plugins/shotwell-plugin-dev-1.0.vapi $(AM_V_at)mv -f $@-t $@ -$(srcdir)/thumbnailer/shotwell-video-thumbnailer.c: $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp; \ - fi -$(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp: thumbnailer/shotwell-video-thumbnailer.vala - $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(thumbnailer_shotwell_video_thumbnailer_VALAFLAGS) $(VALAFLAGS) -C thumbnailer/shotwell-video-thumbnailer.vala - $(AM_V_at)mv -f $@-t $@ -$(srcdir)/plugins/shotwell-transitions/BlindsEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-transitions/ChessEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-transitions/CircleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-transitions/CirclesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-transitions/ClockEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-transitions/CrumbleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-transitions/FadeEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-transitions/shotwell-transitions.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-transitions/SlideEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-transitions/SquaresEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-transitions/StripesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp: plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala 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-plugin-common.vapi - $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_transitions_shotwell_transitions_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala 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-plugin-common.vapi - $(AM_V_at)mv -f $@-t $@ $(srcdir)/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c: $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp; fi @if test -f $@; then :; else \ @@ -7227,6 +7168,35 @@ $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp: plu $(AM_V_at)rm -f $@ && echo stamp > $@-t $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_data_imports_shotwell_data_imports_la_VALAFLAGS) $(VALAFLAGS) -C 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-plugin-common.vapi $(AM_V_at)mv -f $@-t $@ +$(srcdir)/plugins/shotwell-publishing-extras/GalleryConnector.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-publishing-extras/RajcePublishing.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-publishing-extras/TumblrPublishing.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-publishing-extras/YandexPublishing.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \ + fi +$(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp: plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala plugins/shotwell-publishing-extras/TumblrPublishing.vala plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-plugin-common.vapi + $(AM_V_at)rm -f $@ && echo stamp > $@-t + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala plugins/shotwell-publishing-extras/TumblrPublishing.vala plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-plugin-common.vapi + $(AM_V_at)mv -f $@-t $@ $(srcdir)/plugins/common/RESTSupport.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp @if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi @if test -f $@; then :; else \ @@ -7251,68 +7221,64 @@ $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp: plugins/common $(AM_V_at)rm -f $@ && echo stamp > $@-t $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_common_libshotwell_plugin_common_la_VALAFLAGS) $(VALAFLAGS) -C plugins/common/RESTSupport.vala plugins/common/Resources.vala plugins/common/WebAuthenticationPane.vala plugins/common/BuilderPane.vala plugins/shotwell-plugin-dev-1.0.vapi $(AM_V_at)mv -f $@-t $@ -$(srcdir)/plugins/shotwell-publishing/shotwell-publishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi +$(srcdir)/plugins/shotwell-transitions/BlindsEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ fi -$(srcdir)/plugins/shotwell-publishing/FacebookPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi +$(srcdir)/plugins/shotwell-transitions/ChessEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ fi -$(srcdir)/plugins/shotwell-publishing/PicasaPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi +$(srcdir)/plugins/shotwell-transitions/CircleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ fi -$(srcdir)/plugins/shotwell-publishing/FlickrPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi +$(srcdir)/plugins/shotwell-transitions/CirclesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ fi -$(srcdir)/plugins/shotwell-publishing/YouTubePublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi +$(srcdir)/plugins/shotwell-transitions/ClockEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ fi -$(srcdir)/plugins/shotwell-publishing/PiwigoPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi +$(srcdir)/plugins/shotwell-transitions/CrumbleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ fi -$(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp: plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi plugins/authenticator/shotwell-authenticator.vapi vapi/libgdata.vapi - $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi plugins/authenticator/shotwell-authenticator.vapi vapi/libgdata.vapi - $(AM_V_at)mv -f $@-t $@ -$(srcdir)/plugins/shotwell-publishing-extras/GalleryConnector.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi +$(srcdir)/plugins/shotwell-transitions/FadeEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ fi -$(srcdir)/plugins/shotwell-publishing-extras/RajcePublishing.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi +$(srcdir)/plugins/shotwell-transitions/shotwell-transitions.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ fi -$(srcdir)/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi +$(srcdir)/plugins/shotwell-transitions/SlideEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ fi -$(srcdir)/plugins/shotwell-publishing-extras/TumblrPublishing.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi +$(srcdir)/plugins/shotwell-transitions/SquaresEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ fi -$(srcdir)/plugins/shotwell-publishing-extras/YandexPublishing.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi +$(srcdir)/plugins/shotwell-transitions/StripesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ fi -$(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp: plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala plugins/shotwell-publishing-extras/TumblrPublishing.vala plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-plugin-common.vapi +$(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp: plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala 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-plugin-common.vapi $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala plugins/shotwell-publishing-extras/TumblrPublishing.vala plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-plugin-common.vapi + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_transitions_shotwell_transitions_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala 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-plugin-common.vapi $(AM_V_at)mv -f $@-t $@ $(srcdir)/src/plugins/SpitInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp @if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi @@ -7338,6 +7304,40 @@ $(srcdir)/src_plugins_libplugin_la_vala.stamp: src/plugins/SpitInterfaces.vala s $(AM_V_at)rm -f $@ && echo stamp > $@-t $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(src_plugins_libplugin_la_VALAFLAGS) $(VALAFLAGS) -C src/plugins/SpitInterfaces.vala src/plugins/TransitionsInterfaces.vala src/plugins/PublishingInterfaces.vala src/plugins/DataImportsInterfaces.vala $(AM_V_at)mv -f $@-t $@ +$(srcdir)/plugins/shotwell-publishing/shotwell-publishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-publishing/FacebookPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-publishing/PicasaPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-publishing/FlickrPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-publishing/YouTubePublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-publishing/PiwigoPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ + fi +$(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp: plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi plugins/authenticator/shotwell-authenticator.vapi vapi/libgdata.vapi + $(AM_V_at)rm -f $@ && echo stamp > $@-t + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi plugins/authenticator/shotwell-authenticator.vapi vapi/libgdata.vapi + $(AM_V_at)mv -f $@-t $@ $(srcdir)/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c: $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp @if test -f $@; then :; else rm -f $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; fi @if test -f $@; then :; else \ @@ -1,3 +1,32 @@ +Shotwell 0.26.2 - 1 Jun 2017 + * Fix issue when minimizing publishing UI on Unity + * Fix browsing on GVFS-mounted file systems + * Fix missing linebreaks in comments when writing back meta-data + * Fix crash when no import plugin is selected + * Translation updates + +Bugs fixed in this release: + - https://bugzilla.gnome.org/show_bug.cgi?id=719240 + - https://bugzilla.gnome.org/show_bug.cgi?id=733652 + - https://bugzilla.gnome.org/show_bug.cgi?id=781897 + - https://bugzilla.gnome.org/show_bug.cgi?id=783250 + +All contributors to this release: + - Jens Georg <mail@jensge.org> + - Andika Triwidada <atriwidada@gnome.org> + - Мирослав Николић <miroslavnikolic@rocketmail.com> + - Rafael Fontenelle <rafaelff@gnome.org> + - Dušan Kazik <prescott66@gmail.com> + - Daniel Mustieles <daniel.mustieles@gmail.com> + +Added/updated translations + - es, courtesy of Daniel Mustieles + - id, courtesy of Andika Triwidada + - pt_BR, courtesy of Rafael Fontenelle + - sk, courtesy of Dušan Kazik + - sr, courtesy of Мирослав Николић + - sr@latin, courtesy of Miroslav Nikolić + Shotwell 0.26.1 - 11 Apr 2017 * Fix "About" wording * Fix missing Keyboard shortcuts diff --git a/build-aux/config.guess b/build-aux/config.guess index 0967f2a..2e9ad7f 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2016-04-02' +timestamp='2016-10-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -186,9 +186,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. + # to ELF recently (or will in the future) and ABI. case "${UNAME_MACHINE_ARCH}" in - arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax) + earm*) + os=netbsdelf + ;; + arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ @@ -997,6 +1000,9 @@ EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + mips64el:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; openrisc*:Linux:*:*) echo or1k-unknown-linux-${LIBC} exit ;; @@ -1029,6 +1035,9 @@ EOF ppcle:Linux:*:*) echo powerpcle-unknown-linux-${LIBC} exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; @@ -1408,18 +1417,17 @@ esac cat >&2 <<EOF $0: unable to guess system type -This script, last modified $timestamp, has failed to recognize -the operating system you are using. It is advised that you -download the most up to date version of the config scripts from +This script (version $timestamp), has failed to recognize the +operating system you are using. If your script is old, overwrite +config.guess and config.sub with the latest versions from: http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess and http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub -If the version you run ($0) is already up to date, please -send the following data and any information you think might be -pertinent to <config-patches@gnu.org> in order to provide the needed -information to handle your system. +If $0 has already been updated, send the following data and any +information you think might be pertinent to config-patches@gnu.org to +provide the necessary information to handle your system. config.guess timestamp = $timestamp diff --git a/build-aux/config.sub b/build-aux/config.sub index 8d39c4b..dd2ca93 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2016-03-30' +timestamp='2016-11-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -117,7 +117,7 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -301,6 +301,7 @@ case $basic_machine in | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \ | riscv32 | riscv64 \ | rl78 | rx \ @@ -428,6 +429,7 @@ case $basic_machine in | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ | pyramid-* \ | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ @@ -643,6 +645,14 @@ case $basic_machine in basic_machine=m68k-bull os=-sysv3 ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + os=$os"spe" + ;; ebmon29k) basic_machine=a29k-amd os=-ebmon @@ -1022,7 +1032,7 @@ case $basic_machine in ppc-* | ppcbe-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppcle | powerpclittle | ppc-le | powerpc-little) + ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) @@ -1032,7 +1042,7 @@ case $basic_machine in ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) + ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) @@ -1389,7 +1399,7 @@ case $os in | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ @@ -1399,7 +1409,7 @@ case $os in | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos*) + | -onefs* | -tirtos* | -phoenix* | -fuchsia*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh index 2ad8be8..a736cf9 100644 --- a/build-aux/ltmain.sh +++ b/build-aux/ltmain.sh @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.6 Debian-2.4.6-1" +VERSION="2.4.6 Debian-2.4.6-2" package_revision=2.4.6 @@ -1977,7 +1977,7 @@ func_version () # End: # Set a version string. -scriptversion='(GNU libtool) 2.4.6 Debian-2.4.6-1' +scriptversion='(GNU libtool) 2.4.6' # func_echo ARG... @@ -2068,7 +2068,7 @@ include the following information: compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion + version: $progname $scriptversion Debian-2.4.6-2 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for shotwell 0.26.1. +# Generated by GNU Autoconf 2.69 for shotwell 0.26.2. # # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell>. # @@ -650,8 +650,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='shotwell' PACKAGE_TARNAME='shotwell' -PACKAGE_VERSION='0.26.1' -PACKAGE_STRING='shotwell 0.26.1' +PACKAGE_VERSION='0.26.2' +PACKAGE_STRING='shotwell 0.26.2' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell' PACKAGE_URL='' @@ -1502,7 +1502,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures shotwell 0.26.1 to adapt to many kinds of systems. +\`configure' configures shotwell 0.26.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1573,7 +1573,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of shotwell 0.26.1:";; + short | recursive ) echo "Configuration of shotwell 0.26.2:";; esac cat <<\_ACEOF @@ -1746,7 +1746,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -shotwell configure 0.26.1 +shotwell configure 0.26.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2024,7 +2024,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by shotwell $as_me 0.26.1, which was +It was created by shotwell $as_me 0.26.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2485,12 +2485,12 @@ MAJOR_VERSION=0 MINOR_VERSION=26 -MICRO_VERSION=1 +MICRO_VERSION=2 API_VERSION=0 -GITVER=23f098ffa0b6fb7586829ff171c57dfa74f2d7f6 +GITVER=4f0174c855ca28b2b1f51e51120333de89edf994 if test "x$GITVER" != "x"; then @@ -2988,7 +2988,7 @@ fi # Define the identity of the package. PACKAGE='shotwell' - VERSION='0.26.1' + VERSION='0.26.2' cat >>confdefs.h <<_ACEOF @@ -17761,7 +17761,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by shotwell $as_me 0.26.1, which was +This file was extended by shotwell $as_me 0.26.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17827,7 +17827,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -shotwell config.status 0.26.1 +shotwell config.status 0.26.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 880b2eb..9d4c907 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ dnl Define Versioning Information dnl *********************************************************************** m4_define([major_version],[0]) m4_define([minor_version],[26]) -m4_define([micro_version],[1]) +m4_define([micro_version],[2]) m4_define([package_version],[major_version.minor_version.micro_version]) m4_define([bug_report_url],[https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell]) m4_define([api_version],[major_version]) Binary files differ@@ -2,8 +2,8 @@ # PO message string template file for Shotwell Core Components
# Copyright 2016 Software Freedom Conservancy Inc.
# See COPYING for license.
-#
-#
+#
+#
# Translators:
# Adolfo Jayme Barrientos <fitoschido@ubuntu.com>, 2011-2013
# Alejandro Johnson C. <alejandrojohnson750@hotmail.com>, 2012
@@ -18,6895 +18,6852 @@ # lsbeeler <lucas@yorba.org>, 2011
# Matias Menich <und34d@gmail.com>, 2012
# Rodrigo Cares <rcares@gmail.com>, 2012
-#
-#
-#
-#
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2014, 2015, 2016.
, 2016.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: shotwell-0.15\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2016-11-10 11:50+0000\n"
-"PO-Revision-Date: 2016-11-11 \n"
-"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
-"Language-Team: es <gnome-es-list@gnome.org>\n"
-"Language: es\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
-
-#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/MediaPage.vala:435 src/photos/RawSupport.vala:300
-msgid "Shotwell"
-msgstr "Shotwell"
-
-#: misc/shotwell.appdata.xml.in:9
-msgid "Popular photo manager"
-msgstr "Gestor de fotos popular"
-
-#: misc/shotwell.appdata.xml.in:11
-msgid ""
-"Shotwell is an easy-to-use, fast photo organizer designed for the GNOME "
-"desktop. It allows you to import photos from your camera or disk, organize "
-"them by date and subject matter, even ratings. It also offers basic photo "
-"editing, like crop, red-eye correction, color adjustments, and straighten. "
-"Shotwell’s non-destructive photo editor does not alter your master photos, "
-"making it easy to experiment and correct errors."
-msgstr ""
-"Shotwell es un organizador de fotos fácil de usar, diseñado para el "
-"escritorio GNOME. Le permite importar fotos de su cámara o disco, "
-"organizarlas por fecha y asunto o por puntuación. También ofree edición "
-"básica, como recortar, eliminar ojos rojos, ajustes de color y enderezar. El "
-"editor no destructivo de Shotwell no altera las fotos originales, haciendo "
-"que sea más fácil experimentar y corregir errores."
-
-#: misc/shotwell.appdata.xml.in:18
-msgid ""
-"When ready, Shotwell can upload your photos to various web sites, such as "
-"Facebook, Flickr, Picasa (Google Plus), and more."
-msgstr ""
-"Cuando esté preparado, Shotwell puede subir sus fotos a varios sitios web, "
-"tales como Facebook, Flickr, Picasa (Google Plus) y más"
-
-#: misc/shotwell.appdata.xml.in:22
-msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats."
-msgstr "Shotwell soporta JPEG, PNG, TIFF, y varios formatos de archivos RAW."
-
-#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
-msgid "Photo Manager"
-msgstr "Gestor de fotos"
-
-#: misc/shotwell.desktop.in.in:6
-msgid "Organize your photos"
-msgstr "Organice sus fotos"
-
-#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: misc/shotwell.desktop.in.in:8
-msgid ""
-"album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
-"organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
-"rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;"
-msgstr ""
-"álbum;cámara;cámaras;recortar;editar;mejorar;exportar;galería;imagen;"
-"imágenes;importar;organizar;foto;fotográfos;fotos;fotografía;imprimir;"
-"publicar;rotar;compartir;etiquetas;vídeo;facebook;flickr;picasa;youtube;"
-"piwigo;"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8
-msgid "shotwell"
-msgstr "shotwell"
-
-#: misc/shotwell-viewer.desktop.in.in:4
-msgid "Shotwell Viewer"
-msgstr "Visor de fotos Shotwell"
-
-#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
-msgid "Photo Viewer"
-msgstr "Visor de fotos"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:6
-msgid "authentication token"
-msgstr "testigo de autenticación"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:7
-msgid "Yandex-Fotki authentication token, if logged in."
-msgstr "Testigo de autenticación en Yandex-Fotki, si ha iniciado sesión."
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:14
-msgid "Token"
-msgstr "Testigo"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:15
-msgid "The token to access tumblr"
-msgstr "El testigo para acceder a Tumblr"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:20
-msgid "Secret token"
-msgstr "Testigo secreto"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:21
-msgid "The secret token to sign oauth requests"
-msgstr "El testigo secreto para firmar peticiones oauth"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:486
-msgid "default size"
-msgstr "tamaño predeterminado"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:27
-msgid ""
-"A numeric code representing the default size for photos uploaded to Tumblr"
-msgstr ""
-"Un código numérico que representa el tamaño predeterminado de las fotos "
-"subidas a Tumblr"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:32
-msgid "default blog"
-msgstr "blog prederminado"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:33
-msgid "The name of the default blog of the user, if any"
-msgstr "El nombre del blog predeterminado del usuario, si existe"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:40
-msgid "Rajce URL"
-msgstr "URL de Rajce"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:41
-msgid "URL of the Rajce server."
-msgstr "URL del servidor Rajce."
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:454
-#: misc/org.yorba.shotwell.gschema.xml:512
-#: misc/org.yorba.shotwell.gschema.xml:568
-msgid "username"
-msgstr "nombre de usuario"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:47
-msgid "Rajce username, if logged in."
-msgstr "Nombre de usuario de Rajce, si ha iniciado sesión."
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:52
-msgid "token"
-msgstr "testigo"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:53
-msgid "user token, if remembered."
-msgstr "testigo de usuario, si se recuerda."
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:530
-msgid "last category"
-msgstr "última categoría"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:59
-msgid "The last selected Rajce category."
-msgstr "La última categoría de Rajce seleccionada."
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:542
-msgid "last photo size"
-msgstr "último tamaño de foto"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:65
-msgid ""
-"A numeric code representing the last photo size preset used when publishing "
-"to Rajce."
-msgstr ""
-"Un código numérico que representa el último tamaño de foto predefinido usado "
-"para publicar en Rajce."
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:70
-msgid "remember"
-msgstr "recordar"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:71
-msgid "If true, remember last login."
-msgstr "Si es cierto, recordar el último inicio de sesión"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:76
-msgid "hide album"
-msgstr "ocultar álbum"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:77
-msgid "If true, hide the newly created Rajce album."
-msgstr "Si es cierto, ocultar el nuevo álbum creado en Rajce."
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:82
-msgid "open album in web browser"
-msgstr "abrir álbum en el navegador"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:83
-msgid ""
-"If true, open target album in the web browser just after uploading photos"
-msgstr ""
-"Si es cierto, abrir el álbum objetivo en el navegador web justo después de "
-"subir las fotos"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:434
-#: misc/org.yorba.shotwell.gschema.xml:472
-#: misc/org.yorba.shotwell.gschema.xml:498
-#: misc/org.yorba.shotwell.gschema.xml:548
-#: misc/org.yorba.shotwell.gschema.xml:592
-msgid "remove sensitive info from uploads"
-msgstr "eliminar contenido comprometido de las subidas"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:89
-msgid ""
-"Whether images being uploaded to Rajce should have their metadata removed "
-"first"
-msgstr ""
-"Indica si se deben eliminar los metadatos antes de subir las imágenes a Rajce"
-
-#: misc/org.yorba.shotwell.gschema.xml:23
-msgid "display basic properties"
-msgstr "mostrar propiedades básicas"
-
-#: misc/org.yorba.shotwell.gschema.xml:24
-msgid "True if the basic properties pane is to be displayed, false otherwise."
-msgstr ""
-"Cierto si se muestra el panel de propiedades básicas, falso en otro caso."
-
-#: misc/org.yorba.shotwell.gschema.xml:29
-msgid "display extended properties"
-msgstr "mostrar propiedades extendidas"
-
-#: misc/org.yorba.shotwell.gschema.xml:30
-msgid ""
-"True if the extended properties window is to be displayed, false otherwise."
-msgstr ""
-"Cierto si se muestra la ventana de propiedades ampliadas, falso en otro caso."
-
-#: misc/org.yorba.shotwell.gschema.xml:35
-msgid "display sidebar"
-msgstr "mostrar barra lateral"
-
-#: misc/org.yorba.shotwell.gschema.xml:36
-msgid "True if the sidebar is to be displayed, false otherwise."
-msgstr "Cierto si se debe mostrar la barra lateral, falso en otro caso."
-
-#: misc/org.yorba.shotwell.gschema.xml:41
-msgid "display toolbar"
-msgstr "mostrar barra de herramientas"
-
-#: misc/org.yorba.shotwell.gschema.xml:42
-msgid "True if the bottom toolbar is to be displayed, false otherwise."
-msgstr ""
-"Cierto si se debe mostrar la barra de herramientas inferior, falso en otro "
-"caso."
-
-#: misc/org.yorba.shotwell.gschema.xml:47
-msgid "display search bar"
-msgstr "mostrar barra de búsqueda"
-
-#: misc/org.yorba.shotwell.gschema.xml:48
-msgid "True if the Search/Filter Toolbar is to be displayed, false otherwise."
-msgstr ""
-"Cierto si se muestra la barra de herramientas de buscar/filtrar, falso en "
-"otro caso."
-
-#: misc/org.yorba.shotwell.gschema.xml:53
-msgid "display photo titles"
-msgstr "mostrar títulos de las fotos"
-
-#: misc/org.yorba.shotwell.gschema.xml:54
-msgid ""
-"True if photo titles are to be displayed beneath thumbnails in collection "
-"views, false otherwise."
-msgstr ""
-"Cierto si se deben mostrar los títulos de las fotos debajo de las miniaturas "
-"en la vista de la colección, falso en otro caso."
-
-#: misc/org.yorba.shotwell.gschema.xml:59
-msgid "display photo comments"
-msgstr "mostrar comentarios de las fotos"
-
-#: misc/org.yorba.shotwell.gschema.xml:60
-msgid ""
-"True if photo comments are to be displayed beneath thumbnails in collection "
-"views, false otherwise."
-msgstr ""
-"Cierto si se deben mostrar los comentarios debajo de las miniaturas en la "
-"vista de la colección, falso en otro caso."
-
-#: misc/org.yorba.shotwell.gschema.xml:65
-msgid "display event comments"
-msgstr "mostrar comentarios del evento"
-
-#: misc/org.yorba.shotwell.gschema.xml:66
-msgid ""
-"True if event comments are to be displayed beneath thumbnails in event "
-"views, false otherwise."
-msgstr ""
-"Cierto si se deben mostrar los comentarios debajo de las miniaturas en la "
-"vista de la colección, falso en otro caso."
-
-#: misc/org.yorba.shotwell.gschema.xml:71
-msgid "display photo tags"
-msgstr "mostrar etiquetas de las fotos"
-
-#: misc/org.yorba.shotwell.gschema.xml:72
-msgid ""
-"True if photo tags are to be listed beneath thumbnails in collection views, "
-"false otherwise."
-msgstr ""
-"Cierto si se deben poner en una lista las etiquetas de las fotos debajo de "
-"las miniaturas en la vista de colección."
-
-#: misc/org.yorba.shotwell.gschema.xml:77
-msgid "display photo ratings"
-msgstr "mostrar puntuación de las fotos"
-
-#: misc/org.yorba.shotwell.gschema.xml:78
-#| msgid ""
-#| "True if the basic properties pane is to be displayed, false otherwise."
-msgid ""
-"True if a photo’s rating should be displayed as overlaid trinket, false "
-"otherwise."
-msgstr ""
-"Cierto si se muestra el panel de propiedades básicas, falso en otro caso."
-
-#: misc/org.yorba.shotwell.gschema.xml:83
-msgid "rating filter level"
-msgstr "nivel de filtrado de puntuación"
-
-#: misc/org.yorba.shotwell.gschema.xml:84
-msgid ""
-"Determines how to filter photos based on their ratings. 1: Rejected or "
-"better, 2: Unrated or better, 3: One or better, 4: Two or better, 5: Three "
-"or better, 6: Four or better, 7: Five or better."
-msgstr ""
-"Determina cómo filtrar las fotos según sus calificaciones. 1: rechazada o "
-"mejor, 2: sin puntuar o mejor, 3: una o mejor, 4: dos o mejor, 5: tres o "
-"mejor, 6: cuatro o mejor, 7: cinco o mejor"
-
-#: misc/org.yorba.shotwell.gschema.xml:89
-msgid "sort events ascending"
-msgstr "ordenar eventos ascendentemente"
-
-#: misc/org.yorba.shotwell.gschema.xml:90
-msgid "True if events should be sorted ascending, false if descending."
-msgstr ""
-"Cierto si se deben clasificar los eventos ascendentemente, falso si "
-"descendentemente."
-
-#: misc/org.yorba.shotwell.gschema.xml:95
-msgid "sort library photos ascending"
-msgstr "ordenar fotos de la biblioteca ascendentemente"
-
-#: misc/org.yorba.shotwell.gschema.xml:96
-msgid "True if library photos should be sorted ascending, false if descending."
-msgstr ""
-"Cierto si se debe clasificar la biblioteca de fotos ascendentemente, falso "
-"si descendentemente."
-
-#: misc/org.yorba.shotwell.gschema.xml:101
-msgid "sort library photos criteria"
-msgstr "criterio de ordenación de fotos en la biblioteca"
-
-#: misc/org.yorba.shotwell.gschema.xml:102
-msgid ""
-"A numeric code that specifies the sort criteria for photos in library views."
-msgstr ""
-"Un código numérico que representa el criterio de ordenación de las fotos el "
-"vistas de biblioteca."
-
-#: misc/org.yorba.shotwell.gschema.xml:107
-msgid "sort event photos ascending"
-msgstr "ordenar fotos de eventos ascendentemente"
-
-#: misc/org.yorba.shotwell.gschema.xml:108
-msgid "True if event photos should be sorted ascending, false if descending."
-msgstr ""
-"Cierto si se deben ordenar las fotos de eventos ascendentemente, falso si es "
-"descendentemente."
-
-#: misc/org.yorba.shotwell.gschema.xml:113
-msgid "sort event photos criteria"
-msgstr "criterio de ordenación de las fotos de eventos"
-
-#: misc/org.yorba.shotwell.gschema.xml:114
-msgid "Specifies the sort criteria for event photos."
-msgstr "Especifica el criterio de ordenación de las fotos de eventos."
-
-#: misc/org.yorba.shotwell.gschema.xml:119
-msgid "use 24 hour time"
-msgstr "usar formato de 24 horas"
-
-#: misc/org.yorba.shotwell.gschema.xml:120
-msgid ""
-"True if should display times with a 24 hour clock, false if times should use "
-"AM/PM notation."
-msgstr ""
-"Cierto si se debe mostrar la hora con formato 24 horas, falso si se debe "
-"usar el formato am/pm."
-
-#: misc/org.yorba.shotwell.gschema.xml:125
-msgid "keep relative time between photos"
-msgstr "mantener el tiempo relativo entre fotos"
-
-#: misc/org.yorba.shotwell.gschema.xml:126
-msgid ""
-"True if when adjusting time/date of photos, relative time should be "
-"maintained. False if all photos should be set to the same time."
-msgstr ""
-"Cierto si cuando se ajusta la hora y la fecha de las fotos se mantiene la "
-"hora relativa. Falso si todas las fotos deben ajustarse a la misma hora."
-
-#: misc/org.yorba.shotwell.gschema.xml:131
-msgid "modify original photo files"
-msgstr "modificar archivos de fotos originales"
-
-#: misc/org.yorba.shotwell.gschema.xml:132
-msgid ""
-"True if when adjusting time/date of photos, the original files should be "
-"modified as well. False if changes are made only in the database."
-msgstr ""
-"Cierto si cuando ajustamos la hora y la fecha de las fotos los archivos "
-"originales también se deben modificar. Falso si los cambios sólo se hacen en "
-"la base de datos."
-
-#: misc/org.yorba.shotwell.gschema.xml:137
-msgid "show welcome dialog on startup"
-msgstr "mostrar diálogo de bienvenida al inicio"
-
-#: misc/org.yorba.shotwell.gschema.xml:138
-msgid ""
-"True if, when on startup, a welcome dialog should be shown. False if it "
-"should not be shown."
-msgstr ""
-"Cierto si se debe mostrar un diálogo de bienvenida al inicio. Falso si no se "
-"debe mostrar."
-
-#: misc/org.yorba.shotwell.gschema.xml:143
-msgid "sidebar position"
-msgstr "posición de la barra lateral"
-
-#: misc/org.yorba.shotwell.gschema.xml:144
-msgid "The width, in pixels, of the sidebar"
-msgstr "La anchura en píxeles de la barra lateral"
-
-#: misc/org.yorba.shotwell.gschema.xml:149
-msgid "photo thumbnail scale"
-msgstr "escala de la miniatura de la foto"
-
-#: misc/org.yorba.shotwell.gschema.xml:150
-msgid "The scale of photo thumbnails, ranging from 72 to 360."
-msgstr "La escala de las miniaturas de las fotos, en un rango de 72 a 360."
-
-#: misc/org.yorba.shotwell.gschema.xml:155
-msgid "pin toolbar state"
-msgstr "estado de anclaje de la barra de herramientas"
-
-#: misc/org.yorba.shotwell.gschema.xml:156
-msgid "Pin toolbar in fullscreen, or not."
-msgstr "Anclar o no la barra de herramientas en modo a pantalla completa."
-
-#: misc/org.yorba.shotwell.gschema.xml:161
-msgid "background color"
-msgstr "color de fondo"
-
-#: misc/org.yorba.shotwell.gschema.xml:162
-msgid "A grayscale color for use as the background color."
-msgstr "La escala de color que usar como color de fondo."
-
-#: misc/org.yorba.shotwell.gschema.xml:167
-msgid "Selection state of “hide photos” option"
-msgstr "Estado de la selección de la opción «ocultar fotos»"
-
-#: misc/org.yorba.shotwell.gschema.xml:168
-msgid ""
-"Last used selection state of the “hide photos already imported” option in "
-"the import page."
-msgstr ""
-"Último estado de selección usado de la opción «ocultar fotos ya importadas» "
-"en la página de importación."
-
-#: misc/org.yorba.shotwell.gschema.xml:175
-msgid "delay"
-msgstr "retardo"
-
-#: misc/org.yorba.shotwell.gschema.xml:176
-msgid "Delay (in seconds) between photos in the slideshow."
-msgstr "Retardo (en segundos) entre fotos en la presentación de diapositivas."
-
-#: misc/org.yorba.shotwell.gschema.xml:181
-msgid "transition delay"
-msgstr "retraso de la transición"
-
-#: misc/org.yorba.shotwell.gschema.xml:182
-msgid ""
-"The time (in seconds) that a transition runs between photos in a slideshow"
-msgstr ""
-"El tiempo (en segundos) que transcurre entre las fotos en una presentación "
-"de diapositivas"
-
-#: misc/org.yorba.shotwell.gschema.xml:187
-msgid "transition effect id"
-msgstr "ID del efecto de transición"
-
-#: misc/org.yorba.shotwell.gschema.xml:188
-msgid ""
-"The name of the transition effect that will be used between photos when "
-"running a slideshow"
-msgstr ""
-"El nombre del efecto de transición que se usará entre fotos al hacer una "
-"presentación"
-
-#: misc/org.yorba.shotwell.gschema.xml:193
-msgid "Show title"
-msgstr "Mostrar título"
-
-#: misc/org.yorba.shotwell.gschema.xml:194
-msgid "Whether to show the title of a photo during the slideshow"
-msgstr ""
-"Indica si se debe mostrar el título de una foto durante la presentación de "
-"diapositivas"
-
-#: misc/org.yorba.shotwell.gschema.xml:201
-msgid "maximize library window"
-msgstr "maximizar ventana de biblioteca"
-
-#: misc/org.yorba.shotwell.gschema.xml:202
-msgid "True if library application is maximized, false otherwise."
-msgstr ""
-"Cierto si la aplicación de biblioteca está maximizada, falso en otro caso."
-
-#: misc/org.yorba.shotwell.gschema.xml:207
-msgid "width of library window"
-msgstr "anchura de la ventana de biblioteca"
-
-#: misc/org.yorba.shotwell.gschema.xml:208
-msgid "The last recorded width of the library application window."
-msgstr ""
-"La última anchura guardada de la ventana de la aplicación de biblioteca."
-
-#: misc/org.yorba.shotwell.gschema.xml:213
-msgid "height of library window"
-msgstr "altura de la ventana de biblioteca"
-
-#: misc/org.yorba.shotwell.gschema.xml:214
-msgid "The last recorded height of the library application window."
-msgstr ""
-"La última altura guardada de la ventana de la aplicación de biblioteca."
-
-#: misc/org.yorba.shotwell.gschema.xml:219
-msgid "maximize direct-edit window"
-msgstr "maximizar ventana de edición directa"
-
-#: misc/org.yorba.shotwell.gschema.xml:220
-msgid "True if direct-edit application is maximized, false otherwise."
-msgstr ""
-"Cierto si la ventana de edición directa está maximizada, falso en otro caso."
-
-#: misc/org.yorba.shotwell.gschema.xml:225
-msgid "width of direct-edit window"
-msgstr "anchura de la ventana de edición directa"
-
-#: misc/org.yorba.shotwell.gschema.xml:226
-msgid "The last recorded width of the direct-edit application window."
-msgstr "La última anchura guardada de la ventana de edición directa."
-
-#: misc/org.yorba.shotwell.gschema.xml:231
-msgid "height of direct-edit window"
-msgstr "altura de la ventana de edición directa"
-
-#: misc/org.yorba.shotwell.gschema.xml:232
-msgid "The last recorded height of the direct-edit application window."
-msgstr "La última altura guardada de la ventana de edición directa."
-
-#: misc/org.yorba.shotwell.gschema.xml:237
-msgid "sidebar divider position"
-msgstr "posición del divisor de la barra lateral"
-
-#: misc/org.yorba.shotwell.gschema.xml:238
-msgid ""
-"The last recorded position of the divider between the sidebar and view in "
-"library application window."
-msgstr ""
-"La última posición registrada del divisor entre la barra lateral y la vista "
-"de la ventana de la aplicación de la biblioteca."
-
-#: misc/org.yorba.shotwell.gschema.xml:245
-msgid "import directory"
-msgstr "importar carpeta"
-
-#: misc/org.yorba.shotwell.gschema.xml:246
-msgid "Directory in which imported photo files are placed."
-msgstr "Carpeta en la que se guardan los archivos de fotos importadas."
-
-#: misc/org.yorba.shotwell.gschema.xml:251
-msgid "watch library directory for new files"
-msgstr "vigilar carpeta de biblioteca en busca de archivos nuevos"
-
-#: misc/org.yorba.shotwell.gschema.xml:252
-msgid ""
-"If true, files added to the library directory are automatically imported."
-msgstr ""
-"Si es cierto si los archivos añadidos a la carpeta de la biblioteca se "
-"importan automáticamente."
-
-#: misc/org.yorba.shotwell.gschema.xml:257
-msgid "write metadata to master files"
-msgstr "escribir metadatos en archivos maestros"
-
-#: misc/org.yorba.shotwell.gschema.xml:258
-msgid ""
-"If true, changes to metadata (tags, titles, etc.) are written to the master "
-"photo file."
-msgstr ""
-"Si es cierto, los cambios en los metadatos (etiquetas, títulos, etc.) se "
-"escriben al archivo de foto maestro."
-
-#: misc/org.yorba.shotwell.gschema.xml:263
-msgid "use lowercase filenames"
-msgstr "usar nombres de archivos en minúscula"
-
-#: misc/org.yorba.shotwell.gschema.xml:264
-msgid ""
-"If true, Shotwell will convert all filenames to lowercase when importing "
-"photo files"
-msgstr ""
-"Si es cierto, Shotwell convertirá todos los nombres de archivos en "
-"minúsculas cuando importe archivos de fotos"
-
-#: misc/org.yorba.shotwell.gschema.xml:269
-msgid "directory pattern"
-msgstr "patrón de carpetas"
-
-#: misc/org.yorba.shotwell.gschema.xml:270
-msgid ""
-"A string encoding a naming pattern that will be used to name photo "
-"directories on import."
-msgstr ""
-"Una cadena que codifica un patrón de nombre que se utilizará para nombrar "
-"las carpetas de fotos en la importación."
-
-#: misc/org.yorba.shotwell.gschema.xml:275
-msgid "directory pattern custom"
-msgstr "Patrón de carpetas personalizadas"
-
-#: misc/org.yorba.shotwell.gschema.xml:276
-msgid ""
-"A string encoding a custom naming pattern that will be used to name photo "
-"directories on import."
-msgstr ""
-"Una cadena que codifica un patrón de nombre que se utilizará para nombrar "
-"las carpetas de fotos en la importación."
-
-#: misc/org.yorba.shotwell.gschema.xml:281
-msgid "RAW developer default"
-msgstr "desarrollador RAW predeterminado"
-
-#: misc/org.yorba.shotwell.gschema.xml:282
-msgid "Default option for which RAW developer Shotwell will use."
-msgstr "Opción predeterminada que utilizará el desarrollador RAW Shotwell."
-
-#: misc/org.yorba.shotwell.gschema.xml:289
-msgid "Most-recently-used crop aspect ratio menu choice."
-msgstr "Elección más reciente del menú de relación de aspecto del recorte."
-
-#: misc/org.yorba.shotwell.gschema.xml:290
-msgid "A numeric code representing the last crop menu choice the user made."
-msgstr ""
-"Un código numérico que representa la última elección del menú de recortar "
-"que hizo el usuario."
-
-#: misc/org.yorba.shotwell.gschema.xml:294
-msgid "Most-recently-used crop custom aspect ratio’s numerator."
-msgstr ""
-"Numerador utilizado más recientemente de relación de aspecto del recorte "
-"personalizado."
-
-#: misc/org.yorba.shotwell.gschema.xml:295
-msgid ""
-"A nonzero, positive integer representing the width part of the last custom "
-"crop ratio the user entered."
-msgstr ""
-"Un número entero positivo no cero que representa el ancho de la última "
-"relación del recorte personalizado que el usuario introdujo."
-
-#: misc/org.yorba.shotwell.gschema.xml:299
-msgid "Most-recently-used crop custom aspect ratio’s denominator."
-msgstr ""
-"Denominador utilizado más recientemente de relación de aspecto del recorte "
-"personalizado."
-
-#: misc/org.yorba.shotwell.gschema.xml:300
-msgid ""
-"A nonzero, positive integer representing the height part of the last custom "
-"crop ratio the user entered."
-msgstr ""
-"Un número entero positivo no cero que representa la altura de la última "
-"relación del recorte personalizado que el usuario introdujo."
-
-#: misc/org.yorba.shotwell.gschema.xml:307
-msgid "external photo editor"
-msgstr "editor de fotos externo"
-
-#: misc/org.yorba.shotwell.gschema.xml:308
-msgid "External application used to edit photos."
-msgstr "Aplicación externa usada para editar fotos."
-
-#: misc/org.yorba.shotwell.gschema.xml:313
-msgid "external raw editor"
-msgstr "editor RAW externo"
-
-#: misc/org.yorba.shotwell.gschema.xml:314
-msgid "External application used to edit RAW photos."
-msgstr "Aplicación externa usada para editar fotos RAW."
-
-#: misc/org.yorba.shotwell.gschema.xml:352
-#: misc/org.yorba.shotwell.gschema.xml:353
-msgid "Setting in export dialog: how to trim images"
-msgstr ""
-"Configurando el cuadro de diálogo de exportación: cómo recortar imágenes"
-
-#: misc/org.yorba.shotwell.gschema.xml:358
-msgid "export metadata"
-msgstr "exportar metadatos"
-
-#: misc/org.yorba.shotwell.gschema.xml:359
-msgid "Setting in export dialog: option to export metadata"
-msgstr ""
-"Configurando el cuadro de diálogo de exportación: opción para exportar "
-"metadatos"
-
-#: misc/org.yorba.shotwell.gschema.xml:364
-msgid "format setting, special value"
-msgstr "configuración de formato, valor especial"
-
-#: misc/org.yorba.shotwell.gschema.xml:365
-msgid "Setting in export dialog: format setting, special value"
-msgstr ""
-"Configurando el cuadro de diálogo de exportación: configuración de formato, "
-"valor especial"
-
-#: misc/org.yorba.shotwell.gschema.xml:370
-msgid "format setting, type value"
-msgstr "configuración de formato, valor de tipo"
-
-#: misc/org.yorba.shotwell.gschema.xml:371
-msgid "Setting in export dialog: format setting, type value"
-msgstr ""
-"Configurando el cuadro de diálogo de exportación: configuración de formato, "
-"valor de tipo"
-
-#: misc/org.yorba.shotwell.gschema.xml:376
-msgid "JPEG quality option"
-msgstr "Opción de calidad JPEG"
-
-#: misc/org.yorba.shotwell.gschema.xml:377
-msgid "Setting in export dialog: jpeg quality option"
-msgstr ""
-"Configurando el cuadro de diálogo de exportación: opción de calidad JPEG"
-
-#: misc/org.yorba.shotwell.gschema.xml:382
-msgid "maximal size of image"
-msgstr "tamaño máximo de la imagen"
-
-#: misc/org.yorba.shotwell.gschema.xml:383
-msgid "Setting in export dialog: maximal size of image"
-msgstr ""
-"Configurando el cuadro de diálogo de exportación: tamaño máximo de la imagen"
-
-#: misc/org.yorba.shotwell.gschema.xml:390
-msgid "last used publishing service"
-msgstr "último servicio de publicación usado"
-
-#: misc/org.yorba.shotwell.gschema.xml:391
-#: misc/org.yorba.shotwell.gschema.xml:397
-msgid ""
-"A numeric code representing the last service to which photos were published"
-msgstr ""
-"Un código numérico que representa el último servicio en el que se publicaron "
-"las fotos"
-
-#: misc/org.yorba.shotwell.gschema.xml:396
-msgid "default publishing service"
-msgstr "servicio de publicación predeterminado"
-
-#: misc/org.yorba.shotwell.gschema.xml:410
-msgid "access token"
-msgstr "testigo de acceso"
-
-#: misc/org.yorba.shotwell.gschema.xml:411
-msgid "Facebook OAuth token for the currently logged in session, if any"
-msgstr ""
-"Testigo OAuth de Facebook para el usuario que ha iniciado sesión "
-"actualmente, si existe"
-
-#: misc/org.yorba.shotwell.gschema.xml:416
-msgid "user i.d."
-msgstr "ID de usuario"
-
-#: misc/org.yorba.shotwell.gschema.xml:417
-msgid "Facebook user i.d. for the currently logged in user, if any"
-msgstr ""
-"ID del usuario de Facebook que ha iniciado sesión actualmente, si existe"
-
-#: misc/org.yorba.shotwell.gschema.xml:422
-msgid "user name"
-msgstr "nombre de usuario"
-
-#: misc/org.yorba.shotwell.gschema.xml:423
-msgid "The name of the currently logged in Facebook user, if any"
-msgstr ""
-"El nombre del usuario que actualmente ha iniciado sesión en Facebook, si "
-"existe"
-
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:460
-msgid "default size code"
-msgstr "código de tamaño predeterminado"
-
-#: misc/org.yorba.shotwell.gschema.xml:429
-msgid ""
-"A numeric code representing the default size for photos published to Facebook"
-msgstr ""
-"Un código numérico que representa el tamaño predeterminado de las fotos "
-"publicadas en Facebook"
-
-#: misc/org.yorba.shotwell.gschema.xml:435
-msgid ""
-"Whether images being uploaded to Facebook should have their metadata removed "
-"first"
-msgstr ""
-"Indica si se deben eliminar los metadatos antes de subir las imágenes a "
-"Facebook"
-
-#: misc/org.yorba.shotwell.gschema.xml:442
-msgid "OAuth Access Phase Token"
-msgstr "Fase de acceso de testigo OAuth"
-
-#: misc/org.yorba.shotwell.gschema.xml:443
-msgid "The authorization token for the currently logged in Flickr user, if any"
-msgstr ""
-"El testigo de autenticación para el usuario que actualmente ha iniciado "
-"sesión en Flickr, si existe"
-
-#: misc/org.yorba.shotwell.gschema.xml:448
-msgid "OAuth Access Phase Token Secret"
-msgstr "Fase de acceso del testigo secreto OAuth"
-
-#: misc/org.yorba.shotwell.gschema.xml:449
-msgid ""
-"The cryptographic secret used to sign requests against the authorization "
-"token for the currently logged in Flickr user, if any"
-msgstr ""
-"El secreto criptográfico usado para firmar peticiones con el testigo de "
-"autenticación para el usuario que actualmente ha iniciado sesión en Flickr, "
-"si existe"
-
-#: misc/org.yorba.shotwell.gschema.xml:455
-msgid "The user name of the currently logged in Flickr user, if any"
-msgstr ""
-"El nombre del usuario que actualmente ha iniciado sesión en Flickr, si existe"
-
-#: misc/org.yorba.shotwell.gschema.xml:461
-msgid ""
-"A numeric code representing the default size for photos published to Flickr"
-msgstr ""
-"Un código numérico que representa el tamaño predeterminado de las fotos "
-"publicadas en Flickr"
-
-#: misc/org.yorba.shotwell.gschema.xml:466
-msgid "default visibility"
-msgstr "visibilidad predeterminada"
-
-#: misc/org.yorba.shotwell.gschema.xml:467
-msgid ""
-"A numeric code representing the default visibility for photos published to "
-"Flickr"
-msgstr ""
-"Un código numérico que representa la visibilidad predeterminada de las fotos "
-"publicadas en Flickr"
-
-#: misc/org.yorba.shotwell.gschema.xml:473
-msgid ""
-"Whether images being uploaded to Flickr should have their metadata removed "
-"first"
-msgstr ""
-"Indica si se deben eliminar los metadatos antes de subir las imágenes a "
-"Flicrk"
-
-#: misc/org.yorba.shotwell.gschema.xml:480
-#: misc/org.yorba.shotwell.gschema.xml:612
-msgid "refresh token"
-msgstr "actualizar testigo"
-
-#: misc/org.yorba.shotwell.gschema.xml:481
-msgid ""
-"The OAuth token used to refresh the Picasa Web Albums session for the "
-"currently logged in user, if any."
-msgstr ""
-"El testigo OAuth utilizado para actualizar la sesión de álbumes web de "
-"Picasa para el usuario que actualmente ha iniciado sesión, si existe"
-
-#: misc/org.yorba.shotwell.gschema.xml:487
-msgid ""
-"A numeric code representing the default size for photos uploaded to Picasa "
-"Web Albums"
-msgstr ""
-"Un código numérico que representa el tamaño predeterminado de las fotos "
-"subidas a álbumes web Picasa"
-
-#: misc/org.yorba.shotwell.gschema.xml:492
-#: misc/org.yorba.shotwell.gschema.xml:586
-msgid "last album"
-msgstr "último álbum"
-
-#: misc/org.yorba.shotwell.gschema.xml:493
-#: misc/org.yorba.shotwell.gschema.xml:587
-msgid "The name of the last album the user published photos to, if any"
-msgstr ""
-"El nombre del último álbum en el que el usuario publicó fotos, si existe"
-
-#: misc/org.yorba.shotwell.gschema.xml:499
-msgid ""
-"Whether images being uploaded to Picasa should have their metadata removed "
-"first"
-msgstr ""
-"Indica si se deben eliminar los metadatos antes de subir las imágenes a "
-"Picasa"
-
-#: misc/org.yorba.shotwell.gschema.xml:506
-msgid "Piwigo URL"
-msgstr "URL de Pigwio"
-
-#: misc/org.yorba.shotwell.gschema.xml:507
-msgid "URL of the Piwigo server."
-msgstr "URL del servidor Piwigo."
-
-#: misc/org.yorba.shotwell.gschema.xml:513
-msgid "Piwigo username, if logged in."
-msgstr "Nombre de usuario de Piwigo, si ha iniciado sesión."
-
-#: misc/org.yorba.shotwell.gschema.xml:518
-msgid "password"
-msgstr "contraseña"
-
-#: misc/org.yorba.shotwell.gschema.xml:519
-msgid "Piwigo password, if logged in."
-msgstr "Contraseña de Piwigo, si ha iniciado sesión."
-
-#: misc/org.yorba.shotwell.gschema.xml:524
-msgid "remember password"
-msgstr "recortar contraseña"
-
-#: misc/org.yorba.shotwell.gschema.xml:525
-msgid "If true, remember the Piwigo password."
-msgstr "Si es cierto, recordar la contraseña de Piwigo."
-
-#: misc/org.yorba.shotwell.gschema.xml:531
-msgid "The last selected Piwigo category."
-msgstr "La última categoría de Piwigo seleccionada."
-
-#: misc/org.yorba.shotwell.gschema.xml:536
-msgid "last permission level"
-msgstr "último nivel de permisos"
-
-#: misc/org.yorba.shotwell.gschema.xml:537
-msgid "The last chosen Piwigo permission level."
-msgstr "El último nivel de privilegios elegido el Piwigo."
-
-#: misc/org.yorba.shotwell.gschema.xml:543
-msgid ""
-"A numeric code representing the last photo size preset used when publishing "
-"to Piwigo."
-msgstr ""
-"Un código numérico que representa el último tamaño de foto predefinido usado "
-"para publicar en Piwigo."
-
-#: misc/org.yorba.shotwell.gschema.xml:549
-msgid ""
-"Whether images being uploaded to Piwigo should have their metadata removed "
-"first"
-msgstr ""
-"Indica si se deben eliminar los metadatos antes de subir las imágenes a "
-"Piwigo"
-
-#: misc/org.yorba.shotwell.gschema.xml:554
-msgid ""
-"if title is set and comment unset, use title as comment for uploads to Piwigo"
-msgstr ""
-"si se definió el titulo pero no un comentario, usar el título como "
-"comentario para las subidas a Piwigo"
-
-#: misc/org.yorba.shotwell.gschema.xml:555
-msgid ""
-"Whether images being uploaded to Piwigo should have their comment set from "
-"the title if title is set and comment unset"
-msgstr ""
-"Indica si las imágenes que se vayan a subir a Piwigo deben tener un "
-"comentario a partir del título, si tiene, y no tiene comentario"
-
-#: misc/org.yorba.shotwell.gschema.xml:560
-msgid "do not upload tags when uploading to Piwigo"
-msgstr "no subir etiquetas al subir a Piwigo"
-
-#: misc/org.yorba.shotwell.gschema.xml:561
-msgid ""
-"Whether images being uploaded to Piwigo should have their tags removed on "
-"upload, such that these tags will not appear on the remote Piwigo server."
-msgstr ""
-"Indica si se deben eliminar las etiquetas antes de subir las imágenes a "
-"Piwigo, para que esas etiquetas no aparezcan en el servidor remoto de Piwigo."
-
-#: misc/org.yorba.shotwell.gschema.xml:569
-msgid "Gallery3 username"
-msgstr "Nombre de usuario de Gallery3"
-
-#: misc/org.yorba.shotwell.gschema.xml:574
-msgid "API key"
-msgstr "Clave de la API"
-
-#: misc/org.yorba.shotwell.gschema.xml:575
-msgid "Gallery3 API key"
-msgstr "Clave de la API de Gallery3"
-
-#: misc/org.yorba.shotwell.gschema.xml:580
-msgid "URL"
-msgstr "URL"
-
-#: misc/org.yorba.shotwell.gschema.xml:581
-msgid "Gallery3 site URL"
-msgstr "URL de Gallery3"
-
-#: misc/org.yorba.shotwell.gschema.xml:593
-msgid ""
-"Indicates whether images being uploaded to Gallery3 should have their "
-"metadata removed first"
-msgstr ""
-"Indica si se deben eliminar los metadatos antes de subir las imágenes a "
-"Gallery3"
-
-#: misc/org.yorba.shotwell.gschema.xml:598
-msgid "scaling constraint of uploaded picture"
-msgstr "restricción de escala de una foto subida"
-
-#: misc/org.yorba.shotwell.gschema.xml:599
-msgid "The scaling constraint ID of the picture to be uploaded"
-msgstr "El ID de la restricción de escala de la foto que se subirá"
-
-#: misc/org.yorba.shotwell.gschema.xml:604
-msgid "pixels of the major axis uploaded picture"
-msgstr "píxeles del eje principal de la foto subida"
-
-#: misc/org.yorba.shotwell.gschema.xml:605
-msgid ""
-"The pixels of the major axis of the picture to be uploaded; used only if "
-"scaling-constraint-id is an appropriate value"
-msgstr ""
-"Los píxeles del eje principal de la foto que se subirá; usados solo si el ID "
-"de la restricción de escala tiene un valor adecuado"
-
-#: misc/org.yorba.shotwell.gschema.xml:613
-msgid ""
-"The OAuth token used to refresh the YouTube session for the currently logged "
-"in user, if any."
-msgstr ""
-"El testigo OAuth usado para actualizar la sesión de Youtube para el usuario "
-"que ha iniciado sesión actualmente, si existe."
-
-#: misc/org.yorba.shotwell.gschema.xml:620
-msgid "last used import service"
-msgstr "último servicio de importación usado"
-
-#: misc/org.yorba.shotwell.gschema.xml:621
-msgid ""
-"A numeric code representing the last service from which photos were imported"
-msgstr ""
-"Un código numérico que representa el último servicio del que se importaron "
-"fotos"
-
-#: misc/org.yorba.shotwell.gschema.xml:628
-msgid "interpreter state cookie"
-msgstr "cookie de estado del intérprete"
-
-#: misc/org.yorba.shotwell.gschema.xml:629
-msgid ""
-"A numeric code that captures the state of the GStreamer plug-in environment"
-msgstr ""
-"Un código numérico que captura el estado del entorno del complemento "
-"GStreamer"
-
-#: misc/org.yorba.shotwell.gschema.xml:636
-msgid "content layout mode"
-msgstr "modo de distribución del contenido"
-
-#: misc/org.yorba.shotwell.gschema.xml:637
-msgid ""
-"A numeric code that describes how photos are laid out on the page during "
-"printing"
-msgstr ""
-"Un código numérico que representa cuántas fotos aparecen en la página al "
-"imprimir"
-
-#: misc/org.yorba.shotwell.gschema.xml:642
-msgid "content ppi"
-msgstr "ppp del contenido"
-
-#: misc/org.yorba.shotwell.gschema.xml:643
-msgid "The number of pixels per inch (ppi) sent to the printer during printing"
-msgstr ""
-"El número de píxeles por pulgada (ppp) enviado a la impresora al imprimir"
-
-#: misc/org.yorba.shotwell.gschema.xml:648
-msgid "content width"
-msgstr "anchura del contenido"
-
-#: misc/org.yorba.shotwell.gschema.xml:649
-msgid "The width of the printed emulsion on the page when printing"
-msgstr "La anchura de la emulsión impresa en la página al imprimir"
-
-#: misc/org.yorba.shotwell.gschema.xml:654
-msgid "content height"
-msgstr "altura del contenido"
-
-#: misc/org.yorba.shotwell.gschema.xml:655
-msgid "The height of the printed emulsion on the page when printing"
-msgstr "La altura de la emulsión impresa en la página al imprimir"
-
-#: misc/org.yorba.shotwell.gschema.xml:660
-msgid "content units"
-msgstr "unidades del contenido"
-
-#: misc/org.yorba.shotwell.gschema.xml:661
-msgid ""
-"A numeric code representing unit of measure (inches or centimeters) used "
-"when printing"
-msgstr ""
-"Un código numérico que representa la unidad de medida (pulgadas o "
-"centímetros) usada al imprimir"
-
-#: misc/org.yorba.shotwell.gschema.xml:666
-msgid "images per page code"
-msgstr "código de imágenes por página"
-
-#: misc/org.yorba.shotwell.gschema.xml:667
-msgid ""
-"A numeric code representing the currently selected images per page mode used "
-"when printing"
-msgstr ""
-"Un código numérico que representa el modo usado de imágenes por página "
-"seleccionadas actualmente al imprimir"
-
-#: misc/org.yorba.shotwell.gschema.xml:672
-msgid "size selection"
-msgstr "tamaño de la selección"
-
-#: misc/org.yorba.shotwell.gschema.xml:673
-msgid ""
-"The index of the current print size in a pre-defined list of standard sizes"
-msgstr ""
-"El índice del tamaño de impresión actual en una lista de tamaños estándar "
-"predefinidos"
-
-#: misc/org.yorba.shotwell.gschema.xml:678
-msgid "match aspect ratio"
-msgstr "coincidir con relación de aspecto"
-
-#: misc/org.yorba.shotwell.gschema.xml:679
-msgid ""
-"Determines whether custom print sizes must match the aspect ratio of the "
-"original photo"
-msgstr ""
-"Determina si los tamaños de impresión personalizados deben coincidir con la "
-"relación de aspecto de la fotografía original"
-
-#: misc/org.yorba.shotwell.gschema.xml:684
-msgid "print titles"
-msgstr "imprimir títulos"
-
-#: misc/org.yorba.shotwell.gschema.xml:685
-msgid ""
-"True if the title of a photo should be printed when the photo is printed, "
-"false otherwise."
-msgstr ""
-"Cierto si se debe imprimir el título de la foto al imprimirla, falso en otro "
-"caso."
-
-#: misc/org.yorba.shotwell.gschema.xml:690
-msgid "titles font"
-msgstr "tipografía de los títulos"
-
-#: misc/org.yorba.shotwell.gschema.xml:691
-msgid "The name of the font to use for photo titles when they are printed."
-msgstr "El nombre de la tipografía que usar cuando se imprimen los títulos."
-
-#: misc/org.yorba.shotwell.gschema.xml:702
-msgid "enable facebook publishing plugin"
-msgstr "activar complemento de publicación en Facebook"
-
-#: misc/org.yorba.shotwell.gschema.xml:703
-msgid "True if the Facebook publishing plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de publicación en Facebook está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:708
-msgid "enable flickr publishing plugin"
-msgstr "activar complemento de publicación en Flickr"
-
-#: misc/org.yorba.shotwell.gschema.xml:709
-msgid "True if the Flickr publishing plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de publicación en Flickr está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:714
-msgid "enable picasa publishing plugin"
-msgstr "activar complemento de publicación en Picasa"
-
-#: misc/org.yorba.shotwell.gschema.xml:715
-msgid ""
-"True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de publicación en álbumes web Picasa está activado, "
-"falso en otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:720
-msgid "enable youtube publishing plugin"
-msgstr "activar complemento de publicación en Youtube"
-
-#: misc/org.yorba.shotwell.gschema.xml:721
-msgid "True if the YouTube publishing plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de publicación en Youtube está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:726
-msgid "enable piwigo publishing plugin"
-msgstr "activar complemento de publicación en Piwigo"
-
-#: misc/org.yorba.shotwell.gschema.xml:727
-msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de publicación en Piwigo está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:732
-msgid "enable yandex publishing plugin"
-msgstr "activar complemento de publicación en Yandex"
-
-#: misc/org.yorba.shotwell.gschema.xml:733
-msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de publicación en Yandex.Fotki está activado, falso "
-"en otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:738
-msgid "enable tumblr publishing plugin"
-msgstr "activar complemento de publicación en Tumblr"
-
-#: misc/org.yorba.shotwell.gschema.xml:739
-msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de publicación en Tumblr está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:744
-msgid "enable rajce publishing plugin"
-msgstr "activar complemento de publicación en Rajce"
-
-#: misc/org.yorba.shotwell.gschema.xml:745
-msgid "True if the Rajce publishing plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de publicación en Rajce está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:750
-msgid "enable gallery3 publishing plugin"
-msgstr "activar complemento de publicación en Gallery3"
-
-#: misc/org.yorba.shotwell.gschema.xml:751
-msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de publicación en Gallery3 está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:756
-msgid "enable F-Spot import plugin"
-msgstr "activar complemento de importación de F-Spot"
-
-#: misc/org.yorba.shotwell.gschema.xml:757
-msgid "True if the F-Spot import plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de importación de F-Spot está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:762
-msgid "enable slideshow crumble transition"
-msgstr "activar transición de desmenuzado del pase de diapositivas"
-
-#: misc/org.yorba.shotwell.gschema.xml:763
-msgid ""
-"True if the Crumble slideshow transition plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de transición de desmoronar está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:768
-msgid "enable slideshow fade transition"
-msgstr "activar transición de fundido del pase de diapositivas"
-
-#: misc/org.yorba.shotwell.gschema.xml:769
-msgid ""
-"True if the Fade slideshow transition plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de transición de fundido está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:774
-#: misc/org.yorba.shotwell.gschema.xml:798
-msgid "enable slideshow slide transition"
-msgstr "activar transición lateral del pase de diapositivas"
-
-#: misc/org.yorba.shotwell.gschema.xml:775
-msgid ""
-"True if the Slide slideshow transition plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de transición lateral está activado, falso en otro "
-"caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:780
-msgid "enable slideshow clock transition"
-msgstr "activar transición de reloj del pase de diapositivas"
-
-#: misc/org.yorba.shotwell.gschema.xml:781
-msgid ""
-"True if the Clock slideshow transition plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de transición de reloj está activado, falso en otro "
-"caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:786
-#: misc/org.yorba.shotwell.gschema.xml:792
-msgid "enable slideshow circle transition"
-msgstr "activar transición circular del pase de diapositivas"
-
-#: misc/org.yorba.shotwell.gschema.xml:787
-msgid ""
-"True if the Circle slideshow transition plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de transición circular está activado, falso en otro "
-"caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:793
-msgid ""
-"True if the Circles slideshow transition plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de transición en círculos está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:799
-msgid ""
-"True if the Blinds slideshow transition plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de transición de persianas está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:804
-msgid "enable slideshow squares transition"
-msgstr "activar transición de cuadros del pase de diapositivas"
-
-#: misc/org.yorba.shotwell.gschema.xml:805
-msgid ""
-"True if the Squares slideshow transition plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de transición de cuadros está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:810
-msgid "enable slideshow stripes transition"
-msgstr "activar transición de bandas del pase de diapositivas"
-
-#: misc/org.yorba.shotwell.gschema.xml:811
-msgid ""
-"True if the Stripes slideshow transition plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de transición de bandas está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:816
-msgid "enable slideshow chess transition"
-msgstr "activar transición de ajedrez del pase de diapositivas"
-
-#: misc/org.yorba.shotwell.gschema.xml:817
-msgid ""
-"True if the Chess-Board slideshow transition plugin is enabled, false "
-"otherwise"
-msgstr ""
-"Cierto si el complemento de transición de tablero de ajedrez está activado, "
-"falso en otro caso"
-
-#: plugins/common/Resources.vala:12
-msgid "Visit the Shotwell home page"
-msgstr "Visite la página web de Shotwell"
-
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:679
-msgid "translator-credits"
-msgstr ""
-"Daniel Mustieles <daniel.mustieles@gmail.com>, 2014-2016\n"
-"Adolfo Jayme Barrientos <fitoschido@ubuntu.com>, 2011–2013\n"
-"Claudio Rodrigo Pereyra Diaz <elsupergomez@fedoraproject.org>, 2011–2013\n"
-"monkey.libre <monkey.libre@gmail.com>\n"
-"Jorge González <jorgegonz@svn.gnome.org>, 2011\n"
-"José Luis Navarro <jlnavarro111@gmail.com>"
-
-#. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:202
-msgid ""
-"⚫ This website presented identification that belongs to a different website."
-msgstr ""
-"⚫ Este sitio web presenta una identificación que pertenece a un sitio web "
-"diferente."
-
-#. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:207
-msgid ""
-"⚫ This website’s identification is too old to trust. Check the date on your "
-"computer’s calendar."
-msgstr ""
-"⚫ La identificación de este sitio web es demasiado antigua como para "
-"confiar. Compruebe la fecha en el calendario de su equipo."
-
-#. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:212
-msgid ""
-"⚫ This website’s identification was not issued by a trusted organization."
-msgstr ""
-"⚫ La identificación de este sitio web no ha sido emitida por una "
-"organización de confianza."
-
-#. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:217
-msgid ""
-"⚫ This website’s identification could not be processed. It may be corrupted."
-msgstr ""
-"⚫ La identificación de este sitio web no se pudo procesar. Puede estar "
-"dañada."
-
-#. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:222
-msgid ""
-"⚫ This website’s identification has been revoked by the trusted organization "
-"that issued it."
-msgstr ""
-"⚫ La identificación de este sitio web ha sido revocada por la organización "
-"de confianza que la emitió."
-
-#. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:227
-msgid ""
-"⚫ This website’s identification cannot be trusted because it uses very weak "
-"encryption."
-msgstr ""
-"⚫ No se puede confiar en la identificación de este sitio web porque utiliza "
-"un cifrado muy débil."
-
-#. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:232
-msgid ""
-"⚫ This website’s identification is only valid for future dates. Check the "
-"date on your computer’s calendar."
-msgstr ""
-"⚫ La identificación de este sitio web sólo es válida para fechas futuras. "
-"Compruebe la fecha en el calendario de su equipo."
-
-#: plugins/common/RESTSupport.vala:509
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:958
-msgid "A temporary file needed for publishing is unavailable"
-msgstr "No está disponible un archivo temporal necesario para la publicación"
-
-#: plugins/common/RESTSupport.vala:1167
-msgid ""
-"You have already logged in and out of a Google service during this Shotwell "
-"session.\n"
-"\n"
-"To continue publishing to Google services, quit and restart Shotwell, then "
-"try publishing again."
-msgstr ""
-"Ya ha iniciado y cerrado sesión de Google durante esta sesión de Shotwell.\n"
-"Para seguir publicando en servicios de Google, cierre y reinicie Shotwell, e "
-"intente publicar de nuevo."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:36
-#: plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: plugins/shotwell-publishing/FlickrPublishing.vala:33
-#: plugins/shotwell-publishing/PicasaPublishing.vala:33
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
-#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Copyright 2016 Software Freedom Conservancy Inc."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:58
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
-msgstr ""
-"Bienvenido/a al servicio de importación de F-Spot.\n"
-"\n"
-"Seleccione una colección a importar, ya sea eligiendo una de las colecciones "
-"existentes encontradas por Shotwell o eligiendo un archivo de base de datos "
-"de F-Spot alternativo."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select an F-Spot database file."
-msgstr ""
-"Bienvenido/a al servicio de importación de colecciones de F-Spot.\n"
-"\n"
-"Seleccione un archivo de colección de F-Spot."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:62
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Seleccionar manualmente una colección de F-Spot para importar:"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:64
-msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
-msgstr ""
-"No se puede abrir el archivo seleccionado de F-Spot: el archivo no existe o "
-"no es un archivo de colección de F-Spot"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
-msgstr ""
-"No se puede abrir el archivo seleccionado de F-Spot: esta versión de F-Spot "
-"no está soportada por Shotwell"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"No se puede abrir el archivo seleccionado de F-Spot: error al leer la tabla "
-"de etiquetas"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:70
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"No se puede abrir el archivo seleccionado de F-Spot: error al leer la tabla "
-"de fotos"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:72
-#, c-format
-msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
-msgstr ""
-"Shotwell encontró %d fotos en la colección de F-Spot y está importándolas "
-"ahora. Los duplicados se detectarán y eliminarán automáticamente.\n"
-"\n"
-"Puede cerrar este diálogo y empezar a utilizar Shotwell mientras el proceso "
-"de importación ocurre en segundo plano."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:86
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "Colección de F-Spot: %s"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:424
-msgid "Preparing to import"
-msgstr "Preparando para importar"
-
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Servicios de importación de datos de núcleo"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:5
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-msgid "Go _Back"
-msgstr "A_trás"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:8
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:145
-#: ui/shotwell.ui:1627
-#| msgid "_Login"
-msgid "_Log in"
-msgstr "Iniciar _sesión"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:34
-msgid "_Gallery3 URL:"
-msgstr "URL de _Gallery3:"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:64
-msgid "_User name:"
-msgstr "_Nombre de usuario:"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:79
-msgid "_Password:"
-msgstr "_Contraseña:"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:178
-msgid "API _Key:"
-msgstr "_Clave de la API:"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:208
-msgid "or"
-msgstr "o"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:5
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:38
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:116
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:115
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:197
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:137
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:229
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
-msgid "_Logout"
-msgstr "Cerrar _sesión"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:8
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:247
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:134
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:129
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:212
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:153
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:243
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
-msgid "_Publish"
-msgstr "_Publicar"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:11
-msgid "A _new album"
-msgstr "Un álbum _nuevo"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:17
-msgid "An _existing album"
-msgstr "Un álbum _existente"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:22
-msgid "_Remove location, tag and camera-identifying data before uploading"
-msgstr "_Quitar ubicación, etiqueta y datos de la cámara antes de subir"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:135
-msgid "Scaling constraint:"
-msgstr "Re_stricción de escalado:"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:153
-msgid "pixels"
-msgstr "píxeles"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1235
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1329
-#: src/Dimensions.vala:17
-msgid "Original size"
-msgstr "Tamaño original"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:196
-#: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Anchura o altura"
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
-msgid "Gallery3 publishing module"
-msgstr "Módulo de publicación Gallery3"
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:114
-msgid ""
-"You are not currently logged into your Gallery.\n"
-"\n"
-"You must have already signed up for a Gallery3 account to complete the login "
-"process."
-msgstr ""
-"No ha iniciado sesión en su Galería.\n"
-"\n"
-"Debe haber registrado una cuenta de Gallery3 para poder iniciar sesión."
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:117
-msgid "Shotwell default directory"
-msgstr "Carpeta predeterminada de Shotwell"
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:801
-#, c-format
-#| msgid ""
-#| "\n"
-#| "\n"
-#| "The file \"%s\" may not be supported by or may be too large for this "
-#| "instance of Gallery3."
-msgid ""
-"\n"
-"\n"
-"The file “%s” may not be supported by or may be too large for this instance "
-"of Gallery3."
-msgstr ""
-"\n"
-"\n"
-"El archivo «%s» puede no estar soportado o ser demasiado grande para esta "
-"instancia de Gallery3."
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:802
-msgid ""
-"\n"
-"Note that Gallery3 only supports the video types that Flowplayer does."
-msgstr ""
-"\n"
-"Tenga en cuenta que Gallery3 sólo soporta los mismos tipos de vídeo que "
-"Flowplayer."
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1021
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773
-#, c-format
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to %s can't "
-#| "continue."
-msgid ""
-"A file required for publishing is unavailable. Publishing to %s can’t "
-"continue."
-msgstr ""
-"No está disponible un archivo necesario para publicar. La publicación en %s "
-"no puede continuar."
-
-#. populate any widgets whose contents are
-#. programmatically-generated
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
-#, c-format
-msgid "Publishing to %s as %s."
-msgstr "Publicar en %s como %s."
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
-msgid ""
-"Enter the URL for your Gallery3 site and the username and password (or API "
-"key) for your Gallery3 account."
-msgstr ""
-"Escriba el URL de su sitio Gallery3, así como el nombre de usuario y "
-"contraseña (o clave API) para su cuenta de Gallery3."
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
-msgid ""
-"The username and password or API key were incorrect. To try again, re-enter "
-"your username and password below."
-msgstr ""
-"El nombre de usuario y la contraseña o la clave de la API no son correctos. "
-"Para interntarlo de nuevo, vuelva a introducir su nombre y su contraseña a "
-"continuación."
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
-msgid ""
-"The URL entered does not appear to be the main directory of a Gallery3 "
-"instance. Please make sure you typed it correctly and it does not have any "
-"trailing components (e.g., index.php)."
-msgstr ""
-"El URL introducido no parece ser la carpeta principal de una instancia de "
-"Gallery3. Asegúrese de que lo ha escrito correctamente y que no tiene "
-"elementos adicionales (ej. index.php)."
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1872
-msgid "Unrecognized User"
-msgstr "Usuario no reconocido"
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1877
-msgid " Site Not Found"
-msgstr " Sitio no encontrado"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:49
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:49
-msgid "_Email address"
-msgstr "Dirección de correo _electrónico"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:59
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:59
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:73
-msgid "_Password"
-msgstr "_Contraseña"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:103
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
-msgid "_Remember"
-msgstr "_Recordar"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:125
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:107
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:151
-#| msgid "Logging in…"
-msgid "Log in"
-msgstr "Iniciando sesión…"
-
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:111
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:75
-msgid "An _existing album:"
-msgstr "Un álbum _existente:"
-
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:135
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:94
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:52
-msgid "A _new album named:"
-msgstr "Un álbum _nuevo:"
-
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:159
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1005
-msgid "_Hide album"
-msgstr "_Ocultar álbum"
-
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:178
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
-msgid "Open target _album in browser"
-msgstr "Abrir ál_bum objetivo en el navegador"
-
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:40
-#| msgid "Copyright (C) 2013 rajce.net"
-msgid "Copyright © 2013 rajce.net"
-msgstr "Copyright (C) 2013 rajce.net"
-
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:744
-msgid "An error message occurred when publishing to Rajce. Please try again."
-msgstr "Ocurrió un error al publicar en Rajce. Inténtelo de nuevo."
-
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:833
-msgid "Enter email and password associated with your Rajce account."
-msgstr ""
-"Escriba el nombre de usuario y contraseña asociados con su cuenta de Rajce."
-
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:834
-msgid "Invalid email and/or password. Please try again"
-msgstr "Usuario y/o contraseña no válidos. Inténtelo de nuevo"
-
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:865
-msgid "Invalid User Email or Password"
-msgstr "Nombre de usuario o contraseña no válidos"
-
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1012
-#, c-format
-msgid "You are logged into Rajce as %s."
-msgstr "Ha iniciado sesión en Rajce como %s."
-
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
-#: plugins/shotwell-publishing/PicasaPublishing.vala:670
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:24
-msgid "Photos will appear in:"
-msgstr "Las fotos aparecen en:"
-
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
-msgid "Shotwell Extra Publishing Services"
-msgstr "Servicios de publicación adicionales de Shotwell"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:43
-msgid "Blogs:"
-msgstr "Blogs:"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:60
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
-msgid "Photo _size:"
-msgstr "_Tamaño de la foto:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Copyright 2012 BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1325
-#| msgid "500 x 375 pixels"
-msgid "500 × 375 pixels"
-msgstr "500 × 375 píxeles"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1326
-#| msgid "1024 x 768 pixels"
-msgid "1024 × 768 pixels"
-msgstr "1024 × 768 píxeles"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-#| msgid "1280 x 853 pixels"
-msgid "1280 × 853 pixels"
-msgstr "1280 × 853 píxeles"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:311
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:321
-#, c-format
-#| msgid "'%s' isn't a valid response to an OAuth authentication request"
-msgid "“%s” isn’t a valid response to an OAuth authentication request"
-msgstr "«%s» no es una respuesta válida a una solicitud de autenticación OAuth"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-#| msgid ""
-#| "TumblrPublisher: start( ): can't start; this publisher is not restartable."
-msgid ""
-"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
-msgstr ""
-"TumblrPublisher: start( ): no puede iniciar, este publicador no es "
-"reiniciable."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr ""
-"Escriba el nombre de usuario y contraseña asociados con su cuenta de Tumblr."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1087
-msgid "Username and/or password invalid. Please try again"
-msgstr "Usuario y/o contraseña no válidos. Inténtelo de nuevo"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1121
-msgid "Invalid User Name or Password"
-msgstr "Nombre de usuario o contraseña no válidos"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:634
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:752
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "No se pudo cargar la IU: %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:734
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"Ha iniciado sesión en Tumblr como %s.\n"
-"\n"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
-msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
-msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:25
-msgid "Visit the Yandex.Fotki web site"
-msgstr "Visitar el sitio web de Yandex.Fotki"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:609
-msgid "You are not currently logged into Yandex.Fotki."
-msgstr "Actualmente no ha iniciado sesión en Yandex.Fotki."
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:24
-msgid "_Albums (or write new):"
-msgstr "Álb_umes (o crear uno nuevo):"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:38
-msgid "Access _type:"
-msgstr "_Tipo de acceso:"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:81
-msgid "Disable _comments"
-msgstr "Desactivar _comentarios"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:96
-msgid "_Forbid downloading original photo"
-msgstr "_No permitir la descarga de la foto original"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
-msgid "Public"
-msgstr "Público"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:162
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
-msgid "Friends"
-msgstr "Amigos"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:165
-#: plugins/shotwell-publishing/YouTubePublishing.vala:498
-msgid "Private"
-msgstr "Privado"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:39
-msgid "Publish to an e_xisting album:"
-msgstr "Publicar en un álbum e_xistente:"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:57
-msgid "Create a _new album named:"
-msgstr "Crear un álbum _nuevo llamado:"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:108
-#: plugins/shotwell-publishing/FacebookPublishing.vala:984
-msgid "Upload _size:"
-msgstr "_Tamaño de subida:"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:139
-msgid "Videos and new photo albums _visible to:"
-msgstr "Vídeos y álbumes de fotos nuevos _visibles para:"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:175
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:102
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:178
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:226
-msgid ""
-"_Remove location, camera, and other identifying information before uploading"
-msgstr "_Quitar ubicación, cámara y otra información antes de subir"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:62
-#: plugins/shotwell-publishing/PicasaPublishing.vala:60
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1209
-msgid "Shotwell Connect"
-msgstr "Shotwell Connect"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:64
-#| msgid ""
-#| "You are not currently logged into Facebook.\n"
-#| "\n"
-#| "If you don't yet have a Facebook account, you can create one during the "
-#| "login process. During login, Shotwell Connect may ask you for permission "
-#| "to upload photos and publish to your feed. These permissions are required "
-#| "for Shotwell Connect to function."
-msgid ""
-"You are not currently logged into Facebook.\n"
-"\n"
-"If you don’t yet have a Facebook account, you can create one during the "
-"login process. During login, Shotwell Connect may ask you for permission to "
-"upload photos and publish to your feed. These permissions are required for "
-"Shotwell Connect to function."
-msgstr ""
-"Actualmente no ha iniciado sesión en Facebook.\n"
-"\n"
-"Si no tiene una cuenta de Facebook, puede crear una durante el proceso de "
-"inicio de sesión. Durante el inicio de sesión, Shotwell Connect le puede "
-"pedir permiso para subir fotos y publicar en su muro. Estos permisos son "
-"necesarios para que Shotwell Connect funcione."
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:66
-msgid ""
-"You have already logged in and out of Facebook during this Shotwell "
-"session.\n"
-"To continue publishing to Facebook, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"Ya ha iniciado y cerrado sesión de Facebook durante esta sesión de "
-"Shotwell.\n"
-"Para seguir publicando en Facebook, cierre y reinicie Shotwell, e intente "
-"publicar de nuevo."
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:87
-msgid "Standard (720 pixels)"
-msgstr "Estándar (720 píxeles)"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:90
-msgid "Large (2048 pixels)"
-msgstr "Grande (2048 píxeles)"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:255
-#| msgid "Testing connection to Facebook..."
-msgid "Testing connection to Facebook…"
-msgstr "Comprobando la conexión a Facebook…"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:348
-#: plugins/shotwell-publishing/PicasaPublishing.vala:379
-#| msgid "Creating album..."
-msgid "Creating album…"
-msgstr "Creando el álbum…"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:374
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Facebook "
-#| "can't continue."
-msgid ""
-"A file required for publishing is unavailable. Publishing to Facebook can’t "
-"continue."
-msgstr ""
-"No está disponible un archivo necesario para publicar. La publicación en "
-"Facebook no puede continuar."
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:982
-#, c-format
-msgid ""
-"You are logged into Facebook as %s.\n"
-"\n"
-msgstr ""
-"Ha iniciado sesión en Facebook como %s.\n"
-"\n"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:983
-msgid "Where would you like to publish the selected photos?"
-msgstr "¿Dónde quiere publicar las fotos seleccionadas?"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1143
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1213
-msgid "Just me"
-msgstr "Solo yo"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1145
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1313
-msgid "Everyone"
-msgstr "Todos"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:16
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Introduzca el número de confirmación que aparece en su navegador web después "
-"de iniciar sesión en Flickr."
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "_Número de autorización:"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83
-#: src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "Con_tinuar"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:60
-#| msgid ""
-#| "You are not currently logged into Flickr.\n"
-#| "\n"
-#| "Click Login to log into Flickr in your Web browser. You will have to "
-#| "authorize Shotwell Connect to link to your Flickr account."
-msgid ""
-"You are not currently logged into Flickr.\n"
-"\n"
-"Click Log in to log into Flickr in your Web browser. You will have to "
-"authorize Shotwell Connect to link to your Flickr account."
-msgstr ""
-"Actualmente no ha iniciado sesión en Flickr.\n"
-"\n"
-"Pulse Iniciar sesión para identificarse en Flickr en su navegador web. "
-"Tendrá que autorizar a Shotwell Connect para que se enlace a su cuenta de "
-"Flickr."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:62
-msgid ""
-"You have already logged in and out of Flickr during this Shotwell session.\n"
-"To continue publishing to Flickr, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"Ya ha iniciado y cerrado sesión de Flickr durante esta sesión de Shotwell.\n"
-"Para seguir publicando en Flickr, cierre y reinicie Shotwell, e intente "
-"publicar de nuevo."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:374
-#| msgid "Preparing for login..."
-msgid "Preparing for login…"
-msgstr "Preparándose para iniciar sesión…"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: plugins/shotwell-publishing/FlickrPublishing.vala:594
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Flickr can't "
-#| "continue."
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can’t "
-"continue."
-msgstr ""
-"No está disponible un archivo necesario para publicar. La publicación en "
-"Flickr no puede continuar."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:457
-#| msgid "Verifying authorization..."
-msgid "Verifying authorization…"
-msgstr "Comprobando la autorización…"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1152
-#, c-format
-msgid ""
-"You are logged into Flickr as %s.\n"
-"\n"
-msgstr ""
-"Ha iniciado sesión en Flickr como %s.\n"
-"\n"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1155
-#, c-format
-msgid ""
-"Your free Flickr account limits how much data you can upload per month.\n"
-"This month you have %d megabyte remaining in your upload quota."
-msgid_plural ""
-"Your free Flickr account limits how much data you can upload per month.\n"
-"This month you have %d megabytes remaining in your upload quota."
-msgstr[0] ""
-"Su cuenta gratuita de Flickr limita la cantidad de datos que puede subir al "
-"mes.\n"
-"Este mes tiene %d megabyte restantes de su límite de subida."
-msgstr[1] ""
-"Su cuenta gratuita de Flickr limita la cantidad de datos que puede subir al "
-"mes.\n"
-"Este mes tiene %d megabytes restantes de su límite de sudiba."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1159
-msgid "Your Flickr Pro account entitles you to unlimited uploads."
-msgstr "Su cuenta de Flickr Pro le permite subidas ilimitadas."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
-msgid "Photos _visible to:"
-msgstr "Fotos _visibles para:"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1166
-msgid "Videos _visible to:"
-msgstr "Vídeos _visibles para:"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1169
-msgid "Photos and videos _visible to:"
-msgstr "Fotos y vídeos _visibles para:"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
-msgid "Friends & family only"
-msgstr "Solo amigos y familia"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
-msgid "Family only"
-msgstr "Solo familia"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1212
-msgid "Friends only"
-msgstr "Solo amigos"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1327
-#| msgid "2048 x 1536 pixels"
-msgid "2048 × 1536 pixels"
-msgstr "2048 × 1536 píxeles"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1234
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1328
-#| msgid "4096 x 3072 pixels"
-msgid "4096 × 3072 pixels"
-msgstr "4096 × 3072 píxeles"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:113
-msgid "L_ist album in public gallery"
-msgstr "_Listar álbum en la galería pública"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:150
-msgid "Photo _size preset:"
-msgstr "_Tamaño de foto predefinido:"
-
-#: plugins/shotwell-publishing/PicasaPublishing.vala:59
-#| msgid ""
-#| "You are not currently logged into Picasa Web Albums.\n"
-#| "\n"
-#| "Click Login to log into Picasa Web Albums in your Web browser. You will "
-#| "have to authorize Shotwell Connect to link to your Picasa Web Albums "
-#| "account."
-msgid ""
-"You are not currently logged into Picasa Web Albums.\n"
-"\n"
-"Click Log in to log into Picasa Web Albums in your Web browser. You will "
-"have to authorize Shotwell Connect to link to your Picasa Web Albums account."
-msgstr ""
-"Actualmente no ha iniciado sesión en Álbumes web de Picasa.\n"
-"\n"
-"Pulse Iniciar sesión para identificarse en Álbumes web de Picasa en su "
-"navegador web. Tendrá que autorizar a Shotwell Connect para que se enlace a "
-"su cuenta de Álbumes web de Picasa."
-
-#: plugins/shotwell-publishing/PicasaPublishing.vala:361
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Picasa can't "
-#| "continue."
-msgid ""
-"A file required for publishing is unavailable. Publishing to Picasa can’t "
-"continue."
-msgstr ""
-"No está disponible un archivo necesario para publicar. La publicación en "
-"Picasa no puede continuar."
-
-#. populate any widgets whose contents are programmatically-generated.
-#: plugins/shotwell-publishing/PicasaPublishing.vala:659
-#, c-format
-msgid "You are logged into Picasa Web Albums as %s."
-msgstr "Ha iniciado sesión en Álbumes web de Picasa como %s."
-
-#: plugins/shotwell-publishing/PicasaPublishing.vala:665
-msgid "Videos will appear in:"
-msgstr "Los vídeos aparecerán en:"
-
-#: plugins/shotwell-publishing/PicasaPublishing.vala:746
-#| msgid "Small (640 x 480 pixels)"
-msgid "Small (640 × 480 pixels)"
-msgstr "Pequeño (640 × 480 píxeles)"
-
-#: plugins/shotwell-publishing/PicasaPublishing.vala:747
-#| msgid "Medium (1024 x 768 pixels)"
-msgid "Medium (1024 × 768 pixels)"
-msgstr "Mediano (1024 × 768 píxeles)"
-
-#: plugins/shotwell-publishing/PicasaPublishing.vala:748
-#| msgid "Recommended (1600 x 1200 pixels)"
-msgid "Recommended (1600 × 1200 pixels)"
-msgstr "Recomendado (1600 × 1200 píxeles)"
-
-#: plugins/shotwell-publishing/PicasaPublishing.vala:749
-#| msgid "Google+ (2048 x 1536 pixels)"
-msgid "Google+ (2048 × 1536 pixels)"
-msgstr "Google+ (2048 × 1536 píxeles)"
-
-#: plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: src/editing_tools/EditingTools.vala:756
-msgid "Original Size"
-msgstr "Tamaño original"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:49
-msgid "_URL of your Piwigo photo library"
-msgstr "_URL de su biblioteca de fotos Piwigo"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:59
-msgid "User _name"
-msgstr "_Nombre de usuario"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:130
-msgid "_Remember Password"
-msgstr "_Recortar contraseña"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:40
-msgid "An _existing category:"
-msgstr "Una categoría _existente:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:121
-msgid "Photos will be _visible by:"
-msgstr "Las fotos serán _visibles para:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:149
-msgid "Photo size:"
-msgstr "Tamaño de la foto:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:176
-msgid "within category:"
-msgstr "en la categoría:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:210
-msgid "Album comment:"
-msgstr "Comentario del álbum:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:242
-msgid "_If a title is set and comment unset, use title as comment"
-msgstr ""
-"_Si se definió el titulo pero no un comentario, usar el título como "
-"comentario"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:258
-msgid "_Do no upload tags"
-msgstr "_No cargar las etiquetas"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:278
-msgid "Logout"
-msgstr "Salir"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:291
-#: src/Resources.vala:295
-msgid "Publish"
-msgstr "Publicar"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:775
-#, c-format
-#| msgid "Creating album %s..."
-msgid "Creating album %s…"
-msgstr "Creando el álbum %s…"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:948
-msgid "An error message occurred when publishing to Piwigo. Please try again."
-msgstr "Ocurrió un error al publicar en Piwigo. Inténtelo de nuevo."
-
-#. %s is the host name that we tried to connect to
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1024
-#, c-format
-msgid ""
-"This does not look like the real <b>%s</b>. Attackers might be trying to "
-"steal or alter information going to or from this site (for example, private "
-"messages, credit card information, or passwords)."
-msgstr ""
-"Esto no parece el <b>%s</b> real. Los atacantes pueden estar tratando de "
-"robar o alterar la información que entra o sale de este sitio (por ejemplo, "
-"mensajes privados, información de tarjetas de crédito o contraseñas)."
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1085
-msgid ""
-"Enter the URL of your Piwigo photo library as well as the username and "
-"password associated with your Piwigo account for that library."
-msgstr ""
-"Escriba el URL de su colección fotográfica de Piwigo, así como el nombre de "
-"usuario y contraseña asociados a esa colección."
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1086
-msgid ""
-"Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
-"entered"
-msgstr ""
-"Shotwell no puede contactar su colección de fotos de Piwigo. Compruebe la "
-"URL que ha introducido"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1116
-msgid "Invalid URL"
-msgstr "URL no válida"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1314
-msgid "Admins, Family, Friends, Contacts"
-msgstr "Administradores, Familia, Amigos, Contactos"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1315
-msgid "Admins, Family, Friends"
-msgstr "Administradores, Familia, Amigos"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1316
-msgid "Admins, Family"
-msgstr "Administradores, Familia"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1317
-msgid "Admins"
-msgstr "Administradores"
-
-#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:21
-msgid "This connection is not secure"
-msgstr "Esta conexión no es segura"
-
-#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:75
-msgid "Show the certificate…"
-msgstr "Mostrar el certificado…"
-
-#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:88
-msgid "I understand, please _proceed."
-msgstr "Lo entiendo, _continuar."
-
-#: plugins/shotwell-publishing/shotwell-publishing.vala:26
-msgid "Core Publishing Services"
-msgstr "Servicios de publicación"
-
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
-msgid "Video privacy _setting:"
-msgstr "Co_nfiguración de privacidad de vídeos:"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:58
-msgid ""
-"You are not currently logged into YouTube.\n"
-"\n"
-"You must have already signed up for a Google account and set it up for use "
-"with YouTube to continue. You can set up most accounts by using your browser "
-"to log into the YouTube site at least once."
-msgstr ""
-"No ha iniciado sesión en YouTube.\n"
-"\n"
-"Debe haber registrado una cuenta de Google y configurarla para utilizarla "
-"con YouTube para continuar. Puede configurar la mayoría de cuentas mediante "
-"el uso de su navegador para registrarse en el sitio de YouTube al menos una "
-"vez."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:363
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Youtube "
-#| "can't continue."
-msgid ""
-"A file required for publishing is unavailable. Publishing to YouTube can’t "
-"continue."
-msgstr ""
-"No está disponible un archivo necesario para publicar. La publicación en "
-"Youtube no puede continuar."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:462
-#, c-format
-msgid "You are logged into YouTube as %s."
-msgstr "Ha iniciado sesión en YouTube como %s."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:464
-#, c-format
-#| msgid "Videos will appear in '%s'"
-msgid "Videos will appear in “%s”"
-msgstr "Los vídeos aparecerán en «%s»"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:496
-msgid "Public listed"
-msgstr "Listado públicamente"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:497
-msgid "Public unlisted"
-msgstr "No listado públicamente"
-
-#: plugins/shotwell-transitions/BlindsEffect.vala:20
-msgid "Blinds"
-msgstr "Persianas"
-
-#: plugins/shotwell-transitions/ChessEffect.vala:20
-msgid "Chess"
-msgstr "Ajedrez"
-
-#: plugins/shotwell-transitions/CircleEffect.vala:20
-msgid "Circle"
-msgstr "Círculo"
-
-#: plugins/shotwell-transitions/CirclesEffect.vala:20
-msgid "Circles"
-msgstr "Círculos"
-
-#: plugins/shotwell-transitions/ClockEffect.vala:20
-msgid "Clock"
-msgstr "Reloj"
-
-#: plugins/shotwell-transitions/CrumbleEffect.vala:20
-msgid "Crumble"
-msgstr "Desmoronar"
-
-#: plugins/shotwell-transitions/FadeEffect.vala:20
-msgid "Fade"
-msgstr "Desvanecer"
-
-#: plugins/shotwell-transitions/shotwell-transitions.vala:28
-msgid "Core Slideshow Transitions"
-msgstr "Transiciones de pase de diapositivas"
-
-#: plugins/shotwell-transitions/shotwell-transitions.vala:76
-msgid ""
-"Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "
-"Inc."
-msgstr ""
-"Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "
-"Inc."
-
-#: plugins/shotwell-transitions/SlideEffect.vala:20
-msgid "Slide"
-msgstr "Diapositiva"
-
-#: plugins/shotwell-transitions/SquaresEffect.vala:20
-msgid "Squares"
-msgstr "Cuadrados"
-
-#: plugins/shotwell-transitions/StripesEffect.vala:20
-msgid "Stripes"
-msgstr "Franjas"
-
-#: src/AppDirs.vala:64 src/AppDirs.vala:115
-#, c-format
-msgid "Unable to create cache directory %s: %s"
-msgstr "No se pudo crear la carpeta de caché %s: %s"
-
-#: src/AppDirs.vala:74 src/AppDirs.vala:104
-#, c-format
-msgid "Unable to create data directory %s: %s"
-msgstr "No se puede crear la carpeta de datos %s: %s"
-
-#. If XDG yarfed, use ~/Pictures
-#: src/AppDirs.vala:168
-msgid "Pictures"
-msgstr "Imágenes"
-
-#: src/AppDirs.vala:206
-#, c-format
-msgid "Unable to create temporary directory %s: %s"
-msgstr "No se puede crear la carpeta temporal %s: %s"
-
-#: src/AppDirs.vala:223 src/AppDirs.vala:254
-#, c-format
-msgid "Unable to create data subdirectory %s: %s"
-msgstr "No se puede crear la subcarpeta de datos %s: %s"
-
-#: src/AppDirs.vala:236
-#, c-format
-msgid "Could not make directory %s writable"
-msgstr "No se pudo hacer que la carpeta %s sea escribible"
-
-#: src/AppDirs.vala:239
-#, c-format
-msgid "Could not make directory %s writable: %s"
-msgstr "No se pudo hacer escribible la carpeta %s: %s"
-
-#: src/AppWindow.vala:54
-msgid "Pin Toolbar"
-msgstr "Anclar la barra de herramientas"
-
-#: src/AppWindow.vala:55
-msgid "Pin the toolbar open"
-msgstr "Mantener abierta la barra de herramientas"
-
-#: src/AppWindow.vala:60
-msgid "Leave fullscreen"
-msgstr "Salir de pantalla completa"
-
-#: src/AppWindow.vala:499
-msgid "_Contents"
-msgstr "_Contenido"
-
-#: src/AppWindow.vala:504
-msgid "_Frequently Asked Questions"
-msgstr "_Preguntas más frecuentes"
-
-#: src/AppWindow.vala:509
-msgid "_Report a Problem…"
-msgstr "_Informar de un problema…"
-
-#: src/AppWindow.vala:608 src/AppWindow.vala:629 src/AppWindow.vala:646
-#: src/data_imports/DataImportsUI.vala:413 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1441 src/Dialogs.vala:1464
-#: src/publishing/PublishingUI.vala:512 src/Resources.vala:157
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#: src/AppWindow.vala:656
-#, c-format
-#| msgid ""
-#| "A fatal error occurred when accessing Shotwell's library. Shotwell "
-#| "cannot continue.\n"
-#| "\n"
-#| "%s"
-msgid ""
-"A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
-"continue.\n"
-"\n"
-"%s"
-msgstr ""
-"Ocurrió un error grave al acceder a la colección de Shotwell. Shotwell no "
-"puede continuar.\n"
-"\n"
-"%s"
-
-#: src/AppWindow.vala:676
-msgid "Visit the Shotwell web site"
-msgstr "Visite la página web de Shotwell"
-
-#: src/AppWindow.vala:688
-#, c-format
-msgid "Unable to display help: %s"
-msgstr "No se puede mostrar la ayuda: %s"
-
-#: src/AppWindow.vala:696
-#, c-format
-msgid "Unable to navigate to bug database: %s"
-msgstr "No se pudo navegar en la base de datos de errores: %s"
-
-#: src/AppWindow.vala:704
-#, c-format
-msgid "Unable to display FAQ: %s"
-msgstr "No se pudieron mostrar las P+F: %s"
-
-#: src/BatchImport.vala:26
-msgid "Success"
-msgstr "Éxito"
-
-#: src/BatchImport.vala:29
-msgid "File error"
-msgstr "Error de archivo"
-
-#: src/BatchImport.vala:32
-msgid "Unable to decode file"
-msgstr "No se puede descodificar el archivo"
-
-#: src/BatchImport.vala:35
-msgid "Database error"
-msgstr "Error de la base de datos"
-
-#: src/BatchImport.vala:38
-msgid "User aborted import"
-msgstr "El usuario canceló la importación"
-
-#: src/BatchImport.vala:41
-msgid "Not a file"
-msgstr "No es un archivo"
-
-#: src/BatchImport.vala:44
-msgid "File already exists in database"
-msgstr "El archivo ya existe en la base de datos"
-
-#: src/BatchImport.vala:47
-msgid "Unsupported file format"
-msgstr "Formato de archivo no soportado"
-
-#: src/BatchImport.vala:50
-msgid "Not an image file"
-msgstr "No es un archivo de imagen"
-
-#: src/BatchImport.vala:53
-msgid "Disk failure"
-msgstr "Fallo en disco"
-
-#: src/BatchImport.vala:56
-msgid "Disk full"
-msgstr "Disco lleno"
-
-#: src/BatchImport.vala:59
-msgid "Camera error"
-msgstr "Error de la cámara"
-
-#: src/BatchImport.vala:62
-msgid "File write error"
-msgstr "Error de escritura en el archivo"
-
-#: src/BatchImport.vala:65
-msgid "Corrupt image file"
-msgstr "Archivo de imagen dañado"
-
-#: src/BatchImport.vala:68
-#, c-format
-msgid "Imported failed (%d)"
-msgstr "Fallo de importación (%d)"
-
-#: src/camera/Branch.vala:85
-msgid "Cameras"
-msgstr "Cámaras"
-
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:710
-#: src/camera/ImportPage.vala:726 src/MediaPage.vala:440
-#: src/photos/RawSupport.vala:303
-msgid "Camera"
-msgstr "Cámara"
-
-#: src/camera/ImportPage.vala:311 src/Properties.vala:227
-msgid "RAW+JPEG"
-msgstr "RAW+JPEG"
-
-#: src/camera/ImportPage.vala:458
-#| msgid ""
-#| "Unable to unmount camera. Try unmounting the camera from the file "
-#| "manager."
-msgid ""
-"Unable to unmount camera. Try unmounting the camera from the file manager."
-msgstr ""
-"No se puede desmontar la cámara. Intente desmontar la cámara desde el gestor "
-"de archivos."
-
-#. hide duplicates checkbox
-#: src/camera/ImportPage.vala:775
-msgid "Hide photos already imported"
-msgstr "Ocultar fotos ya importadas"
-
-#: src/camera/ImportPage.vala:776
-msgid "Only display photos that have not been imported"
-msgstr "Mostrar solo las fotos que no han sido importadas"
-
-#: src/camera/ImportPage.vala:842
-msgid "The camera seems to be empty. No photos/videos found to import"
-msgstr "La cámara parece estar vacía. No se han importado fotos/vídeos"
-
-#: src/camera/ImportPage.vala:846
-msgid "No new photos/videos found on camera"
-msgstr "No se encontraron fotos/vídeos en la cámara"
-
-#: src/camera/ImportPage.vala:873 src/MediaPage.vala:451
-msgid "_Titles"
-msgstr "_Títulos"
-
-#: src/camera/ImportPage.vala:874 src/MediaPage.vala:452
-msgid "Display the title of each photo"
-msgstr "Mostrar el título de cada foto"
-
-#: src/camera/ImportPage.vala:885
-msgid "Import _Selected"
-msgstr "Importar _seleccionadas"
-
-#: src/camera/ImportPage.vala:886
-msgid "Import the selected photos into your library"
-msgstr "Importar las fotos seleccionadas a su colección"
-
-#: src/camera/ImportPage.vala:891
-msgid "Import _All"
-msgstr "Importar tod_as"
-
-#: src/camera/ImportPage.vala:892
-msgid "Import all the photos into your library"
-msgstr "Importar todas las fotos a su colección"
-
-#. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1013
-#| msgid ""
-#| "Shotwell needs to unmount the camera from the filesystem in order to "
-#| "access it. Continue?"
-msgid ""
-"Shotwell needs to unmount the camera from the filesystem in order to access "
-"it. Continue?"
-msgstr ""
-"Shotwell necesita desmontar la cámara del sistema de archivos con el fin de "
-"acceder a ella. ¿Continuar?"
-
-#: src/camera/ImportPage.vala:1019
-msgid "_Unmount"
-msgstr "_Desmontar"
-
-#: src/camera/ImportPage.vala:1024
-msgid "Please unmount the camera."
-msgstr "Desmonte la cámara."
-
-#: src/camera/ImportPage.vala:1029
-#| msgid ""
-#| "The camera is locked by another application. Shotwell can only access "
-#| "the camera when it's unlocked. Please close any other application using "
-#| "the camera and try again."
-msgid ""
-"The camera is locked by another application. Shotwell can only access the "
-"camera when it’s unlocked. Please close any other application using the "
-"camera and try again."
-msgstr ""
-"La cámara está bloqueada por otra aplicación. Shotwell solo puede acceder a "
-"la cámara cuando está desbloqueada. Cierre cualquier otra aplicación que "
-"esté utilizando la cámara e inténtelo de nuevo."
-
-#: src/camera/ImportPage.vala:1039
-msgid "Please close any other application using the camera."
-msgstr "Cierre cualquier otra aplicación que esté utilizando la cámara."
-
-#: src/camera/ImportPage.vala:1044
-#, c-format
-msgid ""
-"Unable to fetch previews from the camera:\n"
-"%s"
-msgstr ""
-"No se pueden obtener previsualizaciones de la cámara:\n"
-"%s"
-
-#: src/camera/ImportPage.vala:1061
-msgid "Unmounting…"
-msgstr "Desmontando…"
-
-#: src/camera/ImportPage.vala:1152
-msgid "Starting import, please wait…"
-msgstr "Iniciando la importación, espere un momento…"
-
-#: src/camera/ImportPage.vala:1169
-msgid "Fetching photo information"
-msgstr "Obteniendo información de la foto"
-
-#: src/camera/ImportPage.vala:1527
-#, c-format
-msgid "Fetching preview for %s"
-msgstr "Obteniendo previsualización para %s"
-
-#: src/camera/ImportPage.vala:1643
-#, c-format
-msgid "Unable to lock camera: %s"
-msgstr "No se puede bloquear la cámara: %s"
-
-#: src/camera/ImportPage.vala:1728
-#, c-format
-msgid "Delete this photo from camera?"
-msgid_plural "Delete these %d photos from camera?"
-msgstr[0] "¿Quiere eliminar esta foto de la cámara?"
-msgstr[1] "¿Quiere eliminar estas %d fotos de la cámara?"
-
-#: src/camera/ImportPage.vala:1731
-#, c-format
-msgid "Delete this video from camera?"
-msgid_plural "Delete these %d videos from camera?"
-msgstr[0] "¿Quiere eliminar esta foto de la cámara?"
-msgstr[1] "¿Quiere eliminar estas %d fotos de la cámara?"
-
-#: src/camera/ImportPage.vala:1734
-#, c-format
-msgid "Delete this photo/video from camera?"
-msgid_plural "Delete these %d photos/videos from camera?"
-msgstr[0] "¿Quiere eliminar esta foto/vídeo de la cámara?"
-msgstr[1] "¿Quiere eliminar estas %d fotos/vídeos de la cámara?"
-
-#: src/camera/ImportPage.vala:1737
-#, c-format
-msgid "Delete these files from camera?"
-msgid_plural "Delete these %d files from camera?"
-msgstr[0] "¿Eliminar este archivo de la cámara?"
-msgstr[1] "¿Eliminar estos %d archivos de la cámara?"
-
-#: src/camera/ImportPage.vala:1745 src/Dialogs.vala:1408
-msgid "_Keep"
-msgstr "_Mantener"
-
-#: src/camera/ImportPage.vala:1764
-msgid "Removing photos/videos from camera"
-msgstr "Eliminando fotos/vídeos de la cámara"
-
-#: src/camera/ImportPage.vala:1768
-#, c-format
-msgid "Unable to delete %d photo/video from the camera due to errors."
-msgid_plural "Unable to delete %d photos/videos from the camera due to errors."
-msgstr[0] "No se puede eliminar %d foto/vídeo de la cámara, debido a errores."
-msgstr[1] ""
-"No se pueden eliminar %d fotos/vídeos de la cámara, debido a errores."
-
-#: src/CollectionPage.vala:230 src/PhotoPage.vala:2635
-msgid "S_lideshow"
-msgstr "_Diapositivas"
-
-#: src/CollectionPage.vala:231 src/PhotoPage.vala:2636
-msgid "Play a slideshow"
-msgstr "Iniciar un pase de diapositivas"
-
-#: src/CollectionPage.vala:456
-msgid "Export Photo/Video"
-msgstr "Exportar foto o vídeo"
-
-#: src/CollectionPage.vala:456
-msgid "Export Photos/Videos"
-msgstr "Exportar fotos/vídeos"
-
-#: src/CollectionPage.vala:458 src/Dialogs.vala:59 src/PhotoPage.vala:3209
-msgid "Export Photo"
-msgstr "Exportar foto"
-
-#: src/CollectionPage.vala:458 src/Dialogs.vala:84
-msgid "Export Photos"
-msgstr "Exportar fotos"
-
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
-msgid "Rotating"
-msgstr "Girando"
-
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
-msgid "Undoing Rotate"
-msgstr "Deshaciendo el giro"
-
-#: src/CollectionPage.vala:570
-msgid "Flipping Horizontally"
-msgstr "Volteando horizontalmente"
-
-#: src/CollectionPage.vala:571
-msgid "Undoing Flip Horizontally"
-msgstr "Deshaciendo volteo horizontal"
-
-#: src/CollectionPage.vala:580
-msgid "Flipping Vertically"
-msgstr "Volteando verticalmente"
-
-#: src/CollectionPage.vala:581
-msgid "Undoing Flip Vertically"
-msgstr "Deshaciendo volteo vertical"
-
-#: src/Commands.vala:737
-msgid "Reverting"
-msgstr "Revirtiendo"
-
-#: src/Commands.vala:737
-msgid "Undoing Revert"
-msgstr "Deshaciendo reversión"
-
-#: src/Commands.vala:781
-msgid "Enhancing"
-msgstr "Mejorando"
-
-#: src/Commands.vala:781
-msgid "Undoing Enhance"
-msgstr "Deshaciendo mejora"
-
-#: src/Commands.vala:857
-msgid "Applying Color Transformations"
-msgstr "Aplicando transformación de color"
-
-#: src/Commands.vala:857
-msgid "Undoing Color Transformations"
-msgstr "Deshaciendo transformación de color"
-
-#: src/Commands.vala:1007
-msgid "Creating New Event"
-msgstr "Creando un evento nuevo"
-
-#: src/Commands.vala:1008
-msgid "Removing Event"
-msgstr "Quitando el evento"
-
-#: src/Commands.vala:1017
-msgid "Moving Photos to New Event"
-msgstr "Moviendo fotos a un evento nuevo"
-
-#: src/Commands.vala:1018
-msgid "Setting Photos to Previous Event"
-msgstr "Estableciendo fotos al evento anterior"
-
-#: src/Commands.vala:1075
-msgid "Merging"
-msgstr "Combinando"
-
-#: src/Commands.vala:1076
-msgid "Unmerging"
-msgstr "Deshaciendo la combinación"
-
-#: src/Commands.vala:1085
-msgid "Duplicating photos"
-msgstr "Duplicando las fotos"
-
-#: src/Commands.vala:1085
-msgid "Removing duplicated photos"
-msgstr "Quitando las fotos duplicadas"
-
-#: src/Commands.vala:1108
-#, c-format
-msgid "Unable to duplicate one photo due to a file error"
-msgid_plural "Unable to duplicate %d photos due to file errors"
-msgstr[0] "No se puede duplicar una foto debido a un error de archivo"
-msgstr[1] "No se pueden duplicar %d fotos debido a errores de archivo"
-
-#: src/Commands.vala:1195
-msgid "Restoring previous rating"
-msgstr "Restaurar valoración anterior"
-
-#: src/Commands.vala:1205 src/Commands.vala:1206
-msgid "Increasing ratings"
-msgstr "Aumentando la valoración"
-
-#: src/Commands.vala:1205 src/Commands.vala:1206
-msgid "Decreasing ratings"
-msgstr "Disminuyendo la valoración"
-
-#: src/Commands.vala:1256
-msgid "Setting RAW developer"
-msgstr "Configurando el revelador RAW"
-
-#: src/Commands.vala:1256
-msgid "Restoring previous RAW developer"
-msgstr "Restaurando el revelador RAW anterior"
-
-#: src/Commands.vala:1257
-msgid "Set Developer"
-msgstr "Establecer revelador"
-
-#: src/Commands.vala:1347
-msgid "Original photo could not be adjusted."
-msgstr "No se pudo ajustar la foto original."
-
-#: src/Commands.vala:1368
-msgid "Adjusting Date and Time"
-msgstr "Ajustar fecha y hora"
-
-#: src/Commands.vala:1368
-msgid "Undoing Date and Time Adjustment"
-msgstr "Deshacer ajuste de fecha y hora"
-
-#: src/Commands.vala:1399
-msgid "One original photo could not be adjusted."
-msgid_plural "The following original photos could not be adjusted."
-msgstr[0] "No se pudo modificar una foto original."
-msgstr[1] "No se pudieron modificar las siguientes fotos originales."
-
-#: src/Commands.vala:1401 src/Commands.vala:1425
-msgid "Time Adjustment Error"
-msgstr "Error al ajustar la hora"
-
-#: src/Commands.vala:1423
-msgid "Time adjustments could not be undone on the following photo file."
-msgid_plural ""
-"Time adjustments could not be undone on the following photo files."
-msgstr[0] ""
-"El ajuste de la hora no se puede deshacer en el archivo de la foto siguiente."
-msgstr[1] ""
-"El ajuste de la hora no se puede deshacer en el archivo de la foto siguiente."
-
-#: src/Commands.vala:1637 src/Commands.vala:1660
-msgid "Create Tag"
-msgstr "Crear etiqueta"
-
-#: src/Commands.vala:1695
-#, c-format
-#| msgid "Move Tag \"%s\""
-msgid "Move Tag “%s”"
-msgstr "Mover etiqueta «%s»"
-
-#: src/Commands.vala:2347
-msgid "Move Photos to Trash"
-msgstr "Mover fotos a la papelera"
-
-#: src/Commands.vala:2347
-msgid "Restore Photos from Trash"
-msgstr "Restaurar fotos desde la papelera"
-
-#: src/Commands.vala:2348
-msgid "Move the photos to the Shotwell trash"
-msgstr "Mover las fotos a la papelera de Shotwell"
-
-#: src/Commands.vala:2348
-msgid "Restore the photos back to the Shotwell library"
-msgstr "Restaurar las fotos a la colección de Shotwell"
-
-#: src/Commands.vala:2367
-msgid "Moving Photos to Trash"
-msgstr "Mover fotos a la papelera"
-
-#: src/Commands.vala:2367
-msgid "Restoring Photos From Trash"
-msgstr "Restaurar fotos desde la papelera"
-
-#: src/Commands.vala:2453
-msgid "Flag selected photos"
-msgstr "Marcar las fotos seleccionadas"
-
-#: src/Commands.vala:2454
-msgid "Unflag selected photos"
-msgstr "Desmarcar las fotos seleccionadas"
-
-#: src/Commands.vala:2455
-msgid "Flagging selected photos"
-msgstr "Marcando las fotos seleccionadas"
-
-#: src/Commands.vala:2456
-msgid "Unflagging selected photos"
-msgstr "Desmarcando las fotos seleccionadas"
-
-#: src/Commands.vala:2463
-msgid "Flag"
-msgstr "Marcar"
-
-#: src/Commands.vala:2463
-msgid "Unflag"
-msgstr "Desmarcar"
-
-#. Send an empty job to the queue to mark the end of the import
-#: src/data_imports/DataImportsPluginHost.vala:65
-#: src/data_imports/DataImportsPluginHost.vala:78
-#, c-format
-msgid "%s Database"
-msgstr "Base de datos %s"
-
-#: src/data_imports/DataImportsPluginHost.vala:148
-#: src/data_imports/DataImportsPluginHost.vala:294
-#, c-format
-#| msgid "Importing from %s can't continue because an error occurred:"
-msgid "Importing from %s can’t continue because an error occurred:"
-msgstr ""
-"La importación desde %s no puede continuar porque ha ocurrido un error:"
-
-#: src/data_imports/DataImportsPluginHost.vala:151
-msgid "To try importing from another service, select one from the above menu."
-msgstr ""
-"Para intentar importar desde otro servicio, seleccione uno desde el menú "
-"anterior."
-
-#: src/data_imports/DataImportsUI.vala:10
-msgid ""
-"You do not have any data imports plugins enabled.\n"
-"\n"
-"In order to use the Import From Application functionality, you need to have "
-"at least one data imports plugin enabled. Plugins can be enabled in the "
-"Preferences dialog."
-msgstr ""
-"No tiene ningún complemento de importación de datos activado.\n"
-"\n"
-"Para utilizar la función Importar desde aplicación, necesita activar al "
-"menos un complemento de importación. Puede hacerlo en el cuadro de diálogo "
-"Preferencias."
-
-#: src/data_imports/DataImportsUI.vala:100
-msgid "Database file:"
-msgstr "Archivo de base de datos:"
-
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:904
-msgid "_Import"
-msgstr "_Importar"
-
-#: src/data_imports/DataImportsUI.vala:220
-msgid "Import From Application"
-msgstr "Importar desde aplicación"
-
-#: src/data_imports/DataImportsUI.vala:221
-msgid "Import media _from:"
-msgstr "Importar medios _desde:"
-
-#: src/data_imports/DataImportsUI.vala:408
-#: src/publishing/PublishingUI.vala:507
-msgid "_Close"
-msgstr "_Cerrar"
-
-#: src/data_imports/DataImports.vala:22
-msgid "Data Imports"
-msgstr "Importaciones de datos"
-
-#: src/db/DatabaseTable.vala:37
-#, c-format
-msgid "Unable to open/create photo database %s: error code %d"
-msgstr "No se puede abrir/crear base de datos de fotos %s: código de error %d"
-
-#: src/db/DatabaseTable.vala:46
-#, c-format
-msgid ""
-"Unable to write to photo database file:\n"
-" %s"
-msgstr ""
-"No se pudo escribir el archivo de la base de datos de fotos:\n"
-"%s"
-
-#: src/db/DatabaseTable.vala:48
-#, c-format
-msgid ""
-"Error accessing database file:\n"
-" %s\n"
-"\n"
-"Error was: \n"
-"%s"
-msgstr ""
-"Error al acceder al archivo de la base de datos:\n"
-"%s\n"
-"\n"
-"El error fue:\n"
-"%s"
-
-#: src/db/DatabaseTable.vala:92
-#, c-format
-msgid "Unable to restore photo database %s"
-msgstr "No se pudo restaurar la base de datos de fotos %s"
-
-#: src/DesktopIntegration.vala:121
-#, c-format
-msgid "Unable to launch Nautilus Send-To: %s"
-msgstr "No se puede abrir Nautilus Enviar a: %s"
-
-#: src/DesktopIntegration.vala:129
-msgid "Send To"
-msgstr "Enviar a"
-
-#: src/DesktopIntegration.vala:174
-#, c-format
-msgid "Unable to export background to %s: %s"
-msgstr "No se puede exportar el fondo de pantalla a %s: %s"
-
-#: src/DesktopIntegration.vala:311
-#, c-format
-msgid "Unable to prepare desktop slideshow: %s"
-msgstr "No se puede preparar el presentación de diapositivas de escritorio: %s"
-
-#: src/Dialogs.vala:16
-#, c-format
-#| msgid "This will remove the tag \"%s\" from one photo. Continue?"
-#| msgid_plural "This will remove the tag \"%s\" from %d photos. Continue?"
-msgid "This will remove the tag “%s” from one photo. Continue?"
-msgid_plural "This will remove the tag “%s” from %d photos. Continue?"
-msgstr[0] "Esto eliminará la etiqueta «%s» de una foto. ¿Continuar?"
-msgstr[1] "Esto eliminará la etiqueta «%s» de %d fotos. ¿Continuar?"
-
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1409
-#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:414
-#: src/Resources.vala:679
-msgid "_Delete"
-msgstr "_Eliminar"
-
-#: src/Dialogs.vala:25
-#, c-format
-#| msgid "This will remove the saved search \"%s\". Continue?"
-msgid "This will remove the saved search “%s”. Continue?"
-msgstr "Esto quitará la búsqueda guardada «%s». ¿Quiere continuar?"
-
-#: src/Dialogs.vala:36
-msgid ""
-"Switching developers will undo all changes you have made to this photo in "
-"Shotwell"
-msgid_plural ""
-"Switching developers will undo all changes you have made to these photos in "
-"Shotwell"
-msgstr[0] ""
-"Al cambiar de revelador se desharán todos los cambios que realizó a esta "
-"foto en Shotwell"
-msgstr[1] ""
-"Al cambiar de revelador se desharán todos los cambios que realizó a estas "
-"fotos en Shotwell"
-
-#: src/Dialogs.vala:40
-msgid "_Switch Developer"
-msgstr "_Cambiar de revelador"
-
-#: src/Dialogs.vala:59
-msgid "Export Video"
-msgstr "Exportar vídeo"
-
-#. Ticket #3023
-#. Attempt to replace the system error with something friendlier
-#. if we can't copy an image over for editing in an external tool.
-#. Did we fail because we can't write to this directory?
-#. Yes - display an alternate error message here.
-#: src/Dialogs.vala:112
-#, c-format
-#| msgid ""
-#| "Shotwell couldn't create a file for editing this photo because you do not "
-#| "have permission to write to %s."
-msgid ""
-"Shotwell couldn’t create a file for editing this photo because you do not "
-"have permission to write to %s."
-msgstr ""
-"Shotwell no pudo crear un archivo para editar esta foto porque no tiene "
-"permiso para escribir en %s."
-
-#: src/Dialogs.vala:121
-msgid ""
-"Unable to export the following photo due to a file error.\n"
-"\n"
-msgstr "No se puede exportar la siguiente foto debido a un error de archivo.\n"
-
-#: src/Dialogs.vala:127
-msgid ""
-"\n"
-"\n"
-"Would you like to continue exporting?"
-msgstr ""
-"\n"
-"\n"
-"¿Quiere continuar la exportación?"
-
-#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
-#. aren't formats so much as they are operating modes that determine specific formats.
-#. Hereafter we'll refer to these as "special formats."
-#: src/Dialogs.vala:144
-msgid "Unmodified"
-msgstr "Sin modificar"
-
-#: src/Dialogs.vala:145
-msgid "Current"
-msgstr "Actual"
-
-#. layout controls
-#: src/Dialogs.vala:221
-msgid "_Format:"
-msgstr "_Formato:"
-
-#: src/Dialogs.vala:224
-msgid "_Quality:"
-msgstr "_Calidad:"
-
-#: src/Dialogs.vala:227
-msgid "_Scaling constraint:"
-msgstr "Re_stricción de escala:"
-
-#: src/Dialogs.vala:230
-msgid "_Pixels:"
-msgstr "_Píxeles:"
-
-#: src/Dialogs.vala:234
-#| msgid "Export metadata"
-msgid "Export _metadata:"
-msgstr "Exportar metadatos:"
-
-#: src/Dialogs.vala:478
-msgid "Save Details…"
-msgstr "Guardar detalles…"
-
-#: src/Dialogs.vala:479
-msgid "Save Details"
-msgstr "Guardar detalles"
-
-#: src/Dialogs.vala:494
-#, c-format
-msgid "(and %d more)\n"
-msgstr "(y %d más)\n"
-
-#: src/Dialogs.vala:547
-msgid "Import Results Report"
-msgstr "Informe de resultados de importación"
-
-#: src/Dialogs.vala:551
-#, c-format
-msgid "Attempted to import %d file."
-msgid_plural "Attempted to import %d files."
-msgstr[0] "Se intentó importar %d archivo."
-msgstr[1] "Se intentaron importar %d archivos."
-
-#: src/Dialogs.vala:554
-#, c-format
-msgid "Of these, %d file was successfully imported."
-msgid_plural "Of these, %d files were successfully imported."
-msgstr[0] "De ellos, se importó %d archivo correctamente."
-msgstr[1] "De ellos, se importaron %d archivos correctamente."
-
-#.
-#. Duplicates
-#.
-#: src/Dialogs.vala:566
-msgid "Duplicate Photos/Videos Not Imported:"
-msgstr "Fotos/vídeos duplicados no importados:"
-
-#: src/Dialogs.vala:570
-msgid "duplicates existing media item"
-msgstr "duplica el elemento existente"
-
-#.
-#. Files Not Imported Due to Camera Errors
-#.
-#: src/Dialogs.vala:581
-msgid "Photos/Videos Not Imported Due to Camera Errors:"
-msgstr "Fotos/vídeos no importados debido a errores de cámara:"
-
-#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614
-#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659
-msgid "error message:"
-msgstr "mensaje de error:"
-
-#.
-#. Files Not Imported Because They Weren't Recognized as Photos or Videos
-#.
-#: src/Dialogs.vala:595
-#| msgid ""
-#| "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
-msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
-msgstr "Archivos no importados porque no se reconocieron como fotos o vídeos:"
-
-#.
-#. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
-#.
-#: src/Dialogs.vala:610
-#| msgid ""
-#| "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
-#| "Understands:"
-msgid ""
-"Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
-"Understands:"
-msgstr ""
-"Fotos/vídeos no importados porque no estaban en un formato compatible con "
-"Shotwell:"
-
-#.
-#. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
-#.
-#: src/Dialogs.vala:625
-#| msgid ""
-#| "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
-#| "Library:"
-msgid ""
-"Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
-"Library:"
-msgstr ""
-"Fotos/vídeos no importados porque Shotwell no pudo copiarlos a su colección:"
-
-#: src/Dialogs.vala:629
-#, c-format
-#| msgid ""
-#| "couldn't copy %s\n"
-#| "\tto %s"
-msgid ""
-"couldn’t copy %s\n"
-"\tto %s"
-msgstr ""
-"no se pudo copiar %s\n"
-"\ta %s"
-
-#.
-#. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
-#.
-#: src/Dialogs.vala:641
-msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
-msgstr "No se importaron las fotos/vídeos porque los archivos están dañados:"
-
-#.
-#. Photos/Videos Not Imported for Other Reasons
-#.
-#: src/Dialogs.vala:656
-msgid "Photos/Videos Not Imported for Other Reasons:"
-msgstr "Fotos/vídeos no importados por otros motivos:"
-
-#: src/Dialogs.vala:676
-#, c-format
-msgid "1 duplicate photo was not imported:\n"
-msgid_plural "%d duplicate photos were not imported:\n"
-msgstr[0] "No se importó 1 foto duplicada:\r\n"
-msgstr[1] "No se importaron %d fotos duplicadas:\r\n"
-
-#: src/Dialogs.vala:679
-#, c-format
-msgid "1 duplicate video was not imported:\n"
-msgid_plural "%d duplicate videos were not imported:\n"
-msgstr[0] "No se importó 1 vídeo duplicado:\r\n"
-msgstr[1] "No se importaron %d vídeos duplicados:\r\n"
-
-#: src/Dialogs.vala:682
-#, c-format
-msgid "1 duplicate photo/video was not imported:\n"
-msgid_plural "%d duplicate photos/videos were not imported:\n"
-msgstr[0] "No se importó 1 foto/vídeo duplicado:\r\n"
-msgstr[1] "No se importaron %d fotos/vídeos duplicados:\r\n"
-
-#: src/Dialogs.vala:696
-#, c-format
-msgid "1 photo failed to import due to a file or hardware error:\n"
-msgid_plural "%d photos failed to import due to a file or hardware error:\n"
-msgstr[0] ""
-"Falló al importar 1 foto debido a un error del archivo o de hardware:\n"
-msgstr[1] ""
-"Falló al importar %d fotos debido a un error del archivo o de hardware:\n"
-
-#: src/Dialogs.vala:699
-#, c-format
-msgid "1 video failed to import due to a file or hardware error:\n"
-msgid_plural "%d videos failed to import due to a file or hardware error:\n"
-msgstr[0] ""
-"Falló al importar 1 vídeo debido a un error del archivo o de hardware:\r\n"
-msgstr[1] ""
-"Falló al importar %d vídeos debido a un error del archivo o de hardware:\r\n"
-
-#: src/Dialogs.vala:702
-#, c-format
-msgid "1 photo/video failed to import due to a file or hardware error:\n"
-msgid_plural ""
-"%d photos/videos failed to import due to a file or hardware error:\n"
-msgstr[0] ""
-"Falló al importar 1 foto/vídeo debido a un error del archivo o de hardware:"
-"\r\n"
-msgstr[1] ""
-"Falló al importar %d fotos/vídeos debido a un error del archivo o de "
-"hardware:\r\n"
-
-#: src/Dialogs.vala:705
-#, c-format
-msgid "1 file failed to import due to a file or hardware error:\n"
-msgid_plural "%d files failed to import due to a file or hardware error:\n"
-msgstr[0] ""
-"Falló al importar 1 archivo debido a un error del archivo o de hardware:\n"
-msgstr[1] ""
-"Falló al importar %d archivos debido a un error de archivo o de hardware:\n"
-
-#: src/Dialogs.vala:719
-#, c-format
-msgid ""
-"1 photo failed to import because the photo library folder was not writable:\n"
-msgid_plural ""
-"%d photos failed to import because the photo library folder was not "
-"writable:\n"
-msgstr[0] ""
-"Falló al importar 1 foto porque la carpeta de la colección de fotos no se "
-"puede escribir:\n"
-msgstr[1] ""
-"Falló al importar %d fotos porque la carpeta de la colección de fotos no se "
-"puede escribir:\n"
-
-#: src/Dialogs.vala:722
-#, c-format
-msgid ""
-"1 video failed to import because the photo library folder was not writable:\n"
-msgid_plural ""
-"%d videos failed to import because the photo library folder was not "
-"writable:\n"
-msgstr[0] ""
-"Falló al importar 1 foto porque la carpeta de la colección de fotos no se "
-"puede escribir:\n"
-msgstr[1] ""
-"Falló al importar %d fotos porque la carpeta de la colección de fotos no se "
-"puede escribir:\n"
-
-#: src/Dialogs.vala:725
-#, c-format
-msgid ""
-"1 photo/video failed to import because the photo library folder was not "
-"writable:\n"
-msgid_plural ""
-"%d photos/videos failed to import because the photo library folder was not "
-"writable:\n"
-msgstr[0] ""
-"Falló al importar 1 foto/vídeo porque la carpeta de la colección de fotos no "
-"se puede escribir:\n"
-msgstr[1] ""
-"Falló al importar %d fotos/vídeos porque la carpeta de la colección de fotos "
-"no se puede escribir:\n"
-
-#: src/Dialogs.vala:728
-#, c-format
-msgid ""
-"1 file failed to import because the photo library folder was not writable:\n"
-msgid_plural ""
-"%d files failed to import because the photo library folder was not "
-"writable:\n"
-msgstr[0] ""
-"Falló la importación de 1 archivo porque no se puede escribir en la "
-"colección de fotos:\n"
-msgstr[1] ""
-"Falló la importación de %d archivos porque no se puede escribir en la "
-"colección de fotos:\n"
-
-#: src/Dialogs.vala:742
-#, c-format
-msgid "1 photo failed to import due to a camera error:\n"
-msgid_plural "%d photos failed to import due to a camera error:\n"
-msgstr[0] "Falló al importar 1 foto/vídeo debido a un error de la cámara:\n"
-msgstr[1] "Falló al importar %d fotos debido a un error de la cámara:\n"
-
-#: src/Dialogs.vala:745
-#, c-format
-msgid "1 video failed to import due to a camera error:\n"
-msgid_plural "%d videos failed to import due to a camera error:\n"
-msgstr[0] "Falló al importar 1 foto/vídeo debido a un error de la cámara:\n"
-msgstr[1] "Falló al importar %d vídeos debido a un error de la cámara:\n"
-
-#: src/Dialogs.vala:748
-#, c-format
-msgid "1 photo/video failed to import due to a camera error:\n"
-msgid_plural "%d photos/videos failed to import due to a camera error:\n"
-msgstr[0] "Falló al importar 1 foto/vídeo debido a un error de la cámara:\n"
-msgstr[1] "Falló al importar %d foto/vídeo debido a un error de la cámara:\n"
-
-#: src/Dialogs.vala:751
-#, c-format
-msgid "1 file failed to import due to a camera error:\n"
-msgid_plural "%d files failed to import due to a camera error:\n"
-msgstr[0] "Falló al importar 1 archivo debido a un error de la cámara: \n"
-msgstr[1] "Falló al importar %d archivor debido a un error de la cámara: \n"
-
-#: src/Dialogs.vala:765
-#, c-format
-msgid "1 photo failed to import because it was corrupt:\n"
-msgid_plural "%d photos failed to import because they were corrupt:\n"
-msgstr[0] "No se pudo importar una foto porque está dañada:\n"
-msgstr[1] "No se pudieron importar %d fotos porque están dañadas:\n"
-
-#: src/Dialogs.vala:768
-#, c-format
-msgid "1 video failed to import because it was corrupt:\n"
-msgid_plural "%d videos failed to import because they were corrupt:\n"
-msgstr[0] "No se pudo importar un vídeo porque está dañado:\n"
-msgstr[1] "No se pudieron importar %d vídeos porque están dañados:\n"
-
-#: src/Dialogs.vala:771
-#, c-format
-msgid "1 photo/video failed to import because it was corrupt:\n"
-msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
-msgstr[0] "No se pudo importar 1 foto/vídeo porque está dañado:\n"
-msgstr[1] "No se pudieron importar %d fotos/vídeos porque están dañados:\n"
-
-#: src/Dialogs.vala:774
-#, c-format
-msgid "1 file failed to import because it was corrupt:\n"
-msgid_plural "%d files failed to import because it was corrupt:\n"
-msgstr[0] "No se pudo importar un archivo porque está dañado:\n"
-msgstr[1] "No se pudieron importar %d archivos porque están dañados:\n"
-
-#. we have no notion of "unsupported" video files right now in Shotwell (all
-#. standard container formats are supported, it's just that the streams in them
-#. might or might not be interpretable), so this message does not need to be
-#. media specific
-#: src/Dialogs.vala:791
-#, c-format
-msgid "1 unsupported photo skipped:\n"
-msgid_plural "%d unsupported photos skipped:\n"
-msgstr[0] "Se omitió 1 foto no compatible:\n"
-msgstr[1] "Se omitieron %d fotos no compatibles:\n"
-
-#. we have no notion of "non-video" video files right now in Shotwell, so this
-#. message doesn't need to be media specific
-#: src/Dialogs.vala:806
-#, c-format
-msgid "1 non-image file skipped.\n"
-msgid_plural "%d non-image files skipped.\n"
-msgstr[0] "Se omitió 1 archivo que no era una imagen.\n"
-msgstr[1] "Se omitieron %d archivos que no eran imágenes.\n"
-
-#: src/Dialogs.vala:817
-#, c-format
-msgid "1 photo skipped due to user cancel:\n"
-msgid_plural "%d photos skipped due to user cancel:\n"
-msgstr[0] "Se omitió 1 foto debido a la cancelación del usuario:\n"
-msgstr[1] "Se omitieron %d fotos debido a la cancelación del usuario:\n"
-
-#: src/Dialogs.vala:820
-#, c-format
-msgid "1 video skipped due to user cancel:\n"
-msgid_plural "%d videos skipped due to user cancel:\n"
-msgstr[0] "Se omitió 1 vídeo debido a la cancelación del usuario:\n"
-msgstr[1] "Se omitieron %d vídeos debido a la cancelación del usuario:\n"
-
-#: src/Dialogs.vala:823
-#, c-format
-msgid "1 photo/video skipped due to user cancel:\n"
-msgid_plural "%d photos/videos skipped due to user cancel:\n"
-msgstr[0] "Se omitió 1 foto/vídeo debido a la cancelación del usuario:\n"
-msgstr[1] "Se omitieron %d fotos/vídeos debido a la cancelación del usuario:\n"
-
-#: src/Dialogs.vala:826
-#, c-format
-msgid "1 file skipped due to user cancel:\n"
-msgid_plural "%d file skipped due to user cancel:\n"
-msgstr[0] "Se omitió 1 archivo debido a la cancelación del usuario:\n"
-msgstr[1] "Se omitieron %d archivos debido a la cancelación del usuario:\n"
-
-#: src/Dialogs.vala:840
-#, c-format
-msgid "1 photo successfully imported.\n"
-msgid_plural "%d photos successfully imported.\n"
-msgstr[0] "1 foto correctamente importada.\n"
-msgstr[1] "%d fotos importadas correctamente.\n"
-
-#: src/Dialogs.vala:843
-#, c-format
-msgid "1 video successfully imported.\n"
-msgid_plural "%d videos successfully imported.\n"
-msgstr[0] "1 vídeo correctamente importado.\n"
-msgstr[1] "%d vídeos importados correctamente.\n"
-
-#: src/Dialogs.vala:846
-#, c-format
-msgid "1 photo/video successfully imported.\n"
-msgid_plural "%d photos/videos successfully imported.\n"
-msgstr[0] "1 foto/vídeo correctamente importado.\n"
-msgstr[1] "%d fotos/vídeos importados correctamente.\n"
-
-#. if no media items were imported at all (i.e. an empty directory attempted), need to at least
-#. report that nothing was imported
-#: src/Dialogs.vala:862
-msgid "No photos or videos imported.\n"
-msgstr "No se importó ninguna foto o vídeo.\n"
-
-#: src/Dialogs.vala:869 src/Dialogs.vala:888
-msgid "Import Complete"
-msgstr "Importación completa"
-
-#: src/Dialogs.vala:1174
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d segundo"
-msgstr[1] "%d segundos"
-
-#: src/Dialogs.vala:1177
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minuto"
-msgstr[1] "%d minutos"
-
-#: src/Dialogs.vala:1181
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hora"
-msgstr[1] "%d horas"
-
-#: src/Dialogs.vala:1184
-msgid "1 day"
-msgstr "1 día"
-
-#: src/Dialogs.vala:1338 src/Resources.vala:231
-msgid "Rename Event"
-msgstr "Renombrar evento"
-
-#: src/Dialogs.vala:1338
-msgid "Name:"
-msgstr "Nombre:"
-
-#. Dialog title
-#: src/Dialogs.vala:1349
-msgctxt "Dialog Title"
-msgid "Edit Title"
-msgstr "Editar título"
-
-#: src/Dialogs.vala:1350 src/Properties.vala:340
-msgid "Title:"
-msgstr "Título:"
-
-#. Dialog title
-#: src/Dialogs.vala:1366 src/Resources.vala:307
-msgid "Edit Event Comment"
-msgstr "Editar comentario de evento"
-
-#: src/Dialogs.vala:1367
-msgid "Edit Photo/Video Comment"
-msgstr "Editar comentario de foto/vídeo"
-
-#: src/Dialogs.vala:1368 src/Properties.vala:628
-msgid "Comment:"
-msgstr "Comentario:"
-
-#: src/Dialogs.vala:1384
-msgid "Remove and _Trash File"
-msgid_plural "Remove and _Trash Files"
-msgstr[0] "Eliminar archivo y mover a la _papelera"
-msgstr[1] "Eliminar archivos y mover a la _papelera"
-
-#: src/Dialogs.vala:1388
-msgid "_Remove From Library"
-msgstr "_Quitar de la colección"
-
-#: src/Dialogs.vala:1431
-msgid "Revert External Edit?"
-msgstr "¿Revertir las ediciones externas?"
-
-#: src/Dialogs.vala:1431
-msgid "Revert External Edits?"
-msgstr "¿Revertir ediciones externas?"
-
-#: src/Dialogs.vala:1433
-#, c-format
-#| msgid "This will destroy all changes made to the external file. Continue?"
-#| msgid_plural ""
-#| "This will destroy all changes made to %d external files. Continue?"
-msgid "This will destroy all changes made to the external file. Continue?"
-msgid_plural ""
-"This will destroy all changes made to %d external files. Continue?"
-msgstr[0] ""
-"Esto destruirá todos los cambios realizados en el archivo externo. "
-"¿Continuar?"
-msgstr[1] ""
-"Esto destruirá todos los cambios realizados en los %d archivos externos. "
-"¿Continuar?"
-
-#: src/Dialogs.vala:1437
-msgid "Re_vert External Edit"
-msgstr "Re_vertir edición externa"
-
-#: src/Dialogs.vala:1437
-msgid "Re_vert External Edits"
-msgstr "Re_vertir ediciones externas"
-
-#: src/Dialogs.vala:1458
-#, c-format
-#| msgid "This will remove the photo from the library. Continue?"
-#| msgid_plural "This will remove %d photos from the library. Continue?"
-msgid "This will remove the photo from the library. Continue?"
-msgid_plural "This will remove %d photos from the library. Continue?"
-msgstr[0] "Esto quitará la foto de la colección. ¿Continuar?"
-msgstr[1] "Esto quitará las %d fotos de la colección. ¿Continuar?"
-
-#: src/Dialogs.vala:1465 src/Resources.vala:173
-msgid "_Remove"
-msgstr "_Quitar"
-
-#: src/Dialogs.vala:1466
-msgid "Remove Photo From Library"
-msgstr "Quitar la foto de la colección"
-
-#: src/Dialogs.vala:1466
-msgid "Remove Photos From Library"
-msgstr "Quitar fotos de la colección"
-
-#: src/Dialogs.vala:1559
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/Dialogs.vala:1713
-msgid "AM"
-msgstr "a.m."
-
-#: src/Dialogs.vala:1714
-msgid "PM"
-msgstr "p.m."
-
-#: src/Dialogs.vala:1715
-msgid "24 Hr"
-msgstr "24 hrs."
-
-#: src/Dialogs.vala:1730
-msgid "_Shift photos/videos by the same amount"
-msgstr "_Desplazar todas las fotos y/o vídeos la misma cantidad"
-
-#: src/Dialogs.vala:1735
-msgid "Set _all photos/videos to this time"
-msgstr "Ajustar _todas las fotos y/o vídeos a esta hora"
-
-#: src/Dialogs.vala:1742
-msgid "_Modify original photo file"
-msgstr "_Modificar archivo de foto original"
-
-#: src/Dialogs.vala:1742
-msgid "_Modify original photo files"
-msgstr ":Modificar archivos de fotos originales"
-
-#: src/Dialogs.vala:1745
-msgid "_Modify original file"
-msgstr "_Modificar archivos originales"
-
-#: src/Dialogs.vala:1745
-msgid "_Modify original files"
-msgstr "_Modificar archivos originales"
-
-#: src/Dialogs.vala:1831
-msgid "Original: "
-msgstr "Original:"
-
-#: src/Dialogs.vala:1832
-msgid "%m/%d/%Y, %H:%M:%S"
-msgstr "%d/%m/%Y, %H:%M:%S"
-
-#: src/Dialogs.vala:1833
-msgid "%m/%d/%Y, %I:%M:%S %p"
-msgstr "%d/%m/%Y, %H:%M:%S %p"
-
-#: src/Dialogs.vala:1922
-#, c-format
-msgid ""
-"Exposure time will be shifted forward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"El tiempo de exposición se adelantará por\n"
-"%d %s, %d %s, %d %s, y %d %s."
-
-#: src/Dialogs.vala:1923
-#, c-format
-msgid ""
-"Exposure time will be shifted backward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"El tiempo de exposición se atrasará por\n"
-"%d %s, %d %s, %d %s, y %d %s."
-
-#: src/Dialogs.vala:1925
-msgid "day"
-msgid_plural "days"
-msgstr[0] "día"
-msgstr[1] "días"
-
-#: src/Dialogs.vala:1926
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "hora"
-msgstr[1] "horas"
-
-#: src/Dialogs.vala:1927
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minuto"
-msgstr[1] "minutos"
-
-#: src/Dialogs.vala:1928
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "segundo"
-msgstr[1] "segundos"
-
-#: src/Dialogs.vala:1972
-#, c-format
-msgid ""
-"\n"
-"\n"
-"And %d other."
-msgid_plural ""
-"\n"
-"\n"
-"And %d others."
-msgstr[0] ""
-"\n"
-"\n"
-"Y %d más."
-msgstr[1] ""
-"\n"
-"\n"
-"Y %d más."
-
-#: src/Dialogs.vala:1996 src/Dialogs.vala:2023
-msgid "Tags (separated by commas):"
-msgstr "Etiquetas (separadas por comas):"
-
-#: src/Dialogs.vala:2103
-msgid "Welcome!"
-msgstr "Bienvenido/a"
-
-#: src/Dialogs.vala:2110
-msgid "Welcome to Shotwell!"
-msgstr "Bienvenido/a a Shotwell."
-
-#: src/Dialogs.vala:2114
-msgid "To get started, import photos in any of these ways:"
-msgstr "Para comenzar, importe fotos de cualquiera de las siguientes formas:"
-
-#: src/Dialogs.vala:2133
-#, c-format
-msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
-msgstr "Elija <span weight=\"bold\">Archivo %s Importar desde carpeta</span>"
-
-#: src/Dialogs.vala:2134
-msgid "Drag and drop photos onto the Shotwell window"
-msgstr "Arrastre y suelte fotos en la ventana de Shotwell"
-
-#: src/Dialogs.vala:2135
-msgid "Connect a camera to your computer and import"
-msgstr "Conecte una cámara al equipo e importe"
-
-#: src/Dialogs.vala:2145
-#, c-format
-msgid "_Import photos from your %s folder"
-msgstr "_Importar fotos desde su carpeta %s"
-
-#: src/Dialogs.vala:2152
-msgid "You can also import photos in any of these ways:"
-msgstr "También puede importar fotos en cualquiera de estas formas:"
-
-#: src/Dialogs.vala:2162
-#| msgid "_Don't show this message again"
-msgid "_Don’t show this message again"
-msgstr "_No mostrar este mensaje de nuevo"
-
-#: src/Dialogs.vala:2197
-#, c-format
-msgid "Import photos from your %s library"
-msgstr "Importar fotos desde su colección %s"
-
-#. We're installed system-wide, so use the system help.
-#. We're being run from the build directory; we'll have to handle clicks to this
-#. link manually ourselves, due to a limitation of help: URIs.
-#: src/Dialogs.vala:2344 src/Dialogs.vala:2348
-msgid "(Help)"
-msgstr "(Ayuda)"
-
-#: src/Dialogs.vala:2357
-#, c-format
-msgid "Year%sMonth%sDay"
-msgstr "Año%sMes%sDía"
-
-#: src/Dialogs.vala:2359
-#, c-format
-msgid "Year%sMonth"
-msgstr "Año%sMes"
-
-#: src/Dialogs.vala:2361
-#, c-format
-msgid "Year%sMonth-Day"
-msgstr "Año%sMes-Día"
-
-#: src/Dialogs.vala:2363
-msgid "Year-Month-Day"
-msgstr "Año-Mes-Día"
-
-#: src/Dialogs.vala:2364 src/editing_tools/EditingTools.vala:781
-msgid "Custom"
-msgstr "Personalizado"
-
-#. Invalid pattern.
-#: src/Dialogs.vala:2601
-msgid "Invalid pattern"
-msgstr "Patrón no válido"
-
-#. This function is used to determine whether or not files should be copied or linked when imported.
-#. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: src/Dialogs.vala:2703
-msgid ""
-"Shotwell can copy the photos into your library folder or it can import them "
-"without copying."
-msgstr ""
-"Shotwell puede copiar las fotos en su colección o puede importarlas sin "
-"copiarlas."
-
-#: src/Dialogs.vala:2708
-msgid "Co_py Photos"
-msgstr "C_opiar fotos"
-
-#: src/Dialogs.vala:2709
-msgid "_Import in Place"
-msgstr "_Importar en el lugar"
-
-#: src/Dialogs.vala:2710
-msgid "Import to Library"
-msgstr "Importar a la colección"
-
-#: src/Dialogs.vala:2720 src/PhotoPage.vala:3085
-msgid "Remove From Library"
-msgstr "Quitar de la colección"
-
-#: src/Dialogs.vala:2721 src/PhotoPage.vala:3085
-msgid "Removing Photo From Library"
-msgstr "Quitando la foto de la colección"
-
-#: src/Dialogs.vala:2721
-msgid "Removing Photos From Library"
-msgstr "Quitando fotos de la colección"
-
-#: src/Dialogs.vala:2735
-#, c-format
-#| msgid ""
-#| "This will remove the photo/video from your Shotwell library. Would you "
-#| "also like to move the file to your desktop trash?\n"
-#| "\n"
-#| "This action cannot be undone."
-#| msgid_plural ""
-#| "This will remove %d photos/videos from your Shotwell library. Would you "
-#| "also like to move the files to your desktop trash?\n"
-#| "\n"
-#| "This action cannot be undone."
-msgid ""
-"This will remove the photo/video from your Shotwell library. Would you also "
-"like to move the file to your desktop trash?\n"
-"\n"
-"This action cannot be undone."
-msgid_plural ""
-"This will remove %d photos/videos from your Shotwell library. Would you also "
-"like to move the files to your desktop trash?\n"
-"\n"
-"This action cannot be undone."
-msgstr[0] ""
-"Esto quitará la foto y/o el vídeo de su colección de Shotwell. ¿Le gustaría "
-"mover el archivo a la papelera del escritorio?\n"
-"\n"
-"Esta acción no se puede deshacer."
-msgstr[1] ""
-"Esto quitará %d fotos y/o vídeos de su colección de Shotwell. ¿Le gustaría "
-"mover los archivos a la papelera del escritorio?\n"
-"\n"
-"Esta acción no se puede deshacer."
-
-#: src/Dialogs.vala:2739
-#, c-format
-#| msgid ""
-#| "This will remove the video from your Shotwell library. Would you also "
-#| "like to move the file to your desktop trash?\n"
-#| "\n"
-#| "This action cannot be undone."
-#| msgid_plural ""
-#| "This will remove %d videos from your Shotwell library. Would you also "
-#| "like to move the files to your desktop trash?\n"
-#| "\n"
-#| "This action cannot be undone."
-msgid ""
-"This will remove the video from your Shotwell library. Would you also like "
-"to move the file to your desktop trash?\n"
-"\n"
-"This action cannot be undone."
-msgid_plural ""
-"This will remove %d videos from your Shotwell library. Would you also like "
-"to move the files to your desktop trash?\n"
-"\n"
-"This action cannot be undone."
-msgstr[0] ""
-"Esto quitará el vídeo de su colección de Shotwell. ¿Le gustaría mover el "
-"archivo a la papelera del escritorio?\n"
-"\n"
-"Esta acción no se puede deshacer."
-msgstr[1] ""
-"Esto quitará los %d vídeos de su colección de Shotwell. ¿Le gustaría mover "
-"los archivos a la papelera del escritorio?\n"
-"\n"
-"Esta acción no se puede deshacer."
-
-#: src/Dialogs.vala:2743
-#, c-format
-#| msgid ""
-#| "This will remove the photo from your Shotwell library. Would you also "
-#| "like to move the file to your desktop trash?\n"
-#| "\n"
-#| "This action cannot be undone."
-#| msgid_plural ""
-#| "This will remove %d photos from your Shotwell library. Would you also "
-#| "like to move the files to your desktop trash?\n"
-#| "\n"
-#| "This action cannot be undone."
-msgid ""
-"This will remove the photo from your Shotwell library. Would you also like "
-"to move the file to your desktop trash?\n"
-"\n"
-"This action cannot be undone."
-msgid_plural ""
-"This will remove %d photos from your Shotwell library. Would you also like "
-"to move the files to your desktop trash?\n"
-"\n"
-"This action cannot be undone."
-msgstr[0] ""
-"Esto quitará la foto de su colección de Shotwell. ¿Le gustaría mover el "
-"archivo a la papelera del escritorio?\n"
-"\n"
-"Esta acción no se puede deshacer."
-msgstr[1] ""
-"Esto quitará %d fotos de su colección de Shotwell. ¿Le gustaría mover los "
-"archivos a la papelera del escritorio?\n"
-"\n"
-"Esta acción no se puede deshacer."
-
-#: src/Dialogs.vala:2775
-#, c-format
-#| msgid ""
-#| "The photo or video cannot be moved to your desktop trash. Delete this "
-#| "file?"
-#| msgid_plural ""
-#| "%d photos/videos cannot be moved to your desktop trash. Delete these "
-#| "files?"
-msgid ""
-"The photo or video cannot be moved to your desktop trash. Delete this file?"
-msgid_plural ""
-"%d photos/videos cannot be moved to your desktop trash. Delete these files?"
-msgstr[0] ""
-"No se puede mover la foto o el vídeo a la papelera de su escritorio. "
-"¿Eliminar este archivo?"
-msgstr[1] ""
-"No se pueden mover las %d fotos o vídeos a la papelera de su escritorio. "
-"¿Eliminar estos archivos?"
-
-#. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2792
-#, c-format
-msgid "The photo or video cannot be deleted."
-msgid_plural "%d photos/videos cannot be deleted."
-msgstr[0] "No se puede eliminar la foto o el vídeo."
-msgstr[1] "No se pueden eliminar las %d fotos o vídeos."
-
-#: src/Dimensions.vala:23
-msgid "Width"
-msgstr "Anchura"
-
-#: src/Dimensions.vala:26
-msgid "Height"
-msgstr "Altura"
-
-#: src/direct/DirectPhotoPage.vala:46 src/library/LibraryWindow.vala:335
-msgid "_File"
-msgstr "_Archivo"
-
-#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:432
-#: src/Resources.vala:175
-msgid "_Save"
-msgstr "_Guardar"
-
-#: src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Guardar la foto"
-
-#: src/direct/DirectPhotoPage.vala:57
-msgid "Save _As…"
-msgstr "Guardar _como…"
-
-#: src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Guardar la foto con un nombre diferente"
-
-#: src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "Imprimir la foto en una impresora conectada a su equipo"
-
-#: src/direct/DirectPhotoPage.vala:73 src/library/LibraryWindow.vala:339
-#: src/Resources.vala:159
-msgid "_Edit"
-msgstr "_Editar"
-
-#: src/direct/DirectPhotoPage.vala:77 src/library/LibraryWindow.vala:347
-msgid "_Photo"
-msgstr "_Foto"
-
-#: src/direct/DirectPhotoPage.vala:81 src/PhotoPage.vala:2416
-msgid "T_ools"
-msgstr "_Herramientas"
-
-#: src/direct/DirectPhotoPage.vala:86 src/PhotoPage.vala:2421
-msgid "_Previous Photo"
-msgstr "Foto _anterior"
-
-#: src/direct/DirectPhotoPage.vala:87 src/PhotoPage.vala:2422
-msgid "Previous Photo"
-msgstr "Foto anterior"
-
-#: src/direct/DirectPhotoPage.vala:92 src/PhotoPage.vala:2427
-msgid "_Next Photo"
-msgstr "_Siguiente foto"
-
-#: src/direct/DirectPhotoPage.vala:93 src/PhotoPage.vala:2428
-msgid "Next Photo"
-msgstr "Siguiente foto"
-
-#: src/direct/DirectPhotoPage.vala:165 src/library/LibraryWindow.vala:343
-#: src/PhotoPage.vala:2412
-msgid "_View"
-msgstr "_Ver"
-
-#: src/direct/DirectPhotoPage.vala:169 src/library/LibraryWindow.vala:363
-#: src/Resources.vala:162
-msgid "_Help"
-msgstr "Ay_uda"
-
-#: src/direct/DirectPhotoPage.vala:174 src/MediaPage.vala:340
-#: src/PhotoPage.vala:2591 src/Resources.vala:183
-msgid "Zoom _In"
-msgstr "_Ampliar"
-
-#: src/direct/DirectPhotoPage.vala:175 src/PhotoPage.vala:2592
-msgid "Increase the magnification of the photo"
-msgstr "Aumentar la ampliación de la foto"
-
-#: src/direct/DirectPhotoPage.vala:180 src/MediaPage.vala:346
-#: src/PhotoPage.vala:2597 src/Resources.vala:184
-msgid "Zoom _Out"
-msgstr "Re_ducir"
-
-#: src/direct/DirectPhotoPage.vala:181 src/PhotoPage.vala:2598
-msgid "Decrease the magnification of the photo"
-msgstr "Reducir la ampliación de la foto"
-
-#: src/direct/DirectPhotoPage.vala:186 src/PhotoPage.vala:2603
-msgid "Fit to _Page"
-msgstr "Aj_ustar a la página"
-
-#: src/direct/DirectPhotoPage.vala:187 src/PhotoPage.vala:2604
-msgid "Zoom the photo to fit on the screen"
-msgstr "Aumentar la foto hasta ajustar a la pantalla"
-
-#: src/direct/DirectPhotoPage.vala:193 src/PhotoPage.vala:2610
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "Ampliar al _100%"
-
-#: src/direct/DirectPhotoPage.vala:195 src/PhotoPage.vala:2612
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr "Ampliar la foto al 100%"
-
-#: src/direct/DirectPhotoPage.vala:201 src/PhotoPage.vala:2618
-#, no-c-format
-msgid "Zoom _200%"
-msgstr "Ampliar al _200%"
-
-#: src/direct/DirectPhotoPage.vala:203 src/PhotoPage.vala:2620
-#, no-c-format
-msgid "Zoom the photo to 200% magnification"
-msgstr "Ampliar la foto al 200%"
-
-#: src/direct/DirectPhotoPage.vala:227
-#, c-format
-msgid "%s does not exist."
-msgstr "%s no existe."
-
-#: src/direct/DirectPhotoPage.vala:229
-#, c-format
-msgid "%s is not a file."
-msgstr "%s no es un archivo."
-
-#: src/direct/DirectPhotoPage.vala:231
-#, c-format
-msgid ""
-"%s does not support the file format of\n"
-"%s."
-msgstr ""
-"%s no es compatible con el formato de archivo de\n"
-"%s."
-
-#: src/direct/DirectPhotoPage.vala:248
-#, c-format
-msgid "Unable open photo %s. Sorry."
-msgstr "No se puede abrir la foto %s."
-
-#: src/direct/DirectPhotoPage.vala:432
-msgid "_Save a Copy"
-msgstr "_Guardar una copia"
-
-#: src/direct/DirectPhotoPage.vala:435
-#, c-format
-msgid "Lose changes to %s?"
-msgstr "¿Quiere descartar los cambios a %s?"
-
-#: src/direct/DirectPhotoPage.vala:436
-msgid "Close _without Saving"
-msgstr "Cerrar _sin guardar"
-
-#: src/direct/DirectPhotoPage.vala:469
-#, c-format
-msgid "Error while saving to %s: %s"
-msgstr "Error al guardar en %s: %s"
-
-#: src/direct/DirectPhotoPage.vala:497 src/direct/DirectPhotoPage.vala:518
-msgid "Save As"
-msgstr "Guardar como"
-
-#. verify this is a directory
-#: src/DirectoryMonitor.vala:889
-#, c-format
-msgid "Unable to monitor %s: Not a directory (%s)"
-msgstr "No se puede monitorizar %s: No es un directorio (%s)"
-
-#: src/editing_tools/EditingTools.vala:665
-msgid "Return to current photo dimensions"
-msgstr "Volver a las dimensiones actuales de la foto"
-
-#: src/editing_tools/EditingTools.vala:668
-msgid "Set the crop for this photo"
-msgstr "Establecer el corte para esta foto"
-
-#: src/editing_tools/EditingTools.vala:680
-msgid "Pivot the crop rectangle between portrait and landscape orientations"
-msgstr ""
-"Girar el rectángulo de corte entre las orientaciones vertical y horizontal"
-
-#: src/editing_tools/EditingTools.vala:753
-msgid "Unconstrained"
-msgstr "Sin restricciones"
-
-#: src/editing_tools/EditingTools.vala:754
-msgid "Square"
-msgstr "Cuadrado"
-
-#: src/editing_tools/EditingTools.vala:755
-msgid "Screen"
-msgstr "Pantalla"
-
-#: src/editing_tools/EditingTools.vala:757
-#: src/editing_tools/EditingTools.vala:760
-#: src/editing_tools/EditingTools.vala:770
-#: src/editing_tools/EditingTools.vala:780
-msgid "-"
-msgstr "-"
-
-#: src/editing_tools/EditingTools.vala:758
-#| msgid "SD Video (4 : 3)"
-msgid "SD Video (4 ∶ 3)"
-msgstr "Vídeo SD (4:3)"
-
-#: src/editing_tools/EditingTools.vala:759
-#| msgid "HD Video (16 : 9)"
-msgid "HD Video (16 ∶ 9)"
-msgstr "Vídeo HD (16:9)"
-
-#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:818
-#| msgid "Wallet (2 x 3 in.)"
-msgid "Wallet (2 × 3 in.)"
-msgstr "Cartera (2 × 3 pulg.)"
-
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:821
-#| msgid "Notecard (3 x 5 in.)"
-msgid "Notecard (3 × 5 in.)"
-msgstr "Tarjeta de notas (3 × 5 pulg.)"
-
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:824
-#| msgid "4 x 6 in."
-msgid "4 × 6 in."
-msgstr "4 × 6 pulg."
-
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:827
-#| msgid "5 x 7 in."
-msgid "5 × 7 in."
-msgstr "5 × 7 pulg."
-
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:830
-#| msgid "8 x 10 in."
-msgid "8 × 10 in."
-msgstr "8 × 10 pulg."
-
-#: src/editing_tools/EditingTools.vala:766
-#| msgid "Letter (8.5 x 11 in.)"
-msgid "Letter (8.5 × 11 in.)"
-msgstr "Carta (8.5 × 11 pulg.)"
-
-#: src/editing_tools/EditingTools.vala:767 src/Printing.vala:833
-#| msgid "11 x 14 in."
-msgid "11 × 14 in."
-msgstr "11 × 14 pulg."
-
-#: src/editing_tools/EditingTools.vala:768
-#| msgid "Tabloid (11 x 17 in.)"
-msgid "Tabloid (11 × 17 in.)"
-msgstr "Tabloide (11 × 17 pulg.)"
-
-#: src/editing_tools/EditingTools.vala:769 src/Printing.vala:836
-#| msgid "16 x 20 in."
-msgid "16 × 20 in."
-msgstr "16 × 20 pulg."
-
-#: src/editing_tools/EditingTools.vala:771 src/Printing.vala:842
-#| msgid "Metric Wallet (9 x 13 cm)"
-msgid "Metric Wallet (9 × 13 cm)"
-msgstr "Cartera métrica (9 × 13 cm)"
-
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:845
-#| msgid "Postcard (10 x 15 cm)"
-msgid "Postcard (10 × 15 cm)"
-msgstr "Tarjeta postal (10 × 15 cm)"
-
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:848
-#| msgid "13 x 18 cm"
-msgid "13 × 18 cm"
-msgstr "13 × 18 cm"
-
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:851
-#| msgid "18 x 24 cm"
-msgid "18 × 24 cm"
-msgstr "18 × 24 cm"
-
-#: src/editing_tools/EditingTools.vala:775
-#| msgid "A4 (210 x 297 mm)"
-msgid "A4 (210 × 297 mm)"
-msgstr "A4 (210 × 297 mm)"
-
-#: src/editing_tools/EditingTools.vala:776 src/Printing.vala:854
-#| msgid "20 x 30 cm"
-msgid "20 × 30 cm"
-msgstr "20 × 30 cm"
-
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:857
-#| msgid "24 x 40 cm"
-msgid "24 × 40 cm"
-msgstr "24 × 40 cm"
-
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:860
-#| msgid "30 x 40 cm"
-msgid "30 × 40 cm"
-msgstr "30 × 40 cm"
-
-#: src/editing_tools/EditingTools.vala:779
-#| msgid "A3 (297 x 420 mm)"
-msgid "A3 (297 × 420 mm)"
-msgstr "A3 (297 × 420 mm)"
-
-#: src/editing_tools/EditingTools.vala:1872 src/Properties.vala:395
-msgid "Size:"
-msgstr "Tamaño:"
-
-#: src/editing_tools/EditingTools.vala:1887
-msgid "Close the red-eye tool"
-msgstr "Cerrar la herramienta de ojos rojos"
-
-#: src/editing_tools/EditingTools.vala:1890
-msgid "Remove any red-eye effects in the selected region"
-msgstr "Quitar cualquier efecto de ojos rojos en la región seleccionada"
-
-#: src/editing_tools/EditingTools.vala:2229
-#: src/editing_tools/StraightenTool.vala:102
-msgid "_Reset"
-msgstr "_Restablecer"
-
-#. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2243 src/Properties.vala:436
-#: src/Properties.vala:440 src/Properties.vala:447
-msgid "Exposure:"
-msgstr "Exposición:"
-
-#: src/editing_tools/EditingTools.vala:2251
-msgid "Contrast:"
-msgstr "Contraste:"
-
-#: src/editing_tools/EditingTools.vala:2259
-msgid "Saturation:"
-msgstr "Saturación:"
-
-#: src/editing_tools/EditingTools.vala:2267
-msgid "Tint:"
-msgstr "Matiz:"
-
-#: src/editing_tools/EditingTools.vala:2276
-msgid "Temperature:"
-msgstr "Temperatura:"
-
-#: src/editing_tools/EditingTools.vala:2284
-msgid "Shadows:"
-msgstr "Sombras:"
-
-#: src/editing_tools/EditingTools.vala:2292
-msgid "Highlights:"
-msgstr "Resaltadas:"
-
-#: src/editing_tools/EditingTools.vala:2346
-msgid "Reset Colors"
-msgstr "Restablecer colores"
-
-#: src/editing_tools/EditingTools.vala:2346
-msgid "Reset all color adjustments to original"
-msgstr "Restablecer todos los ajustes de color al original"
-
-#: src/editing_tools/EditingTools.vala:2705
-msgid "Temperature"
-msgstr "Temperatura"
-
-#: src/editing_tools/EditingTools.vala:2717
-msgid "Tint"
-msgstr "Matiz"
-
-#: src/editing_tools/EditingTools.vala:2729
-msgid "Contrast"
-msgstr "Contraste"
-
-#: src/editing_tools/EditingTools.vala:2743
-msgid "Saturation"
-msgstr "Saturación"
-
-#: src/editing_tools/EditingTools.vala:2756
-msgid "Exposure"
-msgstr "Exposición"
-
-#: src/editing_tools/EditingTools.vala:2769
-msgid "Shadows"
-msgstr "Sombras"
-
-#: src/editing_tools/EditingTools.vala:2782
-msgid "Highlights"
-msgstr "Resaltadas"
-
-#: src/editing_tools/EditingTools.vala:2792
-msgid "Contrast Expansion"
-msgstr "Expansión de contraste"
-
-#: src/editing_tools/StraightenTool.vala:99
-msgid "Angle:"
-msgstr "Ángulo:"
-
-#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
-msgid "_Straighten"
-msgstr "_Enderezar"
-
-#: src/events/Branch.vala:25
-msgid "Events"
-msgstr "Eventos"
-
-#: src/events/EventDirectoryItem.vala:83
-#, c-format
-msgid "%d Photo/Video"
-msgid_plural "%d Photos/Videos"
-msgstr[0] "%d foto/vídeo"
-msgstr[1] "%d fotos/vídeos"
-
-#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:355
-#, c-format
-msgid "%d Video"
-msgid_plural "%d Videos"
-msgstr[0] "%d vídeo"
-msgstr[1] "%d vídeos"
-
-#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:353
-#, c-format
-msgid "%d Photo"
-msgid_plural "%d Photos"
-msgstr[0] "%d foto"
-msgstr[1] "%d fotos"
-
-#: src/events/EventPage.vala:129
-msgid "No Event"
-msgstr "No hay eventos"
-
-#: src/events/EventsDirectoryPage.vala:130 src/MediaPage.vala:457
-msgid "_Comments"
-msgstr "_Comentarios"
-
-#: src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "Mostrar el comentario de cada evento"
-
-#: src/events/EventsDirectoryPage.vala:155
-msgid "No events"
-msgstr "No hay eventos"
-
-#: src/events/EventsDirectoryPage.vala:159
-msgid "No events found"
-msgstr "No se encontraron eventos"
-
-#: src/events/EventsDirectoryPage.vala:230
-msgid "All Events"
-msgstr "Todos los eventos"
-
-#: src/events/EventsDirectoryPage.vala:244
-msgid "Undated"
-msgstr "Sin fecha"
-
-#: src/events/EventsDirectoryPage.vala:245
-msgid "%Y"
-msgstr "%Y"
-
-#: src/events/EventsDirectoryPage.vala:246
-msgid "%B"
-msgstr "%B"
-
-#. if no name, pretty up the start time
-#: src/Event.vala:753
-#, c-format
-msgid "Event %s"
-msgstr "Evento %s"
-
-#: src/Exporter.vala:232
-#, c-format
-msgid "Unable to generate a temporary file for %s: %s"
-msgstr "No se puede crear el directorio temporal %s: %s"
-
-#: src/Exporter.vala:299
-msgid "Exporting"
-msgstr "Exportando"
-
-#: src/Exporter.vala:317
-#, c-format
-#| msgid "File %s already exists. Replace?"
-msgid "File %s already exists. Replace?"
-msgstr "El archivo %s ya existe. ¿Quiere reemplazarlo?"
-
-#: src/Exporter.vala:319
-msgid "_Skip"
-msgstr "_Omitir"
-
-#: src/Exporter.vala:319
-msgid "_Replace"
-msgstr "_Reemplazar"
-
-#: src/Exporter.vala:319
-msgid "Replace _All"
-msgstr "Reempla_zar todo"
-
-#: src/Exporter.vala:319
-msgid "Export"
-msgstr "Exportar"
-
-#: src/folders/Branch.vala:144
-msgid "Folders"
-msgstr "Carpetas"
-
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:1191
-msgid "Library"
-msgstr "Colección"
-
-#: src/library/Branch.vala:97 src/SearchFilter.vala:608
-#: src/SearchFilter.vala:609
-msgid "Photos"
-msgstr "Fotos"
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:602
-#: src/SearchFilter.vala:603 src/SearchFilter.vala:1188
-msgid "Flagged"
-msgstr "Marcada"
-
-#: src/library/ImportQueuePage.vala:8
-msgid "Importing…"
-msgstr "Importando…"
-
-#: src/library/ImportQueuePage.vala:67
-msgid "_Stop Import"
-msgstr "_Detener importación"
-
-#: src/library/ImportQueuePage.vala:68
-msgid "Stop importing photos"
-msgstr "Detener la importación de fotos"
-
-#: src/library/ImportQueuePage.vala:124
-msgid "Preparing to import…"
-msgstr "Preparando para importar…"
-
-#: src/library/ImportQueuePage.vala:151
-#, c-format
-msgid "Imported %s"
-msgstr "Importada %s"
-
-#: src/library/LastImportPage.vala:8
-msgid "Last Import"
-msgstr "Última importación"
-
-#: src/library/LibraryWindow.vala:285
-msgid "_Import From Folder…"
-msgstr "_Importar desde carpeta…"
-
-#: src/library/LibraryWindow.vala:286
-msgid "Import photos from disk to library"
-msgstr "Importar fotos desde el disco a la colección"
-
-#: src/library/LibraryWindow.vala:293
-msgid "Import From _Application…"
-msgstr "Importar desde _aplicación…"
-
-#: src/library/LibraryWindow.vala:297
-msgid "Sort _Events"
-msgstr "Ordenar _eventos"
-
-#: src/library/LibraryWindow.vala:307
-msgid "Empty T_rash"
-msgstr "Vaciar la papele_ra"
-
-#: src/library/LibraryWindow.vala:308
-msgid "Delete all photos in the trash"
-msgstr "Eliminar todas las fotos en la papelera"
-
-#: src/library/LibraryWindow.vala:313
-msgid "View Eve_nt for Photo"
-msgstr "Ver eve_nto para la foto"
-
-#: src/library/LibraryWindow.vala:317
-msgid "_Find"
-msgstr "_Buscar"
-
-#: src/library/LibraryWindow.vala:318
-msgid "Find photos and videos by search criteria"
-msgstr "Buscar fotos y vídeos por criterio de búsqueda"
-
-#: src/library/LibraryWindow.vala:329 src/searches/Branch.vala:77
-#: src/sidebar/Tree.vala:199
-msgid "Ne_w Saved Search…"
-msgstr "_Búsqueda guardada nueva…"
-
-#: src/library/LibraryWindow.vala:351
-msgid "_Photos"
-msgstr "_Fotos"
-
-#: src/library/LibraryWindow.vala:355
-msgid "Even_ts"
-msgstr "Even_tos"
-
-#: src/library/LibraryWindow.vala:359 src/MediaPage.vala:469
-msgid "Ta_gs"
-msgstr "_Etiquetas"
-
-#: src/library/LibraryWindow.vala:374
-msgid "_Basic Information"
-msgstr "Información _básica"
-
-#: src/library/LibraryWindow.vala:375
-msgid "Display basic information for the selection"
-msgstr "Mostrar la información básica para la selección"
-
-#: src/library/LibraryWindow.vala:380
-msgid "E_xtended Information"
-msgstr "Información e_xtendida"
-
-#: src/library/LibraryWindow.vala:381
-msgid "Display extended information for the selection"
-msgstr "Mostrar la información extendida para la selección"
-
-#: src/library/LibraryWindow.vala:386
-msgid "_Search Bar"
-msgstr "_Barra de búsqueda"
-
-#: src/library/LibraryWindow.vala:387
-msgid "Display the search bar"
-msgstr "Mostrar la barra de búsqueda"
-
-#: src/library/LibraryWindow.vala:392
-msgid "S_idebar"
-msgstr "_Barra lateral"
-
-#: src/library/LibraryWindow.vala:393
-msgid "Display the sidebar"
-msgstr "Mostrar la barra lateral"
-
-#: src/library/LibraryWindow.vala:398
-msgid "T_oolbar"
-msgstr "B_arra de herramientas"
-
-#: src/library/LibraryWindow.vala:399
-msgid "Display the tool bar"
-msgstr "Mostrar la barra de herramientas"
-
-#: src/library/LibraryWindow.vala:411 src/MediaPage.vala:515
-msgid "_Ascending"
-msgstr "_Ascendente"
-
-#: src/library/LibraryWindow.vala:412 src/MediaPage.vala:516
-msgid "Sort photos in an ascending order"
-msgstr "Ordenar fotos en orden ascendente"
-
-#: src/library/LibraryWindow.vala:418 src/MediaPage.vala:521
-msgid "D_escending"
-msgstr "D_escendente"
-
-#: src/library/LibraryWindow.vala:419 src/MediaPage.vala:522
-msgid "Sort photos in a descending order"
-msgstr "Ordenar fotos en orden descendente"
-
-#: src/library/LibraryWindow.vala:657
-msgid "Import From Folder"
-msgstr "Importar desde carpeta"
-
-#: src/library/LibraryWindow.vala:726
-msgid "Empty Trash"
-msgstr "Vaciar la papelera"
-
-#: src/library/LibraryWindow.vala:726
-msgid "Emptying Trash…"
-msgstr "Vaciando la papelera…"
-
-#: src/library/LibraryWindow.vala:901
-#, c-format
-msgid ""
-"Shotwell is configured to import photos to your home directory.\n"
-"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
-"span>.\n"
-"Do you want to continue importing photos?"
-msgstr ""
-"Shotwell esta´configurado para importar fotos a su carpeta personal.\n"
-"Se recomienda cambiar esto en <span weight=\"bold\">Editar %s Preferencias</"
-"span>.\n"
-"¿Quiere seguir importando fotos?"
-
-#: src/library/LibraryWindow.vala:904 ui/shotwell.ui:784
-msgid "Library Location"
-msgstr "Ubicación de la colección"
-
-#. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:917
-msgid "Photos cannot be imported from this directory."
-msgstr "Las fotos no pueden importarse desde esta carpeta."
-
-#: src/library/LibraryWindow.vala:1203
-#, c-format
-msgid "%s (%d%%)"
-msgstr "%s (%d%%)"
-
-#: src/library/LibraryWindow.vala:1247 src/library/LibraryWindow.vala:1258
-msgid "Updating library…"
-msgstr "Actualizando la colección…"
-
-#: src/library/LibraryWindow.vala:1264
-msgid "Preparing to auto-import photos…"
-msgstr "Preparando para importar fotos automáticamente…"
-
-#: src/library/LibraryWindow.vala:1269
-msgid "Auto-importing photos…"
-msgstr "Importando fotos automáticamente…"
-
-#: src/library/LibraryWindow.vala:1277
-msgid "Writing metadata to files…"
-msgstr "Escribiendo metadatos en los archivos…"
-
-#: src/library/OfflinePage.vala:8
-msgid "Missing Files"
-msgstr "Archivos faltantes"
-
-#: src/library/OfflinePage.vala:106
-msgid "Deleting…"
-msgstr "Eliminando…"
-
-#: src/library/TrashPage.vala:8
-msgid "Trash"
-msgstr "Papelera"
-
-#: src/library/TrashPage.vala:108
-msgid "Trash is empty"
-msgstr "La papelera está vacía"
-
-#: src/library/TrashPage.vala:112
-msgid "Delete"
-msgstr "Eliminar"
-
-#: src/library/TrashPage.vala:113
-msgid "Deleting Photos"
-msgstr "Eliminando fotos"
-
-#: src/main.vala:54
-#, c-format
-#| msgid ""
-#| "Your photo library is not compatible with this version of Shotwell. It "
-#| "appears it was created by Shotwell %s (schema %d). This version is %s "
-#| "(schema %d). Please use the latest version of Shotwell."
-msgid ""
-"Your photo library is not compatible with this version of Shotwell. It "
-"appears it was created by Shotwell %s (schema %d). This version is %s "
-"(schema %d). Please use the latest version of Shotwell."
-msgstr ""
-"Su colección de fotos no es compatible con esta versión de Shotwell. Parece "
-"que fue creada por Shotwell %s (esquema %d). Esta versión es %s (esquema %"
-"d). Use la versión más reciente de Shotwell."
-
-#: src/main.vala:59
-#, c-format
-#| msgid ""
-#| "Shotwell was unable to upgrade your photo library from version %s (schema "
-#| "%d) to %s (schema %d). For more information please check the Shotwell "
-#| "Wiki at %s"
-msgid ""
-"Shotwell was unable to upgrade your photo library from version %s (schema %"
-"d) to %s (schema %d). For more information please check the Shotwell Wiki at "
-"%s"
-msgstr ""
-"Shotwell no pudo actualizar su colección de fotos desde la versión %s "
-"(esquema %d) a la %s (esquema %d). Para obtener más información , consulte "
-"el wiki de Shotwell en %s"
-
-#: src/main.vala:65
-#, c-format
-#| msgid ""
-#| "Your photo library is not compatible with this version of Shotwell. It "
-#| "appears it was created by Shotwell %s (schema %d). This version is %s "
-#| "(schema %d). Please clear your library by deleting %s and re-import your "
-#| "photos."
-msgid ""
-"Your photo library is not compatible with this version of Shotwell. It "
-"appears it was created by Shotwell %s (schema %d). This version is %s "
-"(schema %d). Please clear your library by deleting %s and re-import your "
-"photos."
-msgstr ""
-"Su colección de fotos no es compatible con esta versión de Shotwell. Parece "
-"que fue creada por Shotwell %s (esquema %d). Esta versión es %s (esquema %"
-"d). Vacíe la colección mediante la eliminación de %s, y vuelva a importar "
-"las fotos."
-
-#: src/main.vala:71
-#, c-format
-#| msgid "Unknown error attempting to verify Shotwell's database: %s"
-msgid "Unknown error attempting to verify Shotwell’s database: %s"
-msgstr ""
-"Error desconocido al intentar verificar la base de datos de Shotwell: %s"
-
-#: src/main.vala:104
-msgid "Loading Shotwell"
-msgstr "Cargando Shotwell"
-
-#: src/main.vala:294
-#| msgid "Path to Shotwell's private data"
-msgid "Path to Shotwell’s private data"
-msgstr "Ruta a los datos privados de Shotwell"
-
-#: src/main.vala:294
-msgid "DIRECTORY"
-msgstr "DIRECTORIO"
-
-#: src/main.vala:298
-msgid "Do not monitor library directory at runtime for changes"
-msgstr ""
-"No monitorear el directorio de la colección en tiempo de ejecución para "
-"buscar cambios"
-
-#: src/main.vala:302
-#| msgid "Don't display startup progress meter"
-msgid "Don’t display startup progress meter"
-msgstr "No mostrar medidor de progreso de inicio"
-
-#: src/main.vala:306
-#| msgid "Show the application's version"
-msgid "Show the application’s version"
-msgstr "Mostrar la versión de la aplicación"
-
-#. init GTK (valac has already called g_threads_init())
-#: src/main.vala:338
-msgid "[FILE]"
-msgstr "[ARCHIVO]"
-
-#: src/main.vala:342
-#, c-format
-#| msgid ""
-#| "Run '%s --help' to see a full list of available command line options.\n"
-msgid "Run “%s --help” to see a full list of available command line options.\n"
-msgstr ""
-"Ejecute «%s --help» para ver una lista completa de opciones de línea de "
-"órdenes.\n"
-
-#: src/MediaMonitor.vala:400
-#, c-format
-msgid "Unable to process monitoring updates: %s"
-msgstr "No se pueden procesar las actualizaciones de la monitorización %s"
-
-#: src/MediaPage.vala:158
-msgid "Adjust the size of the thumbnails"
-msgstr "Ajustar el tamaño de las miniaturas"
-
-#: src/MediaPage.vala:341
-msgid "Increase the magnification of the thumbnails"
-msgstr "Aumentar la ampliación de las miniaturas"
-
-#: src/MediaPage.vala:347
-msgid "Decrease the magnification of the thumbnails"
-msgstr "Disminuir la ampliación de las miniaturas"
-
-#: src/MediaPage.vala:414
-msgid "Sort _Photos"
-msgstr "Ordenar _fotos"
-
-#: src/MediaPage.vala:423
-msgid "_Play Video"
-msgstr "_Reproducir vídeo"
-
-#: src/MediaPage.vala:424
-msgid "Open the selected videos in the system video player"
-msgstr "Abrir los vídeos seleccionados en el reproductor de vídeos del sistema"
-
-#: src/MediaPage.vala:428 src/PhotoPage.vala:2640
-msgid "_Developer"
-msgstr "_Revelador"
-
-#: src/MediaPage.vala:458
-msgid "Display the comment of each photo"
-msgstr "Mostrar el comentario de cada foto"
-
-#: src/MediaPage.vala:470
-#| msgid "Display each photo's tags"
-msgid "Display each photo’s tags"
-msgstr "Mostrar la etiqueta de cada foto"
-
-#: src/MediaPage.vala:486
-msgid "By _Title"
-msgstr "Por _título"
-
-#: src/MediaPage.vala:487
-msgid "Sort photos by title"
-msgstr "Ordenar las fotos por título"
-
-#: src/MediaPage.vala:492
-msgid "By Exposure _Date"
-msgstr "Por fecha de exposición"
-
-#: src/MediaPage.vala:493
-msgid "Sort photos by exposure date"
-msgstr "Ordenar fotos por fecha de exposición"
-
-#: src/MediaPage.vala:498
-msgid "By _Rating"
-msgstr "Por p_untuación"
-
-#: src/MediaPage.vala:499
-msgid "Sort photos by rating"
-msgstr "Ordenar fotos por puntuación"
-
-#: src/MediaPage.vala:504
-msgid "By _Filename"
-msgstr "Por _nombre del archivo"
-
-#: src/MediaPage.vala:505
-msgid "Sort photos by filename"
-msgstr "Ordenar fotos por nombre"
-
-#: src/MediaPage.vala:723
-#, c-format
-msgid ""
-"Shotwell was unable to play the selected video:\n"
-"%s"
-msgstr ""
-"Shotwell no pudo reproducir el vídeo seleccionado:\n"
-"%s"
-
-#: src/Page.vala:1266
-msgid "No photos/videos"
-msgstr "No hay fotos/vídeos"
-
-#: src/Page.vala:1270
-msgid "No photos/videos found which match the current filter"
-msgstr "No se han encontrado fotos/vídeos que coincidan con el filtro actual"
-
-#: src/Page.vala:2576
-msgid "Photos cannot be exported to this directory."
-msgstr "No se pueden exportar las fotos a este directorio."
-
-#. previous button
-#: src/PhotoPage.vala:533
-msgid "Previous photo"
-msgstr "Foto anterior"
-
-#. next button
-#: src/PhotoPage.vala:539
-msgid "Next photo"
-msgstr "Siguiente foto"
-
-#: src/PhotoPage.vala:1845
-#, c-format
-msgid "Photo source file missing: %s"
-msgstr "Falta el archivo de origen de la foto: %s"
-
-#: src/PhotoPage.vala:3229
-#, c-format
-msgid "Unable to export %s: %s"
-msgstr "No se puede exportar %s: %s"
-
-#: src/photos/BmpSupport.vala:32
-msgid "BMP"
-msgstr "BMP"
-
-#: src/photos/JfifSupport.vala:84
-msgid "JPEG"
-msgstr "JPEG"
-
-#: src/photos/JfifSupport.vala:185
-#, c-format
-msgid "Low (%d%%)"
-msgstr "Baja (%d%%)"
-
-#: src/photos/JfifSupport.vala:188
-#, c-format
-msgid "Medium (%d%%)"
-msgstr "Media (%d%%)"
-
-#: src/photos/JfifSupport.vala:191
-#, c-format
-msgid "High (%d%%)"
-msgstr "Alta (%d%%)"
-
-#: src/photos/JfifSupport.vala:194
-#, c-format
-msgid "Maximum (%d%%)"
-msgstr "Máxima (%d%%)"
-
-#: src/photos/PngSupport.vala:30
-msgid "PNG"
-msgstr "PNG"
-
-#: src/photos/RawSupport.vala:134
-msgid "RAW"
-msgstr "RAW"
-
-#: src/photos/TiffSupport.vala:86
-msgid "TIFF"
-msgstr "TIFF"
-
-#: src/Photo.vala:3753
-msgid "modified"
-msgstr "modificada"
-
-#: src/Printing.vala:255
-msgid "Fill the entire page"
-msgstr "Llenar la página entera"
-
-#: src/Printing.vala:256
-msgid "2 images per page"
-msgstr "2 imágenes por página"
-
-#: src/Printing.vala:257
-msgid "4 images per page"
-msgstr "4 imágenes por página"
-
-#: src/Printing.vala:258
-msgid "6 images per page"
-msgstr "6 imágenes por página"
-
-#: src/Printing.vala:259
-msgid "8 images per page"
-msgstr "8 imágenes por página"
-
-#: src/Printing.vala:260
-msgid "16 images per page"
-msgstr "16 imágenes por página"
-
-#: src/Printing.vala:261
-msgid "32 images per page"
-msgstr "32 imágenes por página"
-
-#: src/Printing.vala:348
-msgid "in."
-msgstr "pulg."
-
-#: src/Printing.vala:349
-msgid "cm"
-msgstr "cm"
-
-#: src/Printing.vala:876
-msgid "Image Settings"
-msgstr "Ajustes de la imagen"
-
-#: src/Printing.vala:889
-msgid "Printing…"
-msgstr "Imprimiendo…"
-
-#: src/Printing.vala:909 src/Printing.vala:1112
-#, c-format
-msgid ""
-"Unable to print photo:\n"
-"\n"
-"%s"
-msgstr ""
-"No se puede imprimir la foto:\n"
-"\n"
-"%s"
-
-#: src/Properties.vala:84
-msgid "Today"
-msgstr "Hoy"
-
-#: src/Properties.vala:86
-msgid "Yesterday"
-msgstr "Ayer"
-
-#: src/Properties.vala:343
-msgid "Items:"
-msgstr "Elementos:"
-
-#: src/Properties.vala:346
-#, c-format
-msgid "%d Event"
-msgid_plural "%d Events"
-msgstr[0] "%d evento"
-msgstr[1] "%d eventos"
-
-#. display only one date if start and end are the same
-#: src/Properties.vala:377
-msgid "Date:"
-msgstr "Fecha:"
-
-#. display only one time if start and end are the same
-#: src/Properties.vala:381
-msgid "Time:"
-msgstr "Hora:"
-
-#. display time range
-#. display date range
-#: src/Properties.vala:384 src/Properties.vala:389
-msgid "From:"
-msgstr "De:"
-
-#: src/Properties.vala:385 src/Properties.vala:390
-msgid "To:"
-msgstr "A:"
-
-#: src/Properties.vala:404
-msgid "Duration:"
-msgstr "Duración:"
-
-#: src/Properties.vala:404
-#, c-format
-msgid "%.1f seconds"
-msgstr "%.1f segundos"
-
-#: src/Properties.vala:408
-msgid "Developer:"
-msgstr "Revelador:"
-
-#. nothing special to be done for now for Events
-#: src/Properties.vala:583
-msgid "Location:"
-msgstr "Ubicación:"
-
-#: src/Properties.vala:586
-msgid "File size:"
-msgstr "Tamaño del archivo:"
-
-#: src/Properties.vala:590
-msgid "Current Development:"
-msgstr "Desarrollo actual:"
-
-#: src/Properties.vala:592
-msgid "Original dimensions:"
-msgstr "Dimensiones originales:"
-
-#: src/Properties.vala:595
-msgid "Camera make:"
-msgstr "Cámara:"
-
-#: src/Properties.vala:598
-msgid "Camera model:"
-msgstr "Modelo de la cámara:"
-
-#: src/Properties.vala:601
-msgid "Flash:"
-msgstr "Flash:"
-
-#: src/Properties.vala:603
-msgid "Focal length:"
-msgstr "Longitud focal:"
-
-#: src/Properties.vala:606
-msgid "Exposure date:"
-msgstr "Fecha de exposición:"
-
-#: src/Properties.vala:609
-msgid "Exposure time:"
-msgstr "Tiempo de exposición:"
-
-#: src/Properties.vala:612
-msgid "Exposure bias:"
-msgstr "Exposición:"
-
-#: src/Properties.vala:614
-msgid "GPS latitude:"
-msgstr "Latitud GPS:"
-
-#: src/Properties.vala:617
-msgid "GPS longitude:"
-msgstr "Longitud GPS:"
-
-#: src/Properties.vala:620
-msgid "Artist:"
-msgstr "Artista:"
-
-#: src/Properties.vala:622
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: src/Properties.vala:624
-msgid "Software:"
-msgstr "Software:"
-
-#: src/Properties.vala:641
-msgid "Extended Information"
-msgstr "Información extendida"
-
-#: src/publishing/PublishingPluginHost.vala:11
-msgid "Preparing for upload"
-msgstr "Preparando para subir"
-
-#: src/publishing/PublishingPluginHost.vala:12
-#, c-format
-msgid "Uploading %d of %d"
-msgstr "Subiendo %d de %d"
-
-#: src/publishing/PublishingPluginHost.vala:81
-#, c-format
-#| msgid "Publishing to %s can't continue because an error occurred:"
-msgid "Publishing to %s can’t continue because an error occurred:"
-msgstr "No se puede continuar la publicación en %s porque ocurrió un error:"
-
-#: src/publishing/PublishingPluginHost.vala:84
-msgid "To try publishing to another service, select one from the above menu."
-msgstr ""
-"Para intentar publicar en otro servicio, seleccione uno en el menú de arriba."
-
-#: src/publishing/PublishingUI.vala:105
-msgid "The selected photos/videos were successfully published."
-msgstr "Las fotos/vídeos seleccionados se publicaron correctamente."
-
-#: src/publishing/PublishingUI.vala:107
-msgid "The selected videos were successfully published."
-msgstr "Las fotos seleccionadas se publicaron correctamente."
-
-#: src/publishing/PublishingUI.vala:109
-msgid "The selected photos were successfully published."
-msgstr "Las fotos seleccionadas se publicaron correctamente."
-
-#: src/publishing/PublishingUI.vala:112
-msgid "The selected video was successfully published."
-msgstr "El vídeo seleccionado se publicó correctamente."
-
-#: src/publishing/PublishingUI.vala:114
-msgid "The selected photo was successfully published."
-msgstr "La foto seleccionada se publicó correctamente."
-
-#: src/publishing/PublishingUI.vala:122
-msgid "Fetching account information…"
-msgstr "Obteniendo información de la cuenta…"
-
-#: src/publishing/PublishingUI.vala:128
-msgid "Logging in…"
-msgstr "Iniciando sesión…"
-
-#: src/publishing/PublishingUI.vala:188
-msgid "Publish Photos"
-msgstr "Publicar fotos"
-
-#: src/publishing/PublishingUI.vala:189
-msgid "Publish photos _to:"
-msgstr "Publicar fo_tos en:"
-
-#: src/publishing/PublishingUI.vala:191
-msgid "Publish Videos"
-msgstr "Publicar vídeos"
-
-#: src/publishing/PublishingUI.vala:192
-msgid "Publish videos _to"
-msgstr "Publicar vídeos _en"
-
-#: src/publishing/PublishingUI.vala:194
-msgid "Publish Photos and Videos"
-msgstr "Publicar fotos y vídeos"
-
-#: src/publishing/PublishingUI.vala:195
-msgid "Publish photos and videos _to"
-msgstr "Publicar fotos y vídeos _en"
-
-#. There are no enabled publishing services that accept this media type,
-#. warn the user.
-#: src/publishing/PublishingUI.vala:397
-msgid "Unable to publish"
-msgstr "No se pudo publicar"
-
-#: src/publishing/PublishingUI.vala:398
-#, c-format
-msgid ""
-"Shotwell cannot publish the selected items because you do not have a "
-"compatible publishing plugin enabled. To correct this, choose <b>Edit %s "
-"Preferences</b> and enable one or more of the publishing plugins on the "
-"<b>Plugins</b> tab."
-msgstr ""
-"Shotwell no puede publicar el elemento seleccionado porque no tiene activado "
-"un complemento compatible. Para corregir esto, vaya a <b>Editar %s "
-"Preferencias</b> y active uno o más complementos de publicación en la "
-"pestaña <b>Complementos</b>."
-
-#: src/publishing/Publishing.vala:16
-msgid "Publishing"
-msgstr "Publicando"
-
-#: src/Resources.vala:139
-msgid "Rotate _Right"
-msgstr "Girar a la _derecha"
-
-#: src/Resources.vala:140 src/Resources.vala:145
-msgid "Rotate"
-msgstr "Girar"
-
-#: src/Resources.vala:141
-msgid "Rotate Right"
-msgstr "Girar a la derecha"
-
-#: src/Resources.vala:142
-msgid "Rotate the photos right (press Ctrl to rotate left)"
-msgstr "Girar las fotos a la derecha (oprima Ctrl para girar a la izquierda)"
-
-#: src/Resources.vala:144
-msgid "Rotate _Left"
-msgstr "Girar a la izq_uierda"
-
-#: src/Resources.vala:146
-msgid "Rotate Left"
-msgstr "Girar a la izquierda"
-
-#: src/Resources.vala:147
-msgid "Rotate the photos left"
-msgstr "Girar las fotos a la izquierda"
-
-#: src/Resources.vala:149
-msgid "Flip Hori_zontally"
-msgstr "Voltear hori_zontalmente"
-
-#: src/Resources.vala:150
-msgid "Flip Horizontally"
-msgstr "Voltear horizontalmente"
-
-#: src/Resources.vala:152
-msgid "Flip Verti_cally"
-msgstr "Voltear _verticalmente"
-
-#: src/Resources.vala:153
-msgid "Flip Vertically"
-msgstr "Voltear verticalmente"
-
-#: src/Resources.vala:155
-msgid "_About"
-msgstr "_Acerca de"
-
-#: src/Resources.vala:156
-msgid "_Apply"
-msgstr "_Aplicar"
-
-#: src/Resources.vala:160
-msgid "_Forward"
-msgstr "_Adelante"
-
-#: src/Resources.vala:161
-msgid "Fulls_creen"
-msgstr "Pantalla c_ompleta"
-
-#: src/Resources.vala:163
-msgid "Leave _Fullscreen"
-msgstr "Salir de pantalla co_mpleta"
-
-#: src/Resources.vala:164 src/Resources.vala:363
-msgid "_New"
-msgstr "_Nueva"
-
-#: src/Resources.vala:165
-msgid "_Next"
-msgstr "_Siguiente"
-
-#: src/Resources.vala:166
-msgid "_OK"
-msgstr "_Aceptar"
-
-#: src/Resources.vala:167
-msgid "_Play"
-msgstr "_Reproducir"
-
-#: src/Resources.vala:168 src/Resources.vala:317
-msgid "_Preferences"
-msgstr "_Preferencias"
-
-#: src/Resources.vala:169
-msgid "_Previous"
-msgstr "_Anterior"
-
-#: src/Resources.vala:170
-msgid "_Print"
-msgstr "_Imprimir"
-
-#: src/Resources.vala:171
-msgid "_Quit"
-msgstr "_Salir"
-
-#: src/Resources.vala:172
-msgid "_Refresh"
-msgstr "_Actualizar"
-
-#: src/Resources.vala:174
-msgid "_Revert"
-msgstr "_Revertir"
-
-#: src/Resources.vala:176
-msgid "Save _As"
-msgstr "Guardar _como"
-
-#: src/Resources.vala:177
-msgid "Sort _Ascending"
-msgstr "Ordenar _ascendentemente"
-
-#: src/Resources.vala:178
-msgid "Sort _Descending"
-msgstr "Ordenar d_escendentemente"
-
-#: src/Resources.vala:179
-msgid "_Stop"
-msgstr "_Detener"
-
-#: src/Resources.vala:180
-msgid "_Undelete"
-msgstr "_Recuperar"
-
-#: src/Resources.vala:181
-msgid "_Normal Size"
-msgstr "Tamaño _normal"
-
-#: src/Resources.vala:182
-msgid "Best _Fit"
-msgstr "_Mejor ajuste"
-
-#: src/Resources.vala:186
-msgid "_Enhance"
-msgstr "M_ejorar"
-
-#: src/Resources.vala:187
-msgid "Enhance"
-msgstr "Mejorar"
-
-#: src/Resources.vala:188
-#| msgid "Automatically improve the photo's appearance"
-msgid "Automatically improve the photo’s appearance"
-msgstr "Mejorar automáticamente la apariencia de la foto"
-
-#: src/Resources.vala:190
-msgid "_Copy Color Adjustments"
-msgstr "_Copiar ajustes de color"
-
-#: src/Resources.vala:191
-msgid "Copy Color Adjustments"
-msgstr "Copiar ajustes de color"
-
-#: src/Resources.vala:192
-msgid "Copy the color adjustments applied to the photo"
-msgstr "Copiar los ajustes de color aplicados a la foto"
-
-#: src/Resources.vala:194
-msgid "_Paste Color Adjustments"
-msgstr "_Pegar ajustes de color"
-
-#: src/Resources.vala:195
-msgid "Paste Color Adjustments"
-msgstr "Pegar ajustes de color"
-
-#: src/Resources.vala:196
-msgid "Apply copied color adjustments to the selected photos"
-msgstr "Aplicar ajuste de color copiado a las fotos seleccionadas"
-
-#: src/Resources.vala:198
-msgid "_Crop"
-msgstr "Re_cortar"
-
-#: src/Resources.vala:199
-msgid "Crop"
-msgstr "Recortar"
-
-#: src/Resources.vala:200
-#| msgid "Crop the photo's size"
-msgid "Crop the photo’s size"
-msgstr "Recortar el tamaño de la foto"
-
-#: src/Resources.vala:203
-msgid "Straighten"
-msgstr "Enderezar"
-
-#: src/Resources.vala:204
-msgid "Straighten the photo"
-msgstr "Enderezar la foto"
-
-#: src/Resources.vala:206
-msgid "_Red-eye"
-msgstr "Ojos _rojos"
-
-#: src/Resources.vala:207
-msgid "Red-eye"
-msgstr "Ojos rojos"
-
-#: src/Resources.vala:208
-msgid "Reduce or eliminate any red-eye effects in the photo"
-msgstr "Reducir o eliminar cualquier efecto de ojos rojos en la foto"
-
-#: src/Resources.vala:210
-msgid "_Adjust"
-msgstr "_Ajuste"
-
-#: src/Resources.vala:211
-msgid "Adjust"
-msgstr "Ajuste"
-
-#: src/Resources.vala:212
-#| msgid "Adjust the photo's color and tone"
-msgid "Adjust the photo’s color and tone"
-msgstr "Ajustar el color y el tono de la foto"
-
-#: src/Resources.vala:214
-msgid "Re_vert to Original"
-msgstr "_Volver al original"
-
-#: src/Resources.vala:215
-msgid "Revert to Original"
-msgstr "Volver al original"
-
-#: src/Resources.vala:217
-msgid "Revert External E_dits"
-msgstr "Revertir e_diciones externas"
-
-#: src/Resources.vala:218
-msgid "Revert to the master photo"
-msgstr "Revertir a la foto original"
-
-#: src/Resources.vala:220
-msgid "Set as _Desktop Background"
-msgstr "Establecer como fondo _de escritorio"
-
-#: src/Resources.vala:221
-msgid "Set selected image to be the new desktop background"
-msgstr "Establezca la imagen seleccionada como nuevo fondo de escritorio"
-
-#: src/Resources.vala:222
-msgid "Set as _Desktop Slideshow…"
-msgstr "Establecer como pase de _diapositivas de escritorio…"
-
-#: src/Resources.vala:224
-msgid "_Undo"
-msgstr "_Deshacer"
-
-#: src/Resources.vala:225
-msgid "Undo"
-msgstr "Deshacer"
-
-#: src/Resources.vala:227
-msgid "_Redo"
-msgstr "_Rehacer"
-
-#: src/Resources.vala:228
-msgid "Redo"
-msgstr "Rehacer"
-
-#: src/Resources.vala:230
-msgid "Re_name Event…"
-msgstr "Re_nombrar evento…"
-
-#: src/Resources.vala:233
-msgid "Make _Key Photo for Event"
-msgstr "Hacer foto _clave para el evento"
-
-#: src/Resources.vala:234
-msgid "Make Key Photo for Event"
-msgstr "Hacer foto clave para el evento"
-
-#: src/Resources.vala:236
-msgid "_New Event"
-msgstr "Evento _nuevo"
-
-#: src/Resources.vala:237
-msgid "New Event"
-msgstr "Evento nuevo"
-
-#: src/Resources.vala:239
-msgid "Move Photos"
-msgstr "Mover fotos"
-
-#: src/Resources.vala:240
-msgid "Move photos to an event"
-msgstr "Mover fotos a un evento"
-
-#: src/Resources.vala:242
-msgid "_Merge Events"
-msgstr "_Combinar eventos"
-
-#: src/Resources.vala:243
-msgid "Merge"
-msgstr "Combinar"
-
-#: src/Resources.vala:244
-msgid "Combine events into a single event"
-msgstr "Combinar eventos en uno solo"
-
-#: src/Resources.vala:246
-msgid "_Set Rating"
-msgstr "Establecer p_untuación"
-
-#: src/Resources.vala:247
-msgid "Set Rating"
-msgstr "Establecer puntuación"
-
-#: src/Resources.vala:248
-msgid "Change the rating of your photo"
-msgstr "Cambiar la puntuación de su foto"
-
-#: src/Resources.vala:250
-msgid "_Increase"
-msgstr "_Aumentar"
-
-#: src/Resources.vala:251
-msgid "Increase Rating"
-msgstr "Aumentar puntuación"
-
-#: src/Resources.vala:253
-msgid "_Decrease"
-msgstr "Disminuir"
-
-#: src/Resources.vala:254
-msgid "Decrease Rating"
-msgstr "Disminuir puntuación"
-
-#: src/Resources.vala:256
-msgid "_Unrated"
-msgstr "_Sin puntuar"
-
-#: src/Resources.vala:257
-msgid "Unrated"
-msgstr "Sin puntuar"
-
-#: src/Resources.vala:258
-msgid "Rate Unrated"
-msgstr "Puntuar no puntuadas"
-
-#: src/Resources.vala:259
-msgid "Setting as unrated"
-msgstr "Establecer como sin puntuación"
-
-#: src/Resources.vala:260
-msgid "Remove any ratings"
-msgstr "Quitar cualquier puntuación"
-
-#: src/Resources.vala:262
-msgid "_Rejected"
-msgstr "_Rechazado"
-
-#: src/Resources.vala:263
-msgid "Rejected"
-msgstr "Rechazada"
-
-#: src/Resources.vala:264
-msgid "Rate Rejected"
-msgstr "Puntuar rechazadas"
-
-#: src/Resources.vala:265
-msgid "Setting as rejected"
-msgstr "Estableciendo como rechazada"
-
-#: src/Resources.vala:266
-msgid "Set rating to rejected"
-msgstr "Establecer puntuación para rechazadas"
-
-#: src/Resources.vala:268
-msgid "Rejected _Only"
-msgstr "Solo _rechazadas"
-
-#: src/Resources.vala:269
-msgid "Rejected Only"
-msgstr "Solo rechazadas"
-
-#: src/Resources.vala:270
-msgid "Show only rejected photos"
-msgstr "Mostrar solo las fotos rechazadas"
-
-#: src/Resources.vala:272
-msgid "All + _Rejected"
-msgstr "Todas + _rechazadas"
-
-#: src/Resources.vala:273
-msgctxt "Tooltip"
-msgid "Show all photos, including rejected"
-msgstr "Mostrar todas las fotos, incluyendo las rechazadas"
-
-#: src/Resources.vala:275
-msgid "_All Photos"
-msgstr "Todas las _fotos"
-
-#. Button tooltip
-#: src/Resources.vala:277
-msgid "Show all photos"
-msgstr "Mostrar todas las fotos"
-
-#: src/Resources.vala:279
-msgid "_Ratings"
-msgstr "_Puntuaciones"
-
-#: src/Resources.vala:280
-#| msgid "Display each photo's rating"
-msgid "Display each photo’s rating"
-msgstr "Mostrar la puntuación de cada foto"
-
-#: src/Resources.vala:282
-msgid "_Filter Photos"
-msgstr "_Filtrar fotos"
-
-#: src/Resources.vala:283
-msgid "Filter Photos"
-msgstr "Filtrar fotos"
-
-#: src/Resources.vala:284
-msgid "Limit the number of photos displayed based on a filter"
-msgstr "Limitar el número de fotos mostradas en base al filtro"
-
-#: src/Resources.vala:286
-msgid "_Duplicate"
-msgstr "_Duplicar"
-
-#: src/Resources.vala:287
-msgid "Duplicate"
-msgstr "Duplicar"
-
-#: src/Resources.vala:288
-msgid "Make a duplicate of the photo"
-msgstr "Hacer un duplicado de la foto"
-
-#: src/Resources.vala:290
-msgid "_Export…"
-msgstr "_Exportar…"
-
-#: src/Resources.vala:292
-msgid "_Print…"
-msgstr "_Imprimir…"
-
-#: src/Resources.vala:294
-msgid "Pu_blish…"
-msgstr "Pu_blicar…"
-
-#: src/Resources.vala:296
-msgid "Publish to various websites"
-msgstr "Publicar en varios sitios web"
-
-#: src/Resources.vala:298
-msgid "Edit _Title…"
-msgstr "Editar _título…"
-
-#. Button label
-#: src/Resources.vala:300
-msgctxt "Button Label"
-msgid "Edit Title"
-msgstr "Editar título"
-
-#: src/Resources.vala:302
-msgid "Edit _Comment…"
-msgstr "Editar _comentario…"
-
-#. Button label
-#: src/Resources.vala:304
-msgid "Edit Comment"
-msgstr "Editar comentario"
-
-#: src/Resources.vala:306
-msgid "Edit Event _Comment…"
-msgstr "Editar _comentario de evento…"
-
-#: src/Resources.vala:309
-msgid "_Adjust Date and Time…"
-msgstr "_Ajustar fecha y hora…"
-
-#: src/Resources.vala:310
-msgid "Adjust Date and Time"
-msgstr "Ajustar fecha y hora"
-
-#: src/Resources.vala:312
-msgid "Add _Tags…"
-msgstr "Añadir e_tiquetas…"
-
-#: src/Resources.vala:313
-msgid "_Add Tags…"
-msgstr "_Añadir etiquetas…"
-
-#. Dialog title
-#: src/Resources.vala:315
-msgctxt "Dialog Title"
-msgid "Add Tags"
-msgstr "Añadir etiquetas"
-
-#: src/Resources.vala:319
-msgid "Open With E_xternal Editor"
-msgstr "Abrir con editor e_xterno"
-
-#: src/Resources.vala:321
-msgid "Open With RA_W Editor"
-msgstr "Abrir con editor RA_W"
-
-#: src/Resources.vala:323
-msgid "Send _To…"
-msgstr "En_viar a…"
-
-#: src/Resources.vala:324
-msgid "Send T_o…"
-msgstr "Env_iar a…"
-
-#: src/Resources.vala:326
-msgid "_Find…"
-msgstr "_Buscar…"
-
-#: src/Resources.vala:327
-msgid "Find"
-msgstr "Buscar"
-
-#: src/Resources.vala:328
-msgid "Find an image by typing text that appears in its name or tags"
-msgstr ""
-"Buscar una imagen escribiendo el texto que aparece en su nombre o etiquetas"
-
-#: src/Resources.vala:330
-msgid "_Flag"
-msgstr "_Marcar"
-
-#: src/Resources.vala:332
-msgid "Un_flag"
-msgstr "_Desmarcar"
-
-#: src/Resources.vala:335
-#, c-format
-msgid "Unable to launch editor: %s"
-msgstr "No se puede abrir el editor: %s"
-
-#: src/Resources.vala:340
-#, c-format
-#| msgid "Add Tag \"%s\""
-msgid "Add Tag “%s”"
-msgstr "Añadir etiqueta «%s»"
-
-#. Used when adding two tags to photo(s)
-#: src/Resources.vala:343
-#, c-format
-#| msgid "Add Tags \"%s\" and \"%s\""
-msgid "Add Tags “%s” and “%s”"
-msgstr "Añadir etiquetas «%s» y «%s»"
-
-#. Undo/Redo command name (in Edit menu)
-#: src/Resources.vala:348
-msgctxt "UndoRedo menu entry"
-msgid "Add Tags"
-msgstr "Añadir etiquetas"
-
-#: src/Resources.vala:353
-#, c-format
-#| msgid "_Delete Tag \"%s\""
-msgid "_Delete Tag “%s”"
-msgstr "_Eliminar etiqueta «%s»"
-
-#: src/Resources.vala:357
-#, c-format
-#| msgid "Delete Tag \"%s\""
-msgid "Delete Tag “%s”"
-msgstr "Eliminar etiqueta «%s»"
-
-#: src/Resources.vala:360
-msgid "Delete Tag"
-msgstr "Eliminar etiqueta"
-
-#: src/Resources.vala:366
-#, c-format
-#| msgid "Re_name Tag \"%s\"…"
-msgid "Re_name Tag “%s”…"
-msgstr "Re_nombrar etiqueta «%s»…"
-
-#: src/Resources.vala:370
-#, c-format
-#| msgid "Rename Tag \"%s\" to \"%s\""
-msgid "Rename Tag “%s” to “%s”"
-msgstr "Renombrar la etiqueta «%s» a «%s»"
-
-#: src/Resources.vala:373
-msgid "_Rename…"
-msgstr "_Renombrar…"
-
-#: src/Resources.vala:375
-msgid "Modif_y Tags…"
-msgstr "Mod_ificar etiquetas…"
-
-#: src/Resources.vala:376
-msgid "Modify Tags"
-msgstr "Modificar etiquetas"
-
-#: src/Resources.vala:379
-#, c-format
-#| msgid "Tag Photo as \"%s\""
-msgid "Tag Photo as “%s”"
-msgid_plural "Tag Photos as “%s”"
-msgstr[0] "Etiquetar fotos como «%s»"
-msgstr[1] "Etiquetar fotos como «%s»"
-
-#: src/Resources.vala:385
-#, c-format
-#| msgid "Tag the selected photo as \"%s\""
-msgid "Tag the selected photo as “%s”"
-msgid_plural "Tag the selected photos as “%s”"
-msgstr[0] "Etiquetar las fotos seleccionadas como «%s»"
-msgstr[1] "Etiquetar las fotos seleccionadas como «%s»"
-
-#: src/Resources.vala:391
-#, c-format
-#| msgid "Remove Tag \"%s\" From _Photo"
-msgid "Remove Tag “%s” From _Photo"
-msgid_plural "Remove Tag “%s” From _Photos"
-msgstr[0] "Quitar la etiqueta «%s» de las _fotos"
-msgstr[1] "Quitar la etiqueta «%s» de las _fotos"
-
-#: src/Resources.vala:397
-#, c-format
-#| msgid "Remove Tag \"%s\" From Photo"
-msgid "Remove Tag “%s” From Photo"
-msgid_plural "Remove Tag “%s” From Photos"
-msgstr[0] "Quitar la etiqueta «%s» de las fotos"
-msgstr[1] "Quitar la etiqueta «%s» de las fotos"
-
-#: src/Resources.vala:403
-#, c-format
-#| msgid "Unable to rename tag to \"%s\" because the tag already exists."
-msgid "Unable to rename tag to “%s” because the tag already exists."
-msgstr "No se puede renombrar la etiqueta a «%s» porque la etiqueta ya existe."
-
-#: src/Resources.vala:407
-#, c-format
-#| msgid "Unable to rename search to \"%s\" because the search already exists."
-msgid "Unable to rename search to “%s” because the search already exists."
-msgstr "No se pudo renombrar la búsqueda «%s» porque la búsqueda ya existe."
-
-#. Saved search button
-#: src/Resources.vala:410 src/SearchFilter.vala:1210
-msgid "Saved Search"
-msgstr "Búsqueda guardada"
-
-#: src/Resources.vala:412
-msgid "Delete Search"
-msgstr "Eliminar búsqueda"
-
-#: src/Resources.vala:415
-msgid "_Edit…"
-msgstr "_Editar…"
-
-#: src/Resources.vala:416
-msgid "Re_name…"
-msgstr "Re_nombrar…"
-
-#: src/Resources.vala:419
-#, c-format
-#| msgid "Rename Search \"%s\" to \"%s\""
-msgid "Rename Search “%s” to “%s”"
-msgstr "Renombrar la búsqueda «%s» a «%s»"
-
-#: src/Resources.vala:423
-#, c-format
-#| msgid "Delete Search \"%s\""
-msgid "Delete Search “%s”"
-msgstr "Eliminar búsqueda «%s»"
-
-#: src/Resources.vala:581
-#, c-format
-msgid "Rate %s"
-msgstr "Puntuar %s"
-
-#: src/Resources.vala:582
-#, c-format
-msgid "Set rating to %s"
-msgstr "Establecer puntuación para %s"
-
-#: src/Resources.vala:583
-#, c-format
-msgid "Setting rating to %s"
-msgstr "Estableciendo la puntuación de %s"
-
-#: src/Resources.vala:585
-#, c-format
-msgid "Display %s"
-msgstr "Mostrar %s"
-
-#: src/Resources.vala:586
-#, c-format
-msgid "Only show photos with a rating of %s"
-msgstr "Solo mostrar fotos con puntuación %s"
-
-#: src/Resources.vala:587
-#, c-format
-msgid "%s or Better"
-msgstr "%s o mayor"
-
-#: src/Resources.vala:588
-#, c-format
-msgid "Display %s or Better"
-msgstr "Mostrar %s o mayor"
-
-#: src/Resources.vala:589
-#, c-format
-msgid "Only show photos with a rating of %s or better"
-msgstr "Solo mostrar fotos con puntuación %s o mayor"
-
-#: src/Resources.vala:680
-msgid "Remove the selected photos from the trash"
-msgstr "Quitar las fotos seleccionadas de la papelera"
-
-#: src/Resources.vala:681
-msgid "Remove the selected photos from the library"
-msgstr "Quitar las fotos seleccionadas de la colección"
-
-#: src/Resources.vala:683
-msgid "_Restore"
-msgstr "_Restaurar"
-
-#: src/Resources.vala:684
-msgid "Move the selected photos back into the library"
-msgstr "Mover las fotos seleccionadas de vuelta a la colección"
-
-#: src/Resources.vala:686
-msgid "Show in File Mana_ger"
-msgstr "Mostrar en ge_stor de archivos"
-
-#: src/Resources.vala:687
-#| msgid "Open the selected photo's directory in the file manager"
-msgid "Open the selected photo’s directory in the file manager"
-msgstr "Abrir el directorio de la foto seleccionada en el gestor de archivos"
-
-#: src/Resources.vala:690
-#, c-format
-msgid "Unable to open in file manager: %s"
-msgstr "No se puede abrir el gestor de archivos: %s"
-
-#: src/Resources.vala:693
-msgid "R_emove From Library"
-msgstr "_Quitar de la colección"
-
-#: src/Resources.vala:695
-msgid "_Move to Trash"
-msgstr "_Mover a la papelera"
-
-#: src/Resources.vala:697
-msgid "Select _All"
-msgstr "Seleccionar _todo"
-
-#: src/Resources.vala:698
-msgid "Select all items"
-msgstr "Seleccionar todos los elementos"
-
-#. ...precache the timestamp string...
-#. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
-#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
-#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:787
-msgid "%a %b %d, %Y"
-msgstr "%a %d de %b de %Y"
-
-#. / Locale-specific starting date format for multi-date strings,
-#. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:792
-msgctxt "MultidayFormat"
-msgid "%a %b %d"
-msgstr "%a, %d de %b"
-
-#. / Locale-specific ending date format for multi-date strings,
-#. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:797
-msgctxt "MultidayFormat"
-msgid "%d, %Y"
-msgstr "%d, %Y"
-
-#. / Locale-specific calendar date format for multi-month strings,
-#. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:802
-msgctxt "MultimonthFormat"
-msgid "%a %b %d"
-msgstr "%a, %d de %b"
-
-#. / Locale-specific calendar date format for multi-month strings,
-#. / i.e. the "Mon Apr 06, 2006" in "Tue Mar 08 to Mon Apr 06, 2006"
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:807
-msgctxt "MultimonthFormat"
-msgid "%a %b %d, %Y"
-msgstr "%a %d de %b de %Y"
-
-#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
-msgid "Slideshow"
-msgstr "Diapositivas"
-
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Búsquedas guardadas"
-
-#. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:168
-msgid "contains"
-msgstr "contiene"
-
-#. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:169
-#: src/searches/SavedSearchDialog.vala:500
-msgid "is exactly"
-msgstr "es exactamente"
-
-#: src/searches/SavedSearchDialog.vala:170
-msgid "starts with"
-msgstr "comienza por"
-
-#: src/searches/SavedSearchDialog.vala:171
-msgid "ends with"
-msgstr "termina por"
-
-#: src/searches/SavedSearchDialog.vala:172
-msgid "does not contain"
-msgstr "no contiene"
-
-#: src/searches/SavedSearchDialog.vala:173
-#: src/searches/SavedSearchDialog.vala:504
-msgid "is not set"
-msgstr "no está establecida"
-
-#: src/searches/SavedSearchDialog.vala:174
-msgid "is set"
-msgstr "está establecida"
-
-#. Ordering must correspond with SearchConditionMediaType.Context
-#: src/searches/SavedSearchDialog.vala:248
-#: src/searches/SavedSearchDialog.vala:379
-#: src/searches/SavedSearchDialog.vala:444
-msgid "is"
-msgstr "es"
-
-#: src/searches/SavedSearchDialog.vala:249
-msgid "is not"
-msgstr "no es"
-
-#. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:255
-msgid "any photo"
-msgstr "cualquier foto"
-
-#: src/searches/SavedSearchDialog.vala:256
-msgid "a raw photo"
-msgstr "una foto en «raw»"
-
-#: src/searches/SavedSearchDialog.vala:257
-msgid "a video"
-msgstr "un vídeo"
-
-#: src/searches/SavedSearchDialog.vala:311
-msgid "has"
-msgstr "tiene"
-
-#: src/searches/SavedSearchDialog.vala:312
-msgid "has no"
-msgstr "no tiene"
-
-#: src/searches/SavedSearchDialog.vala:317
-msgid "modifications"
-msgstr "modificaciones"
-
-#: src/searches/SavedSearchDialog.vala:318
-msgid "internal modifications"
-msgstr "modificaciones internas"
-
-#: src/searches/SavedSearchDialog.vala:319
-msgid "external modifications"
-msgstr "modificaciones externas"
-
-#. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:373
-msgid "flagged"
-msgstr "marcada"
-
-#: src/searches/SavedSearchDialog.vala:374
-msgid "not flagged"
-msgstr "no marcada"
-
-#: src/searches/SavedSearchDialog.vala:437
-msgid "and higher"
-msgstr "y superior"
-
-#: src/searches/SavedSearchDialog.vala:438
-msgid "only"
-msgstr "solo"
-
-#: src/searches/SavedSearchDialog.vala:439
-msgid "and lower"
-msgstr "e inferior"
-
-#: src/searches/SavedSearchDialog.vala:501
-msgid "is after"
-msgstr "está después"
-
-#: src/searches/SavedSearchDialog.vala:502
-msgid "is before"
-msgstr "está antes"
-
-#: src/searches/SavedSearchDialog.vala:503
-msgid "is between"
-msgstr "está entre"
-
-#: src/searches/SavedSearchDialog.vala:516
-msgid "and"
-msgstr "y"
-
-#: src/searches/SavedSearchDialog.vala:697
-msgid "Search"
-msgstr "Búsqueda"
-
-#: src/searches/SavedSearchDialog.vala:702
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/searches/SavedSearchDialog.vala:703
-msgid "OK"
-msgstr "Aceptar"
-
-#: src/searches/SavedSearchDialog.vala:721
-msgid "any"
-msgstr "cualquiera"
-
-#: src/searches/SavedSearchDialog.vala:722
-msgid "all"
-msgstr "todos"
-
-#: src/searches/SavedSearchDialog.vala:723
-msgid "none"
-msgstr "ninguna"
-
-#: src/searches/SearchBoolean.vala:157
-msgid "Any text"
-msgstr "Cualquier texto"
-
-#: src/searches/SearchBoolean.vala:160
-msgid "Title"
-msgstr "Título"
-
-#: src/searches/SearchBoolean.vala:163
-msgid "Tag"
-msgstr "Etiqueta"
-
-#: src/searches/SearchBoolean.vala:166
-msgid "Comment"
-msgstr "Comentario"
-
-#: src/searches/SearchBoolean.vala:169
-msgid "Event name"
-msgstr "Nombre del acontecimiento"
-
-#: src/searches/SearchBoolean.vala:172
-msgid "File name"
-msgstr "Nombre del archivo"
-
-#: src/searches/SearchBoolean.vala:175
-msgid "Media type"
-msgstr "Tipo de medio"
-
-#: src/searches/SearchBoolean.vala:178
-msgid "Flag state"
-msgstr "Estado de la opción"
-
-#: src/searches/SearchBoolean.vala:181
-msgid "Photo state"
-msgstr "Estado de la foto"
-
-#. Rating button
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:1199
-msgid "Rating"
-msgstr "Puntuación"
-
-#: src/searches/SearchBoolean.vala:187
-msgid "Date"
-msgstr "Fecha"
-
-#: src/SearchFilter.vala:614 src/SearchFilter.vala:615
-msgid "Videos"
-msgstr "Vídeos"
-
-#: src/SearchFilter.vala:620
-msgid "RAW Photos"
-msgstr "Fotos RAW"
-
-#: src/SearchFilter.vala:621
-msgid "RAW photos"
-msgstr "Fotos RAW"
-
-#: src/SearchFilter.vala:1148
-#, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "Error al cargar el archivo de IU %s: %s"
-
-#. Ticket #3260 - Add a 'close' context menu to
-#. the searchbar.
-#. Prepare the close menu for use, but don't
-#. display it yet; we'll connect it to secondary
-#. click later on.
-#: src/SearchFilter.vala:1159
-msgid "Close"
-msgstr "Cerrar"
-
-#. Type label and toggles
-#: src/SearchFilter.vala:1165
-msgid "Type"
-msgstr "Tipo"
-
-#: src/SearchFilter.vala:1211
-msgid "Use a saved search to filter items in the current view"
-msgstr ""
-"Utilizar una búsqueda guardada para filtrar elementos en la vista actual"
-
-#: src/sidebar/Tree.vala:203
-msgid "New _Tag…"
-msgstr "E_tiqueta nueva…"
-
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Configuración"
-
-#. Set up toolbar
-#. add toolbar buttons
-#: src/SlideshowPage.vala:160
-msgid "Back"
-msgstr "Atrás"
-
-#: src/SlideshowPage.vala:162
-msgid "Go to the previous photo"
-msgstr "Ir a la foto anterior"
-
-#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
-msgid "Pause"
-msgstr "Pausa"
-
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
-msgid "Pause the slideshow"
-msgstr "Pausar la presentación"
-
-#: src/SlideshowPage.vala:174
-msgid "Next"
-msgstr "Siguiente"
-
-#: src/SlideshowPage.vala:176
-msgid "Go to the next photo"
-msgstr "Ir a la siguiente foto"
-
-#: src/SlideshowPage.vala:184
-msgid "Change slideshow settings"
-msgstr "Cambiar la configuración de la presentación"
-
-#. An entire slideshow set might be missing, so check for a loop.
-#: src/SlideshowPage.vala:238
-msgid "All photo source files are missing."
-msgstr "Todos los archivos origen de fotos están perdidos."
-
-#: src/SlideshowPage.vala:270
-msgid "Play"
-msgstr "Reproducir"
-
-#: src/SlideshowPage.vala:271
-msgid "Continue the slideshow"
-msgstr "Continuar la presentación"
-
-#: src/slideshow/Slideshow.vala:22
-msgid "Slideshow Transitions"
-msgstr "Transiciones de diapositiva"
-
-#: src/slideshow/TransitionEffects.vala:98
-msgid "(None)"
-msgstr "(Ninguna)"
-
-#: src/slideshow/TransitionEffects.vala:287
-msgid "None"
-msgstr "Ninguna"
-
-#: src/slideshow/TransitionEffects.vala:339
-msgid "Random"
-msgstr "Aleatorio"
-
-#: src/tags/Branch.vala:131
-msgid "Tags"
-msgstr "Etiquetas"
-
-#: src/Tag.vala:830
-msgid "untitled"
-msgstr "sin título"
-
-#. multiple videos
-#: src/VideoSupport.vala:507
-msgid "Export Videos"
-msgstr "Exportar vídeos"
-
-#: ui/set_background_dialog.ui:15
-msgid "Set as Desktop Background"
-msgstr "Establecer como fondo de escritorio"
-
-#: ui/set_background_dialog.ui:77 ui/set_background_slideshow_dialog.ui:132
-msgid "Use for Desktop"
-msgstr "Usar para el escritorio"
-
-#: ui/set_background_dialog.ui:93 ui/set_background_slideshow_dialog.ui:148
-msgid "Use for Lock Screen"
-msgstr "Usar para la pantalla de bloqueo"
-
-#: ui/set_background_slideshow_dialog.ui:15
-msgid "Set as Desktop Slideshow"
-msgstr "Establecer como pase de diapositivas de escritorio"
-
-#: ui/set_background_slideshow_dialog.ui:33
-msgid "Show each photo for"
-msgstr "Mostrar cada foto para"
-
-#: ui/set_background_slideshow_dialog.ui:45
-msgid "period of time"
-msgstr "periodo de tiempo"
-
-#: ui/set_background_slideshow_dialog.ui:94
-msgid "Generate desktop background slideshow"
-msgstr "Generar un pase de diapositivas de fondo de escritorio"
-
-#: ui/set_background_slideshow_dialog.ui:115
-msgid "How long each photo is shown on the desktop background"
-msgstr "Cuánto tiempo se muestra cada foto en el fondo de escritorio"
-
-#: ui/shotwell.ui:23
-msgid "_Name of search:"
-msgstr "_Nombre de la búsqueda:"
-
-#: ui/shotwell.ui:81
-msgid "_Match"
-msgstr "_Coincidir"
-
-#: ui/shotwell.ui:108
-msgid "of the following:"
-msgstr "de los siguientes:"
-
-#: ui/shotwell.ui:195
-msgid "<b>Printed Image Size</b>"
-msgstr "<b>Tamaño de imagen impresa</b>"
-
-#: ui/shotwell.ui:212
-msgid "Use a _standard size:"
-msgstr "Utilizar un tamaño e_stándar:"
-
-#: ui/shotwell.ui:255
-msgid "Use a c_ustom size:"
-msgstr "Utilizar un tamaño p_ersonalizado:"
-
-#: ui/shotwell.ui:345
-msgid "_Match photo aspect ratio"
-msgstr "E_mparejar relación de aspecto de la foto"
-
-#: ui/shotwell.ui:369
-msgid "_Autosize:"
-msgstr "Tamaño _automático:"
-
-#: ui/shotwell.ui:409
-msgid "<b>Titles</b>"
-msgstr "<b>Títulos</b>"
-
-#: ui/shotwell.ui:426
-msgid "Print image _title"
-msgstr "Imprimir el _título de la imagen"
-
-#: ui/shotwell.ui:470
-msgid "<b>Pixel Resolution</b>"
-msgstr "<b>Resolución de píxeles</b>"
-
-#: ui/shotwell.ui:490
-msgid "_Output photo at:"
-msgstr "_Salida de foto en:"
-
-#: ui/shotwell.ui:525
-msgid "pixels per inch"
-msgstr "píxeles por pulgada"
-
-#: ui/shotwell.ui:559
-msgid "label"
-msgstr "etiqueta"
-
-#: ui/shotwell.ui:681
-msgid "Shotwell Preferences"
-msgstr "Preferencias de Shotwell"
-
-#: ui/shotwell.ui:730
-msgid "white"
-msgstr "blanco"
-
-#: ui/shotwell.ui:757
-msgid "black"
-msgstr "negro"
-
-#: ui/shotwell.ui:805
-msgid "_Watch library directory for new files"
-msgstr "_Vigilar mi colección en busca de archivos nuevos"
-
-#: ui/shotwell.ui:834
-msgid "Metadata"
-msgstr "Metadatos"
-
-#: ui/shotwell.ui:854
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr ""
-"Escribir etiquetas, títulos y otros _metadatos en los archivos de fotos"
-
-#: ui/shotwell.ui:880
-msgid "Display"
-msgstr "Mostrar"
-
-#: ui/shotwell.ui:901
-msgid "_Import photos to:"
-msgstr "_Importar fotos a:"
-
-#: ui/shotwell.ui:924
-msgid "_Background:"
-msgstr "_Fondo:"
-
-#: ui/shotwell.ui:947
-msgid "Importing"
-msgstr "Importando"
-
-#: ui/shotwell.ui:970
-msgid "_Directory structure:"
-msgstr "Estructura de _carpetas:"
-
-#: ui/shotwell.ui:1009
-msgid "_Pattern:"
-msgstr "_Patrón:"
-
-#: ui/shotwell.ui:1091
-msgid "Example:"
-msgstr "Ejemplo:"
-
-#: ui/shotwell.ui:1108
-msgid "R_ename imported files to lowercase"
-msgstr "R_enombrar los archivos importados a minúsculas"
-
-#: ui/shotwell.ui:1137
-msgid "RAW Developer"
-msgstr "Revelador RAW"
-
-#: ui/shotwell.ui:1172
-msgid "De_fault:"
-msgstr "_Predeterminado:"
-
-#: ui/shotwell.ui:1226
-msgid "E_xternal photo editor:"
-msgstr "Editor de fotos e_xterno:"
-
-#: ui/shotwell.ui:1242
-msgid "External _RAW editor:"
-msgstr "Editor _RAW externo:"
-
-#: ui/shotwell.ui:1307
-msgid "External Editors"
-msgstr "Editores externos"
-
-#: ui/shotwell.ui:1334
-msgid "Plugins"
-msgstr "Complementos"
-
-#: ui/shotwell.ui:1400
-msgid "_Delay:"
-msgstr "_Retardo:"
-
-#: ui/shotwell.ui:1416
-msgid "_Transition effect:"
-msgstr "Efecto de _transición:"
-
-#: ui/shotwell.ui:1432
-msgid "Transition d_elay:"
-msgstr "R_etraso de transición:"
-
-#: ui/shotwell.ui:1444
-msgid "Show t_itle"
-msgstr "Mostrar tít_ulo"
-
-#: ui/shotwell.ui:1534 ui/shotwell.ui:1547
-msgid "seconds"
-msgstr "segundos"
-
-#, fuzzy
-#~| msgid "Tag Photos as \"%s\""
-#~ msgid "Tag Photos as “%s”"
-#~ msgstr "Etiquetar fotos como «%s»"
-
-#, fuzzy
-#~| msgid "Tag the selected photos as \"%s\""
-#~ msgid "Tag the selected photos as “%s”"
-#~ msgstr "Etiquetar las fotos seleccionadas como «%s»"
-
-#, fuzzy
-#~| msgid "Remove Tag \"%s\" From _Photos"
-#~ msgid "Remove Tag “%s” From _Photos"
-#~ msgstr "Quitar la etiqueta «%s» de las _fotos"
-
-#, fuzzy
-#~| msgid "Remove Tag \"%s\" From Photos"
-#~ msgid "Remove Tag “%s” From Photos"
-#~ msgstr "Quitar la etiqueta «%s» de las fotos"
-
-#~ msgid "Login"
-#~ msgstr "Iniciar sesión"
-
-#~ msgid "Save Details..."
-#~ msgstr "Guardar detalles…"
-
-#~ msgid "Save _As..."
-#~ msgstr "G_uardar como…"
-
-#~ msgid "Importing..."
-#~ msgstr "Importando…"
-
-#~ msgid "Preparing to import..."
-#~ msgstr "Preparando importación…"
-
-#~ msgid "_Import From Folder..."
-#~ msgstr "_Importar desde carpeta…"
-
-#~ msgid "Import From _Application..."
-#~ msgstr "Importar desde _aplicación…"
-
-#~ msgid "Set as _Desktop Slideshow..."
-#~ msgstr "Establecer como pase de _diapositivas de escritorio…"
-
-#~ msgid "Re_name Event..."
-#~ msgstr "Re_nombrar evento…"
-
-#~ msgid "_Export..."
-#~ msgstr "_Exportar…"
-
-#~ msgid "_Print..."
-#~ msgstr "_Imprimir…"
-
-#~ msgid "Pu_blish..."
-#~ msgstr "Pu_blicar…"
-
-#~ msgid "Edit _Title..."
-#~ msgstr "Editar el _título…"
-
-#~ msgid "Edit _Comment..."
-#~ msgstr "Editar _comentario…"
-
-#~ msgid "Edit Event _Comment..."
-#~ msgstr "Editar _comentario del evento…"
-
-#~ msgid "_Adjust Date and Time..."
-#~ msgstr "_Ajustar fecha y hora…"
-
-#~ msgid "Add _Tags..."
-#~ msgstr "Añadir e_tiquetas…"
-
-#~ msgid "_Add Tags..."
-#~ msgstr "_Añadir etiquetas…"
-
-#~ msgid "Send _To..."
-#~ msgstr "En_viar a…"
-
-#~ msgid "Send T_o..."
-#~ msgstr "En_viar a…"
-
-#~ msgid "_Find..."
-#~ msgstr "Buscar…"
-
-#~ msgid "Modif_y Tags..."
-#~ msgstr "Modif_icar etiquetas…"
-
-#~ msgid "_Edit..."
-#~ msgstr "_Editar…"
-
-#~ msgid "%-I:%M %p"
-#~ msgstr "%-I:%M %p"
-
-#~ msgid "%-I:%M:%S %p"
-#~ msgstr "%-I:%M:%S %p"
-
-#~ msgid "Intro message replaced at runtime"
-#~ msgstr "Mensaje de introducción reemplazado en tiempo de ejecución"
-
-#~ msgid "'Publishing to $url as $username' (populated in application code)"
-#~ msgstr ""
-#~ "«Publicando en $url como $username» (informado en el código de la "
-#~ "aplicación)"
-
-#~ msgid "you are logged in rajce as $name"
-#~ msgstr "ha iniciado sesión en rajce como $name"
-
-#~ msgid "$mediatype will appear in"
-#~ msgstr "$mediatype aparecerá en"
-
-#~ msgid "Copyright 2009-2015 Yorba Foundation"
-#~ msgstr "Copyright 2009-2015 Fundación Yorba"
-
-#~ msgid "Visit the Yorba web site"
-#~ msgstr "Visitar el sitio web de Yorba"
-
-#, fuzzy
-#~| msgid ""
-#~| "A file required for publishing is unavailable. Publishing to Flickr "
-#~| "can't continue."
-#~ msgid "A file required for publishing is unavailable. Publishing to "
-#~ msgstr ""
-#~ "No está disponible un archivo necesario para publicar. La publicación en "
-#~ "Flickr no puede continuar."
-
-#~ msgid "Only _Remove"
-#~ msgstr "Solo quita_r"
-
-#~ msgid "Shotwell is configured to import photos to your home directory.\n"
-#~ msgstr ""
-#~ "Shotwell está configurado para importar fotos desde su carpeta personal.\n"
-
-#~ msgid ""
-#~ " (text depends on fb username and is modified in the app - \n"
-#~ "anything put into this field won't display)"
-#~ msgstr ""
-#~ " (el texto depende del nombre de usuario de Facebook y se modifica en la "
-#~ "aplicación;\n"
-#~ "no se mostrará el contenido de este campo)"
-
-#~ msgid ""
-#~ "You are logged into Flickr as (name).\n"
-#~ "\n"
-#~ "(this label's string is populated and set inside the code, \n"
-#~ "so changes made here will not display)"
-#~ msgstr ""
-#~ "Ha iniciado sesión en Flickr como (name).\n"
-#~ "\n"
-#~ "(la etiqueta de esta cadena se rellena y se ubica en el código, \n"
-#~ "y los cambios hechos aquí no se mostrarán)"
-
-#~ msgid "_visibility label (populated in the code)"
-#~ msgstr "etiqueta de _visibilidad (rellenada en el código)"
-
-#~ msgid ""
-#~ "$mediatype will appear in\n"
-#~ "(populated in code)"
-#~ msgstr ""
-#~ "$mediatype aparecerá en\n"
-#~ "(rellenado en el código)"
-
-#~ msgid ""
-#~ "You are logged into Tumblr as (name).\n"
-#~ "\n"
-#~ "(this label's string is populated and set inside the code, \n"
-#~ "so changes made here will not display)"
-#~ msgstr ""
-#~ "Ha iniciado sesión en Tumblr como (nombre).\n"
-#~ "\n"
-#~ "(la etiqueta de esta cadena se rellena y se ubica en el código, \n"
-#~ "y los cambios hechos aquí no se mostrarán)"
+#
+#
+#
+#
+#
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2014, 2015, 2016.
, 2017. +# +msgid "" +msgstr "" +"Project-Id-Version: shotwell-0.15\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" +"product=shotwell&keywords=I18N+L10N&component=Internationalization\n" +"POT-Creation-Date: 2017-04-02 16:28+0000\n" +"PO-Revision-Date: 2017-04-17 12:52+0200\n" +"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n" +"Language-Team: es <gnome-es-list@gnome.org>\n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.6\n" + +#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4 +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:115 +#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:356 +#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346 +#: ui/tags.ui:356 +msgid "Shotwell" +msgstr "Shotwell" + +#: misc/shotwell.appdata.xml.in:9 +msgid "Popular photo manager" +msgstr "Gestor de fotos popular" + +#: misc/shotwell.appdata.xml.in:11 +msgid "" +"Shotwell is an easy-to-use, fast photo organizer designed for the GNOME " +"desktop. It allows you to import photos from your camera or disk, organize " +"them by date and subject matter, even ratings. It also offers basic photo " +"editing, like crop, red-eye correction, color adjustments, and straighten. " +"Shotwell’s non-destructive photo editor does not alter your master photos, " +"making it easy to experiment and correct errors." +msgstr "" +"Shotwell es un organizador de fotos fácil de usar, diseñado para el " +"escritorio GNOME. Le permite importar fotos de su cámara o disco, " +"organizarlas por fecha y asunto o por puntuación. También ofree edición " +"básica, como recortar, eliminar ojos rojos, ajustes de color y enderezar. El " +"editor no destructivo de Shotwell no altera las fotos originales, haciendo " +"que sea más fácil experimentar y corregir errores." + +#: misc/shotwell.appdata.xml.in:18 +msgid "" +"When ready, Shotwell can upload your photos to various web sites, such as " +"Facebook, Flickr, Picasa (Google Plus), and more." +msgstr "" +"Cuando esté preparado, Shotwell puede subir sus fotos a varios sitios web, " +"tales como Facebook, Flickr, Picasa (Google Plus) y más" + +#: misc/shotwell.appdata.xml.in:22 +msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats." +msgstr "Shotwell soporta JPEG, PNG, TIFF, y varios formatos de archivos RAW." + +#: misc/shotwell.appdata.xml.in:52 +#| msgid "Shotwell Viewer" +msgid "The Shotwell developers" +msgstr "Los desarrolladores de Shotwell" + +#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17 +msgid "Photo Manager" +msgstr "Gestor de fotos" + +#: misc/shotwell.desktop.in.in:6 +msgid "Organize your photos" +msgstr "Organice sus fotos" + +#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: misc/shotwell.desktop.in.in:8 +msgid "" +"album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;" +"organize;photo;photographs;photos;picture;pictures;photography;print;publish;" +"rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;" +msgstr "" +"álbum;cámara;cámaras;recortar;editar;mejorar;exportar;galería;imagen;" +"imágenes;importar;organizar;foto;fotográfos;fotos;fotografía;imprimir;" +"publicar;rotar;compartir;etiquetas;vídeo;facebook;flickr;picasa;youtube;" +"piwigo;" + +#. Translators: Do NOT translate or transliterate this text (this is an icon file name)! +#: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8 +msgid "shotwell" +msgstr "shotwell" + +#: misc/shotwell-viewer.desktop.in.in:4 +msgid "Shotwell Viewer" +msgstr "Visor de fotos Shotwell" + +#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18 +msgid "Photo Viewer" +msgstr "Visor de fotos" + +#: misc/org.yorba.shotwell-extras.gschema.xml:6 +msgid "authentication token" +msgstr "testigo de autenticación" + +#: misc/org.yorba.shotwell-extras.gschema.xml:7 +msgid "Yandex-Fotki authentication token, if logged in." +msgstr "Testigo de autenticación en Yandex-Fotki, si ha iniciado sesión." + +#: misc/org.yorba.shotwell-extras.gschema.xml:14 +msgid "Token" +msgstr "Testigo" + +#: misc/org.yorba.shotwell-extras.gschema.xml:15 +msgid "The token to access tumblr" +msgstr "El testigo para acceder a Tumblr" + +#: misc/org.yorba.shotwell-extras.gschema.xml:20 +msgid "Secret token" +msgstr "Testigo secreto" + +#: misc/org.yorba.shotwell-extras.gschema.xml:21 +msgid "The secret token to sign oauth requests" +msgstr "El testigo secreto para firmar peticiones oauth" + +#: misc/org.yorba.shotwell-extras.gschema.xml:26 +#: misc/org.yorba.shotwell.gschema.xml:486 +msgid "default size" +msgstr "tamaño predeterminado" + +#: misc/org.yorba.shotwell-extras.gschema.xml:27 +msgid "" +"A numeric code representing the default size for photos uploaded to Tumblr" +msgstr "" +"Un código numérico que representa el tamaño predeterminado de las fotos " +"subidas a Tumblr" + +#: misc/org.yorba.shotwell-extras.gschema.xml:32 +msgid "default blog" +msgstr "blog prederminado" + +#: misc/org.yorba.shotwell-extras.gschema.xml:33 +msgid "The name of the default blog of the user, if any" +msgstr "El nombre del blog predeterminado del usuario, si existe" + +#: misc/org.yorba.shotwell-extras.gschema.xml:40 +msgid "Rajce URL" +msgstr "URL de Rajce" + +#: misc/org.yorba.shotwell-extras.gschema.xml:41 +msgid "URL of the Rajce server." +msgstr "URL del servidor Rajce." + +#: misc/org.yorba.shotwell-extras.gschema.xml:46 +#: misc/org.yorba.shotwell.gschema.xml:454 +#: misc/org.yorba.shotwell.gschema.xml:512 +#: misc/org.yorba.shotwell.gschema.xml:568 +msgid "username" +msgstr "nombre de usuario" + +#: misc/org.yorba.shotwell-extras.gschema.xml:47 +msgid "Rajce username, if logged in." +msgstr "Nombre de usuario de Rajce, si ha iniciado sesión." + +#: misc/org.yorba.shotwell-extras.gschema.xml:52 +msgid "token" +msgstr "testigo" + +#: misc/org.yorba.shotwell-extras.gschema.xml:53 +msgid "user token, if remembered." +msgstr "testigo de usuario, si se recuerda." + +#: misc/org.yorba.shotwell-extras.gschema.xml:58 +#: misc/org.yorba.shotwell.gschema.xml:530 +msgid "last category" +msgstr "última categoría" + +#: misc/org.yorba.shotwell-extras.gschema.xml:59 +msgid "The last selected Rajce category." +msgstr "La última categoría de Rajce seleccionada." + +#: misc/org.yorba.shotwell-extras.gschema.xml:64 +#: misc/org.yorba.shotwell.gschema.xml:542 +msgid "last photo size" +msgstr "último tamaño de foto" + +#: misc/org.yorba.shotwell-extras.gschema.xml:65 +msgid "" +"A numeric code representing the last photo size preset used when publishing " +"to Rajce." +msgstr "" +"Un código numérico que representa el último tamaño de foto predefinido usado " +"para publicar en Rajce." + +#: misc/org.yorba.shotwell-extras.gschema.xml:70 +msgid "remember" +msgstr "recordar" + +#: misc/org.yorba.shotwell-extras.gschema.xml:71 +msgid "If true, remember last login." +msgstr "Si es cierto, recordar el último inicio de sesión" + +#: misc/org.yorba.shotwell-extras.gschema.xml:76 +msgid "hide album" +msgstr "ocultar álbum" + +#: misc/org.yorba.shotwell-extras.gschema.xml:77 +msgid "If true, hide the newly created Rajce album." +msgstr "Si es cierto, ocultar el nuevo álbum creado en Rajce." + +#: misc/org.yorba.shotwell-extras.gschema.xml:82 +msgid "open album in web browser" +msgstr "abrir álbum en el navegador" + +#: misc/org.yorba.shotwell-extras.gschema.xml:83 +msgid "" +"If true, open target album in the web browser just after uploading photos" +msgstr "" +"Si es cierto, abrir el álbum objetivo en el navegador web justo después de " +"subir las fotos" + +#: misc/org.yorba.shotwell-extras.gschema.xml:88 +#: misc/org.yorba.shotwell.gschema.xml:434 +#: misc/org.yorba.shotwell.gschema.xml:472 +#: misc/org.yorba.shotwell.gschema.xml:498 +#: misc/org.yorba.shotwell.gschema.xml:548 +#: misc/org.yorba.shotwell.gschema.xml:592 +msgid "remove sensitive info from uploads" +msgstr "eliminar contenido comprometido de las subidas" + +#: misc/org.yorba.shotwell-extras.gschema.xml:89 +msgid "" +"Whether images being uploaded to Rajce should have their metadata removed " +"first" +msgstr "" +"Indica si se deben eliminar los metadatos antes de subir las imágenes a Rajce" + +#: misc/org.yorba.shotwell.gschema.xml:23 +msgid "display basic properties" +msgstr "mostrar propiedades básicas" + +#: misc/org.yorba.shotwell.gschema.xml:24 +msgid "True if the basic properties pane is to be displayed, false otherwise." +msgstr "" +"Cierto si se muestra el panel de propiedades básicas, falso en otro caso." + +#: misc/org.yorba.shotwell.gschema.xml:29 +msgid "display extended properties" +msgstr "mostrar propiedades extendidas" + +#: misc/org.yorba.shotwell.gschema.xml:30 +msgid "" +"True if the extended properties window is to be displayed, false otherwise." +msgstr "" +"Cierto si se muestra la ventana de propiedades ampliadas, falso en otro caso." + +#: misc/org.yorba.shotwell.gschema.xml:35 +msgid "display sidebar" +msgstr "mostrar barra lateral" + +#: misc/org.yorba.shotwell.gschema.xml:36 +msgid "True if the sidebar is to be displayed, false otherwise." +msgstr "Cierto si se debe mostrar la barra lateral, falso en otro caso." + +#: misc/org.yorba.shotwell.gschema.xml:41 +msgid "display toolbar" +msgstr "mostrar barra de herramientas" + +#: misc/org.yorba.shotwell.gschema.xml:42 +msgid "True if the bottom toolbar is to be displayed, false otherwise." +msgstr "" +"Cierto si se debe mostrar la barra de herramientas inferior, falso en otro " +"caso." + +#: misc/org.yorba.shotwell.gschema.xml:47 +msgid "display search bar" +msgstr "mostrar barra de búsqueda" + +#: misc/org.yorba.shotwell.gschema.xml:48 +msgid "True if the Search/Filter Toolbar is to be displayed, false otherwise." +msgstr "" +"Cierto si se muestra la barra de herramientas de buscar/filtrar, falso en " +"otro caso." + +#: misc/org.yorba.shotwell.gschema.xml:53 +msgid "display photo titles" +msgstr "mostrar títulos de las fotos" + +#: misc/org.yorba.shotwell.gschema.xml:54 +msgid "" +"True if photo titles are to be displayed beneath thumbnails in collection " +"views, false otherwise." +msgstr "" +"Cierto si se deben mostrar los títulos de las fotos debajo de las miniaturas " +"en la vista de la colección, falso en otro caso." + +#: misc/org.yorba.shotwell.gschema.xml:59 +msgid "display photo comments" +msgstr "mostrar comentarios de las fotos" + +#: misc/org.yorba.shotwell.gschema.xml:60 +msgid "" +"True if photo comments are to be displayed beneath thumbnails in collection " +"views, false otherwise." +msgstr "" +"Cierto si se deben mostrar los comentarios debajo de las miniaturas en la " +"vista de la colección, falso en otro caso." + +#: misc/org.yorba.shotwell.gschema.xml:65 +msgid "display event comments" +msgstr "mostrar comentarios del evento" + +#: misc/org.yorba.shotwell.gschema.xml:66 +msgid "" +"True if event comments are to be displayed beneath thumbnails in event " +"views, false otherwise." +msgstr "" +"Cierto si se deben mostrar los comentarios debajo de las miniaturas en la " +"vista de la colección, falso en otro caso." + +#: misc/org.yorba.shotwell.gschema.xml:71 +msgid "display photo tags" +msgstr "mostrar etiquetas de las fotos" + +#: misc/org.yorba.shotwell.gschema.xml:72 +msgid "" +"True if photo tags are to be listed beneath thumbnails in collection views, " +"false otherwise." +msgstr "" +"Cierto si se deben poner en una lista las etiquetas de las fotos debajo de " +"las miniaturas en la vista de colección." + +#: misc/org.yorba.shotwell.gschema.xml:77 +msgid "display photo ratings" +msgstr "mostrar puntuación de las fotos" + +#: misc/org.yorba.shotwell.gschema.xml:78 +msgid "" +"True if a photo’s rating should be displayed as overlaid trinket, false " +"otherwise." +msgstr "" +"Cierto si se muestra el panel de propiedades básicas, falso en otro caso." + +#: misc/org.yorba.shotwell.gschema.xml:83 +msgid "rating filter level" +msgstr "nivel de filtrado de puntuación" + +#: misc/org.yorba.shotwell.gschema.xml:84 +msgid "" +"Determines how to filter photos based on their ratings. 1: Rejected or " +"better, 2: Unrated or better, 3: One or better, 4: Two or better, 5: Three " +"or better, 6: Four or better, 7: Five or better." +msgstr "" +"Determina cómo filtrar las fotos según sus calificaciones. 1: rechazada o " +"mejor, 2: sin puntuar o mejor, 3: una o mejor, 4: dos o mejor, 5: tres o " +"mejor, 6: cuatro o mejor, 7: cinco o mejor" + +#: misc/org.yorba.shotwell.gschema.xml:89 +msgid "sort events ascending" +msgstr "ordenar eventos ascendentemente" + +#: misc/org.yorba.shotwell.gschema.xml:90 +msgid "True if events should be sorted ascending, false if descending." +msgstr "" +"Cierto si se deben clasificar los eventos ascendentemente, falso si " +"descendentemente." + +#: misc/org.yorba.shotwell.gschema.xml:95 +msgid "sort library photos ascending" +msgstr "ordenar fotos de la biblioteca ascendentemente" + +#: misc/org.yorba.shotwell.gschema.xml:96 +msgid "True if library photos should be sorted ascending, false if descending." +msgstr "" +"Cierto si se debe clasificar la biblioteca de fotos ascendentemente, falso " +"si descendentemente." + +#: misc/org.yorba.shotwell.gschema.xml:101 +msgid "sort library photos criteria" +msgstr "criterio de ordenación de fotos en la biblioteca" + +#: misc/org.yorba.shotwell.gschema.xml:102 +msgid "" +"A numeric code that specifies the sort criteria for photos in library views." +msgstr "" +"Un código numérico que representa el criterio de ordenación de las fotos el " +"vistas de biblioteca." + +#: misc/org.yorba.shotwell.gschema.xml:107 +msgid "sort event photos ascending" +msgstr "ordenar fotos de eventos ascendentemente" + +#: misc/org.yorba.shotwell.gschema.xml:108 +msgid "True if event photos should be sorted ascending, false if descending." +msgstr "" +"Cierto si se deben ordenar las fotos de eventos ascendentemente, falso si es " +"descendentemente." + +#: misc/org.yorba.shotwell.gschema.xml:113 +msgid "sort event photos criteria" +msgstr "criterio de ordenación de las fotos de eventos" + +#: misc/org.yorba.shotwell.gschema.xml:114 +msgid "Specifies the sort criteria for event photos." +msgstr "Especifica el criterio de ordenación de las fotos de eventos." + +#: misc/org.yorba.shotwell.gschema.xml:119 +msgid "use 24 hour time" +msgstr "usar formato de 24 horas" + +#: misc/org.yorba.shotwell.gschema.xml:120 +msgid "" +"True if should display times with a 24 hour clock, false if times should use " +"AM/PM notation." +msgstr "" +"Cierto si se debe mostrar la hora con formato 24 horas, falso si se debe " +"usar el formato am/pm." + +#: misc/org.yorba.shotwell.gschema.xml:125 +msgid "keep relative time between photos" +msgstr "mantener el tiempo relativo entre fotos" + +#: misc/org.yorba.shotwell.gschema.xml:126 +msgid "" +"True if when adjusting time/date of photos, relative time should be " +"maintained. False if all photos should be set to the same time." +msgstr "" +"Cierto si cuando se ajusta la hora y la fecha de las fotos se mantiene la " +"hora relativa. Falso si todas las fotos deben ajustarse a la misma hora." + +#: misc/org.yorba.shotwell.gschema.xml:131 +msgid "modify original photo files" +msgstr "modificar archivos de fotos originales" + +#: misc/org.yorba.shotwell.gschema.xml:132 +msgid "" +"True if when adjusting time/date of photos, the original files should be " +"modified as well. False if changes are made only in the database." +msgstr "" +"Cierto si cuando ajustamos la hora y la fecha de las fotos los archivos " +"originales también se deben modificar. Falso si los cambios sólo se hacen en " +"la base de datos." + +#: misc/org.yorba.shotwell.gschema.xml:137 +msgid "show welcome dialog on startup" +msgstr "mostrar diálogo de bienvenida al inicio" + +#: misc/org.yorba.shotwell.gschema.xml:138 +msgid "" +"True if, when on startup, a welcome dialog should be shown. False if it " +"should not be shown." +msgstr "" +"Cierto si se debe mostrar un diálogo de bienvenida al inicio. Falso si no se " +"debe mostrar." + +#: misc/org.yorba.shotwell.gschema.xml:143 +msgid "sidebar position" +msgstr "posición de la barra lateral" + +#: misc/org.yorba.shotwell.gschema.xml:144 +msgid "The width, in pixels, of the sidebar" +msgstr "La anchura en píxeles de la barra lateral" + +#: misc/org.yorba.shotwell.gschema.xml:149 +msgid "photo thumbnail scale" +msgstr "escala de la miniatura de la foto" + +#: misc/org.yorba.shotwell.gschema.xml:150 +msgid "The scale of photo thumbnails, ranging from 72 to 360." +msgstr "La escala de las miniaturas de las fotos, en un rango de 72 a 360." + +#: misc/org.yorba.shotwell.gschema.xml:155 +msgid "pin toolbar state" +msgstr "estado de anclaje de la barra de herramientas" + +#: misc/org.yorba.shotwell.gschema.xml:156 +msgid "Pin toolbar in fullscreen, or not." +msgstr "Anclar o no la barra de herramientas en modo a pantalla completa." + +#: misc/org.yorba.shotwell.gschema.xml:161 +msgid "background color" +msgstr "color de fondo" + +#: misc/org.yorba.shotwell.gschema.xml:162 +msgid "A grayscale color for use as the background color." +msgstr "La escala de color que usar como color de fondo." + +#: misc/org.yorba.shotwell.gschema.xml:167 +msgid "Selection state of “hide photos” option" +msgstr "Estado de la selección de la opción «ocultar fotos»" + +#: misc/org.yorba.shotwell.gschema.xml:168 +msgid "" +"Last used selection state of the “hide photos already imported” option in " +"the import page." +msgstr "" +"Último estado de selección usado de la opción «ocultar fotos ya importadas» " +"en la página de importación." + +#: misc/org.yorba.shotwell.gschema.xml:175 +msgid "delay" +msgstr "retardo" + +#: misc/org.yorba.shotwell.gschema.xml:176 +msgid "Delay (in seconds) between photos in the slideshow." +msgstr "Retardo (en segundos) entre fotos en la presentación de diapositivas." + +#: misc/org.yorba.shotwell.gschema.xml:181 +msgid "transition delay" +msgstr "retraso de la transición" + +#: misc/org.yorba.shotwell.gschema.xml:182 +msgid "" +"The time (in seconds) that a transition runs between photos in a slideshow" +msgstr "" +"El tiempo (en segundos) que transcurre entre las fotos en una presentación " +"de diapositivas" + +#: misc/org.yorba.shotwell.gschema.xml:187 +msgid "transition effect id" +msgstr "ID del efecto de transición" + +#: misc/org.yorba.shotwell.gschema.xml:188 +msgid "" +"The name of the transition effect that will be used between photos when " +"running a slideshow" +msgstr "" +"El nombre del efecto de transición que se usará entre fotos al hacer una " +"presentación" + +#: misc/org.yorba.shotwell.gschema.xml:193 +msgid "Show title" +msgstr "Mostrar título" + +#: misc/org.yorba.shotwell.gschema.xml:194 +msgid "Whether to show the title of a photo during the slideshow" +msgstr "" +"Indica si se debe mostrar el título de una foto durante la presentación de " +"diapositivas" + +#: misc/org.yorba.shotwell.gschema.xml:201 +msgid "maximize library window" +msgstr "maximizar ventana de biblioteca" + +#: misc/org.yorba.shotwell.gschema.xml:202 +msgid "True if library application is maximized, false otherwise." +msgstr "" +"Cierto si la aplicación de biblioteca está maximizada, falso en otro caso." + +#: misc/org.yorba.shotwell.gschema.xml:207 +msgid "width of library window" +msgstr "anchura de la ventana de biblioteca" + +#: misc/org.yorba.shotwell.gschema.xml:208 +msgid "The last recorded width of the library application window." +msgstr "" +"La última anchura guardada de la ventana de la aplicación de biblioteca." + +#: misc/org.yorba.shotwell.gschema.xml:213 +msgid "height of library window" +msgstr "altura de la ventana de biblioteca" + +#: misc/org.yorba.shotwell.gschema.xml:214 +msgid "The last recorded height of the library application window." +msgstr "" +"La última altura guardada de la ventana de la aplicación de biblioteca." + +#: misc/org.yorba.shotwell.gschema.xml:219 +msgid "maximize direct-edit window" +msgstr "maximizar ventana de edición directa" + +#: misc/org.yorba.shotwell.gschema.xml:220 +msgid "True if direct-edit application is maximized, false otherwise." +msgstr "" +"Cierto si la ventana de edición directa está maximizada, falso en otro caso." + +#: misc/org.yorba.shotwell.gschema.xml:225 +msgid "width of direct-edit window" +msgstr "anchura de la ventana de edición directa" + +#: misc/org.yorba.shotwell.gschema.xml:226 +msgid "The last recorded width of the direct-edit application window." +msgstr "La última anchura guardada de la ventana de edición directa." + +#: misc/org.yorba.shotwell.gschema.xml:231 +msgid "height of direct-edit window" +msgstr "altura de la ventana de edición directa" + +#: misc/org.yorba.shotwell.gschema.xml:232 +msgid "The last recorded height of the direct-edit application window." +msgstr "La última altura guardada de la ventana de edición directa." + +#: misc/org.yorba.shotwell.gschema.xml:237 +msgid "sidebar divider position" +msgstr "posición del divisor de la barra lateral" + +#: misc/org.yorba.shotwell.gschema.xml:238 +msgid "" +"The last recorded position of the divider between the sidebar and view in " +"library application window." +msgstr "" +"La última posición registrada del divisor entre la barra lateral y la vista " +"de la ventana de la aplicación de la biblioteca." + +#: misc/org.yorba.shotwell.gschema.xml:245 +msgid "import directory" +msgstr "importar carpeta" + +#: misc/org.yorba.shotwell.gschema.xml:246 +msgid "Directory in which imported photo files are placed." +msgstr "Carpeta en la que se guardan los archivos de fotos importadas." + +#: misc/org.yorba.shotwell.gschema.xml:251 +msgid "watch library directory for new files" +msgstr "vigilar carpeta de biblioteca en busca de archivos nuevos" + +#: misc/org.yorba.shotwell.gschema.xml:252 +msgid "" +"If true, files added to the library directory are automatically imported." +msgstr "" +"Si es cierto si los archivos añadidos a la carpeta de la biblioteca se " +"importan automáticamente." + +#: misc/org.yorba.shotwell.gschema.xml:257 +msgid "write metadata to master files" +msgstr "escribir metadatos en archivos maestros" + +#: misc/org.yorba.shotwell.gschema.xml:258 +msgid "" +"If true, changes to metadata (tags, titles, etc.) are written to the master " +"photo file." +msgstr "" +"Si es cierto, los cambios en los metadatos (etiquetas, títulos, etc.) se " +"escriben al archivo de foto maestro." + +#: misc/org.yorba.shotwell.gschema.xml:263 +msgid "use lowercase filenames" +msgstr "usar nombres de archivos en minúscula" + +#: misc/org.yorba.shotwell.gschema.xml:264 +msgid "" +"If true, Shotwell will convert all filenames to lowercase when importing " +"photo files" +msgstr "" +"Si es cierto, Shotwell convertirá todos los nombres de archivos en " +"minúsculas cuando importe archivos de fotos" + +#: misc/org.yorba.shotwell.gschema.xml:269 +msgid "directory pattern" +msgstr "patrón de carpetas" + +#: misc/org.yorba.shotwell.gschema.xml:270 +msgid "" +"A string encoding a naming pattern that will be used to name photo " +"directories on import." +msgstr "" +"Una cadena que codifica un patrón de nombre que se utilizará para nombrar " +"las carpetas de fotos en la importación." + +#: misc/org.yorba.shotwell.gschema.xml:275 +msgid "directory pattern custom" +msgstr "Patrón de carpetas personalizadas" + +#: misc/org.yorba.shotwell.gschema.xml:276 +msgid "" +"A string encoding a custom naming pattern that will be used to name photo " +"directories on import." +msgstr "" +"Una cadena que codifica un patrón de nombre que se utilizará para nombrar " +"las carpetas de fotos en la importación." + +#: misc/org.yorba.shotwell.gschema.xml:281 +msgid "RAW developer default" +msgstr "desarrollador RAW predeterminado" + +#: misc/org.yorba.shotwell.gschema.xml:282 +msgid "Default option for which RAW developer Shotwell will use." +msgstr "Opción predeterminada que utilizará el desarrollador RAW Shotwell." + +#: misc/org.yorba.shotwell.gschema.xml:289 +msgid "Most-recently-used crop aspect ratio menu choice." +msgstr "Elección más reciente del menú de relación de aspecto del recorte." + +#: misc/org.yorba.shotwell.gschema.xml:290 +msgid "A numeric code representing the last crop menu choice the user made." +msgstr "" +"Un código numérico que representa la última elección del menú de recortar " +"que hizo el usuario." + +#: misc/org.yorba.shotwell.gschema.xml:294 +msgid "Most-recently-used crop custom aspect ratio’s numerator." +msgstr "" +"Numerador utilizado más recientemente de relación de aspecto del recorte " +"personalizado." + +#: misc/org.yorba.shotwell.gschema.xml:295 +msgid "" +"A nonzero, positive integer representing the width part of the last custom " +"crop ratio the user entered." +msgstr "" +"Un número entero positivo no cero que representa el ancho de la última " +"relación del recorte personalizado que el usuario introdujo." + +#: misc/org.yorba.shotwell.gschema.xml:299 +msgid "Most-recently-used crop custom aspect ratio’s denominator." +msgstr "" +"Denominador utilizado más recientemente de relación de aspecto del recorte " +"personalizado." + +#: misc/org.yorba.shotwell.gschema.xml:300 +msgid "" +"A nonzero, positive integer representing the height part of the last custom " +"crop ratio the user entered." +msgstr "" +"Un número entero positivo no cero que representa la altura de la última " +"relación del recorte personalizado que el usuario introdujo." + +#: misc/org.yorba.shotwell.gschema.xml:307 +msgid "external photo editor" +msgstr "editor de fotos externo" + +#: misc/org.yorba.shotwell.gschema.xml:308 +msgid "External application used to edit photos." +msgstr "Aplicación externa usada para editar fotos." + +#: misc/org.yorba.shotwell.gschema.xml:313 +msgid "external raw editor" +msgstr "editor RAW externo" + +#: misc/org.yorba.shotwell.gschema.xml:314 +msgid "External application used to edit RAW photos." +msgstr "Aplicación externa usada para editar fotos RAW." + +#: misc/org.yorba.shotwell.gschema.xml:352 +#: misc/org.yorba.shotwell.gschema.xml:353 +msgid "Setting in export dialog: how to trim images" +msgstr "" +"Configurando el cuadro de diálogo de exportación: cómo recortar imágenes" + +#: misc/org.yorba.shotwell.gschema.xml:358 +msgid "export metadata" +msgstr "exportar metadatos" + +#: misc/org.yorba.shotwell.gschema.xml:359 +msgid "Setting in export dialog: option to export metadata" +msgstr "" +"Configurando el cuadro de diálogo de exportación: opción para exportar " +"metadatos" + +#: misc/org.yorba.shotwell.gschema.xml:364 +msgid "format setting, special value" +msgstr "configuración de formato, valor especial" + +#: misc/org.yorba.shotwell.gschema.xml:365 +msgid "Setting in export dialog: format setting, special value" +msgstr "" +"Configurando el cuadro de diálogo de exportación: configuración de formato, " +"valor especial" + +#: misc/org.yorba.shotwell.gschema.xml:370 +msgid "format setting, type value" +msgstr "configuración de formato, valor de tipo" + +#: misc/org.yorba.shotwell.gschema.xml:371 +msgid "Setting in export dialog: format setting, type value" +msgstr "" +"Configurando el cuadro de diálogo de exportación: configuración de formato, " +"valor de tipo" + +#: misc/org.yorba.shotwell.gschema.xml:376 +msgid "JPEG quality option" +msgstr "Opción de calidad JPEG" + +#: misc/org.yorba.shotwell.gschema.xml:377 +msgid "Setting in export dialog: jpeg quality option" +msgstr "" +"Configurando el cuadro de diálogo de exportación: opción de calidad JPEG" + +#: misc/org.yorba.shotwell.gschema.xml:382 +msgid "maximal size of image" +msgstr "tamaño máximo de la imagen" + +#: misc/org.yorba.shotwell.gschema.xml:383 +msgid "Setting in export dialog: maximal size of image" +msgstr "" +"Configurando el cuadro de diálogo de exportación: tamaño máximo de la imagen" + +#: misc/org.yorba.shotwell.gschema.xml:390 +msgid "last used publishing service" +msgstr "último servicio de publicación usado" + +#: misc/org.yorba.shotwell.gschema.xml:391 +#: misc/org.yorba.shotwell.gschema.xml:397 +msgid "" +"A numeric code representing the last service to which photos were published" +msgstr "" +"Un código numérico que representa el último servicio en el que se publicaron " +"las fotos" + +#: misc/org.yorba.shotwell.gschema.xml:396 +msgid "default publishing service" +msgstr "servicio de publicación predeterminado" + +#: misc/org.yorba.shotwell.gschema.xml:410 +msgid "access token" +msgstr "testigo de acceso" + +#: misc/org.yorba.shotwell.gschema.xml:411 +msgid "Facebook OAuth token for the currently logged in session, if any" +msgstr "" +"Testigo OAuth de Facebook para el usuario que ha iniciado sesión " +"actualmente, si existe" + +#: misc/org.yorba.shotwell.gschema.xml:416 +msgid "user i.d." +msgstr "ID de usuario" + +#: misc/org.yorba.shotwell.gschema.xml:417 +msgid "Facebook user i.d. for the currently logged in user, if any" +msgstr "" +"ID del usuario de Facebook que ha iniciado sesión actualmente, si existe" + +#: misc/org.yorba.shotwell.gschema.xml:422 +msgid "user name" +msgstr "nombre de usuario" + +#: misc/org.yorba.shotwell.gschema.xml:423 +msgid "The name of the currently logged in Facebook user, if any" +msgstr "" +"El nombre del usuario que actualmente ha iniciado sesión en Facebook, si " +"existe" + +#: misc/org.yorba.shotwell.gschema.xml:428 +#: misc/org.yorba.shotwell.gschema.xml:460 +msgid "default size code" +msgstr "código de tamaño predeterminado" + +#: misc/org.yorba.shotwell.gschema.xml:429 +msgid "" +"A numeric code representing the default size for photos published to Facebook" +msgstr "" +"Un código numérico que representa el tamaño predeterminado de las fotos " +"publicadas en Facebook" + +#: misc/org.yorba.shotwell.gschema.xml:435 +msgid "" +"Whether images being uploaded to Facebook should have their metadata removed " +"first" +msgstr "" +"Indica si se deben eliminar los metadatos antes de subir las imágenes a " +"Facebook" + +#: misc/org.yorba.shotwell.gschema.xml:442 +msgid "OAuth Access Phase Token" +msgstr "Fase de acceso de testigo OAuth" + +#: misc/org.yorba.shotwell.gschema.xml:443 +msgid "The authorization token for the currently logged in Flickr user, if any" +msgstr "" +"El testigo de autenticación para el usuario que actualmente ha iniciado " +"sesión en Flickr, si existe" + +#: misc/org.yorba.shotwell.gschema.xml:448 +msgid "OAuth Access Phase Token Secret" +msgstr "Fase de acceso del testigo secreto OAuth" + +#: misc/org.yorba.shotwell.gschema.xml:449 +msgid "" +"The cryptographic secret used to sign requests against the authorization " +"token for the currently logged in Flickr user, if any" +msgstr "" +"El secreto criptográfico usado para firmar peticiones con el testigo de " +"autenticación para el usuario que actualmente ha iniciado sesión en Flickr, " +"si existe" + +#: misc/org.yorba.shotwell.gschema.xml:455 +msgid "The user name of the currently logged in Flickr user, if any" +msgstr "" +"El nombre del usuario que actualmente ha iniciado sesión en Flickr, si existe" + +#: misc/org.yorba.shotwell.gschema.xml:461 +msgid "" +"A numeric code representing the default size for photos published to Flickr" +msgstr "" +"Un código numérico que representa el tamaño predeterminado de las fotos " +"publicadas en Flickr" + +#: misc/org.yorba.shotwell.gschema.xml:466 +msgid "default visibility" +msgstr "visibilidad predeterminada" + +#: misc/org.yorba.shotwell.gschema.xml:467 +msgid "" +"A numeric code representing the default visibility for photos published to " +"Flickr" +msgstr "" +"Un código numérico que representa la visibilidad predeterminada de las fotos " +"publicadas en Flickr" + +#: misc/org.yorba.shotwell.gschema.xml:473 +msgid "" +"Whether images being uploaded to Flickr should have their metadata removed " +"first" +msgstr "" +"Indica si se deben eliminar los metadatos antes de subir las imágenes a " +"Flicrk" + +#: misc/org.yorba.shotwell.gschema.xml:480 +#: misc/org.yorba.shotwell.gschema.xml:612 +msgid "refresh token" +msgstr "actualizar testigo" + +#: misc/org.yorba.shotwell.gschema.xml:481 +msgid "" +"The OAuth token used to refresh the Picasa Web Albums session for the " +"currently logged in user, if any." +msgstr "" +"El testigo OAuth utilizado para actualizar la sesión de álbumes web de " +"Picasa para el usuario que actualmente ha iniciado sesión, si existe" + +#: misc/org.yorba.shotwell.gschema.xml:487 +msgid "" +"A numeric code representing the default size for photos uploaded to Picasa " +"Web Albums" +msgstr "" +"Un código numérico que representa el tamaño predeterminado de las fotos " +"subidas a álbumes web Picasa" + +#: misc/org.yorba.shotwell.gschema.xml:492 +#: misc/org.yorba.shotwell.gschema.xml:586 +msgid "last album" +msgstr "último álbum" + +#: misc/org.yorba.shotwell.gschema.xml:493 +#: misc/org.yorba.shotwell.gschema.xml:587 +msgid "The name of the last album the user published photos to, if any" +msgstr "" +"El nombre del último álbum en el que el usuario publicó fotos, si existe" + +#: misc/org.yorba.shotwell.gschema.xml:499 +msgid "" +"Whether images being uploaded to Picasa should have their metadata removed " +"first" +msgstr "" +"Indica si se deben eliminar los metadatos antes de subir las imágenes a " +"Picasa" + +#: misc/org.yorba.shotwell.gschema.xml:506 +msgid "Piwigo URL" +msgstr "URL de Pigwio" + +#: misc/org.yorba.shotwell.gschema.xml:507 +msgid "URL of the Piwigo server." +msgstr "URL del servidor Piwigo." + +#: misc/org.yorba.shotwell.gschema.xml:513 +msgid "Piwigo username, if logged in." +msgstr "Nombre de usuario de Piwigo, si ha iniciado sesión." + +#: misc/org.yorba.shotwell.gschema.xml:518 +msgid "password" +msgstr "contraseña" + +#: misc/org.yorba.shotwell.gschema.xml:519 +msgid "Piwigo password, if logged in." +msgstr "Contraseña de Piwigo, si ha iniciado sesión." + +#: misc/org.yorba.shotwell.gschema.xml:524 +msgid "remember password" +msgstr "recortar contraseña" + +#: misc/org.yorba.shotwell.gschema.xml:525 +msgid "If true, remember the Piwigo password." +msgstr "Si es cierto, recordar la contraseña de Piwigo." + +#: misc/org.yorba.shotwell.gschema.xml:531 +msgid "The last selected Piwigo category." +msgstr "La última categoría de Piwigo seleccionada." + +#: misc/org.yorba.shotwell.gschema.xml:536 +msgid "last permission level" +msgstr "último nivel de permisos" + +#: misc/org.yorba.shotwell.gschema.xml:537 +msgid "The last chosen Piwigo permission level." +msgstr "El último nivel de privilegios elegido el Piwigo." + +#: misc/org.yorba.shotwell.gschema.xml:543 +msgid "" +"A numeric code representing the last photo size preset used when publishing " +"to Piwigo." +msgstr "" +"Un código numérico que representa el último tamaño de foto predefinido usado " +"para publicar en Piwigo." + +#: misc/org.yorba.shotwell.gschema.xml:549 +msgid "" +"Whether images being uploaded to Piwigo should have their metadata removed " +"first" +msgstr "" +"Indica si se deben eliminar los metadatos antes de subir las imágenes a " +"Piwigo" + +#: misc/org.yorba.shotwell.gschema.xml:554 +msgid "" +"if title is set and comment unset, use title as comment for uploads to Piwigo" +msgstr "" +"si se definió el titulo pero no un comentario, usar el título como " +"comentario para las subidas a Piwigo" + +#: misc/org.yorba.shotwell.gschema.xml:555 +msgid "" +"Whether images being uploaded to Piwigo should have their comment set from " +"the title if title is set and comment unset" +msgstr "" +"Indica si las imágenes que se vayan a subir a Piwigo deben tener un " +"comentario a partir del título, si tiene, y no tiene comentario" + +#: misc/org.yorba.shotwell.gschema.xml:560 +msgid "do not upload tags when uploading to Piwigo" +msgstr "no subir etiquetas al subir a Piwigo" + +#: misc/org.yorba.shotwell.gschema.xml:561 +msgid "" +"Whether images being uploaded to Piwigo should have their tags removed on " +"upload, such that these tags will not appear on the remote Piwigo server." +msgstr "" +"Indica si se deben eliminar las etiquetas antes de subir las imágenes a " +"Piwigo, para que esas etiquetas no aparezcan en el servidor remoto de Piwigo." + +#: misc/org.yorba.shotwell.gschema.xml:569 +msgid "Gallery3 username" +msgstr "Nombre de usuario de Gallery3" + +#: misc/org.yorba.shotwell.gschema.xml:574 +msgid "API key" +msgstr "Clave de la API" + +#: misc/org.yorba.shotwell.gschema.xml:575 +msgid "Gallery3 API key" +msgstr "Clave de la API de Gallery3" + +#: misc/org.yorba.shotwell.gschema.xml:580 +msgid "URL" +msgstr "URL" + +#: misc/org.yorba.shotwell.gschema.xml:581 +msgid "Gallery3 site URL" +msgstr "URL de Gallery3" + +#: misc/org.yorba.shotwell.gschema.xml:593 +msgid "" +"Indicates whether images being uploaded to Gallery3 should have their " +"metadata removed first" +msgstr "" +"Indica si se deben eliminar los metadatos antes de subir las imágenes a " +"Gallery3" + +#: misc/org.yorba.shotwell.gschema.xml:598 +msgid "scaling constraint of uploaded picture" +msgstr "restricción de escala de una foto subida" + +#: misc/org.yorba.shotwell.gschema.xml:599 +msgid "The scaling constraint ID of the picture to be uploaded" +msgstr "El ID de la restricción de escala de la foto que se subirá" + +#: misc/org.yorba.shotwell.gschema.xml:604 +msgid "pixels of the major axis uploaded picture" +msgstr "píxeles del eje principal de la foto subida" + +#: misc/org.yorba.shotwell.gschema.xml:605 +msgid "" +"The pixels of the major axis of the picture to be uploaded; used only if " +"scaling-constraint-id is an appropriate value" +msgstr "" +"Los píxeles del eje principal de la foto que se subirá; usados solo si el ID " +"de la restricción de escala tiene un valor adecuado" + +#: misc/org.yorba.shotwell.gschema.xml:613 +msgid "" +"The OAuth token used to refresh the YouTube session for the currently logged " +"in user, if any." +msgstr "" +"El testigo OAuth usado para actualizar la sesión de Youtube para el usuario " +"que ha iniciado sesión actualmente, si existe." + +#: misc/org.yorba.shotwell.gschema.xml:620 +msgid "last used import service" +msgstr "último servicio de importación usado" + +#: misc/org.yorba.shotwell.gschema.xml:621 +msgid "" +"A numeric code representing the last service from which photos were imported" +msgstr "" +"Un código numérico que representa el último servicio del que se importaron " +"fotos" + +#: misc/org.yorba.shotwell.gschema.xml:628 +msgid "interpreter state cookie" +msgstr "cookie de estado del intérprete" + +#: misc/org.yorba.shotwell.gschema.xml:629 +msgid "" +"A numeric code that captures the state of the GStreamer plug-in environment" +msgstr "" +"Un código numérico que captura el estado del entorno del complemento " +"GStreamer" + +#: misc/org.yorba.shotwell.gschema.xml:636 +msgid "content layout mode" +msgstr "modo de distribución del contenido" + +#: misc/org.yorba.shotwell.gschema.xml:637 +msgid "" +"A numeric code that describes how photos are laid out on the page during " +"printing" +msgstr "" +"Un código numérico que representa cuántas fotos aparecen en la página al " +"imprimir" + +#: misc/org.yorba.shotwell.gschema.xml:642 +msgid "content ppi" +msgstr "ppp del contenido" + +#: misc/org.yorba.shotwell.gschema.xml:643 +msgid "The number of pixels per inch (ppi) sent to the printer during printing" +msgstr "" +"El número de píxeles por pulgada (ppp) enviado a la impresora al imprimir" + +#: misc/org.yorba.shotwell.gschema.xml:648 +msgid "content width" +msgstr "anchura del contenido" + +#: misc/org.yorba.shotwell.gschema.xml:649 +msgid "The width of the printed emulsion on the page when printing" +msgstr "La anchura de la emulsión impresa en la página al imprimir" + +#: misc/org.yorba.shotwell.gschema.xml:654 +msgid "content height" +msgstr "altura del contenido" + +#: misc/org.yorba.shotwell.gschema.xml:655 +msgid "The height of the printed emulsion on the page when printing" +msgstr "La altura de la emulsión impresa en la página al imprimir" + +#: misc/org.yorba.shotwell.gschema.xml:660 +msgid "content units" +msgstr "unidades del contenido" + +#: misc/org.yorba.shotwell.gschema.xml:661 +msgid "" +"A numeric code representing unit of measure (inches or centimeters) used " +"when printing" +msgstr "" +"Un código numérico que representa la unidad de medida (pulgadas o " +"centímetros) usada al imprimir" + +#: misc/org.yorba.shotwell.gschema.xml:666 +msgid "images per page code" +msgstr "código de imágenes por página" + +#: misc/org.yorba.shotwell.gschema.xml:667 +msgid "" +"A numeric code representing the currently selected images per page mode used " +"when printing" +msgstr "" +"Un código numérico que representa el modo usado de imágenes por página " +"seleccionadas actualmente al imprimir" + +#: misc/org.yorba.shotwell.gschema.xml:672 +msgid "size selection" +msgstr "tamaño de la selección" + +#: misc/org.yorba.shotwell.gschema.xml:673 +msgid "" +"The index of the current print size in a pre-defined list of standard sizes" +msgstr "" +"El índice del tamaño de impresión actual en una lista de tamaños estándar " +"predefinidos" + +#: misc/org.yorba.shotwell.gschema.xml:678 +msgid "match aspect ratio" +msgstr "coincidir con relación de aspecto" + +#: misc/org.yorba.shotwell.gschema.xml:679 +msgid "" +"Determines whether custom print sizes must match the aspect ratio of the " +"original photo" +msgstr "" +"Determina si los tamaños de impresión personalizados deben coincidir con la " +"relación de aspecto de la fotografía original" + +#: misc/org.yorba.shotwell.gschema.xml:684 +msgid "print titles" +msgstr "imprimir títulos" + +#: misc/org.yorba.shotwell.gschema.xml:685 +msgid "" +"True if the title of a photo should be printed when the photo is printed, " +"false otherwise." +msgstr "" +"Cierto si se debe imprimir el título de la foto al imprimirla, falso en otro " +"caso." + +#: misc/org.yorba.shotwell.gschema.xml:690 +msgid "titles font" +msgstr "tipografía de los títulos" + +#: misc/org.yorba.shotwell.gschema.xml:691 +msgid "The name of the font to use for photo titles when they are printed." +msgstr "El nombre de la tipografía que usar cuando se imprimen los títulos." + +#: misc/org.yorba.shotwell.gschema.xml:702 +msgid "enable facebook publishing plugin" +msgstr "activar complemento de publicación en Facebook" + +#: misc/org.yorba.shotwell.gschema.xml:703 +msgid "True if the Facebook publishing plugin is enabled, false otherwise" +msgstr "" +"Cierto si el complemento de publicación en Facebook está activado, falso en " +"otro caso" + +#: misc/org.yorba.shotwell.gschema.xml:708 +msgid "enable flickr publishing plugin" +msgstr "activar complemento de publicación en Flickr" + +#: misc/org.yorba.shotwell.gschema.xml:709 +msgid "True if the Flickr publishing plugin is enabled, false otherwise" +msgstr "" +"Cierto si el complemento de publicación en Flickr está activado, falso en " +"otro caso" + +#: misc/org.yorba.shotwell.gschema.xml:714 +msgid "enable picasa publishing plugin" +msgstr "activar complemento de publicación en Picasa" + +#: misc/org.yorba.shotwell.gschema.xml:715 +msgid "" +"True if the Picasa Web Albums publishing plugin is enabled, false otherwise" +msgstr "" +"Cierto si el complemento de publicación en álbumes web Picasa está activado, " +"falso en otro caso" + +#: misc/org.yorba.shotwell.gschema.xml:720 +msgid "enable youtube publishing plugin" +msgstr "activar complemento de publicación en Youtube" + +#: misc/org.yorba.shotwell.gschema.xml:721 +msgid "True if the YouTube publishing plugin is enabled, false otherwise" +msgstr "" +"Cierto si el complemento de publicación en Youtube está activado, falso en " +"otro caso" + +#: misc/org.yorba.shotwell.gschema.xml:726 +msgid "enable piwigo publishing plugin" +msgstr "activar complemento de publicación en Piwigo" + +#: misc/org.yorba.shotwell.gschema.xml:727 +msgid "True if the Piwigo publishing plugin is enabled, false otherwise" +msgstr "" +"Cierto si el complemento de publicación en Piwigo está activado, falso en " +"otro caso" + +#: misc/org.yorba.shotwell.gschema.xml:732 +msgid "enable yandex publishing plugin" +msgstr "activar complemento de publicación en Yandex" + +#: misc/org.yorba.shotwell.gschema.xml:733 +msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise" +msgstr "" +"Cierto si el complemento de publicación en Yandex.Fotki está activado, falso " +"en otro caso" + +#: misc/org.yorba.shotwell.gschema.xml:738 +msgid "enable tumblr publishing plugin" +msgstr "activar complemento de publicación en Tumblr" + +#: misc/org.yorba.shotwell.gschema.xml:739 +msgid "True if the Tumblr publishing plugin is enabled, false otherwise" +msgstr "" +"Cierto si el complemento de publicación en Tumblr está activado, falso en " +"otro caso" + +#: misc/org.yorba.shotwell.gschema.xml:744 +msgid "enable rajce publishing plugin" +msgstr "activar complemento de publicación en Rajce" + +#: misc/org.yorba.shotwell.gschema.xml:745 +msgid "True if the Rajce publishing plugin is enabled, false otherwise" +msgstr "" +"Cierto si el complemento de publicación en Rajce está activado, falso en " +"otro caso" + +#: misc/org.yorba.shotwell.gschema.xml:750 +msgid "enable gallery3 publishing plugin" +msgstr "activar complemento de publicación en Gallery3" + +#: misc/org.yorba.shotwell.gschema.xml:751 +msgid "True if the Gallery3 publishing plugin is enabled, false otherwise" +msgstr "" +"Cierto si el complemento de publicación en Gallery3 está activado, falso en " +"otro caso" + +#: misc/org.yorba.shotwell.gschema.xml:756 +msgid "enable F-Spot import plugin" +msgstr "activar complemento de importación de F-Spot" + +#: misc/org.yorba.shotwell.gschema.xml:757 +msgid "True if the F-Spot import plugin is enabled, false otherwise" +msgstr "" +"Cierto si el complemento de importación de F-Spot está activado, falso en " +"otro caso" + +#: misc/org.yorba.shotwell.gschema.xml:762 +msgid "enable slideshow crumble transition" +msgstr "activar transición de desmenuzado del pase de diapositivas" + +#: misc/org.yorba.shotwell.gschema.xml:763 +msgid "" +"True if the Crumble slideshow transition plugin is enabled, false otherwise" +msgstr "" +"Cierto si el complemento de transición de desmoronar está activado, falso en " +"otro caso" + +#: misc/org.yorba.shotwell.gschema.xml:768 +msgid "enable slideshow fade transition" +msgstr "activar transición de fundido del pase de diapositivas" + +#: misc/org.yorba.shotwell.gschema.xml:769 +msgid "" +"True if the Fade slideshow transition plugin is enabled, false otherwise" +msgstr "" +"Cierto si el complemento de transición de fundido está activado, falso en " +"otro caso" + +#: misc/org.yorba.shotwell.gschema.xml:774 +msgid "enable slideshow slide transition" +msgstr "activar transición lateral del pase de diapositivas" + +#: misc/org.yorba.shotwell.gschema.xml:775 +msgid "" +"True if the Slide slideshow transition plugin is enabled, false otherwise" +msgstr "" +"Cierto si el complemento de transición lateral está activado, falso en otro " +"caso" + +#: misc/org.yorba.shotwell.gschema.xml:780 +msgid "enable slideshow clock transition" +msgstr "activar transición de reloj del pase de diapositivas" + +#: misc/org.yorba.shotwell.gschema.xml:781 +msgid "" +"True if the Clock slideshow transition plugin is enabled, false otherwise" +msgstr "" +"Cierto si el complemento de transición de reloj está activado, falso en otro " +"caso" + +#: misc/org.yorba.shotwell.gschema.xml:786 +msgid "enable slideshow circle transition" +msgstr "activar transición circular del pase de diapositivas" + +#: misc/org.yorba.shotwell.gschema.xml:787 +msgid "" +"True if the Circle slideshow transition plugin is enabled, false otherwise" +msgstr "" +"Cierto si el complemento de transición circular está activado, falso en otro " +"caso" + +#: misc/org.yorba.shotwell.gschema.xml:792 +#| msgid "enable slideshow circle transition" +msgid "enable slideshow circles transition" +msgstr "activar transición circular del pase de diapositivas" + +#: misc/org.yorba.shotwell.gschema.xml:793 +msgid "" +"True if the Circles slideshow transition plugin is enabled, false otherwise" +msgstr "" +"Cierto si el complemento de transición en círculos está activado, falso en " +"otro caso" + +#: misc/org.yorba.shotwell.gschema.xml:798 +#| msgid "enable slideshow slide transition" +msgid "enable slideshow blinds transition" +msgstr "activar transición de persianas del pase de diapositivas" + +#: misc/org.yorba.shotwell.gschema.xml:799 +msgid "" +"True if the Blinds slideshow transition plugin is enabled, false otherwise" +msgstr "" +"Cierto si el complemento de transición de persianas está activado, falso en " +"otro caso" + +#: misc/org.yorba.shotwell.gschema.xml:804 +msgid "enable slideshow squares transition" +msgstr "activar transición de cuadros del pase de diapositivas" + +#: misc/org.yorba.shotwell.gschema.xml:805 +msgid "" +"True if the Squares slideshow transition plugin is enabled, false otherwise" +msgstr "" +"Cierto si el complemento de transición de cuadros está activado, falso en " +"otro caso" + +#: misc/org.yorba.shotwell.gschema.xml:810 +msgid "enable slideshow stripes transition" +msgstr "activar transición de bandas del pase de diapositivas" + +#: misc/org.yorba.shotwell.gschema.xml:811 +msgid "" +"True if the Stripes slideshow transition plugin is enabled, false otherwise" +msgstr "" +"Cierto si el complemento de transición de bandas está activado, falso en " +"otro caso" + +#: misc/org.yorba.shotwell.gschema.xml:816 +msgid "enable slideshow chess transition" +msgstr "activar transición de ajedrez del pase de diapositivas" + +#: misc/org.yorba.shotwell.gschema.xml:817 +msgid "" +"True if the Chess-Board slideshow transition plugin is enabled, false " +"otherwise" +msgstr "" +"Cierto si el complemento de transición de tablero de ajedrez está activado, " +"falso en otro caso" + +#: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:166 +msgid "" +"You are not currently logged into Facebook.\n" +"\n" +"If you don’t yet have a Facebook account, you can create one during the " +"login process. During login, Shotwell Connect may ask you for permission to " +"upload photos and publish to your feed. These permissions are required for " +"Shotwell Connect to function." +msgstr "" +"Actualmente no ha iniciado sesión en Facebook.\n" +"\n" +"Si no tiene una cuenta de Facebook, puede crear una durante el proceso de " +"inicio de sesión. Durante el inicio de sesión, Shotwell Connect le puede " +"pedir permiso para subir fotos y publicar en su muro. Estos permisos son " +"necesarios para que Shotwell Connect funcione." + +#: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:168 +msgid "" +"You have already logged in and out of Facebook during this Shotwell " +"session.\n" +"To continue publishing to Facebook, quit and restart Shotwell, then try " +"publishing again." +msgstr "" +"Ya ha iniciado y cerrado sesión de Facebook durante esta sesión de " +"Shotwell.\n" +"Para seguir publicando en Facebook, cierre y reinicie Shotwell, e intente " +"publicar de nuevo." + +#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:17 +msgid "" +"Enter the confirmation number which appears after you log into Flickr in " +"your Web browser." +msgstr "" +"Introduzca el número de confirmación que aparece en su navegador web después " +"de iniciar sesión en Flickr." + +#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:37 +msgid "Authorization _Number:" +msgstr "_Número de autorización:" + +#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70 +#: src/Dialogs.vala:128 +msgid "Con_tinue" +msgstr "Con_tinuar" + +#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:187 +msgid "" +"You are not currently logged into Flickr.\n" +"\n" +"Click Log in to log into Flickr in your Web browser. You will have to " +"authorize Shotwell Connect to link to your Flickr account." +msgstr "" +"Actualmente no ha iniciado sesión en Flickr.\n" +"\n" +"Pulse Iniciar sesión para identificarse en Flickr en su navegador web. " +"Tendrá que autorizar a Shotwell Connect para que se enlace a su cuenta de " +"Flickr." + +#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364 +msgid "Preparing for login…" +msgstr "Preparándose para iniciar sesión…" + +#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:468 +#: plugins/shotwell-publishing/FlickrPublishing.vala:341 +msgid "" +"A file required for publishing is unavailable. Publishing to Flickr can’t " +"continue." +msgstr "" +"No está disponible un archivo necesario para publicar. La publicación en " +"Flickr no puede continuar." + +#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:481 +msgid "Verifying authorization…" +msgstr "Comprobando la autorización…" + +#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:118 +msgid "" +"You have already logged in and out of a Google service during this Shotwell " +"session.\n" +"\n" +"To continue publishing to Google services, quit and restart Shotwell, then " +"try publishing again." +msgstr "" +"Ya ha iniciado y cerrado sesión de Google durante esta sesión de Shotwell.\n" +"Para seguir publicando en servicios de Google, cierre y reinicie Shotwell, e " +"intente publicar de nuevo." + +#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:31 +msgid "" +"You are not currently logged into Picasa Web Albums.\n" +"\n" +"Click Log in to log into Picasa Web Albums in your Web browser. You will " +"have to authorize Shotwell Connect to link to your Picasa Web Albums account." +msgstr "" +"Actualmente no ha iniciado sesión en Álbumes web de Picasa.\n" +"\n" +"Pulse Iniciar sesión para identificarse en Álbumes web de Picasa en su " +"navegador web. Tendrá que autorizar a Shotwell Connect para que se enlace a " +"su cuenta de Álbumes web de Picasa." + +#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34 +msgid "" +"You are not currently logged into YouTube.\n" +"\n" +"You must have already signed up for a Google account and set it up for use " +"with YouTube to continue. You can set up most accounts by using your browser " +"to log into the YouTube site at least once." +msgstr "" +"No ha iniciado sesión en YouTube.\n" +"\n" +"Debe haber registrado una cuenta de Google y configurarla para utilizarla " +"con YouTube para continuar. Puede configurar la mayoría de cuentas mediante " +"el uso de su navegador para registrarse en el sitio de YouTube al menos una " +"vez." + +#: plugins/common/Resources.vala:12 +msgid "Visit the Shotwell home page" +msgstr "Visite la página web de Shotwell" + +#: plugins/common/Resources.vala:31 src/AppWindow.vala:605 +msgid "translator-credits" +msgstr "" +"Daniel Mustieles <daniel.mustieles@gmail.com>, 2014-2016\n" +"Adolfo Jayme Barrientos <fitoschido@ubuntu.com>, 2011–2013\n" +"Claudio Rodrigo Pereyra Diaz <elsupergomez@fedoraproject.org>, 2011–2013\n" +"monkey.libre <monkey.libre@gmail.com>\n" +"Jorge González <jorgegonz@svn.gnome.org>, 2011\n" +"José Luis Navarro <jlnavarro111@gmail.com>" + +#. Possible error message when a site presents a bad certificate. +#: plugins/common/RESTSupport.vala:202 +msgid "" +"⚫ This website presented identification that belongs to a different website." +msgstr "" +"⚫ Este sitio web presenta una identificación que pertenece a un sitio web " +"diferente." + +#. Possible error message when a site presents a bad certificate. +#: plugins/common/RESTSupport.vala:207 +msgid "" +"⚫ This website’s identification is too old to trust. Check the date on your " +"computer’s calendar." +msgstr "" +"⚫ La identificación de este sitio web es demasiado antigua como para " +"confiar. Compruebe la fecha en el calendario de su equipo." + +#. Possible error message when a site presents a bad certificate. +#: plugins/common/RESTSupport.vala:212 +msgid "" +"⚫ This website’s identification was not issued by a trusted organization." +msgstr "" +"⚫ La identificación de este sitio web no ha sido emitida por una " +"organización de confianza." + +#. Possible error message when a site presents a bad certificate. +#: plugins/common/RESTSupport.vala:217 +msgid "" +"⚫ This website’s identification could not be processed. It may be corrupted." +msgstr "" +"⚫ La identificación de este sitio web no se pudo procesar. Puede estar " +"dañada." + +#. Possible error message when a site presents a bad certificate. +#: plugins/common/RESTSupport.vala:222 +msgid "" +"⚫ This website’s identification has been revoked by the trusted organization " +"that issued it." +msgstr "" +"⚫ La identificación de este sitio web ha sido revocada por la organización " +"de confianza que la emitió." + +#. Possible error message when a site presents a bad certificate. +#: plugins/common/RESTSupport.vala:227 +msgid "" +"⚫ This website’s identification cannot be trusted because it uses very weak " +"encryption." +msgstr "" +"⚫ No se puede confiar en la identificación de este sitio web porque utiliza " +"un cifrado muy débil." + +#. Possible error message when a site presents a bad certificate. +#: plugins/common/RESTSupport.vala:232 +msgid "" +"⚫ This website’s identification is only valid for future dates. Check the " +"date on your computer’s calendar." +msgstr "" +"⚫ La identificación de este sitio web sólo es válida para fechas futuras. " +"Compruebe la fecha en el calendario de su equipo." + +#: plugins/common/RESTSupport.vala:509 +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:959 +msgid "A temporary file needed for publishing is unavailable" +msgstr "No está disponible un archivo temporal necesario para la publicación" + +#: plugins/shotwell-data-imports/FSpotImporter.vala:36 +#: plugins/shotwell-publishing/FacebookPublishing.vala:33 +#: plugins/shotwell-publishing/FlickrPublishing.vala:33 +#: plugins/shotwell-publishing/PicasaPublishing.vala:33 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:33 +#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27 +msgid "Copyright 2016 Software Freedom Conservancy Inc." +msgstr "Copyright 2016 Software Freedom Conservancy Inc." + +#: plugins/shotwell-data-imports/FSpotImporter.vala:58 +msgid "" +"Welcome to the F-Spot library import service.\n" +"\n" +"Please select a library to import, either by selecting one of the existing " +"libraries found by Shotwell or by selecting an alternative F-Spot database " +"file." +msgstr "" +"Bienvenido/a al servicio de importación de F-Spot.\n" +"\n" +"Seleccione una colección a importar, ya sea eligiendo una de las colecciones " +"existentes encontradas por Shotwell o eligiendo un archivo de base de datos " +"de F-Spot alternativo." + +#: plugins/shotwell-data-imports/FSpotImporter.vala:60 +msgid "" +"Welcome to the F-Spot library import service.\n" +"\n" +"Please select an F-Spot database file." +msgstr "" +"Bienvenido/a al servicio de importación de colecciones de F-Spot.\n" +"\n" +"Seleccione un archivo de colección de F-Spot." + +#: plugins/shotwell-data-imports/FSpotImporter.vala:62 +msgid "Manually select an F-Spot database file to import:" +msgstr "Seleccionar manualmente una colección de F-Spot para importar:" + +#: plugins/shotwell-data-imports/FSpotImporter.vala:64 +msgid "" +"Cannot open the selected F-Spot database file: the file does not exist or is " +"not an F-Spot database" +msgstr "" +"No se puede abrir el archivo seleccionado de F-Spot: el archivo no existe o " +"no es un archivo de colección de F-Spot" + +#: plugins/shotwell-data-imports/FSpotImporter.vala:66 +msgid "" +"Cannot open the selected F-Spot database file: this version of the F-Spot " +"database is not supported by Shotwell" +msgstr "" +"No se puede abrir el archivo seleccionado de F-Spot: esta versión de F-Spot " +"no está soportada por Shotwell" + +#: plugins/shotwell-data-imports/FSpotImporter.vala:68 +msgid "" +"Cannot read the selected F-Spot database file: error while reading tags table" +msgstr "" +"No se puede abrir el archivo seleccionado de F-Spot: error al leer la tabla " +"de etiquetas" + +#: plugins/shotwell-data-imports/FSpotImporter.vala:70 +msgid "" +"Cannot read the selected F-Spot database file: error while reading photos " +"table" +msgstr "" +"No se puede abrir el archivo seleccionado de F-Spot: error al leer la tabla " +"de fotos" + +#: plugins/shotwell-data-imports/FSpotImporter.vala:72 +#, c-format +msgid "" +"Shotwell has found %d photos in the F-Spot library and is currently " +"importing them. Duplicates will be automatically detected and removed.\n" +"\n" +"You can close this dialog and start using Shotwell while the import is " +"taking place in the background." +msgstr "" +"Shotwell encontró %d fotos en la colección de F-Spot y está importándolas " +"ahora. Los duplicados se detectarán y eliminarán automáticamente.\n" +"\n" +"Puede cerrar este diálogo y empezar a utilizar Shotwell mientras el proceso " +"de importación ocurre en segundo plano." + +#: plugins/shotwell-data-imports/FSpotImporter.vala:86 +#, c-format +msgid "F-Spot library: %s" +msgstr "Colección de F-Spot: %s" + +#: plugins/shotwell-data-imports/FSpotImporter.vala:424 +msgid "Preparing to import" +msgstr "Preparando para importar" + +#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22 +msgid "Core Data Import Services" +msgstr "Servicios de importación de datos de núcleo" + +#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28 +msgid "_Gallery3 URL:" +msgstr "URL de _Gallery3:" + +#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:55 +msgid "_User name:" +msgstr "_Nombre de usuario:" + +#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68 +msgid "_Password:" +msgstr "_Contraseña:" + +#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108 +msgid "Go _Back" +msgstr "A_trás" + +#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125 +#: ui/shotwell.ui:1105 +msgid "_Log in" +msgstr "Iniciar _sesión" + +#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154 +msgid "API _Key:" +msgstr "_Clave de la API:" + +#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180 +msgid "or" +msgstr "o" + +#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34 +msgid "An _existing album" +msgstr "Un álbum _existente" + +#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:60 +msgid "A _new album" +msgstr "Un álbum _nuevo" + +#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86 +msgid "_Remove location, tag and camera-identifying data before uploading" +msgstr "_Quitar ubicación, etiqueta y datos de la cámara antes de subir" + +#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108 +msgid "Scaling constraint:" +msgstr "Re_stricción de escalado:" + +#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124 +msgid "pixels" +msgstr "píxeles" + +#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158 +#: plugins/shotwell-publishing/FlickrPublishing.vala:880 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1306 +#: src/Dimensions.vala:17 +msgid "Original size" +msgstr "Tamaño original" + +#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159 +#: src/Dimensions.vala:20 +msgid "Width or height" +msgstr "Anchura o altura" + +#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:203 +#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:39 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1019 +#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:105 +#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:145 +#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:177 +#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:125 +#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:142 +#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99 +msgid "_Logout" +msgstr "Cerrar _sesión" + +#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:216 +#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:220 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018 +#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:121 +#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159 +#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:192 +#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:141 +#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:156 +#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115 +#: src/CollectionPage.vala:82 src/PhotoPage.vala:2469 +msgid "_Publish" +msgstr "_Publicar" + +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:41 +msgid "Gallery3 publishing module" +msgstr "Módulo de publicación Gallery3" + +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:114 +msgid "" +"You are not currently logged into your Gallery.\n" +"\n" +"You must have already signed up for a Gallery3 account to complete the login " +"process." +msgstr "" +"No ha iniciado sesión en su Galería.\n" +"\n" +"Debe haber registrado una cuenta de Gallery3 para poder iniciar sesión." + +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:117 +msgid "Shotwell default directory" +msgstr "Carpeta predeterminada de Shotwell" + +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:801 +#, c-format +msgid "" +"\n" +"\n" +"The file “%s” may not be supported by or may be too large for this instance " +"of Gallery3." +msgstr "" +"\n" +"\n" +"El archivo «%s» puede no estar soportado o ser demasiado grande para esta " +"instancia de Gallery3." + +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:802 +msgid "" +"\n" +"Note that Gallery3 only supports the video types that Flowplayer does." +msgstr "" +"\n" +"Tenga en cuenta que Gallery3 sólo soporta los mismos tipos de vídeo que " +"Flowplayer." + +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1021 +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773 +#, c-format +msgid "" +"A file required for publishing is unavailable. Publishing to %s can’t " +"continue." +msgstr "" +"No está disponible un archivo necesario para publicar. La publicación en %s " +"no puede continuar." + +#. populate any widgets whose contents are +#. programmatically-generated +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1550 +#, c-format +msgid "Publishing to %s as %s." +msgstr "Publicar en %s como %s." + +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1817 +msgid "" +"Enter the URL for your Gallery3 site and the username and password (or API " +"key) for your Gallery3 account." +msgstr "" +"Escriba el URL de su sitio Gallery3, así como el nombre de usuario y " +"contraseña (o clave API) para su cuenta de Gallery3." + +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1818 +msgid "" +"The username and password or API key were incorrect. To try again, re-enter " +"your username and password below." +msgstr "" +"El nombre de usuario y la contraseña o la clave de la API no son correctos. " +"Para interntarlo de nuevo, vuelva a introducir su nombre y su contraseña a " +"continuación." + +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1819 +msgid "" +"The URL entered does not appear to be the main directory of a Gallery3 " +"instance. Please make sure you typed it correctly and it does not have any " +"trailing components (e.g., index.php)." +msgstr "" +"El URL introducido no parece ser la carpeta principal de una instancia de " +"Gallery3. Asegúrese de que lo ha escrito correctamente y que no tiene " +"elementos adicionales (ej. index.php)." + +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1872 +msgid "Unrecognized User" +msgstr "Usuario no reconocido" + +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1877 +msgid " Site Not Found" +msgstr " Sitio no encontrado" + +#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892 +#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42 +msgid "_Email address" +msgstr "Dirección de correo _electrónico" + +#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893 +#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:82 +#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119 +msgid "_Password" +msgstr "_Contraseña" + +#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:894 +msgid "_Remember" +msgstr "_Recordar" + +#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895 +#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104 +#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154 +msgid "Log in" +msgstr "Iniciando sesión…" + +#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015 +msgid "An _existing album:" +msgstr "Un álbum _existente:" + +#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:123 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016 +msgid "A _new album named:" +msgstr "Un álbum _nuevo:" + +#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:141 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1006 +msgid "_Hide album" +msgstr "_Ocultar álbum" + +#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:156 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017 +msgid "Open target _album in browser" +msgstr "Abrir ál_bum objetivo en el navegador" + +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:40 +msgid "Copyright © 2013 rajce.net" +msgstr "Copyright (C) 2013 rajce.net" + +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:744 +msgid "An error message occurred when publishing to Rajce. Please try again." +msgstr "Ocurrió un error al publicar en Rajce. Inténtelo de nuevo." + +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:833 +msgid "Enter email and password associated with your Rajce account." +msgstr "" +"Escriba el nombre de usuario y contraseña asociados con su cuenta de Rajce." + +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:834 +msgid "Invalid email and/or password. Please try again" +msgstr "Usuario y/o contraseña no válidos. Inténtelo de nuevo" + +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:865 +msgid "Invalid User Email or Password" +msgstr "Nombre de usuario o contraseña no válidos" + +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013 +#, c-format +msgid "You are logged into Rajce as %s." +msgstr "Ha iniciado sesión en Rajce como %s." + +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014 +#: plugins/shotwell-publishing/PicasaPublishing.vala:571 +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:20 +msgid "Photos will appear in:" +msgstr "Las fotos aparecen en:" + +#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31 +msgid "Shotwell Extra Publishing Services" +msgstr "Servicios de publicación adicionales de Shotwell" + +#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44 +msgid "Blogs:" +msgstr "Blogs:" + +#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59 +#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61 +msgid "Photo _size:" +msgstr "_Tamaño de la foto:" + +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36 +msgid "Copyright 2012 BJA Electronics" +msgstr "Copyright 2012 BJA Electronics" + +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105 +#: plugins/shotwell-publishing/FlickrPublishing.vala:876 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302 +msgid "500 × 375 pixels" +msgstr "500 × 375 píxeles" + +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106 +#: plugins/shotwell-publishing/FlickrPublishing.vala:877 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303 +msgid "1024 × 768 pixels" +msgstr "1024 × 768 píxeles" + +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107 +msgid "1280 × 853 pixels" +msgstr "1280 × 853 píxeles" + +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:311 +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:321 +#, c-format +msgid "“%s” isn’t a valid response to an OAuth authentication request" +msgstr "«%s» no es una respuesta válida a una solicitud de autenticación OAuth" + +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559 +msgid "" +"TumblrPublisher: start( ): can’t start; this publisher is not restartable." +msgstr "" +"TumblrPublisher: start( ): no puede iniciar, este publicador no es " +"reiniciable." + +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587 +msgid "Enter the username and password associated with your Tumblr account." +msgstr "" +"Escriba el nombre de usuario y contraseña asociados con su cuenta de Tumblr." + +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081 +msgid "Username and/or password invalid. Please try again" +msgstr "Usuario y/o contraseña no válidos. Inténtelo de nuevo" + +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117 +msgid "Invalid User Name or Password" +msgstr "Nombre de usuario o contraseña no válidos" + +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635 +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753 +#, c-format +msgid "Could not load UI: %s" +msgstr "No se pudo cargar la IU: %s" + +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735 +#, c-format +msgid "" +"You are logged into Tumblr as %s.\n" +"\n" +msgstr "" +"Ha iniciado sesión en Tumblr como %s.\n" +"\n" + +#: plugins/shotwell-publishing-extras/YandexPublishing.vala:22 +msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>" +msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>" + +#: plugins/shotwell-publishing-extras/YandexPublishing.vala:25 +msgid "Visit the Yandex.Fotki web site" +msgstr "Visitar el sitio web de Yandex.Fotki" + +#: plugins/shotwell-publishing-extras/YandexPublishing.vala:609 +msgid "You are not currently logged into Yandex.Fotki." +msgstr "Actualmente no ha iniciado sesión en Yandex.Fotki." + +#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:12 +msgid "Public" +msgstr "Público" + +#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15 +#: plugins/shotwell-publishing/FacebookPublishing.vala:888 +msgid "Friends" +msgstr "Amigos" + +#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18 +#: plugins/shotwell-publishing/YouTubePublishing.vala:378 +msgid "Private" +msgstr "Privado" + +#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:47 +msgid "_Albums (or write new):" +msgstr "Álb_umes (o crear uno nuevo):" + +#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85 +msgid "Access _type:" +msgstr "_Tipo de acceso:" + +#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106 +msgid "Disable _comments" +msgstr "Desactivar _comentarios" + +#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:123 +msgid "_Forbid downloading original photo" +msgstr "_No permitir la descarga de la foto original" + +#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:42 +msgid "Publish to an e_xisting album:" +msgstr "Publicar en un álbum e_xistente:" + +#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:58 +msgid "Create a _new album named:" +msgstr "Crear un álbum _nuevo llamado:" + +#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100 +#: plugins/shotwell-publishing/FacebookPublishing.vala:725 +msgid "Upload _size:" +msgstr "_Tamaño de subida:" + +#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:125 +msgid "Videos and new photo albums _visible to:" +msgstr "Vídeos y álbumes de fotos nuevos _visibles para:" + +#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:155 +#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:92 +#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:59 +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203 +msgid "" +"_Remove location, camera, and other identifying information before uploading" +msgstr "_Quitar ubicación, cámara y otra información antes de subir" + +#: plugins/shotwell-publishing/FacebookPublishing.vala:61 +#: plugins/shotwell-publishing/PicasaPublishing.vala:58 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1188 +msgid "Shotwell Connect" +msgstr "Shotwell Connect" + +#: plugins/shotwell-publishing/FacebookPublishing.vala:81 +msgid "Standard (720 pixels)" +msgstr "Estándar (720 píxeles)" + +#: plugins/shotwell-publishing/FacebookPublishing.vala:84 +msgid "Large (2048 pixels)" +msgstr "Grande (2048 píxeles)" + +#: plugins/shotwell-publishing/FacebookPublishing.vala:314 +msgid "Creating album…" +msgstr "Creando el álbum…" + +#: plugins/shotwell-publishing/FacebookPublishing.vala:340 +msgid "" +"A file required for publishing is unavailable. Publishing to Facebook can’t " +"continue." +msgstr "" +"No está disponible un archivo necesario para publicar. La publicación en " +"Facebook no puede continuar." + +#: plugins/shotwell-publishing/FacebookPublishing.vala:723 +#, c-format +msgid "" +"You are logged into Facebook as %s.\n" +"\n" +msgstr "" +"Ha iniciado sesión en Facebook como %s.\n" +"\n" + +#: plugins/shotwell-publishing/FacebookPublishing.vala:724 +msgid "Where would you like to publish the selected photos?" +msgstr "¿Dónde quiere publicar las fotos seleccionadas?" + +#: plugins/shotwell-publishing/FacebookPublishing.vala:887 +#: plugins/shotwell-publishing/FlickrPublishing.vala:858 +msgid "Just me" +msgstr "Solo yo" + +#: plugins/shotwell-publishing/FacebookPublishing.vala:889 +#: plugins/shotwell-publishing/FlickrPublishing.vala:854 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1290 +msgid "Everyone" +msgstr "Todos" + +#: plugins/shotwell-publishing/FlickrPublishing.vala:800 +#, c-format +msgid "" +"You are logged into Flickr as %s.\n" +"\n" +msgstr "" +"Ha iniciado sesión en Flickr como %s.\n" +"\n" + +#: plugins/shotwell-publishing/FlickrPublishing.vala:802 +#, c-format +#| msgid "" +#| "Your free Flickr account limits how much data you can upload per month.\n" +#| "This month you have %d megabyte remaining in your upload quota." +#| msgid_plural "" +#| "Your free Flickr account limits how much data you can upload per month.\n" +#| "This month you have %d megabytes remaining in your upload quota." +msgid "" +"Your free Flickr account limits how much data you can upload per month.\n" +"This month you have %s remaining in your upload quota." +msgstr "" +"Su cuenta gratuita de Flickr limita la cantidad de datos que puede subir al " +"mes.\n" +"Este mes le quedan %s de su límite de subida." + +#: plugins/shotwell-publishing/FlickrPublishing.vala:804 +msgid "Your Flickr Pro account entitles you to unlimited uploads." +msgstr "Su cuenta de Flickr Pro le permite subidas ilimitadas." + +#: plugins/shotwell-publishing/FlickrPublishing.vala:809 +msgid "Photos _visible to:" +msgstr "Fotos _visibles para:" + +#: plugins/shotwell-publishing/FlickrPublishing.vala:811 +msgid "Videos _visible to:" +msgstr "Vídeos _visibles para:" + +#: plugins/shotwell-publishing/FlickrPublishing.vala:814 +msgid "Photos and videos _visible to:" +msgstr "Fotos y vídeos _visibles para:" + +#: plugins/shotwell-publishing/FlickrPublishing.vala:855 +msgid "Friends & family only" +msgstr "Solo amigos y familia" + +#: plugins/shotwell-publishing/FlickrPublishing.vala:856 +msgid "Family only" +msgstr "Solo familia" + +#: plugins/shotwell-publishing/FlickrPublishing.vala:857 +msgid "Friends only" +msgstr "Solo amigos" + +#: plugins/shotwell-publishing/FlickrPublishing.vala:878 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1304 +msgid "2048 × 1536 pixels" +msgstr "2048 × 1536 píxeles" + +#: plugins/shotwell-publishing/FlickrPublishing.vala:879 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1305 +msgid "4096 × 3072 pixels" +msgstr "4096 × 3072 píxeles" + +#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:93 +msgid "Photo _size preset:" +msgstr "_Tamaño de foto predefinido:" + +#. Add album that will push to the default feed for all the new users +#. Activate last known album id. If none was chosen, either use the old default (Shotwell connect) +#. or the new "Default album" album for Google Photos +#: plugins/shotwell-publishing/PicasaPublishing.vala:96 +#: plugins/shotwell-publishing/PicasaPublishing.vala:630 +#| msgid "last album" +msgid "Default album" +msgstr "Álbum predeterminado" + +#: plugins/shotwell-publishing/PicasaPublishing.vala:291 +msgid "" +"A file required for publishing is unavailable. Publishing to Picasa can’t " +"continue." +msgstr "" +"No está disponible un archivo necesario para publicar. La publicación en " +"Picasa no puede continuar." + +#. populate any widgets whose contents are programmatically-generated. +#: plugins/shotwell-publishing/PicasaPublishing.vala:560 +#, c-format +msgid "You are logged into Picasa Web Albums as %s." +msgstr "Ha iniciado sesión en Álbumes web de Picasa como %s." + +#: plugins/shotwell-publishing/PicasaPublishing.vala:566 +msgid "Videos will appear in:" +msgstr "Los vídeos aparecerán en:" + +#: plugins/shotwell-publishing/PicasaPublishing.vala:610 +msgid "Small (640 × 480 pixels)" +msgstr "Pequeño (640 × 480 píxeles)" + +#: plugins/shotwell-publishing/PicasaPublishing.vala:611 +msgid "Medium (1024 × 768 pixels)" +msgstr "Mediano (1024 × 768 píxeles)" + +#: plugins/shotwell-publishing/PicasaPublishing.vala:612 +msgid "Recommended (1600 × 1200 pixels)" +msgstr "Recomendado (1600 × 1200 píxeles)" + +#: plugins/shotwell-publishing/PicasaPublishing.vala:613 +msgid "Google+ (2048 × 1536 pixels)" +msgstr "Google+ (2048 × 1536 píxeles)" + +#: plugins/shotwell-publishing/PicasaPublishing.vala:614 +#: src/editing_tools/EditingTools.vala:757 +msgid "Original Size" +msgstr "Tamaño original" + +#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:44 +msgid "_URL of your Piwigo photo library" +msgstr "_URL de su biblioteca de fotos Piwigo" + +#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:94 +msgid "User _name" +msgstr "_Nombre de usuario" + +#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133 +#| msgid "_Remember Password" +msgid "Remember Password" +msgstr "_Recortar contraseña" + +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36 +#| msgid "An _existing category:" +msgid "An _existing category" +msgstr "Una categoría _existente" + +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110 +#| msgid "A _new album named:" +msgid "A _new album named" +msgstr "Un álbum _nuevo llamado:" + +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142 +#| msgid "within category:" +msgid "within category" +msgstr "en la categoría" + +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155 +#| msgid "Album comment:" +msgid "Album comment" +msgstr "Comentario del álbum" + +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167 +#| msgid "Photos will be _visible by:" +msgid "Photos will be _visible by" +msgstr "Las fotos serán _visibles para" + +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181 +#| msgid "Photo size:" +msgid "Photo size" +msgstr "Tamaño de la foto" + +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:219 +msgid "_If a title is set and comment unset, use title as comment" +msgstr "" +"_Si se definió el titulo pero no un comentario, usar el título como " +"comentario" + +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:235 +msgid "_Do no upload tags" +msgstr "_No cargar las etiquetas" + +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:255 +msgid "Logout" +msgstr "Salir" + +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268 +#: src/Resources.vala:296 ui/collection.ui:192 +msgid "Publish" +msgstr "Publicar" + +#: plugins/shotwell-publishing/PiwigoPublishing.vala:773 +#, c-format +msgid "Creating album %s…" +msgstr "Creando el álbum %s…" + +#: plugins/shotwell-publishing/PiwigoPublishing.vala:946 +msgid "An error message occurred when publishing to Piwigo. Please try again." +msgstr "Ocurrió un error al publicar en Piwigo. Inténtelo de nuevo." + +#. %s is the host name that we tried to connect to +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1030 +#, c-format +msgid "" +"This does not look like the real <b>%s</b>. Attackers might be trying to " +"steal or alter information going to or from this site (for example, private " +"messages, credit card information, or passwords)." +msgstr "" +"Esto no parece el <b>%s</b> real. Los atacantes pueden estar tratando de " +"robar o alterar la información que entra o sale de este sitio (por ejemplo, " +"mensajes privados, información de tarjetas de crédito o contraseñas)." + +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1048 +#, c-format +msgid "Certificate of %s" +msgstr "Certificado de %s" + +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1051 +#: src/Resources.vala:167 +msgid "_OK" +msgstr "_Aceptar" + +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1079 +msgid "" +"Enter the URL of your Piwigo photo library as well as the username and " +"password associated with your Piwigo account for that library." +msgstr "" +"Escriba el URL de su colección fotográfica de Piwigo, así como el nombre de " +"usuario y contraseña asociados a esa colección." + +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1080 +msgid "" +"Shotwell cannot contact your Piwigo photo library. Please verify the URL you " +"entered" +msgstr "" +"Shotwell no puede contactar su colección de fotos de Piwigo. Compruebe la " +"URL que ha introducido" + +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1112 +msgid "Invalid URL" +msgstr "URL no válida" + +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1291 +msgid "Admins, Family, Friends, Contacts" +msgstr "Administradores, Familia, Amigos, Contactos" + +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1292 +msgid "Admins, Family, Friends" +msgstr "Administradores, Familia, Amigos" + +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1293 +msgid "Admins, Family" +msgstr "Administradores, Familia" + +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1294 +msgid "Admins" +msgstr "Administradores" + +#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:21 +msgid "This connection is not secure" +msgstr "Esta conexión no es segura" + +#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:75 +msgid "Show the certificate…" +msgstr "Mostrar el certificado…" + +#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:88 +msgid "I understand, please _proceed." +msgstr "Lo entiendo, _continuar." + +#: plugins/shotwell-publishing/shotwell-publishing.vala:55 +msgid "Core Publishing Services" +msgstr "Servicios de publicación" + +#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55 +msgid "Video privacy _setting:" +msgstr "Co_nfiguración de privacidad de vídeos:" + +#: plugins/shotwell-publishing/YouTubePublishing.vala:236 +msgid "" +"A file required for publishing is unavailable. Publishing to YouTube can’t " +"continue." +msgstr "" +"No está disponible un archivo necesario para publicar. La publicación en " +"Youtube no puede continuar." + +#: plugins/shotwell-publishing/YouTubePublishing.vala:344 +#, c-format +msgid "You are logged into YouTube as %s." +msgstr "Ha iniciado sesión en YouTube como %s." + +#: plugins/shotwell-publishing/YouTubePublishing.vala:376 +msgid "Public listed" +msgstr "Listado públicamente" + +#: plugins/shotwell-publishing/YouTubePublishing.vala:377 +msgid "Public unlisted" +msgstr "No listado públicamente" + +#: plugins/shotwell-transitions/BlindsEffect.vala:20 +msgid "Blinds" +msgstr "Persianas" + +#: plugins/shotwell-transitions/ChessEffect.vala:20 +msgid "Chess" +msgstr "Ajedrez" + +#: plugins/shotwell-transitions/CircleEffect.vala:20 +msgid "Circle" +msgstr "Círculo" + +#: plugins/shotwell-transitions/CirclesEffect.vala:20 +msgid "Circles" +msgstr "Círculos" + +#: plugins/shotwell-transitions/ClockEffect.vala:20 +msgid "Clock" +msgstr "Reloj" + +#: plugins/shotwell-transitions/CrumbleEffect.vala:20 +msgid "Crumble" +msgstr "Desmoronar" + +#: plugins/shotwell-transitions/FadeEffect.vala:20 +msgid "Fade" +msgstr "Desvanecer" + +#: plugins/shotwell-transitions/shotwell-transitions.vala:28 +msgid "Core Slideshow Transitions" +msgstr "Transiciones de pase de diapositivas" + +#: plugins/shotwell-transitions/shotwell-transitions.vala:76 +msgid "" +"Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy " +"Inc." +msgstr "" +"Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy " +"Inc." + +#: plugins/shotwell-transitions/SlideEffect.vala:20 +msgid "Slide" +msgstr "Diapositiva" + +#: plugins/shotwell-transitions/SquaresEffect.vala:20 +msgid "Squares" +msgstr "Cuadrados" + +#: plugins/shotwell-transitions/StripesEffect.vala:20 +msgid "Stripes" +msgstr "Franjas" + +#: src/AppDirs.vala:64 src/AppDirs.vala:115 +#, c-format +msgid "Unable to create cache directory %s: %s" +msgstr "No se pudo crear la carpeta de caché %s: %s" + +#: src/AppDirs.vala:74 src/AppDirs.vala:104 +#, c-format +msgid "Unable to create data directory %s: %s" +msgstr "No se puede crear la carpeta de datos %s: %s" + +#. If XDG yarfed, use ~/Pictures +#: src/AppDirs.vala:168 +msgid "Pictures" +msgstr "Imágenes" + +#: src/AppDirs.vala:206 +#, c-format +msgid "Unable to create temporary directory %s: %s" +msgstr "No se puede crear la carpeta temporal %s: %s" + +#: src/AppDirs.vala:223 src/AppDirs.vala:254 +#, c-format +msgid "Unable to create data subdirectory %s: %s" +msgstr "No se puede crear la subcarpeta de datos %s: %s" + +#: src/AppDirs.vala:236 +#, c-format +msgid "Could not make directory %s writable" +msgstr "No se pudo hacer que la carpeta %s sea escribible" + +#: src/AppDirs.vala:239 +#, c-format +msgid "Could not make directory %s writable: %s" +msgstr "No se pudo hacer escribible la carpeta %s: %s" + +#: src/AppWindow.vala:47 +msgid "Pin Toolbar" +msgstr "Anclar la barra de herramientas" + +#: src/AppWindow.vala:48 +msgid "Pin the toolbar open" +msgstr "Mantener abierta la barra de herramientas" + +#: src/AppWindow.vala:53 +msgid "Leave fullscreen" +msgstr "Salir de pantalla completa" + +#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569 +#: src/data_imports/DataImportsUI.vala:301 +#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20 +#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443 +#: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525 +#: src/Resources.vala:158 +msgid "_Cancel" +msgstr "_Cancelar" + +#: src/AppWindow.vala:579 +#, c-format +msgid "" +"A fatal error occurred when accessing Shotwell’s library. Shotwell cannot " +"continue.\n" +"\n" +"%s" +msgstr "" +"Ocurrió un error grave al acceder a la colección de Shotwell. Shotwell no " +"puede continuar.\n" +"\n" +"%s" + +#. translators: %s will be replaced by application version +#: src/AppWindow.vala:596 +#, c-format +msgid "%s – “Aachen”" +msgstr "%s – «Aachen»" + +#: src/AppWindow.vala:601 +msgid "Visit the Shotwell web site" +msgstr "Visite la página web de Shotwell" + +#: src/AppWindow.vala:614 +#, c-format +msgid "Unable to display help: %s" +msgstr "No se puede mostrar la ayuda: %s" + +#: src/AppWindow.vala:622 +#, c-format +msgid "Unable to navigate to bug database: %s" +msgstr "No se pudo navegar en la base de datos de errores: %s" + +#: src/AppWindow.vala:630 +#, c-format +msgid "Unable to display FAQ: %s" +msgstr "No se pudieron mostrar las P+F: %s" + +#: src/BatchImport.vala:26 +msgid "Success" +msgstr "Éxito" + +#: src/BatchImport.vala:29 +msgid "File error" +msgstr "Error de archivo" + +#: src/BatchImport.vala:32 +msgid "Unable to decode file" +msgstr "No se puede descodificar el archivo" + +#: src/BatchImport.vala:35 +msgid "Database error" +msgstr "Error de la base de datos" + +#: src/BatchImport.vala:38 +msgid "User aborted import" +msgstr "El usuario canceló la importación" + +#: src/BatchImport.vala:41 +msgid "Not a file" +msgstr "No es un archivo" + +#: src/BatchImport.vala:44 +msgid "File already exists in database" +msgstr "El archivo ya existe en la base de datos" + +#: src/BatchImport.vala:47 +msgid "Unsupported file format" +msgstr "Formato de archivo no soportado" + +#: src/BatchImport.vala:50 +msgid "Not an image file" +msgstr "No es un archivo de imagen" + +#: src/BatchImport.vala:53 +msgid "Disk failure" +msgstr "Fallo en disco" + +#: src/BatchImport.vala:56 +msgid "Disk full" +msgstr "Disco lleno" + +#: src/BatchImport.vala:59 +msgid "Camera error" +msgstr "Error de la cámara" + +#: src/BatchImport.vala:62 +msgid "File write error" +msgstr "Error de escritura en el archivo" + +#: src/BatchImport.vala:65 +msgid "Corrupt image file" +msgstr "Archivo de imagen dañado" + +#: src/BatchImport.vala:68 +#, c-format +msgid "Imported failed (%d)" +msgstr "Fallo de importación (%d)" + +#: src/camera/Branch.vala:85 +msgid "Cameras" +msgstr "Cámaras" + +#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718 +#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316 +#: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361 +#: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361 +msgid "Camera" +msgstr "Cámara" + +#: src/camera/ImportPage.vala:311 src/Properties.vala:230 +msgid "RAW+JPEG" +msgstr "RAW+JPEG" + +#: src/camera/ImportPage.vala:466 +msgid "" +"Unable to unmount camera. Try unmounting the camera from the file manager." +msgstr "" +"No se puede desmontar la cámara. Intente desmontar la cámara desde el gestor " +"de archivos." + +#. hide duplicates checkbox +#: src/camera/ImportPage.vala:783 +msgid "Hide photos already imported" +msgstr "Ocultar fotos ya importadas" + +#: src/camera/ImportPage.vala:784 +msgid "Only display photos that have not been imported" +msgstr "Mostrar solo las fotos que no han sido importadas" + +#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210 +msgid "Import _Selected" +msgstr "Importar _seleccionadas" + +#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214 +msgid "Import _All" +msgstr "Importar tod_as" + +#: src/camera/ImportPage.vala:857 +msgid "The camera seems to be empty. No photos/videos found to import" +msgstr "La cámara parece estar vacía. No se han importado fotos/vídeos" + +#: src/camera/ImportPage.vala:861 +msgid "No new photos/videos found on camera" +msgstr "No se encontraron fotos/vídeos en la cámara" + +#. it's mounted, offer to unmount for the user +#: src/camera/ImportPage.vala:1021 +msgid "" +"Shotwell needs to unmount the camera from the filesystem in order to access " +"it. Continue?" +msgstr "" +"Shotwell necesita desmontar la cámara del sistema de archivos con el fin de " +"acceder a ella. ¿Continuar?" + +#: src/camera/ImportPage.vala:1027 +msgid "_Unmount" +msgstr "_Desmontar" + +#: src/camera/ImportPage.vala:1032 +msgid "Please unmount the camera." +msgstr "Desmonte la cámara." + +#: src/camera/ImportPage.vala:1037 +msgid "" +"The camera is locked by another application. Shotwell can only access the " +"camera when it’s unlocked. Please close any other application using the " +"camera and try again." +msgstr "" +"La cámara está bloqueada por otra aplicación. Shotwell solo puede acceder a " +"la cámara cuando está desbloqueada. Cierre cualquier otra aplicación que " +"esté utilizando la cámara e inténtelo de nuevo." + +#: src/camera/ImportPage.vala:1047 +msgid "Please close any other application using the camera." +msgstr "Cierre cualquier otra aplicación que esté utilizando la cámara." + +#: src/camera/ImportPage.vala:1052 +#, c-format +msgid "" +"Unable to fetch previews from the camera:\n" +"%s" +msgstr "" +"No se pueden obtener previsualizaciones de la cámara:\n" +"%s" + +#: src/camera/ImportPage.vala:1069 +msgid "Unmounting…" +msgstr "Desmontando…" + +#: src/camera/ImportPage.vala:1160 +msgid "Starting import, please wait…" +msgstr "Iniciando la importación, espere un momento…" + +#: src/camera/ImportPage.vala:1177 +msgid "Fetching photo information" +msgstr "Obteniendo información de la foto" + +#: src/camera/ImportPage.vala:1535 +#, c-format +msgid "Fetching preview for %s" +msgstr "Obteniendo previsualización para %s" + +#: src/camera/ImportPage.vala:1651 +#, c-format +msgid "Unable to lock camera: %s" +msgstr "No se puede bloquear la cámara: %s" + +#: src/camera/ImportPage.vala:1736 +#, c-format +msgid "Delete this photo from camera?" +msgid_plural "Delete these %d photos from camera?" +msgstr[0] "¿Quiere eliminar esta foto de la cámara?" +msgstr[1] "¿Quiere eliminar estas %d fotos de la cámara?" + +#: src/camera/ImportPage.vala:1739 +#, c-format +msgid "Delete this video from camera?" +msgid_plural "Delete these %d videos from camera?" +msgstr[0] "¿Quiere eliminar esta foto de la cámara?" +msgstr[1] "¿Quiere eliminar estas %d fotos de la cámara?" + +#: src/camera/ImportPage.vala:1742 +#, c-format +msgid "Delete this photo/video from camera?" +msgid_plural "Delete these %d photos/videos from camera?" +msgstr[0] "¿Quiere eliminar esta foto/vídeo de la cámara?" +msgstr[1] "¿Quiere eliminar estas %d fotos/vídeos de la cámara?" + +#: src/camera/ImportPage.vala:1745 +#, c-format +msgid "Delete these files from camera?" +msgid_plural "Delete these %d files from camera?" +msgstr[0] "¿Eliminar este archivo de la cámara?" +msgstr[1] "¿Eliminar estos %d archivos de la cámara?" + +#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387 +msgid "_Keep" +msgstr "_Mantener" + +#: src/camera/ImportPage.vala:1772 +msgid "Removing photos/videos from camera" +msgstr "Eliminando fotos/vídeos de la cámara" + +#: src/camera/ImportPage.vala:1776 +#, c-format +msgid "Unable to delete %d photo/video from the camera due to errors." +msgid_plural "Unable to delete %d photos/videos from the camera due to errors." +msgstr[0] "No se puede eliminar %d foto/vídeo de la cámara, debido a errores." +msgstr[1] "" +"No se pueden eliminar %d fotos/vídeos de la cámara, debido a errores." + +#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85 +#: src/PhotoPage.vala:2464 src/Resources.vala:171 +msgid "_Print" +msgstr "_Imprimir" + +#: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128 +#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28 +msgid "Send _To…" +msgstr "En_viar a…" + +#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90 +#: src/PhotoPage.vala:2474 src/Resources.vala:221 +msgid "Set as _Desktop Background" +msgstr "Establecer como fondo _de escritorio" + +#: src/CollectionPage.vala:92 src/Resources.vala:287 +msgid "_Duplicate" +msgstr "_Duplicar" + +#: src/CollectionPage.vala:100 +#| msgid "Fulls_creen" +msgid "Fullscreen" +msgstr "Pantalla completa" + +#: src/CollectionPage.vala:102 ui/photo.ui:180 +msgid "S_lideshow" +msgstr "_Diapositivas" + +#: src/CollectionPage.vala:110 src/Resources.vala:140 ui/direct.ui:111 +#: ui/photo.ui:200 +msgid "Rotate _Right" +msgstr "Girar a la _derecha" + +#: src/CollectionPage.vala:113 src/Resources.vala:145 ui/direct.ui:116 +#: ui/photo.ui:205 +msgid "Rotate _Left" +msgstr "Girar a la izq_uierda" + +#: src/CollectionPage.vala:116 src/Resources.vala:150 ui/direct.ui:121 +#: ui/photo.ui:210 +msgid "Flip Hori_zontally" +msgstr "Voltear hori_zontalmente" + +#: src/CollectionPage.vala:117 src/Resources.vala:153 ui/direct.ui:125 +#: ui/photo.ui:214 +msgid "Flip Verti_cally" +msgstr "Voltear _verticalmente" + +#: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8 +#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:447 +#: ui/photo_context.ui:6 ui/photo.ui:223 +msgid "_Enhance" +msgstr "M_ejorar" + +#: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13 +#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:452 +#: ui/photo_context.ui:11 ui/photo.ui:250 +msgid "Re_vert to Original" +msgstr "_Volver al original" + +#: src/CollectionPage.vala:122 src/Resources.vala:191 ui/photo.ui:256 +msgid "_Copy Color Adjustments" +msgstr "_Copiar ajustes de color" + +#: src/CollectionPage.vala:125 src/Resources.vala:195 ui/photo.ui:261 +msgid "_Paste Color Adjustments" +msgstr "_Pegar ajustes de color" + +#: src/CollectionPage.vala:135 +#| msgid "_Adjust Date and Time…" +msgid "Adjust Date and Time…" +msgstr "Ajustar fecha y hora…" + +#: src/CollectionPage.vala:143 src/Resources.vala:320 +msgid "Open With E_xternal Editor" +msgstr "Abrir con editor e_xterno" + +#: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113 +#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:365 +msgid "Open With RA_W Editor" +msgstr "Abrir con editor RA_W" + +#: src/CollectionPage.vala:149 src/Resources.vala:168 +msgid "_Play" +msgstr "_Reproducir" + +#: src/CollectionPage.vala:415 +msgid "Export Photo/Video" +msgstr "Exportar foto o vídeo" + +#: src/CollectionPage.vala:415 +msgid "Export Photos/Videos" +msgstr "Exportar fotos/vídeos" + +#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998 +msgid "Export Photo" +msgstr "Exportar foto" + +#: src/CollectionPage.vala:417 src/Dialogs.vala:84 +msgid "Export Photos" +msgstr "Exportar fotos" + +#: src/CollectionPage.vala:504 src/CollectionPage.vala:520 +msgid "Rotating" +msgstr "Girando" + +#: src/CollectionPage.vala:504 src/CollectionPage.vala:520 +msgid "Undoing Rotate" +msgstr "Deshaciendo el giro" + +#: src/CollectionPage.vala:529 +msgid "Flipping Horizontally" +msgstr "Volteando horizontalmente" + +#: src/CollectionPage.vala:530 +msgid "Undoing Flip Horizontally" +msgstr "Deshaciendo volteo horizontal" + +#: src/CollectionPage.vala:539 +msgid "Flipping Vertically" +msgstr "Volteando verticalmente" + +#: src/CollectionPage.vala:540 +msgid "Undoing Flip Vertically" +msgstr "Deshaciendo volteo vertical" + +#: src/Commands.vala:737 +msgid "Reverting" +msgstr "Revirtiendo" + +#: src/Commands.vala:737 +msgid "Undoing Revert" +msgstr "Deshaciendo reversión" + +#: src/Commands.vala:781 +msgid "Enhancing" +msgstr "Mejorando" + +#: src/Commands.vala:781 +msgid "Undoing Enhance" +msgstr "Deshaciendo mejora" + +#: src/Commands.vala:857 +msgid "Applying Color Transformations" +msgstr "Aplicando transformación de color" + +#: src/Commands.vala:857 +msgid "Undoing Color Transformations" +msgstr "Deshaciendo transformación de color" + +#: src/Commands.vala:1007 +msgid "Creating New Event" +msgstr "Creando un evento nuevo" + +#: src/Commands.vala:1008 +msgid "Removing Event" +msgstr "Quitando el evento" + +#: src/Commands.vala:1017 +msgid "Moving Photos to New Event" +msgstr "Moviendo fotos a un evento nuevo" + +#: src/Commands.vala:1018 +msgid "Setting Photos to Previous Event" +msgstr "Estableciendo fotos al evento anterior" + +#: src/Commands.vala:1075 +msgid "Merging" +msgstr "Combinando" + +#: src/Commands.vala:1076 +msgid "Unmerging" +msgstr "Deshaciendo la combinación" + +#: src/Commands.vala:1085 +msgid "Duplicating photos" +msgstr "Duplicando las fotos" + +#: src/Commands.vala:1085 +msgid "Removing duplicated photos" +msgstr "Quitando las fotos duplicadas" + +#: src/Commands.vala:1108 +#, c-format +msgid "Unable to duplicate one photo due to a file error" +msgid_plural "Unable to duplicate %d photos due to file errors" +msgstr[0] "No se puede duplicar una foto debido a un error de archivo" +msgstr[1] "No se pueden duplicar %d fotos debido a errores de archivo" + +#: src/Commands.vala:1195 +msgid "Restoring previous rating" +msgstr "Restaurar valoración anterior" + +#: src/Commands.vala:1205 src/Commands.vala:1206 +msgid "Increasing ratings" +msgstr "Aumentando la valoración" + +#: src/Commands.vala:1205 src/Commands.vala:1206 +msgid "Decreasing ratings" +msgstr "Disminuyendo la valoración" + +#: src/Commands.vala:1256 +msgid "Setting RAW developer" +msgstr "Configurando el revelador RAW" + +#: src/Commands.vala:1256 +msgid "Restoring previous RAW developer" +msgstr "Restaurando el revelador RAW anterior" + +#: src/Commands.vala:1257 +msgid "Set Developer" +msgstr "Establecer revelador" + +#: src/Commands.vala:1347 +msgid "Original photo could not be adjusted." +msgstr "No se pudo ajustar la foto original." + +#: src/Commands.vala:1368 +msgid "Adjusting Date and Time" +msgstr "Ajustar fecha y hora" + +#: src/Commands.vala:1368 +msgid "Undoing Date and Time Adjustment" +msgstr "Deshacer ajuste de fecha y hora" + +#: src/Commands.vala:1399 +msgid "One original photo could not be adjusted." +msgid_plural "The following original photos could not be adjusted." +msgstr[0] "No se pudo modificar una foto original." +msgstr[1] "No se pudieron modificar las siguientes fotos originales." + +#: src/Commands.vala:1401 src/Commands.vala:1425 +msgid "Time Adjustment Error" +msgstr "Error al ajustar la hora" + +#: src/Commands.vala:1423 +msgid "Time adjustments could not be undone on the following photo file." +msgid_plural "" +"Time adjustments could not be undone on the following photo files." +msgstr[0] "" +"El ajuste de la hora no se puede deshacer en el archivo de la foto siguiente." +msgstr[1] "" +"El ajuste de la hora no se puede deshacer en el archivo de la foto siguiente." + +#: src/Commands.vala:1637 src/Commands.vala:1660 +msgid "Create Tag" +msgstr "Crear etiqueta" + +#: src/Commands.vala:1695 +#, c-format +msgid "Move Tag “%s”" +msgstr "Mover etiqueta «%s»" + +#: src/Commands.vala:2347 +msgid "Move Photos to Trash" +msgstr "Mover fotos a la papelera" + +#: src/Commands.vala:2347 +msgid "Restore Photos from Trash" +msgstr "Restaurar fotos desde la papelera" + +#: src/Commands.vala:2348 +msgid "Move the photos to the Shotwell trash" +msgstr "Mover las fotos a la papelera de Shotwell" + +#: src/Commands.vala:2348 +msgid "Restore the photos back to the Shotwell library" +msgstr "Restaurar las fotos a la colección de Shotwell" + +#: src/Commands.vala:2367 +msgid "Moving Photos to Trash" +msgstr "Mover fotos a la papelera" + +#: src/Commands.vala:2367 +msgid "Restoring Photos From Trash" +msgstr "Restaurar fotos desde la papelera" + +#: src/Commands.vala:2453 +msgid "Flag selected photos" +msgstr "Marcar las fotos seleccionadas" + +#: src/Commands.vala:2454 +msgid "Unflag selected photos" +msgstr "Desmarcar las fotos seleccionadas" + +#: src/Commands.vala:2455 +msgid "Flagging selected photos" +msgstr "Marcando las fotos seleccionadas" + +#: src/Commands.vala:2456 +msgid "Unflagging selected photos" +msgstr "Desmarcando las fotos seleccionadas" + +#: src/Commands.vala:2463 +msgid "Flag" +msgstr "Marcar" + +#: src/Commands.vala:2463 +msgid "Unflag" +msgstr "Desmarcar" + +#. Send an empty job to the queue to mark the end of the import +#: src/data_imports/DataImportsPluginHost.vala:65 +#: src/data_imports/DataImportsPluginHost.vala:78 +#, c-format +msgid "%s Database" +msgstr "Base de datos %s" + +#: src/data_imports/DataImportsPluginHost.vala:148 +#: src/data_imports/DataImportsPluginHost.vala:294 +#, c-format +msgid "Importing from %s can’t continue because an error occurred:" +msgstr "" +"La importación desde %s no puede continuar porque ha ocurrido un error:" + +#: src/data_imports/DataImportsPluginHost.vala:151 +msgid "To try importing from another service, select one from the above menu." +msgstr "" +"Para intentar importar desde otro servicio, seleccione uno desde el menú " +"anterior." + +#: src/data_imports/DataImportsUI.vala:10 +msgid "" +"You do not have any data imports plugins enabled.\n" +"\n" +"In order to use the Import From Application functionality, you need to have " +"at least one data imports plugin enabled. Plugins can be enabled in the " +"Preferences dialog." +msgstr "" +"No tiene ningún complemento de importación de datos activado.\n" +"\n" +"Para utilizar la función Importar desde aplicación, necesita activar al " +"menos un complemento de importación. Puede hacerlo en el cuadro de diálogo " +"Preferencias." + +#: src/data_imports/DataImportsUI.vala:100 +msgid "Database file:" +msgstr "Archivo de base de datos:" + +#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775 +msgid "_Import" +msgstr "_Importar" + +#: src/data_imports/DataImportsUI.vala:220 +msgid "Import From Application" +msgstr "Importar desde aplicación" + +#: src/data_imports/DataImportsUI.vala:221 +msgid "Import media _from:" +msgstr "Importar medios _desde:" + +#: src/data_imports/DataImportsUI.vala:414 +#: src/publishing/PublishingUI.vala:520 +msgid "_Close" +msgstr "_Cerrar" + +#: src/data_imports/DataImports.vala:22 +msgid "Data Imports" +msgstr "Importaciones de datos" + +#: src/db/DatabaseTable.vala:37 +#, c-format +msgid "Unable to open/create photo database %s: error code %d" +msgstr "No se puede abrir/crear base de datos de fotos %s: código de error %d" + +#: src/db/DatabaseTable.vala:46 +#, c-format +msgid "" +"Unable to write to photo database file:\n" +" %s" +msgstr "" +"No se pudo escribir el archivo de la base de datos de fotos:\n" +"%s" + +#: src/db/DatabaseTable.vala:48 +#, c-format +msgid "" +"Error accessing database file:\n" +" %s\n" +"\n" +"Error was: \n" +"%s" +msgstr "" +"Error al acceder al archivo de la base de datos:\n" +"%s\n" +"\n" +"El error fue:\n" +"%s" + +#: src/db/DatabaseTable.vala:92 +#, c-format +msgid "Unable to restore photo database %s" +msgstr "No se pudo restaurar la base de datos de fotos %s" + +#: src/DesktopIntegration.vala:121 +#, c-format +msgid "Unable to launch Nautilus Send-To: %s" +msgstr "No se puede abrir Nautilus Enviar a: %s" + +#: src/DesktopIntegration.vala:129 +msgid "Send To" +msgstr "Enviar a" + +#: src/DesktopIntegration.vala:174 +#, c-format +msgid "Unable to export background to %s: %s" +msgstr "No se puede exportar el fondo de pantalla a %s: %s" + +#: src/DesktopIntegration.vala:311 +#, c-format +msgid "Unable to prepare desktop slideshow: %s" +msgstr "No se puede preparar el presentación de diapositivas de escritorio: %s" + +#: src/Dialogs.vala:16 +#, c-format +msgid "This will remove the tag “%s” from one photo. Continue?" +msgid_plural "This will remove the tag “%s” from %d photos. Continue?" +msgstr[0] "Esto eliminará la etiqueta «%s» de una foto. ¿Continuar?" +msgstr[1] "Esto eliminará la etiqueta «%s» de %d fotos. ¿Continuar?" + +#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388 +#: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415 +#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:460 ui/trash.ui:63 +#: ui/trash.ui:216 ui/trash.ui:258 +msgid "_Delete" +msgstr "_Eliminar" + +#: src/Dialogs.vala:25 +#, c-format +msgid "This will remove the saved search “%s”. Continue?" +msgstr "Esto quitará la búsqueda guardada «%s». ¿Quiere continuar?" + +#: src/Dialogs.vala:36 +msgid "" +"Switching developers will undo all changes you have made to this photo in " +"Shotwell" +msgid_plural "" +"Switching developers will undo all changes you have made to these photos in " +"Shotwell" +msgstr[0] "" +"Al cambiar de revelador se desharán todos los cambios que realizó a esta " +"foto en Shotwell" +msgstr[1] "" +"Al cambiar de revelador se desharán todos los cambios que realizó a estas " +"fotos en Shotwell" + +#: src/Dialogs.vala:40 +msgid "_Switch Developer" +msgstr "_Cambiar de revelador" + +#: src/Dialogs.vala:59 +msgid "Export Video" +msgstr "Exportar vídeo" + +#. Ticket #3023 +#. Attempt to replace the system error with something friendlier +#. if we can't copy an image over for editing in an external tool. +#. Did we fail because we can't write to this directory? +#. Yes - display an alternate error message here. +#: src/Dialogs.vala:112 +#, c-format +msgid "" +"Shotwell couldn’t create a file for editing this photo because you do not " +"have permission to write to %s." +msgstr "" +"Shotwell no pudo crear un archivo para editar esta foto porque no tiene " +"permiso para escribir en %s." + +#: src/Dialogs.vala:121 +msgid "" +"Unable to export the following photo due to a file error.\n" +"\n" +msgstr "No se puede exportar la siguiente foto debido a un error de archivo.\n" + +#: src/Dialogs.vala:127 +msgid "" +"\n" +"\n" +"Would you like to continue exporting?" +msgstr "" +"\n" +"\n" +"¿Quiere continuar la exportación?" + +#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really +#. aren't formats so much as they are operating modes that determine specific formats. +#. Hereafter we'll refer to these as "special formats." +#: src/Dialogs.vala:144 +msgid "Unmodified" +msgstr "Sin modificar" + +#: src/Dialogs.vala:145 +msgid "Current" +msgstr "Actual" + +#. layout controls +#: src/Dialogs.vala:221 +msgid "_Format:" +msgstr "_Formato:" + +#: src/Dialogs.vala:224 +msgid "_Quality:" +msgstr "_Calidad:" + +#: src/Dialogs.vala:227 +msgid "_Scaling constraint:" +msgstr "Re_stricción de escala:" + +#: src/Dialogs.vala:230 +msgid "_Pixels:" +msgstr "_Píxeles:" + +#: src/Dialogs.vala:234 +msgid "Export _metadata:" +msgstr "Exportar metadatos:" + +#: src/Dialogs.vala:478 +msgid "Save Details…" +msgstr "Guardar detalles…" + +#: src/Dialogs.vala:479 +msgid "Save Details" +msgstr "Guardar detalles" + +#: src/Dialogs.vala:494 +#, c-format +msgid "(and %d more)\n" +msgstr "(y %d más)\n" + +#: src/Dialogs.vala:547 +msgid "Import Results Report" +msgstr "Informe de resultados de importación" + +#: src/Dialogs.vala:551 +#, c-format +msgid "Attempted to import %d file." +msgid_plural "Attempted to import %d files." +msgstr[0] "Se intentó importar %d archivo." +msgstr[1] "Se intentaron importar %d archivos." + +#: src/Dialogs.vala:554 +#, c-format +msgid "Of these, %d file was successfully imported." +msgid_plural "Of these, %d files were successfully imported." +msgstr[0] "De ellos, se importó %d archivo correctamente." +msgstr[1] "De ellos, se importaron %d archivos correctamente." + +#. +#. Duplicates +#. +#: src/Dialogs.vala:566 +msgid "Duplicate Photos/Videos Not Imported:" +msgstr "Fotos/vídeos duplicados no importados:" + +#: src/Dialogs.vala:570 +msgid "duplicates existing media item" +msgstr "duplica el elemento existente" + +#. +#. Files Not Imported Due to Camera Errors +#. +#: src/Dialogs.vala:581 +msgid "Photos/Videos Not Imported Due to Camera Errors:" +msgstr "Fotos/vídeos no importados debido a errores de cámara:" + +#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614 +#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659 +msgid "error message:" +msgstr "mensaje de error:" + +#. +#. Files Not Imported Because They Weren't Recognized as Photos or Videos +#. +#: src/Dialogs.vala:595 +msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:" +msgstr "Archivos no importados porque no se reconocieron como fotos o vídeos:" + +#. +#. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands +#. +#: src/Dialogs.vala:610 +msgid "" +"Photos/Videos Not Imported Because They Weren’t in a Format Shotwell " +"Understands:" +msgstr "" +"Fotos/vídeos no importados porque no estaban en un formato compatible con " +"Shotwell:" + +#. +#. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library +#. +#: src/Dialogs.vala:625 +msgid "" +"Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its " +"Library:" +msgstr "" +"Fotos/vídeos no importados porque Shotwell no pudo copiarlos a su colección:" + +#: src/Dialogs.vala:629 +#, c-format +msgid "" +"couldn’t copy %s\n" +"\tto %s" +msgstr "" +"no se pudo copiar %s\n" +"\ta %s" + +#. +#. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt +#. +#: src/Dialogs.vala:641 +msgid "Photos/Videos Not Imported Because Files Are Corrupt:" +msgstr "No se importaron las fotos/vídeos porque los archivos están dañados:" + +#. +#. Photos/Videos Not Imported for Other Reasons +#. +#: src/Dialogs.vala:656 +msgid "Photos/Videos Not Imported for Other Reasons:" +msgstr "Fotos/vídeos no importados por otros motivos:" + +#: src/Dialogs.vala:676 +#, c-format +msgid "1 duplicate photo was not imported:\n" +msgid_plural "%d duplicate photos were not imported:\n" +msgstr[0] "No se importó 1 foto duplicada:\r\n" +msgstr[1] "No se importaron %d fotos duplicadas:\r\n" + +#: src/Dialogs.vala:679 +#, c-format +msgid "1 duplicate video was not imported:\n" +msgid_plural "%d duplicate videos were not imported:\n" +msgstr[0] "No se importó 1 vídeo duplicado:\r\n" +msgstr[1] "No se importaron %d vídeos duplicados:\r\n" + +#: src/Dialogs.vala:682 +#, c-format +msgid "1 duplicate photo/video was not imported:\n" +msgid_plural "%d duplicate photos/videos were not imported:\n" +msgstr[0] "No se importó 1 foto/vídeo duplicado:\r\n" +msgstr[1] "No se importaron %d fotos/vídeos duplicados:\r\n" + +#: src/Dialogs.vala:696 +#, c-format +msgid "1 photo failed to import due to a file or hardware error:\n" +msgid_plural "%d photos failed to import due to a file or hardware error:\n" +msgstr[0] "" +"Falló al importar 1 foto debido a un error del archivo o de hardware:\n" +msgstr[1] "" +"Falló al importar %d fotos debido a un error del archivo o de hardware:\n" + +#: src/Dialogs.vala:699 +#, c-format +msgid "1 video failed to import due to a file or hardware error:\n" +msgid_plural "%d videos failed to import due to a file or hardware error:\n" +msgstr[0] "" +"Falló al importar 1 vídeo debido a un error del archivo o de hardware:\r\n" +msgstr[1] "" +"Falló al importar %d vídeos debido a un error del archivo o de hardware:\r\n" + +#: src/Dialogs.vala:702 +#, c-format +msgid "1 photo/video failed to import due to a file or hardware error:\n" +msgid_plural "" +"%d photos/videos failed to import due to a file or hardware error:\n" +msgstr[0] "" +"Falló al importar 1 foto/vídeo debido a un error del archivo o de hardware:" +"\r\n" +msgstr[1] "" +"Falló al importar %d fotos/vídeos debido a un error del archivo o de " +"hardware:\r\n" + +#: src/Dialogs.vala:705 +#, c-format +msgid "1 file failed to import due to a file or hardware error:\n" +msgid_plural "%d files failed to import due to a file or hardware error:\n" +msgstr[0] "" +"Falló al importar 1 archivo debido a un error del archivo o de hardware:\n" +msgstr[1] "" +"Falló al importar %d archivos debido a un error de archivo o de hardware:\n" + +#: src/Dialogs.vala:719 +#, c-format +msgid "" +"1 photo failed to import because the photo library folder was not writable:\n" +msgid_plural "" +"%d photos failed to import because the photo library folder was not " +"writable:\n" +msgstr[0] "" +"Falló al importar 1 foto porque la carpeta de la colección de fotos no se " +"puede escribir:\n" +msgstr[1] "" +"Falló al importar %d fotos porque la carpeta de la colección de fotos no se " +"puede escribir:\n" + +#: src/Dialogs.vala:722 +#, c-format +msgid "" +"1 video failed to import because the photo library folder was not writable:\n" +msgid_plural "" +"%d videos failed to import because the photo library folder was not " +"writable:\n" +msgstr[0] "" +"Falló al importar 1 foto porque la carpeta de la colección de fotos no se " +"puede escribir:\n" +msgstr[1] "" +"Falló al importar %d fotos porque la carpeta de la colección de fotos no se " +"puede escribir:\n" + +#: src/Dialogs.vala:725 +#, c-format +msgid "" +"1 photo/video failed to import because the photo library folder was not " +"writable:\n" +msgid_plural "" +"%d photos/videos failed to import because the photo library folder was not " +"writable:\n" +msgstr[0] "" +"Falló al importar 1 foto/vídeo porque la carpeta de la colección de fotos no " +"se puede escribir:\n" +msgstr[1] "" +"Falló al importar %d fotos/vídeos porque la carpeta de la colección de fotos " +"no se puede escribir:\n" + +#: src/Dialogs.vala:728 +#, c-format +msgid "" +"1 file failed to import because the photo library folder was not writable:\n" +msgid_plural "" +"%d files failed to import because the photo library folder was not " +"writable:\n" +msgstr[0] "" +"Falló la importación de 1 archivo porque no se puede escribir en la " +"colección de fotos:\n" +msgstr[1] "" +"Falló la importación de %d archivos porque no se puede escribir en la " +"colección de fotos:\n" + +#: src/Dialogs.vala:742 +#, c-format +msgid "1 photo failed to import due to a camera error:\n" +msgid_plural "%d photos failed to import due to a camera error:\n" +msgstr[0] "Falló al importar 1 foto/vídeo debido a un error de la cámara:\n" +msgstr[1] "Falló al importar %d fotos debido a un error de la cámara:\n" + +#: src/Dialogs.vala:745 +#, c-format +msgid "1 video failed to import due to a camera error:\n" +msgid_plural "%d videos failed to import due to a camera error:\n" +msgstr[0] "Falló al importar 1 foto/vídeo debido a un error de la cámara:\n" +msgstr[1] "Falló al importar %d vídeos debido a un error de la cámara:\n" + +#: src/Dialogs.vala:748 +#, c-format +msgid "1 photo/video failed to import due to a camera error:\n" +msgid_plural "%d photos/videos failed to import due to a camera error:\n" +msgstr[0] "Falló al importar 1 foto/vídeo debido a un error de la cámara:\n" +msgstr[1] "Falló al importar %d foto/vídeo debido a un error de la cámara:\n" + +#: src/Dialogs.vala:751 +#, c-format +msgid "1 file failed to import due to a camera error:\n" +msgid_plural "%d files failed to import due to a camera error:\n" +msgstr[0] "Falló al importar 1 archivo debido a un error de la cámara: \n" +msgstr[1] "Falló al importar %d archivor debido a un error de la cámara: \n" + +#: src/Dialogs.vala:765 +#, c-format +msgid "1 photo failed to import because it was corrupt:\n" +msgid_plural "%d photos failed to import because they were corrupt:\n" +msgstr[0] "No se pudo importar una foto porque está dañada:\n" +msgstr[1] "No se pudieron importar %d fotos porque están dañadas:\n" + +#: src/Dialogs.vala:768 +#, c-format +msgid "1 video failed to import because it was corrupt:\n" +msgid_plural "%d videos failed to import because they were corrupt:\n" +msgstr[0] "No se pudo importar un vídeo porque está dañado:\n" +msgstr[1] "No se pudieron importar %d vídeos porque están dañados:\n" + +#: src/Dialogs.vala:771 +#, c-format +msgid "1 photo/video failed to import because it was corrupt:\n" +msgid_plural "%d photos/videos failed to import because they were corrupt:\n" +msgstr[0] "No se pudo importar 1 foto/vídeo porque está dañado:\n" +msgstr[1] "No se pudieron importar %d fotos/vídeos porque están dañados:\n" + +#: src/Dialogs.vala:774 +#, c-format +msgid "1 file failed to import because it was corrupt:\n" +msgid_plural "%d files failed to import because it was corrupt:\n" +msgstr[0] "No se pudo importar un archivo porque está dañado:\n" +msgstr[1] "No se pudieron importar %d archivos porque están dañados:\n" + +#. we have no notion of "unsupported" video files right now in Shotwell (all +#. standard container formats are supported, it's just that the streams in them +#. might or might not be interpretable), so this message does not need to be +#. media specific +#: src/Dialogs.vala:791 +#, c-format +msgid "1 unsupported photo skipped:\n" +msgid_plural "%d unsupported photos skipped:\n" +msgstr[0] "Se omitió 1 foto no compatible:\n" +msgstr[1] "Se omitieron %d fotos no compatibles:\n" + +#. we have no notion of "non-video" video files right now in Shotwell, so this +#. message doesn't need to be media specific +#: src/Dialogs.vala:806 +#, c-format +msgid "1 non-image file skipped.\n" +msgid_plural "%d non-image files skipped.\n" +msgstr[0] "Se omitió 1 archivo que no era una imagen.\n" +msgstr[1] "Se omitieron %d archivos que no eran imágenes.\n" + +#: src/Dialogs.vala:817 +#, c-format +msgid "1 photo skipped due to user cancel:\n" +msgid_plural "%d photos skipped due to user cancel:\n" +msgstr[0] "Se omitió 1 foto debido a la cancelación del usuario:\n" +msgstr[1] "Se omitieron %d fotos debido a la cancelación del usuario:\n" + +#: src/Dialogs.vala:820 +#, c-format +msgid "1 video skipped due to user cancel:\n" +msgid_plural "%d videos skipped due to user cancel:\n" +msgstr[0] "Se omitió 1 vídeo debido a la cancelación del usuario:\n" +msgstr[1] "Se omitieron %d vídeos debido a la cancelación del usuario:\n" + +#: src/Dialogs.vala:823 +#, c-format +msgid "1 photo/video skipped due to user cancel:\n" +msgid_plural "%d photos/videos skipped due to user cancel:\n" +msgstr[0] "Se omitió 1 foto/vídeo debido a la cancelación del usuario:\n" +msgstr[1] "Se omitieron %d fotos/vídeos debido a la cancelación del usuario:\n" + +#: src/Dialogs.vala:826 +#, c-format +msgid "1 file skipped due to user cancel:\n" +msgid_plural "%d file skipped due to user cancel:\n" +msgstr[0] "Se omitió 1 archivo debido a la cancelación del usuario:\n" +msgstr[1] "Se omitieron %d archivos debido a la cancelación del usuario:\n" + +#: src/Dialogs.vala:840 +#, c-format +msgid "1 photo successfully imported.\n" +msgid_plural "%d photos successfully imported.\n" +msgstr[0] "1 foto correctamente importada.\n" +msgstr[1] "%d fotos importadas correctamente.\n" + +#: src/Dialogs.vala:843 +#, c-format +msgid "1 video successfully imported.\n" +msgid_plural "%d videos successfully imported.\n" +msgstr[0] "1 vídeo correctamente importado.\n" +msgstr[1] "%d vídeos importados correctamente.\n" + +#: src/Dialogs.vala:846 +#, c-format +msgid "1 photo/video successfully imported.\n" +msgid_plural "%d photos/videos successfully imported.\n" +msgstr[0] "1 foto/vídeo correctamente importado.\n" +msgstr[1] "%d fotos/vídeos importados correctamente.\n" + +#. if no media items were imported at all (i.e. an empty directory attempted), need to at least +#. report that nothing was imported +#: src/Dialogs.vala:862 +msgid "No photos or videos imported.\n" +msgstr "No se importó ninguna foto o vídeo.\n" + +#: src/Dialogs.vala:869 src/Dialogs.vala:888 +msgid "Import Complete" +msgstr "Importación completa" + +#: src/Dialogs.vala:1160 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d segundo" +msgstr[1] "%d segundos" + +#: src/Dialogs.vala:1163 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minuto" +msgstr[1] "%d minutos" + +#: src/Dialogs.vala:1167 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d hora" +msgstr[1] "%d horas" + +#: src/Dialogs.vala:1170 +msgid "1 day" +msgstr "1 día" + +#: src/Dialogs.vala:1317 src/Resources.vala:232 +msgid "Rename Event" +msgstr "Renombrar evento" + +#: src/Dialogs.vala:1317 +msgid "Name:" +msgstr "Nombre:" + +#. Dialog title +#: src/Dialogs.vala:1328 +msgctxt "Dialog Title" +msgid "Edit Title" +msgstr "Editar título" + +#: src/Dialogs.vala:1329 src/Properties.vala:343 +msgid "Title:" +msgstr "Título:" + +#. Dialog title +#: src/Dialogs.vala:1345 src/Resources.vala:308 +msgid "Edit Event Comment" +msgstr "Editar comentario de evento" + +#: src/Dialogs.vala:1346 +msgid "Edit Photo/Video Comment" +msgstr "Editar comentario de foto/vídeo" + +#: src/Dialogs.vala:1347 src/Properties.vala:631 +msgid "Comment:" +msgstr "Comentario:" + +#: src/Dialogs.vala:1363 +msgid "Remove and _Trash File" +msgid_plural "Remove and _Trash Files" +msgstr[0] "Eliminar archivo y mover a la _papelera" +msgstr[1] "Eliminar archivos y mover a la _papelera" + +#: src/Dialogs.vala:1367 +msgid "_Remove From Library" +msgstr "_Quitar de la colección" + +#: src/Dialogs.vala:1410 +msgid "Revert External Edit?" +msgstr "¿Revertir las ediciones externas?" + +#: src/Dialogs.vala:1410 +msgid "Revert External Edits?" +msgstr "¿Revertir ediciones externas?" + +#: src/Dialogs.vala:1412 +#, c-format +msgid "This will destroy all changes made to the external file. Continue?" +msgid_plural "" +"This will destroy all changes made to %d external files. Continue?" +msgstr[0] "" +"Esto destruirá todos los cambios realizados en el archivo externo. " +"¿Continuar?" +msgstr[1] "" +"Esto destruirá todos los cambios realizados en los %d archivos externos. " +"¿Continuar?" + +#: src/Dialogs.vala:1416 +msgid "Re_vert External Edit" +msgstr "Re_vertir edición externa" + +#: src/Dialogs.vala:1416 +msgid "Re_vert External Edits" +msgstr "Re_vertir ediciones externas" + +#: src/Dialogs.vala:1437 +#, c-format +msgid "This will remove the photo from the library. Continue?" +msgid_plural "This will remove %d photos from the library. Continue?" +msgstr[0] "Esto quitará la foto de la colección. ¿Continuar?" +msgstr[1] "Esto quitará las %d fotos de la colección. ¿Continuar?" + +#: src/Dialogs.vala:1444 src/Resources.vala:174 +msgid "_Remove" +msgstr "_Quitar" + +#: src/Dialogs.vala:1445 +msgid "Remove Photo From Library" +msgstr "Quitar la foto de la colección" + +#: src/Dialogs.vala:1445 +msgid "Remove Photos From Library" +msgstr "Quitar fotos de la colección" + +#: src/Dialogs.vala:1543 +#, c-format +msgid "%d%%" +msgstr "%d%%" + +#: src/Dialogs.vala:1697 +msgid "AM" +msgstr "a.m." + +#: src/Dialogs.vala:1698 +msgid "PM" +msgstr "p.m." + +#: src/Dialogs.vala:1699 +msgid "24 Hr" +msgstr "24 hrs." + +#: src/Dialogs.vala:1714 +msgid "_Shift photos/videos by the same amount" +msgstr "_Desplazar todas las fotos y/o vídeos la misma cantidad" + +#: src/Dialogs.vala:1719 +msgid "Set _all photos/videos to this time" +msgstr "Ajustar _todas las fotos y/o vídeos a esta hora" + +#: src/Dialogs.vala:1725 +#| msgid "_Modify original photo file" +msgid "_Modify original photo file" +msgid_plural "_Modify original photo files" +msgstr[0] "_Modificar archivo de foto original" +msgstr[1] "_Modificar archivos de fotos originales" + +#: src/Dialogs.vala:1729 +#| msgid "_Modify original file" +msgid "_Modify original file" +msgid_plural "_Modify original files" +msgstr[0] "_Modificar el archivo original" +msgstr[1] "_Modificar los archivos originales" + +#: src/Dialogs.vala:1817 +msgid "Original: " +msgstr "Original:" + +#: src/Dialogs.vala:1818 +msgid "%m/%d/%Y, %H:%M:%S" +msgstr "%d/%m/%Y, %H:%M:%S" + +#: src/Dialogs.vala:1819 +msgid "%m/%d/%Y, %I:%M:%S %p" +msgstr "%d/%m/%Y, %H:%M:%S %p" + +#: src/Dialogs.vala:1908 +#, c-format +msgid "" +"Exposure time will be shifted forward by\n" +"%d %s, %d %s, %d %s, and %d %s." +msgstr "" +"El tiempo de exposición se adelantará por\n" +"%d %s, %d %s, %d %s, y %d %s." + +#: src/Dialogs.vala:1909 +#, c-format +msgid "" +"Exposure time will be shifted backward by\n" +"%d %s, %d %s, %d %s, and %d %s." +msgstr "" +"El tiempo de exposición se atrasará por\n" +"%d %s, %d %s, %d %s, y %d %s." + +#: src/Dialogs.vala:1911 +msgid "day" +msgid_plural "days" +msgstr[0] "día" +msgstr[1] "días" + +#: src/Dialogs.vala:1912 +msgid "hour" +msgid_plural "hours" +msgstr[0] "hora" +msgstr[1] "horas" + +#: src/Dialogs.vala:1913 +msgid "minute" +msgid_plural "minutes" +msgstr[0] "minuto" +msgstr[1] "minutos" + +#: src/Dialogs.vala:1914 +msgid "second" +msgid_plural "seconds" +msgstr[0] "segundo" +msgstr[1] "segundos" + +#: src/Dialogs.vala:1958 +#, c-format +msgid "" +"\n" +"\n" +"And %d other." +msgid_plural "" +"\n" +"\n" +"And %d others." +msgstr[0] "" +"\n" +"\n" +"Y %d más." +msgstr[1] "" +"\n" +"\n" +"Y %d más." + +#: src/Dialogs.vala:1982 src/Dialogs.vala:2009 +msgid "Tags (separated by commas):" +msgstr "Etiquetas (separadas por comas):" + +#: src/Dialogs.vala:2089 +msgid "Welcome!" +msgstr "Bienvenido/a" + +#: src/Dialogs.vala:2096 +msgid "Welcome to Shotwell!" +msgstr "Bienvenido/a a Shotwell." + +#: src/Dialogs.vala:2101 +msgid "To get started, import photos in any of these ways:" +msgstr "Para comenzar, importe fotos de cualquiera de las siguientes formas:" + +#: src/Dialogs.vala:2121 +#, c-format +msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>" +msgstr "Elija <span weight=\"bold\">Archivo %s Importar desde carpeta</span>" + +#: src/Dialogs.vala:2122 +msgid "Drag and drop photos onto the Shotwell window" +msgstr "Arrastre y suelte fotos en la ventana de Shotwell" + +#: src/Dialogs.vala:2123 +msgid "Connect a camera to your computer and import" +msgstr "Conecte una cámara al equipo e importe" + +#: src/Dialogs.vala:2134 +#, c-format +msgid "_Import photos from your %s folder" +msgstr "_Importar fotos desde su carpeta %s" + +#: src/Dialogs.vala:2141 +msgid "You can also import photos in any of these ways:" +msgstr "También puede importar fotos en cualquiera de estas formas:" + +#: src/Dialogs.vala:2152 +msgid "_Don’t show this message again" +msgstr "_No mostrar este mensaje de nuevo" + +#: src/Dialogs.vala:2189 +#, c-format +msgid "Import photos from your %s library" +msgstr "Importar fotos desde su colección %s" + +#. We're installed system-wide, so use the system help. +#. We're being run from the build directory; we'll have to handle clicks to this +#. link manually ourselves, due to a limitation of help: URIs. +#: src/Dialogs.vala:2335 src/Dialogs.vala:2339 +msgid "(Help)" +msgstr "(Ayuda)" + +#: src/Dialogs.vala:2346 +#, c-format +msgid "Year%sMonth%sDay" +msgstr "Año%sMes%sDía" + +#: src/Dialogs.vala:2348 +#, c-format +msgid "Year%sMonth" +msgstr "Año%sMes" + +#: src/Dialogs.vala:2350 +#, c-format +msgid "Year%sMonth-Day" +msgstr "Año%sMes-Día" + +#: src/Dialogs.vala:2352 +msgid "Year-Month-Day" +msgstr "Año-Mes-Día" + +#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782 +msgid "Custom" +msgstr "Personalizado" + +#. Invalid pattern. +#: src/Dialogs.vala:2590 +msgid "Invalid pattern" +msgstr "Patrón no válido" + +#. This function is used to determine whether or not files should be copied or linked when imported. +#. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel. +#: src/Dialogs.vala:2692 +msgid "" +"Shotwell can copy the photos into your library folder or it can import them " +"without copying." +msgstr "" +"Shotwell puede copiar las fotos en su colección o puede importarlas sin " +"copiarlas." + +#: src/Dialogs.vala:2697 +msgid "Co_py Photos" +msgstr "C_opiar fotos" + +#: src/Dialogs.vala:2698 +msgid "_Import in Place" +msgstr "_Importar en el lugar" + +#: src/Dialogs.vala:2699 +msgid "Import to Library" +msgstr "Importar a la colección" + +#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874 +msgid "Remove From Library" +msgstr "Quitar de la colección" + +#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874 +msgid "Removing Photo From Library" +msgstr "Quitando la foto de la colección" + +#: src/Dialogs.vala:2710 +msgid "Removing Photos From Library" +msgstr "Quitando fotos de la colección" + +#: src/Dialogs.vala:2724 +#, c-format +msgid "" +"This will remove the photo/video from your Shotwell library. Would you also " +"like to move the file to your desktop trash?\n" +"\n" +"This action cannot be undone." +msgid_plural "" +"This will remove %d photos/videos from your Shotwell library. Would you also " +"like to move the files to your desktop trash?\n" +"\n" +"This action cannot be undone." +msgstr[0] "" +"Esto quitará la foto y/o el vídeo de su colección de Shotwell. ¿Le gustaría " +"mover el archivo a la papelera del escritorio?\n" +"\n" +"Esta acción no se puede deshacer." +msgstr[1] "" +"Esto quitará %d fotos y/o vídeos de su colección de Shotwell. ¿Le gustaría " +"mover los archivos a la papelera del escritorio?\n" +"\n" +"Esta acción no se puede deshacer." + +#: src/Dialogs.vala:2728 +#, c-format +msgid "" +"This will remove the video from your Shotwell library. Would you also like " +"to move the file to your desktop trash?\n" +"\n" +"This action cannot be undone." +msgid_plural "" +"This will remove %d videos from your Shotwell library. Would you also like " +"to move the files to your desktop trash?\n" +"\n" +"This action cannot be undone." +msgstr[0] "" +"Esto quitará el vídeo de su colección de Shotwell. ¿Le gustaría mover el " +"archivo a la papelera del escritorio?\n" +"\n" +"Esta acción no se puede deshacer." +msgstr[1] "" +"Esto quitará los %d vídeos de su colección de Shotwell. ¿Le gustaría mover " +"los archivos a la papelera del escritorio?\n" +"\n" +"Esta acción no se puede deshacer." + +#: src/Dialogs.vala:2732 +#, c-format +msgid "" +"This will remove the photo from your Shotwell library. Would you also like " +"to move the file to your desktop trash?\n" +"\n" +"This action cannot be undone." +msgid_plural "" +"This will remove %d photos from your Shotwell library. Would you also like " +"to move the files to your desktop trash?\n" +"\n" +"This action cannot be undone." +msgstr[0] "" +"Esto quitará la foto de su colección de Shotwell. ¿Le gustaría mover el " +"archivo a la papelera del escritorio?\n" +"\n" +"Esta acción no se puede deshacer." +msgstr[1] "" +"Esto quitará %d fotos de su colección de Shotwell. ¿Le gustaría mover los " +"archivos a la papelera del escritorio?\n" +"\n" +"Esta acción no se puede deshacer." + +#: src/Dialogs.vala:2764 +#, c-format +msgid "" +"The photo or video cannot be moved to your desktop trash. Delete this file?" +msgid_plural "" +"%d photos/videos cannot be moved to your desktop trash. Delete these files?" +msgstr[0] "" +"No se puede mover la foto o el vídeo a la papelera de su escritorio. " +"¿Eliminar este archivo?" +msgstr[1] "" +"No se pueden mover las %d fotos o vídeos a la papelera de su escritorio. " +"¿Eliminar estos archivos?" + +#. Alert the user that the files were not removed. +#: src/Dialogs.vala:2781 +#, c-format +msgid "The photo or video cannot be deleted." +msgid_plural "%d photos/videos cannot be deleted." +msgstr[0] "No se puede eliminar la foto o el vídeo." +msgstr[1] "No se pueden eliminar las %d fotos o vídeos." + +#: src/Dimensions.vala:23 +msgid "Width" +msgstr "Anchura" + +#: src/Dimensions.vala:26 +msgid "Height" +msgstr "Altura" + +#: src/direct/DirectPhotoPage.vala:99 +#, c-format +msgid "%s does not exist." +msgstr "%s no existe." + +#: src/direct/DirectPhotoPage.vala:101 +#, c-format +msgid "%s is not a file." +msgstr "%s no es un archivo." + +#: src/direct/DirectPhotoPage.vala:103 +#, c-format +msgid "" +"%s does not support the file format of\n" +"%s." +msgstr "" +"%s no es compatible con el formato de archivo de\n" +"%s." + +#: src/direct/DirectPhotoPage.vala:120 +#, c-format +msgid "Unable open photo %s. Sorry." +msgstr "No se puede abrir la foto %s." + +#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8 +msgid "_Save" +msgstr "_Guardar" + +#: src/direct/DirectPhotoPage.vala:316 +msgid "_Save a Copy" +msgstr "_Guardar una copia" + +#: src/direct/DirectPhotoPage.vala:319 +#, c-format +msgid "Lose changes to %s?" +msgstr "¿Quiere descartar los cambios a %s?" + +#: src/direct/DirectPhotoPage.vala:320 +msgid "Close _without Saving" +msgstr "Cerrar _sin guardar" + +#: src/direct/DirectPhotoPage.vala:353 +#, c-format +msgid "Error while saving to %s: %s" +msgstr "Error al guardar en %s: %s" + +#: src/direct/DirectPhotoPage.vala:383 src/direct/DirectPhotoPage.vala:404 +msgid "Save As" +msgstr "Guardar como" + +#. verify this is a directory +#: src/DirectoryMonitor.vala:889 +#, c-format +msgid "Unable to monitor %s: Not a directory (%s)" +msgstr "No se puede monitorizar %s: No es un directorio (%s)" + +#: src/editing_tools/EditingTools.vala:666 +msgid "Return to current photo dimensions" +msgstr "Volver a las dimensiones actuales de la foto" + +#: src/editing_tools/EditingTools.vala:669 +msgid "Set the crop for this photo" +msgstr "Establecer el corte para esta foto" + +#: src/editing_tools/EditingTools.vala:681 +msgid "Pivot the crop rectangle between portrait and landscape orientations" +msgstr "" +"Girar el rectángulo de corte entre las orientaciones vertical y horizontal" + +#: src/editing_tools/EditingTools.vala:754 +msgid "Unconstrained" +msgstr "Sin restricciones" + +#: src/editing_tools/EditingTools.vala:755 +msgid "Square" +msgstr "Cuadrado" + +#: src/editing_tools/EditingTools.vala:756 +msgid "Screen" +msgstr "Pantalla" + +#: src/editing_tools/EditingTools.vala:758 +#: src/editing_tools/EditingTools.vala:761 +#: src/editing_tools/EditingTools.vala:771 +#: src/editing_tools/EditingTools.vala:781 +msgid "-" +msgstr "-" + +#: src/editing_tools/EditingTools.vala:759 +msgid "SD Video (4 ∶ 3)" +msgstr "Vídeo SD (4:3)" + +#: src/editing_tools/EditingTools.vala:760 +msgid "HD Video (16 ∶ 9)" +msgstr "Vídeo HD (16:9)" + +#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792 +msgid "Wallet (2 × 3 in.)" +msgstr "Cartera (2 × 3 pulg.)" + +#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795 +msgid "Notecard (3 × 5 in.)" +msgstr "Tarjeta de notas (3 × 5 pulg.)" + +#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798 +msgid "4 × 6 in." +msgstr "4 × 6 pulg." + +#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801 +msgid "5 × 7 in." +msgstr "5 × 7 pulg." + +#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804 +msgid "8 × 10 in." +msgstr "8 × 10 pulg." + +#: src/editing_tools/EditingTools.vala:767 +msgid "Letter (8.5 × 11 in.)" +msgstr "Carta (8.5 × 11 pulg.)" + +#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807 +msgid "11 × 14 in." +msgstr "11 × 14 pulg." + +#: src/editing_tools/EditingTools.vala:769 +msgid "Tabloid (11 × 17 in.)" +msgstr "Tabloide (11 × 17 pulg.)" + +#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810 +msgid "16 × 20 in." +msgstr "16 × 20 pulg." + +#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816 +msgid "Metric Wallet (9 × 13 cm)" +msgstr "Cartera métrica (9 × 13 cm)" + +#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819 +msgid "Postcard (10 × 15 cm)" +msgstr "Tarjeta postal (10 × 15 cm)" + +#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822 +msgid "13 × 18 cm" +msgstr "13 × 18 cm" + +#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825 +msgid "18 × 24 cm" +msgstr "18 × 24 cm" + +#: src/editing_tools/EditingTools.vala:776 +msgid "A4 (210 × 297 mm)" +msgstr "A4 (210 × 297 mm)" + +#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828 +msgid "20 × 30 cm" +msgstr "20 × 30 cm" + +#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831 +msgid "24 × 40 cm" +msgstr "24 × 40 cm" + +#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834 +msgid "30 × 40 cm" +msgstr "30 × 40 cm" + +#: src/editing_tools/EditingTools.vala:780 +msgid "A3 (297 × 420 mm)" +msgstr "A3 (297 × 420 mm)" + +#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398 +msgid "Size:" +msgstr "Tamaño:" + +#: src/editing_tools/EditingTools.vala:1895 +msgid "Close the red-eye tool" +msgstr "Cerrar la herramienta de ojos rojos" + +#: src/editing_tools/EditingTools.vala:1898 +msgid "Remove any red-eye effects in the selected region" +msgstr "Quitar cualquier efecto de ojos rojos en la región seleccionada" + +#: src/editing_tools/EditingTools.vala:2238 +#: src/editing_tools/StraightenTool.vala:102 +msgid "_Reset" +msgstr "_Restablecer" + +#. fit both on the top line, emit and move on +#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439 +#: src/Properties.vala:443 src/Properties.vala:450 +msgid "Exposure:" +msgstr "Exposición:" + +#: src/editing_tools/EditingTools.vala:2261 +msgid "Contrast:" +msgstr "Contraste:" + +#: src/editing_tools/EditingTools.vala:2270 +msgid "Saturation:" +msgstr "Saturación:" + +#: src/editing_tools/EditingTools.vala:2279 +msgid "Tint:" +msgstr "Matiz:" + +#: src/editing_tools/EditingTools.vala:2289 +msgid "Temperature:" +msgstr "Temperatura:" + +#: src/editing_tools/EditingTools.vala:2298 +msgid "Shadows:" +msgstr "Sombras:" + +#: src/editing_tools/EditingTools.vala:2307 +msgid "Highlights:" +msgstr "Resaltadas:" + +#: src/editing_tools/EditingTools.vala:2363 +msgid "Reset Colors" +msgstr "Restablecer colores" + +#: src/editing_tools/EditingTools.vala:2363 +msgid "Reset all color adjustments to original" +msgstr "Restablecer todos los ajustes de color al original" + +#: src/editing_tools/EditingTools.vala:2722 +msgid "Temperature" +msgstr "Temperatura" + +#: src/editing_tools/EditingTools.vala:2734 +msgid "Tint" +msgstr "Matiz" + +#: src/editing_tools/EditingTools.vala:2746 +msgid "Contrast" +msgstr "Contraste" + +#: src/editing_tools/EditingTools.vala:2760 +msgid "Saturation" +msgstr "Saturación" + +#: src/editing_tools/EditingTools.vala:2773 +msgid "Exposure" +msgstr "Exposición" + +#: src/editing_tools/EditingTools.vala:2786 +msgid "Shadows" +msgstr "Sombras" + +#: src/editing_tools/EditingTools.vala:2799 +msgid "Highlights" +msgstr "Resaltadas" + +#: src/editing_tools/EditingTools.vala:2809 +msgid "Contrast Expansion" +msgstr "Expansión de contraste" + +#: src/editing_tools/StraightenTool.vala:99 +msgid "Angle:" +msgstr "Ángulo:" + +#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:203 +#: ui/direct.ui:144 ui/photo.ui:233 +msgid "_Straighten" +msgstr "_Enderezar" + +#: src/events/Branch.vala:25 +msgid "Events" +msgstr "Eventos" + +#: src/events/EventDirectoryItem.vala:83 +#, c-format +msgid "%d Photo/Video" +msgid_plural "%d Photos/Videos" +msgstr[0] "%d foto/vídeo" +msgstr[1] "%d fotos/vídeos" + +#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358 +#, c-format +msgid "%d Video" +msgid_plural "%d Videos" +msgstr[0] "%d vídeo" +msgstr[1] "%d vídeos" + +#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356 +#, c-format +msgid "%d Photo" +msgid_plural "%d Photos" +msgstr[0] "%d foto" +msgstr[1] "%d fotos" + +#: src/events/EventPage.vala:128 +msgid "No Event" +msgstr "No hay eventos" + +#: src/events/EventsDirectoryPage.vala:150 +msgid "No events" +msgstr "No hay eventos" + +#: src/events/EventsDirectoryPage.vala:154 +msgid "No events found" +msgstr "No se encontraron eventos" + +#: src/events/EventsDirectoryPage.vala:227 +msgid "All Events" +msgstr "Todos los eventos" + +#: src/events/EventsDirectoryPage.vala:241 +msgid "Undated" +msgstr "Sin fecha" + +#: src/events/EventsDirectoryPage.vala:242 +msgid "%Y" +msgstr "%Y" + +#: src/events/EventsDirectoryPage.vala:243 +msgid "%B" +msgstr "%B" + +#. if no name, pretty up the start time +#: src/Event.vala:753 +#, c-format +msgid "Event %s" +msgstr "Evento %s" + +#: src/Exporter.vala:232 +#, c-format +msgid "Unable to generate a temporary file for %s: %s" +msgstr "No se puede crear el directorio temporal %s: %s" + +#: src/Exporter.vala:299 +msgid "Exporting" +msgstr "Exportando" + +#: src/Exporter.vala:317 +#, c-format +msgid "File %s already exists. Replace?" +msgstr "El archivo %s ya existe. ¿Quiere reemplazarlo?" + +#: src/Exporter.vala:319 +msgid "_Skip" +msgstr "_Omitir" + +#: src/Exporter.vala:319 +msgid "_Replace" +msgstr "_Reemplazar" + +#: src/Exporter.vala:319 +msgid "Replace _All" +msgstr "Reempla_zar todo" + +#: src/Exporter.vala:319 +msgid "Export" +msgstr "Exportar" + +#: src/folders/Branch.vala:144 +msgid "Folders" +msgstr "Carpetas" + +#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412 +msgid "Library" +msgstr "Colección" + +#: src/library/Branch.vala:97 src/SearchFilter.vala:1083 +msgid "Photos" +msgstr "Fotos" + +#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102 +#: src/SearchFilter.vala:1103 +msgid "Flagged" +msgstr "Marcada" + +#: src/library/ImportQueuePage.vala:8 +msgid "Importing…" +msgstr "Importando…" + +#: src/library/ImportQueuePage.vala:129 +msgid "Preparing to import…" +msgstr "Preparando para importar…" + +#: src/library/ImportQueuePage.vala:156 +#, c-format +msgid "Imported %s" +msgstr "Importada %s" + +#: src/library/LastImportPage.vala:8 +msgid "Last Import" +msgstr "Última importación" + +#: src/library/LibraryWindow.vala:507 +msgid "Import From Folder" +msgstr "Importar desde carpeta" + +#: src/library/LibraryWindow.vala:576 ui/trash.ui:288 +msgid "Empty Trash" +msgstr "Vaciar la papelera" + +#: src/library/LibraryWindow.vala:576 +msgid "Emptying Trash…" +msgstr "Vaciando la papelera…" + +#: src/library/LibraryWindow.vala:772 +#, c-format +msgid "" +"Shotwell is configured to import photos to your home directory.\n" +"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</" +"span>.\n" +"Do you want to continue importing photos?" +msgstr "" +"Shotwell esta´configurado para importar fotos a su carpeta personal.\n" +"Se recomienda cambiar esto en <span weight=\"bold\">Editar %s Preferencias</" +"span>.\n" +"¿Quiere seguir importando fotos?" + +#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142 +msgid "Library Location" +msgstr "Ubicación de la colección" + +#. TODO: Specify which directory/file. +#: src/library/LibraryWindow.vala:788 +msgid "Photos cannot be imported from this directory." +msgstr "Las fotos no pueden importarse desde esta carpeta." + +#: src/library/LibraryWindow.vala:1068 +#, c-format +msgid "%s (%d%%)" +msgstr "%s (%d%%)" + +#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123 +msgid "Updating library…" +msgstr "Actualizando la colección…" + +#: src/library/LibraryWindow.vala:1129 +msgid "Preparing to auto-import photos…" +msgstr "Preparando para importar fotos automáticamente…" + +#: src/library/LibraryWindow.vala:1134 +msgid "Auto-importing photos…" +msgstr "Importando fotos automáticamente…" + +#: src/library/LibraryWindow.vala:1142 +msgid "Writing metadata to files…" +msgstr "Escribiendo metadatos en los archivos…" + +#: src/library/OfflinePage.vala:8 +msgid "Missing Files" +msgstr "Archivos faltantes" + +#: src/library/OfflinePage.vala:110 +msgid "Deleting…" +msgstr "Eliminando…" + +#: src/library/TrashPage.vala:8 +msgid "Trash" +msgstr "Papelera" + +#: src/library/TrashPage.vala:108 +msgid "Trash is empty" +msgstr "La papelera está vacía" + +#: src/library/TrashPage.vala:112 +msgid "Delete" +msgstr "Eliminar" + +#: src/library/TrashPage.vala:113 +msgid "Deleting Photos" +msgstr "Eliminando fotos" + +#: src/main.vala:54 +#, c-format +msgid "" +"Your photo library is not compatible with this version of Shotwell. It " +"appears it was created by Shotwell %s (schema %d). This version is %s " +"(schema %d). Please use the latest version of Shotwell." +msgstr "" +"Su colección de fotos no es compatible con esta versión de Shotwell. Parece " +"que fue creada por Shotwell %s (esquema %d). Esta versión es %s (esquema " +"%d). Use la versión más reciente de Shotwell." + +#: src/main.vala:59 +#, c-format +msgid "" +"Shotwell was unable to upgrade your photo library from version %s (schema " +"%d) to %s (schema %d). For more information please check the Shotwell Wiki " +"at %s" +msgstr "" +"Shotwell no pudo actualizar su colección de fotos desde la versión %s " +"(esquema %d) a la %s (esquema %d). Para obtener más información , consulte " +"el wiki de Shotwell en %s" + +#: src/main.vala:65 +#, c-format +msgid "" +"Your photo library is not compatible with this version of Shotwell. It " +"appears it was created by Shotwell %s (schema %d). This version is %s " +"(schema %d). Please clear your library by deleting %s and re-import your " +"photos." +msgstr "" +"Su colección de fotos no es compatible con esta versión de Shotwell. Parece " +"que fue creada por Shotwell %s (esquema %d). Esta versión es %s (esquema " +"%d). Vacíe la colección mediante la eliminación de %s, y vuelva a importar " +"las fotos." + +#: src/main.vala:71 +#, c-format +msgid "Unknown error attempting to verify Shotwell’s database: %s" +msgstr "" +"Error desconocido al intentar verificar la base de datos de Shotwell: %s" + +#: src/main.vala:104 +msgid "Loading Shotwell" +msgstr "Cargando Shotwell" + +#: src/main.vala:293 +msgid "Path to Shotwell’s private data" +msgstr "Ruta a los datos privados de Shotwell" + +#: src/main.vala:293 +msgid "DIRECTORY" +msgstr "DIRECTORIO" + +#: src/main.vala:297 +msgid "Do not monitor library directory at runtime for changes" +msgstr "" +"No monitorear el directorio de la colección en tiempo de ejecución para " +"buscar cambios" + +#: src/main.vala:301 +msgid "Don’t display startup progress meter" +msgstr "No mostrar medidor de progreso de inicio" + +#: src/main.vala:305 +msgid "Show the application’s version" +msgstr "Mostrar la versión de la aplicación" + +#. init GTK (valac has already called g_threads_init()) +#: src/main.vala:342 +msgid "[FILE]" +msgstr "[ARCHIVO]" + +#: src/main.vala:346 +#, c-format +msgid "Run “%s --help” to see a full list of available command line options.\n" +msgstr "" +"Ejecute «%s --help» para ver una lista completa de opciones de línea de " +"órdenes.\n" + +#: src/MediaMonitor.vala:400 +#, c-format +msgid "Unable to process monitoring updates: %s" +msgstr "No se pueden procesar las actualizaciones de la monitorización %s" + +#: src/MediaPage.vala:158 +msgid "Adjust the size of the thumbnails" +msgstr "Ajustar el tamaño de las miniaturas" + +#: src/MediaPage.vala:503 +#, c-format +msgid "" +"Shotwell was unable to play the selected video:\n" +"%s" +msgstr "" +"Shotwell no pudo reproducir el vídeo seleccionado:\n" +"%s" + +#: src/Page.vala:1318 +msgid "No photos/videos" +msgstr "No hay fotos/vídeos" + +#: src/Page.vala:1322 +msgid "No photos/videos found which match the current filter" +msgstr "No se han encontrado fotos/vídeos que coincidan con el filtro actual" + +#: src/Page.vala:2628 +msgid "Photos cannot be exported to this directory." +msgstr "No se pueden exportar las fotos a este directorio." + +#. previous button +#: src/PhotoPage.vala:538 +msgid "Previous photo" +msgstr "Foto anterior" + +#. next button +#: src/PhotoPage.vala:544 +msgid "Next photo" +msgstr "Siguiente foto" + +#: src/PhotoPage.vala:1850 +#, c-format +msgid "Photo source file missing: %s" +msgstr "Falta el archivo de origen de la foto: %s" + +#: src/PhotoPage.vala:3018 +#, c-format +msgid "Unable to export %s: %s" +msgstr "No se puede exportar %s: %s" + +#: src/photos/BmpSupport.vala:32 +msgid "BMP" +msgstr "BMP" + +#: src/photos/JfifSupport.vala:84 +msgid "JPEG" +msgstr "JPEG" + +#: src/photos/JfifSupport.vala:185 +#, c-format +msgid "Low (%d%%)" +msgstr "Baja (%d%%)" + +#: src/photos/JfifSupport.vala:188 +#, c-format +msgid "Medium (%d%%)" +msgstr "Media (%d%%)" + +#: src/photos/JfifSupport.vala:191 +#, c-format +msgid "High (%d%%)" +msgstr "Alta (%d%%)" + +#: src/photos/JfifSupport.vala:194 +#, c-format +msgid "Maximum (%d%%)" +msgstr "Máxima (%d%%)" + +#: src/photos/PngSupport.vala:30 +msgid "PNG" +msgstr "PNG" + +#: src/photos/RawSupport.vala:134 +msgid "RAW" +msgstr "RAW" + +#: src/photos/TiffSupport.vala:86 +msgid "TIFF" +msgstr "TIFF" + +#: src/Photo.vala:3755 +msgid "modified" +msgstr "modificada" + +#: src/Printing.vala:255 +msgid "Fill the entire page" +msgstr "Llenar la página entera" + +#: src/Printing.vala:256 +msgid "2 images per page" +msgstr "2 imágenes por página" + +#: src/Printing.vala:257 +msgid "4 images per page" +msgstr "4 imágenes por página" + +#: src/Printing.vala:258 +msgid "6 images per page" +msgstr "6 imágenes por página" + +#: src/Printing.vala:259 +msgid "8 images per page" +msgstr "8 imágenes por página" + +#: src/Printing.vala:260 +msgid "16 images per page" +msgstr "16 imágenes por página" + +#: src/Printing.vala:261 +msgid "32 images per page" +msgstr "32 imágenes por página" + +#: src/Printing.vala:851 +msgid "Image Settings" +msgstr "Ajustes de la imagen" + +#: src/Printing.vala:864 +msgid "Printing…" +msgstr "Imprimiendo…" + +#: src/Printing.vala:884 src/Printing.vala:1087 +#, c-format +msgid "" +"Unable to print photo:\n" +"\n" +"%s" +msgstr "" +"No se puede imprimir la foto:\n" +"\n" +"%s" + +#: src/Properties.vala:87 +msgid "Today" +msgstr "Hoy" + +#: src/Properties.vala:89 +msgid "Yesterday" +msgstr "Ayer" + +#: src/Properties.vala:346 +msgid "Items:" +msgstr "Elementos:" + +#: src/Properties.vala:349 +#, c-format +msgid "%d Event" +msgid_plural "%d Events" +msgstr[0] "%d evento" +msgstr[1] "%d eventos" + +#. display only one date if start and end are the same +#: src/Properties.vala:380 +msgid "Date:" +msgstr "Fecha:" + +#. display only one time if start and end are the same +#: src/Properties.vala:384 +msgid "Time:" +msgstr "Hora:" + +#. display time range +#. display date range +#: src/Properties.vala:387 src/Properties.vala:392 +msgid "From:" +msgstr "De:" + +#: src/Properties.vala:388 src/Properties.vala:393 +msgid "To:" +msgstr "A:" + +#: src/Properties.vala:407 +msgid "Duration:" +msgstr "Duración:" + +#: src/Properties.vala:407 +#, c-format +msgid "%.1f seconds" +msgstr "%.1f segundos" + +#: src/Properties.vala:411 +msgid "Developer:" +msgstr "Revelador:" + +#. nothing special to be done for now for Events +#: src/Properties.vala:586 +msgid "Location:" +msgstr "Ubicación:" + +#: src/Properties.vala:589 +msgid "File size:" +msgstr "Tamaño del archivo:" + +#: src/Properties.vala:593 +msgid "Current Development:" +msgstr "Desarrollo actual:" + +#: src/Properties.vala:595 +msgid "Original dimensions:" +msgstr "Dimensiones originales:" + +#: src/Properties.vala:598 +msgid "Camera make:" +msgstr "Cámara:" + +#: src/Properties.vala:601 +msgid "Camera model:" +msgstr "Modelo de la cámara:" + +#: src/Properties.vala:604 +msgid "Flash:" +msgstr "Flash:" + +#: src/Properties.vala:606 +msgid "Focal length:" +msgstr "Longitud focal:" + +#: src/Properties.vala:609 +msgid "Exposure date:" +msgstr "Fecha de exposición:" + +#: src/Properties.vala:612 +msgid "Exposure time:" +msgstr "Tiempo de exposición:" + +#: src/Properties.vala:615 +msgid "Exposure bias:" +msgstr "Exposición:" + +#: src/Properties.vala:617 +msgid "GPS latitude:" +msgstr "Latitud GPS:" + +#: src/Properties.vala:620 +msgid "GPS longitude:" +msgstr "Longitud GPS:" + +#: src/Properties.vala:623 +msgid "Artist:" +msgstr "Artista:" + +#: src/Properties.vala:625 +msgid "Copyright:" +msgstr "Copyright:" + +#: src/Properties.vala:627 +msgid "Software:" +msgstr "Software:" + +#: src/Properties.vala:644 +msgid "Extended Information" +msgstr "Información extendida" + +#: src/publishing/PublishingPluginHost.vala:11 +msgid "Preparing for upload" +msgstr "Preparando para subir" + +#: src/publishing/PublishingPluginHost.vala:12 +#, c-format +msgid "Uploading %d of %d" +msgstr "Subiendo %d de %d" + +#: src/publishing/PublishingPluginHost.vala:81 +#, c-format +msgid "Publishing to %s can’t continue because an error occurred:" +msgstr "No se puede continuar la publicación en %s porque ocurrió un error:" + +#: src/publishing/PublishingPluginHost.vala:84 +msgid "To try publishing to another service, select one from the above menu." +msgstr "" +"Para intentar publicar en otro servicio, seleccione uno en el menú de arriba." + +#. Here, we check whether more than one item is being uploaded, and if so, display +#. an alternate message. +#: src/publishing/PublishingUI.vala:104 +#| msgid "The selected video was successfully published." +msgid "The selected video was successfully published." +msgid_plural "The selected videos were successfully published." +msgstr[0] "El vídeo seleccionado se publicó correctamente." +msgstr[1] "Los vídeos seleccionado se publicaron correctamente." + +#: src/publishing/PublishingUI.vala:109 +#| msgid "The selected photo was successfully published." +msgid "The selected photo was successfully published." +msgid_plural "The selected photos were successfully published." +msgstr[0] "La foto seleccionada se publicó correctamente." +msgstr[1] "Las fotos seleccionadas se publicaron correctamente." + +#: src/publishing/PublishingUI.vala:115 +msgid "The selected photos/videos were successfully published." +msgstr "Las fotos/vídeos seleccionados se publicaron correctamente." + +#: src/publishing/PublishingUI.vala:127 +msgid "Fetching account information…" +msgstr "Obteniendo información de la cuenta…" + +#: src/publishing/PublishingUI.vala:133 +msgid "Logging in…" +msgstr "Iniciando sesión…" + +#: src/publishing/PublishingUI.vala:193 +msgid "Publish Photos" +msgstr "Publicar fotos" + +#: src/publishing/PublishingUI.vala:194 +msgid "Publish photos _to:" +msgstr "Publicar fo_tos en:" + +#: src/publishing/PublishingUI.vala:196 +msgid "Publish Videos" +msgstr "Publicar vídeos" + +#: src/publishing/PublishingUI.vala:197 +msgid "Publish videos _to" +msgstr "Publicar vídeos _en" + +#: src/publishing/PublishingUI.vala:199 +msgid "Publish Photos and Videos" +msgstr "Publicar fotos y vídeos" + +#: src/publishing/PublishingUI.vala:200 +msgid "Publish photos and videos _to" +msgstr "Publicar fotos y vídeos _en" + +#. There are no enabled publishing services that accept this media type, +#. warn the user. +#: src/publishing/PublishingUI.vala:410 +msgid "Unable to publish" +msgstr "No se pudo publicar" + +#: src/publishing/PublishingUI.vala:411 +#, c-format +msgid "" +"Shotwell cannot publish the selected items because you do not have a " +"compatible publishing plugin enabled. To correct this, choose <b>Edit %s " +"Preferences</b> and enable one or more of the publishing plugins on the " +"<b>Plugins</b> tab." +msgstr "" +"Shotwell no puede publicar el elemento seleccionado porque no tiene activado " +"un complemento compatible. Para corregir esto, vaya a <b>Editar %s " +"Preferencias</b> y active uno o más complementos de publicación en la " +"pestaña <b>Complementos</b>." + +#: src/publishing/Publishing.vala:16 +msgid "Publishing" +msgstr "Publicando" + +#: src/Resources.vala:141 src/Resources.vala:146 ui/collection.ui:151 +msgid "Rotate" +msgstr "Girar" + +#: src/Resources.vala:142 +msgid "Rotate Right" +msgstr "Girar a la derecha" + +#: src/Resources.vala:143 ui/collection.ui:148 +msgid "Rotate the photos right (press Ctrl to rotate left)" +msgstr "Girar las fotos a la derecha (oprima Ctrl para girar a la izquierda)" + +#: src/Resources.vala:147 +msgid "Rotate Left" +msgstr "Girar a la izquierda" + +#: src/Resources.vala:148 +msgid "Rotate the photos left" +msgstr "Girar las fotos a la izquierda" + +#: src/Resources.vala:151 +msgid "Flip Horizontally" +msgstr "Voltear horizontalmente" + +#: src/Resources.vala:154 +msgid "Flip Vertically" +msgstr "Voltear verticalmente" + +#: src/Resources.vala:156 ui/direct.ui:191 ui/events_directory.ui:168 +#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:421 +#: ui/offline.ui:198 ui/photo.ui:404 ui/tags.ui:440 ui/trash.ui:207 +msgid "_About" +msgstr "_Acerca de" + +#: src/Resources.vala:157 +msgid "_Apply" +msgstr "_Aplicar" + +#: src/Resources.vala:160 ui/direct.ui:44 ui/events_directory.ui:32 +#: ui/event.ui:47 ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32 +#: ui/photo.ui:55 ui/tags.ui:47 ui/trash.ui:37 +msgid "_Edit" +msgstr "_Editar" + +#: src/Resources.vala:161 +msgid "_Forward" +msgstr "_Adelante" + +#: src/Resources.vala:162 ui/direct.ui:62 ui/events_directory.ui:125 +#: ui/photo.ui:173 +msgid "Fulls_creen" +msgstr "Pantalla c_ompleta" + +#: src/Resources.vala:163 ui/direct.ui:173 ui/direct.ui:176 +#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420 +#: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 +#: ui/import.ui:183 ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 +#: ui/offline.ui:180 ui/offline.ui:183 ui/photo.ui:386 ui/photo.ui:389 +#: ui/tags.ui:422 ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192 +msgid "_Help" +msgstr "Ay_uda" + +#: src/Resources.vala:164 +msgid "Leave _Fullscreen" +msgstr "Salir de pantalla co_mpleta" + +#: src/Resources.vala:165 src/Resources.vala:364 ui/tags.ui:450 +msgid "_New" +msgstr "_Nueva" + +#: src/Resources.vala:166 +msgid "_Next" +msgstr "_Siguiente" + +#: src/Resources.vala:169 src/Resources.vala:318 ui/events_directory.ui:65 +#: ui/event.ui:93 ui/import.ui:68 ui/media.ui:93 ui/offline.ui:72 +#: ui/photo.ui:89 ui/tags.ui:93 ui/trash.ui:81 +msgid "_Preferences" +msgstr "_Preferencias" + +#: src/Resources.vala:170 +msgid "_Previous" +msgstr "_Anterior" + +#: src/Resources.vala:172 ui/direct.ui:37 ui/events_directory.ui:25 +#: ui/event.ui:40 ui/import_queue.ui:31 ui/import.ui:33 ui/media.ui:40 +#: ui/offline.ui:25 ui/photo.ui:48 ui/tags.ui:40 ui/trash.ui:30 +msgid "_Quit" +msgstr "_Salir" + +#: src/Resources.vala:173 +msgid "_Refresh" +msgstr "_Actualizar" + +#: src/Resources.vala:175 +msgid "_Revert" +msgstr "_Revertir" + +#: src/Resources.vala:177 +msgid "Save _As" +msgstr "Guardar _como" + +#: src/Resources.vala:178 +msgid "Sort _Ascending" +msgstr "Ordenar _ascendentemente" + +#: src/Resources.vala:179 +msgid "Sort _Descending" +msgstr "Ordenar d_escendentemente" + +#: src/Resources.vala:180 +msgid "_Stop" +msgstr "_Detener" + +#: src/Resources.vala:181 +msgid "_Undelete" +msgstr "_Recuperar" + +#: src/Resources.vala:182 +msgid "_Normal Size" +msgstr "Tamaño _normal" + +#: src/Resources.vala:183 +msgid "Best _Fit" +msgstr "_Mejor ajuste" + +#: src/Resources.vala:184 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260 +#: ui/photo.ui:144 ui/tags.ui:260 +msgid "Zoom _In" +msgstr "_Ampliar" + +#: src/Resources.vala:185 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265 +#: ui/photo.ui:149 ui/tags.ui:265 +msgid "Zoom _Out" +msgstr "Re_ducir" + +#: src/Resources.vala:188 ui/collection.ui:167 +msgid "Enhance" +msgstr "Mejorar" + +#: src/Resources.vala:189 ui/collection.ui:164 +msgid "Automatically improve the photo’s appearance" +msgstr "Mejorar automáticamente la apariencia de la foto" + +#: src/Resources.vala:192 +msgid "Copy Color Adjustments" +msgstr "Copiar ajustes de color" + +#: src/Resources.vala:193 +msgid "Copy the color adjustments applied to the photo" +msgstr "Copiar los ajustes de color aplicados a la foto" + +#: src/Resources.vala:196 +msgid "Paste Color Adjustments" +msgstr "Pegar ajustes de color" + +#: src/Resources.vala:197 +msgid "Apply copied color adjustments to the selected photos" +msgstr "Aplicar ajuste de color copiado a las fotos seleccionadas" + +#: src/Resources.vala:199 ui/direct.ui:139 ui/photo.ui:228 +msgid "_Crop" +msgstr "Re_cortar" + +#: src/Resources.vala:200 +msgid "Crop" +msgstr "Recortar" + +#: src/Resources.vala:201 +msgid "Crop the photo’s size" +msgstr "Recortar el tamaño de la foto" + +#: src/Resources.vala:204 +msgid "Straighten" +msgstr "Enderezar" + +#: src/Resources.vala:205 +msgid "Straighten the photo" +msgstr "Enderezar la foto" + +#: src/Resources.vala:207 ui/direct.ui:149 ui/photo.ui:238 +msgid "_Red-eye" +msgstr "Ojos _rojos" + +#: src/Resources.vala:208 +msgid "Red-eye" +msgstr "Ojos rojos" + +#: src/Resources.vala:209 +msgid "Reduce or eliminate any red-eye effects in the photo" +msgstr "Reducir o eliminar cualquier efecto de ojos rojos en la foto" + +#: src/Resources.vala:211 ui/direct.ui:154 ui/photo.ui:243 +msgid "_Adjust" +msgstr "_Ajuste" + +#: src/Resources.vala:212 +msgid "Adjust" +msgstr "Ajuste" + +#: src/Resources.vala:213 +msgid "Adjust the photo’s color and tone" +msgstr "Ajustar el color y el tono de la foto" + +#: src/Resources.vala:216 +msgid "Revert to Original" +msgstr "Volver al original" + +#: src/Resources.vala:218 +msgid "Revert External E_dits" +msgstr "Revertir e_diciones externas" + +#: src/Resources.vala:219 +msgid "Revert to the master photo" +msgstr "Revertir a la foto original" + +#: src/Resources.vala:222 +msgid "Set selected image to be the new desktop background" +msgstr "Establezca la imagen seleccionada como nuevo fondo de escritorio" + +#: src/Resources.vala:223 +msgid "Set as _Desktop Slideshow…" +msgstr "Establecer como pase de _diapositivas de escritorio…" + +#: src/Resources.vala:225 ui/direct.ui:47 ui/events_directory.ui:35 +#: ui/event.ui:50 ui/import.ui:43 ui/media.ui:50 ui/offline.ui:35 +#: ui/photo.ui:58 ui/tags.ui:50 ui/trash.ui:40 +msgid "_Undo" +msgstr "_Deshacer" + +#: src/Resources.vala:226 +msgid "Undo" +msgstr "Deshacer" + +#: src/Resources.vala:228 ui/direct.ui:52 ui/events_directory.ui:40 +#: ui/event.ui:55 ui/import.ui:48 ui/media.ui:55 ui/offline.ui:40 +#: ui/photo.ui:63 ui/tags.ui:55 ui/trash.ui:45 +msgid "_Redo" +msgstr "_Rehacer" + +#: src/Resources.vala:229 +msgid "Redo" +msgstr "Rehacer" + +#: src/Resources.vala:231 ui/events_directory.ui:139 +#: ui/events_directory.ui:181 ui/event.ui:393 ui/event.ui:588 +msgid "Re_name Event…" +msgstr "Re_nombrar evento…" + +#: src/Resources.vala:234 ui/event.ui:373 ui/event.ui:580 +msgid "Make _Key Photo for Event" +msgstr "Hacer foto _clave para el evento" + +#: src/Resources.vala:235 +msgid "Make Key Photo for Event" +msgstr "Hacer foto clave para el evento" + +#: src/Resources.vala:237 ui/event.ui:382 ui/media.ui:376 ui/tags.ui:376 +msgid "_New Event" +msgstr "Evento _nuevo" + +#: src/Resources.vala:238 +msgid "New Event" +msgstr "Evento nuevo" + +#: src/Resources.vala:240 +msgid "Move Photos" +msgstr "Mover fotos" + +#: src/Resources.vala:241 +msgid "Move photos to an event" +msgstr "Mover fotos a un evento" + +#: src/Resources.vala:243 ui/events_directory.ui:135 +#: ui/events_directory.ui:177 +msgid "_Merge Events" +msgstr "_Combinar eventos" + +#: src/Resources.vala:244 +msgid "Merge" +msgstr "Combinar" + +#: src/Resources.vala:245 +msgid "Combine events into a single event" +msgstr "Combinar eventos en uno solo" + +#: src/Resources.vala:247 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:478 +#: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286 +msgid "_Set Rating" +msgstr "Establecer p_untuación" + +#: src/Resources.vala:248 +msgid "Set Rating" +msgstr "Establecer puntuación" + +#: src/Resources.vala:249 +msgid "Change the rating of your photo" +msgstr "Cambiar la puntuación de su foto" + +#: src/Resources.vala:251 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:511 +#: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326 +msgid "_Increase" +msgstr "_Aumentar" + +#: src/Resources.vala:252 +msgid "Increase Rating" +msgstr "Aumentar puntuación" + +#: src/Resources.vala:254 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:515 +#: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331 +msgid "_Decrease" +msgstr "Disminuir" + +#: src/Resources.vala:255 +msgid "Decrease Rating" +msgstr "Disminuir puntuación" + +#: src/Resources.vala:257 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:501 +#: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314 +msgid "_Unrated" +msgstr "_Sin puntuar" + +#: src/Resources.vala:258 +msgid "Unrated" +msgstr "Sin puntuar" + +#: src/Resources.vala:259 +msgid "Rate Unrated" +msgstr "Puntuar no puntuadas" + +#: src/Resources.vala:260 +msgid "Setting as unrated" +msgstr "Establecer como sin puntuación" + +#: src/Resources.vala:261 +msgid "Remove any ratings" +msgstr "Quitar cualquier puntuación" + +#: src/Resources.vala:263 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:505 +#: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319 +msgid "_Rejected" +msgstr "_Rechazado" + +#: src/Resources.vala:264 +msgid "Rejected" +msgstr "Rechazada" + +#: src/Resources.vala:265 +msgid "Rate Rejected" +msgstr "Puntuar rechazadas" + +#: src/Resources.vala:266 +msgid "Setting as rejected" +msgstr "Estableciendo como rechazada" + +#: src/Resources.vala:267 +msgid "Set rating to rejected" +msgstr "Establecer puntuación para rechazadas" + +#: src/Resources.vala:269 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196 +#: ui/offline.ui:153 ui/search_bar.ui:6 ui/tags.ui:196 ui/trash.ui:162 +msgid "Rejected _Only" +msgstr "Solo _rechazadas" + +#: src/Resources.vala:270 +msgid "Rejected Only" +msgstr "Solo rechazadas" + +#: src/Resources.vala:271 +msgid "Show only rejected photos" +msgstr "Mostrar solo las fotos rechazadas" + +#: src/Resources.vala:273 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190 +#: ui/offline.ui:147 ui/search_bar.ui:12 ui/tags.ui:190 ui/trash.ui:156 +msgid "All + _Rejected" +msgstr "Todas + _rechazadas" + +#: src/Resources.vala:274 +msgctxt "Tooltip" +msgid "Show all photos, including rejected" +msgstr "Mostrar todas las fotos, incluyendo las rechazadas" + +#: src/Resources.vala:276 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184 +#: ui/offline.ui:141 ui/search_bar.ui:18 ui/tags.ui:184 ui/trash.ui:150 +msgid "_All Photos" +msgstr "Todas las _fotos" + +#. Button tooltip +#: src/Resources.vala:278 +msgid "Show all photos" +msgstr "Mostrar todas las fotos" + +#: src/Resources.vala:280 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120 +#: ui/tags.ui:144 +msgid "_Ratings" +msgstr "_Puntuaciones" + +#: src/Resources.vala:281 +msgid "Display each photo’s rating" +msgstr "Mostrar la puntuación de cada foto" + +#: src/Resources.vala:283 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151 +#: ui/offline.ui:108 ui/tags.ui:151 ui/trash.ui:117 +msgid "_Filter Photos" +msgstr "_Filtrar fotos" + +#: src/Resources.vala:284 +msgid "Filter Photos" +msgstr "Filtrar fotos" + +#: src/Resources.vala:285 +msgid "Limit the number of photos displayed based on a filter" +msgstr "Limitar el número de fotos mostradas en base al filtro" + +#: src/Resources.vala:288 +msgid "Duplicate" +msgstr "Duplicar" + +#: src/Resources.vala:289 +msgid "Make a duplicate of the photo" +msgstr "Hacer un duplicado de la foto" + +#: src/Resources.vala:291 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17 +#: ui/tags.ui:17 +msgid "_Export…" +msgstr "_Exportar…" + +#: src/Resources.vala:293 +msgid "_Print…" +msgstr "_Imprimir…" + +#: src/Resources.vala:295 +msgid "Pu_blish…" +msgstr "Pu_blicar…" + +#: src/Resources.vala:297 ui/collection.ui:189 +msgid "Publish to various websites" +msgstr "Publicar en varios sitios web" + +#: src/Resources.vala:299 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:537 +#: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340 +msgid "Edit _Title…" +msgstr "Editar _título…" + +#. Button label +#: src/Resources.vala:301 +msgctxt "Button Label" +msgid "Edit Title" +msgstr "Editar título" + +#: src/Resources.vala:303 ui/collection.ui:103 ui/events_directory.ui:144 +#: ui/events_directory.ui:186 ui/event.ui:345 ui/event.ui:398 ui/event.ui:542 +#: ui/media.ui:345 ui/photo_context.ui:110 ui/photo.ui:332 ui/tags.ui:345 +msgid "Edit _Comment…" +msgstr "Editar _comentario…" + +#. Button label +#: src/Resources.vala:305 +msgid "Edit Comment" +msgstr "Editar comentario" + +#: src/Resources.vala:307 ui/event.ui:592 +msgid "Edit Event _Comment…" +msgstr "Editar _comentario de evento…" + +#: src/Resources.vala:310 ui/direct.ui:167 ui/photo.ui:337 +msgid "_Adjust Date and Time…" +msgstr "_Ajustar fecha y hora…" + +#: src/Resources.vala:311 +msgid "Adjust Date and Time" +msgstr "Ajustar fecha y hora" + +#: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458 +#: ui/media.ui:390 ui/photo.ui:374 ui/tags.ui:390 +msgid "Add _Tags…" +msgstr "Añadir e_tiquetas…" + +#: src/Resources.vala:314 ui/photo_context.ui:17 +msgid "_Add Tags…" +msgstr "_Añadir etiquetas…" + +#. Dialog title +#: src/Resources.vala:316 +msgctxt "Dialog Title" +msgid "Add Tags" +msgstr "Añadir etiquetas" + +#: src/Resources.vala:325 ui/photo_context.ui:135 +msgid "Send T_o…" +msgstr "Env_iar a…" + +#: src/Resources.vala:327 +msgid "_Find…" +msgstr "_Buscar…" + +#: src/Resources.vala:328 ui/collection.ui:217 ui/offline.ui:239 +#: ui/trash.ui:312 +msgid "Find" +msgstr "Buscar" + +#: src/Resources.vala:329 ui/collection.ui:214 ui/offline.ui:236 +#: ui/trash.ui:309 +msgid "Find an image by typing text that appears in its name or tags" +msgstr "" +"Buscar una imagen escribiendo el texto que aparece en su nombre o etiquetas" + +#: src/Resources.vala:331 +msgid "_Flag" +msgstr "_Marcar" + +#: src/Resources.vala:333 +msgid "Un_flag" +msgstr "_Desmarcar" + +#: src/Resources.vala:336 +#, c-format +msgid "Unable to launch editor: %s" +msgstr "No se puede abrir el editor: %s" + +#: src/Resources.vala:341 +#, c-format +msgid "Add Tag “%s”" +msgstr "Añadir etiqueta «%s»" + +#. Used when adding two tags to photo(s) +#: src/Resources.vala:344 +#, c-format +msgid "Add Tags “%s” and “%s”" +msgstr "Añadir etiquetas «%s» y «%s»" + +#. Undo/Redo command name (in Edit menu) +#: src/Resources.vala:349 +msgctxt "UndoRedo menu entry" +msgid "Add Tags" +msgstr "Añadir etiquetas" + +#: src/Resources.vala:354 +#, c-format +msgid "_Delete Tag “%s”" +msgstr "_Eliminar etiqueta «%s»" + +#: src/Resources.vala:358 +#, c-format +msgid "Delete Tag “%s”" +msgstr "Eliminar etiqueta «%s»" + +#: src/Resources.vala:361 +msgid "Delete Tag" +msgstr "Eliminar etiqueta" + +#: src/Resources.vala:367 +#, c-format +msgid "Re_name Tag “%s”…" +msgstr "Re_nombrar etiqueta «%s»…" + +#: src/Resources.vala:371 +#, c-format +msgid "Rename Tag “%s” to “%s”" +msgstr "Renombrar la etiqueta «%s» a «%s»" + +#: src/Resources.vala:374 ui/tags.ui:456 +msgid "_Rename…" +msgstr "_Renombrar…" + +#: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463 +#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:379 ui/tags.ui:395 +msgid "Modif_y Tags…" +msgstr "Mod_ificar etiquetas…" + +#: src/Resources.vala:377 +msgid "Modify Tags" +msgstr "Modificar etiquetas" + +#: src/Resources.vala:380 +#, c-format +msgid "Tag Photo as “%s”" +msgid_plural "Tag Photos as “%s”" +msgstr[0] "Etiquetar fotos como «%s»" +msgstr[1] "Etiquetar fotos como «%s»" + +#: src/Resources.vala:386 +#, c-format +msgid "Tag the selected photo as “%s”" +msgid_plural "Tag the selected photos as “%s”" +msgstr[0] "Etiquetar las fotos seleccionadas como «%s»" +msgstr[1] "Etiquetar las fotos seleccionadas como «%s»" + +#: src/Resources.vala:392 +#, c-format +msgid "Remove Tag “%s” From _Photo" +msgid_plural "Remove Tag “%s” From _Photos" +msgstr[0] "Quitar la etiqueta «%s» de las _fotos" +msgstr[1] "Quitar la etiqueta «%s» de las _fotos" + +#: src/Resources.vala:398 +#, c-format +msgid "Remove Tag “%s” From Photo" +msgid_plural "Remove Tag “%s” From Photos" +msgstr[0] "Quitar la etiqueta «%s» de las fotos" +msgstr[1] "Quitar la etiqueta «%s» de las fotos" + +#: src/Resources.vala:404 +#, c-format +msgid "Unable to rename tag to “%s” because the tag already exists." +msgstr "No se puede renombrar la etiqueta a «%s» porque la etiqueta ya existe." + +#: src/Resources.vala:408 +#, c-format +msgid "Unable to rename search to “%s” because the search already exists." +msgstr "No se pudo renombrar la búsqueda «%s» porque la búsqueda ya existe." + +#. Saved search button +#: src/Resources.vala:411 src/SearchFilter.vala:1124 +msgid "Saved Search" +msgstr "Búsqueda guardada" + +#: src/Resources.vala:413 +msgid "Delete Search" +msgstr "Eliminar búsqueda" + +#: src/Resources.vala:416 ui/savedsearch.ui:11 +msgid "_Edit…" +msgstr "_Editar…" + +#: src/Resources.vala:417 ui/savedsearch.ui:7 +msgid "Re_name…" +msgstr "Re_nombrar…" + +#: src/Resources.vala:420 +#, c-format +msgid "Rename Search “%s” to “%s”" +msgstr "Renombrar la búsqueda «%s» a «%s»" + +#: src/Resources.vala:424 +#, c-format +msgid "Delete Search “%s”" +msgstr "Eliminar búsqueda «%s»" + +#: src/Resources.vala:561 +#, c-format +msgid "Rate %s" +msgstr "Puntuar %s" + +#: src/Resources.vala:562 +#, c-format +msgid "Set rating to %s" +msgstr "Establecer puntuación para %s" + +#: src/Resources.vala:563 +#, c-format +msgid "Setting rating to %s" +msgstr "Estableciendo la puntuación de %s" + +#: src/Resources.vala:565 +#, c-format +msgid "Display %s" +msgstr "Mostrar %s" + +#: src/Resources.vala:566 +#, c-format +msgid "Only show photos with a rating of %s" +msgstr "Solo mostrar fotos con puntuación %s" + +#: src/Resources.vala:567 +#, c-format +msgid "%s or Better" +msgstr "%s o mayor" + +#: src/Resources.vala:568 +#, c-format +msgid "Display %s or Better" +msgstr "Mostrar %s o mayor" + +#: src/Resources.vala:569 +#, c-format +msgid "Only show photos with a rating of %s or better" +msgstr "Solo mostrar fotos con puntuación %s o mayor" + +#: src/Resources.vala:660 ui/trash.ui:255 +msgid "Remove the selected photos from the trash" +msgstr "Quitar las fotos seleccionadas de la papelera" + +#: src/Resources.vala:661 ui/offline.ui:221 +msgid "Remove the selected photos from the library" +msgstr "Quitar las fotos seleccionadas de la colección" + +#: src/Resources.vala:663 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273 +msgid "_Restore" +msgstr "_Restaurar" + +#: src/Resources.vala:664 ui/trash.ui:270 +msgid "Move the selected photos back into the library" +msgstr "Mover las fotos seleccionadas de vuelta a la colección" + +#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:20 +#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27 +#: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19 +#: ui/trash.ui:227 +msgid "Show in File Mana_ger" +msgstr "Mostrar en ge_stor de archivos" + +#: src/Resources.vala:667 +msgid "Open the selected photo’s directory in the file manager" +msgstr "Abrir el directorio de la foto seleccionada en el gestor de archivos" + +#: src/Resources.vala:670 +#, c-format +msgid "Unable to open in file manager: %s" +msgstr "No se puede abrir el gestor de archivos: %s" + +#: src/Resources.vala:673 ui/offline.ui:224 +msgid "R_emove From Library" +msgstr "_Quitar de la colección" + +#: src/Resources.vala:675 ui/collection.ui:134 ui/event.ui:79 ui/event.ui:573 +#: ui/media.ui:79 ui/photo_context.ui:141 ui/photo.ui:82 ui/tags.ui:79 +msgid "_Move to Trash" +msgstr "_Mover a la papelera" + +#: src/Resources.vala:677 ui/events_directory.ui:58 ui/event.ui:86 +#: ui/import.ui:61 ui/media.ui:86 ui/offline.ui:65 ui/tags.ui:86 +#: ui/trash.ui:74 +msgid "Select _All" +msgstr "Seleccionar _todo" + +#: src/Resources.vala:678 +msgid "Select all items" +msgstr "Seleccionar todos los elementos" + +#. ...precache the timestamp string... +#. / Locale-specific time format for 12-hour time, i.e. 8:31 PM +#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes +#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format +#. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM +#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes +#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format +#. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006" +#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format +#: src/Resources.vala:739 +msgid "%a %b %d, %Y" +msgstr "%a %d de %b de %Y" + +#. / Locale-specific starting date format for multi-date strings, +#. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006" +#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format +#: src/Resources.vala:744 +msgctxt "MultidayFormat" +msgid "%a %b %d" +msgstr "%a, %d de %b" + +#. / Locale-specific ending date format for multi-date strings, +#. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006" +#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format +#: src/Resources.vala:749 +msgctxt "MultidayFormat" +msgid "%d, %Y" +msgstr "%d, %Y" + +#. / Locale-specific calendar date format for multi-month strings, +#. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006" +#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format +#: src/Resources.vala:754 +msgctxt "MultimonthFormat" +msgid "%a %b %d" +msgstr "%a, %d de %b" + +#. / Locale-specific calendar date format for multi-month strings, +#. / i.e. the "Mon Apr 06, 2006" in "Tue Mar 08 to Mon Apr 06, 2006" +#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format +#: src/Resources.vala:759 +msgctxt "MultimonthFormat" +msgid "%a %b %d, %Y" +msgstr "%a %d de %b de %Y" + +#: src/Screensaver.vala:18 src/SlideshowPage.vala:141 +msgid "Slideshow" +msgstr "Diapositivas" + +#: src/searches/Branch.vala:68 +msgid "Saved Searches" +msgstr "Búsquedas guardadas" + +#. Ordering must correspond with SearchConditionText.Context +#: src/searches/SavedSearchDialog.vala:162 +msgid "contains" +msgstr "contiene" + +#. Ordering must correspond with Context +#: src/searches/SavedSearchDialog.vala:163 +#: src/searches/SavedSearchDialog.vala:494 +msgid "is exactly" +msgstr "es exactamente" + +#: src/searches/SavedSearchDialog.vala:164 +msgid "starts with" +msgstr "comienza por" + +#: src/searches/SavedSearchDialog.vala:165 +msgid "ends with" +msgstr "termina por" + +#: src/searches/SavedSearchDialog.vala:166 +msgid "does not contain" +msgstr "no contiene" + +#: src/searches/SavedSearchDialog.vala:167 +#: src/searches/SavedSearchDialog.vala:498 +msgid "is not set" +msgstr "no está establecida" + +#: src/searches/SavedSearchDialog.vala:168 +msgid "is set" +msgstr "está establecida" + +#. Ordering must correspond with SearchConditionMediaType.Context +#: src/searches/SavedSearchDialog.vala:242 +#: src/searches/SavedSearchDialog.vala:373 +#: src/searches/SavedSearchDialog.vala:438 +msgid "is" +msgstr "es" + +#: src/searches/SavedSearchDialog.vala:243 +msgid "is not" +msgstr "no es" + +#. Ordering must correspond with SearchConditionMediaType.MediaType +#: src/searches/SavedSearchDialog.vala:249 +msgid "any photo" +msgstr "cualquier foto" + +#: src/searches/SavedSearchDialog.vala:250 +msgid "a raw photo" +msgstr "una foto en «raw»" + +#: src/searches/SavedSearchDialog.vala:251 +msgid "a video" +msgstr "un vídeo" + +#: src/searches/SavedSearchDialog.vala:305 +msgid "has" +msgstr "tiene" + +#: src/searches/SavedSearchDialog.vala:306 +msgid "has no" +msgstr "no tiene" + +#: src/searches/SavedSearchDialog.vala:311 +msgid "modifications" +msgstr "modificaciones" + +#: src/searches/SavedSearchDialog.vala:312 +msgid "internal modifications" +msgstr "modificaciones internas" + +#: src/searches/SavedSearchDialog.vala:313 +msgid "external modifications" +msgstr "modificaciones externas" + +#. Ordering must correspond with SearchConditionFlagged.State +#: src/searches/SavedSearchDialog.vala:367 +msgid "flagged" +msgstr "marcada" + +#: src/searches/SavedSearchDialog.vala:368 +msgid "not flagged" +msgstr "no marcada" + +#: src/searches/SavedSearchDialog.vala:431 +msgid "and higher" +msgstr "y superior" + +#: src/searches/SavedSearchDialog.vala:432 +msgid "only" +msgstr "solo" + +#: src/searches/SavedSearchDialog.vala:433 +msgid "and lower" +msgstr "e inferior" + +#: src/searches/SavedSearchDialog.vala:495 +msgid "is after" +msgstr "está después" + +#: src/searches/SavedSearchDialog.vala:496 +msgid "is before" +msgstr "está antes" + +#: src/searches/SavedSearchDialog.vala:497 +msgid "is between" +msgstr "está entre" + +#: src/searches/SavedSearchDialog.vala:510 +msgid "and" +msgstr "y" + +#: src/searches/SavedSearchDialog.vala:691 +msgid "Search" +msgstr "Búsqueda" + +#: src/searches/SavedSearchDialog.vala:696 +msgid "Cancel" +msgstr "Cancelar" + +#: src/searches/SavedSearchDialog.vala:697 +msgid "OK" +msgstr "Aceptar" + +#: src/searches/SavedSearchDialog.vala:716 +msgid "any" +msgstr "cualquiera" + +#: src/searches/SavedSearchDialog.vala:717 +msgid "all" +msgstr "todos" + +#: src/searches/SavedSearchDialog.vala:718 +msgid "none" +msgstr "ninguna" + +#: src/searches/SearchBoolean.vala:157 +msgid "Any text" +msgstr "Cualquier texto" + +#: src/searches/SearchBoolean.vala:160 +msgid "Title" +msgstr "Título" + +#: src/searches/SearchBoolean.vala:163 +msgid "Tag" +msgstr "Etiqueta" + +#: src/searches/SearchBoolean.vala:166 +msgid "Comment" +msgstr "Comentario" + +#: src/searches/SearchBoolean.vala:169 +msgid "Event name" +msgstr "Nombre del acontecimiento" + +#: src/searches/SearchBoolean.vala:172 +msgid "File name" +msgstr "Nombre del archivo" + +#: src/searches/SearchBoolean.vala:175 +msgid "Media type" +msgstr "Tipo de medio" + +#: src/searches/SearchBoolean.vala:178 +msgid "Flag state" +msgstr "Estado de la opción" + +#: src/searches/SearchBoolean.vala:181 +msgid "Photo state" +msgstr "Estado de la foto" + +#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831 +#: src/SearchFilter.vala:1114 +msgid "Rating" +msgstr "Puntuación" + +#: src/searches/SearchBoolean.vala:187 +msgid "Date" +msgstr "Fecha" + +#: src/SearchFilter.vala:815 +#| msgid "Rating" +msgid "★+ Rating" +msgstr "Puntuación ★+" + +#: src/SearchFilter.vala:818 +#| msgid "Rating" +msgid "★★+ Rating" +msgstr "Puntuación ★★+" + +#: src/SearchFilter.vala:821 +msgid "★★★+ Rating" +msgstr "Puntuación ★★★+" + +#: src/SearchFilter.vala:824 +msgid "★★★★+ Rating" +msgstr "Puntuación ★★★★+" + +#: src/SearchFilter.vala:828 +msgid "★★★★★+ Rating" +msgstr "Puntuación ★★★★★+" + +#: src/SearchFilter.vala:1064 +#, c-format +#| msgid "Error loading UI file %s: %s" +msgid "Error loading search bar UI: %s" +msgstr "Error al cargar la IU de la barra de búsqueda: %s" + +#. Ticket #3260 - Add a 'close' context menu to +#. the searchbar. +#. Prepare the close menu for use, but don't +#. display it yet; we'll connect it to secondary +#. click later on. +#: src/SearchFilter.vala:1073 +msgid "Close" +msgstr "Cerrar" + +#. Type label and toggles +#: src/SearchFilter.vala:1079 +msgid "Type" +msgstr "Tipo" + +#: src/SearchFilter.vala:1086 +msgid "Videos" +msgstr "Vídeos" + +#: src/SearchFilter.vala:1089 +msgid "RAW Photos" +msgstr "Fotos RAW" + +#: src/SearchFilter.vala:1125 +msgid "Use a saved search to filter items in the current view" +msgstr "" +"Utilizar una búsqueda guardada para filtrar elementos en la vista actual" + +#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183 +msgid "Settings" +msgstr "Configuración" + +#. Set up toolbar +#. add toolbar buttons +#: src/SlideshowPage.vala:160 +msgid "Back" +msgstr "Atrás" + +#: src/SlideshowPage.vala:162 +msgid "Go to the previous photo" +msgstr "Ir a la foto anterior" + +#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274 +msgid "Pause" +msgstr "Pausa" + +#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275 +msgid "Pause the slideshow" +msgstr "Pausar la presentación" + +#: src/SlideshowPage.vala:174 +msgid "Next" +msgstr "Siguiente" + +#: src/SlideshowPage.vala:176 +msgid "Go to the next photo" +msgstr "Ir a la siguiente foto" + +#: src/SlideshowPage.vala:184 +msgid "Change slideshow settings" +msgstr "Cambiar la configuración de la presentación" + +#. An entire slideshow set might be missing, so check for a loop. +#: src/SlideshowPage.vala:238 +msgid "All photo source files are missing." +msgstr "Todos los archivos origen de fotos están perdidos." + +#: src/SlideshowPage.vala:270 +msgid "Play" +msgstr "Reproducir" + +#: src/SlideshowPage.vala:271 +msgid "Continue the slideshow" +msgstr "Continuar la presentación" + +#: src/slideshow/Slideshow.vala:22 +msgid "Slideshow Transitions" +msgstr "Transiciones de diapositiva" + +#: src/slideshow/TransitionEffects.vala:98 +msgid "(None)" +msgstr "(Ninguna)" + +#: src/slideshow/TransitionEffects.vala:287 +msgid "None" +msgstr "Ninguna" + +#: src/slideshow/TransitionEffects.vala:339 +msgid "Random" +msgstr "Aleatorio" + +#: src/tags/Branch.vala:131 +msgid "Tags" +msgstr "Etiquetas" + +#: src/Tag.vala:830 +msgid "untitled" +msgstr "sin título" + +#. multiple videos +#: src/VideoSupport.vala:523 +msgid "Export Videos" +msgstr "Exportar vídeos" + +#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:472 ui/media.ui:281 +#: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281 +msgid "Toggle _Flag" +msgstr "Cambiar _opción" + +#: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353 +#: ui/photo_context.ui:88 ui/photo.ui:343 ui/tags.ui:353 +msgid "_Developer" +msgstr "_Revelador" + +#: ui/collection.ui:108 ui/event.ui:547 ui/photo_context.ui:115 +#: ui/photo.ui:360 +#| msgid "Open With E_xternal Editor" +msgid "Open with E_xternal Editor" +msgstr "Abrir con editor e_xterno" + +#: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381 +#: ui/photo_context.ui:126 ui/tags.ui:381 +msgid "View Eve_nt for Photo" +msgstr "Ver eve_nto para la foto" + +#: ui/direct.ui:5 ui/events_directory.ui:5 ui/event.ui:5 ui/import_queue.ui:5 +#: ui/import.ui:5 ui/media.ui:5 ui/offline.ui:5 ui/photo.ui:5 ui/tags.ui:5 +#: ui/trash.ui:5 +msgid "_File" +msgstr "_Archivo" + +#: ui/direct.ui:13 +msgid "Save _As…" +msgstr "Guardar _como…" + +#: ui/direct.ui:59 ui/events_directory.ui:71 ui/event.ui:99 +#: ui/import_queue.ui:38 ui/import.ui:74 ui/media.ui:99 ui/offline.ui:78 +#: ui/photo.ui:95 ui/tags.ui:99 ui/trash.ui:87 +msgid "_View" +msgstr "_Ver" + +#: ui/direct.ui:81 ui/photo.ui:156 +msgid "Fit to _Page" +msgstr "Aj_ustar a la página" + +#: ui/direct.ui:86 ui/photo.ui:161 +msgid "Zoom _100%" +msgstr "Ampliar al _100%" + +#: ui/direct.ui:91 ui/photo.ui:166 +msgid "Zoom _200%" +msgstr "Ampliar al _200%" + +#: ui/direct.ui:98 ui/photo.ui:187 +msgid "_Photo" +msgstr "_Foto" + +#: ui/direct.ui:101 ui/photo.ui:190 +msgid "_Previous Photo" +msgstr "Foto _anterior" + +#: ui/direct.ui:105 ui/photo.ui:194 +msgid "_Next Photo" +msgstr "_Siguiente foto" + +#: ui/direct.ui:131 ui/photo.ui:220 +msgid "T_ools" +msgstr "_Herramientas" + +#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:428 +#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188 +#: ui/photo.ui:394 ui/tags.ui:430 ui/trash.ui:197 +msgid "_Frequently Asked Questions" +msgstr "_Preguntas más frecuentes" + +#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:432 +#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192 +#: ui/photo.ui:398 ui/tags.ui:434 ui/trash.ui:201 +msgid "_Report a Problem…" +msgstr "_Informar de un problema…" + +#: ui/events_directory.ui:8 ui/event.ui:8 ui/import_queue.ui:14 ui/import.ui:8 +#: ui/media.ui:8 ui/offline.ui:8 ui/photo.ui:8 ui/tags.ui:8 ui/trash.ui:8 +#| msgid "_Import From Folder…" +msgid "_Import from Folder…" +msgstr "_Importar desde carpeta…" + +#: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19 +#: ui/import.ui:21 ui/media.ui:13 ui/offline.ui:13 ui/photo.ui:13 +#: ui/tags.ui:13 ui/trash.ui:13 +msgid "Import From _Application…" +msgstr "Importar desde _aplicación…" + +#: ui/events_directory.ui:19 ui/event.ui:34 ui/import_queue.ui:25 +#: ui/import.ui:27 ui/media.ui:34 ui/offline.ui:19 ui/photo.ui:42 +#: ui/tags.ui:34 ui/trash.ui:24 ui/trash.ui:234 ui/trash.ui:242 +msgid "Empty T_rash" +msgstr "Vaciar la papele_ra" + +#: ui/events_directory.ui:47 ui/event.ui:62 ui/import.ui:55 ui/media.ui:62 +#: ui/offline.ui:47 ui/tags.ui:62 ui/trash.ui:52 +msgid "_Find" +msgstr "_Buscar" + +#: ui/events_directory.ui:51 ui/event.ui:66 ui/media.ui:66 ui/offline.ui:51 +#: ui/photo.ui:70 ui/search_sidebar_context.ui:6 +#: ui/sidebar_default_context.ui:6 ui/tags.ui:66 ui/trash.ui:56 +msgid "Ne_w Saved Search…" +msgstr "_Búsqueda guardada nueva…" + +#: ui/events_directory.ui:74 ui/event.ui:102 ui/import_queue.ui:41 +#: ui/import.ui:77 ui/media.ui:102 ui/offline.ui:81 ui/photo.ui:98 +#: ui/tags.ui:102 ui/trash.ui:90 +msgid "_Basic Information" +msgstr "Información _básica" + +#: ui/events_directory.ui:79 ui/event.ui:107 ui/import.ui:82 ui/media.ui:107 +#: ui/offline.ui:86 ui/photo.ui:103 ui/tags.ui:107 ui/trash.ui:95 +msgid "E_xtended Information" +msgstr "Información e_xtendida" + +#: ui/events_directory.ui:84 ui/event.ui:112 ui/import.ui:87 ui/media.ui:112 +#: ui/offline.ui:91 ui/tags.ui:112 ui/trash.ui:100 +msgid "_Search Bar" +msgstr "_Barra de búsqueda" + +#: ui/events_directory.ui:89 ui/event.ui:117 ui/import.ui:92 ui/media.ui:117 +#: ui/offline.ui:96 ui/photo.ui:108 ui/tags.ui:117 ui/trash.ui:105 +msgid "S_idebar" +msgstr "_Barra lateral" + +#: ui/events_directory.ui:94 ui/event.ui:122 ui/import.ui:97 ui/media.ui:122 +#: ui/offline.ui:101 ui/photo.ui:113 ui/tags.ui:122 ui/trash.ui:110 +msgid "T_oolbar" +msgstr "B_arra de herramientas" + +#: ui/events_directory.ui:101 ui/event.ui:134 ui/media.ui:134 ui/tags.ui:134 +msgid "_Comments" +msgstr "_Comentarios" + +#: ui/events_directory.ui:108 ui/event.ui:243 ui/import_queue.ui:48 +#: ui/import.ui:166 ui/media.ui:243 ui/offline.ui:163 ui/photo.ui:127 +#: ui/tags.ui:243 ui/trash.ui:172 +msgid "Sort _Events" +msgstr "Ordenar _eventos" + +#: ui/events_directory.ui:111 ui/event.ui:231 ui/event.ui:246 +#: ui/import_queue.ui:51 ui/import.ui:169 ui/media.ui:231 ui/media.ui:246 +#: ui/offline.ui:166 ui/photo.ui:130 ui/tags.ui:231 ui/tags.ui:246 +#: ui/trash.ui:175 +msgid "_Ascending" +msgstr "_Ascendente" + +#: ui/events_directory.ui:116 ui/event.ui:236 ui/import_queue.ui:56 +#: ui/media.ui:236 ui/offline.ui:171 ui/tags.ui:236 ui/trash.ui:180 +msgid "D_escending" +msgstr "D_escendente" + +#: ui/events_directory.ui:132 ui/event.ui:379 ui/media.ui:373 ui/tags.ui:373 +msgid "Even_ts" +msgstr "Even_tos" + +#: ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58 ui/offline.ui:207 +#: ui/photo.ui:77 ui/tags.ui:74 +#| msgid "R_emove From Library" +msgid "R_emove from Library" +msgstr "_Quitar de la colección" + +#: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129 +msgid "_Titles" +msgstr "_Títulos" + +#: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387 +#: ui/photo.ui:371 ui/tags.ui:139 ui/tags.ui:387 +msgid "Ta_gs" +msgstr "_Etiquetas" + +#: ui/event.ui:206 ui/media.ui:206 ui/tags.ui:206 +msgid "Sort _Photos" +msgstr "Ordenar _fotos" + +#: ui/event.ui:209 ui/media.ui:209 ui/tags.ui:209 +msgid "By _Title" +msgstr "Por _título" + +#: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214 +msgid "By _Filename" +msgstr "Por _nombre del archivo" + +#: ui/event.ui:219 ui/media.ui:219 ui/tags.ui:219 +msgid "By Exposure _Date" +msgstr "Por fecha de exposición" + +#: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224 +msgid "By _Rating" +msgstr "Por p_untuación" + +#: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135 +#: ui/tags.ui:251 +#| msgid "D_escending" +msgid "_Descending" +msgstr "D_escendente" + +#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275 +msgid "_Photos" +msgstr "_Fotos" + +#: ui/import_queue.ui:8 +msgid "_Stop Import" +msgstr "_Detener importación" + +#: ui/printing_widget.ui:19 +msgid "<b>Printed Image Size</b>" +msgstr "<b>Tamaño de imagen impresa</b>" + +#: ui/printing_widget.ui:36 +msgid "Use a _standard size:" +msgstr "Utilizar un tamaño e_stándar:" + +#: ui/printing_widget.ui:80 +msgid "Use a c_ustom size:" +msgstr "Utilizar un tamaño p_ersonalizado:" + +#. Abbrevation for "inch" +#: ui/printing_widget.ui:146 +msgid "in." +msgstr "pulg." + +#. Abbrevation for "centimeters" +#: ui/printing_widget.ui:147 +msgid "cm" +msgstr "cm" + +#: ui/printing_widget.ui:173 +msgid "_Match photo aspect ratio" +msgstr "E_mparejar relación de aspecto de la foto" + +#: ui/printing_widget.ui:197 +msgid "_Autosize:" +msgstr "Tamaño _automático:" + +#: ui/printing_widget.ui:237 +msgid "<b>Titles</b>" +msgstr "<b>Títulos</b>" + +#: ui/printing_widget.ui:254 +msgid "Print image _title" +msgstr "Imprimir el _título de la imagen" + +#: ui/printing_widget.ui:297 +msgid "<b>Pixel Resolution</b>" +msgstr "<b>Resolución de píxeles</b>" + +#: ui/printing_widget.ui:317 +msgid "_Output photo at:" +msgstr "_Salida de foto en:" + +#: ui/printing_widget.ui:351 +msgid "pixels per inch" +msgstr "píxeles por pulgada" + +#: ui/set_background_dialog.ui:9 +msgid "Set as Desktop Background" +msgstr "Establecer como fondo de escritorio" + +#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134 +msgid "Use for Desktop" +msgstr "Usar para el escritorio" + +#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151 +msgid "Use for Lock Screen" +msgstr "Usar para la pantalla de bloqueo" + +#: ui/set_background_slideshow_dialog.ui:16 +msgid "Set as Desktop Slideshow" +msgstr "Establecer como pase de diapositivas de escritorio" + +#: ui/set_background_slideshow_dialog.ui:56 +msgid "Generate desktop background slideshow" +msgstr "Generar un pase de diapositivas de fondo de escritorio" + +#: ui/set_background_slideshow_dialog.ui:82 +msgid "Show each photo for" +msgstr "Mostrar cada foto para" + +#: ui/set_background_slideshow_dialog.ui:94 +msgid "period of time" +msgstr "periodo de tiempo" + +#: ui/set_background_slideshow_dialog.ui:116 +msgid "How long each photo is shown on the desktop background" +msgstr "Cuánto tiempo se muestra cada foto en el fondo de escritorio" + +#: ui/shotwell.ui:65 +msgid "white" +msgstr "blanco" + +#: ui/shotwell.ui:92 +msgid "black" +msgstr "negro" + +#: ui/shotwell.ui:123 +msgid "Display" +msgstr "Mostrar" + +#: ui/shotwell.ui:160 +msgid "_Background:" +msgstr "_Fondo:" + +#: ui/shotwell.ui:175 +msgid "_Import photos to:" +msgstr "_Importar fotos a:" + +#: ui/shotwell.ui:186 +msgid "_Watch library directory for new files" +msgstr "_Vigilar mi colección en busca de archivos nuevos" + +#: ui/shotwell.ui:209 +msgid "Importing" +msgstr "Importando" + +#: ui/shotwell.ui:226 +msgid "_Directory structure:" +msgstr "Estructura de _carpetas:" + +#: ui/shotwell.ui:240 +msgid "Example:" +msgstr "Ejemplo:" + +#: ui/shotwell.ui:249 +msgid "R_ename imported files to lowercase" +msgstr "R_enombrar los archivos importados a minúsculas" + +#: ui/shotwell.ui:271 +msgid "Metadata" +msgstr "Metadatos" + +#: ui/shotwell.ui:284 +msgid "Write tags, titles, and other _metadata to photo files" +msgstr "" +"Escribir etiquetas, títulos y otros _metadatos en los archivos de fotos" + +#: ui/shotwell.ui:306 +msgid "RAW Developer" +msgstr "Revelador RAW" + +#: ui/shotwell.ui:323 +msgid "De_fault:" +msgstr "_Predeterminado:" + +#: ui/shotwell.ui:377 +msgid "_Pattern:" +msgstr "_Patrón:" + +#: ui/shotwell.ui:439 +msgid "E_xternal photo editor:" +msgstr "Editor de fotos e_xterno:" + +#: ui/shotwell.ui:456 +msgid "External _RAW editor:" +msgstr "Editor _RAW externo:" + +#: ui/shotwell.ui:517 +msgid "External Editors" +msgstr "Editores externos" + +#: ui/shotwell.ui:542 +msgid "Plugins" +msgstr "Complementos" + +#: ui/shotwell.ui:590 +msgid "_Name of search:" +msgstr "_Nombre de la búsqueda:" + +#: ui/shotwell.ui:644 +msgid "_Match" +msgstr "_Coincidir" + +#: ui/shotwell.ui:671 +msgid "of the following:" +msgstr "de los siguientes:" + +#: ui/shotwell.ui:752 +msgid "label" +msgstr "etiqueta" + +#: ui/shotwell.ui:903 +msgid "_Delay:" +msgstr "_Retardo:" + +#: ui/shotwell.ui:917 +msgid "_Transition effect:" +msgstr "Efecto de _transición:" + +#: ui/shotwell.ui:931 +msgid "Transition d_elay:" +msgstr "R_etraso de transición:" + +#: ui/shotwell.ui:941 +msgid "Show t_itle" +msgstr "Mostrar tít_ulo" + +#: ui/shotwell.ui:1016 ui/shotwell.ui:1027 +msgid "seconds" +msgstr "segundos" + +#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6 +msgid "New _Tag…" +msgstr "E_tiqueta nueva…" + +#: ui/trash.ui:285 +msgid "Delete all photos in the trash" +msgstr "Eliminar todas las fotos en la papelera" + +#~| msgid "Testing connection to Facebook..." +#~ msgid "Testing connection to Facebook…" +#~ msgstr "Comprobando la conexión a Facebook…" + +#~ msgid "" +#~ "You have already logged in and out of Flickr during this Shotwell " +#~ "session.\n" +#~ "To continue publishing to Flickr, quit and restart Shotwell, then try " +#~ "publishing again." +#~ msgstr "" +#~ "Ya ha iniciado y cerrado sesión de Flickr durante esta sesión de " +#~ "Shotwell.\n" +#~ "Para seguir publicando en Flickr, cierre y reinicie Shotwell, e intente " +#~ "publicar de nuevo." + +#~ msgid "L_ist album in public gallery" +#~ msgstr "_Listar álbum en la galería pública" + +#~| msgid "Videos will appear in '%s'" +#~ msgid "Videos will appear in “%s”" +#~ msgstr "Los vídeos aparecerán en «%s»" + +#~ msgid "_Contents" +#~ msgstr "_Contenido" + +#~ msgid "Display the title of each photo" +#~ msgstr "Mostrar el título de cada foto" + +#~ msgid "Import the selected photos into your library" +#~ msgstr "Importar las fotos seleccionadas a su colección" + +#~ msgid "Import all the photos into your library" +#~ msgstr "Importar todas las fotos a su colección" + +#~ msgid "Play a slideshow" +#~ msgstr "Iniciar un pase de diapositivas" + +#~ msgid "_Modify original photo files" +#~ msgstr ":Modificar archivos de fotos originales" + +#~ msgid "_Modify original files" +#~ msgstr "_Modificar archivos originales" + +#~ msgid "Save photo" +#~ msgstr "Guardar la foto" + +#~ msgid "Save photo with a different name" +#~ msgstr "Guardar la foto con un nombre diferente" + +#~ msgid "Print the photo to a printer connected to your computer" +#~ msgstr "Imprimir la foto en una impresora conectada a su equipo" + +#~ msgid "Previous Photo" +#~ msgstr "Foto anterior" + +#~ msgid "Next Photo" +#~ msgstr "Siguiente foto" + +#~ msgid "Increase the magnification of the photo" +#~ msgstr "Aumentar la ampliación de la foto" + +#~ msgid "Decrease the magnification of the photo" +#~ msgstr "Reducir la ampliación de la foto" + +#~ msgid "Zoom the photo to fit on the screen" +#~ msgstr "Aumentar la foto hasta ajustar a la pantalla" + +#~ msgid "Zoom the photo to 100% magnification" +#~ msgstr "Ampliar la foto al 100%" + +#~ msgid "Zoom the photo to 200% magnification" +#~ msgstr "Ampliar la foto al 200%" + +#~ msgid "Display the comment of each event" +#~ msgstr "Mostrar el comentario de cada evento" + +#~ msgid "Stop importing photos" +#~ msgstr "Detener la importación de fotos" + +#~ msgid "Import photos from disk to library" +#~ msgstr "Importar fotos desde el disco a la colección" + +#~ msgid "Find photos and videos by search criteria" +#~ msgstr "Buscar fotos y vídeos por criterio de búsqueda" + +#~ msgid "Display basic information for the selection" +#~ msgstr "Mostrar la información básica para la selección" + +#~ msgid "Display extended information for the selection" +#~ msgstr "Mostrar la información extendida para la selección" + +#~ msgid "Display the search bar" +#~ msgstr "Mostrar la barra de búsqueda" + +#~ msgid "Display the sidebar" +#~ msgstr "Mostrar la barra lateral" + +#~ msgid "Display the tool bar" +#~ msgstr "Mostrar la barra de herramientas" + +#~ msgid "Sort photos in an ascending order" +#~ msgstr "Ordenar fotos en orden ascendente" + +#~ msgid "Sort photos in a descending order" +#~ msgstr "Ordenar fotos en orden descendente" + +#~ msgid "Increase the magnification of the thumbnails" +#~ msgstr "Aumentar la ampliación de las miniaturas" + +#~ msgid "Decrease the magnification of the thumbnails" +#~ msgstr "Disminuir la ampliación de las miniaturas" + +#~ msgid "_Play Video" +#~ msgstr "_Reproducir vídeo" + +#~ msgid "Open the selected videos in the system video player" +#~ msgstr "" +#~ "Abrir los vídeos seleccionados en el reproductor de vídeos del sistema" + +#~ msgid "Display the comment of each photo" +#~ msgstr "Mostrar el comentario de cada foto" + +#~| msgid "Display each photo's tags" +#~ msgid "Display each photo’s tags" +#~ msgstr "Mostrar la etiqueta de cada foto" + +#~ msgid "Sort photos by title" +#~ msgstr "Ordenar las fotos por título" + +#~ msgid "Sort photos by exposure date" +#~ msgstr "Ordenar fotos por fecha de exposición" + +#~ msgid "Sort photos by rating" +#~ msgstr "Ordenar fotos por puntuación" + +#~ msgid "Sort photos by filename" +#~ msgstr "Ordenar fotos por nombre" + +#~ msgid "The selected videos were successfully published." +#~ msgstr "Las fotos seleccionadas se publicaron correctamente." + +#~ msgid "The selected photos were successfully published." +#~ msgstr "Las fotos seleccionadas se publicaron correctamente." + +#~ msgid "RAW photos" +#~ msgstr "Fotos RAW" + +#~ msgid "Shotwell Preferences" +#~ msgstr "Preferencias de Shotwell" + +#, fuzzy +#~| msgid "Tag Photos as \"%s\"" +#~ msgid "Tag Photos as “%s”" +#~ msgstr "Etiquetar fotos como «%s»" + +#, fuzzy +#~| msgid "Tag the selected photos as \"%s\"" +#~ msgid "Tag the selected photos as “%s”" +#~ msgstr "Etiquetar las fotos seleccionadas como «%s»" + +#, fuzzy +#~| msgid "Remove Tag \"%s\" From _Photos" +#~ msgid "Remove Tag “%s” From _Photos" +#~ msgstr "Quitar la etiqueta «%s» de las _fotos" + +#, fuzzy +#~| msgid "Remove Tag \"%s\" From Photos" +#~ msgid "Remove Tag “%s” From Photos" +#~ msgstr "Quitar la etiqueta «%s» de las fotos" + +#~ msgid "Login" +#~ msgstr "Iniciar sesión" + +#~ msgid "Save Details..." +#~ msgstr "Guardar detalles…" + +#~ msgid "Save _As..." +#~ msgstr "G_uardar como…" + +#~ msgid "Importing..." +#~ msgstr "Importando…" + +#~ msgid "Preparing to import..." +#~ msgstr "Preparando importación…" + +#~ msgid "_Import From Folder..." +#~ msgstr "_Importar desde carpeta…" + +#~ msgid "Import From _Application..." +#~ msgstr "Importar desde _aplicación…" + +#~ msgid "Set as _Desktop Slideshow..." +#~ msgstr "Establecer como pase de _diapositivas de escritorio…" + +#~ msgid "Re_name Event..." +#~ msgstr "Re_nombrar evento…" + +#~ msgid "_Export..." +#~ msgstr "_Exportar…" + +#~ msgid "_Print..." +#~ msgstr "_Imprimir…" + +#~ msgid "Pu_blish..." +#~ msgstr "Pu_blicar…" + +#~ msgid "Edit _Title..." +#~ msgstr "Editar el _título…" + +#~ msgid "Edit _Comment..." +#~ msgstr "Editar _comentario…" + +#~ msgid "Edit Event _Comment..." +#~ msgstr "Editar _comentario del evento…" + +#~ msgid "_Adjust Date and Time..." +#~ msgstr "_Ajustar fecha y hora…" + +#~ msgid "Add _Tags..." +#~ msgstr "Añadir e_tiquetas…" + +#~ msgid "_Add Tags..." +#~ msgstr "_Añadir etiquetas…" + +#~ msgid "Send _To..." +#~ msgstr "En_viar a…" + +#~ msgid "Send T_o..." +#~ msgstr "En_viar a…" + +#~ msgid "_Find..." +#~ msgstr "Buscar…" + +#~ msgid "Modif_y Tags..." +#~ msgstr "Modif_icar etiquetas…" + +#~ msgid "_Edit..." +#~ msgstr "_Editar…" + +#~ msgid "%-I:%M %p" +#~ msgstr "%-I:%M %p" + +#~ msgid "%-I:%M:%S %p" +#~ msgstr "%-I:%M:%S %p" + +#~ msgid "Intro message replaced at runtime" +#~ msgstr "Mensaje de introducción reemplazado en tiempo de ejecución" + +#~ msgid "'Publishing to $url as $username' (populated in application code)" +#~ msgstr "" +#~ "«Publicando en $url como $username» (informado en el código de la " +#~ "aplicación)" + +#~ msgid "you are logged in rajce as $name" +#~ msgstr "ha iniciado sesión en rajce como $name" + +#~ msgid "$mediatype will appear in" +#~ msgstr "$mediatype aparecerá en" + +#~ msgid "Copyright 2009-2015 Yorba Foundation" +#~ msgstr "Copyright 2009-2015 Fundación Yorba" + +#~ msgid "Visit the Yorba web site" +#~ msgstr "Visitar el sitio web de Yorba" + +#, fuzzy +#~| msgid "" +#~| "A file required for publishing is unavailable. Publishing to Flickr " +#~| "can't continue." +#~ msgid "A file required for publishing is unavailable. Publishing to " +#~ msgstr "" +#~ "No está disponible un archivo necesario para publicar. La publicación en " +#~ "Flickr no puede continuar." + +#~ msgid "Only _Remove" +#~ msgstr "Solo quita_r" + +#~ msgid "Shotwell is configured to import photos to your home directory.\n" +#~ msgstr "" +#~ "Shotwell está configurado para importar fotos desde su carpeta personal.\n" + +#~ msgid "" +#~ " (text depends on fb username and is modified in the app - \n" +#~ "anything put into this field won't display)" +#~ msgstr "" +#~ " (el texto depende del nombre de usuario de Facebook y se modifica en la " +#~ "aplicación;\n" +#~ "no se mostrará el contenido de este campo)" + +#~ msgid "" +#~ "You are logged into Flickr as (name).\n" +#~ "\n" +#~ "(this label's string is populated and set inside the code, \n" +#~ "so changes made here will not display)" +#~ msgstr "" +#~ "Ha iniciado sesión en Flickr como (name).\n" +#~ "\n" +#~ "(la etiqueta de esta cadena se rellena y se ubica en el código, \n" +#~ "y los cambios hechos aquí no se mostrarán)" + +#~ msgid "_visibility label (populated in the code)" +#~ msgstr "etiqueta de _visibilidad (rellenada en el código)" + +#~ msgid "" +#~ "$mediatype will appear in\n" +#~ "(populated in code)" +#~ msgstr "" +#~ "$mediatype aparecerá en\n" +#~ "(rellenado en el código)" + +#~ msgid "" +#~ "You are logged into Tumblr as (name).\n" +#~ "\n" +#~ "(this label's string is populated and set inside the code, \n" +#~ "so changes made here will not display)" +#~ msgstr "" +#~ "Ha iniciado sesión en Tumblr como (nombre).\n" +#~ "\n" +#~ "(la etiqueta de esta cadena se rellena y se ubica en el código, \n" +#~ "y los cambios hechos aquí no se mostrarán)" Binary files differ@@ -16,31 +16,31 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell shotwell-0.22\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"Project-Id-Version: shotwell shotwell-0.26\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=shotwell&keywords=I18N+L10N&component=Internationalization\n" -"POT-Creation-Date: 2016-07-04 19:42+0000\n" -"PO-Revision-Date: 2016-07-09 21:29+0700\n" -"Last-Translator: Andika Triwidada <atriwidada@gnome.org>\n" +"POT-Creation-Date: 2017-04-18 10:17+0000\n" +"PO-Revision-Date: 2017-04-30 17:02+0000\n" +"Last-Translator: Andika Triwidada <andika@gmail.com>\n" "Language-Team: Indonesian <gnome@i15n.org>\n" "Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.8.7.1\n" +"X-Generator: Poedit 2.0.1\n" #: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115 -#: src/MediaPage.vala:435 src/photos/RawSupport.vala:300 +#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:356 +#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346 +#: ui/tags.ui:356 msgid "Shotwell" msgstr "Shotwell" #: misc/shotwell.appdata.xml.in:9 -#, fuzzy -#| msgid "Photo Manager" msgid "Popular photo manager" -msgstr "Album Foto" +msgstr "Manajer foto populer" #: misc/shotwell.appdata.xml.in:11 msgid "" @@ -48,16 +48,16 @@ msgid "" "desktop. It allows you to import photos from your camera or disk, organize " "them by date and subject matter, even ratings. It also offers basic photo " "editing, like crop, red-eye correction, color adjustments, and straighten. " -"Shotwell's non-destructive photo editor does not alter your master photos, " +"Shotwell’s non-destructive photo editor does not alter your master photos, " "making it easy to experiment and correct errors." msgstr "" -"Shotwell mudah digunakan, pengorganisasi foto yang didesain untuk desktop " -"GNOME. Dapat digunakan untuk mengimpor foto dari kamera atau diska, " -"organisasikan berdasarkan waktu dan subyek pokok, bahkan penilaian. Juga " -"menawarkan penyuntingan foto dasar, seperti memotong, koreksi mata-merah, " -"penyeimbang warna, pelurusan. Penyunting foto non-desktruktif Shotwell tidak " -"mengubah foto asli Anda, sehingga aman untuk bereksperimen dan memperbaiki " -"kesalahan." +"Shotwell adalah pengorganisasi foto yang mudah digunakan, cepat, yang " +"didesain untuk desktop GNOME. Dapat digunakan untuk mengimpor foto dari " +"kamera atau diska, menata berdasarkan waktu dan subyek pokok, bahkan " +"peringkat. Juga menawarkan penyuntingan foto dasar, seperti memotong, " +"koreksi mata-merah, penyeimbang warna, dan pelurusan. Penyunting foto non-" +"desktruktif Shotwell tidak mengubah foto asli Anda, sehingga aman untuk " +"bereksperimen dan memperbaiki kesalahan." #: misc/shotwell.appdata.xml.in:18 msgid "" @@ -73,9 +73,13 @@ msgstr "" "Shotwell mendukung JPEG, PNG, TIFF, dan varietas berkas berformat RAW " "lainnya." +#: misc/shotwell.appdata.xml.in:52 +msgid "The Shotwell developers" +msgstr "Para pengembang Shotwell" + #: misc/shotwell.desktop.in.in:5 src/Resources.vala:17 msgid "Photo Manager" -msgstr "Album Foto" +msgstr "Manajer Foto" #: misc/shotwell.desktop.in.in:6 msgid "Organize your photos" @@ -88,16 +92,14 @@ msgid "" "organize;photo;photographs;photos;picture;pictures;photography;print;publish;" "rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;" msgstr "" -"album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;" -"organize;photo;photographs;photos;picture;pictures;photography;print;publish;" -"rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;" +"album;kamera;crop;edit;perbaiki;ekspor;galeri;gambar;citra;impor;atur;tata;" +"foto;fotografi;ctak;publikasi;rotasi;putar;berbagi;tag;video;facebook;flickr;" +"picasa;youtube;piwigo;" #. Translators: Do NOT translate or transliterate this text (this is an icon file name)! #: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8 -#, fuzzy -#| msgid "Shotwell" msgid "shotwell" -msgstr "Shotwell" +msgstr "shotwell" #: misc/shotwell-viewer.desktop.in.in:4 msgid "Shotwell Viewer" @@ -113,9 +115,8 @@ msgstr "token autentikasi" #: misc/org.yorba.shotwell-extras.gschema.xml:7 msgid "Yandex-Fotki authentication token, if logged in." -msgstr "" +msgstr "Token otentikasi Yandex-Fotki, bila log masuk." -# Ini untuk string apa ya? #: misc/org.yorba.shotwell-extras.gschema.xml:14 msgid "Token" msgstr "Token" @@ -130,10 +131,10 @@ msgstr "Token rahasia" #: misc/org.yorba.shotwell-extras.gschema.xml:21 msgid "The secret token to sign oauth requests" -msgstr "" +msgstr "Token rahasia untuk menandatangani permintaan oauth" #: misc/org.yorba.shotwell-extras.gschema.xml:26 -#: misc/org.yorba.shotwell.gschema.xml:410 +#: misc/org.yorba.shotwell.gschema.xml:486 msgid "default size" msgstr "ukuran bawaan" @@ -146,11 +147,11 @@ msgstr "" #: misc/org.yorba.shotwell-extras.gschema.xml:32 msgid "default blog" -msgstr "" +msgstr "blog baku" #: misc/org.yorba.shotwell-extras.gschema.xml:33 msgid "The name of the default blog of the user, if any" -msgstr "" +msgstr "Nama blog baku pengguna, bila ada" #: misc/org.yorba.shotwell-extras.gschema.xml:40 msgid "Rajce URL" @@ -161,15 +162,15 @@ msgid "URL of the Rajce server." msgstr "URL dari server Rajce." #: misc/org.yorba.shotwell-extras.gschema.xml:46 -#: misc/org.yorba.shotwell.gschema.xml:378 -#: misc/org.yorba.shotwell.gschema.xml:436 -#: misc/org.yorba.shotwell.gschema.xml:492 +#: misc/org.yorba.shotwell.gschema.xml:454 +#: misc/org.yorba.shotwell.gschema.xml:512 +#: misc/org.yorba.shotwell.gschema.xml:568 msgid "username" msgstr "nama pengguna" #: misc/org.yorba.shotwell-extras.gschema.xml:47 msgid "Rajce username, if logged in." -msgstr "" +msgstr "Nama pengguna Rajce, bila log masuk." #: misc/org.yorba.shotwell-extras.gschema.xml:52 msgid "token" @@ -180,7 +181,7 @@ msgid "user token, if remembered." msgstr "token pengguna, jika ingat." #: misc/org.yorba.shotwell-extras.gschema.xml:58 -#: misc/org.yorba.shotwell.gschema.xml:454 +#: misc/org.yorba.shotwell.gschema.xml:530 msgid "last category" msgstr "kategori terakhir" @@ -189,7 +190,7 @@ msgid "The last selected Rajce category." msgstr "Kategori Racje yang terakhir dipilih." #: misc/org.yorba.shotwell-extras.gschema.xml:64 -#: misc/org.yorba.shotwell.gschema.xml:466 +#: misc/org.yorba.shotwell.gschema.xml:542 msgid "last photo size" msgstr "ukuran foto terakhir" @@ -198,6 +199,8 @@ msgid "" "A numeric code representing the last photo size preset used when publishing " "to Rajce." msgstr "" +"Kode numerik yang mewakili pratat ukuran foto terakhir yang dipakai ketika " +"mempublikasikan ke Rajce." #: misc/org.yorba.shotwell-extras.gschema.xml:70 msgid "remember" @@ -205,7 +208,7 @@ msgstr "ingat" #: misc/org.yorba.shotwell-extras.gschema.xml:71 msgid "If true, remember last login." -msgstr "Jika bernilai benar, maka akan mengingat terakhir kali masuk." +msgstr "Jika bernilai true, maka akan mengingat terakhir kali masuk." #: misc/org.yorba.shotwell-extras.gschema.xml:76 msgid "hide album" @@ -213,27 +216,25 @@ msgstr "sembunyikan album" #: misc/org.yorba.shotwell-extras.gschema.xml:77 msgid "If true, hide the newly created Rajce album." -msgstr "" +msgstr "Bila bernilai true, menyembunyikan album Rajce yang baru dibuat." #: misc/org.yorba.shotwell-extras.gschema.xml:82 -#, fuzzy -#| msgid "Open target _album in browser" msgid "open album in web browser" -msgstr "Buka _album target dalam peramban" +msgstr "buka album dalam peramban web" #: misc/org.yorba.shotwell-extras.gschema.xml:83 msgid "" "If true, open target album in the web browser just after uploading photos" msgstr "" -"Jika bernilai benar, maka buka album target dalam peramban hanya setelah " +"Jika bernilai true, maka buka album target dalam peramban hanya setelah " "mengunggah foto" #: misc/org.yorba.shotwell-extras.gschema.xml:88 -#: misc/org.yorba.shotwell.gschema.xml:358 -#: misc/org.yorba.shotwell.gschema.xml:396 -#: misc/org.yorba.shotwell.gschema.xml:422 +#: misc/org.yorba.shotwell.gschema.xml:434 #: misc/org.yorba.shotwell.gschema.xml:472 -#: misc/org.yorba.shotwell.gschema.xml:516 +#: misc/org.yorba.shotwell.gschema.xml:498 +#: misc/org.yorba.shotwell.gschema.xml:548 +#: misc/org.yorba.shotwell.gschema.xml:592 msgid "remove sensitive info from uploads" msgstr "hilangkan informasi senitif dari unggahan" @@ -242,375 +243,396 @@ msgid "" "Whether images being uploaded to Rajce should have their metadata removed " "first" msgstr "" +"Apakah gambar yang sedang diunggah ke Rajce mesti terlebih dahulu dihapus " +"metadatanya" -#: misc/org.yorba.shotwell.gschema.xml:22 +#: misc/org.yorba.shotwell.gschema.xml:23 msgid "display basic properties" msgstr "tampilkan properti dasar" -#: misc/org.yorba.shotwell.gschema.xml:23 +#: misc/org.yorba.shotwell.gschema.xml:24 msgid "True if the basic properties pane is to be displayed, false otherwise." -msgstr "" +msgstr "True bila panel properti dasar akan ditampilkan, false bila tidak." -#: misc/org.yorba.shotwell.gschema.xml:28 -#, fuzzy -#| msgid "Display extended information for the selection" +#: misc/org.yorba.shotwell.gschema.xml:29 msgid "display extended properties" -msgstr "Tampilkan informasi lanjutan foto terpilih" +msgstr "tampilkan properti perluasan" -#: misc/org.yorba.shotwell.gschema.xml:29 +#: misc/org.yorba.shotwell.gschema.xml:30 msgid "" "True if the extended properties window is to be displayed, false otherwise." msgstr "" +"True bila jendela properti perluasan akan ditampilkan, false juga tidak." -#: misc/org.yorba.shotwell.gschema.xml:34 -#, fuzzy -#| msgid "Display the sidebar" +#: misc/org.yorba.shotwell.gschema.xml:35 msgid "display sidebar" -msgstr "Tampilkan bilah sisi" +msgstr "tampilkan bilah sisi" -#: misc/org.yorba.shotwell.gschema.xml:35 +#: misc/org.yorba.shotwell.gschema.xml:36 msgid "True if the sidebar is to be displayed, false otherwise." -msgstr "" +msgstr "True bila bilah sisi akan ditampilkan, false bila tidak." -#: misc/org.yorba.shotwell.gschema.xml:40 -#, fuzzy -#| msgid "Display the search bar" +#: misc/org.yorba.shotwell.gschema.xml:41 +msgid "display toolbar" +msgstr "tampilkan bilah alat" + +#: misc/org.yorba.shotwell.gschema.xml:42 +msgid "True if the bottom toolbar is to be displayed, false otherwise." +msgstr "True bila bilah alat di dasar akan ditampilkan, false bila tidak." + +#: misc/org.yorba.shotwell.gschema.xml:47 msgid "display search bar" -msgstr "Tampilkan bilah pencarian" +msgstr "tampilkan bilah pencarian" -#: misc/org.yorba.shotwell.gschema.xml:41 +#: misc/org.yorba.shotwell.gschema.xml:48 msgid "True if the Search/Filter Toolbar is to be displayed, false otherwise." -msgstr "" +msgstr "True bila Bilah Alat Cari/Saring akan ditampilkan, false bila tidak." -#: misc/org.yorba.shotwell.gschema.xml:46 +#: misc/org.yorba.shotwell.gschema.xml:53 msgid "display photo titles" -msgstr "Tampilkan judul setiap foto" +msgstr "tampilkan judul foto" -#: misc/org.yorba.shotwell.gschema.xml:47 +#: misc/org.yorba.shotwell.gschema.xml:54 msgid "" "True if photo titles are to be displayed beneath thumbnails in collection " "views, false otherwise." msgstr "" +"True bila judul foto akan ditampilkan di bawah gambar mini dalam tilikan " +"koleksi, false bila tidak." -#: misc/org.yorba.shotwell.gschema.xml:52 +#: misc/org.yorba.shotwell.gschema.xml:59 msgid "display photo comments" -msgstr "Tampilkan komentar setiap foto" +msgstr "tampilkan komentar foto" -#: misc/org.yorba.shotwell.gschema.xml:53 +#: misc/org.yorba.shotwell.gschema.xml:60 msgid "" "True if photo comments are to be displayed beneath thumbnails in collection " "views, false otherwise." msgstr "" +"True bila komentar foto akan ditampilkan di bawah gambar mini dalam tilikan " +"koleksi, false bila tidak." -#: misc/org.yorba.shotwell.gschema.xml:58 +#: misc/org.yorba.shotwell.gschema.xml:65 msgid "display event comments" msgstr "tampilkan komentar kejadian" -#: misc/org.yorba.shotwell.gschema.xml:59 +#: misc/org.yorba.shotwell.gschema.xml:66 msgid "" "True if event comments are to be displayed beneath thumbnails in event " "views, false otherwise." msgstr "" +"True bila komentar kejadian akan ditampilkan di bawah gambar mini dalam " +"tilikan kejadian, false bila tidak." -#: misc/org.yorba.shotwell.gschema.xml:64 -#, fuzzy -#| msgid "Display each photo's tags" +#: misc/org.yorba.shotwell.gschema.xml:71 msgid "display photo tags" -msgstr "Tampilkan tanda setiap foto" +msgstr "tampilkan tag foto" -#: misc/org.yorba.shotwell.gschema.xml:65 +#: misc/org.yorba.shotwell.gschema.xml:72 msgid "" "True if photo tags are to be listed beneath thumbnails in collection views, " "false otherwise." msgstr "" +"True bila tag foto akan ditampilkan daftarnya di bawah gambar mini dalam " +"tilikan koleksi, false bila tidak." -#: misc/org.yorba.shotwell.gschema.xml:70 -#, fuzzy -#| msgid "Display each photo's rating" +#: misc/org.yorba.shotwell.gschema.xml:77 msgid "display photo ratings" -msgstr "Tampilkan rating tiap foto" +msgstr "tampilkan peringkat foto" -#: misc/org.yorba.shotwell.gschema.xml:71 +#: misc/org.yorba.shotwell.gschema.xml:78 msgid "" -"True if a photo's rating should be displayed as overlaid trinket, false " +"True if a photo’s rating should be displayed as overlaid trinket, false " "otherwise." msgstr "" +"True bila peringkat foto mesti ditampilkan sebagai trinket yang dilapiskan, " +"false bila tidak." -#: misc/org.yorba.shotwell.gschema.xml:76 +#: misc/org.yorba.shotwell.gschema.xml:83 msgid "rating filter level" -msgstr "" +msgstr "tingkat penyaring peringkat" -#: misc/org.yorba.shotwell.gschema.xml:77 +#: misc/org.yorba.shotwell.gschema.xml:84 msgid "" "Determines how to filter photos based on their ratings. 1: Rejected or " "better, 2: Unrated or better, 3: One or better, 4: Two or better, 5: Three " "or better, 6: Four or better, 7: Five or better." msgstr "" +"Menentukan bagaimana menyaring foto berdasarkan peringkat mereka. 1: Ditolak " +"atau lebih baik, 2: Tidak diperingkat atau lebih baik, 3: Satu atau lebih, " +"4: Dua atau lebih, 5: Tiga atau lebih, 6: Empat atau lebih, 7: Lima atau " +"lebih." -#: misc/org.yorba.shotwell.gschema.xml:82 +#: misc/org.yorba.shotwell.gschema.xml:89 msgid "sort events ascending" -msgstr "Urutkan kejadian secara menurun" +msgstr "urutkan kejadian secara menaik" -#: misc/org.yorba.shotwell.gschema.xml:83 +#: misc/org.yorba.shotwell.gschema.xml:90 msgid "True if events should be sorted ascending, false if descending." -msgstr "" +msgstr "True bila kejadian mesti diurut naik, false bila turun." -#: misc/org.yorba.shotwell.gschema.xml:88 +#: misc/org.yorba.shotwell.gschema.xml:95 msgid "sort library photos ascending" -msgstr "urutkan foto dengan urut naik" +msgstr "urutkan pustaka foto dengan urut naik" -#: misc/org.yorba.shotwell.gschema.xml:89 +#: misc/org.yorba.shotwell.gschema.xml:96 msgid "True if library photos should be sorted ascending, false if descending." -msgstr "" +msgstr "True bila pustaka foto mesti diurut naik, false bila turun." -#: misc/org.yorba.shotwell.gschema.xml:94 +#: misc/org.yorba.shotwell.gschema.xml:101 msgid "sort library photos criteria" -msgstr "Urutkan kriteria daftar pustaka foto" +msgstr "kriteria pengurutan pustaka foto" -#: misc/org.yorba.shotwell.gschema.xml:95 +#: misc/org.yorba.shotwell.gschema.xml:102 msgid "" "A numeric code that specifies the sort criteria for photos in library views." msgstr "" +"Kode numerik yang menyatakan kriteria pengurutan untuk foto dalam tilikan " +"pustaka." -#: misc/org.yorba.shotwell.gschema.xml:100 -#, fuzzy -#| msgid "Sort photos in an ascending order" +#: misc/org.yorba.shotwell.gschema.xml:107 msgid "sort event photos ascending" -msgstr "Urutkan foto dengan urut naik" +msgstr "urutkan foto kejadian dengan urut naik" -#: misc/org.yorba.shotwell.gschema.xml:101 +#: misc/org.yorba.shotwell.gschema.xml:108 msgid "True if event photos should be sorted ascending, false if descending." -msgstr "" +msgstr "True bila foto kejadian mesti diurut naik, false bila turun." -#: misc/org.yorba.shotwell.gschema.xml:106 +#: misc/org.yorba.shotwell.gschema.xml:113 msgid "sort event photos criteria" -msgstr "Urutkan foto berdasarkan kriteria" +msgstr "kriteria pengurutan foto kejadian" -#: misc/org.yorba.shotwell.gschema.xml:107 +#: misc/org.yorba.shotwell.gschema.xml:114 msgid "Specifies the sort criteria for event photos." -msgstr "" +msgstr "Menyatakan kriteria pengurutan untuk foto kejadian." -#: misc/org.yorba.shotwell.gschema.xml:112 +#: misc/org.yorba.shotwell.gschema.xml:119 msgid "use 24 hour time" msgstr "gunakan waktu 24 jam" -#: misc/org.yorba.shotwell.gschema.xml:113 +#: misc/org.yorba.shotwell.gschema.xml:120 msgid "" "True if should display times with a 24 hour clock, false if times should use " "AM/PM notation." msgstr "" +"True bila mesti menampilkan waktu dalam bentuk 24 jam, false bila waktu " +"mesti memakai notasi AM/PM." -#: misc/org.yorba.shotwell.gschema.xml:118 +#: misc/org.yorba.shotwell.gschema.xml:125 msgid "keep relative time between photos" -msgstr "" +msgstr "pertahankan waktu relatif antar foto" -#: misc/org.yorba.shotwell.gschema.xml:119 +#: misc/org.yorba.shotwell.gschema.xml:126 msgid "" "True if when adjusting time/date of photos, relative time should be " "maintained. False if all photos should be set to the same time." msgstr "" +"True bila ketika menyetel waktu/tanggal foto, waktu relatif mesti " +"dipertahankan. False bila semua foto mesti ditata ke waktu yang sama." -#: misc/org.yorba.shotwell.gschema.xml:124 +#: misc/org.yorba.shotwell.gschema.xml:131 msgid "modify original photo files" msgstr "modifikasi berkas asli foto" -#: misc/org.yorba.shotwell.gschema.xml:125 +#: misc/org.yorba.shotwell.gschema.xml:132 msgid "" "True if when adjusting time/date of photos, the original files should be " "modified as well. False if changes are made only in the database." msgstr "" +"True bila ketika menyetel waktu/tanggal foto, berkas asli mesti diubah juga. " +"False bila perubahan hanya dibuat di dalam basis data." -#: misc/org.yorba.shotwell.gschema.xml:130 +#: misc/org.yorba.shotwell.gschema.xml:137 msgid "show welcome dialog on startup" msgstr "tampilkan dialog selamat datang saat memulai" -#: misc/org.yorba.shotwell.gschema.xml:131 +#: misc/org.yorba.shotwell.gschema.xml:138 msgid "" "True if, when on startup, a welcome dialog should be shown. False if it " "should not be shown." msgstr "" +"True bila, ketika awal mula, sebuah dialog selamat datang mesti ditampilkan. " +"False bila itu tidak perlu ditampilkan." -#: misc/org.yorba.shotwell.gschema.xml:136 +#: misc/org.yorba.shotwell.gschema.xml:143 msgid "sidebar position" msgstr "posisi bilah sisi" -#: misc/org.yorba.shotwell.gschema.xml:137 +#: misc/org.yorba.shotwell.gschema.xml:144 msgid "The width, in pixels, of the sidebar" -msgstr "" +msgstr "Lebar, dalam piksel, dari bilah sisi" -#: misc/org.yorba.shotwell.gschema.xml:142 +#: misc/org.yorba.shotwell.gschema.xml:149 msgid "photo thumbnail scale" -msgstr "" +msgstr "skala gambar mini foto" -#: misc/org.yorba.shotwell.gschema.xml:143 +#: misc/org.yorba.shotwell.gschema.xml:150 msgid "The scale of photo thumbnails, ranging from 72 to 360." -msgstr "" +msgstr "Skala dari gambar mini foto, mulai dari 72 sampai 360." -#: misc/org.yorba.shotwell.gschema.xml:148 +#: misc/org.yorba.shotwell.gschema.xml:155 msgid "pin toolbar state" msgstr "sematkan batang alat" -#: misc/org.yorba.shotwell.gschema.xml:149 +#: misc/org.yorba.shotwell.gschema.xml:156 msgid "Pin toolbar in fullscreen, or not." -msgstr "Sematkan atau tidak pada mode layar penuh" +msgstr "Sematkan atau tidak bilah alat pada mode layar penuh." -#: misc/org.yorba.shotwell.gschema.xml:154 +#: misc/org.yorba.shotwell.gschema.xml:161 msgid "background color" msgstr "warna latar belakang" -#: misc/org.yorba.shotwell.gschema.xml:155 +#: misc/org.yorba.shotwell.gschema.xml:162 msgid "A grayscale color for use as the background color." msgstr "Warna hitam-putih digunakan sebagai warna latar belakang." -#: misc/org.yorba.shotwell.gschema.xml:160 -msgid "Selection state of \"hide photos\" option" -msgstr "" +#: misc/org.yorba.shotwell.gschema.xml:167 +msgid "Selection state of “hide photos” option" +msgstr "Keadaan pemilihan dari opsi \"sembunyikan foto\"" -#: misc/org.yorba.shotwell.gschema.xml:161 +#: misc/org.yorba.shotwell.gschema.xml:168 msgid "" -"Last used selection state of the \"hide photos already imported\" option in " +"Last used selection state of the “hide photos already imported” option in " "the import page." msgstr "" +"Keadaan pemilihan yang terakhir dipakai dari opsi \"sembunyikan foto yang " +"telah diimpor\" dalam halaman impor." -#: misc/org.yorba.shotwell.gschema.xml:168 -#, fuzzy -#| msgid "_Delay:" +#: misc/org.yorba.shotwell.gschema.xml:175 msgid "delay" -msgstr "Penun_daan" +msgstr "tundaan" -#: misc/org.yorba.shotwell.gschema.xml:169 +#: misc/org.yorba.shotwell.gschema.xml:176 msgid "Delay (in seconds) between photos in the slideshow." -msgstr "Penundaan (dalam detik) antar foto pada tampilan slide." +msgstr "Penundaan (dalam detik) antar foto pada pertunjukan salindia." -#: misc/org.yorba.shotwell.gschema.xml:174 -#, fuzzy -#| msgid "Transition d_elay:" +#: misc/org.yorba.shotwell.gschema.xml:181 msgid "transition delay" -msgstr "P_enundaan Peralihan" +msgstr "tundaan transisi" -#: misc/org.yorba.shotwell.gschema.xml:175 +#: misc/org.yorba.shotwell.gschema.xml:182 msgid "" "The time (in seconds) that a transition runs between photos in a slideshow" msgstr "" -"Waktu (dalam detik) transisi yang berjalan antar foto pada tampilan slide" +"Waktu (dalam detik) transisi yang berjalan antar foto pada pertunjukan " +"salindia" -#: misc/org.yorba.shotwell.gschema.xml:180 -#, fuzzy -#| msgid "_Transition effect:" +#: misc/org.yorba.shotwell.gschema.xml:187 msgid "transition effect id" -msgstr "Efek _Transisi" +msgstr "id efek transisi" -#: misc/org.yorba.shotwell.gschema.xml:181 +#: misc/org.yorba.shotwell.gschema.xml:188 msgid "" "The name of the transition effect that will be used between photos when " "running a slideshow" msgstr "" -"Nama efek transisi yang akan digunakan ketika menjalankan tampilan slide" +"Nama efek transisi yang akan digunakan ketika menjalankan pertunjukan " +"salindia" -#: misc/org.yorba.shotwell.gschema.xml:186 -#, fuzzy -#| msgid "Show t_itle" +#: misc/org.yorba.shotwell.gschema.xml:193 msgid "Show title" -msgstr "Tampilkan _judul" +msgstr "Tampilkan judul" -#: misc/org.yorba.shotwell.gschema.xml:187 +#: misc/org.yorba.shotwell.gschema.xml:194 msgid "Whether to show the title of a photo during the slideshow" -msgstr "Apakah tampilkan judul dari foto pada saat tampilan slide" +msgstr "Apakah tampilkan judul dari foto pada saat pertunjukan salindia" -#: misc/org.yorba.shotwell.gschema.xml:194 +#: misc/org.yorba.shotwell.gschema.xml:201 msgid "maximize library window" msgstr "maksimumkan jendela pustaka" -#: misc/org.yorba.shotwell.gschema.xml:195 +#: misc/org.yorba.shotwell.gschema.xml:202 msgid "True if library application is maximized, false otherwise." -msgstr "Benar jika pustaka aplikasi dimaksimalkan, salah jika sebaliknya." +msgstr "True jika pustaka aplikasi dimaksimalkan, false jika sebaliknya." -#: misc/org.yorba.shotwell.gschema.xml:200 +#: misc/org.yorba.shotwell.gschema.xml:207 msgid "width of library window" msgstr "lebar dari jendela pustaka" -#: misc/org.yorba.shotwell.gschema.xml:201 +#: misc/org.yorba.shotwell.gschema.xml:208 msgid "The last recorded width of the library application window." -msgstr "lebar yang tersimpan dari jendela pustaka aplikasi sebelumnya." +msgstr "Lebar yang tersimpan dari jendela pustaka aplikasi sebelumnya." -#: misc/org.yorba.shotwell.gschema.xml:206 +#: misc/org.yorba.shotwell.gschema.xml:213 msgid "height of library window" -msgstr "tingga dari jendela pustaka" +msgstr "tinggi dari jendela pustaka" -#: misc/org.yorba.shotwell.gschema.xml:207 +#: misc/org.yorba.shotwell.gschema.xml:214 msgid "The last recorded height of the library application window." -msgstr "tinggi yang tersimpan dari jendela pustaka aplikasi sebelumnya." +msgstr "Tinggi yang tersimpan dari jendela pustaka aplikasi sebelumnya." -#: misc/org.yorba.shotwell.gschema.xml:212 +#: misc/org.yorba.shotwell.gschema.xml:219 msgid "maximize direct-edit window" -msgstr "" +msgstr "maksimalkan jendela sunting-langsung" -#: misc/org.yorba.shotwell.gschema.xml:213 +#: misc/org.yorba.shotwell.gschema.xml:220 msgid "True if direct-edit application is maximized, false otherwise." -msgstr "" +msgstr "True bila aplikasi sunting-langsung dimaksimalkan, false bila tidak." -#: misc/org.yorba.shotwell.gschema.xml:218 +#: misc/org.yorba.shotwell.gschema.xml:225 msgid "width of direct-edit window" -msgstr "" +msgstr "lebar jendela sunting-langsung" -#: misc/org.yorba.shotwell.gschema.xml:219 +#: misc/org.yorba.shotwell.gschema.xml:226 msgid "The last recorded width of the direct-edit application window." -msgstr "" +msgstr "Lebar yang terakhir terrekam dari jendela aplikasi sunting-langsung." -#: misc/org.yorba.shotwell.gschema.xml:224 +#: misc/org.yorba.shotwell.gschema.xml:231 msgid "height of direct-edit window" -msgstr "" +msgstr "tinggi dari jendela sunting-langsung" -#: misc/org.yorba.shotwell.gschema.xml:225 +#: misc/org.yorba.shotwell.gschema.xml:232 msgid "The last recorded height of the direct-edit application window." -msgstr "" +msgstr "Tinggi yang terakhir terrekam dari jendela aplikasi sunting-langsung." -#: misc/org.yorba.shotwell.gschema.xml:230 +#: misc/org.yorba.shotwell.gschema.xml:237 msgid "sidebar divider position" msgstr "posisi pemisah bilah sisi" -#: misc/org.yorba.shotwell.gschema.xml:231 +#: misc/org.yorba.shotwell.gschema.xml:238 msgid "" "The last recorded position of the divider between the sidebar and view in " "library application window." msgstr "" +"Posisi yang terakhir terrekam dari pemisah antara bilah sisi dan tilikan " +"dalam jendela aplikasi pustaka." -#: misc/org.yorba.shotwell.gschema.xml:238 -#, fuzzy -#| msgid "Import to Library" +#: misc/org.yorba.shotwell.gschema.xml:245 msgid "import directory" -msgstr "Impor ke Album" +msgstr "direktori impor" -#: misc/org.yorba.shotwell.gschema.xml:239 +#: misc/org.yorba.shotwell.gschema.xml:246 msgid "Directory in which imported photo files are placed." -msgstr "Direktori dari berkas foto yang diimpor" +msgstr "Direktori tempat meletakkan berkas foto yang diimpor." -#: misc/org.yorba.shotwell.gschema.xml:244 -#, fuzzy -#| msgid "_Watch library directory for new files" +#: misc/org.yorba.shotwell.gschema.xml:251 msgid "watch library directory for new files" -msgstr "_Pantau berkas baru di direktori album" +msgstr "pantau berkas baru di direktori pustaka" -#: misc/org.yorba.shotwell.gschema.xml:245 +#: misc/org.yorba.shotwell.gschema.xml:252 msgid "" "If true, files added to the library directory are automatically imported." msgstr "" +"Bila true, berkas yang ditambahkan ke direktori pustaka secara otomatis " +"diimpor." -#: misc/org.yorba.shotwell.gschema.xml:250 +#: misc/org.yorba.shotwell.gschema.xml:257 msgid "write metadata to master files" msgstr "menulis metadata ke berkas" -#: misc/org.yorba.shotwell.gschema.xml:251 +#: misc/org.yorba.shotwell.gschema.xml:258 msgid "" "If true, changes to metadata (tags, titles, etc.) are written to the master " "photo file." msgstr "" +"Bila true, perubahan ke metadata (tag, judul, dsb.) ditulis ke berkas foto " +"induk." -#: misc/org.yorba.shotwell.gschema.xml:256 +#: misc/org.yorba.shotwell.gschema.xml:263 msgid "use lowercase filenames" msgstr "gunakan huruf kecil untuk nama berkas" -#: misc/org.yorba.shotwell.gschema.xml:257 +#: misc/org.yorba.shotwell.gschema.xml:264 msgid "" "If true, Shotwell will convert all filenames to lowercase when importing " "photo files" @@ -618,631 +640,843 @@ msgstr "" "Jika bernilai benar, Shotwell akan mengubah semua nama berkas menjadi huruf " "kecil ketika mengimpor berkas foto" -#: misc/org.yorba.shotwell.gschema.xml:262 -#, fuzzy -#| msgid "_Directory structure:" +#: misc/org.yorba.shotwell.gschema.xml:269 msgid "directory pattern" -msgstr "_Struktur direktori" +msgstr "pola direktori" -#: misc/org.yorba.shotwell.gschema.xml:263 +#: misc/org.yorba.shotwell.gschema.xml:270 msgid "" "A string encoding a naming pattern that will be used to name photo " "directories on import." msgstr "" +"Kalimat yang mengkodekan pola penamaan yang akan dipakai untuk menamai " +"direktori foto saat impor." -#: misc/org.yorba.shotwell.gschema.xml:268 +#: misc/org.yorba.shotwell.gschema.xml:275 msgid "directory pattern custom" -msgstr "" +msgstr "pola direktori ubahan" -#: misc/org.yorba.shotwell.gschema.xml:269 +#: misc/org.yorba.shotwell.gschema.xml:276 msgid "" "A string encoding a custom naming pattern that will be used to name photo " "directories on import." msgstr "" +"Kalimat yang mengkodekan pola penamaan ubahan yang akan dipakai untuk " +"menamai direktori foto saat impor." -#: misc/org.yorba.shotwell.gschema.xml:274 -#, fuzzy -#| msgid "RAW Developer" +#: misc/org.yorba.shotwell.gschema.xml:281 msgid "RAW developer default" -msgstr "RAW Developer" +msgstr "Baku pengembang RAW" -#: misc/org.yorba.shotwell.gschema.xml:275 +#: misc/org.yorba.shotwell.gschema.xml:282 msgid "Default option for which RAW developer Shotwell will use." -msgstr "" +msgstr "Opsi baku yang akan dipakai oleh Shotwell bagi pengembang RAW." -#: misc/org.yorba.shotwell.gschema.xml:282 +#: misc/org.yorba.shotwell.gschema.xml:289 msgid "Most-recently-used crop aspect ratio menu choice." -msgstr "" +msgstr "Pilihan menu rasio aspek pangkas yang terakhir dipakai." -#: misc/org.yorba.shotwell.gschema.xml:283 +#: misc/org.yorba.shotwell.gschema.xml:290 msgid "A numeric code representing the last crop menu choice the user made." msgstr "" +"Kode numerik yang mewakili pilihan menu pangkas yang terakhir diambil oleh " +"pengguna." -#: misc/org.yorba.shotwell.gschema.xml:287 -msgid "Most-recently-used crop custom aspect ratio's numerator." -msgstr "" +#: misc/org.yorba.shotwell.gschema.xml:294 +msgid "Most-recently-used crop custom aspect ratio’s numerator." +msgstr "Numerator rasio aspek ubahan pemangkasan yang terakhir dipakai." -#: misc/org.yorba.shotwell.gschema.xml:288 +#: misc/org.yorba.shotwell.gschema.xml:295 msgid "" "A nonzero, positive integer representing the width part of the last custom " "crop ratio the user entered." msgstr "" +"Suatu bilangan bulat positif yang mewakili bagian lebar dari rasio pangkas " +"ubahan yang terakhir dimasukkan oleh pengguna." -#: misc/org.yorba.shotwell.gschema.xml:292 -msgid "Most-recently-used crop custom aspect ratio's denominator." -msgstr "" +#: misc/org.yorba.shotwell.gschema.xml:299 +msgid "Most-recently-used crop custom aspect ratio’s denominator." +msgstr "Denominator rasio aspek ubahan pemangkasan yang terakhir dipakai." -#: misc/org.yorba.shotwell.gschema.xml:293 +#: misc/org.yorba.shotwell.gschema.xml:300 msgid "" "A nonzero, positive integer representing the height part of the last custom " "crop ratio the user entered." msgstr "" +"Suatu bilangan bulat positif yang mewakili bagian tinggi dari rasio pangkas " +"ubahan yang terakhir dimasukkan oleh pengguna." -#: misc/org.yorba.shotwell.gschema.xml:300 -#, fuzzy -#| msgid "E_xternal photo editor:" +#: misc/org.yorba.shotwell.gschema.xml:307 msgid "external photo editor" -msgstr "Penyunting foto e_ksternal" +msgstr "penyunting foto eksternal" -#: misc/org.yorba.shotwell.gschema.xml:301 +#: misc/org.yorba.shotwell.gschema.xml:308 msgid "External application used to edit photos." -msgstr "Aplikasi ekternal untuk mengubah foto." +msgstr "Aplikasi ekternal untuk menyunting foto." -#: misc/org.yorba.shotwell.gschema.xml:306 -#, fuzzy -#| msgid "External _RAW editor:" +#: misc/org.yorba.shotwell.gschema.xml:313 msgid "external raw editor" -msgstr "Penyunting _RAW eksternal" +msgstr "penyunting raw eksternal" -#: misc/org.yorba.shotwell.gschema.xml:307 +#: misc/org.yorba.shotwell.gschema.xml:314 msgid "External application used to edit RAW photos." -msgstr "Aplikasi eksternal untuk mengubah RAW foto." +msgstr "Aplikasi eksternal untuk menyunting foto RAW." -#: misc/org.yorba.shotwell.gschema.xml:314 +#: misc/org.yorba.shotwell.gschema.xml:352 +#: misc/org.yorba.shotwell.gschema.xml:353 +msgid "Setting in export dialog: how to trim images" +msgstr "Pengaturan dalam dialog ekspor: bagaimana memangkas citra" + +#: misc/org.yorba.shotwell.gschema.xml:358 +msgid "export metadata" +msgstr "ekspor metadata" + +#: misc/org.yorba.shotwell.gschema.xml:359 +msgid "Setting in export dialog: option to export metadata" +msgstr "Pengaturan dalam dialog ekspor: opsi untuk mengekspor metadata" + +#: misc/org.yorba.shotwell.gschema.xml:364 +msgid "format setting, special value" +msgstr "pengaturan format, nilai khusus" + +#: misc/org.yorba.shotwell.gschema.xml:365 +msgid "Setting in export dialog: format setting, special value" +msgstr "Pengaturan dalam dialog ekspor: pengaturan format, nilai khusus" + +#: misc/org.yorba.shotwell.gschema.xml:370 +msgid "format setting, type value" +msgstr "pengaturan format, nilai tipe" + +#: misc/org.yorba.shotwell.gschema.xml:371 +msgid "Setting in export dialog: format setting, type value" +msgstr "Pengaturan dalam dialog ekspor: pengaturan format, nilai tipe" + +#: misc/org.yorba.shotwell.gschema.xml:376 +msgid "JPEG quality option" +msgstr "Opsi kualitas JPEG" + +#: misc/org.yorba.shotwell.gschema.xml:377 +msgid "Setting in export dialog: jpeg quality option" +msgstr "Pengaturan dalam dialog ekspor: opsi kualitas jpeg" + +#: misc/org.yorba.shotwell.gschema.xml:382 +msgid "maximal size of image" +msgstr "ukuran maksimum citra" + +#: misc/org.yorba.shotwell.gschema.xml:383 +msgid "Setting in export dialog: maximal size of image" +msgstr "Pengaturan dalam dialog ekspor: ukuran maksimum citra" + +#: misc/org.yorba.shotwell.gschema.xml:390 msgid "last used publishing service" msgstr "layanan penerbitan yang terakhir digunakan" -#: misc/org.yorba.shotwell.gschema.xml:315 -#: misc/org.yorba.shotwell.gschema.xml:321 +#: misc/org.yorba.shotwell.gschema.xml:391 +#: misc/org.yorba.shotwell.gschema.xml:397 msgid "" "A numeric code representing the last service to which photos were published" msgstr "" +"Suatu kode numerik yang mewakili layanan yang terakhir dipakai untuk " +"mempublikasikan foto" -#: misc/org.yorba.shotwell.gschema.xml:320 +#: misc/org.yorba.shotwell.gschema.xml:396 msgid "default publishing service" msgstr "layanan penerbitan bawaan" -#: misc/org.yorba.shotwell.gschema.xml:334 +#: misc/org.yorba.shotwell.gschema.xml:410 msgid "access token" msgstr "token akses" -#: misc/org.yorba.shotwell.gschema.xml:335 +#: misc/org.yorba.shotwell.gschema.xml:411 msgid "Facebook OAuth token for the currently logged in session, if any" -msgstr "" +msgstr "Token OAuth Facebook untuk sesi log masuk saat ini, bila ada" -#: misc/org.yorba.shotwell.gschema.xml:340 +#: misc/org.yorba.shotwell.gschema.xml:416 msgid "user i.d." -msgstr "" +msgstr "ID pengguna" -#: misc/org.yorba.shotwell.gschema.xml:341 +#: misc/org.yorba.shotwell.gschema.xml:417 msgid "Facebook user i.d. for the currently logged in user, if any" -msgstr "" +msgstr "ID pengguna Facebook yang sedang dipakai masuk, bila ada" -#: misc/org.yorba.shotwell.gschema.xml:346 +#: misc/org.yorba.shotwell.gschema.xml:422 msgid "user name" msgstr "nama pengguna" -#: misc/org.yorba.shotwell.gschema.xml:347 -#, fuzzy -#| msgid "You are not currently logged into Yandex.Fotki." +#: misc/org.yorba.shotwell.gschema.xml:423 msgid "The name of the currently logged in Facebook user, if any" -msgstr "Anda belum masuk ke Yandex.Fotki." +msgstr "Nama pengguna Facebook yang sedang dipakai masuk, bila ada" -#: misc/org.yorba.shotwell.gschema.xml:352 -#: misc/org.yorba.shotwell.gschema.xml:384 +#: misc/org.yorba.shotwell.gschema.xml:428 +#: misc/org.yorba.shotwell.gschema.xml:460 msgid "default size code" -msgstr "" +msgstr "kode ukuran baku" -#: misc/org.yorba.shotwell.gschema.xml:353 +#: misc/org.yorba.shotwell.gschema.xml:429 msgid "" "A numeric code representing the default size for photos published to Facebook" msgstr "" +"Kode numerik yang mewakili ukuran baku bagi foto yang dipublikasikan ke " +"Facebook" -#: misc/org.yorba.shotwell.gschema.xml:359 +#: misc/org.yorba.shotwell.gschema.xml:435 msgid "" "Whether images being uploaded to Facebook should have their metadata removed " "first" msgstr "" +"Apakah citra yang diunggah ke Facebook mesti dihapus terlebih dahulu " +"metadatanya" -#: misc/org.yorba.shotwell.gschema.xml:366 +#: misc/org.yorba.shotwell.gschema.xml:442 msgid "OAuth Access Phase Token" -msgstr "" +msgstr "Token Fasa Akses OAuth" -#: misc/org.yorba.shotwell.gschema.xml:367 +#: misc/org.yorba.shotwell.gschema.xml:443 msgid "The authorization token for the currently logged in Flickr user, if any" -msgstr "" +msgstr "Token otorisasi untuk pengguna Flickr yang sedang log masuk, bila ada" -#: misc/org.yorba.shotwell.gschema.xml:372 +#: misc/org.yorba.shotwell.gschema.xml:448 msgid "OAuth Access Phase Token Secret" -msgstr "" +msgstr "Rahasia Token Fasa Akses OAuth" -#: misc/org.yorba.shotwell.gschema.xml:373 +#: misc/org.yorba.shotwell.gschema.xml:449 msgid "" "The cryptographic secret used to sign requests against the authorization " "token for the currently logged in Flickr user, if any" msgstr "" +"Rahasia kriptografis yang dipakai untuk menandatangani permintaan atas token " +"otorisasi bagi pengguna Flickr yang sedang log masuk, bila ada" -#: misc/org.yorba.shotwell.gschema.xml:379 +#: misc/org.yorba.shotwell.gschema.xml:455 msgid "The user name of the currently logged in Flickr user, if any" -msgstr "" +msgstr "Nama pengguna dari pengguna Flicker yang sedang log masuk, bila ada" -#: misc/org.yorba.shotwell.gschema.xml:385 +#: misc/org.yorba.shotwell.gschema.xml:461 msgid "" "A numeric code representing the default size for photos published to Flickr" msgstr "" +"Kode numerik yang mewakili ukuran foto baku yang dipublikasikan ke Flickr" -#: misc/org.yorba.shotwell.gschema.xml:390 +#: misc/org.yorba.shotwell.gschema.xml:466 msgid "default visibility" msgstr "visibilitas bawaan" -#: misc/org.yorba.shotwell.gschema.xml:391 +#: misc/org.yorba.shotwell.gschema.xml:467 msgid "" "A numeric code representing the default visibility for photos published to " "Flickr" msgstr "" +"Kode numerik yang mewakili kenampakan baku bagi foto yang dipublikasikan ke " +"Flickr" -#: misc/org.yorba.shotwell.gschema.xml:397 +#: misc/org.yorba.shotwell.gschema.xml:473 msgid "" "Whether images being uploaded to Flickr should have their metadata removed " "first" msgstr "" +"Apakah gambar yang sedang diunggah ke Flickr mesti terlebih dahulu dihapus " +"metadatanya" -#: misc/org.yorba.shotwell.gschema.xml:404 -#: misc/org.yorba.shotwell.gschema.xml:536 +#: misc/org.yorba.shotwell.gschema.xml:480 +#: misc/org.yorba.shotwell.gschema.xml:612 msgid "refresh token" -msgstr "" +msgstr "segarkan token" -#: misc/org.yorba.shotwell.gschema.xml:405 +#: misc/org.yorba.shotwell.gschema.xml:481 msgid "" "The OAuth token used to refresh the Picasa Web Albums session for the " "currently logged in user, if any." msgstr "" +"Token OAuth yang dipakai untuk menyegarkan sesi Album Web Picasa bagi " +"pengguna yang sedang log masuk, bila ada." -#: misc/org.yorba.shotwell.gschema.xml:411 +#: misc/org.yorba.shotwell.gschema.xml:487 msgid "" "A numeric code representing the default size for photos uploaded to Picasa " "Web Albums" msgstr "" +"Kode numerik yang mewakili ukuran foto baku yang diunggah ke Album Web Picasa" -#: misc/org.yorba.shotwell.gschema.xml:416 -#: misc/org.yorba.shotwell.gschema.xml:510 +#: misc/org.yorba.shotwell.gschema.xml:492 +#: misc/org.yorba.shotwell.gschema.xml:586 msgid "last album" msgstr "album terakhir" -#: misc/org.yorba.shotwell.gschema.xml:417 -#: misc/org.yorba.shotwell.gschema.xml:511 +#: misc/org.yorba.shotwell.gschema.xml:493 +#: misc/org.yorba.shotwell.gschema.xml:587 msgid "The name of the last album the user published photos to, if any" -msgstr "" +msgstr "Nama dari album terakhir tempat pengguna mempublikasi foto, bila ada" -#: misc/org.yorba.shotwell.gschema.xml:423 +#: misc/org.yorba.shotwell.gschema.xml:499 msgid "" "Whether images being uploaded to Picasa should have their metadata removed " "first" msgstr "" +"Apakah gambar yang sedang diunggah ke Picasa mesti terlebih dahulu dihapus " +"metadatanya" -#: misc/org.yorba.shotwell.gschema.xml:430 -msgid "Piwigio URL" -msgstr "Piwigio URL" +#: misc/org.yorba.shotwell.gschema.xml:506 +msgid "Piwigo URL" +msgstr "URL Piwigo" -#: misc/org.yorba.shotwell.gschema.xml:431 +#: misc/org.yorba.shotwell.gschema.xml:507 msgid "URL of the Piwigo server." -msgstr "URL dari server Piwigio." +msgstr "URL dari server Piwigo." -#: misc/org.yorba.shotwell.gschema.xml:437 +#: misc/org.yorba.shotwell.gschema.xml:513 msgid "Piwigo username, if logged in." -msgstr "" +msgstr "Nama pengguna Piwigo, bila log masuk." -#: misc/org.yorba.shotwell.gschema.xml:442 +#: misc/org.yorba.shotwell.gschema.xml:518 msgid "password" msgstr "kata sandi" -#: misc/org.yorba.shotwell.gschema.xml:443 +#: misc/org.yorba.shotwell.gschema.xml:519 msgid "Piwigo password, if logged in." -msgstr "" +msgstr "Kata sandi Piwigo, bila log masuk." -#: misc/org.yorba.shotwell.gschema.xml:448 +#: misc/org.yorba.shotwell.gschema.xml:524 msgid "remember password" msgstr "ingat Sandi" -#: misc/org.yorba.shotwell.gschema.xml:449 +#: misc/org.yorba.shotwell.gschema.xml:525 msgid "If true, remember the Piwigo password." -msgstr "" +msgstr "Jika bernilai true, maka akan mengingat kata sandi Piwigo." -#: misc/org.yorba.shotwell.gschema.xml:455 +#: misc/org.yorba.shotwell.gschema.xml:531 msgid "The last selected Piwigo category." msgstr "Kategori Piwigio yang terakhir dipilih." -#: misc/org.yorba.shotwell.gschema.xml:460 +#: misc/org.yorba.shotwell.gschema.xml:536 msgid "last permission level" msgstr "tingkatan hak akses yang terakhir digunakan" -#: misc/org.yorba.shotwell.gschema.xml:461 +#: misc/org.yorba.shotwell.gschema.xml:537 msgid "The last chosen Piwigo permission level." msgstr "Tingkatan hak akses Piwigio yang terakhir dipilih." -#: misc/org.yorba.shotwell.gschema.xml:467 +#: misc/org.yorba.shotwell.gschema.xml:543 msgid "" "A numeric code representing the last photo size preset used when publishing " "to Piwigo." msgstr "" +"Kode numerik yang mewakili pratata ukuran foto terakhir yang dipakai ketika " +"mempublikasikan ke Piwigo." -#: misc/org.yorba.shotwell.gschema.xml:473 +#: misc/org.yorba.shotwell.gschema.xml:549 msgid "" "Whether images being uploaded to Piwigo should have their metadata removed " "first" msgstr "" +"Apakah gambar yang sedang diunggah ke Piwigo mesti terlebih dahulu dihapus " +"metadatanya" -#: misc/org.yorba.shotwell.gschema.xml:478 +#: misc/org.yorba.shotwell.gschema.xml:554 msgid "" "if title is set and comment unset, use title as comment for uploads to Piwigo" msgstr "" "bila judul diatur dan komentar kosong, pakai judul sebagai komentar untuk " "diunggah ke Piwigio" -#: misc/org.yorba.shotwell.gschema.xml:479 +#: misc/org.yorba.shotwell.gschema.xml:555 msgid "" "Whether images being uploaded to Piwigo should have their comment set from " "the title if title is set and comment unset" msgstr "" +"Apakah citra yang sedang diunggap ke Piwigo komentarnya mesti disalin dari " +"judul bila judul terisi dan komentar kosong" -#: misc/org.yorba.shotwell.gschema.xml:484 +#: misc/org.yorba.shotwell.gschema.xml:560 msgid "do not upload tags when uploading to Piwigo" msgstr "jangan unggah tanda ketika mengunggah ke Piwigio" -#: misc/org.yorba.shotwell.gschema.xml:485 +#: misc/org.yorba.shotwell.gschema.xml:561 msgid "" "Whether images being uploaded to Piwigo should have their tags removed on " "upload, such that these tags will not appear on the remote Piwigo server." msgstr "" +"Apakah citra yang sedang diunggah ke Piwigo mesti dihapus terlebih dahulu " +"tagnya, sehingga tag-tag ini tidak akan muncul pada server Piwigo." -#: misc/org.yorba.shotwell.gschema.xml:493 +#: misc/org.yorba.shotwell.gschema.xml:569 msgid "Gallery3 username" msgstr "Nama pengguna Gallery3" -#: misc/org.yorba.shotwell.gschema.xml:498 +#: misc/org.yorba.shotwell.gschema.xml:574 msgid "API key" msgstr "Kunci API" -#: misc/org.yorba.shotwell.gschema.xml:499 +#: misc/org.yorba.shotwell.gschema.xml:575 msgid "Gallery3 API key" msgstr "Kunci API Gallery3" -#: misc/org.yorba.shotwell.gschema.xml:504 +#: misc/org.yorba.shotwell.gschema.xml:580 msgid "URL" msgstr "URL" -#: misc/org.yorba.shotwell.gschema.xml:505 +#: misc/org.yorba.shotwell.gschema.xml:581 msgid "Gallery3 site URL" -msgstr "URL _Gallery3" +msgstr "URL situs Gallery3" -#: misc/org.yorba.shotwell.gschema.xml:517 +#: misc/org.yorba.shotwell.gschema.xml:593 msgid "" "Indicates whether images being uploaded to Gallery3 should have their " "metadata removed first" msgstr "" +"Apakah citra yang diunggah ke Gallery3 mesti dihapus terlebih dahulu " +"metadatanya" -#: misc/org.yorba.shotwell.gschema.xml:522 +#: misc/org.yorba.shotwell.gschema.xml:598 msgid "scaling constraint of uploaded picture" -msgstr "" +msgstr "kendala pengaturan skala dari gambar yang diunggah" -#: misc/org.yorba.shotwell.gschema.xml:523 +#: misc/org.yorba.shotwell.gschema.xml:599 msgid "The scaling constraint ID of the picture to be uploaded" -msgstr "" +msgstr "ID kendala pengaturan skala dari gambar yang diunggah" -#: misc/org.yorba.shotwell.gschema.xml:528 +#: misc/org.yorba.shotwell.gschema.xml:604 msgid "pixels of the major axis uploaded picture" -msgstr "" +msgstr "piksel sumbu mayor dari gambar yang diunggah" -#: misc/org.yorba.shotwell.gschema.xml:529 +#: misc/org.yorba.shotwell.gschema.xml:605 msgid "" "The pixels of the major axis of the picture to be uploaded; used only if " "scaling-constraint-id is an appropriate value" msgstr "" +"Piksel dari sumbu mayor gambar yang akan diunggah; hanya dipakai bila " +"scaling-constraint-id adalah nilai yang sesuai" -#: misc/org.yorba.shotwell.gschema.xml:537 +#: misc/org.yorba.shotwell.gschema.xml:613 msgid "" "The OAuth token used to refresh the YouTube session for the currently logged " "in user, if any." msgstr "" +"Token OAuth yang dipakai untuk menyegarkan sesi YouTube bagi pengguna yang " +"sedang log masuk, bila ada." -#: misc/org.yorba.shotwell.gschema.xml:544 +#: misc/org.yorba.shotwell.gschema.xml:620 msgid "last used import service" msgstr "layanan impor yang terakhir digunakan" -#: misc/org.yorba.shotwell.gschema.xml:545 +#: misc/org.yorba.shotwell.gschema.xml:621 msgid "" "A numeric code representing the last service from which photos were imported" msgstr "" +"Suatu kode numerik yang mewakili layanan yang terakhir dipakai sebagai " +"sumber impor foto" -#: misc/org.yorba.shotwell.gschema.xml:552 +#: misc/org.yorba.shotwell.gschema.xml:628 msgid "interpreter state cookie" -msgstr "" +msgstr "cookie keadaan interpreter" -#: misc/org.yorba.shotwell.gschema.xml:553 +#: misc/org.yorba.shotwell.gschema.xml:629 msgid "" "A numeric code that captures the state of the GStreamer plug-in environment" -msgstr "" +msgstr "Kode numerik yang menangkap keadaan dari lingkungan pengaya GStreamer" -#: misc/org.yorba.shotwell.gschema.xml:560 +#: misc/org.yorba.shotwell.gschema.xml:636 msgid "content layout mode" -msgstr "" +msgstr "mode tata letak isi" -#: misc/org.yorba.shotwell.gschema.xml:561 +#: misc/org.yorba.shotwell.gschema.xml:637 msgid "" "A numeric code that describes how photos are laid out on the page during " "printing" msgstr "" +"Kode numerik yang menjelaskan bagaimana foto disusun pada halaman saat " +"pencetakan" -#: misc/org.yorba.shotwell.gschema.xml:566 -#, fuzzy -#| msgid "_Contents" +#: misc/org.yorba.shotwell.gschema.xml:642 msgid "content ppi" -msgstr "Daftar _Isi" +msgstr "ppi isi" -#: misc/org.yorba.shotwell.gschema.xml:567 +#: misc/org.yorba.shotwell.gschema.xml:643 msgid "The number of pixels per inch (ppi) sent to the printer during printing" -msgstr "" +msgstr "Angka piksel per inci (ppi) yang dikirim ke pencetak selama pencetakan" -#: misc/org.yorba.shotwell.gschema.xml:572 +#: misc/org.yorba.shotwell.gschema.xml:648 msgid "content width" msgstr "lebar konten" -#: misc/org.yorba.shotwell.gschema.xml:573 +#: misc/org.yorba.shotwell.gschema.xml:649 msgid "The width of the printed emulsion on the page when printing" -msgstr "" +msgstr "Lebar dari emulsi yang dicetak pada halaman ketika mencetak" -#: misc/org.yorba.shotwell.gschema.xml:578 +#: misc/org.yorba.shotwell.gschema.xml:654 msgid "content height" msgstr "tinggi konten" -#: misc/org.yorba.shotwell.gschema.xml:579 +#: misc/org.yorba.shotwell.gschema.xml:655 msgid "The height of the printed emulsion on the page when printing" -msgstr "" +msgstr "Tinggi dari emulsi yang dicetak pada halaman ketika mencetak" -#: misc/org.yorba.shotwell.gschema.xml:584 -#, fuzzy -#| msgid "_Contents" +#: misc/org.yorba.shotwell.gschema.xml:660 msgid "content units" -msgstr "Daftar _Isi" +msgstr "satuan isi" -#: misc/org.yorba.shotwell.gschema.xml:585 +#: misc/org.yorba.shotwell.gschema.xml:661 msgid "" "A numeric code representing unit of measure (inches or centimeters) used " "when printing" msgstr "" +"Kode numerik yang mewakili satuan pengukuran (inci atau sentimeter) yang " +"dipakai ketika mencetak" -#: misc/org.yorba.shotwell.gschema.xml:590 +#: misc/org.yorba.shotwell.gschema.xml:666 msgid "images per page code" msgstr "gambar per kode halaman" -#: misc/org.yorba.shotwell.gschema.xml:591 +#: misc/org.yorba.shotwell.gschema.xml:667 msgid "" "A numeric code representing the currently selected images per page mode used " "when printing" msgstr "" +"Kode numerik yang mewakili mode cacah citra per halaman yang kini dipakai " +"ketika mencetak" -#: misc/org.yorba.shotwell.gschema.xml:596 +#: misc/org.yorba.shotwell.gschema.xml:672 msgid "size selection" -msgstr "" +msgstr "pemilihan ukuran" -#: misc/org.yorba.shotwell.gschema.xml:597 +#: misc/org.yorba.shotwell.gschema.xml:673 msgid "" "The index of the current print size in a pre-defined list of standard sizes" msgstr "" +"Indeks dari ukuran cetak saat ini dalam daftar terpradefinisi dari ukuran-" +"ukuran standar" -#: misc/org.yorba.shotwell.gschema.xml:602 -#, fuzzy -#| msgid "_Match photo aspect ratio" +#: misc/org.yorba.shotwell.gschema.xml:678 msgid "match aspect ratio" -msgstr "_Sesuaikan dengan rasio foto" +msgstr "cocok rasio aspek" -#: misc/org.yorba.shotwell.gschema.xml:603 +#: misc/org.yorba.shotwell.gschema.xml:679 msgid "" "Determines whether custom print sizes must match the aspect ratio of the " "original photo" msgstr "" +"Menentukan apakah ukuran cetak ubahan mesti cocok dengan rasio aspek dari " +"foto asli" -#: misc/org.yorba.shotwell.gschema.xml:608 -#, fuzzy -#| msgid "Print image _title" +#: misc/org.yorba.shotwell.gschema.xml:684 msgid "print titles" -msgstr "Ce_tak judul gambar" +msgstr "cetak judul" -#: misc/org.yorba.shotwell.gschema.xml:609 +#: misc/org.yorba.shotwell.gschema.xml:685 msgid "" "True if the title of a photo should be printed when the photo is printed, " "false otherwise." msgstr "" +"True bila judul foto mesti dicetak ketika foto dicetak, false bila tidak." -#: misc/org.yorba.shotwell.gschema.xml:614 +#: misc/org.yorba.shotwell.gschema.xml:690 msgid "titles font" msgstr "fonta judul" -#: misc/org.yorba.shotwell.gschema.xml:615 +#: misc/org.yorba.shotwell.gschema.xml:691 msgid "The name of the font to use for photo titles when they are printed." -msgstr "" +msgstr "Nama fonta yang dipakai untuk judul foto ketika mereka dicetak." -#: misc/org.yorba.shotwell.gschema.xml:626 +#: misc/org.yorba.shotwell.gschema.xml:702 msgid "enable facebook publishing plugin" msgstr "aktifkan plugin penerbitan facebook" -#: misc/org.yorba.shotwell.gschema.xml:627 +#: misc/org.yorba.shotwell.gschema.xml:703 msgid "True if the Facebook publishing plugin is enabled, false otherwise" -msgstr "" +msgstr "True bila pengaya publikasi Facebook difungsikan, false bila tidak" -#: misc/org.yorba.shotwell.gschema.xml:632 +#: misc/org.yorba.shotwell.gschema.xml:708 msgid "enable flickr publishing plugin" msgstr "aktifkan plugin penerbitan flickr" -#: misc/org.yorba.shotwell.gschema.xml:633 +#: misc/org.yorba.shotwell.gschema.xml:709 msgid "True if the Flickr publishing plugin is enabled, false otherwise" -msgstr "" +msgstr "True bila pengaya publikasi Flickr difungsikan, false bila tidak" -#: misc/org.yorba.shotwell.gschema.xml:638 +#: misc/org.yorba.shotwell.gschema.xml:714 msgid "enable picasa publishing plugin" msgstr "aktifkan plugin penerbitan picasa" -#: misc/org.yorba.shotwell.gschema.xml:639 +#: misc/org.yorba.shotwell.gschema.xml:715 msgid "" "True if the Picasa Web Albums publishing plugin is enabled, false otherwise" msgstr "" +"True bila pengaya publikasi Album Web Picasa difungsikan, false bila tidak" -#: misc/org.yorba.shotwell.gschema.xml:644 +#: misc/org.yorba.shotwell.gschema.xml:720 msgid "enable youtube publishing plugin" msgstr "aktifkan plugin penerbitan youtube" -#: misc/org.yorba.shotwell.gschema.xml:645 +#: misc/org.yorba.shotwell.gschema.xml:721 msgid "True if the YouTube publishing plugin is enabled, false otherwise" -msgstr "" +msgstr "True bila pengaya publikasi YouTube difungsikan, false bila tidak" -#: misc/org.yorba.shotwell.gschema.xml:650 +#: misc/org.yorba.shotwell.gschema.xml:726 msgid "enable piwigo publishing plugin" -msgstr "aktifkan plugin penerbitan piwigio" +msgstr "aktifkan plugin penerbitan piwigo" -#: misc/org.yorba.shotwell.gschema.xml:651 +#: misc/org.yorba.shotwell.gschema.xml:727 msgid "True if the Piwigo publishing plugin is enabled, false otherwise" -msgstr "" +msgstr "True bila pengaya publikasi Piwigo difungsikan, false bila tidak" -#: misc/org.yorba.shotwell.gschema.xml:656 +#: misc/org.yorba.shotwell.gschema.xml:732 msgid "enable yandex publishing plugin" msgstr "aktifkan plugin penerbitan yandex" -#: misc/org.yorba.shotwell.gschema.xml:657 +#: misc/org.yorba.shotwell.gschema.xml:733 msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise" -msgstr "" +msgstr "True bila pengaya publikasi Yandex.Fotki difungsikan, false bila tidak" -#: misc/org.yorba.shotwell.gschema.xml:662 +#: misc/org.yorba.shotwell.gschema.xml:738 msgid "enable tumblr publishing plugin" -msgstr "aktifkan plugin penerbitan tublr" +msgstr "aktifkan plugin penerbitan tumblr" -#: misc/org.yorba.shotwell.gschema.xml:663 +#: misc/org.yorba.shotwell.gschema.xml:739 msgid "True if the Tumblr publishing plugin is enabled, false otherwise" -msgstr "" +msgstr "True bila pengaya publikasi Tumblr difungsikan, false bila tidak" -#: misc/org.yorba.shotwell.gschema.xml:668 +#: misc/org.yorba.shotwell.gschema.xml:744 msgid "enable rajce publishing plugin" msgstr "aktifkan plugin penerbitan rajce" -#: misc/org.yorba.shotwell.gschema.xml:669 +#: misc/org.yorba.shotwell.gschema.xml:745 msgid "True if the Rajce publishing plugin is enabled, false otherwise" -msgstr "" +msgstr "True bila pengaya publikasi Rajce difungsikan, false bila tidak" -#: misc/org.yorba.shotwell.gschema.xml:674 +#: misc/org.yorba.shotwell.gschema.xml:750 msgid "enable gallery3 publishing plugin" msgstr "aktifkan plugin penerbitan gallery3" -#: misc/org.yorba.shotwell.gschema.xml:675 +#: misc/org.yorba.shotwell.gschema.xml:751 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise" -msgstr "" +msgstr "True bila pengaya publikasi Gallery3 difungsikan, false bila tidak" -#: misc/org.yorba.shotwell.gschema.xml:680 +#: misc/org.yorba.shotwell.gschema.xml:756 msgid "enable F-Spot import plugin" msgstr "aktifkan plugin impor F-Spot" -#: misc/org.yorba.shotwell.gschema.xml:681 +#: misc/org.yorba.shotwell.gschema.xml:757 msgid "True if the F-Spot import plugin is enabled, false otherwise" -msgstr "" +msgstr "True bila pengaya impor F-Spot difungsikan, false bila tidak" -#: misc/org.yorba.shotwell.gschema.xml:686 +#: misc/org.yorba.shotwell.gschema.xml:762 msgid "enable slideshow crumble transition" -msgstr "aktifkan transisi hancur pada tampilan slide" +msgstr "aktifkan transisi rontok pertunjukan salindia" -#: misc/org.yorba.shotwell.gschema.xml:687 +#: misc/org.yorba.shotwell.gschema.xml:763 msgid "" "True if the Crumble slideshow transition plugin is enabled, false otherwise" msgstr "" +"True bila pengaya transisi salindia Rontok difungsikan, false bila tidak" -#: misc/org.yorba.shotwell.gschema.xml:692 +#: misc/org.yorba.shotwell.gschema.xml:768 msgid "enable slideshow fade transition" -msgstr "aktifkan transisi luntur pada tampilan slide" +msgstr "aktifkan transisi memudar pertunjukan salindia" -#: misc/org.yorba.shotwell.gschema.xml:693 +#: misc/org.yorba.shotwell.gschema.xml:769 msgid "" "True if the Fade slideshow transition plugin is enabled, false otherwise" msgstr "" +"True bila pengaya transisi salindia Memudar difungsikan, false bila tidak" -#: misc/org.yorba.shotwell.gschema.xml:698 -#: misc/org.yorba.shotwell.gschema.xml:722 +#: misc/org.yorba.shotwell.gschema.xml:774 msgid "enable slideshow slide transition" -msgstr "aktifkan transisi tampilan slide" +msgstr "aktifkan transisi geser pertunjukan salindia" -#: misc/org.yorba.shotwell.gschema.xml:699 +#: misc/org.yorba.shotwell.gschema.xml:775 msgid "" "True if the Slide slideshow transition plugin is enabled, false otherwise" msgstr "" +"True bila pengaya transisi salindia Geser difungsikan, false bila tidak" -#: misc/org.yorba.shotwell.gschema.xml:704 +#: misc/org.yorba.shotwell.gschema.xml:780 msgid "enable slideshow clock transition" -msgstr "aktifkan transisi jam pada tampilan slide" +msgstr "aktifkan transisi jam pada pertunjukan salindia" -#: misc/org.yorba.shotwell.gschema.xml:705 +#: misc/org.yorba.shotwell.gschema.xml:781 msgid "" "True if the Clock slideshow transition plugin is enabled, false otherwise" -msgstr "" +msgstr "True bila pengaya transisi salindia Jam difungsikan, false bila tidak" -#: misc/org.yorba.shotwell.gschema.xml:710 -#: misc/org.yorba.shotwell.gschema.xml:716 +#: misc/org.yorba.shotwell.gschema.xml:786 msgid "enable slideshow circle transition" -msgstr "aktifkan transisi lingkaran pada tampilan slide" +msgstr "aktifkan transisi lingkaran pada pertunjukan salindia" -#: misc/org.yorba.shotwell.gschema.xml:711 +#: misc/org.yorba.shotwell.gschema.xml:787 msgid "" "True if the Circle slideshow transition plugin is enabled, false otherwise" msgstr "" +"True bila pengaya transisi salindia Lingkaran difungsikan, false bila tidak" + +#: misc/org.yorba.shotwell.gschema.xml:792 +msgid "enable slideshow circles transition" +msgstr "aktifkan transisi lingkaran pertunjukan salindia" -#: misc/org.yorba.shotwell.gschema.xml:717 +#: misc/org.yorba.shotwell.gschema.xml:793 msgid "" "True if the Circles slideshow transition plugin is enabled, false otherwise" msgstr "" +"True bila pengaya transisi salindia Lingkaran difungsikan, false bila tidak" + +#: misc/org.yorba.shotwell.gschema.xml:798 +msgid "enable slideshow blinds transition" +msgstr "aktifkan transisi tirai jajar pada tampilan slide" -#: misc/org.yorba.shotwell.gschema.xml:723 +#: misc/org.yorba.shotwell.gschema.xml:799 msgid "" "True if the Blinds slideshow transition plugin is enabled, false otherwise" msgstr "" +"True bila pengaya transisi salindia Tirai Jajar difungsikan, false bila tidak" -#: misc/org.yorba.shotwell.gschema.xml:728 +#: misc/org.yorba.shotwell.gschema.xml:804 msgid "enable slideshow squares transition" -msgstr "aktifkan transisi kotak pada tampilan slide" +msgstr "aktifkan transisi bujur sangkar pada tampilan slide" -#: misc/org.yorba.shotwell.gschema.xml:729 +#: misc/org.yorba.shotwell.gschema.xml:805 msgid "" "True if the Squares slideshow transition plugin is enabled, false otherwise" msgstr "" +"True bila pengaya transisi salindia Bujur Sangkar difungsikan, false bila " +"tidak" -#: misc/org.yorba.shotwell.gschema.xml:734 +#: misc/org.yorba.shotwell.gschema.xml:810 msgid "enable slideshow stripes transition" msgstr "aktifkan transisi bergaris pada tampilan slide" -#: misc/org.yorba.shotwell.gschema.xml:735 +#: misc/org.yorba.shotwell.gschema.xml:811 msgid "" "True if the Stripes slideshow transition plugin is enabled, false otherwise" msgstr "" +"True bila pengaya transisi salindia Garis-garis difungsikan, false bila tidak" -#: misc/org.yorba.shotwell.gschema.xml:740 +#: misc/org.yorba.shotwell.gschema.xml:816 msgid "enable slideshow chess transition" msgstr "aktifkan transisi papan catur pada tampilan slide" -#: misc/org.yorba.shotwell.gschema.xml:741 +#: misc/org.yorba.shotwell.gschema.xml:817 msgid "" "True if the Chess-Board slideshow transition plugin is enabled, false " "otherwise" msgstr "" +"True bila pengaya transisi salindia Papan Catur difungsikan, false bila tidak" + +#: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:166 +msgid "" +"You are not currently logged into Facebook.\n" +"\n" +"If you don’t yet have a Facebook account, you can create one during the " +"login process. During login, Shotwell Connect may ask you for permission to " +"upload photos and publish to your feed. These permissions are required for " +"Shotwell Connect to function." +msgstr "" +"Anda tidak sedang log masuk ke Facebook.\n" +"\n" +"Jika belum memiliki akun Facebook, Anda dapat membuatnya nanti saat log " +"masuk. Saat log masuk, Shotwell Connect akan menanyakan hak unggah dan hak " +"penerbitan berita. Hak-hak tersebut diperlukan oleh Shotwell Connect agar " +"berfungsi." + +#: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:168 +msgid "" +"You have already logged in and out of Facebook during this Shotwell " +"session.\n" +"To continue publishing to Facebook, quit and restart Shotwell, then try " +"publishing again." +msgstr "" +"Selama menggunakan Shotwell tadi, Anda sudah keluar dan masuk dari " +"Facebook.\n" +"Untuk dapat mengirim foto ke Facebook, silakan keluar dan jalankan Shotwell " +"kembali, kemudian ulangi proses pengiriman." + +#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:17 +msgid "" +"Enter the confirmation number which appears after you log into Flickr in " +"your Web browser." +msgstr "" +"Masukkan nomor konfirmasi yang muncul setelah Anda log masuk ke Flickr dalam " +"peramban Web Anda." + +#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:37 +msgid "Authorization _Number:" +msgstr "_Nomor Otorisasi:" + +#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70 +#: src/Dialogs.vala:128 +msgid "Con_tinue" +msgstr "Lanju_tkan" + +#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:187 +msgid "" +"You are not currently logged into Flickr.\n" +"\n" +"Click Log in to log into Flickr in your Web browser. You will have to " +"authorize Shotwell Connect to link to your Flickr account." +msgstr "" +"Anda masih belum masuk ke Flickr.\n" +"\n" +"Klik Masuk untuk masuk ke Flickr pada peramban Web Anda. Anda mesti memberi " +"izin Shotwell Connect untuk menyambungkan ke akun Flickr Anda." + +#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364 +msgid "Preparing for login…" +msgstr "Mempersiapkan log masuk…" + +#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:468 +#: plugins/shotwell-publishing/FlickrPublishing.vala:341 +msgid "" +"A file required for publishing is unavailable. Publishing to Flickr can’t " +"continue." +msgstr "" +"Berkas penting untuk penerbitan tidak tersedia. Tak bisa lanjutkan " +"menerbitkan ke Flickr." + +#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:481 +msgid "Verifying authorization…" +msgstr "Memverifikasi otorisasi…" + +#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:118 +msgid "" +"You have already logged in and out of a Google service during this Shotwell " +"session.\n" +"\n" +"To continue publishing to Google services, quit and restart Shotwell, then " +"try publishing again." +msgstr "" +"Anda telah log masuk dan log keluar dari suatu layanan Google selama sesi " +"Shotwell ini.\n" +"\n" +"Untuk melanjutkan penerbitan ke layanan Google, keluar dan jalankan lagi " +"Shotwell, lalu cobalah mempublikasikan lagi." + +#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:31 +msgid "" +"You are not currently logged into Picasa Web Albums.\n" +"\n" +"Click Log in to log into Picasa Web Albums in your Web browser. You will " +"have to authorize Shotwell Connect to link to your Picasa Web Albums account." +msgstr "" +"Kamu tidak sedang log masuk ke Album Web Picasa.\n" +"\n" +"Klik Log Masuk untuk masuk ke Album Web Picasa lewat peramban Web Anda. Anda " +"perlu memberi wewenang Shotwell Connect menyambung ke akun Album Web Picasa " +"Anda." + +#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34 +msgid "" +"You are not currently logged into YouTube.\n" +"\n" +"You must have already signed up for a Google account and set it up for use " +"with YouTube to continue. You can set up most accounts by using your browser " +"to log into the YouTube site at least once." +msgstr "" +"Anda tidak terhubung ke YouTube.\n" +"\n" +"Anda harus memiliki akun Google/YouTube untuk melanjutkan." -#: plugins/common/Resources.vala:9 +#: plugins/common/Resources.vala:12 msgid "Visit the Shotwell home page" msgstr "Kunjungi laman serambi Shotwell" -#: plugins/common/Resources.vala:28 src/AppWindow.vala:676 +#: plugins/common/Resources.vala:31 src/AppWindow.vala:605 msgid "translator-credits" msgstr "" "Mohammad Anwari <mdamt@di.blankon.in>, 2010\n" @@ -1253,37 +1487,79 @@ msgstr "" "Malsasa <teknoloid@gmail.com>, 2012\n" "Mohamad Hasan Al Banna, 2013\n" "Rahman Yusri Aftian <aftian@yahoo.com>, 2012, 2013\n" -"Andika Triwidada <andika@gmail.com>, 2011, 2014" +"Andika Triwidada <andika@gmail.com>, 2011, 2014, 2017" -#: plugins/common/RESTSupport.vala:448 -#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:960 -msgid "A temporary file needed for publishing is unavailable" -msgstr "Berkas sementara yang diperlukan untuk penerbitan tidak tersedia" +#. Possible error message when a site presents a bad certificate. +#: plugins/common/RESTSupport.vala:202 +msgid "" +"⚫ This website presented identification that belongs to a different website." +msgstr "⚫ Situs web ini menyajikan identifikasi milik situs web lain." -#: plugins/common/RESTSupport.vala:1154 +#. Possible error message when a site presents a bad certificate. +#: plugins/common/RESTSupport.vala:207 msgid "" -"You have already logged in and out of a Google service during this Shotwell " -"session.\n" -"\n" -"To continue publishing to Google services, quit and restart Shotwell, then " -"try publishing again." +"⚫ This website’s identification is too old to trust. Check the date on your " +"computer’s calendar." msgstr "" -"Anda telah log masuk dan log keluar dari suatu layanan Google selama sesi " -"Shotwell ini.\n" -"\n" -"Untuk melanjutkan penerbitan ke layanan Google, keluar dan jalankan lagi " -"Shotwell, lalu cobalah mempublikasikan lagi." +"⚫ Identifikasi situs web ini terlalu tua untuk dipercaya. Periksalah tanggal " +"pada kalender komputer Anda." + +#. Possible error message when a site presents a bad certificate. +#: plugins/common/RESTSupport.vala:212 +msgid "" +"⚫ This website’s identification was not issued by a trusted organization." +msgstr "" +"⚫ Identifikasi situs web ini tidak diterbitkan oleh organisasi yang " +"terpercaya." + +#. Possible error message when a site presents a bad certificate. +#: plugins/common/RESTSupport.vala:217 +msgid "" +"⚫ This website’s identification could not be processed. It may be corrupted." +msgstr "⚫ Identifikasi situs web ini tak dapat diproses. Mungkin itu rusak." + +#. Possible error message when a site presents a bad certificate. +#: plugins/common/RESTSupport.vala:222 +msgid "" +"⚫ This website’s identification has been revoked by the trusted organization " +"that issued it." +msgstr "" +"⚫ Identifikasi situs web ini telah dicabut oleh organisasi terpercaya yang " +"menerbitkannya." -#: plugins/shotwell-data-imports/FSpotImporter.vala:34 -#: plugins/shotwell-publishing/FacebookPublishing.vala:32 -#: plugins/shotwell-publishing/FlickrPublishing.vala:34 -#: plugins/shotwell-publishing/PicasaPublishing.vala:32 -#: plugins/shotwell-publishing/PiwigoPublishing.vala:32 -#: plugins/shotwell-publishing/YouTubePublishing.vala:32 src/Resources.vala:27 +#. Possible error message when a site presents a bad certificate. +#: plugins/common/RESTSupport.vala:227 +msgid "" +"⚫ This website’s identification cannot be trusted because it uses very weak " +"encryption." +msgstr "" +"⚫ Identifikasi situs web ini tak dapat dipercaya karena memakai enkripsi " +"yang sangat lemah." + +#. Possible error message when a site presents a bad certificate. +#: plugins/common/RESTSupport.vala:232 +msgid "" +"⚫ This website’s identification is only valid for future dates. Check the " +"date on your computer’s calendar." +msgstr "" +"⚫ Identifikasi situs web ini hanya valid pada tanggal di masa depan. Periksa " +"tanggal pada kalender komputer Anda." + +#: plugins/common/RESTSupport.vala:509 +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:959 +msgid "A temporary file needed for publishing is unavailable" +msgstr "Berkas sementara yang diperlukan untuk penerbitan tidak tersedia" + +#: plugins/shotwell-data-imports/FSpotImporter.vala:36 +#: plugins/shotwell-publishing/FacebookPublishing.vala:33 +#: plugins/shotwell-publishing/FlickrPublishing.vala:33 +#: plugins/shotwell-publishing/PicasaPublishing.vala:33 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:33 +#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27 msgid "Copyright 2016 Software Freedom Conservancy Inc." msgstr "Hak Cipta 2016 Software Freedom Conservancy Inc." -#: plugins/shotwell-data-imports/FSpotImporter.vala:56 +#: plugins/shotwell-data-imports/FSpotImporter.vala:58 msgid "" "Welcome to the F-Spot library import service.\n" "\n" @@ -1297,7 +1573,7 @@ msgstr "" "ditemukan oleh Shotwell atau dengan memilih berkas basis data F-Spot " "alternatif." -#: plugins/shotwell-data-imports/FSpotImporter.vala:58 +#: plugins/shotwell-data-imports/FSpotImporter.vala:60 msgid "" "Welcome to the F-Spot library import service.\n" "\n" @@ -1307,11 +1583,11 @@ msgstr "" "\n" "Silahkan pilih berkas basis data F-Spot." -#: plugins/shotwell-data-imports/FSpotImporter.vala:60 +#: plugins/shotwell-data-imports/FSpotImporter.vala:62 msgid "Manually select an F-Spot database file to import:" msgstr "Pilih manual basis data F-Spot untuk di impor:" -#: plugins/shotwell-data-imports/FSpotImporter.vala:62 +#: plugins/shotwell-data-imports/FSpotImporter.vala:64 msgid "" "Cannot open the selected F-Spot database file: the file does not exist or is " "not an F-Spot database" @@ -1319,7 +1595,7 @@ msgstr "" "Tidak dapat membuka berkas basis data F-Spot terpilih: berkas tidak ada atau " "bukan basis data F-Spot" -#: plugins/shotwell-data-imports/FSpotImporter.vala:64 +#: plugins/shotwell-data-imports/FSpotImporter.vala:66 msgid "" "Cannot open the selected F-Spot database file: this version of the F-Spot " "database is not supported by Shotwell" @@ -1327,14 +1603,14 @@ msgstr "" "Tidak dapat membuka berkas basis data F-Spot terpilih: versi basis data F-" "Spot ini tidak didukung oleh Shotwell" -#: plugins/shotwell-data-imports/FSpotImporter.vala:66 +#: plugins/shotwell-data-imports/FSpotImporter.vala:68 msgid "" "Cannot read the selected F-Spot database file: error while reading tags table" msgstr "" "Tidak dapat membaca berkas basis data F-Spot terpilih: kesalahan saat " "membaca tabel tag" -#: plugins/shotwell-data-imports/FSpotImporter.vala:68 +#: plugins/shotwell-data-imports/FSpotImporter.vala:70 msgid "" "Cannot read the selected F-Spot database file: error while reading photos " "table" @@ -1342,7 +1618,7 @@ msgstr "" "Tidak dapat membaca berkas basis data F-Spot terpilih: kesalahan saat " "membaca tabel foto" -#: plugins/shotwell-data-imports/FSpotImporter.vala:70 +#: plugins/shotwell-data-imports/FSpotImporter.vala:72 #, c-format msgid "" "Shotwell has found %d photos in the F-Spot library and is currently " @@ -1357,12 +1633,12 @@ msgstr "" "Anda dapat menutup dialog ini dan mulai menggunakan Shotwell saat proses " "impor berlangsung di belakang." -#: plugins/shotwell-data-imports/FSpotImporter.vala:84 +#: plugins/shotwell-data-imports/FSpotImporter.vala:86 #, c-format msgid "F-Spot library: %s" msgstr "Pustaka F-Spot: %s" -#: plugins/shotwell-data-imports/FSpotImporter.vala:422 +#: plugins/shotwell-data-imports/FSpotImporter.vala:424 msgid "Preparing to import" msgstr "Bersiap mengimpor" @@ -1370,94 +1646,93 @@ msgstr "Bersiap mengimpor" msgid "Core Data Import Services" msgstr "Servis Impor Data Inti" -#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:5 -#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125 -msgid "Go _Back" -msgstr "_Mundur" - -#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:8 -#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:145 -#: ui/shotwell.ui:1627 -msgid "_Login" -msgstr "_Login" - -#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:34 +#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28 msgid "_Gallery3 URL:" msgstr "URL _Gallery3:" -#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:64 +#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:55 msgid "_User name:" msgstr "Nama pengg_una:" -#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:79 +#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68 msgid "_Password:" msgstr "_Sandi:" -#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:178 +#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108 +msgid "Go _Back" +msgstr "_Mundur" + +#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125 +#: ui/shotwell.ui:1105 +msgid "_Log in" +msgstr "_Log masuk" + +#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154 msgid "API _Key:" msgstr "_Kunci API:" -#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:208 +#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180 msgid "or" msgstr "atau" -#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:5 -#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:38 -#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017 -#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:116 -#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:115 -#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:197 -#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:137 -#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:229 -#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99 -msgid "_Logout" -msgstr "_Keluar" - -#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:8 -#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:247 -#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016 -#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:134 -#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:129 -#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:212 -#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:153 -#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:243 -#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115 -msgid "_Publish" -msgstr "_Terbitkan" +#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34 +msgid "An _existing album" +msgstr "Album _yang ada" -#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:11 +#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:60 msgid "A _new album" msgstr "Sebuah album _baru" -#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:17 -msgid "An _existing album" -msgstr "Album _yang ada" - -#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:22 +#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86 msgid "_Remove location, tag and camera-identifying data before uploading" msgstr "" "Hapus lokasi, tag, dan data pengidentifikasian kameda sebelum mengunggah" -#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:135 +#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108 msgid "Scaling constraint:" msgstr "Kendala penskalaan:" -#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:153 +#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124 msgid "pixels" msgstr "piksel" -#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195 -#: plugins/shotwell-publishing/FlickrPublishing.vala:1236 -#: plugins/shotwell-publishing/PiwigoPublishing.vala:1237 +#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158 +#: plugins/shotwell-publishing/FlickrPublishing.vala:880 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1306 #: src/Dimensions.vala:17 msgid "Original size" msgstr "Ukuran asal" -#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:196 +#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159 #: src/Dimensions.vala:20 msgid "Width or height" msgstr "Lebar atau tinggi" +#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:203 +#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:39 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1019 +#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:105 +#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:145 +#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:177 +#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:125 +#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:142 +#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99 +msgid "_Logout" +msgstr "_Keluar" + +#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:216 +#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:220 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018 +#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:121 +#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159 +#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:192 +#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:141 +#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:156 +#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115 +#: src/CollectionPage.vala:82 src/PhotoPage.vala:2469 +msgid "_Publish" +msgstr "_Terbitkan" + #: plugins/shotwell-publishing-extras/GalleryConnector.vala:41 msgid "Gallery3 publishing module" msgstr "Modul publikasi Gallery3" @@ -1482,13 +1757,13 @@ msgstr "Direktori baku Shotwell" msgid "" "\n" "\n" -"The file \"%s\" may not be supported by or may be too large for this " -"instance of Gallery3." +"The file “%s” may not be supported by or may be too large for this instance " +"of Gallery3." msgstr "" "\n" "\n" -"Berkas \"%s\" mungkin tak didukung atau mungkin terlalu besar bagi instansi " -"Gallery3 ini." +"Berkas \"%s\" mungkin tidak didukung atau mungkin terlalu besar bagi " +"instansi Gallery3 ini." #: plugins/shotwell-publishing-extras/GalleryConnector.vala:802 msgid "" @@ -1499,24 +1774,24 @@ msgstr "" "Perhatikan bahwa Gallery3 hanya mendukung tipe video yang didukung oleh " "Flowplayer." -#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1022 -#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1775 +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1021 +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773 #, c-format msgid "" -"A file required for publishing is unavailable. Publishing to %s can't " +"A file required for publishing is unavailable. Publishing to %s can’t " "continue." msgstr "" -"Sebuah berkas yang diperlukan untuk penerbitan tidak tersedia. Tak dapat " -"lanjutkan menerbitkan ke %s." +"Sebuah berkas yang diperlukan untuk penerbitan tidak tersedia. Tak bisa " +"melanjutkan menerbitkan ke %s." #. populate any widgets whose contents are #. programmatically-generated -#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1551 +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1550 #, c-format msgid "Publishing to %s as %s." msgstr "Menerbitkan ke %s sebagai %s." -#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1819 +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1817 msgid "" "Enter the URL for your Gallery3 site and the username and password (or API " "key) for your Gallery3 account." @@ -1524,7 +1799,7 @@ msgstr "" "Masukkan URL untuk situs Gallery3 dan nama pengguna serta sandi (atau kunci " "API) bagi akun Gallery3 Anda." -#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1820 +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1818 msgid "" "The username and password or API key were incorrect. To try again, re-enter " "your username and password below." @@ -1532,7 +1807,7 @@ msgstr "" "Nama pengguna dan sandi atau kunci API salah. Untuk mencoba lagi, masukkan " "lagi nama pengguna dan sandi di bawah." -#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1821 +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1819 msgid "" "The URL entered does not appear to be the main directory of a Gallery3 " "instance. Please make sure you typed it correctly and it does not have any " @@ -1542,164 +1817,161 @@ msgstr "" "Gallery3. Harap pastikan bahwa Anda mengetikkannya dengan benar dan itu tak " "memiliki sebarang komponen ekor (mis., index.php)." -#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1874 +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1872 msgid "Unrecognized User" msgstr "Pengguna Tak Dikenal" -#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1879 +#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1877 msgid " Site Not Found" msgstr "Situs Tak Ditemukan" -#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:49 -#: plugins/shotwell-publishing-extras/RajcePublishing.vala:890 -#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:49 +#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892 +#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42 msgid "_Email address" msgstr "_Alamat Email" -#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:59 -#: plugins/shotwell-publishing-extras/RajcePublishing.vala:891 -#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:59 -#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:73 +#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893 +#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:82 +#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119 msgid "_Password" msgstr "_Kata Sandi" -#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:103 -#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892 +#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:894 msgid "_Remember" msgstr "_Ingat" -#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:125 -#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893 -#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:107 -#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:151 -msgid "Login" -msgstr "Masuk" +#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895 +#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104 +#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154 +msgid "Log in" +msgstr "Log masuk" -#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:111 -#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013 -#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:75 +#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015 msgid "An _existing album:" msgstr "Album _yang ada:" -#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:135 -#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014 -#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:94 -#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:52 +#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:123 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016 msgid "A _new album named:" msgstr "Nama album _baru:" -#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:159 -#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1004 +#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:141 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1006 msgid "_Hide album" msgstr "Sembuny_ikan album" -#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:178 -#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015 +#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:156 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017 msgid "Open target _album in browser" msgstr "Buka _album target dalam peramban" -#: plugins/shotwell-publishing-extras/RajcePublishing.vala:38 -msgid "Copyright (C) 2013 rajce.net" -msgstr "Hak Cipta (C) 2013 rajce.net" +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:40 +msgid "Copyright © 2013 rajce.net" +msgstr "Hak Cipta © 2013 rajce.net" -#: plugins/shotwell-publishing-extras/RajcePublishing.vala:742 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:744 msgid "An error message occurred when publishing to Rajce. Please try again." msgstr "" "Terjadi pesan kesalahan ketika mempublikasikan ke Rajce. Harap coba lagi." -#: plugins/shotwell-publishing-extras/RajcePublishing.vala:831 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:833 msgid "Enter email and password associated with your Rajce account." msgstr "" "Masukkan nama pengguna dan sandi yang berhubungan dengan akun Rajce Anda." -#: plugins/shotwell-publishing-extras/RajcePublishing.vala:832 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:834 msgid "Invalid email and/or password. Please try again" msgstr "Surel dan/atau sandi tak valid. Harap coba lagi" -#: plugins/shotwell-publishing-extras/RajcePublishing.vala:863 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:865 msgid "Invalid User Email or Password" msgstr "Sandi atau Surel Pengguna Tak Valid" -#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1011 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013 #, c-format msgid "You are logged into Rajce as %s." msgstr "Anda masuk ke Rajce sebagai %s." -#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1012 -#: plugins/shotwell-publishing/PicasaPublishing.vala:670 -#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:24 +#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014 +#: plugins/shotwell-publishing/PicasaPublishing.vala:571 +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:20 msgid "Photos will appear in:" msgstr "Foto akan muncul di:" -#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20 +#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31 msgid "Shotwell Extra Publishing Services" msgstr "Layanan Penerbit Ekstra Shotwell" -#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:43 +#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44 msgid "Blogs:" msgstr "Blog:" -#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:60 +#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61 msgid "Photo _size:" msgstr "Ukuran _foto:" -#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:34 +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36 msgid "Copyright 2012 BJA Electronics" msgstr "Hak Cipta 2012 BJA Electronics" -#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:103 -#: plugins/shotwell-publishing/FlickrPublishing.vala:1232 -#: plugins/shotwell-publishing/PiwigoPublishing.vala:1233 -msgid "500 x 375 pixels" +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105 +#: plugins/shotwell-publishing/FlickrPublishing.vala:876 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302 +msgid "500 × 375 pixels" msgstr "500 x 375 piksel" -#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:104 -#: plugins/shotwell-publishing/FlickrPublishing.vala:1233 -#: plugins/shotwell-publishing/PiwigoPublishing.vala:1234 -msgid "1024 x 768 pixels" +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106 +#: plugins/shotwell-publishing/FlickrPublishing.vala:877 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303 +msgid "1024 × 768 pixels" msgstr "1024 x 768 piksel" -#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105 -msgid "1280 x 853 pixels" +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107 +msgid "1280 × 853 pixels" msgstr "1280 x 853 piksel" -#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:309 -#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:319 +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:311 +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:321 #, c-format -msgid "'%s' isn't a valid response to an OAuth authentication request" -msgstr "'%s' permintaan otentikasi OAuth ke yang tidak valid" +msgid "“%s” isn’t a valid response to an OAuth authentication request" +msgstr "\"%s\" bukan jawaban yang valid ke permintaan otentikasi OAuth" -#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:557 +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559 msgid "" -"TumblrPublisher: start( ): can't start; this publisher is not restartable." +"TumblrPublisher: start( ): can’t start; this publisher is not restartable." msgstr "" -"TumblrPublisher: start(): tidak dapat memulai, penerbit ini tidak " -"restartable." +"TumblrPublisher: start(): tak bisa memulai, penerbit ini tidak bisa di-start " +"ulang." -#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:585 +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587 msgid "Enter the username and password associated with your Tumblr account." msgstr "" "Masukkan nama pengguna dan kata sandi yang berhubungan dengan akun Tumblr " "anda." -#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:586 -#: plugins/shotwell-publishing/PiwigoPublishing.vala:989 +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081 msgid "Username and/or password invalid. Please try again" msgstr "Nama pengguna dan/atau kata sandi tak valid. Harap coba lagi" -#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:616 -#: plugins/shotwell-publishing/PiwigoPublishing.vala:1026 +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117 msgid "Invalid User Name or Password" msgstr "Nama Pengguna atau Kata Sandi Tak Valid" #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635 -#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:754 +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753 #, c-format msgid "Could not load UI: %s" msgstr "Tidak dapat membuka UI: %s" -#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:736 +#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735 #, c-format msgid "" "You are logged into Tumblr as %s.\n" @@ -1716,125 +1988,93 @@ msgstr "Hak Cipta 2010+ Evgeniy Polyakov <zbr@ioremap.net>" msgid "Visit the Yandex.Fotki web site" msgstr "Kunjungi situs Yandex.Fotki" -#: plugins/shotwell-publishing-extras/YandexPublishing.vala:659 +#: plugins/shotwell-publishing-extras/YandexPublishing.vala:609 msgid "You are not currently logged into Yandex.Fotki." msgstr "Anda belum masuk ke Yandex.Fotki." -#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:24 +#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:12 +msgid "Public" +msgstr "Publik" + +#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15 +#: plugins/shotwell-publishing/FacebookPublishing.vala:888 +msgid "Friends" +msgstr "Teman" + +#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18 +#: plugins/shotwell-publishing/YouTubePublishing.vala:378 +msgid "Private" +msgstr "Privat" + +#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:47 msgid "_Albums (or write new):" msgstr "_Album (atau tulis baru):" -#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:38 +#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85 msgid "Access _type:" msgstr "Jenis _akses:" -#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:81 +#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106 msgid "Disable _comments" msgstr "Nonaktifkan _komentar" -#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:96 +#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:123 msgid "_Forbid downloading original photo" msgstr "_Dilarang mengunduh foto asli" -#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159 -msgid "Public" -msgstr "Publik" - -#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:162 -#: plugins/shotwell-publishing/FacebookPublishing.vala:1194 -msgid "Friends" -msgstr "Teman" - -#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:165 -#: plugins/shotwell-publishing/YouTubePublishing.vala:497 -msgid "Private" -msgstr "Privat" - -#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:39 +#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:42 msgid "Publish to an e_xisting album:" msgstr "Terbitkan ke album yang _sudah ada:" -#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:57 +#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:58 msgid "Create a _new album named:" msgstr "Buat album baru dengan _nama:" -#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:108 -#: plugins/shotwell-publishing/FacebookPublishing.vala:1034 +#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100 +#: plugins/shotwell-publishing/FacebookPublishing.vala:725 msgid "Upload _size:" -msgstr "U_kuran unggah" +msgstr "U_kuran unggah:" -#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:139 +#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:125 msgid "Videos and new photo albums _visible to:" msgstr "_Video dan album foto baru tampak ke:" -#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:175 -#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:102 -#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:178 -#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:226 +#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:155 +#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:92 +#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:59 +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203 msgid "" "_Remove location, camera, and other identifying information before uploading" msgstr "" "Hapus lokasi, kame_ra, dan informasi pengidentifikasi lain sebelum mengunggah" #: plugins/shotwell-publishing/FacebookPublishing.vala:61 -#: plugins/shotwell-publishing/PicasaPublishing.vala:59 -#: plugins/shotwell-publishing/PiwigoPublishing.vala:1114 +#: plugins/shotwell-publishing/PicasaPublishing.vala:58 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1188 msgid "Shotwell Connect" msgstr "Kiriman dari Shotwell" -#: plugins/shotwell-publishing/FacebookPublishing.vala:63 -msgid "" -"You are not currently logged into Facebook.\n" -"\n" -"If you don't yet have a Facebook account, you can create one during the " -"login process. During login, Shotwell Connect may ask you for permission to " -"upload photos and publish to your feed. These permissions are required for " -"Shotwell Connect to function." -msgstr "" -"Anda belum terhubung ke Facebook.\n" -"\n" -"Jika belum memiliki akun Facebook, Anda dapat membuatnya nanti saat login. " -"Saat login, Shotwell akan menanyakan hak unggah dan hak penerbitan berita. " -"Hak-hak tersebut diperlukan oleh Shotwell." - -#: plugins/shotwell-publishing/FacebookPublishing.vala:65 -msgid "" -"You have already logged in and out of Facebook during this Shotwell " -"session.\n" -"To continue publishing to Facebook, quit and restart Shotwell, then try " -"publishing again." -msgstr "" -"Selama menggunakan Shotwell tadi, Anda sudah keluar dan masuk dari " -"Facebook.\n" -"Untuk dapat mengirim foto ke Facebook, silakan keluar dan jalankan Shotwell " -"kembali, kemudian ulangi proses pengiriman." - -#: plugins/shotwell-publishing/FacebookPublishing.vala:86 +#: plugins/shotwell-publishing/FacebookPublishing.vala:81 msgid "Standard (720 pixels)" msgstr "Standar (720 piksel)" -#: plugins/shotwell-publishing/FacebookPublishing.vala:89 +#: plugins/shotwell-publishing/FacebookPublishing.vala:84 msgid "Large (2048 pixels)" msgstr "Besar (2048 piksel)" -#: plugins/shotwell-publishing/FacebookPublishing.vala:254 -msgid "Testing connection to Facebook..." -msgstr "Mencoba koneksi ke Facebook..." - -#: plugins/shotwell-publishing/FacebookPublishing.vala:347 -#: plugins/shotwell-publishing/PicasaPublishing.vala:379 -msgid "Creating album..." -msgstr "Membuat album..." +#: plugins/shotwell-publishing/FacebookPublishing.vala:314 +msgid "Creating album…" +msgstr "Membuat album…" -#: plugins/shotwell-publishing/FacebookPublishing.vala:374 +#: plugins/shotwell-publishing/FacebookPublishing.vala:340 msgid "" -"A file required for publishing is unavailable. Publishing to Facebook can't " +"A file required for publishing is unavailable. Publishing to Facebook can’t " "continue." msgstr "" -"Berkas penting untuk penerbitan tidak tersedia. Gagal menerbitkan ke " -"Facebook." +"Berkas yang diperlukan untuk penerbitan tidak tersedia. Tak bisa lanjutkan " +"menerbitkan ke Facebook." -#: plugins/shotwell-publishing/FacebookPublishing.vala:1032 +#: plugins/shotwell-publishing/FacebookPublishing.vala:723 #, c-format msgid "" "You are logged into Facebook as %s.\n" @@ -1843,76 +2083,22 @@ msgstr "" "Anda terhubung ke Facebook sebagai %s.\n" "\n" -#: plugins/shotwell-publishing/FacebookPublishing.vala:1033 +#: plugins/shotwell-publishing/FacebookPublishing.vala:724 msgid "Where would you like to publish the selected photos?" msgstr "Kirim foto ke mana?" -#: plugins/shotwell-publishing/FacebookPublishing.vala:1193 -#: plugins/shotwell-publishing/FlickrPublishing.vala:1214 +#: plugins/shotwell-publishing/FacebookPublishing.vala:887 +#: plugins/shotwell-publishing/FlickrPublishing.vala:858 msgid "Just me" msgstr "Saya sendiri saja" -#: plugins/shotwell-publishing/FacebookPublishing.vala:1195 -#: plugins/shotwell-publishing/FlickrPublishing.vala:1210 -#: plugins/shotwell-publishing/PiwigoPublishing.vala:1221 +#: plugins/shotwell-publishing/FacebookPublishing.vala:889 +#: plugins/shotwell-publishing/FlickrPublishing.vala:854 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1290 msgid "Everyone" msgstr "Semua orang" -#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:16 -msgid "" -"Enter the confirmation number which appears after you log into Flickr in " -"your Web browser." -msgstr "" -"Masukkan nomor konfirmasi yang muncul setelah Anda log masuk ke Flickr dalam " -"peramban Web Anda." - -#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:37 -msgid "Authorization _Number:" -msgstr "_Nomor Otorisasi:" - -#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83 src/Dialogs.vala:131 -msgid "Con_tinue" -msgstr "Lanju_tkan" - -#: plugins/shotwell-publishing/FlickrPublishing.vala:61 -msgid "" -"You are not currently logged into Flickr.\n" -"\n" -"Click Login to log into Flickr in your Web browser. You will have to " -"authorize Shotwell Connect to link to your Flickr account." -msgstr "" -"Anda masih belum masuk ke Flickr.\n" -"\n" -"Klik Masuk untuk masuk ke Flickr pada peramban Web anda. Anda diharuskan " -"memberikan izin Shotwell menyambungkan ke akun Flickr anda." - -#: plugins/shotwell-publishing/FlickrPublishing.vala:63 -msgid "" -"You have already logged in and out of Flickr during this Shotwell session.\n" -"To continue publishing to Flickr, quit and restart Shotwell, then try " -"publishing again." -msgstr "" -"Saat menggunakan Shotwell tadi, Anda sudah keluar dan masuk dari Flickr.\n" -"Untuk dapat mengirim foto ke Facebook, silakan keluar dan jalankan Shotwell " -"kembali, kemudian ulangi proses pengiriman." - -#: plugins/shotwell-publishing/FlickrPublishing.vala:375 -msgid "Preparing for login..." -msgstr "Bersiap untuk login..." - -#: plugins/shotwell-publishing/FlickrPublishing.vala:444 -#: plugins/shotwell-publishing/FlickrPublishing.vala:595 -msgid "" -"A file required for publishing is unavailable. Publishing to Flickr can't " -"continue." -msgstr "" -"Berkas penting untuk penerbitan tidak tersedia. Gagal menerbitkan ke Flickr." - -#: plugins/shotwell-publishing/FlickrPublishing.vala:457 -msgid "Verifying authorization..." -msgstr "Verifikasi wewenang..." - -#: plugins/shotwell-publishing/FlickrPublishing.vala:1153 +#: plugins/shotwell-publishing/FlickrPublishing.vala:800 #, c-format msgid "" "You are logged into Flickr as %s.\n" @@ -1921,175 +2107,191 @@ msgstr "" "Anda sudah login ke Flickr atas nama %s.\n" "\n" -#: plugins/shotwell-publishing/FlickrPublishing.vala:1156 +#: plugins/shotwell-publishing/FlickrPublishing.vala:802 #, c-format msgid "" "Your free Flickr account limits how much data you can upload per month.\n" -"This month you have %d megabyte remaining in your upload quota." -msgid_plural "" -"Your free Flickr account limits how much data you can upload per month.\n" -"This month you have %d megabytes remaining in your upload quota." -msgstr[0] "" +"This month you have %s remaining in your upload quota." +msgstr "" "Akun Flickr gratis Anda membatasi besarnya data yang dapat Anda kirim per " "bulan.\n" -"Bulan ini, Anda punya sisa jatah kuota unggah %d megabyte." +"Bulan ini Anda punya sisa jatah kuota unggah %s." -#: plugins/shotwell-publishing/FlickrPublishing.vala:1160 +#: plugins/shotwell-publishing/FlickrPublishing.vala:804 msgid "Your Flickr Pro account entitles you to unlimited uploads." msgstr "Anda memiliki akun Flickr Pro yang tidak memiliki batas pengiriman." -#: plugins/shotwell-publishing/FlickrPublishing.vala:1165 +#: plugins/shotwell-publishing/FlickrPublishing.vala:809 msgid "Photos _visible to:" msgstr "Foto ini dapat _dilihat oleh:" -#: plugins/shotwell-publishing/FlickrPublishing.vala:1167 +#: plugins/shotwell-publishing/FlickrPublishing.vala:811 msgid "Videos _visible to:" msgstr "Video ini dapat _dilihat oleh:" -#: plugins/shotwell-publishing/FlickrPublishing.vala:1170 +#: plugins/shotwell-publishing/FlickrPublishing.vala:814 msgid "Photos and videos _visible to:" msgstr "Foto dan video ini dapat _dilihat oleh:" -#: plugins/shotwell-publishing/FlickrPublishing.vala:1211 +#: plugins/shotwell-publishing/FlickrPublishing.vala:855 msgid "Friends & family only" msgstr "Teman dan keluarga saja" -#: plugins/shotwell-publishing/FlickrPublishing.vala:1212 +#: plugins/shotwell-publishing/FlickrPublishing.vala:856 msgid "Family only" msgstr "Hanya keluarga" -#: plugins/shotwell-publishing/FlickrPublishing.vala:1213 +#: plugins/shotwell-publishing/FlickrPublishing.vala:857 msgid "Friends only" msgstr "Hanya teman" -#: plugins/shotwell-publishing/FlickrPublishing.vala:1234 -#: plugins/shotwell-publishing/PiwigoPublishing.vala:1235 -msgid "2048 x 1536 pixels" +#: plugins/shotwell-publishing/FlickrPublishing.vala:878 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1304 +msgid "2048 × 1536 pixels" msgstr "2048 x 1536 piksel" -#: plugins/shotwell-publishing/FlickrPublishing.vala:1235 -#: plugins/shotwell-publishing/PiwigoPublishing.vala:1236 -msgid "4096 x 3072 pixels" +#: plugins/shotwell-publishing/FlickrPublishing.vala:879 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1305 +msgid "4096 × 3072 pixels" msgstr "4096 x 3072 piksel" -#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:113 -msgid "L_ist album in public gallery" -msgstr "Daftarkan album dalam galeri publ_ik" - -#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:150 +#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:93 msgid "Photo _size preset:" msgstr "Pratata uku_ran foto:" -#: plugins/shotwell-publishing/PicasaPublishing.vala:58 -msgid "" -"You are not currently logged into Picasa Web Albums.\n" -"\n" -"Click Login to log into Picasa Web Albums in your Web browser. You will have " -"to authorize Shotwell Connect to link to your Picasa Web Albums account." -msgstr "" -"Kamu belum masuk ke Album Web Picasa.\n" -"\n" -"Klik Login untuk masuk ke Album Web Picasa lewat Peramban Web. Kamu perlu " -"memberi wewenang Shotwell Connect menyambung ke akun Album Web Picasa mu." +#. Add album that will push to the default feed for all the new users +#. Activate last known album id. If none was chosen, either use the old default (Shotwell connect) +#. or the new "Default album" album for Google Photos +#: plugins/shotwell-publishing/PicasaPublishing.vala:96 +#: plugins/shotwell-publishing/PicasaPublishing.vala:630 +msgid "Default album" +msgstr "Album baku" -#: plugins/shotwell-publishing/PicasaPublishing.vala:361 +#: plugins/shotwell-publishing/PicasaPublishing.vala:291 msgid "" -"A file required for publishing is unavailable. Publishing to Picasa can't " +"A file required for publishing is unavailable. Publishing to Picasa can’t " "continue." msgstr "" -"Berkas penting untuk penerbitan tidak tersedia. Gagal menerbitkan ke Picasa." +"Berkas penting untuk penerbitan tidak tersedia. Penerbitan ke Picasa tak " +"bisa dilanjutkan." #. populate any widgets whose contents are programmatically-generated. -#: plugins/shotwell-publishing/PicasaPublishing.vala:659 +#: plugins/shotwell-publishing/PicasaPublishing.vala:560 #, c-format msgid "You are logged into Picasa Web Albums as %s." msgstr "Anda sudah masuk ke Album Web Picasa atas nama %s." -#: plugins/shotwell-publishing/PicasaPublishing.vala:665 +#: plugins/shotwell-publishing/PicasaPublishing.vala:566 msgid "Videos will appear in:" msgstr "Video akan muncul di:" -#: plugins/shotwell-publishing/PicasaPublishing.vala:746 -msgid "Small (640 x 480 pixels)" +#: plugins/shotwell-publishing/PicasaPublishing.vala:610 +msgid "Small (640 × 480 pixels)" msgstr "Kecil (640 x 480 piksel)" -#: plugins/shotwell-publishing/PicasaPublishing.vala:747 -msgid "Medium (1024 x 768 pixels)" +#: plugins/shotwell-publishing/PicasaPublishing.vala:611 +msgid "Medium (1024 × 768 pixels)" msgstr "Sedang (1024 x 768 piksel)" -#: plugins/shotwell-publishing/PicasaPublishing.vala:748 -msgid "Recommended (1600 x 1200 pixels)" -msgstr "Ideal (1600 x 1200 piksel)" +#: plugins/shotwell-publishing/PicasaPublishing.vala:612 +msgid "Recommended (1600 × 1200 pixels)" +msgstr "Disarankan (1600 x 1200 piksel)" -#: plugins/shotwell-publishing/PicasaPublishing.vala:749 -msgid "Google+ (2048 x 1536 pixels)" +#: plugins/shotwell-publishing/PicasaPublishing.vala:613 +msgid "Google+ (2048 × 1536 pixels)" msgstr "Google+ (2048 x 1536 pixel)" -#: plugins/shotwell-publishing/PicasaPublishing.vala:750 -#: src/editing_tools/EditingTools.vala:756 +#: plugins/shotwell-publishing/PicasaPublishing.vala:614 +#: src/editing_tools/EditingTools.vala:757 msgid "Original Size" msgstr "Ukuran Asli" -#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:49 +#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:44 msgid "_URL of your Piwigo photo library" msgstr "_URL dari pustaka gambar Piwigo Anda" -#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:59 +#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:94 msgid "User _name" msgstr "_Nama pengguna" -#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:130 -msgid "_Remember Password" -msgstr "_Ingat Sandi" +#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133 +msgid "Remember Password" +msgstr "Ingat Sandi" -#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:40 -msgid "An _existing category:" -msgstr "Direktori yang _ada:" +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36 +msgid "An _existing category" +msgstr "Kat_egori yang ada" -#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:121 -msgid "Photos will be _visible by:" -msgstr "Gambar akan bisa _dilihat oleh:" +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110 +msgid "A _new album named" +msgstr "Album _baru dinamai" -#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:149 -msgid "Photo size:" -msgstr "Ukuran foto:" +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142 +msgid "within category" +msgstr "dalam kategori" -#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:176 -msgid "within category:" -msgstr "dalam kategori:" +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155 +msgid "Album comment" +msgstr "Komentar album" -#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:210 -msgid "Album comment:" -msgstr "Komentar album:" +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167 +msgid "Photos will be _visible by" +msgstr "Foto akan _tampak oleh" -#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:242 +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181 +msgid "Photo size" +msgstr "Ukuran foto" + +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:219 msgid "_If a title is set and comment unset, use title as comment" msgstr "B_ila judul diatur dan komentar kosong, pakai judul sebagai komentar" -#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:258 +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:235 msgid "_Do no upload tags" msgstr "_Jangan unggah tag" -#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:278 +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:255 msgid "Logout" msgstr "Catat keluar" -#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:291 -#: src/Resources.vala:295 +#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268 +#: src/Resources.vala:296 ui/collection.ui:192 msgid "Publish" msgstr "Kirim" -#: plugins/shotwell-publishing/PiwigoPublishing.vala:746 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:773 #, c-format -msgid "Creating album %s..." -msgstr "Membuat akbum %s..." +msgid "Creating album %s…" +msgstr "Membuat album %s…" -#: plugins/shotwell-publishing/PiwigoPublishing.vala:917 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:946 msgid "An error message occurred when publishing to Piwigo. Please try again." msgstr "" "Terjadi pesan kesalahan ketika mempublikasikan ke Piwigo. Harap coba lagi." -#: plugins/shotwell-publishing/PiwigoPublishing.vala:987 +#. %s is the host name that we tried to connect to +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1030 +#, c-format +msgid "" +"This does not look like the real <b>%s</b>. Attackers might be trying to " +"steal or alter information going to or from this site (for example, private " +"messages, credit card information, or passwords)." +msgstr "" +"Ini sepertinya bukan <b>%s</b> yang sebenarnya. Penyerang mungkin mencoba " +"mencuri atau mengubah informasi menuju atau berasal dari situs ini (sebagai " +"contoh, pesan pribadi, informasi kartu kredit, atau kata sandi)." + +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1048 +#, c-format +msgid "Certificate of %s" +msgstr "Sertifikat dari %s" + +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1051 +#: src/Resources.vala:167 +msgid "_OK" +msgstr "_OK" + +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1079 msgid "" "Enter the URL of your Piwigo photo library as well as the username and " "password associated with your Piwigo account for that library." @@ -2097,7 +2299,7 @@ msgstr "" "Masukkan URL pustaka foto Piwigo mu beserta username dan password akun " "Piwigo untuk pustaka tersebut." -#: plugins/shotwell-publishing/PiwigoPublishing.vala:988 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1080 msgid "" "Shotwell cannot contact your Piwigo photo library. Please verify the URL you " "entered" @@ -2105,27 +2307,39 @@ msgstr "" "Shotwell tidak bisa menghubungi pustaka foto Piwigo. Harap periksa kembali " "URL yang kamu masukkan" -#: plugins/shotwell-publishing/PiwigoPublishing.vala:1021 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1112 msgid "Invalid URL" msgstr "URL tidak sah" -#: plugins/shotwell-publishing/PiwigoPublishing.vala:1222 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1291 msgid "Admins, Family, Friends, Contacts" msgstr "Admin, Keluarga, Teman, Kontak" -#: plugins/shotwell-publishing/PiwigoPublishing.vala:1223 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1292 msgid "Admins, Family, Friends" msgstr "Admin, Keluarga, Teman" -#: plugins/shotwell-publishing/PiwigoPublishing.vala:1224 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1293 msgid "Admins, Family" msgstr "Admin, Keluarga" -#: plugins/shotwell-publishing/PiwigoPublishing.vala:1225 +#: plugins/shotwell-publishing/PiwigoPublishing.vala:1294 msgid "Admins" msgstr "Admin" -#: plugins/shotwell-publishing/shotwell-publishing.vala:26 +#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:21 +msgid "This connection is not secure" +msgstr "Koneksi ini tidak aman" + +#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:75 +msgid "Show the certificate…" +msgstr "Tampilkan sertifikat…" + +#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:88 +msgid "I understand, please _proceed." +msgstr "Saya _paham, harap lanjutkan." + +#: plugins/shotwell-publishing/shotwell-publishing.vala:55 msgid "Core Publishing Services" msgstr "Layanan Penerbit Utama" @@ -2133,40 +2347,24 @@ msgstr "Layanan Penerbit Utama" msgid "Video privacy _setting:" msgstr "Pengaturan priva_si video:" -#: plugins/shotwell-publishing/YouTubePublishing.vala:57 +#: plugins/shotwell-publishing/YouTubePublishing.vala:236 msgid "" -"You are not currently logged into YouTube.\n" -"\n" -"You must have already signed up for a Google account and set it up for use " -"with YouTube to continue. You can set up most accounts by using your browser " -"to log into the YouTube site at least once." -msgstr "" -"Anda tidak terhubung ke YouTube.\n" -"\n" -"Anda harus memiliki akun Google/YouTube untuk melanjutkan." - -#: plugins/shotwell-publishing/YouTubePublishing.vala:362 -msgid "" -"A file required for publishing is unavailable. Publishing to Youtube can't " +"A file required for publishing is unavailable. Publishing to YouTube can’t " "continue." msgstr "" -"Berkas penting untuk penerbitan tidak tersedia. Gagal menerbitkan ke Youtube." +"Berkas penting untuk penerbitan tidak tersedia. Penerbitan ke YouTube tak " +"bisa dilanjutkan." -#: plugins/shotwell-publishing/YouTubePublishing.vala:461 +#: plugins/shotwell-publishing/YouTubePublishing.vala:344 #, c-format msgid "You are logged into YouTube as %s." -msgstr "Anda terhubung ke YouTube sebagai %s" +msgstr "Anda log masuk ke YouTube sebagai %s." -#: plugins/shotwell-publishing/YouTubePublishing.vala:463 -#, c-format -msgid "Videos will appear in '%s'" -msgstr "Video akan tampil dalam '%s'" - -#: plugins/shotwell-publishing/YouTubePublishing.vala:495 +#: plugins/shotwell-publishing/YouTubePublishing.vala:376 msgid "Public listed" msgstr "Publik terdaftar" -#: plugins/shotwell-publishing/YouTubePublishing.vala:496 +#: plugins/shotwell-publishing/YouTubePublishing.vala:377 msgid "Public unlisted" msgstr "Publik tak terdaftar" @@ -2202,13 +2400,13 @@ msgstr "Kabur" msgid "Core Slideshow Transitions" msgstr "Peralihan Salindia Utama" -#: plugins/shotwell-transitions/shotwell-transitions.vala:75 -#, fuzzy -#| msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation" +#: plugins/shotwell-transitions/shotwell-transitions.vala:76 msgid "" "Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy " "Inc." -msgstr "Hak Cipta 2010 Maxim Kartashev, Hak Cipta 2011-2015 Yorba Foundation" +msgstr "" +"Hak Cipta 2010 Maxim Kartashev, Hak Cipta 2016 Software Freedom Conservancy " +"Inc." #: plugins/shotwell-transitions/SlideEffect.vala:20 msgid "Slide" @@ -2250,75 +2448,68 @@ msgstr "Gagal membuat direktori data %s: %s" #: src/AppDirs.vala:236 #, c-format msgid "Could not make directory %s writable" -msgstr "" +msgstr "Tidak bisa membuat direktori %s dapat ditulisi" #: src/AppDirs.vala:239 -#, fuzzy, c-format -#| msgid "Unable to create cache directory %s: %s" +#, c-format msgid "Could not make directory %s writable: %s" -msgstr "Gagal membuat direktori cache %s: %s" +msgstr "Tidak bisa membuat direktori %s dapat ditulisi: %s" -#: src/AppWindow.vala:54 +#: src/AppWindow.vala:47 msgid "Pin Toolbar" msgstr "Semat Batang Alat" -#: src/AppWindow.vala:55 +#: src/AppWindow.vala:48 msgid "Pin the toolbar open" msgstr "Sematkan batang alat terbuka" -#: src/AppWindow.vala:60 +#: src/AppWindow.vala:53 msgid "Leave fullscreen" msgstr "Tinggalkan layar penuh" -#: src/AppWindow.vala:496 -msgid "_Contents" -msgstr "Daftar _Isi" - -#: src/AppWindow.vala:501 -msgid "_Frequently Asked Questions" -msgstr "_Pertanyaan Sering Ditanyakan" - -#: src/AppWindow.vala:506 -msgid "_Report a Problem..." -msgstr "Lapo_r Masalah..." - -#: src/AppWindow.vala:605 src/AppWindow.vala:626 src/AppWindow.vala:643 -#: src/data_imports/DataImportsUI.vala:413 src/Dialogs.vala:20 -#: src/Dialogs.vala:28 src/Dialogs.vala:1424 src/Dialogs.vala:1447 -#: src/publishing/PublishingUI.vala:512 src/Resources.vala:157 +#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569 +#: src/data_imports/DataImportsUI.vala:301 +#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20 +#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443 +#: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525 +#: src/Resources.vala:158 msgid "_Cancel" msgstr "_Batal" -#: src/AppWindow.vala:653 +#: src/AppWindow.vala:579 #, c-format msgid "" -"A fatal error occurred when accessing Shotwell's library. Shotwell cannot " +"A fatal error occurred when accessing Shotwell’s library. Shotwell cannot " "continue.\n" "\n" "%s" msgstr "" -"Ada kesalahan yang fatal saat mengakses pustaka Shotwell. Terpaksa tidak " +"Terjadi kesalahan yang fatal saat mengakses pustaka Shotwell. Shotwell tidak " "dapat dilanjutkan.\n" "\n" "%s" -#: src/AppWindow.vala:673 -#, fuzzy -#| msgid "Visit the Shotwell home page" +#. translators: %s will be replaced by application version +#: src/AppWindow.vala:596 +#, c-format +msgid "%s – “Aachen”" +msgstr "%s – \"Aachen\"" + +#: src/AppWindow.vala:601 msgid "Visit the Shotwell web site" -msgstr "Kunjungi laman serambi Shotwell" +msgstr "Kunjungi situs web Shotwell" -#: src/AppWindow.vala:685 +#: src/AppWindow.vala:614 #, c-format msgid "Unable to display help: %s" msgstr "Pedoman penggunaan tidak dapat ditampilkan: %s" -#: src/AppWindow.vala:693 +#: src/AppWindow.vala:622 #, c-format msgid "Unable to navigate to bug database: %s" msgstr "Gagal menavigasi basis data bug: %s" -#: src/AppWindow.vala:701 +#: src/AppWindow.vala:630 #, c-format msgid "Unable to display FAQ: %s" msgstr "Gagal menampilkan FAQ: %s" @@ -2388,95 +2579,81 @@ msgstr "Impor yang gagal (%d)" msgid "Cameras" msgstr "Kamera" -#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:710 -#: src/camera/ImportPage.vala:726 src/MediaPage.vala:440 -#: src/photos/RawSupport.vala:303 +#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718 +#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316 +#: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361 +#: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361 msgid "Camera" msgstr "Kamera" -#: src/camera/ImportPage.vala:311 src/Properties.vala:227 +#: src/camera/ImportPage.vala:311 src/Properties.vala:230 msgid "RAW+JPEG" msgstr "RAW+JPEG" -#: src/camera/ImportPage.vala:458 +#: src/camera/ImportPage.vala:466 msgid "" -"Unable to unmount camera. Try unmounting the camera from the file manager." +"Unable to unmount camera. Try unmounting the camera from the file manager." msgstr "" "Kamera tidak dapat dilepas. Silakan lepas melalui program pengelola berkas." #. hide duplicates checkbox -#: src/camera/ImportPage.vala:775 +#: src/camera/ImportPage.vala:783 msgid "Hide photos already imported" msgstr "Sembunyikan foto yang sudah selesai diimpor" -#: src/camera/ImportPage.vala:776 +#: src/camera/ImportPage.vala:784 msgid "Only display photos that have not been imported" msgstr "Hanya tampilkan foto yang belum diimpor" -#. Ticket #3304 - Import page shouldn't display confusing message -#. prior to import. -#. TODO: replace this with approved text for "talking to camera, -#. please wait" once new strings are being accepted. -#: src/camera/ImportPage.vala:846 -msgid "Starting import, please wait..." -msgstr "Mulai mengimpor, silakan tunggu..." - -#: src/camera/ImportPage.vala:873 src/MediaPage.vala:451 -msgid "_Titles" -msgstr "_Judul" - -#: src/camera/ImportPage.vala:874 src/MediaPage.vala:452 -msgid "Display the title of each photo" -msgstr "Tampilkan judul setiap foto" - -#: src/camera/ImportPage.vala:885 +#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210 msgid "Import _Selected" msgstr "Impor Foto _Terpilih" -#: src/camera/ImportPage.vala:886 -msgid "Import the selected photos into your library" -msgstr "Impor foto terpilih ke album" - -#: src/camera/ImportPage.vala:891 +#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214 msgid "Import _All" msgstr "Impor Semu_a" -#: src/camera/ImportPage.vala:892 -msgid "Import all the photos into your library" -msgstr "Impor semua foto ke album" +#: src/camera/ImportPage.vala:857 +msgid "The camera seems to be empty. No photos/videos found to import" +msgstr "" +"Kamera tampaknya kosong. Tidak ada foto/video yang ditemukan untuk diimpor" + +#: src/camera/ImportPage.vala:861 +msgid "No new photos/videos found on camera" +msgstr "Tidak ditemukan foto/video baru pada kamera" #. it's mounted, offer to unmount for the user -#: src/camera/ImportPage.vala:1013 +#: src/camera/ImportPage.vala:1021 msgid "" "Shotwell needs to unmount the camera from the filesystem in order to access " -"it. Continue?" +"it. Continue?" msgstr "" -"Shotwell harus dapat melepaskan kamera dari sistem agar dapat mengaksesnya. " -"Izinkan?" +"Shotwell perlu melepaskan kamera dari sistem berkas agar dapat mengaksesnya. " +"Lanjutkan?" -#: src/camera/ImportPage.vala:1019 +#: src/camera/ImportPage.vala:1027 msgid "_Unmount" msgstr "_Lepas" -#: src/camera/ImportPage.vala:1024 +#: src/camera/ImportPage.vala:1032 msgid "Please unmount the camera." msgstr "Silakan lepaskan kamera." -#: src/camera/ImportPage.vala:1029 +#: src/camera/ImportPage.vala:1037 msgid "" -"The camera is locked by another application. Shotwell can only access the " -"camera when it's unlocked. Please close any other application using the " +"The camera is locked by another application. Shotwell can only access the " +"camera when it’s unlocked. Please close any other application using the " "camera and try again." msgstr "" -"Kamera sudah terkunci oleh aplikasi lain. Shotwell hanya dapat mengakses " -"kamera pada saat tidak terkunci. Silakan matikan aplikasi yang sedang " -"menggunakan kamera ini dan coba kembali." +"Kamera terkunci oleh aplikasi lain. Shotwell hanya dapat mengakses kamera " +"pada saat tidak terkunci. Silakan matikan aplikasi yang sedang menggunakan " +"kamera ini dan coba kembali." -#: src/camera/ImportPage.vala:1039 +#: src/camera/ImportPage.vala:1047 msgid "Please close any other application using the camera." msgstr "Mohon segera mematikan aplikasi lain yang sedang menggunakan kamera." -#: src/camera/ImportPage.vala:1044 +#: src/camera/ImportPage.vala:1052 #, c-format msgid "" "Unable to fetch previews from the camera:\n" @@ -2485,278 +2662,359 @@ msgstr "" "Gambar pratayang tidak dapat diambil dari kamera:\n" "%s" -#: src/camera/ImportPage.vala:1061 -msgid "Unmounting..." -msgstr "Melepaskan kamera..." +#: src/camera/ImportPage.vala:1069 +msgid "Unmounting…" +msgstr "Melepas kaitan…" -#: src/camera/ImportPage.vala:1167 +#: src/camera/ImportPage.vala:1160 +msgid "Starting import, please wait…" +msgstr "Mulai mengimpor, mohon tunggu…" + +#: src/camera/ImportPage.vala:1177 msgid "Fetching photo information" msgstr "Mengambil informasi foto" -#: src/camera/ImportPage.vala:1522 +#: src/camera/ImportPage.vala:1535 #, c-format msgid "Fetching preview for %s" msgstr "Mengambil gambar pratayang %s" -#: src/camera/ImportPage.vala:1638 +#: src/camera/ImportPage.vala:1651 #, c-format msgid "Unable to lock camera: %s" msgstr "Kamera tidak dapat dikunci: %s" -#: src/camera/ImportPage.vala:1723 +#: src/camera/ImportPage.vala:1736 #, c-format msgid "Delete this photo from camera?" msgid_plural "Delete these %d photos from camera?" msgstr[0] "Hapus %d foto ini dari kamera?" -#: src/camera/ImportPage.vala:1726 +#: src/camera/ImportPage.vala:1739 #, c-format msgid "Delete this video from camera?" msgid_plural "Delete these %d videos from camera?" msgstr[0] "Hapus %d video ini dari kamera?" -#: src/camera/ImportPage.vala:1729 +#: src/camera/ImportPage.vala:1742 #, c-format msgid "Delete this photo/video from camera?" msgid_plural "Delete these %d photos/videos from camera?" msgstr[0] "Hapus %d foto/video ini dari kamera?" -#: src/camera/ImportPage.vala:1732 +#: src/camera/ImportPage.vala:1745 #, c-format msgid "Delete these files from camera?" msgid_plural "Delete these %d files from camera?" msgstr[0] "Hapus %d berkas ini dari kamera?" -#: src/camera/ImportPage.vala:1740 src/Dialogs.vala:1391 +#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387 msgid "_Keep" msgstr "_Simpan" -#: src/camera/ImportPage.vala:1759 +#: src/camera/ImportPage.vala:1772 msgid "Removing photos/videos from camera" msgstr "Menghapus foto/video dari kamera" -#: src/camera/ImportPage.vala:1763 +#: src/camera/ImportPage.vala:1776 #, c-format msgid "Unable to delete %d photo/video from the camera due to errors." msgid_plural "Unable to delete %d photos/videos from the camera due to errors." msgstr[0] "" -"Tidak dapat menghapus %d foto/video dari kamera karena adanya kesalahan" +"Tidak dapat menghapus %d foto/video dari kamera karena adanya kesalahan." + +#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85 +#: src/PhotoPage.vala:2464 src/Resources.vala:171 +msgid "_Print" +msgstr "_Cetak" + +#: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128 +#: ui/direct_context.ui:24 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28 +msgid "Send _To…" +msgstr "Kirim _Ke…" -#: src/CollectionPage.vala:230 src/PhotoPage.vala:2635 +#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90 +#: src/PhotoPage.vala:2474 src/Resources.vala:221 +msgid "Set as _Desktop Background" +msgstr "Atur sebagai Latar _Destop" + +#: src/CollectionPage.vala:92 src/Resources.vala:287 +msgid "_Duplicate" +msgstr "_Gandakan" + +#: src/CollectionPage.vala:100 +msgid "Fullscreen" +msgstr "Layar penuh" + +#: src/CollectionPage.vala:102 ui/photo.ui:180 msgid "S_lideshow" msgstr "Sa_lindia" -#: src/CollectionPage.vala:231 src/PhotoPage.vala:2636 -msgid "Play a slideshow" -msgstr "Putar tampilan salindia" +#: src/CollectionPage.vala:110 src/Resources.vala:140 ui/direct.ui:111 +#: ui/photo.ui:200 +msgid "Rotate _Right" +msgstr "Puta_r Kanan" + +#: src/CollectionPage.vala:113 src/Resources.vala:145 ui/direct.ui:116 +#: ui/photo.ui:205 +msgid "Rotate _Left" +msgstr "Putar _Kiri" + +#: src/CollectionPage.vala:116 src/Resources.vala:150 ui/direct.ui:121 +#: ui/photo.ui:210 +msgid "Flip Hori_zontally" +msgstr "Balik hori_zontal" + +#: src/CollectionPage.vala:117 src/Resources.vala:153 ui/direct.ui:125 +#: ui/photo.ui:214 +msgid "Flip Verti_cally" +msgstr "Balik Verti_kal" + +#: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8 +#: ui/direct_context.ui:8 ui/direct.ui:134 ui/event.ui:447 +#: ui/photo_context.ui:6 ui/photo.ui:223 +msgid "_Enhance" +msgstr "Taja_mkan" -#: src/CollectionPage.vala:456 +#: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13 +#: ui/direct_context.ui:13 ui/direct.ui:161 ui/event.ui:452 +#: ui/photo_context.ui:11 ui/photo.ui:250 +msgid "Re_vert to Original" +msgstr "K_embalikan ke Asal" + +#: src/CollectionPage.vala:122 src/Resources.vala:191 ui/photo.ui:256 +msgid "_Copy Color Adjustments" +msgstr "Salin Penyetelan _Warna" + +#: src/CollectionPage.vala:125 src/Resources.vala:195 ui/photo.ui:261 +msgid "_Paste Color Adjustments" +msgstr "Tem_pel Penyetelan Warna" + +#: src/CollectionPage.vala:135 +msgid "Adjust Date and Time…" +msgstr "Atur Jam dan Tanggal…" + +#: src/CollectionPage.vala:143 src/Resources.vala:320 +msgid "Open With E_xternal Editor" +msgstr "Buka Oleh Penyunting E_ksternal" + +#: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113 +#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:365 +msgid "Open With RA_W Editor" +msgstr "Buka Dengan Penyunting RA_W" + +#: src/CollectionPage.vala:149 src/Resources.vala:168 +msgid "_Play" +msgstr "_Putar" + +#: src/CollectionPage.vala:415 msgid "Export Photo/Video" msgstr "Ekspor Foto/Video" -#: src/CollectionPage.vala:456 +#: src/CollectionPage.vala:415 msgid "Export Photos/Videos" msgstr "Ekspor Foto-foto/Video-video" -#: src/CollectionPage.vala:458 src/Dialogs.vala:58 src/PhotoPage.vala:3209 +#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998 msgid "Export Photo" msgstr "Ekspor Foto" -#: src/CollectionPage.vala:458 src/Dialogs.vala:87 +#: src/CollectionPage.vala:417 src/Dialogs.vala:84 msgid "Export Photos" msgstr "Ekspor Foto-foto" -#: src/CollectionPage.vala:545 src/CollectionPage.vala:561 +#: src/CollectionPage.vala:504 src/CollectionPage.vala:520 msgid "Rotating" msgstr "Memutar" -#: src/CollectionPage.vala:545 src/CollectionPage.vala:561 +#: src/CollectionPage.vala:504 src/CollectionPage.vala:520 msgid "Undoing Rotate" msgstr "Batalkan Pemutaran" -#: src/CollectionPage.vala:570 +#: src/CollectionPage.vala:529 msgid "Flipping Horizontally" msgstr "Balikkan Horizontal" -#: src/CollectionPage.vala:571 +#: src/CollectionPage.vala:530 msgid "Undoing Flip Horizontally" msgstr "Batalkan Batal Horizontal" -#: src/CollectionPage.vala:580 +#: src/CollectionPage.vala:539 msgid "Flipping Vertically" msgstr "Balikkan Vertikal" -#: src/CollectionPage.vala:581 +#: src/CollectionPage.vala:540 msgid "Undoing Flip Vertically" msgstr "Batalkan Balik Vertikal" -#: src/Commands.vala:733 +#: src/Commands.vala:737 msgid "Reverting" msgstr "Membalikkan" -#: src/Commands.vala:733 +#: src/Commands.vala:737 msgid "Undoing Revert" msgstr "Batalkan pembalikan" -#: src/Commands.vala:777 +#: src/Commands.vala:781 msgid "Enhancing" msgstr "Menajamkan gambar" -#: src/Commands.vala:777 +#: src/Commands.vala:781 msgid "Undoing Enhance" msgstr "Batalkan Penajaman Gambar" -#: src/Commands.vala:853 +#: src/Commands.vala:857 msgid "Applying Color Transformations" msgstr "Menerapkan Transformasi Warna" -#: src/Commands.vala:853 +#: src/Commands.vala:857 msgid "Undoing Color Transformations" msgstr "Membatalkan Transformasi Warna" -#: src/Commands.vala:1003 +#: src/Commands.vala:1007 msgid "Creating New Event" msgstr "Buat Rangkaian Baru" -#: src/Commands.vala:1004 +#: src/Commands.vala:1008 msgid "Removing Event" msgstr "Hapus Rangkaian" -#: src/Commands.vala:1013 +#: src/Commands.vala:1017 msgid "Moving Photos to New Event" msgstr "Memindahkan Semua Foto Ini ke Rangkaian Baru" -#: src/Commands.vala:1014 +#: src/Commands.vala:1018 msgid "Setting Photos to Previous Event" msgstr "Menandai Foto ke Rangkaian Sebelumnya" -#: src/Commands.vala:1071 +#: src/Commands.vala:1075 msgid "Merging" msgstr "Menggabungkan" -#: src/Commands.vala:1072 +#: src/Commands.vala:1076 msgid "Unmerging" msgstr "Membatalkan Penggabungan" -#: src/Commands.vala:1081 +#: src/Commands.vala:1085 msgid "Duplicating photos" msgstr "Gandakan foto" -#: src/Commands.vala:1081 +#: src/Commands.vala:1085 msgid "Removing duplicated photos" msgstr "Hapus foto ganda" -#: src/Commands.vala:1104 +#: src/Commands.vala:1108 #, c-format msgid "Unable to duplicate one photo due to a file error" msgid_plural "Unable to duplicate %d photos due to file errors" msgstr[0] "Ada %d foto yang tidak dapat digandakan karena ada kesalahan teknis" -#: src/Commands.vala:1191 +#: src/Commands.vala:1195 msgid "Restoring previous rating" msgstr "Mengembalikan rating sebelumnya" -#: src/Commands.vala:1201 src/Commands.vala:1202 +#: src/Commands.vala:1205 src/Commands.vala:1206 msgid "Increasing ratings" msgstr "Naikkan rating" -#: src/Commands.vala:1201 src/Commands.vala:1202 +#: src/Commands.vala:1205 src/Commands.vala:1206 msgid "Decreasing ratings" msgstr "Turunkan rating" -#: src/Commands.vala:1252 +#: src/Commands.vala:1256 msgid "Setting RAW developer" msgstr "Atur RAW pengembang" -#: src/Commands.vala:1252 +#: src/Commands.vala:1256 msgid "Restoring previous RAW developer" msgstr "Mengembalikan pembangun RAW sebelumnya" -#: src/Commands.vala:1253 +#: src/Commands.vala:1257 msgid "Set Developer" msgstr "Atur Pengembang" -#: src/Commands.vala:1343 +#: src/Commands.vala:1347 msgid "Original photo could not be adjusted." -msgstr "Foto asli tidak dapat diatur" +msgstr "Foto asli tidak dapat diatur." -#: src/Commands.vala:1364 +#: src/Commands.vala:1368 msgid "Adjusting Date and Time" msgstr "Mengatur Tanggal dan Jam" -#: src/Commands.vala:1364 +#: src/Commands.vala:1368 msgid "Undoing Date and Time Adjustment" msgstr "Batalkan Pengaturan Tanggal dan Jam" -#: src/Commands.vala:1395 +#: src/Commands.vala:1399 msgid "One original photo could not be adjusted." msgid_plural "The following original photos could not be adjusted." -msgstr[0] "Foto ini tidak dapat diatur" +msgstr[0] "Foto asli ini tidak dapat diatur." -#: src/Commands.vala:1397 src/Commands.vala:1421 +#: src/Commands.vala:1401 src/Commands.vala:1425 msgid "Time Adjustment Error" msgstr "Tidak Dapat Mengatur Jam" -#: src/Commands.vala:1419 +#: src/Commands.vala:1423 msgid "Time adjustments could not be undone on the following photo file." msgid_plural "" "Time adjustments could not be undone on the following photo files." -msgstr[0] "Jam asli pada foto ini tidak dapat dikembalikan" +msgstr[0] "" +"Penyesuaian jam tidak dapat dikembalikan pada berkas-berkas foto berikut." -#: src/Commands.vala:1633 src/Commands.vala:1656 +#: src/Commands.vala:1637 src/Commands.vala:1660 msgid "Create Tag" msgstr "Buat Tanda" -#: src/Commands.vala:1691 +#: src/Commands.vala:1695 #, c-format -msgid "Move Tag \"%s\"" -msgstr "Pindah Tag \"%s\"" +msgid "Move Tag “%s”" +msgstr "Pindahkan Tag \"%s\"" -#: src/Commands.vala:2343 +#: src/Commands.vala:2347 msgid "Move Photos to Trash" msgstr "Pindahkan Foto ke Tempat Pembuangan" -#: src/Commands.vala:2343 +#: src/Commands.vala:2347 msgid "Restore Photos from Trash" msgstr "Kembalikan Foto dari Tempat Pembuangan" -#: src/Commands.vala:2344 +#: src/Commands.vala:2348 msgid "Move the photos to the Shotwell trash" msgstr "Pindahkan foto-foto tersebut ke tempat pembuangan" -#: src/Commands.vala:2344 +#: src/Commands.vala:2348 msgid "Restore the photos back to the Shotwell library" msgstr "Kembalikan foto-foto yang dibuang ke album" -#: src/Commands.vala:2363 +#: src/Commands.vala:2367 msgid "Moving Photos to Trash" msgstr "Pindahkan Foto ke Tempat Pembuangan" -#: src/Commands.vala:2363 +#: src/Commands.vala:2367 msgid "Restoring Photos From Trash" msgstr "Kembalikan Foto dari Tempat Pembuangan" -#: src/Commands.vala:2449 +#: src/Commands.vala:2453 msgid "Flag selected photos" msgstr "Tandai foto terpilih" -#: src/Commands.vala:2450 +#: src/Commands.vala:2454 msgid "Unflag selected photos" msgstr "Hapus tanda foto terpilih" -#: src/Commands.vala:2451 +#: src/Commands.vala:2455 msgid "Flagging selected photos" msgstr "Tandai foto terpilih" -#: src/Commands.vala:2452 +#: src/Commands.vala:2456 msgid "Unflagging selected photos" msgstr "Hapus tanda foto terpilih" -#: src/Commands.vala:2459 +#: src/Commands.vala:2463 msgid "Flag" msgstr "Tanda" -#: src/Commands.vala:2459 +#: src/Commands.vala:2463 msgid "Unflag" msgstr "Hapus Tanda" @@ -2770,8 +3028,8 @@ msgstr "Basisdata %s" #: src/data_imports/DataImportsPluginHost.vala:148 #: src/data_imports/DataImportsPluginHost.vala:294 #, c-format -msgid "Importing from %s can't continue because an error occurred:" -msgstr "Gagal lanjut mengimpor dari %s karena terjadi eror:" +msgid "Importing from %s can’t continue because an error occurred:" +msgstr "Mengimpor dari %s tak bisa berlanjut karena terjadi eror:" #: src/data_imports/DataImportsPluginHost.vala:151 msgid "To try importing from another service, select one from the above menu." @@ -2794,7 +3052,7 @@ msgstr "" msgid "Database file:" msgstr "Berkas basis data:" -#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:882 +#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775 msgid "_Import" msgstr "_Impor" @@ -2803,12 +3061,10 @@ msgid "Import From Application" msgstr "Impor Dari Aplikasi" #: src/data_imports/DataImportsUI.vala:221 -#, fuzzy -#| msgid "Imported %s" msgid "Import media _from:" -msgstr "%s diimpor" +msgstr "Impor media _dari:" -#: src/data_imports/DataImportsUI.vala:408 src/publishing/PublishingUI.vala:507 +#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520 msgid "_Close" msgstr "_Tutup" @@ -2845,15 +3101,10 @@ msgstr "" "Kesalahan: \n" "%s" -#: src/db/DatabaseTable.vala:88 -#, fuzzy, c-format -#| msgid "" -#| "Unable to write to photo database file:\n" -#| " %s" +#: src/db/DatabaseTable.vala:92 +#, c-format msgid "Unable to restore photo database %s" -msgstr "" -"Gagal menulis ke berkas basis data foto:\n" -" %s" +msgstr "Gagal memulihkan basis data foto %s" #: src/DesktopIntegration.vala:121 #, c-format @@ -2876,22 +3127,23 @@ msgstr "Gagal menyiapkan salindia destop: %s" #: src/Dialogs.vala:16 #, c-format -msgid "This will remove the tag \"%s\" from one photo. Continue?" -msgid_plural "This will remove the tag \"%s\" from %d photos. Continue?" -msgstr[0] "Tanda \"%s\" akan dihapus dari %d foto. Teruskan?" +msgid "This will remove the tag “%s” from one photo. Continue?" +msgid_plural "This will remove the tag “%s” from %d photos. Continue?" +msgstr[0] "Ini akan menghapus tag \"%s\" dari %d foto. Teruskan?" -#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1392 -#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:409 -#: src/Resources.vala:674 +#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388 +#: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415 +#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:460 ui/trash.ui:63 +#: ui/trash.ui:216 ui/trash.ui:258 msgid "_Delete" msgstr "_Hapus" #: src/Dialogs.vala:25 #, c-format -msgid "This will remove the saved search \"%s\". Continue?" -msgstr "Pencarian tersimpan \"%s\" akan dihapus. Teruskan?" +msgid "This will remove the saved search “%s”. Continue?" +msgstr "Pencarian tersimpan \"%s\" akan dihapus. Teruskan?" -#: src/Dialogs.vala:35 +#: src/Dialogs.vala:36 msgid "" "Switching developers will undo all changes you have made to this photo in " "Shotwell" @@ -2902,11 +3154,11 @@ msgstr[0] "" "Mengganti pengembang akan membatalkan perubahan yang kamu buat ke foto ini " "di Shotwell" -#: src/Dialogs.vala:39 +#: src/Dialogs.vala:40 msgid "_Switch Developer" msgstr "_Ganti Pengembang" -#: src/Dialogs.vala:58 +#: src/Dialogs.vala:59 msgid "Export Video" msgstr "Ekspor Video" @@ -2915,16 +3167,16 @@ msgstr "Ekspor Video" #. if we can't copy an image over for editing in an external tool. #. Did we fail because we can't write to this directory? #. Yes - display an alternate error message here. -#: src/Dialogs.vala:115 +#: src/Dialogs.vala:112 #, c-format msgid "" -"Shotwell couldn't create a file for editing this photo because you do not " +"Shotwell couldn’t create a file for editing this photo because you do not " "have permission to write to %s." msgstr "" -"Shotwell tidak dapat membuat berkas penyuntingan foto karena tidak ada izin " -"menulisi %s" +"Shotwell tak bisa membuat berkas untuk penyuntingan foto ini karena Anda " +"tidak punya izin menulis ke %s." -#: src/Dialogs.vala:124 +#: src/Dialogs.vala:121 msgid "" "Unable to export the following photo due to a file error.\n" "\n" @@ -2932,7 +3184,7 @@ msgstr "" "Pengeksporan foto berikut gagal karena kesalahan teknis pada berkas.\n" "\n" -#: src/Dialogs.vala:130 +#: src/Dialogs.vala:127 msgid "" "\n" "\n" @@ -2945,59 +3197,59 @@ msgstr "" #. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really #. aren't formats so much as they are operating modes that determine specific formats. #. Hereafter we'll refer to these as "special formats." -#: src/Dialogs.vala:147 +#: src/Dialogs.vala:144 msgid "Unmodified" msgstr "Tidak dimodifikasi" -#: src/Dialogs.vala:148 +#: src/Dialogs.vala:145 msgid "Current" msgstr "Sekarang" #. layout controls -#: src/Dialogs.vala:215 +#: src/Dialogs.vala:221 msgid "_Format:" msgstr "_Format:" -#: src/Dialogs.vala:218 +#: src/Dialogs.vala:224 msgid "_Quality:" msgstr "_Kualitas:" -#: src/Dialogs.vala:221 +#: src/Dialogs.vala:227 msgid "_Scaling constraint:" msgstr "_Batas skala:" -#: src/Dialogs.vala:224 +#: src/Dialogs.vala:230 msgid "_Pixels:" msgstr "_Piksel:" -#: src/Dialogs.vala:227 -msgid "Export metadata" -msgstr "Ekspor metadata" +#: src/Dialogs.vala:234 +msgid "Export _metadata:" +msgstr "Ekspor _metadata:" -#: src/Dialogs.vala:461 -msgid "Save Details..." -msgstr "Simpan Rincian..." +#: src/Dialogs.vala:478 +msgid "Save Details…" +msgstr "Simpan Rincian…" -#: src/Dialogs.vala:462 +#: src/Dialogs.vala:479 msgid "Save Details" msgstr "Simpan Rincian" -#: src/Dialogs.vala:477 +#: src/Dialogs.vala:494 #, c-format msgid "(and %d more)\n" msgstr "(dan %d buah lagi)\n" -#: src/Dialogs.vala:530 +#: src/Dialogs.vala:547 msgid "Import Results Report" msgstr "Impor Laporan Hasil" -#: src/Dialogs.vala:534 +#: src/Dialogs.vala:551 #, c-format msgid "Attempted to import %d file." msgid_plural "Attempted to import %d files." msgstr[0] "Mencoba mengimpor %d berkas." -#: src/Dialogs.vala:537 +#: src/Dialogs.vala:554 #, c-format msgid "Of these, %d file was successfully imported." msgid_plural "Of these, %d files were successfully imported." @@ -3006,58 +3258,60 @@ msgstr[0] "Dari sekian banyak, %d berkas sukses diimpor." #. #. Duplicates #. -#: src/Dialogs.vala:549 +#: src/Dialogs.vala:566 msgid "Duplicate Photos/Videos Not Imported:" msgstr "Foto/Video Duplikat Yang Tak Diimpor:" -#: src/Dialogs.vala:553 +#: src/Dialogs.vala:570 msgid "duplicates existing media item" msgstr "butir media yang ada yang duplikat" #. #. Files Not Imported Due to Camera Errors #. -#: src/Dialogs.vala:564 +#: src/Dialogs.vala:581 msgid "Photos/Videos Not Imported Due to Camera Errors:" msgstr "Foto/Video Yang Tak Diimpor Karena Galat Kamera:" -#: src/Dialogs.vala:567 src/Dialogs.vala:582 src/Dialogs.vala:597 -#: src/Dialogs.vala:613 src/Dialogs.vala:628 src/Dialogs.vala:642 +#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614 +#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659 msgid "error message:" msgstr "pesan kesalahan:" #. #. Files Not Imported Because They Weren't Recognized as Photos or Videos #. -#: src/Dialogs.vala:578 -msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:" -msgstr "Berkas Yang Tak Diimpor Karena Tak Dikenali Sebagai Foto atau Video:" +#: src/Dialogs.vala:595 +msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:" +msgstr "" +"Berkas-berkas Tidak Diimpor Karena Tak Dikenali Sebagai Foto atau Video:" #. #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands #. -#: src/Dialogs.vala:593 +#: src/Dialogs.vala:610 msgid "" -"Photos/Videos Not Imported Because They Weren't in a Format Shotwell " +"Photos/Videos Not Imported Because They Weren’t in a Format Shotwell " "Understands:" msgstr "" -"Foto/Video Yang Tak Diimpor Karena Bukan Dalam Format Yang Dikenal Shotwell:" +"Foto/Video Yang Tidak Diimpor Karena Bukan Dalam Format Yang Dikenal " +"Shotwell:" #. #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library #. -#: src/Dialogs.vala:608 +#: src/Dialogs.vala:625 msgid "" -"Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its " +"Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its " "Library:" msgstr "" -"Foto/Video Yang Tak Diimpor Karena Shotwell Tak Bisa Menyalin Mereka Ke " +"Foto/Video Yang Tidak Diimpor Karena Shotwell Tak Bisa Menyalin Mereka Ke " "Pustaka:" -#: src/Dialogs.vala:612 +#: src/Dialogs.vala:629 #, c-format msgid "" -"couldn't copy %s\n" +"couldn’t copy %s\n" "\tto %s" msgstr "" "tak bisa menyalin %s\n" @@ -3066,36 +3320,36 @@ msgstr "" #. #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt #. -#: src/Dialogs.vala:624 +#: src/Dialogs.vala:641 msgid "Photos/Videos Not Imported Because Files Are Corrupt:" msgstr "Foto/Video Yang Tak Diimpor Karena Berkas Rusak:" #. #. Photos/Videos Not Imported for Other Reasons #. -#: src/Dialogs.vala:639 +#: src/Dialogs.vala:656 msgid "Photos/Videos Not Imported for Other Reasons:" msgstr "Foto Video Yang Tak Diimpor Karena Alasan Lain:" -#: src/Dialogs.vala:659 +#: src/Dialogs.vala:676 #, c-format msgid "1 duplicate photo was not imported:\n" msgid_plural "%d duplicate photos were not imported:\n" msgstr[0] "%d foto duplikat tidak diimpor:\n" -#: src/Dialogs.vala:662 +#: src/Dialogs.vala:679 #, c-format msgid "1 duplicate video was not imported:\n" msgid_plural "%d duplicate videos were not imported:\n" msgstr[0] "%d video duplikat tidak diimpor:\n" -#: src/Dialogs.vala:665 +#: src/Dialogs.vala:682 #, c-format msgid "1 duplicate photo/video was not imported:\n" msgid_plural "%d duplicate photos/videos were not imported:\n" msgstr[0] "%d foto/video duplikat tidak diimpor:\n" -#: src/Dialogs.vala:679 +#: src/Dialogs.vala:696 #, c-format msgid "1 photo failed to import due to a file or hardware error:\n" msgid_plural "%d photos failed to import due to a file or hardware error:\n" @@ -3104,7 +3358,7 @@ msgstr[0] "" "keras:\n" "\r\n" -#: src/Dialogs.vala:682 +#: src/Dialogs.vala:699 #, c-format msgid "1 video failed to import due to a file or hardware error:\n" msgid_plural "%d videos failed to import due to a file or hardware error:\n" @@ -3112,7 +3366,7 @@ msgstr[0] "" "Ada %d video gagal diimpor karena kesalahan pada berkas atau perangkat " "keras:\n" -#: src/Dialogs.vala:685 +#: src/Dialogs.vala:702 #, c-format msgid "1 photo/video failed to import due to a file or hardware error:\n" msgid_plural "" @@ -3121,7 +3375,7 @@ msgstr[0] "" "Ada %d foto/video gagal diimpor karena kesalahan pada berkas atau perangkat " "keras:\n" -#: src/Dialogs.vala:688 +#: src/Dialogs.vala:705 #, c-format msgid "1 file failed to import due to a file or hardware error:\n" msgid_plural "%d files failed to import due to a file or hardware error:\n" @@ -3129,7 +3383,7 @@ msgstr[0] "" "Ada %d berkas gagal diimpor karena kesalahan pada berkas atau perangkat " "keras:\n" -#: src/Dialogs.vala:702 +#: src/Dialogs.vala:719 #, c-format msgid "" "1 photo failed to import because the photo library folder was not writable:\n" @@ -3139,7 +3393,7 @@ msgid_plural "" msgstr[0] "" "%d foto tidak dapat diimpor karena folder album foto tidak dapat ditulisi:\n" -#: src/Dialogs.vala:705 +#: src/Dialogs.vala:722 #, c-format msgid "" "1 video failed to import because the photo library folder was not writable:\n" @@ -3149,7 +3403,7 @@ msgid_plural "" msgstr[0] "" "%d video tidak dapat diimpor karena folder album foto tidak dapat ditulisi:\n" -#: src/Dialogs.vala:708 +#: src/Dialogs.vala:725 #, c-format msgid "" "1 photo/video failed to import because the photo library folder was not " @@ -3161,7 +3415,7 @@ msgstr[0] "" "%d foto/video tidak dapat diimpor karena folder album foto tidak dapat " "ditulisi:\n" -#: src/Dialogs.vala:711 +#: src/Dialogs.vala:728 #, c-format msgid "" "1 file failed to import because the photo library folder was not writable:\n" @@ -3172,7 +3426,7 @@ msgstr[0] "" "%d berkas tidak dapat diimpor karena folder album foto tidak dapat " "ditulisi:\n" -#: src/Dialogs.vala:725 +#: src/Dialogs.vala:742 #, c-format msgid "1 photo failed to import due to a camera error:\n" msgid_plural "%d photos failed to import due to a camera error:\n" @@ -3180,43 +3434,43 @@ msgstr[0] "" "Ada %d foto gagal diimpor karena kesalahan pada kamera:\n" "\r\n" -#: src/Dialogs.vala:728 +#: src/Dialogs.vala:745 #, c-format msgid "1 video failed to import due to a camera error:\n" msgid_plural "%d videos failed to import due to a camera error:\n" msgstr[0] "%d video gagal diimpor karena kesalahan pada kamera:\n" -#: src/Dialogs.vala:731 +#: src/Dialogs.vala:748 #, c-format msgid "1 photo/video failed to import due to a camera error:\n" msgid_plural "%d photos/videos failed to import due to a camera error:\n" msgstr[0] "%d foto/video gagal diimpor karena kesalahan pada kamera:\n" -#: src/Dialogs.vala:734 +#: src/Dialogs.vala:751 #, c-format msgid "1 file failed to import due to a camera error:\n" msgid_plural "%d files failed to import due to a camera error:\n" msgstr[0] "%d berkas gagal diimpor karena kesalahan pada kamera:\n" -#: src/Dialogs.vala:748 +#: src/Dialogs.vala:765 #, c-format msgid "1 photo failed to import because it was corrupt:\n" msgid_plural "%d photos failed to import because they were corrupt:\n" msgstr[0] "%d foto gagal diimpor karena rusak:\n" -#: src/Dialogs.vala:751 +#: src/Dialogs.vala:768 #, c-format msgid "1 video failed to import because it was corrupt:\n" msgid_plural "%d videos failed to import because they were corrupt:\n" msgstr[0] "%d video gagal diimpor karena rusak:\n" -#: src/Dialogs.vala:754 +#: src/Dialogs.vala:771 #, c-format msgid "1 photo/video failed to import because it was corrupt:\n" msgid_plural "%d photos/videos failed to import because they were corrupt:\n" msgstr[0] "%d foto/video gagal diimpor karena rusak:\n" -#: src/Dialogs.vala:757 +#: src/Dialogs.vala:774 #, c-format msgid "1 file failed to import because it was corrupt:\n" msgid_plural "%d files failed to import because it was corrupt:\n" @@ -3226,7 +3480,7 @@ msgstr[0] "%d berkas gagal diimpor karena rusak:\n" #. standard container formats are supported, it's just that the streams in them #. might or might not be interpretable), so this message does not need to be #. media specific -#: src/Dialogs.vala:774 +#: src/Dialogs.vala:791 #, c-format msgid "1 unsupported photo skipped:\n" msgid_plural "%d unsupported photos skipped:\n" @@ -3236,49 +3490,49 @@ msgstr[0] "" #. we have no notion of "non-video" video files right now in Shotwell, so this #. message doesn't need to be media specific -#: src/Dialogs.vala:789 +#: src/Dialogs.vala:806 #, c-format msgid "1 non-image file skipped.\n" msgid_plural "%d non-image files skipped.\n" msgstr[0] "Ada %d berkas yang bukan berupa foto.\n" -#: src/Dialogs.vala:800 +#: src/Dialogs.vala:817 #, c-format msgid "1 photo skipped due to user cancel:\n" msgid_plural "%d photos skipped due to user cancel:\n" msgstr[0] "Ada %d foto yang tidak masuk karena Anda batalkan:\n" -#: src/Dialogs.vala:803 +#: src/Dialogs.vala:820 #, c-format msgid "1 video skipped due to user cancel:\n" msgid_plural "%d videos skipped due to user cancel:\n" msgstr[0] "Ada %d video yang tidak masuk karena Anda batalkan:\n" -#: src/Dialogs.vala:806 +#: src/Dialogs.vala:823 #, c-format msgid "1 photo/video skipped due to user cancel:\n" msgid_plural "%d photos/videos skipped due to user cancel:\n" msgstr[0] "Ada %d foto/video yang tidak masuk karena Anda batalkan:\n" -#: src/Dialogs.vala:809 +#: src/Dialogs.vala:826 #, c-format msgid "1 file skipped due to user cancel:\n" msgid_plural "%d file skipped due to user cancel:\n" msgstr[0] "Ada %d berkas yang tidak masuk karena Anda batalkan:\n" -#: src/Dialogs.vala:823 +#: src/Dialogs.vala:840 #, c-format msgid "1 photo successfully imported.\n" msgid_plural "%d photos successfully imported.\n" msgstr[0] "%d foto telah berhasil diimpor.\n" -#: src/Dialogs.vala:826 +#: src/Dialogs.vala:843 #, c-format msgid "1 video successfully imported.\n" msgid_plural "%d videos successfully imported.\n" msgstr[0] "%d video telah berhasil diimpor.\n" -#: src/Dialogs.vala:829 +#: src/Dialogs.vala:846 #, c-format msgid "1 photo/video successfully imported.\n" msgid_plural "%d photos/videos successfully imported.\n" @@ -3286,168 +3540,167 @@ msgstr[0] "%d foto/video telah berhasil diimpor.\n" #. if no media items were imported at all (i.e. an empty directory attempted), need to at least #. report that nothing was imported -#: src/Dialogs.vala:845 +#: src/Dialogs.vala:862 msgid "No photos or videos imported.\n" msgstr "Tidak ada foto atau video yang diimpor.\n" -#: src/Dialogs.vala:852 src/Dialogs.vala:871 +#: src/Dialogs.vala:869 src/Dialogs.vala:888 msgid "Import Complete" msgstr "Impor Selesai" -#: src/Dialogs.vala:1157 +#: src/Dialogs.vala:1160 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d detik" -#: src/Dialogs.vala:1160 +#: src/Dialogs.vala:1163 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d menit" -#: src/Dialogs.vala:1164 +#: src/Dialogs.vala:1167 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d jam" -#: src/Dialogs.vala:1167 +#: src/Dialogs.vala:1170 msgid "1 day" msgstr "1 hari" -#: src/Dialogs.vala:1321 src/Resources.vala:231 +#: src/Dialogs.vala:1317 src/Resources.vala:232 msgid "Rename Event" msgstr "Ubah Nama Peristiwa" -#: src/Dialogs.vala:1321 +#: src/Dialogs.vala:1317 msgid "Name:" msgstr "Nama:" #. Dialog title -#: src/Dialogs.vala:1333 src/Properties.vala:340 +#: src/Dialogs.vala:1328 +msgctxt "Dialog Title" +msgid "Edit Title" +msgstr "Sunting Judul" + +#: src/Dialogs.vala:1329 src/Properties.vala:343 msgid "Title:" msgstr "Judul:" #. Dialog title -#: src/Dialogs.vala:1349 src/Resources.vala:307 +#: src/Dialogs.vala:1345 src/Resources.vala:308 msgid "Edit Event Comment" msgstr "Sunting Komentar Peristiwa" -#: src/Dialogs.vala:1350 +#: src/Dialogs.vala:1346 msgid "Edit Photo/Video Comment" msgstr "Sunting Komentar Foto/Video" -#: src/Dialogs.vala:1351 src/Properties.vala:628 +#: src/Dialogs.vala:1347 src/Properties.vala:631 msgid "Comment:" msgstr "Komentar:" -#: src/Dialogs.vala:1367 +#: src/Dialogs.vala:1363 msgid "Remove and _Trash File" msgid_plural "Remove and _Trash Files" msgstr[0] "Hapus dan _Buang Berkas" -#: src/Dialogs.vala:1371 +#: src/Dialogs.vala:1367 msgid "_Remove From Library" msgstr "Hapus Da_ri Pustaka" -#: src/Dialogs.vala:1414 +#: src/Dialogs.vala:1410 msgid "Revert External Edit?" msgstr "Batalkan Penyuntingan Eksternal?" -#: src/Dialogs.vala:1414 +#: src/Dialogs.vala:1410 msgid "Revert External Edits?" msgstr "Batalkan Penyuntingan Eksternal?" -#: src/Dialogs.vala:1416 +#: src/Dialogs.vala:1412 #, c-format -msgid "This will destroy all changes made to the external file. Continue?" +msgid "This will destroy all changes made to the external file. Continue?" msgid_plural "" -"This will destroy all changes made to %d external files. Continue?" +"This will destroy all changes made to %d external files. Continue?" msgstr[0] "" -"Jika proses ini diteruskan maka semua perubahan yang sudah Anda lakukan pada " -"berkas %d foto eksternal tidak akan disimpan. Lanjutan?" +"Ini akan menghancurkan semua perubahan yang telah dibuat pada %d berkas " +"eksternal. Lanjutan?" -#: src/Dialogs.vala:1420 +#: src/Dialogs.vala:1416 msgid "Re_vert External Edit" msgstr "_Batalkan Penyuntingan Eksternal" -#: src/Dialogs.vala:1420 +#: src/Dialogs.vala:1416 msgid "Re_vert External Edits" msgstr "_Batalkan Penyuntingan Eksternal" -#: src/Dialogs.vala:1441 +#: src/Dialogs.vala:1437 #, c-format -msgid "This will remove the photo from the library. Continue?" -msgid_plural "This will remove %d photos from the library. Continue?" -msgstr[0] "%d foto akan dihapus dari album. Lanjutkan?" +msgid "This will remove the photo from the library. Continue?" +msgid_plural "This will remove %d photos from the library. Continue?" +msgstr[0] "Ini akan menghapus %d foto dari pustaka. Lanjutkan?" -#: src/Dialogs.vala:1448 src/Resources.vala:173 +#: src/Dialogs.vala:1444 src/Resources.vala:174 msgid "_Remove" msgstr "_Hapus" -#: src/Dialogs.vala:1449 +#: src/Dialogs.vala:1445 msgid "Remove Photo From Library" msgstr "Hapus Foto Dari Album" -#: src/Dialogs.vala:1449 +#: src/Dialogs.vala:1445 msgid "Remove Photos From Library" msgstr "Hapus Foto Dari Album" -#: src/Dialogs.vala:1542 +#: src/Dialogs.vala:1543 #, c-format msgid "%d%%" msgstr "%d%%" -#: src/Dialogs.vala:1696 +#: src/Dialogs.vala:1697 msgid "AM" msgstr "Pagi" -#: src/Dialogs.vala:1697 +#: src/Dialogs.vala:1698 msgid "PM" msgstr "Siang/Malam" -#: src/Dialogs.vala:1698 +#: src/Dialogs.vala:1699 msgid "24 Hr" msgstr "24 Jam" -#: src/Dialogs.vala:1713 +#: src/Dialogs.vala:1714 msgid "_Shift photos/videos by the same amount" msgstr "Ge_ser foto/video dalam jumlah sama" -#: src/Dialogs.vala:1718 +#: src/Dialogs.vala:1719 msgid "Set _all photos/videos to this time" msgstr "Atur semu_a foto/video ke waktu ini" #: src/Dialogs.vala:1725 msgid "_Modify original photo file" -msgstr "_Modifikasi berkas asli foto" +msgid_plural "_Modify original photo files" +msgstr[0] "_Modifikasi berkas asli foto" -#: src/Dialogs.vala:1725 -msgid "_Modify original photo files" -msgstr "_Modifikasi berkas asli foto" - -#: src/Dialogs.vala:1728 +#: src/Dialogs.vala:1729 msgid "_Modify original file" -msgstr "Ubah pada _berkas foto aslinya" +msgid_plural "_Modify original files" +msgstr[0] "_Modifikasi berkas asli" -#: src/Dialogs.vala:1728 -msgid "_Modify original files" -msgstr "Ubah pada _berkas foto aslinya" - -#: src/Dialogs.vala:1814 +#: src/Dialogs.vala:1817 msgid "Original: " -msgstr "Aslinya:" +msgstr "Asli: " -#: src/Dialogs.vala:1815 +#: src/Dialogs.vala:1818 msgid "%m/%d/%Y, %H:%M:%S" msgstr "%d/%m/%Y, %H:%M:%S" -#: src/Dialogs.vala:1816 +#: src/Dialogs.vala:1819 msgid "%m/%d/%Y, %I:%M:%S %p" msgstr "%d/%m/%Y, %I:%M:%S %p" -#: src/Dialogs.vala:1905 +#: src/Dialogs.vala:1908 #, c-format msgid "" "Exposure time will be shifted forward by\n" @@ -3456,7 +3709,7 @@ msgstr "" "Tanggal pengambilan gambar akan dimajukan\n" "%d %s, %d %s, %d %s, dan %d %s." -#: src/Dialogs.vala:1906 +#: src/Dialogs.vala:1909 #, c-format msgid "" "Exposure time will be shifted backward by\n" @@ -3465,27 +3718,27 @@ msgstr "" "Tanggal pengambilan gambar akan dimundurkan\n" "%d %s, %d %s, %d %s, dan %d %s." -#: src/Dialogs.vala:1908 +#: src/Dialogs.vala:1911 msgid "day" msgid_plural "days" msgstr[0] "hari" -#: src/Dialogs.vala:1909 +#: src/Dialogs.vala:1912 msgid "hour" msgid_plural "hours" msgstr[0] "jam" -#: src/Dialogs.vala:1910 +#: src/Dialogs.vala:1913 msgid "minute" msgid_plural "minutes" msgstr[0] "menit" -#: src/Dialogs.vala:1911 +#: src/Dialogs.vala:1914 msgid "second" msgid_plural "seconds" msgstr[0] "detik" -#: src/Dialogs.vala:1955 +#: src/Dialogs.vala:1958 #, c-format msgid "" "\n" @@ -3500,49 +3753,49 @@ msgstr[0] "" "\n" "Dan %d lainnya." -#: src/Dialogs.vala:1977 src/Dialogs.vala:2004 +#: src/Dialogs.vala:1982 src/Dialogs.vala:2009 msgid "Tags (separated by commas):" msgstr "Tanda (pisahkan dengan koma):" -#: src/Dialogs.vala:2084 +#: src/Dialogs.vala:2089 msgid "Welcome!" msgstr "Selamat Datang!" -#: src/Dialogs.vala:2091 +#: src/Dialogs.vala:2096 msgid "Welcome to Shotwell!" msgstr "Selamat Datang di Shotwell!" -#: src/Dialogs.vala:2095 +#: src/Dialogs.vala:2101 msgid "To get started, import photos in any of these ways:" msgstr "Silakan memulai dengan mengimpor foto melalui cara berikut:" -#: src/Dialogs.vala:2114 +#: src/Dialogs.vala:2121 #, c-format msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>" msgstr "Pilih <span weight=\"bold\">Berkas %s Impor Dari Folder</span>" -#: src/Dialogs.vala:2115 +#: src/Dialogs.vala:2122 msgid "Drag and drop photos onto the Shotwell window" msgstr "Ambil dan letakkan foto ke jendela Shotwell" -#: src/Dialogs.vala:2116 +#: src/Dialogs.vala:2123 msgid "Connect a camera to your computer and import" msgstr "Sambungkan kamera ke komputer dan lakukan impor" -#: src/Dialogs.vala:2126 +#: src/Dialogs.vala:2134 #, c-format msgid "_Import photos from your %s folder" msgstr "_Impor foto dari folder %s" -#: src/Dialogs.vala:2133 +#: src/Dialogs.vala:2141 msgid "You can also import photos in any of these ways:" -msgstr "Anda juga dapat mengimpor foto dengan cara berikut" +msgstr "Anda juga dapat mengimpor foto dengan cara berikut:" -#: src/Dialogs.vala:2143 -msgid "_Don't show this message again" -msgstr "_Jangan tampilkan pesan ini pada masa mendatang" +#: src/Dialogs.vala:2152 +msgid "_Don’t show this message again" +msgstr "Janga_n tampilkan pesan ini lagi" -#: src/Dialogs.vala:2178 +#: src/Dialogs.vala:2189 #, c-format msgid "Import photos from your %s library" msgstr "Impor foto dari %s pustakamu" @@ -3550,141 +3803,142 @@ msgstr "Impor foto dari %s pustakamu" #. We're installed system-wide, so use the system help. #. We're being run from the build directory; we'll have to handle clicks to this #. link manually ourselves, due to a limitation of help: URIs. -#: src/Dialogs.vala:2325 src/Dialogs.vala:2329 +#: src/Dialogs.vala:2335 src/Dialogs.vala:2339 msgid "(Help)" msgstr "(Bantuan)" -#: src/Dialogs.vala:2338 +#: src/Dialogs.vala:2346 #, c-format msgid "Year%sMonth%sDay" msgstr "Tahun%sBulan%sHari" -#: src/Dialogs.vala:2340 +#: src/Dialogs.vala:2348 #, c-format msgid "Year%sMonth" msgstr "Tahun%sBulan" -#: src/Dialogs.vala:2342 +#: src/Dialogs.vala:2350 #, c-format msgid "Year%sMonth-Day" msgstr "Tahun%sBulan-Hari" -#: src/Dialogs.vala:2344 +#: src/Dialogs.vala:2352 msgid "Year-Month-Day" msgstr "Tahun-Bulan-Hari" -#: src/Dialogs.vala:2345 src/editing_tools/EditingTools.vala:781 +#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782 msgid "Custom" msgstr "Bebas" #. Invalid pattern. -#: src/Dialogs.vala:2582 +#: src/Dialogs.vala:2590 msgid "Invalid pattern" msgstr "Pola tak sah" #. This function is used to determine whether or not files should be copied or linked when imported. #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel. -#: src/Dialogs.vala:2684 +#: src/Dialogs.vala:2692 msgid "" "Shotwell can copy the photos into your library folder or it can import them " "without copying." msgstr "" -"Shotwell dapat menyalin foto foto ke folder album ataupun mengimpor tanpa " -"menyalin" +"Shotwell dapat menyalin foto ke dalam folder pustaka atau mengimpor mereka " +"tanpa menyalin." -#: src/Dialogs.vala:2689 +#: src/Dialogs.vala:2697 msgid "Co_py Photos" msgstr "Sa_lin Foto" -#: src/Dialogs.vala:2690 +#: src/Dialogs.vala:2698 msgid "_Import in Place" msgstr "_Impor di Lokasi" -#: src/Dialogs.vala:2691 +#: src/Dialogs.vala:2699 msgid "Import to Library" msgstr "Impor ke Album" -#: src/Dialogs.vala:2701 src/PhotoPage.vala:3085 +#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874 msgid "Remove From Library" msgstr "Hapus Dari Album" -#: src/Dialogs.vala:2702 src/PhotoPage.vala:3085 +#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874 msgid "Removing Photo From Library" msgstr "Hapus Foto dari Album" -#: src/Dialogs.vala:2702 +#: src/Dialogs.vala:2710 msgid "Removing Photos From Library" msgstr "Hapus Foto Dari Album" -#: src/Dialogs.vala:2716 +#: src/Dialogs.vala:2724 #, c-format msgid "" -"This will remove the photo/video from your Shotwell library. Would you also " +"This will remove the photo/video from your Shotwell library. Would you also " "like to move the file to your desktop trash?\n" "\n" "This action cannot be undone." msgid_plural "" -"This will remove %d photos/videos from your Shotwell library. Would you " -"also like to move the files to your desktop trash?\n" +"This will remove %d photos/videos from your Shotwell library. Would you also " +"like to move the files to your desktop trash?\n" "\n" "This action cannot be undone." msgstr[0] "" -"Anda dapat menghapus %d foto/video ini dari Album saja atau memindahkannya " -"ke tempat pembuangan. Mana yang Anda pilih?\n" +"Ini akan menghapus %d foto/video dari pustaka Shotwell Anda. Apakah Anda " +"juga hendak memindahkan berkas-berkas tersebut ke tong sampah desktop?\n" "\n" -"(proses ini tidak dapat dikembalikan ke semula)" +"Aksi ini tidak dapat dikembalikan ke semula." -#: src/Dialogs.vala:2720 +#: src/Dialogs.vala:2728 #, c-format msgid "" -"This will remove the video from your Shotwell library. Would you also like " +"This will remove the video from your Shotwell library. Would you also like " "to move the file to your desktop trash?\n" "\n" "This action cannot be undone." msgid_plural "" -"This will remove %d videos from your Shotwell library. Would you also like " +"This will remove %d videos from your Shotwell library. Would you also like " "to move the files to your desktop trash?\n" "\n" "This action cannot be undone." msgstr[0] "" -"Anda dapat menghapus %d video ini dari Album saja atau memindahkannya ke " -"tempat pembuangan. Mana yang Anda pilih?\n" +"Ini akan menghapus %d video dari pustaka Shotwell Anda. Apakah Anda juga " +"hendak memindahkan berkas-berkas tersebut ke tong sampah desktop?\n" "\n" -"(proses ini tidak dapat dikembalikan ke semula)" +"Aksi ini tidak dapat dikembalikan ke semula." -#: src/Dialogs.vala:2724 +#: src/Dialogs.vala:2732 #, c-format msgid "" -"This will remove the photo from your Shotwell library. Would you also like " +"This will remove the photo from your Shotwell library. Would you also like " "to move the file to your desktop trash?\n" "\n" "This action cannot be undone." msgid_plural "" -"This will remove %d photos from your Shotwell library. Would you also like " +"This will remove %d photos from your Shotwell library. Would you also like " "to move the files to your desktop trash?\n" "\n" "This action cannot be undone." msgstr[0] "" -"Anda dapat menghapus %d foto ini dari Album saja atau memindahkannya ke " -"tempat pembuangan. Mana yang Anda pilih?\n" +"Ini akan menghapus %d foto dari pustaka Shotwell Anda. Apakah Anda juga " +"hendak memindahkan berkas-berkas tersebut ke tong sampah desktop?\n" "\n" -"(proses ini tidak dapat dikembalikan ke semula)" +"Aksi ini tidak dapat dikembalikan ke semula." -#: src/Dialogs.vala:2756 +#: src/Dialogs.vala:2764 #, c-format msgid "" -"The photo or video cannot be moved to your desktop trash. Delete this file?" +"The photo or video cannot be moved to your desktop trash. Delete this file?" msgid_plural "" -"%d photos/videos cannot be moved to your desktop trash. Delete these files?" +"%d photos/videos cannot be moved to your desktop trash. Delete these files?" msgstr[0] "" -"Foto/video %d tidak dapat dipindahkan ke tempat pembuangan. Hapus berkas ini?" +"%d foto/video tidak dapat dipindahkan ke tong sampah desktop Anda. Hapus " +"berkas ini?" #. Alert the user that the files were not removed. -#: src/Dialogs.vala:2773 +#: src/Dialogs.vala:2781 #, c-format msgid "The photo or video cannot be deleted." msgid_plural "%d photos/videos cannot be deleted." -msgstr[0] "Foto/video %d tidak dapat dihapus" +msgstr[0] "%d foto/video tidak dapat dihapus." #: src/Dimensions.vala:23 msgid "Width" @@ -3694,127 +3948,17 @@ msgstr "Lebar" msgid "Height" msgstr "Tinggi" -#: src/direct/DirectPhotoPage.vala:46 src/library/LibraryWindow.vala:335 -msgid "_File" -msgstr "_Berkas" - -#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:432 -#: src/Resources.vala:175 -msgid "_Save" -msgstr "_Simpan" - -#: src/direct/DirectPhotoPage.vala:52 -msgid "Save photo" -msgstr "Simpan foto" - -#: src/direct/DirectPhotoPage.vala:57 -msgid "Save _As..." -msgstr "Simpan seb_agai..." - -#: src/direct/DirectPhotoPage.vala:58 -msgid "Save photo with a different name" -msgstr "Simpan foto dengan nama lain" - -#: src/direct/DirectPhotoPage.vala:69 -msgid "Print the photo to a printer connected to your computer" -msgstr "Cetak foto ke pencetak yang terhubung ke komputer ini" - -#: src/direct/DirectPhotoPage.vala:73 src/library/LibraryWindow.vala:339 -#: src/Resources.vala:159 -msgid "_Edit" -msgstr "S_unting" - -#: src/direct/DirectPhotoPage.vala:77 src/library/LibraryWindow.vala:347 -msgid "_Photo" -msgstr "_Foto" - -#: src/direct/DirectPhotoPage.vala:81 src/PhotoPage.vala:2416 -msgid "T_ools" -msgstr "P_eralatan" - -#: src/direct/DirectPhotoPage.vala:86 src/PhotoPage.vala:2421 -msgid "_Previous Photo" -msgstr "Foto Se_belumnya" - -#: src/direct/DirectPhotoPage.vala:87 src/PhotoPage.vala:2422 -msgid "Previous Photo" -msgstr "Foto Sebelumnya" - -#: src/direct/DirectPhotoPage.vala:92 src/PhotoPage.vala:2427 -msgid "_Next Photo" -msgstr "Foto B_erikutnya" - -#: src/direct/DirectPhotoPage.vala:93 src/PhotoPage.vala:2428 -msgid "Next Photo" -msgstr "Foto Berikutnya" - -#: src/direct/DirectPhotoPage.vala:165 src/library/LibraryWindow.vala:343 -#: src/PhotoPage.vala:2412 -msgid "_View" -msgstr "_Tampilkan" - -#: src/direct/DirectPhotoPage.vala:169 src/library/LibraryWindow.vala:363 -#: src/Resources.vala:162 -msgid "_Help" -msgstr "Ba_ntuan" - -#: src/direct/DirectPhotoPage.vala:174 src/MediaPage.vala:340 -#: src/PhotoPage.vala:2591 src/Resources.vala:183 -msgid "Zoom _In" -msgstr "Zum _Masuk" - -#: src/direct/DirectPhotoPage.vala:175 src/PhotoPage.vala:2592 -msgid "Increase the magnification of the photo" -msgstr "Tingkatkan perbesaran foto" - -#: src/direct/DirectPhotoPage.vala:180 src/MediaPage.vala:346 -#: src/PhotoPage.vala:2597 src/Resources.vala:184 -msgid "Zoom _Out" -msgstr "Zum _Keluar" - -#: src/direct/DirectPhotoPage.vala:181 src/PhotoPage.vala:2598 -msgid "Decrease the magnification of the photo" -msgstr "Surutkan perbesaran foto" - -#: src/direct/DirectPhotoPage.vala:186 src/PhotoPage.vala:2603 -msgid "Fit to _Page" -msgstr "_Pas ke laman" - -#: src/direct/DirectPhotoPage.vala:187 src/PhotoPage.vala:2604 -msgid "Zoom the photo to fit on the screen" -msgstr "Zum foto untuk pas ke layar" - -#: src/direct/DirectPhotoPage.vala:193 src/PhotoPage.vala:2610 -#, no-c-format -msgid "Zoom _100%" -msgstr "Zum _100%" - -#: src/direct/DirectPhotoPage.vala:195 src/PhotoPage.vala:2612 -#, no-c-format -msgid "Zoom the photo to 100% magnification" -msgstr "Zum foto ke perbesaran 100%" - -#: src/direct/DirectPhotoPage.vala:201 src/PhotoPage.vala:2618 -#, no-c-format -msgid "Zoom _200%" -msgstr "Zum _200%" - -#: src/direct/DirectPhotoPage.vala:203 src/PhotoPage.vala:2620 -#, no-c-format -msgid "Zoom the photo to 200% magnification" -msgstr "Zum foto ke perbesaran 200%" - -#: src/direct/DirectPhotoPage.vala:227 +#: src/direct/DirectPhotoPage.vala:99 #, c-format msgid "%s does not exist." msgstr "%s tidak ada." -#: src/direct/DirectPhotoPage.vala:229 +#: src/direct/DirectPhotoPage.vala:101 #, c-format msgid "%s is not a file." msgstr "%s bukan berkas." -#: src/direct/DirectPhotoPage.vala:231 +#: src/direct/DirectPhotoPage.vala:103 #, c-format msgid "" "%s does not support the file format of\n" @@ -3823,37 +3967,34 @@ msgstr "" "%s tidak dapat mendukung berkas jenis\n" "%s." -#: src/direct/DirectPhotoPage.vala:248 -#, fuzzy, c-format -#| msgid "" -#| "Unable to print photo:\n" -#| "\n" -#| "%s" +#: src/direct/DirectPhotoPage.vala:120 +#, c-format msgid "Unable open photo %s. Sorry." -msgstr "" -"Foto tidak dapat dicetak:\n" -"\n" -"%s" +msgstr "Tidak bisa membuka foto %s. Maaf." -#: src/direct/DirectPhotoPage.vala:432 +#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8 +msgid "_Save" +msgstr "_Simpan" + +#: src/direct/DirectPhotoPage.vala:316 msgid "_Save a Copy" msgstr "Buat _Salinan" -#: src/direct/DirectPhotoPage.vala:435 +#: src/direct/DirectPhotoPage.vala:319 #, c-format msgid "Lose changes to %s?" msgstr "Jangan simpan perubahan pada %s?" -#: src/direct/DirectPhotoPage.vala:436 +#: src/direct/DirectPhotoPage.vala:320 msgid "Close _without Saving" msgstr "Tutup _tanpa menyimpan" -#: src/direct/DirectPhotoPage.vala:469 +#: src/direct/DirectPhotoPage.vala:353 #, c-format msgid "Error while saving to %s: %s" msgstr "Ada kesalahan saat menyimpan ke %s: %s" -#: src/direct/DirectPhotoPage.vala:497 src/direct/DirectPhotoPage.vala:518 +#: src/direct/DirectPhotoPage.vala:383 src/direct/DirectPhotoPage.vala:404 msgid "Save As" msgstr "Simpan Sebagai" @@ -3863,193 +4004,201 @@ msgstr "Simpan Sebagai" msgid "Unable to monitor %s: Not a directory (%s)" msgstr "Gagal memantau %s: Bukan direktori (%s)" -#: src/editing_tools/EditingTools.vala:665 +#: src/editing_tools/EditingTools.vala:666 msgid "Return to current photo dimensions" msgstr "Kembalikan ukuran foto saat ini" -#: src/editing_tools/EditingTools.vala:668 +#: src/editing_tools/EditingTools.vala:669 msgid "Set the crop for this photo" msgstr "Atur pemotongan foto ini" -#: src/editing_tools/EditingTools.vala:680 +#: src/editing_tools/EditingTools.vala:681 msgid "Pivot the crop rectangle between portrait and landscape orientations" msgstr "Atur kotak pemotongan antara orientasi mendatar dan berdiri" -#: src/editing_tools/EditingTools.vala:753 +#: src/editing_tools/EditingTools.vala:754 msgid "Unconstrained" msgstr "Tanpa batas" -#: src/editing_tools/EditingTools.vala:754 +#: src/editing_tools/EditingTools.vala:755 msgid "Square" msgstr "Kotak" -#: src/editing_tools/EditingTools.vala:755 +#: src/editing_tools/EditingTools.vala:756 msgid "Screen" msgstr "Seukuran Layar" -#: src/editing_tools/EditingTools.vala:757 -#: src/editing_tools/EditingTools.vala:760 -#: src/editing_tools/EditingTools.vala:770 -#: src/editing_tools/EditingTools.vala:780 +#: src/editing_tools/EditingTools.vala:758 +#: src/editing_tools/EditingTools.vala:761 +#: src/editing_tools/EditingTools.vala:771 +#: src/editing_tools/EditingTools.vala:781 msgid "-" msgstr "-" -#: src/editing_tools/EditingTools.vala:758 -msgid "SD Video (4 : 3)" +#: src/editing_tools/EditingTools.vala:759 +msgid "SD Video (4 ∶ 3)" msgstr "Video SD (4:3)" -#: src/editing_tools/EditingTools.vala:759 -msgid "HD Video (16 : 9)" +#: src/editing_tools/EditingTools.vala:760 +msgid "HD Video (16 ∶ 9)" msgstr "Video HD (16:9)" -#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:817 -msgid "Wallet (2 x 3 in.)" -msgstr "Dompet (2 x 3 inci)" +#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792 +msgid "Wallet (2 × 3 in.)" +msgstr "Dompet (2 x 3 in.)" -#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:820 -msgid "Notecard (3 x 5 in.)" -msgstr "Kertas catatan (3 x 5 inci)" +#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795 +msgid "Notecard (3 × 5 in.)" +msgstr "Kertas catatan (3 x 5 in.)" -#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:823 -msgid "4 x 6 in." -msgstr "4 x 6 inci." +#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798 +msgid "4 × 6 in." +msgstr "4 x 6 in." -#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:826 -msgid "5 x 7 in." -msgstr "5 x 7 inci" +#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801 +msgid "5 × 7 in." +msgstr "5 x 7 in." -#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:829 -msgid "8 x 10 in." -msgstr "8 x 10 inci" +#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804 +msgid "8 × 10 in." +msgstr "8 x 10 in." -#: src/editing_tools/EditingTools.vala:766 -msgid "Letter (8.5 x 11 in.)" +#: src/editing_tools/EditingTools.vala:767 +msgid "Letter (8.5 × 11 in.)" msgstr "Letter (8.5 x 11 in.)" -#: src/editing_tools/EditingTools.vala:767 src/Printing.vala:832 -msgid "11 x 14 in." -msgstr "11 x 14 inci" +#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807 +msgid "11 × 14 in." +msgstr "11 x 14 in." -#: src/editing_tools/EditingTools.vala:768 -msgid "Tabloid (11 x 17 in.)" +#: src/editing_tools/EditingTools.vala:769 +msgid "Tabloid (11 × 17 in.)" msgstr "Tabloid (11 x 17 in.)" -#: src/editing_tools/EditingTools.vala:769 src/Printing.vala:835 -msgid "16 x 20 in." -msgstr "16 x 20 inci" +#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810 +msgid "16 × 20 in." +msgstr "16 × 20 in." -#: src/editing_tools/EditingTools.vala:771 src/Printing.vala:841 -msgid "Metric Wallet (9 x 13 cm)" -msgstr "Dompet (9 x 13 cm)" +#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816 +msgid "Metric Wallet (9 × 13 cm)" +msgstr "Dompet Metrik (9 x 13 cm)" -#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:844 -msgid "Postcard (10 x 15 cm)" +#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819 +msgid "Postcard (10 × 15 cm)" msgstr "Kartupos (10 x 15 cm)" -#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:847 -msgid "13 x 18 cm" +#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822 +msgid "13 × 18 cm" msgstr "13 x 18 cm" -#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:850 -msgid "18 x 24 cm" +#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825 +msgid "18 × 24 cm" msgstr "18 x 24 cm" -#: src/editing_tools/EditingTools.vala:775 -msgid "A4 (210 x 297 mm)" +#: src/editing_tools/EditingTools.vala:776 +msgid "A4 (210 × 297 mm)" msgstr "A4 (210 x 297 mm)" -#: src/editing_tools/EditingTools.vala:776 src/Printing.vala:853 -msgid "20 x 30 cm" +#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828 +msgid "20 × 30 cm" msgstr "20 x 30 cm" -#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:856 -msgid "24 x 40 cm" +#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831 +msgid "24 × 40 cm" msgstr "24 x 40 cm" -#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:859 -msgid "30 x 40 cm" +#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834 +msgid "30 × 40 cm" msgstr "30 x 40 cm" -#: src/editing_tools/EditingTools.vala:779 -msgid "A3 (297 x 420 mm)" +#: src/editing_tools/EditingTools.vala:780 +msgid "A3 (297 × 420 mm)" msgstr "A3 (297 x 420 mm)" -#: src/editing_tools/EditingTools.vala:1872 src/Properties.vala:395 +#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398 msgid "Size:" msgstr "Ukuran:" -#: src/editing_tools/EditingTools.vala:1887 +#: src/editing_tools/EditingTools.vala:1895 msgid "Close the red-eye tool" msgstr "Tutup penghilang mata merah" -#: src/editing_tools/EditingTools.vala:1890 +#: src/editing_tools/EditingTools.vala:1898 msgid "Remove any red-eye effects in the selected region" msgstr "Hilangkan efek mata merah pada area yang diinginkan" -#: src/editing_tools/EditingTools.vala:2226 +#: src/editing_tools/EditingTools.vala:2238 #: src/editing_tools/StraightenTool.vala:102 msgid "_Reset" msgstr "_Reset" #. fit both on the top line, emit and move on -#: src/editing_tools/EditingTools.vala:2240 src/Properties.vala:436 -#: src/Properties.vala:440 src/Properties.vala:447 +#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439 +#: src/Properties.vala:443 src/Properties.vala:450 msgid "Exposure:" msgstr "Bukaan:" -#: src/editing_tools/EditingTools.vala:2248 +#: src/editing_tools/EditingTools.vala:2261 +msgid "Contrast:" +msgstr "Kontras:" + +#: src/editing_tools/EditingTools.vala:2270 msgid "Saturation:" msgstr "Saturasi:" -#: src/editing_tools/EditingTools.vala:2256 +#: src/editing_tools/EditingTools.vala:2279 msgid "Tint:" msgstr "Tint:" -#: src/editing_tools/EditingTools.vala:2265 +#: src/editing_tools/EditingTools.vala:2289 msgid "Temperature:" msgstr "Suhu:" -#: src/editing_tools/EditingTools.vala:2273 +#: src/editing_tools/EditingTools.vala:2298 msgid "Shadows:" msgstr "Kegelapan:" -#: src/editing_tools/EditingTools.vala:2281 +#: src/editing_tools/EditingTools.vala:2307 msgid "Highlights:" msgstr "Highlight:" -#: src/editing_tools/EditingTools.vala:2335 +#: src/editing_tools/EditingTools.vala:2363 msgid "Reset Colors" msgstr "Reset Warna" -#: src/editing_tools/EditingTools.vala:2335 +#: src/editing_tools/EditingTools.vala:2363 msgid "Reset all color adjustments to original" msgstr "Kembalikan warna ke nilai aslinya" -#: src/editing_tools/EditingTools.vala:2687 +#: src/editing_tools/EditingTools.vala:2722 msgid "Temperature" msgstr "Suhu" -#: src/editing_tools/EditingTools.vala:2700 +#: src/editing_tools/EditingTools.vala:2734 msgid "Tint" msgstr "Tint" -#: src/editing_tools/EditingTools.vala:2713 +#: src/editing_tools/EditingTools.vala:2746 +msgid "Contrast" +msgstr "Kontras" + +#: src/editing_tools/EditingTools.vala:2760 msgid "Saturation" msgstr "Saturasi" -#: src/editing_tools/EditingTools.vala:2726 +#: src/editing_tools/EditingTools.vala:2773 msgid "Exposure" msgstr "Bukaan" -#: src/editing_tools/EditingTools.vala:2739 +#: src/editing_tools/EditingTools.vala:2786 msgid "Shadows" msgstr "Kegelapan" -#: src/editing_tools/EditingTools.vala:2752 +#: src/editing_tools/EditingTools.vala:2799 msgid "Highlights" msgstr "Highlight" -#: src/editing_tools/EditingTools.vala:2762 +#: src/editing_tools/EditingTools.vala:2809 msgid "Contrast Expansion" msgstr "Naikkan Kontras" @@ -4057,7 +4206,8 @@ msgstr "Naikkan Kontras" msgid "Angle:" msgstr "Sudut:" -#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202 +#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:203 +#: ui/direct.ui:144 ui/photo.ui:233 msgid "_Straighten" msgstr "_Luruskan" @@ -4071,56 +4221,48 @@ msgid "%d Photo/Video" msgid_plural "%d Photos/Videos" msgstr[0] "%d Foto/Video" -#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:355 +#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358 #, c-format msgid "%d Video" msgid_plural "%d Videos" msgstr[0] "%d Video" -#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:353 +#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356 #, c-format msgid "%d Photo" msgid_plural "%d Photos" msgstr[0] "%d Foto" -#: src/events/EventPage.vala:129 +#: src/events/EventPage.vala:128 msgid "No Event" msgstr "Tidak Ada Rangkaian" -#: src/events/EventsDirectoryPage.vala:130 src/MediaPage.vala:457 -msgid "_Comments" -msgstr "_Komentar" - -#: src/events/EventsDirectoryPage.vala:131 -msgid "Display the comment of each event" -msgstr "Tampilkan komentar setiap foto" - -#: src/events/EventsDirectoryPage.vala:155 +#: src/events/EventsDirectoryPage.vala:150 msgid "No events" msgstr "Tidak ada rangkaian" -#: src/events/EventsDirectoryPage.vala:159 +#: src/events/EventsDirectoryPage.vala:154 msgid "No events found" msgstr "Tidak ada rangkaian ditemukan" -#: src/events/EventsDirectoryPage.vala:230 +#: src/events/EventsDirectoryPage.vala:227 msgid "All Events" msgstr "Semua Kejadian" -#: src/events/EventsDirectoryPage.vala:244 +#: src/events/EventsDirectoryPage.vala:241 msgid "Undated" msgstr "Tidak bertanggal" -#: src/events/EventsDirectoryPage.vala:245 +#: src/events/EventsDirectoryPage.vala:242 msgid "%Y" msgstr "%Y" -#: src/events/EventsDirectoryPage.vala:246 +#: src/events/EventsDirectoryPage.vala:243 msgid "%B" msgstr "%B" #. if no name, pretty up the start time -#: src/Event.vala:751 +#: src/Event.vala:753 #, c-format msgid "Event %s" msgstr "Rangkaian %s" @@ -4136,7 +4278,7 @@ msgstr "Mengekspor" #: src/Exporter.vala:317 #, c-format -msgid "File %s already exists. Replace?" +msgid "File %s already exists. Replace?" msgstr "Berkas %s sudah ada. Timpa?" #: src/Exporter.vala:319 @@ -4155,41 +4297,32 @@ msgstr "Timpa Semu_a" msgid "Export" msgstr "Ekspor" -#: src/folders/Branch.vala:141 +#: src/folders/Branch.vala:144 msgid "Folders" msgstr "Folder" -#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:1191 +#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412 msgid "Library" msgstr "Album" -#: src/library/Branch.vala:97 src/SearchFilter.vala:593 -#: src/SearchFilter.vala:594 +#: src/library/Branch.vala:97 src/SearchFilter.vala:1083 msgid "Photos" msgstr "Foto" -#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:587 -#: src/SearchFilter.vala:588 src/SearchFilter.vala:987 +#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102 +#: src/SearchFilter.vala:1103 msgid "Flagged" msgstr "Ditandai" #: src/library/ImportQueuePage.vala:8 -msgid "Importing..." -msgstr "Mengimpor..." +msgid "Importing…" +msgstr "Mengimpor…" -#: src/library/ImportQueuePage.vala:67 -msgid "_Stop Import" -msgstr "_Hentikan Impor" - -#: src/library/ImportQueuePage.vala:68 -msgid "Stop importing photos" -msgstr "Hentikan proses impor foto" +#: src/library/ImportQueuePage.vala:129 +msgid "Preparing to import…" +msgstr "Bersiap mengimpor…" -#: src/library/ImportQueuePage.vala:124 -msgid "Preparing to import..." -msgstr "Menyiapkan impor..." - -#: src/library/ImportQueuePage.vala:151 +#: src/library/ImportQueuePage.vala:156 #, c-format msgid "Imported %s" msgstr "%s diimpor" @@ -4198,120 +4331,19 @@ msgstr "%s diimpor" msgid "Last Import" msgstr "Impor terakhir" -#: src/library/LibraryWindow.vala:285 -msgid "_Import From Folder..." -msgstr "_Impor Dari Folder ..." - -#: src/library/LibraryWindow.vala:286 -msgid "Import photos from disk to library" -msgstr "Impor foto dari cakram ke album" - -#: src/library/LibraryWindow.vala:293 -msgid "Import From _Application..." -msgstr "Impor Dari _Aplikasi..." - -#: src/library/LibraryWindow.vala:297 -msgid "Sort _Events" -msgstr "_Rangkaian Dengan Urutan" - -#: src/library/LibraryWindow.vala:307 -msgid "Empty T_rash" -msgstr "Hapus Pe_rmanen Foto Buangan" - -#: src/library/LibraryWindow.vala:308 -msgid "Delete all photos in the trash" -msgstr "Hapus semua foto yang pernah dibuang" - -#: src/library/LibraryWindow.vala:313 -msgid "View Eve_nt for Photo" -msgstr "Lihat Eve_nt Foto" - -#: src/library/LibraryWindow.vala:317 -msgid "_Find" -msgstr "_Cari" - -#: src/library/LibraryWindow.vala:318 -msgid "Find photos and videos by search criteria" -msgstr "Cari foto dan video menurut kriteria pencarian" - -#: src/library/LibraryWindow.vala:329 src/searches/Branch.vala:77 -#: src/sidebar/Tree.vala:199 -msgid "Ne_w Saved Search..." -msgstr "Pencarian Tersimpan B_aru" - -#: src/library/LibraryWindow.vala:351 -msgid "_Photos" -msgstr "_Foto-foto" - -#: src/library/LibraryWindow.vala:355 -msgid "Even_ts" -msgstr "_Rangkaian" - -#: src/library/LibraryWindow.vala:359 src/MediaPage.vala:469 -msgid "Ta_gs" -msgstr "Tan_da" - -#: src/library/LibraryWindow.vala:374 -msgid "_Basic Information" -msgstr "Informasi _Dasar" - -#: src/library/LibraryWindow.vala:375 -msgid "Display basic information for the selection" -msgstr "Tampilkan informasi dasar foto terpilih" - -#: src/library/LibraryWindow.vala:380 -msgid "E_xtended Information" -msgstr "Informasi _Lanjut" - -#: src/library/LibraryWindow.vala:381 -msgid "Display extended information for the selection" -msgstr "Tampilkan informasi lanjutan foto terpilih" - -#: src/library/LibraryWindow.vala:386 -msgid "_Search Bar" -msgstr "_Bilah Pencarian" - -#: src/library/LibraryWindow.vala:387 -msgid "Display the search bar" -msgstr "Tampilkan bilah pencarian" - -#: src/library/LibraryWindow.vala:392 -msgid "S_idebar" -msgstr "Bilah S_isi" - -#: src/library/LibraryWindow.vala:393 -msgid "Display the sidebar" -msgstr "Tampilkan bilah sisi" - -#: src/library/LibraryWindow.vala:405 src/MediaPage.vala:515 -msgid "_Ascending" -msgstr "N_aik" - -#: src/library/LibraryWindow.vala:406 src/MediaPage.vala:516 -msgid "Sort photos in an ascending order" -msgstr "Urutkan foto dengan urut naik" - -#: src/library/LibraryWindow.vala:412 src/MediaPage.vala:521 -msgid "D_escending" -msgstr "T_urun" - -#: src/library/LibraryWindow.vala:413 src/MediaPage.vala:522 -msgid "Sort photos in a descending order" -msgstr "Urutkan foto dengan urut turun" - -#: src/library/LibraryWindow.vala:651 +#: src/library/LibraryWindow.vala:507 msgid "Import From Folder" msgstr "Impor Dari Folder" -#: src/library/LibraryWindow.vala:720 +#: src/library/LibraryWindow.vala:576 ui/trash.ui:288 msgid "Empty Trash" msgstr "Hapus Permanen Foto Buangan" -#: src/library/LibraryWindow.vala:720 -msgid "Emptying Trash..." -msgstr "Foto Buangan Sedang Dihapus Permanen..." +#: src/library/LibraryWindow.vala:576 +msgid "Emptying Trash…" +msgstr "Mengosongkan Tong Sampah…" -#: src/library/LibraryWindow.vala:879 +#: src/library/LibraryWindow.vala:772 #, c-format msgid "" "Shotwell is configured to import photos to your home directory.\n" @@ -4324,43 +4356,43 @@ msgstr "" "Preferensi %s</span>.\n" "Apakah Anda ingin melanjutkan mengimpor foto?" -#: src/library/LibraryWindow.vala:882 ui/shotwell.ui:784 +#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142 msgid "Library Location" -msgstr "Lokasi Album:" +msgstr "Lokasi Pustaka" #. TODO: Specify which directory/file. -#: src/library/LibraryWindow.vala:895 +#: src/library/LibraryWindow.vala:788 msgid "Photos cannot be imported from this directory." msgstr "Foto tidak dapat diimpor dari direktori tersebut." -#: src/library/LibraryWindow.vala:1181 +#: src/library/LibraryWindow.vala:1068 #, c-format msgid "%s (%d%%)" msgstr "%s (%d%%)" -#: src/library/LibraryWindow.vala:1225 src/library/LibraryWindow.vala:1236 -msgid "Updating library..." -msgstr "Memperbaharui album..." +#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123 +msgid "Updating library…" +msgstr "Memutakhirkan pustaka…" -#: src/library/LibraryWindow.vala:1242 -msgid "Preparing to auto-import photos..." -msgstr "Bersiap impor foto otomatis..." +#: src/library/LibraryWindow.vala:1129 +msgid "Preparing to auto-import photos…" +msgstr "Bersiap mengimpor otomatis foto…" -#: src/library/LibraryWindow.vala:1247 -msgid "Auto-importing photos..." -msgstr "Mengimpor foto otomatis" +#: src/library/LibraryWindow.vala:1134 +msgid "Auto-importing photos…" +msgstr "Mengimpor otomatis foto…" -#: src/library/LibraryWindow.vala:1255 -msgid "Writing metadata to files..." -msgstr "Menulis metadata ke berkas..." +#: src/library/LibraryWindow.vala:1142 +msgid "Writing metadata to files…" +msgstr "Menulis metadata ke berkas…" #: src/library/OfflinePage.vala:8 msgid "Missing Files" msgstr "Berkas Hilang" -#: src/library/OfflinePage.vala:106 -msgid "Deleting..." -msgstr "Menghapus..." +#: src/library/OfflinePage.vala:110 +msgid "Deleting…" +msgstr "Menghapus…" #: src/library/TrashPage.vala:8 msgid "Trash" @@ -4381,77 +4413,78 @@ msgstr "Menghapus foto-foto" #: src/main.vala:54 #, c-format msgid "" -"Your photo library is not compatible with this version of Shotwell. It " -"appears it was created by Shotwell %s (schema %d). This version is %s " -"(schema %d). Please use the latest version of Shotwell." +"Your photo library is not compatible with this version of Shotwell. It " +"appears it was created by Shotwell %s (schema %d). This version is %s " +"(schema %d). Please use the latest version of Shotwell." msgstr "" -"Album foto tidak kompatibel dengan versi Shotwell sekarang. Tampaknya album " -"dibuat dengan Shotwell %s (schema %d). Versi sekarang adalah %s (schema %d). " -"Harap gunakan Shotwell versi terbaru" +"Pustaka foto Anda tidak kompatibel dengan versi Shotwell ini. Tampaknya ini " +"dibuat dengan Shotwell %s (skema %d). Versi ini adalah %s (skema %d). Harap " +"gunakan Shotwell versi terbaru." #: src/main.vala:59 #, c-format msgid "" "Shotwell was unable to upgrade your photo library from version %s (schema " -"%d) to %s (schema %d). For more information please check the Shotwell Wiki " +"%d) to %s (schema %d). For more information please check the Shotwell Wiki " "at %s" msgstr "" -"Shotwell gagal meningkatkan album foto dari versi %s (schema %d) ke %s " -"(schema %d). Untuk informasi lebih lanjut, silakan periksa Shotwell Wiki di " -"%s" +"Shotwell tidak bisa meningkatkan pustaka foto Anda dari versi %s (skema %d) " +"ke %s (skema %d). Untuk informasi lebih lanjut, silakan periksa Wiki " +"Shotwell di %s" #: src/main.vala:65 #, c-format msgid "" -"Your photo library is not compatible with this version of Shotwell. It " -"appears it was created by Shotwell %s (schema %d). This version is %s " -"(schema %d). Please clear your library by deleting %s and re-import your " +"Your photo library is not compatible with this version of Shotwell. It " +"appears it was created by Shotwell %s (schema %d). This version is %s " +"(schema %d). Please clear your library by deleting %s and re-import your " "photos." msgstr "" -"Album foto tidak kompatibel dengan versi Shotwell sekarang. Tampaknya album " -"dibuat dengan Shotwell %s (schema %d). Versi sekarang adalah %s (schema %d). " -"Harap bersihkan album dengan menghapus %s dan mengimpor ulang foto" +"Pustaka foto Anda tidak kompatibel dengan versi Shotwell ini. Tampaknya ini " +"dibuat dengan Shotwell %s (skema %d). Versi ini adalah %s (skema %d). Harap " +"bersihkan pustaka Anda dengan menghapus %s dan mengimpor ulang foto-foto " +"Anda." #: src/main.vala:71 #, c-format -msgid "Unknown error attempting to verify Shotwell's database: %s" -msgstr "Kesalahan tak dikenal saat mencoba verifikasi database Shotwell: %s" +msgid "Unknown error attempting to verify Shotwell’s database: %s" +msgstr "Kesalahan tak dikenal saat mencoba verifikasi basis data Shotwell: %s" #: src/main.vala:104 msgid "Loading Shotwell" msgstr "Menjalankan Shotwell" -#: src/main.vala:294 -msgid "Path to Shotwell's private data" +#: src/main.vala:293 +msgid "Path to Shotwell’s private data" msgstr "Path ke data privat Shotwell" -#: src/main.vala:294 +#: src/main.vala:293 msgid "DIRECTORY" msgstr "DIREKTORI" -#: src/main.vala:298 +#: src/main.vala:297 msgid "Do not monitor library directory at runtime for changes" msgstr "Jangan pantau perubahan direktori pustaka saat runtime" -#: src/main.vala:302 -msgid "Don't display startup progress meter" +#: src/main.vala:301 +msgid "Don’t display startup progress meter" msgstr "Jangan tampilkan meter kemajuan awal mula" -#: src/main.vala:306 -msgid "Show the application's version" -msgstr "Menampilkan versi aplikasi" +#: src/main.vala:305 +msgid "Show the application’s version" +msgstr "Tampilkan versi aplikasi" #. init GTK (valac has already called g_threads_init()) -#: src/main.vala:338 +#: src/main.vala:342 msgid "[FILE]" msgstr "[FILE]" -#: src/main.vala:342 +#: src/main.vala:346 #, c-format -msgid "Run '%s --help' to see a full list of available command line options.\n" +msgid "Run “%s --help” to see a full list of available command line options.\n" msgstr "" -"Jalankan dengan perintah '%s --help' untuk melihat daftar opsi yang bisa " -"digunakan.\n" +"Jalankan \"%s --help\" untuk melihat daftar lengkap opsi baris perintah yang " +"tersedia.\n" #: src/MediaMonitor.vala:400 #, c-format @@ -4462,71 +4495,7 @@ msgstr "Gagal memroses pembaruan pemantauan: %s" msgid "Adjust the size of the thumbnails" msgstr "Atur ukuran gambar mini" -#: src/MediaPage.vala:341 -msgid "Increase the magnification of the thumbnails" -msgstr "Tingkatkan perbesaran gambar mini" - -#: src/MediaPage.vala:347 -msgid "Decrease the magnification of the thumbnails" -msgstr "Surutkan perbesaran gambar mini" - -#: src/MediaPage.vala:414 -msgid "Sort _Photos" -msgstr "Urutkan _Foto" - -#: src/MediaPage.vala:423 -msgid "_Play Video" -msgstr "_Mainkan Video" - -#: src/MediaPage.vala:424 -msgid "Open the selected videos in the system video player" -msgstr "Buka video-video terpilih di pemutar video" - -#: src/MediaPage.vala:428 src/PhotoPage.vala:2640 -msgid "_Developer" -msgstr "_Developer" - -#: src/MediaPage.vala:458 -msgid "Display the comment of each photo" -msgstr "Tampilkan komentar setiap foto" - -#: src/MediaPage.vala:470 -msgid "Display each photo's tags" -msgstr "Tampilkan tanda setiap foto" - -#: src/MediaPage.vala:486 -msgid "By _Title" -msgstr "Berdasarkan _Judul" - -#: src/MediaPage.vala:487 -msgid "Sort photos by title" -msgstr "Urutkan foto berdasarkan judul" - -#: src/MediaPage.vala:492 -msgid "By Exposure _Date" -msgstr "Ber_dasarkan Tanggal Pengambilan" - -#: src/MediaPage.vala:493 -msgid "Sort photos by exposure date" -msgstr "Urutkan foto berdasarkan tanggal pengambilan" - -#: src/MediaPage.vala:498 -msgid "By _Rating" -msgstr "Berdasarkan _Rating" - -#: src/MediaPage.vala:499 -msgid "Sort photos by rating" -msgstr "Urutkan foto berdasarkan rating" - -#: src/MediaPage.vala:504 -msgid "By _Filename" -msgstr "Berdasarkan _Nama Berkas" - -#: src/MediaPage.vala:505 -msgid "Sort photos by filename" -msgstr "Urutkan foto menurut nama berkasnya" - -#: src/MediaPage.vala:723 +#: src/MediaPage.vala:503 #, c-format msgid "" "Shotwell was unable to play the selected video:\n" @@ -4535,34 +4504,34 @@ msgstr "" "Shotwell gagal memutar video terpilih:\n" "%s" -#: src/Page.vala:1266 +#: src/Page.vala:1318 msgid "No photos/videos" msgstr "Tidak ada foto/video" -#: src/Page.vala:1270 -msgid "No photos/videos found" -msgstr "Foto/video tidak ditemukan" +#: src/Page.vala:1322 +msgid "No photos/videos found which match the current filter" +msgstr "Tidak ditemukan foto/video yang cocok dengan penyaring saat ini" -#: src/Page.vala:2568 +#: src/Page.vala:2628 msgid "Photos cannot be exported to this directory." msgstr "Foto tidak dapat diekspor ke direktori tersebut." #. previous button -#: src/PhotoPage.vala:533 +#: src/PhotoPage.vala:538 msgid "Previous photo" msgstr "Foto sebelumnya" #. next button -#: src/PhotoPage.vala:539 +#: src/PhotoPage.vala:544 msgid "Next photo" msgstr "Foto berikutnya" -#: src/PhotoPage.vala:1845 +#: src/PhotoPage.vala:1850 #, c-format msgid "Photo source file missing: %s" msgstr "Sumber foto asli hilang: %s" -#: src/PhotoPage.vala:3229 +#: src/PhotoPage.vala:3018 #, c-format msgid "Unable to export %s: %s" msgstr "Proses ekspor %s gagal: %s" @@ -4607,7 +4576,7 @@ msgstr "RAW" msgid "TIFF" msgstr "TIFF" -#: src/Photo.vala:3753 +#: src/Photo.vala:3755 msgid "modified" msgstr "berubah" @@ -4639,23 +4608,15 @@ msgstr "16 gambar per halaman" msgid "32 images per page" msgstr "32 gambar per halaman" -#: src/Printing.vala:348 -msgid "in." -msgstr "inci" - -#: src/Printing.vala:349 -msgid "cm" -msgstr "cm" - -#: src/Printing.vala:875 +#: src/Printing.vala:851 msgid "Image Settings" msgstr "Penataan Gambar" -#: src/Printing.vala:888 -msgid "Printing..." -msgstr "Mencetak..." +#: src/Printing.vala:864 +msgid "Printing…" +msgstr "Mencetak…" -#: src/Printing.vala:908 src/Printing.vala:1111 +#: src/Printing.vala:884 src/Printing.vala:1087 #, c-format msgid "" "Unable to print photo:\n" @@ -4666,123 +4627,123 @@ msgstr "" "\n" "%s" -#: src/Properties.vala:84 +#: src/Properties.vala:87 msgid "Today" msgstr "Hari ini" -#: src/Properties.vala:86 +#: src/Properties.vala:89 msgid "Yesterday" msgstr "Kemarin" -#: src/Properties.vala:343 +#: src/Properties.vala:346 msgid "Items:" msgstr "Jumlah Foto:" -#: src/Properties.vala:346 +#: src/Properties.vala:349 #, c-format msgid "%d Event" msgid_plural "%d Events" msgstr[0] "%d Rangkaian" #. display only one date if start and end are the same -#: src/Properties.vala:377 +#: src/Properties.vala:380 msgid "Date:" msgstr "Tanggal:" #. display only one time if start and end are the same -#: src/Properties.vala:381 +#: src/Properties.vala:384 msgid "Time:" msgstr "Jam:" #. display time range #. display date range -#: src/Properties.vala:384 src/Properties.vala:389 +#: src/Properties.vala:387 src/Properties.vala:392 msgid "From:" msgstr "Sejak:" -#: src/Properties.vala:385 src/Properties.vala:390 +#: src/Properties.vala:388 src/Properties.vala:393 msgid "To:" msgstr "Hingga:" -#: src/Properties.vala:404 +#: src/Properties.vala:407 msgid "Duration:" msgstr "Durasi:" -#: src/Properties.vala:404 +#: src/Properties.vala:407 #, c-format msgid "%.1f seconds" msgstr "%.1f detik" -#: src/Properties.vala:408 +#: src/Properties.vala:411 msgid "Developer:" msgstr "Pengembang:" #. nothing special to be done for now for Events -#: src/Properties.vala:583 +#: src/Properties.vala:586 msgid "Location:" msgstr "Letak di sistem:" -#: src/Properties.vala:586 +#: src/Properties.vala:589 msgid "File size:" msgstr "Ukuran berkas:" -#: src/Properties.vala:590 +#: src/Properties.vala:593 msgid "Current Development:" msgstr "Pengembangan Saat Ini:" -#: src/Properties.vala:592 +#: src/Properties.vala:595 msgid "Original dimensions:" msgstr "Ukuran asli:" -#: src/Properties.vala:595 +#: src/Properties.vala:598 msgid "Camera make:" msgstr "Merek kamera:" -#: src/Properties.vala:598 +#: src/Properties.vala:601 msgid "Camera model:" msgstr "Model kamera:" -#: src/Properties.vala:601 +#: src/Properties.vala:604 msgid "Flash:" msgstr "Lampu kilat:" -#: src/Properties.vala:603 +#: src/Properties.vala:606 msgid "Focal length:" msgstr "Panjang fokus:" -#: src/Properties.vala:606 +#: src/Properties.vala:609 msgid "Exposure date:" msgstr "Tanggal bukaan:" -#: src/Properties.vala:609 +#: src/Properties.vala:612 msgid "Exposure time:" msgstr "Waktu bukaan:" -#: src/Properties.vala:612 +#: src/Properties.vala:615 msgid "Exposure bias:" msgstr "Bias bukaan:" -#: src/Properties.vala:614 +#: src/Properties.vala:617 msgid "GPS latitude:" msgstr "Garis lintang GPS:" -#: src/Properties.vala:617 +#: src/Properties.vala:620 msgid "GPS longitude:" msgstr "Garis bujur GPS:" -#: src/Properties.vala:620 +#: src/Properties.vala:623 msgid "Artist:" msgstr "Pengambil gambar:" -#: src/Properties.vala:622 +#: src/Properties.vala:625 msgid "Copyright:" msgstr "Hak cipta:" -#: src/Properties.vala:624 +#: src/Properties.vala:627 msgid "Software:" msgstr "Perangkat Lunak:" -#: src/Properties.vala:641 +#: src/Properties.vala:644 msgid "Extended Information" msgstr "Informasi Lanjutan" @@ -4797,72 +4758,68 @@ msgstr "Mengunggah %d dari %d" #: src/publishing/PublishingPluginHost.vala:81 #, c-format -msgid "Publishing to %s can't continue because an error occurred:" -msgstr "Unggahan ke %s tidak dapat diteruskan karena galat berikut" +msgid "Publishing to %s can’t continue because an error occurred:" +msgstr "Publikasi ke %s tak bisa berlanjut karena terjadi kesalahan:" #: src/publishing/PublishingPluginHost.vala:84 msgid "To try publishing to another service, select one from the above menu." msgstr "Pilih dari menu untuk menggunakan layanan lain." -#: src/publishing/PublishingUI.vala:105 -msgid "The selected photos/videos were successfully published." -msgstr "Foto/video terpilih telah berhasil dikirim" - -#: src/publishing/PublishingUI.vala:107 -msgid "The selected videos were successfully published." -msgstr "Video terpilih telah berhasil dikirim" - -#: src/publishing/PublishingUI.vala:109 -msgid "The selected photos were successfully published." -msgstr "Foto tadi sudah berhasil dikirim." - -#: src/publishing/PublishingUI.vala:112 +#. Here, we check whether more than one item is being uploaded, and if so, display +#. an alternate message. +#: src/publishing/PublishingUI.vala:104 msgid "The selected video was successfully published." -msgstr "Video terpilih telah berhasil dikirim" +msgid_plural "The selected videos were successfully published." +msgstr[0] "Video yang dipilih telah berhasil dipublikasikan." -#: src/publishing/PublishingUI.vala:114 +#: src/publishing/PublishingUI.vala:109 msgid "The selected photo was successfully published." -msgstr "Foto terpilih telah berhasil dikirim" +msgid_plural "The selected photos were successfully published." +msgstr[0] "Foto yang dipilih telah berhasil dipublikasikan." + +#: src/publishing/PublishingUI.vala:115 +msgid "The selected photos/videos were successfully published." +msgstr "Foto/video yang dipilih telah berhasil dipublikasikan." -#: src/publishing/PublishingUI.vala:122 -msgid "Fetching account information..." -msgstr "Mengambil informasi akun..." +#: src/publishing/PublishingUI.vala:127 +msgid "Fetching account information…" +msgstr "Mengambil informasi akun…" -#: src/publishing/PublishingUI.vala:128 -msgid "Logging in..." -msgstr "Masuk ke sistem..." +#: src/publishing/PublishingUI.vala:133 +msgid "Logging in…" +msgstr "Sedang log masuk…" -#: src/publishing/PublishingUI.vala:188 +#: src/publishing/PublishingUI.vala:193 msgid "Publish Photos" msgstr "Kirim Foto" -#: src/publishing/PublishingUI.vala:189 +#: src/publishing/PublishingUI.vala:194 msgid "Publish photos _to:" msgstr "Kirim foto _ke:" -#: src/publishing/PublishingUI.vala:191 +#: src/publishing/PublishingUI.vala:196 msgid "Publish Videos" msgstr "Kirim Video" -#: src/publishing/PublishingUI.vala:192 +#: src/publishing/PublishingUI.vala:197 msgid "Publish videos _to" msgstr "Kirim video _ke" -#: src/publishing/PublishingUI.vala:194 +#: src/publishing/PublishingUI.vala:199 msgid "Publish Photos and Videos" msgstr "Kirim Foto dan Video" -#: src/publishing/PublishingUI.vala:195 +#: src/publishing/PublishingUI.vala:200 msgid "Publish photos and videos _to" msgstr "Kirim Foto dan Video _ke" #. There are no enabled publishing services that accept this media type, #. warn the user. -#: src/publishing/PublishingUI.vala:397 +#: src/publishing/PublishingUI.vala:410 msgid "Unable to publish" msgstr "Tidak dapat mengirim" -#: src/publishing/PublishingUI.vala:398 +#: src/publishing/PublishingUI.vala:411 #, c-format msgid "" "Shotwell cannot publish the selected items because you do not have a " @@ -4879,745 +4836,726 @@ msgstr "" msgid "Publishing" msgstr "Kirimkan" -#: src/Resources.vala:139 -msgid "Rotate _Right" -msgstr "Puta_r Kanan" - -#: src/Resources.vala:140 src/Resources.vala:145 +#: src/Resources.vala:141 src/Resources.vala:146 ui/collection.ui:151 msgid "Rotate" msgstr "Putar" -#: src/Resources.vala:141 +#: src/Resources.vala:142 msgid "Rotate Right" msgstr "Putar Kanan" -#: src/Resources.vala:142 +#: src/Resources.vala:143 ui/collection.ui:148 msgid "Rotate the photos right (press Ctrl to rotate left)" msgstr "Putar foto ke kanan (tekan Ctrl untuk putar ke kiri)" -#: src/Resources.vala:144 -msgid "Rotate _Left" -msgstr "Putar _Kiri" - -#: src/Resources.vala:146 +#: src/Resources.vala:147 msgid "Rotate Left" msgstr "Putar Kiri" -#: src/Resources.vala:147 +#: src/Resources.vala:148 msgid "Rotate the photos left" msgstr "Putar foto ke kiri" -#: src/Resources.vala:149 -msgid "Flip Hori_zontally" -msgstr "Balik hori_zontal" - -#: src/Resources.vala:150 +#: src/Resources.vala:151 msgid "Flip Horizontally" msgstr "Balik Horizontal" -#: src/Resources.vala:152 -msgid "Flip Verti_cally" -msgstr "Balik Verti_kal" - -#: src/Resources.vala:153 +#: src/Resources.vala:154 msgid "Flip Vertically" msgstr "Balik Vertikal" -#: src/Resources.vala:155 +#: src/Resources.vala:156 ui/direct.ui:191 ui/events_directory.ui:168 +#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:421 +#: ui/offline.ui:198 ui/photo.ui:404 ui/tags.ui:440 ui/trash.ui:207 msgid "_About" msgstr "Tent_ang" -#: src/Resources.vala:156 +#: src/Resources.vala:157 msgid "_Apply" msgstr "Ter_apkan" -#: src/Resources.vala:160 +#: src/Resources.vala:160 ui/direct.ui:44 ui/events_directory.ui:32 +#: ui/event.ui:47 ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32 +#: ui/photo.ui:55 ui/tags.ui:47 ui/trash.ui:37 +msgid "_Edit" +msgstr "S_unting" + +#: src/Resources.vala:161 msgid "_Forward" msgstr "Ma_ju" -#: src/Resources.vala:161 +#: src/Resources.vala:162 ui/direct.ui:62 ui/events_directory.ui:125 +#: ui/photo.ui:173 msgid "Fulls_creen" msgstr "Layar _Penuh" -#: src/Resources.vala:163 +#: src/Resources.vala:163 ui/direct.ui:173 ui/direct.ui:176 +#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420 +#: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183 +#: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180 +#: ui/offline.ui:183 ui/photo.ui:386 ui/photo.ui:389 ui/tags.ui:422 +#: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192 +msgid "_Help" +msgstr "Ba_ntuan" + +#: src/Resources.vala:164 msgid "Leave _Fullscreen" msgstr "Layar _Biasa" -#: src/Resources.vala:164 src/Resources.vala:363 +#: src/Resources.vala:165 src/Resources.vala:364 ui/tags.ui:450 msgid "_New" msgstr "_Baru" -#: src/Resources.vala:165 +#: src/Resources.vala:166 msgid "_Next" msgstr "Sela_njutnya" -#: src/Resources.vala:166 -msgid "_OK" -msgstr "_OK" - -#: src/Resources.vala:167 -msgid "_Play" -msgstr "_Putar" - -#: src/Resources.vala:168 src/Resources.vala:317 +#: src/Resources.vala:169 src/Resources.vala:318 ui/events_directory.ui:65 +#: ui/event.ui:93 ui/import.ui:68 ui/media.ui:93 ui/offline.ui:72 +#: ui/photo.ui:89 ui/tags.ui:93 ui/trash.ui:81 msgid "_Preferences" msgstr "_Pengaturan" -#: src/Resources.vala:169 +#: src/Resources.vala:170 msgid "_Previous" msgstr "Se_belumnya" -#: src/Resources.vala:170 -msgid "_Print" -msgstr "_Cetak" - -#: src/Resources.vala:171 +#: src/Resources.vala:172 ui/direct.ui:37 ui/events_directory.ui:25 +#: ui/event.ui:40 ui/import_queue.ui:31 ui/import.ui:33 ui/media.ui:40 +#: ui/offline.ui:25 ui/photo.ui:48 ui/tags.ui:40 ui/trash.ui:30 msgid "_Quit" msgstr "_Keluar" -#: src/Resources.vala:172 +#: src/Resources.vala:173 msgid "_Refresh" msgstr "Sega_rkan" -#: src/Resources.vala:174 +#: src/Resources.vala:175 msgid "_Revert" msgstr "Puli_hkan" -#: src/Resources.vala:176 +#: src/Resources.vala:177 msgid "Save _As" msgstr "Simpan Seb_agai" -#: src/Resources.vala:177 +#: src/Resources.vala:178 msgid "Sort _Ascending" msgstr "Urutkan N_aik" -#: src/Resources.vala:178 +#: src/Resources.vala:179 msgid "Sort _Descending" msgstr "Urut _Turun" -#: src/Resources.vala:179 +#: src/Resources.vala:180 msgid "_Stop" msgstr "_Berhenti" -#: src/Resources.vala:180 +#: src/Resources.vala:181 msgid "_Undelete" msgstr "Tak Jadi Hap_us" -#: src/Resources.vala:181 +#: src/Resources.vala:182 msgid "_Normal Size" msgstr "Ukuran _Normal" -#: src/Resources.vala:182 +#: src/Resources.vala:183 msgid "Best _Fit" msgstr "_Pas Terbaik" -#: src/Resources.vala:186 -msgid "_Enhance" -msgstr "Taja_mkan" +#: src/Resources.vala:184 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260 +#: ui/photo.ui:144 ui/tags.ui:260 +msgid "Zoom _In" +msgstr "Zum _Masuk" + +#: src/Resources.vala:185 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265 +#: ui/photo.ui:149 ui/tags.ui:265 +msgid "Zoom _Out" +msgstr "Zum _Keluar" -#: src/Resources.vala:187 +#: src/Resources.vala:188 ui/collection.ui:167 msgid "Enhance" msgstr "Tajamkan" -#: src/Resources.vala:188 -msgid "Automatically improve the photo's appearance" -msgstr "Membuat foto lebih tajam" +#: src/Resources.vala:189 ui/collection.ui:164 +msgid "Automatically improve the photo’s appearance" +msgstr "Secara otomatis memperbaiki penampilan foto" -#: src/Resources.vala:190 -msgid "_Copy Color Adjustments" -msgstr "Salin Penyetelan _Warna" - -#: src/Resources.vala:191 +#: src/Resources.vala:192 msgid "Copy Color Adjustments" msgstr "Salin Penyetelan Warna" -#: src/Resources.vala:192 +#: src/Resources.vala:193 msgid "Copy the color adjustments applied to the photo" msgstr "Salin penyetelan warna yang diterapkan ke foto" -#: src/Resources.vala:194 -msgid "_Paste Color Adjustments" -msgstr "Tem_pel Penyetelan Warna" - -#: src/Resources.vala:195 +#: src/Resources.vala:196 msgid "Paste Color Adjustments" msgstr "Tempel Penyetelan Warna" -#: src/Resources.vala:196 +#: src/Resources.vala:197 msgid "Apply copied color adjustments to the selected photos" msgstr "Terapkan penyetelan warna yang disalin ke foto yang dipilih" -#: src/Resources.vala:198 +#: src/Resources.vala:199 ui/direct.ui:139 ui/photo.ui:228 msgid "_Crop" -msgstr "_Potong" +msgstr "_Pangkas" -#: src/Resources.vala:199 +#: src/Resources.vala:200 msgid "Crop" -msgstr "Potong" +msgstr "Pangkas" -#: src/Resources.vala:200 -msgid "Crop the photo's size" -msgstr "Potong ukuran foto" +#: src/Resources.vala:201 +msgid "Crop the photo’s size" +msgstr "Pangkas ukuran foto" -#: src/Resources.vala:203 +#: src/Resources.vala:204 msgid "Straighten" msgstr "Luruskan" -#: src/Resources.vala:204 +#: src/Resources.vala:205 msgid "Straighten the photo" msgstr "Luruskan foto" -#: src/Resources.vala:206 +#: src/Resources.vala:207 ui/direct.ui:149 ui/photo.ui:238 msgid "_Red-eye" msgstr "Mata-me_rah" -#: src/Resources.vala:207 +#: src/Resources.vala:208 msgid "Red-eye" msgstr "Mata-merah" -#: src/Resources.vala:208 +#: src/Resources.vala:209 msgid "Reduce or eliminate any red-eye effects in the photo" msgstr "Hilangkan efek mata merah pada foto" -#: src/Resources.vala:210 +#: src/Resources.vala:211 ui/direct.ui:154 ui/photo.ui:243 msgid "_Adjust" msgstr "_Atur" -#: src/Resources.vala:211 +#: src/Resources.vala:212 msgid "Adjust" msgstr "Atur" -#: src/Resources.vala:212 -msgid "Adjust the photo's color and tone" +#: src/Resources.vala:213 +msgid "Adjust the photo’s color and tone" msgstr "Atur warna dan tonal foto" -#: src/Resources.vala:214 -msgid "Re_vert to Original" -msgstr "K_embalikan ke Asal" - -#: src/Resources.vala:215 +#: src/Resources.vala:216 msgid "Revert to Original" msgstr "Kembalikan ke Asal" -#: src/Resources.vala:217 +#: src/Resources.vala:218 msgid "Revert External E_dits" msgstr "Kembalikan Suntingan E_ksternal" -#: src/Resources.vala:218 +#: src/Resources.vala:219 msgid "Revert to the master photo" msgstr "Abaikan perubahan dan kembalikan ke foto asal" -#: src/Resources.vala:220 -msgid "Set as _Desktop Background" -msgstr "Atur sebagai Latar _Destop" - -#: src/Resources.vala:221 +#: src/Resources.vala:222 msgid "Set selected image to be the new desktop background" msgstr "Jadikan foto ini menjadi gambar latar desktop" -#: src/Resources.vala:222 -msgid "Set as _Desktop Slideshow..." -msgstr "Atur sebagai Salindia _Destop" +#: src/Resources.vala:223 +msgid "Set as _Desktop Slideshow…" +msgstr "Atur sebagai Salindia _Desktop…" -#: src/Resources.vala:224 +#: src/Resources.vala:225 ui/direct.ui:47 ui/events_directory.ui:35 +#: ui/event.ui:50 ui/import.ui:43 ui/media.ui:50 ui/offline.ui:35 +#: ui/photo.ui:58 ui/tags.ui:50 ui/trash.ui:40 msgid "_Undo" -msgstr "_Batalkan: " +msgstr "_Tak Jadi" -#: src/Resources.vala:225 +#: src/Resources.vala:226 msgid "Undo" msgstr "Batalkan" -#: src/Resources.vala:227 +#: src/Resources.vala:228 ui/direct.ui:52 ui/events_directory.ui:40 +#: ui/event.ui:55 ui/import.ui:48 ui/media.ui:55 ui/offline.ui:40 +#: ui/photo.ui:63 ui/tags.ui:55 ui/trash.ui:45 msgid "_Redo" -msgstr "_Jadikan: " +msgstr "_Jadi Lagi" -#: src/Resources.vala:228 +#: src/Resources.vala:229 msgid "Redo" msgstr "Jadikan" -#: src/Resources.vala:230 -msgid "Re_name Event..." -msgstr "Ga_nti Nama Rangkaian..." +#: src/Resources.vala:231 ui/events_directory.ui:139 ui/events_directory.ui:181 +#: ui/event.ui:393 ui/event.ui:588 +msgid "Re_name Event…" +msgstr "Ubah _Nama Peristiwa…" -#: src/Resources.vala:233 +#: src/Resources.vala:234 ui/event.ui:373 ui/event.ui:580 msgid "Make _Key Photo for Event" msgstr "Jadi_kan Foto Utama Untuk Rangkaian Ini" -#: src/Resources.vala:234 +#: src/Resources.vala:235 msgid "Make Key Photo for Event" msgstr "Jadikan Foto Utama Untuk Rangkaian Ini" -#: src/Resources.vala:236 +#: src/Resources.vala:237 ui/event.ui:382 ui/media.ui:376 ui/tags.ui:376 msgid "_New Event" msgstr "Rangkaia_n Baru" -#: src/Resources.vala:237 +#: src/Resources.vala:238 msgid "New Event" msgstr "Rangkaian Baru" -#: src/Resources.vala:239 +#: src/Resources.vala:240 msgid "Move Photos" msgstr "Pindahkan Foto" -#: src/Resources.vala:240 +#: src/Resources.vala:241 msgid "Move photos to an event" msgstr "Pindahkan foto ke sebuah rangkaian" -#: src/Resources.vala:242 +#: src/Resources.vala:243 ui/events_directory.ui:135 ui/events_directory.ui:177 msgid "_Merge Events" msgstr "_Gabungkan Rangkaian" -#: src/Resources.vala:243 +#: src/Resources.vala:244 msgid "Merge" msgstr "Gabungkan" -#: src/Resources.vala:244 +#: src/Resources.vala:245 msgid "Combine events into a single event" msgstr "Gabungkan acara-acara ke satu acara" -#: src/Resources.vala:246 +#: src/Resources.vala:247 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:478 +#: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286 msgid "_Set Rating" msgstr "_Atur Rating" -#: src/Resources.vala:247 +#: src/Resources.vala:248 msgid "Set Rating" msgstr "Atur Rating" -#: src/Resources.vala:248 +#: src/Resources.vala:249 msgid "Change the rating of your photo" msgstr "Ubah rating foto" -#: src/Resources.vala:250 +#: src/Resources.vala:251 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:511 +#: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326 msgid "_Increase" msgstr "_Naik" -#: src/Resources.vala:251 +#: src/Resources.vala:252 msgid "Increase Rating" msgstr "Naikkan Rating" -#: src/Resources.vala:253 +#: src/Resources.vala:254 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:515 +#: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331 msgid "_Decrease" msgstr "_Turun" -#: src/Resources.vala:254 +#: src/Resources.vala:255 msgid "Decrease Rating" msgstr "Turunkan Rating" -#: src/Resources.vala:256 +#: src/Resources.vala:257 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:501 +#: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314 msgid "_Unrated" msgstr "_Tanpa Rating" -#: src/Resources.vala:257 +#: src/Resources.vala:258 msgid "Unrated" msgstr "Tanpa Rating" -#: src/Resources.vala:258 +#: src/Resources.vala:259 msgid "Rate Unrated" msgstr "Belum Dirating" -#: src/Resources.vala:259 +#: src/Resources.vala:260 msgid "Setting as unrated" msgstr "Atur sebagai Tanpa Rating" -#: src/Resources.vala:260 +#: src/Resources.vala:261 msgid "Remove any ratings" msgstr "Hapus rating" -#: src/Resources.vala:262 +#: src/Resources.vala:263 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:505 +#: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319 msgid "_Rejected" msgstr "_Ditolak" -#: src/Resources.vala:263 +#: src/Resources.vala:264 msgid "Rejected" msgstr "Ditolak" -#: src/Resources.vala:264 +#: src/Resources.vala:265 msgid "Rate Rejected" msgstr "Rating Ditolak" -#: src/Resources.vala:265 +#: src/Resources.vala:266 msgid "Setting as rejected" msgstr "Atur ke ditolak" -#: src/Resources.vala:266 +#: src/Resources.vala:267 msgid "Set rating to rejected" msgstr "Atur rating ke ditolak" -#: src/Resources.vala:268 +#: src/Resources.vala:269 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196 +#: ui/offline.ui:153 ui/search_bar.ui:6 ui/tags.ui:196 ui/trash.ui:162 msgid "Rejected _Only" msgstr "_Hanya Ditolak" -#: src/Resources.vala:269 +#: src/Resources.vala:270 msgid "Rejected Only" msgstr "Hanya Ditolak" -#: src/Resources.vala:270 +#: src/Resources.vala:271 msgid "Show only rejected photos" msgstr "Tampilkan hanya foto yang ditolak" -#: src/Resources.vala:272 +#: src/Resources.vala:273 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190 +#: ui/offline.ui:147 ui/search_bar.ui:12 ui/tags.ui:190 ui/trash.ui:156 msgid "All + _Rejected" msgstr "Semua + _Ditolak" -#: src/Resources.vala:273 -#, fuzzy -#| msgid "Show all photos, including rejected" +#: src/Resources.vala:274 msgctxt "Tooltip" msgid "Show all photos, including rejected" msgstr "Tampilkan semua foto, termasuk yang ditolak" -#: src/Resources.vala:275 +#: src/Resources.vala:276 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184 +#: ui/offline.ui:141 ui/search_bar.ui:18 ui/tags.ui:184 ui/trash.ui:150 msgid "_All Photos" msgstr "Semu_a foto" #. Button tooltip -#: src/Resources.vala:277 +#: src/Resources.vala:278 msgid "Show all photos" msgstr "Tunjukkan semua foto" -#: src/Resources.vala:279 +#: src/Resources.vala:280 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120 +#: ui/tags.ui:144 msgid "_Ratings" msgstr "_Rating" -#: src/Resources.vala:280 -msgid "Display each photo's rating" +#: src/Resources.vala:281 +msgid "Display each photo’s rating" msgstr "Tampilkan rating tiap foto" -#: src/Resources.vala:282 +#: src/Resources.vala:283 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151 +#: ui/offline.ui:108 ui/tags.ui:151 ui/trash.ui:117 msgid "_Filter Photos" msgstr "_Saring Foto" -#: src/Resources.vala:283 +#: src/Resources.vala:284 msgid "Filter Photos" msgstr "Saring Foto" -#: src/Resources.vala:284 +#: src/Resources.vala:285 msgid "Limit the number of photos displayed based on a filter" msgstr "Batasi jumlah foto yang tampil berdasarkan penyaringan" -#: src/Resources.vala:286 -msgid "_Duplicate" -msgstr "_Gandakan" - -#: src/Resources.vala:287 +#: src/Resources.vala:288 msgid "Duplicate" msgstr "Gandakan" -#: src/Resources.vala:288 +#: src/Resources.vala:289 msgid "Make a duplicate of the photo" msgstr "Gandakan foto-foto ini" -#: src/Resources.vala:290 -msgid "_Export..." -msgstr "_Ekspor..." +#: src/Resources.vala:291 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17 +#: ui/tags.ui:17 +msgid "_Export…" +msgstr "_Ekspor…" -#: src/Resources.vala:292 -msgid "_Print..." -msgstr "_Cetak" +#: src/Resources.vala:293 +msgid "_Print…" +msgstr "_Cetak…" -#: src/Resources.vala:294 -msgid "Pu_blish..." -msgstr "_Kirim..." +#: src/Resources.vala:295 +msgid "Pu_blish…" +msgstr "Pu_blikasikan…" -#: src/Resources.vala:296 +#: src/Resources.vala:297 ui/collection.ui:189 msgid "Publish to various websites" msgstr "Kirim foto ini ke beragam situs" -#: src/Resources.vala:298 -msgid "Edit _Title..." -msgstr "Sun_ting Judul..." +#: src/Resources.vala:299 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:537 +#: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340 +msgid "Edit _Title…" +msgstr "Sun_ting Judul…" #. Button label -#: src/Resources.vala:300 -#, fuzzy -#| msgid "Edit Title" +#: src/Resources.vala:301 msgctxt "Button Label" msgid "Edit Title" msgstr "Sunting Judul" -#: src/Resources.vala:302 -msgid "Edit _Comment..." -msgstr "Sunting _Komentar..." +#: src/Resources.vala:303 ui/collection.ui:103 ui/events_directory.ui:144 +#: ui/events_directory.ui:186 ui/event.ui:345 ui/event.ui:398 ui/event.ui:542 +#: ui/media.ui:345 ui/photo_context.ui:110 ui/photo.ui:332 ui/tags.ui:345 +msgid "Edit _Comment…" +msgstr "Sunting _Komentar…" #. Button label -#: src/Resources.vala:304 +#: src/Resources.vala:305 msgid "Edit Comment" msgstr "Sunting Komentar" -#: src/Resources.vala:306 -msgid "Edit Event _Comment..." -msgstr "Sunting _Komentar Peristiwa" +#: src/Resources.vala:307 ui/event.ui:592 +msgid "Edit Event _Comment…" +msgstr "Sunting Komentar Peristiwa…" -#: src/Resources.vala:309 -msgid "_Adjust Date and Time..." -msgstr "_Atur Jam dan Tanggal..." +#: src/Resources.vala:310 ui/direct.ui:167 ui/photo.ui:337 +msgid "_Adjust Date and Time…" +msgstr "_Atur Jam dan Tanggal…" -#: src/Resources.vala:310 +#: src/Resources.vala:311 msgid "Adjust Date and Time" msgstr "Atur Jam dan Tanggal" -#: src/Resources.vala:312 -msgid "Add _Tags..." -msgstr "_Beri _Tanda..." +#: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458 +#: ui/media.ui:390 ui/photo.ui:374 ui/tags.ui:390 +msgid "Add _Tags…" +msgstr "_Tambah Tag…" -#: src/Resources.vala:313 -msgid "_Add Tags..." -msgstr "T_ambah Tag..." +#: src/Resources.vala:314 ui/photo_context.ui:17 +msgid "_Add Tags…" +msgstr "T_ambah Tag…" #. Dialog title -#: src/Resources.vala:315 -#, fuzzy -#| msgid "Add Tags" +#: src/Resources.vala:316 msgctxt "Dialog Title" msgid "Add Tags" -msgstr "Beri Tanda" - -#: src/Resources.vala:319 -msgid "Open With E_xternal Editor" -msgstr "Buka Oleh Penyunting E_ksternal" - -#: src/Resources.vala:321 -msgid "Open With RA_W Editor" -msgstr "Buka Dengan Penyunting RA_W" +msgstr "Tambah Tag" -#: src/Resources.vala:323 -msgid "Send _To..." -msgstr "Kirim _Ke" - -#: src/Resources.vala:324 -msgid "Send T_o..." -msgstr "Kirim _Ke..." - -#: src/Resources.vala:326 -msgid "_Find..." -msgstr "_Cari" +#: src/Resources.vala:325 ui/photo_context.ui:135 +msgid "Send T_o…" +msgstr "_Kirim Ke…" #: src/Resources.vala:327 +msgid "_Find…" +msgstr "_Cari…" + +#: src/Resources.vala:328 ui/collection.ui:217 ui/offline.ui:239 +#: ui/trash.ui:312 msgid "Find" msgstr "Cari" -#: src/Resources.vala:328 +#: src/Resources.vala:329 ui/collection.ui:214 ui/offline.ui:236 +#: ui/trash.ui:309 msgid "Find an image by typing text that appears in its name or tags" msgstr "Cari foto dengan mengetikkan teks yang muncul di nama atau tanda" -#: src/Resources.vala:330 +#: src/Resources.vala:331 msgid "_Flag" msgstr "_Tanda" -#: src/Resources.vala:332 +#: src/Resources.vala:333 msgid "Un_flag" msgstr "Lepas _tanda" -#: src/Resources.vala:335 +#: src/Resources.vala:336 #, c-format msgid "Unable to launch editor: %s" msgstr "Program penyunting tidak dapat dijalankan: %s" -#: src/Resources.vala:340 +#: src/Resources.vala:341 #, c-format -msgid "Add Tag \"%s\"" -msgstr "Beri Tanda \"%s\"" +msgid "Add Tag “%s”" +msgstr "Tambah Tag \"%s\"" #. Used when adding two tags to photo(s) -#: src/Resources.vala:343 +#: src/Resources.vala:344 #, c-format -msgid "Add Tags \"%s\" and \"%s\"" -msgstr "Beri Tanda \"%s\" dan \"%s\"" +msgid "Add Tags “%s” and “%s”" +msgstr "Tambah Tag \"%s\" dan \"%s\"" + +#. Undo/Redo command name (in Edit menu) +#: src/Resources.vala:349 +msgctxt "UndoRedo menu entry" +msgid "Add Tags" +msgstr "Tambah Tag" -#: src/Resources.vala:353 +#: src/Resources.vala:354 #, c-format -msgid "_Delete Tag \"%s\"" -msgstr "_Hapus Tanda \"%s\"" +msgid "_Delete Tag “%s”" +msgstr "_Hapus Tag \"%s\"" -#: src/Resources.vala:357 +#: src/Resources.vala:358 #, c-format -msgid "Delete Tag \"%s\"" -msgstr "Hapus Tanda \"%s\"" +msgid "Delete Tag “%s”" +msgstr "Hapus Tag \"%s\"" -#: src/Resources.vala:360 +#: src/Resources.vala:361 msgid "Delete Tag" -msgstr "Hapus Tanda" +msgstr "Hapus Tag" -#: src/Resources.vala:366 +#: src/Resources.vala:367 #, c-format -msgid "Re_name Tag \"%s\"..." -msgstr "Ganti _Nama Tanda \"%s\"..." +msgid "Re_name Tag “%s”…" +msgstr "Ubah _Nama Tag \"%s\"…" -#: src/Resources.vala:370 +#: src/Resources.vala:371 #, c-format -msgid "Rename Tag \"%s\" to \"%s\"" -msgstr "Ganti Nama Tanda \"%s\" menjadi \"%s\"" +msgid "Rename Tag “%s” to “%s”" +msgstr "Ubah Nama Tag \"%s\" menjadi \"%s\"" -#: src/Resources.vala:373 -msgid "_Rename..." -msgstr "_Ganti nama" +#: src/Resources.vala:374 ui/tags.ui:456 +msgid "_Rename…" +msgstr "_Ubah Nama…" -#: src/Resources.vala:375 -msgid "Modif_y Tags..." -msgstr "_Ubah Tanda..." +#: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463 +#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:379 ui/tags.ui:395 +msgid "Modif_y Tags…" +msgstr "U_bah Tag…" -#: src/Resources.vala:376 +#: src/Resources.vala:377 msgid "Modify Tags" -msgstr "Ubah Tanda" +msgstr "Ubah Tag" -#: src/Resources.vala:379 +#: src/Resources.vala:380 #, c-format -msgid "Tag Photo as \"%s\"" -msgstr "Tandai Foto Sebagai \"%s\"" +msgid "Tag Photo as “%s”" +msgid_plural "Tag Photos as “%s”" +msgstr[0] "Tag Foto sebagai \"%s\"" -#: src/Resources.vala:379 +#: src/Resources.vala:386 #, c-format -msgid "Tag Photos as \"%s\"" -msgstr "Tandai Foto Sebagai \"%s\"" +msgid "Tag the selected photo as “%s”" +msgid_plural "Tag the selected photos as “%s”" +msgstr[0] "Tag foto terpilih sebagai \"%s\"" -#: src/Resources.vala:383 +#: src/Resources.vala:392 #, c-format -msgid "Tag the selected photo as \"%s\"" -msgstr "Tandai foto terpilih sebagai \"%s\"" +msgid "Remove Tag “%s” From _Photo" +msgid_plural "Remove Tag “%s” From _Photos" +msgstr[0] "Hapus Tag \"%s\" Dari _Foto" -#: src/Resources.vala:384 -#, c-format -msgid "Tag the selected photos as \"%s\"" -msgstr "Tandai foto terpilih sebagai \"%s\"" - -#: src/Resources.vala:388 -#, c-format -msgid "Remove Tag \"%s\" From _Photo" -msgstr "Hapus Tanda \"%s\" Dari _Foto" - -#: src/Resources.vala:389 -#, c-format -msgid "Remove Tag \"%s\" From _Photos" -msgstr "Hapus Tanda \"%s\" Dari _Foto" - -#: src/Resources.vala:393 -#, c-format -msgid "Remove Tag \"%s\" From Photo" -msgstr "Hapus Tanda \"%s\" Dari Foto" - -#: src/Resources.vala:394 +#: src/Resources.vala:398 #, c-format -msgid "Remove Tag \"%s\" From Photos" -msgstr "Hapus Tanda \"%s\" Dari _Foto" +msgid "Remove Tag “%s” From Photo" +msgid_plural "Remove Tag “%s” From Photos" +msgstr[0] "Hapus Tag \"%s\" Dari Foto" -#: src/Resources.vala:398 +#: src/Resources.vala:404 #, c-format -msgid "Unable to rename tag to \"%s\" because the tag already exists." -msgstr "Tanda tidak dapat diganti menjadi \"%s\" karena sudah ada." +msgid "Unable to rename tag to “%s” because the tag already exists." +msgstr "Tag tidak dapat diubah menjadi \"%s\" karena sudah ada." -#: src/Resources.vala:402 +#: src/Resources.vala:408 #, c-format -msgid "Unable to rename search to \"%s\" because the search already exists." -msgstr "Gagal mengubah nama pencarian ke \"%s\" karena sudah ada " +msgid "Unable to rename search to “%s” because the search already exists." +msgstr "Tidak bisa mengubah nama pencarian ke \"%s\" karena sudah ada." -#: src/Resources.vala:405 +#. Saved search button +#: src/Resources.vala:411 src/SearchFilter.vala:1124 msgid "Saved Search" msgstr "Pencarian Tersimpan" -#: src/Resources.vala:407 +#: src/Resources.vala:413 msgid "Delete Search" msgstr "Hapus Pencarian" -#: src/Resources.vala:410 -msgid "_Edit..." -msgstr "_Sunting..." +#: src/Resources.vala:416 ui/savedsearch.ui:11 +msgid "_Edit…" +msgstr "S_unting…" -#: src/Resources.vala:411 -msgid "Re_name..." -msgstr "Ganti _nama..." +#: src/Resources.vala:417 ui/savedsearch.ui:7 +msgid "Re_name…" +msgstr "Ganti _nama…" -#: src/Resources.vala:414 +#: src/Resources.vala:420 #, c-format -msgid "Rename Search \"%s\" to \"%s\"" -msgstr "Ubah Nama Pencarian \"%s\" ke \"%s\"" +msgid "Rename Search “%s” to “%s”" +msgstr "Ubah Nama Pencarian \"%s\" menjadi \"%s\"" -#: src/Resources.vala:418 +#: src/Resources.vala:424 #, c-format -msgid "Delete Search \"%s\"" +msgid "Delete Search “%s”" msgstr "Hapus Pencarian \"%s\"" -#: src/Resources.vala:576 +#: src/Resources.vala:561 #, c-format msgid "Rate %s" msgstr "Nilai %s" -#: src/Resources.vala:577 +#: src/Resources.vala:562 #, c-format msgid "Set rating to %s" msgstr "Atur nilai rating ke %s" -#: src/Resources.vala:578 +#: src/Resources.vala:563 #, c-format msgid "Setting rating to %s" msgstr "Mengatur rating ke %s" -#: src/Resources.vala:580 +#: src/Resources.vala:565 #, c-format msgid "Display %s" msgstr "Tampilkan %s" -#: src/Resources.vala:581 +#: src/Resources.vala:566 #, c-format msgid "Only show photos with a rating of %s" msgstr "Hanya tampilkan foto dengan rating %s" -#: src/Resources.vala:582 +#: src/Resources.vala:567 #, c-format msgid "%s or Better" msgstr "%s atau lebih baik" -#: src/Resources.vala:583 +#: src/Resources.vala:568 #, c-format msgid "Display %s or Better" msgstr "Tampilkan %s atau lebih baik" -#: src/Resources.vala:584 +#: src/Resources.vala:569 #, c-format msgid "Only show photos with a rating of %s or better" msgstr "Hanya tampilkan foto dengan rating %s atau lebih baik" -#: src/Resources.vala:675 +#: src/Resources.vala:660 ui/trash.ui:255 msgid "Remove the selected photos from the trash" msgstr "Hapus foto-foto terpilih dari tempat pembuangan" -#: src/Resources.vala:676 +#: src/Resources.vala:661 ui/offline.ui:221 msgid "Remove the selected photos from the library" msgstr "Hapus foto-foto terpilih dari album" -#: src/Resources.vala:678 +#: src/Resources.vala:663 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273 msgid "_Restore" msgstr "_Kembalikan" -#: src/Resources.vala:679 +#: src/Resources.vala:664 ui/trash.ui:270 msgid "Move the selected photos back into the library" msgstr "Kembalikan foto-foto ke album" -#: src/Resources.vala:681 +#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:19 +#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27 +#: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19 +#: ui/trash.ui:227 msgid "Show in File Mana_ger" msgstr "Lihat di Program Pengatur Berkas" -#: src/Resources.vala:682 -msgid "Open the selected photo's directory in the file manager" -msgstr "Buka direktori foto dengan program pengatur berkas" +#: src/Resources.vala:667 +msgid "Open the selected photo’s directory in the file manager" +msgstr "Buka direktori foto yang dipilih dalam manajer berkas" -#: src/Resources.vala:685 +#: src/Resources.vala:670 #, c-format msgid "Unable to open in file manager: %s" msgstr "Program pengatur berkas tidak dapat dibuka: %s" -#: src/Resources.vala:688 +#: src/Resources.vala:673 ui/offline.ui:224 msgid "R_emove From Library" msgstr "Hapus _Dari Album" -#: src/Resources.vala:690 +#: src/Resources.vala:675 ui/collection.ui:134 ui/event.ui:79 ui/event.ui:573 +#: ui/media.ui:79 ui/photo_context.ui:141 ui/photo.ui:82 ui/tags.ui:79 msgid "_Move to Trash" msgstr "Pindahkan ke Tempat Pembuangan" -#: src/Resources.vala:692 +#: src/Resources.vala:677 ui/events_directory.ui:58 ui/event.ui:86 +#: ui/import.ui:61 ui/media.ui:86 ui/offline.ui:65 ui/tags.ui:86 ui/trash.ui:74 msgid "Select _All" msgstr "Pilih semu_a" -#: src/Resources.vala:693 +#: src/Resources.vala:678 msgid "Select all items" msgstr "Pilih semua item" @@ -5625,182 +5563,189 @@ msgstr "Pilih semua item" #. / Locale-specific time format for 12-hour time, i.e. 8:31 PM #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format -#: src/Resources.vala:772 -msgid "%-I:%M %p" -msgstr "%-I:%M %p" - #. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format -#: src/Resources.vala:777 -msgid "%-I:%M:%S %p" -msgstr "%-I:%M:%S %p" - #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006" #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format -#: src/Resources.vala:781 +#: src/Resources.vala:739 msgid "%a %b %d, %Y" msgstr "%a %d %b, %Y" #. / Locale-specific starting date format for multi-date strings, #. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006" #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format -#. / Locale-specific calendar date format for multi-month strings, -#. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006" -#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format -#: src/Resources.vala:786 src/Resources.vala:796 +#: src/Resources.vala:744 +msgctxt "MultidayFormat" msgid "%a %b %d" msgstr "%a %d %b" #. / Locale-specific ending date format for multi-date strings, #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006" #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format -#: src/Resources.vala:791 +#: src/Resources.vala:749 +msgctxt "MultidayFormat" msgid "%d, %Y" msgstr "%d, %Y" +#. / Locale-specific calendar date format for multi-month strings, +#. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006" +#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format +#: src/Resources.vala:754 +msgctxt "MultimonthFormat" +msgid "%a %b %d" +msgstr "%a %d %b" + +#. / Locale-specific calendar date format for multi-month strings, +#. / i.e. the "Mon Apr 06, 2006" in "Tue Mar 08 to Mon Apr 06, 2006" +#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format +#: src/Resources.vala:759 +msgctxt "MultimonthFormat" +msgid "%a %b %d, %Y" +msgstr "%a %d %b, %Y" + #: src/Screensaver.vala:18 src/SlideshowPage.vala:141 msgid "Slideshow" -msgstr "Tampil salindia (slideshow)" +msgstr "Pertunjukan salindia" #: src/searches/Branch.vala:68 msgid "Saved Searches" msgstr "Pencarian Tersimpan" #. Ordering must correspond with SearchConditionText.Context -#: src/searches/SavedSearchDialog.vala:168 +#: src/searches/SavedSearchDialog.vala:162 msgid "contains" msgstr "mengandung" #. Ordering must correspond with Context -#: src/searches/SavedSearchDialog.vala:169 -#: src/searches/SavedSearchDialog.vala:500 +#: src/searches/SavedSearchDialog.vala:163 +#: src/searches/SavedSearchDialog.vala:494 msgid "is exactly" msgstr "persis" -#: src/searches/SavedSearchDialog.vala:170 +#: src/searches/SavedSearchDialog.vala:164 msgid "starts with" msgstr "dimulai dengan" -#: src/searches/SavedSearchDialog.vala:171 +#: src/searches/SavedSearchDialog.vala:165 msgid "ends with" msgstr "diakhiri dengan" -#: src/searches/SavedSearchDialog.vala:172 +#: src/searches/SavedSearchDialog.vala:166 msgid "does not contain" msgstr "tidak mengandung" -#: src/searches/SavedSearchDialog.vala:173 -#: src/searches/SavedSearchDialog.vala:504 +#: src/searches/SavedSearchDialog.vala:167 +#: src/searches/SavedSearchDialog.vala:498 msgid "is not set" msgstr "tak ditata" -#: src/searches/SavedSearchDialog.vala:174 +#: src/searches/SavedSearchDialog.vala:168 msgid "is set" msgstr "ditata" #. Ordering must correspond with SearchConditionMediaType.Context -#: src/searches/SavedSearchDialog.vala:248 -#: src/searches/SavedSearchDialog.vala:379 -#: src/searches/SavedSearchDialog.vala:444 +#: src/searches/SavedSearchDialog.vala:242 +#: src/searches/SavedSearchDialog.vala:373 +#: src/searches/SavedSearchDialog.vala:438 msgid "is" msgstr "adalah" -#: src/searches/SavedSearchDialog.vala:249 +#: src/searches/SavedSearchDialog.vala:243 msgid "is not" msgstr "bukan" #. Ordering must correspond with SearchConditionMediaType.MediaType -#: src/searches/SavedSearchDialog.vala:255 +#: src/searches/SavedSearchDialog.vala:249 msgid "any photo" msgstr "foto manapun" -#: src/searches/SavedSearchDialog.vala:256 +#: src/searches/SavedSearchDialog.vala:250 msgid "a raw photo" msgstr "adalah foto mentah" -#: src/searches/SavedSearchDialog.vala:257 +#: src/searches/SavedSearchDialog.vala:251 msgid "a video" msgstr "video" -#: src/searches/SavedSearchDialog.vala:311 +#: src/searches/SavedSearchDialog.vala:305 msgid "has" msgstr "punya" -#: src/searches/SavedSearchDialog.vala:312 +#: src/searches/SavedSearchDialog.vala:306 msgid "has no" msgstr "tak punya" -#: src/searches/SavedSearchDialog.vala:317 +#: src/searches/SavedSearchDialog.vala:311 msgid "modifications" msgstr "modifikasi" -#: src/searches/SavedSearchDialog.vala:318 +#: src/searches/SavedSearchDialog.vala:312 msgid "internal modifications" msgstr "modifikasi internal" -#: src/searches/SavedSearchDialog.vala:319 +#: src/searches/SavedSearchDialog.vala:313 msgid "external modifications" msgstr "modifikasi eksternal" #. Ordering must correspond with SearchConditionFlagged.State -#: src/searches/SavedSearchDialog.vala:373 +#: src/searches/SavedSearchDialog.vala:367 msgid "flagged" msgstr "ditandai" -#: src/searches/SavedSearchDialog.vala:374 +#: src/searches/SavedSearchDialog.vala:368 msgid "not flagged" msgstr "tidak ditandai" -#: src/searches/SavedSearchDialog.vala:437 +#: src/searches/SavedSearchDialog.vala:431 msgid "and higher" msgstr "dan lebih tinggi" -#: src/searches/SavedSearchDialog.vala:438 +#: src/searches/SavedSearchDialog.vala:432 msgid "only" msgstr "hanya" -#: src/searches/SavedSearchDialog.vala:439 +#: src/searches/SavedSearchDialog.vala:433 msgid "and lower" msgstr "dan lebih rendah" -#: src/searches/SavedSearchDialog.vala:501 +#: src/searches/SavedSearchDialog.vala:495 msgid "is after" msgstr "setelah" -#: src/searches/SavedSearchDialog.vala:502 +#: src/searches/SavedSearchDialog.vala:496 msgid "is before" msgstr "sebelum" -#: src/searches/SavedSearchDialog.vala:503 +#: src/searches/SavedSearchDialog.vala:497 msgid "is between" msgstr "antara" -#: src/searches/SavedSearchDialog.vala:516 +#: src/searches/SavedSearchDialog.vala:510 msgid "and" msgstr "dan" -#: src/searches/SavedSearchDialog.vala:697 +#: src/searches/SavedSearchDialog.vala:691 msgid "Search" msgstr "Pencarian" -#: src/searches/SavedSearchDialog.vala:702 +#: src/searches/SavedSearchDialog.vala:696 msgid "Cancel" msgstr "Batal" -#: src/searches/SavedSearchDialog.vala:703 +#: src/searches/SavedSearchDialog.vala:697 msgid "OK" msgstr "OK" -#: src/searches/SavedSearchDialog.vala:721 +#: src/searches/SavedSearchDialog.vala:716 msgid "any" msgstr "manapun" -#: src/searches/SavedSearchDialog.vala:722 +#: src/searches/SavedSearchDialog.vala:717 msgid "all" msgstr "semua" -#: src/searches/SavedSearchDialog.vala:723 +#: src/searches/SavedSearchDialog.vala:718 msgid "none" msgstr "tidak ada" @@ -5840,8 +5785,8 @@ msgstr "Status tanda" msgid "Photo state" msgstr "Status foto" -#. Rating button -#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:998 +#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831 +#: src/SearchFilter.vala:1114 msgid "Rating" msgstr "Rating" @@ -5849,40 +5794,58 @@ msgstr "Rating" msgid "Date" msgstr "Tanggal" -#: src/SearchFilter.vala:599 src/SearchFilter.vala:600 -msgid "Videos" -msgstr "Video" +#: src/SearchFilter.vala:815 +msgid "★+ Rating" +msgstr "Peringkat ★+" -#: src/SearchFilter.vala:605 -msgid "RAW Photos" -msgstr "Foto RAW" +#: src/SearchFilter.vala:818 +msgid "★★+ Rating" +msgstr "Peringkat ★★+" -#: src/SearchFilter.vala:606 -msgid "RAW photos" -msgstr "Foto RAW" +#: src/SearchFilter.vala:821 +msgid "★★★+ Rating" +msgstr "Peringkat ★★★+" -#: src/SearchFilter.vala:947 +#: src/SearchFilter.vala:824 +msgid "★★★★+ Rating" +msgstr "Peringkat ★★★★+" + +#: src/SearchFilter.vala:828 +msgid "★★★★★+ Rating" +msgstr "Peringkat ★★★★★+" + +#: src/SearchFilter.vala:1064 #, c-format -msgid "Error loading UI file %s: %s" -msgstr "Gagal memuat berkas UI %s:%s" +msgid "Error loading search bar UI: %s" +msgstr "Gagal memuat UI bilah pencarian:%s" #. Ticket #3260 - Add a 'close' context menu to #. the searchbar. #. Prepare the close menu for use, but don't #. display it yet; we'll connect it to secondary #. click later on. -#: src/SearchFilter.vala:958 +#: src/SearchFilter.vala:1073 msgid "Close" msgstr "Tutup" #. Type label and toggles -#: src/SearchFilter.vala:964 +#: src/SearchFilter.vala:1079 msgid "Type" msgstr "Tipe" -#: src/sidebar/Tree.vala:203 -msgid "New _Tag..." -msgstr "_Tag Baru..." +#: src/SearchFilter.vala:1086 +msgid "Videos" +msgstr "Video" + +#: src/SearchFilter.vala:1089 +msgid "RAW Photos" +msgstr "Foto RAW" + +#: src/SearchFilter.vala:1125 +msgid "Use a saved search to filter items in the current view" +msgstr "" +"Gunakan pencarian tersimpan untuk menyaring butir-butir dalam tilikan saat " +"ini" #: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183 msgid "Settings" @@ -5949,220 +5912,417 @@ msgstr "Acak" #: src/tags/Branch.vala:131 msgid "Tags" -msgstr "Tanda" +msgstr "Tag" -#: src/Tag.vala:817 +#: src/Tag.vala:830 msgid "untitled" msgstr "tanpa judul" #. multiple videos -#: src/VideoSupport.vala:490 +#: src/VideoSupport.vala:523 msgid "Export Videos" -msgstr "Ekspor video" +msgstr "Ekspor Video" -#: ui/set_background_dialog.ui:15 -msgid "Set as Desktop Background" -msgstr "Jadikan Latar Desktop" +#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:472 ui/media.ui:281 +#: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281 +msgid "Toggle _Flag" +msgstr "Jungki_tkan Bendera" -#: ui/set_background_dialog.ui:77 ui/set_background_slideshow_dialog.ui:132 -msgid "Use for Desktop" -msgstr "Gunakan untuk Desktop" +#: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353 +#: ui/photo_context.ui:88 ui/photo.ui:343 ui/tags.ui:353 +msgid "_Developer" +msgstr "_Developer" -#: ui/set_background_dialog.ui:93 ui/set_background_slideshow_dialog.ui:148 -msgid "Use for Lock Screen" -msgstr "Gunakan untuk Layar Kunci" +#: ui/collection.ui:108 ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360 +msgid "Open with E_xternal Editor" +msgstr "Buka dengan Penyunting E_ksternal" -#: ui/set_background_slideshow_dialog.ui:15 -msgid "Set as Desktop Slideshow" -msgstr "Atur sebagai Salindia Destop" +#: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381 +#: ui/photo_context.ui:126 ui/tags.ui:381 +msgid "View Eve_nt for Photo" +msgstr "Lihat Eve_nt Foto" -#: ui/set_background_slideshow_dialog.ui:33 -msgid "Show each photo for" -msgstr "Tampilkan tiap foto untuk" +#: ui/direct.ui:5 ui/events_directory.ui:5 ui/event.ui:5 ui/import_queue.ui:5 +#: ui/import.ui:5 ui/media.ui:5 ui/offline.ui:5 ui/photo.ui:5 ui/tags.ui:5 +#: ui/trash.ui:5 +msgid "_File" +msgstr "_Berkas" -#: ui/set_background_slideshow_dialog.ui:45 -msgid "period of time" -msgstr "jangka waktu" +#: ui/direct.ui:13 +msgid "Save _As…" +msgstr "Simpan Seb_agai…" -#: ui/set_background_slideshow_dialog.ui:94 -msgid "Generate desktop background slideshow" -msgstr "Membuat salindia latar destop" +#: ui/direct.ui:59 ui/events_directory.ui:71 ui/event.ui:99 +#: ui/import_queue.ui:38 ui/import.ui:74 ui/media.ui:99 ui/offline.ui:78 +#: ui/photo.ui:95 ui/tags.ui:99 ui/trash.ui:87 +msgid "_View" +msgstr "_Tampilkan" -#: ui/set_background_slideshow_dialog.ui:115 -msgid "How long each photo is shown on the desktop background" -msgstr "Berapa lama tiap foto ditampilkan di latar destop" +#: ui/direct.ui:81 ui/photo.ui:156 +msgid "Fit to _Page" +msgstr "_Pas ke Laman" -#: ui/shotwell.ui:23 -msgid "_Name of search:" -msgstr "_Nama pencarian" +#: ui/direct.ui:86 ui/photo.ui:161 +msgid "Zoom _100%" +msgstr "Zum _100%" -#: ui/shotwell.ui:81 -msgid "_Match" -msgstr "_Cocokkan" +#: ui/direct.ui:91 ui/photo.ui:166 +msgid "Zoom _200%" +msgstr "Zum _200%" -#: ui/shotwell.ui:108 -msgid "of the following:" -msgstr "yang berikut ini:" +#: ui/direct.ui:98 ui/photo.ui:187 +msgid "_Photo" +msgstr "_Foto" + +#: ui/direct.ui:101 ui/photo.ui:190 +msgid "_Previous Photo" +msgstr "Foto Se_belumnya" + +#: ui/direct.ui:105 ui/photo.ui:194 +msgid "_Next Photo" +msgstr "Foto B_erikutnya" + +#: ui/direct.ui:131 ui/photo.ui:220 +msgid "T_ools" +msgstr "P_eralatan" + +#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:428 +#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188 +#: ui/photo.ui:394 ui/tags.ui:430 ui/trash.ui:197 +msgid "_Frequently Asked Questions" +msgstr "_Pertanyaan Sering Ditanyakan" + +#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:432 +#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192 +#: ui/photo.ui:398 ui/tags.ui:434 ui/trash.ui:201 +msgid "_Report a Problem…" +msgstr "Lapo_r Masalah…" + +#: ui/events_directory.ui:8 ui/event.ui:8 ui/import_queue.ui:14 ui/import.ui:8 +#: ui/media.ui:8 ui/offline.ui:8 ui/photo.ui:8 ui/tags.ui:8 ui/trash.ui:8 +msgid "_Import from Folder…" +msgstr "_Impor Dari Folder…" + +#: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19 +#: ui/import.ui:21 ui/media.ui:13 ui/offline.ui:13 ui/photo.ui:13 ui/tags.ui:13 +#: ui/trash.ui:13 +msgid "Import From _Application…" +msgstr "Impor Dari _Aplikasi…" + +#: ui/events_directory.ui:19 ui/event.ui:34 ui/import_queue.ui:25 +#: ui/import.ui:27 ui/media.ui:34 ui/offline.ui:19 ui/photo.ui:42 ui/tags.ui:34 +#: ui/trash.ui:24 ui/trash.ui:234 ui/trash.ui:242 +msgid "Empty T_rash" +msgstr "Hapus Pe_rmanen Foto Buangan" + +#: ui/events_directory.ui:47 ui/event.ui:62 ui/import.ui:55 ui/media.ui:62 +#: ui/offline.ui:47 ui/tags.ui:62 ui/trash.ui:52 +msgid "_Find" +msgstr "_Cari" + +#: ui/events_directory.ui:51 ui/event.ui:66 ui/media.ui:66 ui/offline.ui:51 +#: ui/photo.ui:70 ui/search_sidebar_context.ui:6 +#: ui/sidebar_default_context.ui:6 ui/tags.ui:66 ui/trash.ui:56 +msgid "Ne_w Saved Search…" +msgstr "Pencarian Tersimpan B_aru…" + +#: ui/events_directory.ui:74 ui/event.ui:102 ui/import_queue.ui:41 +#: ui/import.ui:77 ui/media.ui:102 ui/offline.ui:81 ui/photo.ui:98 +#: ui/tags.ui:102 ui/trash.ui:90 +msgid "_Basic Information" +msgstr "Informasi _Dasar" + +#: ui/events_directory.ui:79 ui/event.ui:107 ui/import.ui:82 ui/media.ui:107 +#: ui/offline.ui:86 ui/photo.ui:103 ui/tags.ui:107 ui/trash.ui:95 +msgid "E_xtended Information" +msgstr "Informasi _Lanjut" + +#: ui/events_directory.ui:84 ui/event.ui:112 ui/import.ui:87 ui/media.ui:112 +#: ui/offline.ui:91 ui/tags.ui:112 ui/trash.ui:100 +msgid "_Search Bar" +msgstr "_Bilah Pencarian" + +#: ui/events_directory.ui:89 ui/event.ui:117 ui/import.ui:92 ui/media.ui:117 +#: ui/offline.ui:96 ui/photo.ui:108 ui/tags.ui:117 ui/trash.ui:105 +msgid "S_idebar" +msgstr "Bilah S_isi" + +#: ui/events_directory.ui:94 ui/event.ui:122 ui/import.ui:97 ui/media.ui:122 +#: ui/offline.ui:101 ui/photo.ui:113 ui/tags.ui:122 ui/trash.ui:110 +msgid "T_oolbar" +msgstr "Bil_ah Alat" + +#: ui/events_directory.ui:101 ui/event.ui:134 ui/media.ui:134 ui/tags.ui:134 +msgid "_Comments" +msgstr "_Komentar" + +#: ui/events_directory.ui:108 ui/event.ui:243 ui/import_queue.ui:48 +#: ui/import.ui:166 ui/media.ui:243 ui/offline.ui:163 ui/photo.ui:127 +#: ui/tags.ui:243 ui/trash.ui:172 +msgid "Sort _Events" +msgstr "_Rangkaian Dengan Urutan" + +#: ui/events_directory.ui:111 ui/event.ui:231 ui/event.ui:246 +#: ui/import_queue.ui:51 ui/import.ui:169 ui/media.ui:231 ui/media.ui:246 +#: ui/offline.ui:166 ui/photo.ui:130 ui/tags.ui:231 ui/tags.ui:246 +#: ui/trash.ui:175 +msgid "_Ascending" +msgstr "N_aik" + +#: ui/events_directory.ui:116 ui/event.ui:236 ui/import_queue.ui:56 +#: ui/media.ui:236 ui/offline.ui:171 ui/tags.ui:236 ui/trash.ui:180 +msgid "D_escending" +msgstr "T_urun" + +#: ui/events_directory.ui:132 ui/event.ui:379 ui/media.ui:373 ui/tags.ui:373 +msgid "Even_ts" +msgstr "Peris_tiwa" + +#: ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58 ui/offline.ui:207 +#: ui/photo.ui:77 ui/tags.ui:74 +msgid "R_emove from Library" +msgstr "Hapus _Dari Pustaka" + +#: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129 +msgid "_Titles" +msgstr "_Judul" + +#: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387 +#: ui/photo.ui:371 ui/tags.ui:139 ui/tags.ui:387 +msgid "Ta_gs" +msgstr "Tan_da" -#: ui/shotwell.ui:195 +#: ui/event.ui:206 ui/media.ui:206 ui/tags.ui:206 +msgid "Sort _Photos" +msgstr "Urutkan _Foto" + +#: ui/event.ui:209 ui/media.ui:209 ui/tags.ui:209 +msgid "By _Title" +msgstr "Berdasarkan _Judul" + +#: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214 +msgid "By _Filename" +msgstr "Berdasarkan _Nama Berkas" + +#: ui/event.ui:219 ui/media.ui:219 ui/tags.ui:219 +msgid "By Exposure _Date" +msgstr "Ber_dasarkan Tanggal Pengambilan" + +#: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224 +msgid "By _Rating" +msgstr "Berdasarkan _Rating" + +#: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135 +#: ui/tags.ui:251 +msgid "_Descending" +msgstr "T_urun" + +#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275 +msgid "_Photos" +msgstr "_Foto-foto" + +#: ui/import_queue.ui:8 +msgid "_Stop Import" +msgstr "_Hentikan Impor" + +#: ui/printing_widget.ui:19 msgid "<b>Printed Image Size</b>" msgstr "<b>Ukuran Foto Tercetak</b>" -#: ui/shotwell.ui:212 +#: ui/printing_widget.ui:36 msgid "Use a _standard size:" msgstr "Gunakan ukuran _standar:" -#: ui/shotwell.ui:255 +#: ui/printing_widget.ui:80 msgid "Use a c_ustom size:" msgstr "Gunakan _ukuran bebas:" -#: ui/shotwell.ui:345 +#. Abbrevation for "inch" +#: ui/printing_widget.ui:146 +msgid "in." +msgstr "in." + +#. Abbrevation for "centimeters" +#: ui/printing_widget.ui:147 +msgid "cm" +msgstr "cm" + +#: ui/printing_widget.ui:173 msgid "_Match photo aspect ratio" msgstr "_Sesuaikan dengan rasio foto" -#: ui/shotwell.ui:369 +#: ui/printing_widget.ui:197 msgid "_Autosize:" -msgstr "_Ukuran otomatis" +msgstr "Ukur_an otomatis:" -#: ui/shotwell.ui:409 +#: ui/printing_widget.ui:237 msgid "<b>Titles</b>" msgstr "<b>Judul</b>" -#: ui/shotwell.ui:426 +#: ui/printing_widget.ui:254 msgid "Print image _title" msgstr "Ce_tak judul gambar" -#: ui/shotwell.ui:470 +#: ui/printing_widget.ui:297 msgid "<b>Pixel Resolution</b>" msgstr "<b>Resolusi Piksel</b>" -#: ui/shotwell.ui:490 +#: ui/printing_widget.ui:317 msgid "_Output photo at:" msgstr "Tampilkan f_oto pada:" -#: ui/shotwell.ui:525 +#: ui/printing_widget.ui:351 msgid "pixels per inch" msgstr "piksel per inci" -#: ui/shotwell.ui:559 -msgid "label" -msgstr "label" +#: ui/set_background_dialog.ui:9 +msgid "Set as Desktop Background" +msgstr "Jadikan Latar Desktop" + +#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134 +msgid "Use for Desktop" +msgstr "Gunakan untuk Desktop" -#: ui/shotwell.ui:681 -msgid "Shotwell Preferences" -msgstr "Pengaturan Shotwell" +#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151 +msgid "Use for Lock Screen" +msgstr "Gunakan untuk Layar Kunci" -#: ui/shotwell.ui:730 +#: ui/set_background_slideshow_dialog.ui:16 +msgid "Set as Desktop Slideshow" +msgstr "Atur sebagai Salindia Destop" + +#: ui/set_background_slideshow_dialog.ui:56 +msgid "Generate desktop background slideshow" +msgstr "Membuat salindia latar destop" + +#: ui/set_background_slideshow_dialog.ui:82 +msgid "Show each photo for" +msgstr "Tampilkan tiap foto untuk" + +#: ui/set_background_slideshow_dialog.ui:94 +msgid "period of time" +msgstr "jangka waktu" + +#: ui/set_background_slideshow_dialog.ui:116 +msgid "How long each photo is shown on the desktop background" +msgstr "Berapa lama tiap foto ditampilkan di latar destop" + +#: ui/shotwell.ui:65 msgid "white" msgstr "putih" -#: ui/shotwell.ui:757 +#: ui/shotwell.ui:92 msgid "black" msgstr "hitam" -#: ui/shotwell.ui:805 -msgid "_Watch library directory for new files" -msgstr "_Pantau berkas baru di direktori album" - -#: ui/shotwell.ui:834 -msgid "Metadata" -msgstr "Metadata" - -#: ui/shotwell.ui:854 -msgid "Write tags, titles, and other _metadata to photo files" -msgstr "Tulis tanda, judul dan metadata lainnya ke berkas foto" - -#: ui/shotwell.ui:880 +#: ui/shotwell.ui:123 msgid "Display" msgstr "Tampilan" -#: ui/shotwell.ui:901 +#: ui/shotwell.ui:160 +msgid "_Background:" +msgstr "Latar _Belakang:" + +#: ui/shotwell.ui:175 msgid "_Import photos to:" -msgstr "_Impor foto ke" +msgstr "_Impor foto ke:" -#: ui/shotwell.ui:924 -msgid "_Background:" -msgstr "Latar _Belakang" +#: ui/shotwell.ui:186 +msgid "_Watch library directory for new files" +msgstr "_Pantau berkas baru di direktori album" -#: ui/shotwell.ui:947 +#: ui/shotwell.ui:209 msgid "Importing" msgstr "Mengimpor" -#: ui/shotwell.ui:970 +#: ui/shotwell.ui:226 msgid "_Directory structure:" -msgstr "_Struktur direktori" +msgstr "_Struktur direktori:" -#: ui/shotwell.ui:1009 -msgid "_Pattern:" -msgstr "_Pola:" - -#: ui/shotwell.ui:1091 +#: ui/shotwell.ui:240 msgid "Example:" -msgstr "Contoh" +msgstr "Contoh:" -#: ui/shotwell.ui:1108 +#: ui/shotwell.ui:249 msgid "R_ename imported files to lowercase" msgstr "Ubah n_ama berkas impor ke huruf kecil" -#: ui/shotwell.ui:1137 +#: ui/shotwell.ui:271 +msgid "Metadata" +msgstr "Metadata" + +#: ui/shotwell.ui:284 +msgid "Write tags, titles, and other _metadata to photo files" +msgstr "Tulis tanda, judul dan metadata lainnya ke berkas foto" + +#: ui/shotwell.ui:306 msgid "RAW Developer" msgstr "RAW Developer" -#: ui/shotwell.ui:1172 +#: ui/shotwell.ui:323 msgid "De_fault:" msgstr "De_fault:" -#: ui/shotwell.ui:1226 +#: ui/shotwell.ui:377 +msgid "_Pattern:" +msgstr "_Pola:" + +#: ui/shotwell.ui:439 msgid "E_xternal photo editor:" -msgstr "Penyunting foto e_ksternal" +msgstr "Penyunting foto e_ksternal:" -#: ui/shotwell.ui:1242 +#: ui/shotwell.ui:456 msgid "External _RAW editor:" -msgstr "Penyunting _RAW eksternal" +msgstr "Penyunting _RAW eksternal:" -#: ui/shotwell.ui:1307 +#: ui/shotwell.ui:517 msgid "External Editors" msgstr "Penyunting eksternal" -#: ui/shotwell.ui:1334 +#: ui/shotwell.ui:542 msgid "Plugins" msgstr "Pengaya" -#: ui/shotwell.ui:1400 +#: ui/shotwell.ui:590 +msgid "_Name of search:" +msgstr "_Nama pencarian:" + +#: ui/shotwell.ui:644 +msgid "_Match" +msgstr "_Cocokkan" + +#: ui/shotwell.ui:671 +msgid "of the following:" +msgstr "yang berikut ini:" + +#: ui/shotwell.ui:752 +msgid "label" +msgstr "label" + +#: ui/shotwell.ui:903 msgid "_Delay:" -msgstr "Penun_daan" +msgstr "Tun_daan:" -#: ui/shotwell.ui:1416 +#: ui/shotwell.ui:917 msgid "_Transition effect:" -msgstr "Efek _Transisi" +msgstr "Efek _Transisi:" -#: ui/shotwell.ui:1432 +#: ui/shotwell.ui:931 msgid "Transition d_elay:" -msgstr "P_enundaan Peralihan" +msgstr "Tundaan p_eralihan:" -#: ui/shotwell.ui:1444 +#: ui/shotwell.ui:941 msgid "Show t_itle" msgstr "Tampilkan _judul" -#: ui/shotwell.ui:1534 ui/shotwell.ui:1547 +#: ui/shotwell.ui:1016 ui/shotwell.ui:1027 msgid "seconds" msgstr "detik" -#~ msgid "Copyright 2009-2015 Yorba Foundation" -#~ msgstr "Hak Cipta 2009-2015 Yorba Foundation" - -#~ msgid "Intro message replaced at runtime" -#~ msgstr "Pesan perkenalan digantikan saat berjalan" - -#~ msgid "'Publishing to $url as $username' (populated in application code)" -#~ msgstr "" -#~ "'Mempublikasikan ke $url sebagai $username' (diisi dalam kode aplikasi)" +#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6 +msgid "New _Tag…" +msgstr "_Tag Baru…" -#~ msgid "you are logged in rajce as $name" -#~ msgstr "Anda log masuk rajce sebagai $name" - -#~ msgid "$mediatype will appear in" -#~ msgstr "$mediatype akan muncul dalam" - -#~ msgid "Visit the Yorba web site" -#~ msgstr "Kunjungi situs Yorba" +#: ui/trash.ui:285 +msgid "Delete all photos in the trash" +msgstr "Hapus semua foto yang pernah dibuang" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo Binary files differindex ed0a1ba..e0edeb1 100644 --- a/po/pt_BR.gmo +++ b/po/pt_BR.gmo diff --git a/po/pt_BR.po b/po/pt_BR.po index 78a609e..f0e90fc 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,5 +1,5 @@ # Brazilian Portuguese translation of shotwell. -# Copyright 2016 Software Freedom Conservancy Inc. +# Copyright 2017 Software Freedom Conservancy Inc. # This file is distributed under the same license as the shotwell package. # Translators from Transifex (until 2014): # Djavan Fagundes <djavan@comum.org>, 2011-2012 @@ -12,14 +12,14 @@ # Translators from GNOME Translation Project (2014 forward): # Felipe Braga <fbobraga@gmail.com>, 2015. # Enrico Nicoletto <liverig@gmail.com>, 2016. -# Rafael Fontenelle <rafaelff@gnome.org>, 2014, 2015, 2016, 2017. +# Rafael Fontenelle <rafaelff@gnome.org>, 2014-2017. msgid "" msgstr "" "Project-Id-Version: shotwell\n" "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=shotwe" "ll&keywords=I18N+L10N&component=Internationalization\n" -"POT-Creation-Date: 2017-03-27 20:38+0000\n" -"PO-Revision-Date: 2017-04-01 16:37-0200\n" +"POT-Creation-Date: 2017-04-30 10:05+0000\n" +"PO-Revision-Date: 2017-04-30 17:11-0200\n" "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n" "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n" "Language: pt_BR\n" @@ -32,9 +32,9 @@ msgstr "" #: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115 -#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:354 -#: ui/event.ui:522 ui/media.ui:354 ui/photo_context.ui:91 ui/photo.ui:344 -#: ui/tags.ui:354 +#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:356 +#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346 +#: ui/tags.ui:356 msgid "Shotwell" msgstr "Shotwell" @@ -1365,7 +1365,6 @@ msgstr "" "está habilitado; do contrário, falso" #: misc/org.yorba.shotwell.gschema.xml:792 -#| msgid "enable slideshow circle transition" msgid "enable slideshow circles transition" msgstr "habilitar transição de círculos de apresentações de slides" @@ -1377,7 +1376,6 @@ msgstr "" "está habilitado; do contrário, falso" #: misc/org.yorba.shotwell.gschema.xml:798 -#| msgid "enable slideshow slide transition" msgid "enable slideshow blinds transition" msgstr "habilitar transição de enscurecimento de apresentações de slides" @@ -1539,7 +1537,7 @@ msgstr "" msgid "Visit the Shotwell home page" msgstr "Visitar o site do Shotwell" -#: plugins/common/Resources.vala:31 src/AppWindow.vala:604 +#: plugins/common/Resources.vala:31 src/AppWindow.vala:605 msgid "translator-credits" msgstr "" "Djavan Fagundes <djavan@comum.org>\n" @@ -2226,7 +2224,6 @@ msgstr "Tama_nho pré-definido da foto:" #. or the new "Default album" album for Google Photos #: plugins/shotwell-publishing/PicasaPublishing.vala:96 #: plugins/shotwell-publishing/PicasaPublishing.vala:630 -#| msgid "last album" msgid "Default album" msgstr "Álbum padrão" @@ -2319,7 +2316,7 @@ msgid "Logout" msgstr "Encerrar sessão" #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268 -#: src/Resources.vala:296 ui/collection.ui:190 +#: src/Resources.vala:296 ui/collection.ui:192 msgid "Publish" msgstr "Publicar" @@ -2553,21 +2550,27 @@ msgstr "" "\n" "%s" -#: src/AppWindow.vala:600 +#. translators: %s will be replaced by application version +#: src/AppWindow.vala:596 +#, c-format +msgid "%s – “Aachen”" +msgstr "%s – “Aachen”" + +#: src/AppWindow.vala:601 msgid "Visit the Shotwell web site" msgstr "Visitar o página web do Shotwell" -#: src/AppWindow.vala:613 +#: src/AppWindow.vala:614 #, c-format msgid "Unable to display help: %s" msgstr "Não foi possível exibir a ajuda: %s" -#: src/AppWindow.vala:621 +#: src/AppWindow.vala:622 #, c-format msgid "Unable to navigate to bug database: %s" msgstr "Não foi possível navegar no banco de dados de bugs: %s" -#: src/AppWindow.vala:629 +#: src/AppWindow.vala:630 #, c-format msgid "Unable to display FAQ: %s" msgstr "Não foi possível exibir FAQ: %s" @@ -2639,8 +2642,8 @@ msgstr "Câmeras" #: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718 #: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316 -#: ui/collection.ui:90 ui/event.ui:359 ui/event.ui:527 ui/media.ui:359 -#: ui/photo_context.ui:96 ui/photo.ui:349 ui/tags.ui:359 +#: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361 +#: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361 msgid "Camera" msgstr "Câmera" @@ -2791,8 +2794,8 @@ msgstr[1] "Não foi possível excluir %d fotos/vídeos da câmera devido a erros msgid "_Print" msgstr "Im_primir" -#: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:126 -#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:563 ui/photo.ui:28 +#: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128 +#: ui/direct_context.ui:24 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28 msgid "Send _To…" msgstr "Enviar _para…" @@ -2834,13 +2837,13 @@ msgid "Flip Verti_cally" msgstr "Inverter verti_calmente" #: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8 -#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:445 +#: ui/direct_context.ui:8 ui/direct.ui:134 ui/event.ui:447 #: ui/photo_context.ui:6 ui/photo.ui:223 msgid "_Enhance" msgstr "_Melhorar" #: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13 -#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:450 +#: ui/direct_context.ui:13 ui/direct.ui:161 ui/event.ui:452 #: ui/photo_context.ui:11 ui/photo.ui:250 msgid "Re_vert to Original" msgstr "Re_verter para o original" @@ -2861,8 +2864,8 @@ msgstr "Ajustar a data e hora…" msgid "Open With E_xternal Editor" msgstr "Abrir com o editor e_xterno" -#: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:111 -#: ui/event.ui:548 ui/photo_context.ui:118 ui/photo.ui:363 +#: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113 +#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:365 msgid "Open With RA_W Editor" msgstr "Abrir com editor de RA_W" @@ -3204,7 +3207,7 @@ msgstr[1] "Isto irá remover a etiqueta “%s” de %d fotos. Continuar?" #: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388 #: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415 -#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:458 ui/trash.ui:63 +#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:460 ui/trash.ui:63 #: ui/trash.ui:216 ui/trash.ui:258 msgid "_Delete" msgstr "_Apagar" @@ -4998,7 +5001,7 @@ msgstr "" msgid "Publishing" msgstr "Publicando" -#: src/Resources.vala:141 src/Resources.vala:146 ui/collection.ui:149 +#: src/Resources.vala:141 src/Resources.vala:146 ui/collection.ui:151 msgid "Rotate" msgstr "Girar" @@ -5006,7 +5009,7 @@ msgstr "Girar" msgid "Rotate Right" msgstr "Girar à direita" -#: src/Resources.vala:143 ui/collection.ui:146 +#: src/Resources.vala:143 ui/collection.ui:148 msgid "Rotate the photos right (press Ctrl to rotate left)" msgstr "Gira as fotos para direita (pressione Ctrl para girar para esquerda)" @@ -5027,8 +5030,8 @@ msgid "Flip Vertically" msgstr "Inverter verticalmente" #: src/Resources.vala:156 ui/direct.ui:191 ui/events_directory.ui:168 -#: ui/event.ui:436 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:419 -#: ui/offline.ui:198 ui/photo.ui:402 ui/tags.ui:438 ui/trash.ui:207 +#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:421 +#: ui/offline.ui:198 ui/photo.ui:404 ui/tags.ui:440 ui/trash.ui:207 msgid "_About" msgstr "S_obre" @@ -5052,11 +5055,11 @@ msgid "Fulls_creen" msgstr "Tela _cheia" #: src/Resources.vala:163 ui/direct.ui:173 ui/direct.ui:176 -#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:418 -#: ui/event.ui:421 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183 -#: ui/import.ui:186 ui/media.ui:401 ui/media.ui:404 ui/offline.ui:180 -#: ui/offline.ui:183 ui/photo.ui:384 ui/photo.ui:387 ui/tags.ui:420 -#: ui/tags.ui:423 ui/trash.ui:189 ui/trash.ui:192 +#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420 +#: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183 +#: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180 +#: ui/offline.ui:183 ui/photo.ui:386 ui/photo.ui:389 ui/tags.ui:422 +#: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192 msgid "_Help" msgstr "A_juda" @@ -5064,7 +5067,7 @@ msgstr "A_juda" msgid "Leave _Fullscreen" msgstr "Sair da _tela cheia" -#: src/Resources.vala:165 src/Resources.vala:364 ui/tags.ui:448 +#: src/Resources.vala:165 src/Resources.vala:364 ui/tags.ui:450 msgid "_New" msgstr "_Nova" @@ -5134,11 +5137,11 @@ msgstr "Ampl_iar" msgid "Zoom _Out" msgstr "Redu_zir" -#: src/Resources.vala:188 ui/collection.ui:165 +#: src/Resources.vala:188 ui/collection.ui:167 msgid "Enhance" msgstr "Melhorar" -#: src/Resources.vala:189 ui/collection.ui:162 +#: src/Resources.vala:189 ui/collection.ui:164 msgid "Automatically improve the photo’s appearance" msgstr "Melhora automaticamente a aparência da foto" @@ -5244,11 +5247,11 @@ msgid "Redo" msgstr "Refazer" #: src/Resources.vala:231 ui/events_directory.ui:139 ui/events_directory.ui:181 -#: ui/event.ui:391 ui/event.ui:584 +#: ui/event.ui:393 ui/event.ui:588 msgid "Re_name Event…" msgstr "Re_nomear evento…" -#: src/Resources.vala:234 ui/event.ui:371 ui/event.ui:576 +#: src/Resources.vala:234 ui/event.ui:373 ui/event.ui:580 msgid "Make _Key Photo for Event" msgstr "Designar f_oto como chave para evento" @@ -5256,7 +5259,7 @@ msgstr "Designar f_oto como chave para evento" msgid "Make Key Photo for Event" msgstr "Designa a foto como chave para evento" -#: src/Resources.vala:237 ui/event.ui:380 ui/media.ui:374 ui/tags.ui:374 +#: src/Resources.vala:237 ui/event.ui:382 ui/media.ui:376 ui/tags.ui:376 msgid "_New Event" msgstr "_Novo evento" @@ -5284,7 +5287,7 @@ msgstr "Unir" msgid "Combine events into a single event" msgstr "Combinar eventos em um único evento" -#: src/Resources.vala:247 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:476 +#: src/Resources.vala:247 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:478 #: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286 msgid "_Set Rating" msgstr "A_valiar" @@ -5297,7 +5300,7 @@ msgstr "Avaliar" msgid "Change the rating of your photo" msgstr "Alterar a avaliação da foto" -#: src/Resources.vala:251 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:509 +#: src/Resources.vala:251 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:511 #: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326 msgid "_Increase" msgstr "_Aumentar" @@ -5306,7 +5309,7 @@ msgstr "_Aumentar" msgid "Increase Rating" msgstr "Aumentar avaliação" -#: src/Resources.vala:254 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:513 +#: src/Resources.vala:254 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:515 #: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331 msgid "_Decrease" msgstr "_Diminuir" @@ -5315,7 +5318,7 @@ msgstr "_Diminuir" msgid "Decrease Rating" msgstr "Diminuir avaliação" -#: src/Resources.vala:257 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:499 +#: src/Resources.vala:257 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:501 #: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314 msgid "_Unrated" msgstr "_Sem avaliação" @@ -5336,7 +5339,7 @@ msgstr "Definir como não avaliado" msgid "Remove any ratings" msgstr "Remove avaliação" -#: src/Resources.vala:263 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:503 +#: src/Resources.vala:263 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:505 #: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319 msgid "_Rejected" msgstr "_Rejeitada" @@ -5433,11 +5436,11 @@ msgstr "Im_primir…" msgid "Pu_blish…" msgstr "Pu_blicar…" -#: src/Resources.vala:297 ui/collection.ui:187 +#: src/Resources.vala:297 ui/collection.ui:189 msgid "Publish to various websites" msgstr "Publicar para vários sites" -#: src/Resources.vala:299 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:535 +#: src/Resources.vala:299 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:537 #: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340 msgid "Edit _Title…" msgstr "Editar _título…" @@ -5448,9 +5451,9 @@ msgctxt "Button Label" msgid "Edit Title" msgstr "Editar título" -#: src/Resources.vala:303 ui/collection.ui:102 ui/events_directory.ui:144 -#: ui/events_directory.ui:186 ui/event.ui:344 ui/event.ui:396 ui/event.ui:539 -#: ui/media.ui:344 ui/photo_context.ui:109 ui/photo.ui:331 ui/tags.ui:344 +#: src/Resources.vala:303 ui/collection.ui:103 ui/events_directory.ui:144 +#: ui/events_directory.ui:186 ui/event.ui:345 ui/event.ui:398 ui/event.ui:542 +#: ui/media.ui:345 ui/photo_context.ui:110 ui/photo.ui:332 ui/tags.ui:345 msgid "Edit _Comment…" msgstr "Editar _comentário…" @@ -5459,11 +5462,11 @@ msgstr "Editar _comentário…" msgid "Edit Comment" msgstr "Editar comentário" -#: src/Resources.vala:307 ui/event.ui:588 +#: src/Resources.vala:307 ui/event.ui:592 msgid "Edit Event _Comment…" msgstr "Editar _comentário de evento…" -#: src/Resources.vala:310 ui/direct.ui:167 ui/photo.ui:335 +#: src/Resources.vala:310 ui/direct.ui:167 ui/photo.ui:337 msgid "_Adjust Date and Time…" msgstr "_Ajustar data e hora…" @@ -5471,8 +5474,8 @@ msgstr "_Ajustar data e hora…" msgid "Adjust Date and Time" msgstr "Ajustar a data e hora" -#: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:405 ui/event.ui:456 -#: ui/media.ui:388 ui/photo.ui:372 ui/tags.ui:388 +#: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458 +#: ui/media.ui:390 ui/photo.ui:374 ui/tags.ui:390 msgid "Add _Tags…" msgstr "Adicionar e_tiquetas…" @@ -5486,7 +5489,7 @@ msgctxt "Dialog Title" msgid "Add Tags" msgstr "Adicionar etiquetas" -#: src/Resources.vala:325 ui/photo_context.ui:133 +#: src/Resources.vala:325 ui/photo_context.ui:135 msgid "Send T_o…" msgstr "Enviar p_ara…" @@ -5494,12 +5497,12 @@ msgstr "Enviar p_ara…" msgid "_Find…" msgstr "_Localizar…" -#: src/Resources.vala:328 ui/collection.ui:215 ui/offline.ui:239 +#: src/Resources.vala:328 ui/collection.ui:217 ui/offline.ui:239 #: ui/trash.ui:312 msgid "Find" msgstr "Localização" -#: src/Resources.vala:329 ui/collection.ui:212 ui/offline.ui:236 +#: src/Resources.vala:329 ui/collection.ui:214 ui/offline.ui:236 #: ui/trash.ui:309 msgid "Find an image by typing text that appears in its name or tags" msgstr "" @@ -5559,12 +5562,12 @@ msgstr "Re_nomear etiqueta “%s”…" msgid "Rename Tag “%s” to “%s”" msgstr "Renomear a etiqueta “%s” para “%s”" -#: src/Resources.vala:374 ui/tags.ui:454 +#: src/Resources.vala:374 ui/tags.ui:456 msgid "_Rename…" msgstr "_Renomear…" -#: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:410 ui/event.ui:461 -#: ui/media.ui:393 ui/photo_context.ui:22 ui/photo.ui:377 ui/tags.ui:393 +#: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463 +#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:379 ui/tags.ui:395 msgid "Modif_y Tags…" msgstr "_Modificar etiquetas…" @@ -5697,9 +5700,9 @@ msgstr "_Restaurar" msgid "Move the selected photos back into the library" msgstr "Mover as fotos selecionadas para a biblioteca" -#: src/Resources.vala:666 ui/collection.ui:121 ui/direct_context.ui:20 -#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:558 ui/media.ui:27 -#: ui/photo_context.ui:128 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19 +#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:19 +#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27 +#: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19 #: ui/trash.ui:227 msgid "Show in File Mana_ger" msgstr "Abrir com o gerenciador de a_rquivos" @@ -5717,8 +5720,8 @@ msgstr "Não foi possível abrir no gerenciador de arquivos: %s" msgid "R_emove From Library" msgstr "R_emover da biblioteca" -#: src/Resources.vala:675 ui/collection.ui:132 ui/event.ui:79 ui/event.ui:569 -#: ui/media.ui:79 ui/photo_context.ui:139 ui/photo.ui:82 ui/tags.ui:79 +#: src/Resources.vala:675 ui/collection.ui:134 ui/event.ui:79 ui/event.ui:573 +#: ui/media.ui:79 ui/photo_context.ui:141 ui/photo.ui:82 ui/tags.ui:79 msgid "_Move to Trash" msgstr "_Mover para a lixeira" @@ -6093,22 +6096,22 @@ msgstr "Sem título" msgid "Export Videos" msgstr "Exportar vídeos" -#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:470 ui/media.ui:281 +#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:472 ui/media.ui:281 #: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281 msgid "Toggle _Flag" msgstr "Alternar _marca" -#: ui/collection.ui:82 ui/event.ui:351 ui/event.ui:519 ui/media.ui:351 -#: ui/photo_context.ui:88 ui/photo.ui:341 ui/tags.ui:351 +#: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353 +#: ui/photo_context.ui:88 ui/photo.ui:343 ui/tags.ui:353 msgid "_Developer" msgstr "_Desenvolvedor" -#: ui/collection.ui:106 ui/event.ui:543 ui/photo_context.ui:113 ui/photo.ui:358 +#: ui/collection.ui:108 ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360 msgid "Open with E_xternal Editor" msgstr "Abrir com editor e_xterno" -#: ui/collection.ui:117 ui/event.ui:385 ui/event.ui:554 ui/media.ui:379 -#: ui/photo_context.ui:124 ui/tags.ui:379 +#: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381 +#: ui/photo_context.ui:126 ui/tags.ui:381 msgid "View Eve_nt for Photo" msgstr "Ver eve_nto para foto" @@ -6156,15 +6159,15 @@ msgstr "Próxi_ma foto" msgid "T_ools" msgstr "F_erramentas" -#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:426 -#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:409 ui/offline.ui:188 -#: ui/photo.ui:392 ui/tags.ui:428 ui/trash.ui:197 +#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:428 +#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188 +#: ui/photo.ui:394 ui/tags.ui:430 ui/trash.ui:197 msgid "_Frequently Asked Questions" msgstr "Perguntas _frequentes (FAQ)" -#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:430 -#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:413 ui/offline.ui:192 -#: ui/photo.ui:396 ui/tags.ui:432 ui/trash.ui:201 +#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:432 +#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192 +#: ui/photo.ui:398 ui/tags.ui:434 ui/trash.ui:201 msgid "_Report a Problem…" msgstr "_Relate um problema…" @@ -6244,7 +6247,7 @@ msgstr "_Ascendente" msgid "D_escending" msgstr "D_escendente" -#: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371 +#: ui/events_directory.ui:132 ui/event.ui:379 ui/media.ui:373 ui/tags.ui:373 msgid "Even_ts" msgstr "Even_tos" @@ -6257,8 +6260,8 @@ msgstr "R_emover da biblioteca" msgid "_Titles" msgstr "_Títulos" -#: ui/event.ui:139 ui/event.ui:402 ui/media.ui:139 ui/media.ui:385 -#: ui/photo.ui:369 ui/tags.ui:139 ui/tags.ui:385 +#: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387 +#: ui/photo.ui:371 ui/tags.ui:139 ui/tags.ui:387 msgid "Ta_gs" msgstr "Eti_quetas" diff --git a/po/shotwell.pot b/po/shotwell.pot index 3be2fba..e08e440 100644 --- a/po/shotwell.pot +++ b/po/shotwell.pot @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: shotwell 0.26.1\n" +"Project-Id-Version: shotwell 0.26.2\n" "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=Shotwell&component=Internationalization\n" -"POT-Creation-Date: 2017-04-11 22:36+0200\n" +"POT-Creation-Date: 2017-06-01 18:54+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -2205,10 +2205,10 @@ msgid "Leave fullscreen" msgstr "" #: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569 -#: src/data_imports/DataImportsUI.vala:301 -#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20 +#: src/data_imports/DataImportsUI.vala:303 +#: src/data_imports/DataImportsUI.vala:421 src/Dialogs.vala:20 #: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443 -#: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525 +#: src/publishing/PublishingUI.vala:303 src/publishing/PublishingUI.vala:527 #: src/Resources.vala:158 msgid "_Cancel" msgstr "" @@ -2790,7 +2790,7 @@ msgstr "" msgid "Import media _from:" msgstr "" -#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520 +#: src/data_imports/DataImportsUI.vala:416 src/publishing/PublishingUI.vala:522 msgid "_Close" msgstr "" @@ -3706,7 +3706,7 @@ msgid "Save As" msgstr "" #. verify this is a directory -#: src/DirectoryMonitor.vala:889 +#: src/DirectoryMonitor.vala:891 #, c-format msgid "Unable to monitor %s: Not a directory (%s)" msgstr "" @@ -4481,37 +4481,37 @@ msgstr "" msgid "Logging in…" msgstr "" -#: src/publishing/PublishingUI.vala:193 +#: src/publishing/PublishingUI.vala:195 msgid "Publish Photos" msgstr "" -#: src/publishing/PublishingUI.vala:194 +#: src/publishing/PublishingUI.vala:196 msgid "Publish photos _to:" msgstr "" -#: src/publishing/PublishingUI.vala:196 +#: src/publishing/PublishingUI.vala:198 msgid "Publish Videos" msgstr "" -#: src/publishing/PublishingUI.vala:197 +#: src/publishing/PublishingUI.vala:199 msgid "Publish videos _to" msgstr "" -#: src/publishing/PublishingUI.vala:199 +#: src/publishing/PublishingUI.vala:201 msgid "Publish Photos and Videos" msgstr "" -#: src/publishing/PublishingUI.vala:200 +#: src/publishing/PublishingUI.vala:202 msgid "Publish photos and videos _to" msgstr "" #. There are no enabled publishing services that accept this media type, #. warn the user. -#: src/publishing/PublishingUI.vala:410 +#: src/publishing/PublishingUI.vala:412 msgid "Unable to publish" msgstr "" -#: src/publishing/PublishingUI.vala:411 +#: src/publishing/PublishingUI.vala:413 #, c-format msgid "" "Shotwell cannot publish the selected items because you do not have a " Binary files differ@@ -17,10 +17,10 @@ msgid "" msgstr "" "Project-Id-Version: shotwell-0.15\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=shotwell&keywords=I18N+L10N&component=Internationalization\n" -"POT-Creation-Date: 2017-01-01 19:37+0000\n" -"PO-Revision-Date: 2017-01-01 21:01+0100\n" +"POT-Creation-Date: 2017-04-02 16:28+0000\n" +"PO-Revision-Date: 2017-04-15 19:29+0200\n" "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n" "Language-Team: slovenčina <gnome-sk-list@gnome.org>\n" "Language: sk\n" @@ -32,9 +32,9 @@ msgstr "" #: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115 -#: src/photos/RawSupport.vala:300 ui/collection.ui:85 ui/event.ui:354 -#: ui/event.ui:522 ui/media.ui:354 ui/photo_context.ui:91 ui/photo.ui:344 -#: ui/tags.ui:354 +#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:356 +#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346 +#: ui/tags.ui:356 msgid "Shotwell" msgstr "Shotwell" @@ -63,6 +63,12 @@ msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats." msgstr "" "Prehliadač Shotwell podporuje formáty JPEG, PNG, TIFF a množstvo súborov RAW." +#: misc/shotwell.appdata.xml.in:52 +#, fuzzy +#| msgid "Shotwell Viewer" +msgid "The Shotwell developers" +msgstr "Prehliadač Shotwell" + #: misc/shotwell.desktop.in.in:5 src/Resources.vala:17 msgid "Photo Manager" msgstr "Správca fotografií" @@ -935,7 +941,7 @@ msgstr "Kľúč API služby Gallery3" #: misc/org.yorba.shotwell.gschema.xml:580 msgid "URL" -msgstr "" +msgstr "URL" #: misc/org.yorba.shotwell.gschema.xml:581 msgid "Gallery3 site URL" @@ -1202,7 +1208,6 @@ msgid "" msgstr "" #: misc/org.yorba.shotwell.gschema.xml:774 -#: misc/org.yorba.shotwell.gschema.xml:798 #, fuzzy #| msgid "Core Slideshow Transitions" msgid "enable slideshow slide transition" @@ -1225,7 +1230,6 @@ msgid "" msgstr "" #: misc/org.yorba.shotwell.gschema.xml:786 -#: misc/org.yorba.shotwell.gschema.xml:792 #, fuzzy #| msgid "Core Slideshow Transitions" msgid "enable slideshow circle transition" @@ -1236,11 +1240,23 @@ msgid "" "True if the Circle slideshow transition plugin is enabled, false otherwise" msgstr "" +#: misc/org.yorba.shotwell.gschema.xml:792 +#, fuzzy +#| msgid "Core Slideshow Transitions" +msgid "enable slideshow circles transition" +msgstr "Hlavné prechody prezentácie" + #: misc/org.yorba.shotwell.gschema.xml:793 msgid "" "True if the Circles slideshow transition plugin is enabled, false otherwise" msgstr "" +#: misc/org.yorba.shotwell.gschema.xml:798 +#, fuzzy +#| msgid "Core Slideshow Transitions" +msgid "enable slideshow blinds transition" +msgstr "Hlavné prechody prezentácie" + #: misc/org.yorba.shotwell.gschema.xml:799 msgid "" "True if the Blinds slideshow transition plugin is enabled, false otherwise" @@ -1280,11 +1296,146 @@ msgid "" "otherwise" msgstr "" +#: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:166 +#, fuzzy +#| msgid "" +#| "You are not currently logged into Facebook.\n" +#| "\n" +#| "If you don't yet have a Facebook account, you can create one during the " +#| "login process. During login, Shotwell Connect may ask you for permission " +#| "to upload photos and publish to your feed. These permissions are required " +#| "for Shotwell Connect to function." +msgid "" +"You are not currently logged into Facebook.\n" +"\n" +"If you don’t yet have a Facebook account, you can create one during the " +"login process. During login, Shotwell Connect may ask you for permission to " +"upload photos and publish to your feed. These permissions are required for " +"Shotwell Connect to function." +msgstr "" +"Momentálne nie ste prihlásený do služby Facebook.\n" +"\n" +"Ak ešte nemáte vytvorený Facebook účet, môžete si jeden vytvoriť počas " +"prihlasovacieho procesu. Počas prihlásenia si Shotwell Connect môže vyžiadať " +"povolenie na odovzdanie fotografií a ich uverejnenie vo vašom kanáli. Toto " +"povolenie je potrebné na to, aby Shotwell Connect mohol správne fungovať." + +#: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:168 +msgid "" +"You have already logged in and out of Facebook during this Shotwell " +"session.\n" +"To continue publishing to Facebook, quit and restart Shotwell, then try " +"publishing again." +msgstr "" +"Počas tohoto spustenia programu Shotwell ste sa už prihlásili a odhlásili zo " +"siete Facebook.\n" +"Aby ste mohli naďalej uverejňovať fotografie na sieti Facebook, ukončite a " +"znova spustite Shotwell, a potom to skúste znova." + +#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:17 +msgid "" +"Enter the confirmation number which appears after you log into Flickr in " +"your Web browser." +msgstr "" +"Zadajte potvrdzovacie číslo, ktoré bolo zobrazené po prihlásený do služby " +"Flickr vo vašom webovom prehliadači." + +#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:37 +msgid "Authorization _Number:" +msgstr "Autorizačné čí_slo:" + +#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70 +#: src/Dialogs.vala:128 +msgid "Con_tinue" +msgstr "_Pokračovať" + +#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:187 +msgid "" +"You are not currently logged into Flickr.\n" +"\n" +"Click Log in to log into Flickr in your Web browser. You will have to " +"authorize Shotwell Connect to link to your Flickr account." +msgstr "" +"Momentálne nie ste prihlásený do služby Flickr.\n" +"\n" +"Kliknite na Prihlásiť pre prihlásenie do služby Flickr vo vašom webovom " +"prehliadači. Budete musieť autorizovať Shotwell Connect odkaz na váš účet " +"Flickr." + +#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364 +msgid "Preparing for login…" +msgstr "Pripravuje sa prihlásenie…" + +#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:468 +#: plugins/shotwell-publishing/FlickrPublishing.vala:341 +#, fuzzy +#| msgid "" +#| "A file required for publishing is unavailable. Publishing to Flickr can't " +#| "continue." +msgid "" +"A file required for publishing is unavailable. Publishing to Flickr can’t " +"continue." +msgstr "" +"Súbor potrebný na uverejňovanie nie je dostupný. Uverejňovanie na službu " +"Flickr nemôže pokračovať." + +#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:481 +msgid "Verifying authorization…" +msgstr "Overuje sa autorizácia…" + +#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:118 +msgid "" +"You have already logged in and out of a Google service during this Shotwell " +"session.\n" +"\n" +"To continue publishing to Google services, quit and restart Shotwell, then " +"try publishing again." +msgstr "" +"Už ste sa prihlásili a odhlásili zo služby Google počas tejto relácie " +"programu Shotwell.\n" +"Na pokračovanie v uverejňovaní na služby Google, ukončite a znovu spustite " +"program Shotwell a skúste uverejňovanie znovu." + +#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:31 +#, fuzzy +#| msgid "" +#| "You are not currently logged into Picasa Web Albums.\n" +#| "\n" +#| "Click Login to log into Picasa Web Albums in your Web browser. You will " +#| "have to authorize Shotwell Connect to link to your Picasa Web Albums " +#| "account." +msgid "" +"You are not currently logged into Picasa Web Albums.\n" +"\n" +"Click Log in to log into Picasa Web Albums in your Web browser. You will " +"have to authorize Shotwell Connect to link to your Picasa Web Albums account." +msgstr "" +"Momentálne nie ste prihlásený do služby webových albumov Picasa.\n" +"\n" +"Kliknite na Prihlásiť na prihlásenie do služby webových albumov Picasa vo " +"vašom webovom prehliadači. Budete musieť schváliť požiadavku na spojenie " +"programu Shotwell Connect s vaším účtom webových albumov Picasa." + +#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34 +msgid "" +"You are not currently logged into YouTube.\n" +"\n" +"You must have already signed up for a Google account and set it up for use " +"with YouTube to continue. You can set up most accounts by using your browser " +"to log into the YouTube site at least once." +msgstr "" +"Momentálne nie ste prihlásený do služby YouTube.\n" +"\n" +"Aby ste mohli pokračovať, musíte si vytvoriť účet Google a nastaviť ho na " +"používanie služby YouTube. Väčšinu účtov takto môžete nastaviť prihláseným " +"sa aspoň raz cez prehliadač na stránku služby YouTube (http://www.youtube." +"com/)." + #: plugins/common/Resources.vala:12 msgid "Visit the Shotwell home page" msgstr "Navštíviť domovskú stránku programu Shotwell" -#: plugins/common/Resources.vala:31 src/AppWindow.vala:603 +#: plugins/common/Resources.vala:31 src/AppWindow.vala:605 msgid "translator-credits" msgstr "" "Laco Gubík <lacogubik@googlemail.com>\n" @@ -1343,19 +1494,6 @@ msgstr "" msgid "A temporary file needed for publishing is unavailable" msgstr "Dočasný súbor potrebný na uverejnenie nie je dostupný" -#: plugins/common/RESTSupport.vala:1167 -msgid "" -"You have already logged in and out of a Google service during this Shotwell " -"session.\n" -"\n" -"To continue publishing to Google services, quit and restart Shotwell, then " -"try publishing again." -msgstr "" -"Už ste sa prihlásili a odhlásili zo služby Google počas tejto relácie " -"programu Shotwell.\n" -"Na pokračovanie v uverejňovaní na služby Google, ukončite a znovu spustite " -"program Shotwell a skúste uverejňovanie znovu." - #: plugins/shotwell-data-imports/FSpotImporter.vala:36 #: plugins/shotwell-publishing/FacebookPublishing.vala:33 #: plugins/shotwell-publishing/FlickrPublishing.vala:33 @@ -1469,7 +1607,7 @@ msgid "Go _Back" msgstr "Späť" #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125 -#: ui/shotwell.ui:1464 +#: ui/shotwell.ui:1105 msgid "_Log in" msgstr "_Prihlásiť" @@ -1504,7 +1642,7 @@ msgid "pixels" msgstr " _pixelov" #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158 -#: plugins/shotwell-publishing/FlickrPublishing.vala:1209 +#: plugins/shotwell-publishing/FlickrPublishing.vala:880 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306 #: src/Dimensions.vala:17 msgid "Original size" @@ -1522,7 +1660,7 @@ msgstr "Šírky alebo výšky" #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:145 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:177 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:125 -#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:208 +#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:142 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99 msgid "_Logout" msgstr "_Odhlásiť" @@ -1534,9 +1672,9 @@ msgstr "_Odhlásiť" #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:192 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:141 -#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:222 +#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:156 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115 -#: src/CollectionPage.vala:76 src/PhotoPage.vala:2465 +#: src/CollectionPage.vala:82 src/PhotoPage.vala:2469 msgid "_Publish" msgstr "U_verejniť" @@ -1667,13 +1805,11 @@ msgstr "Prihlásiť" #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015 -#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:70 msgid "An _existing album:" msgstr "_Existujúcom albume:" #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:123 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016 -#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:87 msgid "A _new album named:" msgstr "Photos will be _visible by:" @@ -1688,7 +1824,6 @@ msgid "Open target _album in browser" msgstr "Otvoriť cieľový _album v prehliadači" #: plugins/shotwell-publishing-extras/RajcePublishing.vala:40 -#| msgid "Copyright (C) 2013 rajce.net" msgid "Copyright © 2013 rajce.net" msgstr "Autorské práva © 2013 rajce.net" @@ -1716,12 +1851,12 @@ msgid "You are logged into Rajce as %s." msgstr "Ste prihlásený do služby Rajce ako %s." #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014 -#: plugins/shotwell-publishing/PicasaPublishing.vala:670 +#: plugins/shotwell-publishing/PicasaPublishing.vala:571 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:20 msgid "Photos will appear in:" -msgstr "Fotografie sa zobrazia v:" +msgstr "Fotografie budú zobrazené v:" -#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20 +#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31 msgid "Shotwell Extra Publishing Services" msgstr "Hlavné uverejňovacie služby" @@ -1739,21 +1874,18 @@ msgid "Copyright 2012 BJA Electronics" msgstr "Autorské práva 2012 BJA Electronics" #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105 -#: plugins/shotwell-publishing/FlickrPublishing.vala:1205 +#: plugins/shotwell-publishing/FlickrPublishing.vala:876 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1302 -#| msgid "500 x 375 pixels" msgid "500 × 375 pixels" msgstr "500 × 375 pixelov" #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106 -#: plugins/shotwell-publishing/FlickrPublishing.vala:1206 +#: plugins/shotwell-publishing/FlickrPublishing.vala:877 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1303 -#| msgid "1024 x 768 pixels" msgid "1024 × 768 pixels" msgstr "1024 × 768 pixelov" #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107 -#| msgid "1280 x 853 pixels" msgid "1280 × 853 pixels" msgstr "1280 × 853 pixelov" @@ -1820,12 +1952,12 @@ msgid "Public" msgstr "Uverejniť" #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15 -#: plugins/shotwell-publishing/FacebookPublishing.vala:1144 +#: plugins/shotwell-publishing/FacebookPublishing.vala:888 msgid "Friends" msgstr "Priatelia" #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18 -#: plugins/shotwell-publishing/YouTubePublishing.vala:498 +#: plugins/shotwell-publishing/YouTubePublishing.vala:378 msgid "Private" msgstr "Súkromné" @@ -1854,7 +1986,7 @@ msgid "Create a _new album named:" msgstr "Vytvoriť _nový album s názvom:" #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100 -#: plugins/shotwell-publishing/FacebookPublishing.vala:984 +#: plugins/shotwell-publishing/FacebookPublishing.vala:725 msgid "Upload _size:" msgstr "_Veľkosť odovzdávania:" @@ -1864,7 +1996,7 @@ msgstr "Videá a nové albumy budú v_iditeľné:" #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:155 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:92 -#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:159 +#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:59 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203 msgid "" "_Remove location, camera, and other identifying information before uploading" @@ -1872,66 +2004,25 @@ msgstr "" "_Odstrániť umiestnenie, typ fotoaparátu a iné identifikačné informácie pred " "odovzdaním" -#: plugins/shotwell-publishing/FacebookPublishing.vala:62 -#: plugins/shotwell-publishing/PicasaPublishing.vala:60 +#: plugins/shotwell-publishing/FacebookPublishing.vala:61 +#: plugins/shotwell-publishing/PicasaPublishing.vala:58 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1188 msgid "Shotwell Connect" msgstr "Shotwell Connect" -#: plugins/shotwell-publishing/FacebookPublishing.vala:64 -#, fuzzy -#| msgid "" -#| "You are not currently logged into Facebook.\n" -#| "\n" -#| "If you don't yet have a Facebook account, you can create one during the " -#| "login process. During login, Shotwell Connect may ask you for permission " -#| "to upload photos and publish to your feed. These permissions are required " -#| "for Shotwell Connect to function." -msgid "" -"You are not currently logged into Facebook.\n" -"\n" -"If you don’t yet have a Facebook account, you can create one during the " -"login process. During login, Shotwell Connect may ask you for permission to " -"upload photos and publish to your feed. These permissions are required for " -"Shotwell Connect to function." -msgstr "" -"Momentálne nie ste prihlásený do služby Facebook.\n" -"\n" -"Ak ešte nemáte vytvorený Facebook účet, môžete si jeden vytvoriť počas " -"prihlasovacieho procesu. Počas prihlásenia si Shotwell Connect môže vyžiadať " -"povolenie na odovzdanie fotografií a ich uverejnenie vo vašom kanáli. Toto " -"povolenie je potrebné na to, aby Shotwell Connect mohol správne fungovať." - -#: plugins/shotwell-publishing/FacebookPublishing.vala:66 -msgid "" -"You have already logged in and out of Facebook during this Shotwell " -"session.\n" -"To continue publishing to Facebook, quit and restart Shotwell, then try " -"publishing again." -msgstr "" -"Počas tohoto spustenia programu Shotwell ste sa už prihlásili a odhlásili zo " -"siete Facebook.\n" -"Aby ste mohli naďalej uverejňovať fotografie na sieti Facebook, ukončite a " -"znova spustite Shotwell, a potom to skúste znova." - -#: plugins/shotwell-publishing/FacebookPublishing.vala:87 +#: plugins/shotwell-publishing/FacebookPublishing.vala:81 msgid "Standard (720 pixels)" msgstr "Štandardná (720 pixelov)" -#: plugins/shotwell-publishing/FacebookPublishing.vala:90 +#: plugins/shotwell-publishing/FacebookPublishing.vala:84 msgid "Large (2048 pixels)" msgstr "Veľká (2048 pixelov)" -#: plugins/shotwell-publishing/FacebookPublishing.vala:255 -msgid "Testing connection to Facebook…" -msgstr "Testuje sa pripojenie k službe Facebook…" - -#: plugins/shotwell-publishing/FacebookPublishing.vala:348 -#: plugins/shotwell-publishing/PicasaPublishing.vala:379 +#: plugins/shotwell-publishing/FacebookPublishing.vala:314 msgid "Creating album…" msgstr "Vytvára sa album…" -#: plugins/shotwell-publishing/FacebookPublishing.vala:374 +#: plugins/shotwell-publishing/FacebookPublishing.vala:340 #, fuzzy #| msgid "" #| "A file required for publishing is unavailable. Publishing to Facebook " @@ -1943,7 +2034,7 @@ msgstr "" "Súbor potrebný na uverejňovanie nie je dostupný. Uverejňovanie na službu " "Facebook nemôže pokračovať." -#: plugins/shotwell-publishing/FacebookPublishing.vala:982 +#: plugins/shotwell-publishing/FacebookPublishing.vala:723 #, c-format msgid "" "You are logged into Facebook as %s.\n" @@ -1952,83 +2043,22 @@ msgstr "" "Ste prihlásený do služby Facebook ako %s.\n" "\n" -#: plugins/shotwell-publishing/FacebookPublishing.vala:983 +#: plugins/shotwell-publishing/FacebookPublishing.vala:724 msgid "Where would you like to publish the selected photos?" msgstr "Kde si želáte uverejniť vybrané fotografie?" -#: plugins/shotwell-publishing/FacebookPublishing.vala:1143 -#: plugins/shotwell-publishing/FlickrPublishing.vala:1187 +#: plugins/shotwell-publishing/FacebookPublishing.vala:887 +#: plugins/shotwell-publishing/FlickrPublishing.vala:858 msgid "Just me" msgstr "Len pre mňa" -#: plugins/shotwell-publishing/FacebookPublishing.vala:1145 -#: plugins/shotwell-publishing/FlickrPublishing.vala:1183 +#: plugins/shotwell-publishing/FacebookPublishing.vala:889 +#: plugins/shotwell-publishing/FlickrPublishing.vala:854 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290 msgid "Everyone" msgstr "Všetkých" -#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:17 -msgid "" -"Enter the confirmation number which appears after you log into Flickr in " -"your Web browser." -msgstr "" -"Zadajte potvrdzovacie číslo, ktoré bolo zobrazené po prihlásený do služby " -"Flickr vo vašom webovom prehliadači." - -#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:37 -msgid "Authorization _Number:" -msgstr "Autorizačné čí_slo:" - -#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:70 src/Dialogs.vala:128 -msgid "Con_tinue" -msgstr "_Pokračovať" - -#: plugins/shotwell-publishing/FlickrPublishing.vala:60 -msgid "" -"You are not currently logged into Flickr.\n" -"\n" -"Click Log in to log into Flickr in your Web browser. You will have to " -"authorize Shotwell Connect to link to your Flickr account." -msgstr "" -"Momentálne nie ste prihlásený do služby Flickr.\n" -"\n" -"Kliknite na Prihlásiť pre prihlásenie do služby Flickr vo vašom webovom " -"prehliadači. Budete musieť autorizovať Shotwell Connect odkaz na váš účet " -"Flickr." - -#: plugins/shotwell-publishing/FlickrPublishing.vala:62 -msgid "" -"You have already logged in and out of Flickr during this Shotwell session.\n" -"To continue publishing to Flickr, quit and restart Shotwell, then try " -"publishing again." -msgstr "" -"Počas tohoto spustenia programu Shotwell ste sa už prihlásili a odhlásili k " -"službe Flickr.\n" -"Aby ste mohli naďalej uverejňovať fotografie pomocou služby Flickr, ukončite " -"a znova spustite Shotwell, a potom to skúste znova." - -#: plugins/shotwell-publishing/FlickrPublishing.vala:374 -msgid "Preparing for login…" -msgstr "Pripravuje sa prihlásenie…" - -#: plugins/shotwell-publishing/FlickrPublishing.vala:434 -#: plugins/shotwell-publishing/FlickrPublishing.vala:571 -#, fuzzy -#| msgid "" -#| "A file required for publishing is unavailable. Publishing to Flickr can't " -#| "continue." -msgid "" -"A file required for publishing is unavailable. Publishing to Flickr can’t " -"continue." -msgstr "" -"Súbor potrebný na uverejňovanie nie je dostupný. Uverejňovanie na službu " -"Flickr nemôže pokračovať." - -#: plugins/shotwell-publishing/FlickrPublishing.vala:447 -msgid "Verifying authorization…" -msgstr "Overuje sa autorizácia…" - -#: plugins/shotwell-publishing/FlickrPublishing.vala:1129 +#: plugins/shotwell-publishing/FlickrPublishing.vala:800 #, c-format msgid "" "You are logged into Flickr as %s.\n" @@ -2038,92 +2068,68 @@ msgstr "" "\n" # DK: https://bugzilla.gnome.org/show_bug.cgi?id=736633 -#: plugins/shotwell-publishing/FlickrPublishing.vala:1131 -#, fuzzy, c-format -#| msgid "" -#| "Your free Flickr account limits how much data you can upload per month.\n" -#| "This month you have %d megabyte remaining in your upload quota." -#| msgid_plural "" -#| "Your free Flickr account limits how much data you can upload per month.\n" -#| "This month you have %d megabytes remaining in your upload quota." +#: plugins/shotwell-publishing/FlickrPublishing.vala:802 +#, c-format msgid "" "Your free Flickr account limits how much data you can upload per month.\n" "This month you have %s remaining in your upload quota." msgstr "" "Váš Flickr účet, ktorý je zdarma, obmedzuje koľko dát môžete odovzdať za " "mesiac.\n" -"Tento mesiac vám ešte zostáva %d megabajtov z vašej kvóty." +"Tento mesiac vám ešte zostáva %s megabajtov z vašej kvóty." -#: plugins/shotwell-publishing/FlickrPublishing.vala:1133 +#: plugins/shotwell-publishing/FlickrPublishing.vala:804 msgid "Your Flickr Pro account entitles you to unlimited uploads." msgstr "" "Váš účet služby Flickr Pro vám umožňuje neobmedzené odovzdávania fotografií." -#: plugins/shotwell-publishing/FlickrPublishing.vala:1138 +#: plugins/shotwell-publishing/FlickrPublishing.vala:809 msgid "Photos _visible to:" msgstr "Fotografie _viditeľné pre:" -#: plugins/shotwell-publishing/FlickrPublishing.vala:1140 +#: plugins/shotwell-publishing/FlickrPublishing.vala:811 msgid "Videos _visible to:" msgstr "Videá budú v_iditeľné:" -#: plugins/shotwell-publishing/FlickrPublishing.vala:1143 +#: plugins/shotwell-publishing/FlickrPublishing.vala:814 msgid "Photos and videos _visible to:" msgstr "Fotografie a videá budú v_iditeľné:" -#: plugins/shotwell-publishing/FlickrPublishing.vala:1184 +#: plugins/shotwell-publishing/FlickrPublishing.vala:855 msgid "Friends & family only" msgstr "Len pre priateľov a rodinu" -#: plugins/shotwell-publishing/FlickrPublishing.vala:1185 +#: plugins/shotwell-publishing/FlickrPublishing.vala:856 msgid "Family only" msgstr "Iba rodina" -#: plugins/shotwell-publishing/FlickrPublishing.vala:1186 +#: plugins/shotwell-publishing/FlickrPublishing.vala:857 msgid "Friends only" msgstr "Iba priatelia" -#: plugins/shotwell-publishing/FlickrPublishing.vala:1207 +#: plugins/shotwell-publishing/FlickrPublishing.vala:878 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304 -#| msgid "2048 x 1536 pixels" msgid "2048 × 1536 pixels" msgstr "2048 × 1536 pixelov" -#: plugins/shotwell-publishing/FlickrPublishing.vala:1208 +#: plugins/shotwell-publishing/FlickrPublishing.vala:879 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305 -#| msgid "4096 x 3072 pixels" msgid "4096 × 3072 pixels" msgstr "4096 × 3072 pixelov" -#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:103 -msgid "L_ist album in public gallery" -msgstr "_Zobraziť album vo verejnej galérii" - -#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:137 +#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:93 msgid "Photo _size preset:" msgstr "Prednastavená _veľkosť fotografie:" -#: plugins/shotwell-publishing/PicasaPublishing.vala:59 -#, fuzzy -#| msgid "" -#| "You are not currently logged into Picasa Web Albums.\n" -#| "\n" -#| "Click Login to log into Picasa Web Albums in your Web browser. You will " -#| "have to authorize Shotwell Connect to link to your Picasa Web Albums " -#| "account." -msgid "" -"You are not currently logged into Picasa Web Albums.\n" -"\n" -"Click Log in to log into Picasa Web Albums in your Web browser. You will " -"have to authorize Shotwell Connect to link to your Picasa Web Albums account." -msgstr "" -"Momentálne nie ste prihlásený do služby webových albumov Picasa.\n" -"\n" -"Kliknite na Prihlásiť na prihlásenie do služby webových albumov Picasa vo " -"vašom webovom prehliadači. Budete musieť schváliť požiadavku na spojenie " -"programu Shotwell Connect s vaším účtom webových albumov Picasa." +#. Add album that will push to the default feed for all the new users +#. Activate last known album id. If none was chosen, either use the old default (Shotwell connect) +#. or the new "Default album" album for Google Photos +#: plugins/shotwell-publishing/PicasaPublishing.vala:96 +#: plugins/shotwell-publishing/PicasaPublishing.vala:630 +msgid "Default album" +msgstr "Predvolený album" -#: plugins/shotwell-publishing/PicasaPublishing.vala:361 +#: plugins/shotwell-publishing/PicasaPublishing.vala:291 #, fuzzy #| msgid "" #| "A file required for publishing is unavailable. Publishing to Picasa can't " @@ -2136,36 +2142,32 @@ msgstr "" "Picasa nemôže pokračovať." #. populate any widgets whose contents are programmatically-generated. -#: plugins/shotwell-publishing/PicasaPublishing.vala:659 +#: plugins/shotwell-publishing/PicasaPublishing.vala:560 #, c-format msgid "You are logged into Picasa Web Albums as %s." msgstr "Ste prihlásený do Picasa Web Albums ako %s." -#: plugins/shotwell-publishing/PicasaPublishing.vala:665 +#: plugins/shotwell-publishing/PicasaPublishing.vala:566 msgid "Videos will appear in:" msgstr "Videá sa zobrazia v:" -#: plugins/shotwell-publishing/PicasaPublishing.vala:746 -#| msgid "Small (640 x 480 pixels)" +#: plugins/shotwell-publishing/PicasaPublishing.vala:610 msgid "Small (640 × 480 pixels)" msgstr "Malá (640 × 480 pixelov)" -#: plugins/shotwell-publishing/PicasaPublishing.vala:747 -#| msgid "Medium (1024 x 768 pixels)" +#: plugins/shotwell-publishing/PicasaPublishing.vala:611 msgid "Medium (1024 × 768 pixels)" msgstr "Stredná (1024 × 768 pixelov)" -#: plugins/shotwell-publishing/PicasaPublishing.vala:748 -#| msgid "Recommended (1600 x 1200 pixels)" +#: plugins/shotwell-publishing/PicasaPublishing.vala:612 msgid "Recommended (1600 × 1200 pixels)" msgstr "Odporúčaná (1600 × 1200 pixelov)" -#: plugins/shotwell-publishing/PicasaPublishing.vala:749 -#| msgid "Google+ (2048 x 1536 pixels)" +#: plugins/shotwell-publishing/PicasaPublishing.vala:613 msgid "Google+ (2048 × 1536 pixels)" msgstr "Google+ (2048 × 1536 pixelov)" -#: plugins/shotwell-publishing/PicasaPublishing.vala:750 +#: plugins/shotwell-publishing/PicasaPublishing.vala:614 #: src/editing_tools/EditingTools.vala:757 msgid "Original Size" msgstr "Pôvodná veľkosť" @@ -2179,28 +2181,20 @@ msgid "User _name" msgstr "Používateľské _meno" #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133 -#, fuzzy -#| msgid "_Remember Password" msgid "Remember Password" -msgstr "Za_pamätať heslo" +msgstr "Zapamätať heslo" #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36 -#, fuzzy -#| msgid "An _existing category:" msgid "An _existing category" -msgstr "_Existujúcej kategórii:" +msgstr "_Existujúcej kategórii" #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110 -#, fuzzy -#| msgid "A _new album named:" msgid "A _new album named" -msgstr "Photos will be _visible by:" +msgstr "_Novom pomenovanom albume" #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142 -#, fuzzy -#| msgid "within category:" msgid "within category" -msgstr "v kategórii:" +msgstr "v kategórii" #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155 msgid "Album comment" @@ -2229,7 +2223,7 @@ msgid "Logout" msgstr "Odhlásiť sa" #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268 -#: src/Resources.vala:295 ui/collection.ui:190 +#: src/Resources.vala:296 ui/collection.ui:192 msgid "Publish" msgstr "Uverejniť" @@ -2263,7 +2257,7 @@ msgid "Certificate of %s" msgstr "" #: plugins/shotwell-publishing/PiwigoPublishing.vala:1051 -#: src/Resources.vala:166 +#: src/Resources.vala:167 msgid "_OK" msgstr "_OK" @@ -2315,7 +2309,7 @@ msgstr "Zobraziť certifikát…" msgid "I understand, please _proceed." msgstr "Rozumiem. Prosím, _pokračovať." -#: plugins/shotwell-publishing/shotwell-publishing.vala:26 +#: plugins/shotwell-publishing/shotwell-publishing.vala:55 msgid "Core Publishing Services" msgstr "Hlavné uverejňovacie služby" @@ -2323,22 +2317,7 @@ msgstr "Hlavné uverejňovacie služby" msgid "Video privacy _setting:" msgstr "_Nastavenie súkromia videa:" -#: plugins/shotwell-publishing/YouTubePublishing.vala:58 -msgid "" -"You are not currently logged into YouTube.\n" -"\n" -"You must have already signed up for a Google account and set it up for use " -"with YouTube to continue. You can set up most accounts by using your browser " -"to log into the YouTube site at least once." -msgstr "" -"Momentálne nie ste prihlásený do služby YouTube.\n" -"\n" -"Aby ste mohli pokračovať, musíte si vytvoriť účet Google a nastaviť ho na " -"používanie služby YouTube. Väčšinu účtov takto môžete nastaviť prihláseným " -"sa aspoň raz cez prehliadač na stránku služby YouTube (http://www.youtube." -"com/)." - -#: plugins/shotwell-publishing/YouTubePublishing.vala:363 +#: plugins/shotwell-publishing/YouTubePublishing.vala:236 #, fuzzy #| msgid "" #| "A file required for publishing is unavailable. Publishing to Youtube " @@ -2350,21 +2329,16 @@ msgstr "" "Súbor potrebný na uverejňovanie nie je dostupný. Uverejňovanie na službu " "Youtube nemôže pokračovať." -#: plugins/shotwell-publishing/YouTubePublishing.vala:462 +#: plugins/shotwell-publishing/YouTubePublishing.vala:344 #, c-format msgid "You are logged into YouTube as %s." msgstr "Ste prihlásený do služby YouTube ako %s." -#: plugins/shotwell-publishing/YouTubePublishing.vala:464 -#, c-format -msgid "Videos will appear in “%s”" -msgstr "Videá sa zobrazia v „%s“" - -#: plugins/shotwell-publishing/YouTubePublishing.vala:496 +#: plugins/shotwell-publishing/YouTubePublishing.vala:376 msgid "Public listed" msgstr "Verejné zahrnuté" -#: plugins/shotwell-publishing/YouTubePublishing.vala:497 +#: plugins/shotwell-publishing/YouTubePublishing.vala:377 msgid "Public unlisted" msgstr "Verejné nezahrnuté" @@ -2467,48 +2441,49 @@ msgstr "Pripnúť panel nástrojov otvorený" msgid "Leave fullscreen" msgstr "Opustiť režim celej obrazovky" -#: src/AppWindow.vala:532 src/AppWindow.vala:553 src/AppWindow.vala:570 +#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569 #: src/data_imports/DataImportsUI.vala:301 #: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20 #: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443 #: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525 -#: src/Resources.vala:157 +#: src/Resources.vala:158 msgid "_Cancel" msgstr "_Zrušiť" -#: src/AppWindow.vala:580 -#, fuzzy, c-format -#| msgid "" -#| "A fatal error occurred when accessing Shotwell's library. Shotwell " -#| "cannot continue.\n" -#| "\n" -#| "%s" +#: src/AppWindow.vala:579 +#, c-format msgid "" "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot " "continue.\n" "\n" "%s" msgstr "" -"Vyskytla sa fatálna chyba pri prístupe ku knižnici programu Shotwell. " -"Shotwell nemôže pokračovať.\n" +"Vyskytla sa závažná chyba pri prístupe ku knižnici programu Shotwell. " +"Program Shotwell nemôže pokračovať.\n" "\n" "%s" -#: src/AppWindow.vala:600 +#. translators: %s will be replaced by application version +#: src/AppWindow.vala:596 +#, c-format +msgid "%s – “Aachen”" +msgstr "" + +#: src/AppWindow.vala:601 msgid "Visit the Shotwell web site" msgstr "Navštíviť webovú stránku programu Shotwell" -#: src/AppWindow.vala:612 +#: src/AppWindow.vala:614 #, c-format msgid "Unable to display help: %s" msgstr "Nepodarilo sa zobraziť pomocníka: %s" -#: src/AppWindow.vala:620 +#: src/AppWindow.vala:622 #, c-format msgid "Unable to navigate to bug database: %s" msgstr "Nepodarilo sa prejsť do databázy chýb: %s" -#: src/AppWindow.vala:628 +#: src/AppWindow.vala:630 #, c-format msgid "Unable to display FAQ: %s" msgstr "Nepodarilo sa zobraziť FAQ: %s" @@ -2578,10 +2553,10 @@ msgstr "Importovanie zlyhalo (%d)" msgid "Cameras" msgstr "Fotoaparáty" -#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:710 -#: src/camera/ImportPage.vala:726 src/photos/RawSupport.vala:303 -#: ui/collection.ui:90 ui/event.ui:359 ui/event.ui:527 ui/media.ui:359 -#: ui/photo_context.ui:96 ui/photo.ui:349 ui/tags.ui:359 +#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718 +#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316 +#: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361 +#: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361 msgid "Camera" msgstr "Fotoaparát" @@ -2589,7 +2564,7 @@ msgstr "Fotoaparát" msgid "RAW+JPEG" msgstr "RAW+JPEG" -#: src/camera/ImportPage.vala:458 +#: src/camera/ImportPage.vala:466 #, fuzzy #| msgid "" #| "Unable to unmount camera. Try unmounting the camera from the file " @@ -2601,54 +2576,50 @@ msgstr "" "súborov." #. hide duplicates checkbox -#: src/camera/ImportPage.vala:775 +#: src/camera/ImportPage.vala:783 msgid "Hide photos already imported" msgstr "Skryť fotografie, ktoré sú už importované" -#: src/camera/ImportPage.vala:776 +#: src/camera/ImportPage.vala:784 msgid "Only display photos that have not been imported" msgstr "Zobraziť iba fotografie, ktoré neboli importované" -#: src/camera/ImportPage.vala:815 ui/import.ui:13 ui/import.ui:210 +#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210 msgid "Import _Selected" msgstr "Importovať vy_brané" -#: src/camera/ImportPage.vala:825 ui/import.ui:17 ui/import.ui:214 +#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214 msgid "Import _All" msgstr "Importovať _všetky" -#: src/camera/ImportPage.vala:849 +#: src/camera/ImportPage.vala:857 msgid "The camera seems to be empty. No photos/videos found to import" msgstr "" "Zdá sa, že fotoaparát je prázdny. Nenašli sa žiadne fotografie ani videá na " "importovanie." -#: src/camera/ImportPage.vala:853 +#: src/camera/ImportPage.vala:861 msgid "No new photos/videos found on camera" msgstr "Vo fotoaparáte neboli nájdené žiadne nové fotografie alebo videá" #. it's mounted, offer to unmount for the user -#: src/camera/ImportPage.vala:1013 -#, fuzzy -#| msgid "" -#| "Shotwell needs to unmount the camera from the filesystem in order to " -#| "access it. Continue?" +#: src/camera/ImportPage.vala:1021 msgid "" "Shotwell needs to unmount the camera from the filesystem in order to access " "it. Continue?" msgstr "" -"Shotwell potrebuje odpojiť váš fotoaparát od súborového systému, aby k nemu " -"mohol pristupovať. Chcete pokračovať?" +"Program Shotwell musí odpojiť váš fotoaparát zo súborového systému, aby k " +"nemu mohol pristupovať. Chcete pokračovať?" -#: src/camera/ImportPage.vala:1019 +#: src/camera/ImportPage.vala:1027 msgid "_Unmount" msgstr "_Odpojiť" -#: src/camera/ImportPage.vala:1024 +#: src/camera/ImportPage.vala:1032 msgid "Please unmount the camera." msgstr "Prosím, odpojte fotoaparát." -#: src/camera/ImportPage.vala:1029 +#: src/camera/ImportPage.vala:1037 msgid "" "The camera is locked by another application. Shotwell can only access the " "camera when it’s unlocked. Please close any other application using the " @@ -2658,11 +2629,11 @@ msgstr "" "fotoaparátu iba ak je odomknutý. Zatvorte, prosím, ostatné aplikácie, ktoré " "používajú fotoaparát, a skúste to znova." -#: src/camera/ImportPage.vala:1039 +#: src/camera/ImportPage.vala:1047 msgid "Please close any other application using the camera." msgstr "Zatvorte, prosím, ostatné aplikácie, ktoré používajú fotoaparát." -#: src/camera/ImportPage.vala:1044 +#: src/camera/ImportPage.vala:1052 #, c-format msgid "" "Unable to fetch previews from the camera:\n" @@ -2671,29 +2642,29 @@ msgstr "" "Nepodarilo sa získať náhľady z fotoaparátu:\n" "%s" -#: src/camera/ImportPage.vala:1061 +#: src/camera/ImportPage.vala:1069 msgid "Unmounting…" msgstr "Odpája sa…" -#: src/camera/ImportPage.vala:1152 +#: src/camera/ImportPage.vala:1160 msgid "Starting import, please wait…" msgstr "Spúšťa sa importovanie. Prosím, čakajte…" -#: src/camera/ImportPage.vala:1169 +#: src/camera/ImportPage.vala:1177 msgid "Fetching photo information" msgstr "Získavajú sa informácie o fotografiách" -#: src/camera/ImportPage.vala:1527 +#: src/camera/ImportPage.vala:1535 #, c-format msgid "Fetching preview for %s" msgstr "Získava sa náhľad pre %s" -#: src/camera/ImportPage.vala:1643 +#: src/camera/ImportPage.vala:1651 #, c-format msgid "Unable to lock camera: %s" msgstr "Nepodarilo sa uzamknúť fotoaparát: %s" -#: src/camera/ImportPage.vala:1728 +#: src/camera/ImportPage.vala:1736 #, c-format msgid "Delete this photo from camera?" msgid_plural "Delete these %d photos from camera?" @@ -2701,7 +2672,7 @@ msgstr[0] "Odstrániť týchto %d fotografií z fotoaparátu?" msgstr[1] "Odstrániť túto fotografiu z fotoaparátu?" msgstr[2] "Odstrániť tieto %d fotografie z fotoaparátu?" -#: src/camera/ImportPage.vala:1731 +#: src/camera/ImportPage.vala:1739 #, c-format msgid "Delete this video from camera?" msgid_plural "Delete these %d videos from camera?" @@ -2709,7 +2680,7 @@ msgstr[0] "Odstrániť týchto %d videí z fotoaparátu?" msgstr[1] "Odstrániť toto %d video z fotoaparátu?" msgstr[2] "Odstrániť tieto %d videá z fotoaparátu?" -#: src/camera/ImportPage.vala:1734 +#: src/camera/ImportPage.vala:1742 #, c-format msgid "Delete this photo/video from camera?" msgid_plural "Delete these %d photos/videos from camera?" @@ -2717,7 +2688,7 @@ msgstr[0] "Odstrániť týchto %d fotografií/videí z fotoaparátu?" msgstr[1] "Odstrániť túto %d fotografiu/video z fotoaparátu?" msgstr[2] "Odstrániť tieto %d fotografie/videá z fotoaparátu?" -#: src/camera/ImportPage.vala:1737 +#: src/camera/ImportPage.vala:1745 #, c-format msgid "Delete these files from camera?" msgid_plural "Delete these %d files from camera?" @@ -2725,15 +2696,15 @@ msgstr[0] "Odstrániť týchto %d súborov z fotoaparátu?" msgstr[1] "Odstrániť tento %d súbor z fotoaparátu?" msgstr[2] "Odstrániť tieto %d súbory z fotoaparátu?" -#: src/camera/ImportPage.vala:1745 src/Dialogs.vala:1387 +#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387 msgid "_Keep" msgstr "_Ponechať" -#: src/camera/ImportPage.vala:1764 +#: src/camera/ImportPage.vala:1772 msgid "Removing photos/videos from camera" msgstr "Odstraňujú sa fotografie/videá z fotoaparátu" -#: src/camera/ImportPage.vala:1768 +#: src/camera/ImportPage.vala:1776 #, c-format msgid "Unable to delete %d photo/video from the camera due to errors." msgid_plural "Unable to delete %d photos/videos from the camera due to errors." @@ -2744,129 +2715,129 @@ msgstr[1] "" msgstr[2] "" "Nepodarilo sa odstrániť %d fotografie/videá z fotoaparátu kvôli chybám." -#: src/CollectionPage.vala:74 src/direct/DirectPhotoPage.vala:85 -#: src/PhotoPage.vala:2460 src/Resources.vala:170 +#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85 +#: src/PhotoPage.vala:2464 src/Resources.vala:171 msgid "_Print" msgstr "_Tlačiť" # dialog title -#: src/CollectionPage.vala:77 src/Resources.vala:323 ui/collection.ui:126 -#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:563 ui/photo.ui:28 +#: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128 +#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28 msgid "Send _To…" msgstr "Odoslať _do…" -#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:90 -#: src/PhotoPage.vala:2470 src/Resources.vala:220 +#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90 +#: src/PhotoPage.vala:2474 src/Resources.vala:221 msgid "Set as _Desktop Background" msgstr "Nastaviť ako _pozadie pracovnej plochy" -#: src/CollectionPage.vala:86 src/Resources.vala:286 +#: src/CollectionPage.vala:92 src/Resources.vala:287 msgid "_Duplicate" msgstr "Du_plikovať" -#: src/CollectionPage.vala:94 +#: src/CollectionPage.vala:100 msgid "Fullscreen" msgstr "Na celú obrazovku" -#: src/CollectionPage.vala:96 ui/photo.ui:180 +#: src/CollectionPage.vala:102 ui/photo.ui:180 msgid "S_lideshow" msgstr "P_rezentácia" -#: src/CollectionPage.vala:104 src/Resources.vala:139 ui/direct.ui:111 +#: src/CollectionPage.vala:110 src/Resources.vala:140 ui/direct.ui:111 #: ui/photo.ui:200 msgid "Rotate _Right" msgstr "Otočiť do_prava" -#: src/CollectionPage.vala:107 src/Resources.vala:144 ui/direct.ui:116 +#: src/CollectionPage.vala:113 src/Resources.vala:145 ui/direct.ui:116 #: ui/photo.ui:205 msgid "Rotate _Left" msgstr "Otočiť doľa_va" -#: src/CollectionPage.vala:110 src/Resources.vala:149 ui/direct.ui:121 +#: src/CollectionPage.vala:116 src/Resources.vala:150 ui/direct.ui:121 #: ui/photo.ui:210 msgid "Flip Hori_zontally" msgstr "Prevrátiť vodo_rovne" -#: src/CollectionPage.vala:111 src/Resources.vala:152 ui/direct.ui:125 +#: src/CollectionPage.vala:117 src/Resources.vala:153 ui/direct.ui:125 #: ui/photo.ui:214 msgid "Flip Verti_cally" msgstr "Prevrátiť _zvislo" -#: src/CollectionPage.vala:113 src/Resources.vala:186 ui/collection.ui:8 -#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:445 +#: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8 +#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:447 #: ui/photo_context.ui:6 ui/photo.ui:223 msgid "_Enhance" msgstr "Vy_lepšiť" -#: src/CollectionPage.vala:114 src/Resources.vala:214 ui/collection.ui:13 -#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:450 +#: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13 +#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:452 #: ui/photo_context.ui:11 ui/photo.ui:250 msgid "Re_vert to Original" msgstr "Vrátiť do _pôvodného stavu" -#: src/CollectionPage.vala:116 src/Resources.vala:190 ui/photo.ui:256 +#: src/CollectionPage.vala:122 src/Resources.vala:191 ui/photo.ui:256 msgid "_Copy Color Adjustments" msgstr "_Kopírovať úpravu farieb" -#: src/CollectionPage.vala:119 src/Resources.vala:194 ui/photo.ui:261 +#: src/CollectionPage.vala:125 src/Resources.vala:195 ui/photo.ui:261 msgid "_Paste Color Adjustments" msgstr "_Vložiť úpravu farieb" # window title -#: src/CollectionPage.vala:129 +#: src/CollectionPage.vala:135 msgid "Adjust Date and Time…" msgstr "Upraviť dátum a čas…" -#: src/CollectionPage.vala:137 src/Resources.vala:319 +#: src/CollectionPage.vala:143 src/Resources.vala:320 msgid "Open With E_xternal Editor" msgstr "Otvoriť pomocou e_xterného editora" -#: src/CollectionPage.vala:140 src/Resources.vala:321 ui/collection.ui:111 -#: ui/event.ui:548 ui/photo_context.ui:118 ui/photo.ui:363 +#: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113 +#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:365 msgid "Open With RA_W Editor" msgstr "Otvoriť pomocou RA_W editora" -#: src/CollectionPage.vala:143 src/Resources.vala:167 +#: src/CollectionPage.vala:149 src/Resources.vala:168 msgid "_Play" msgstr "_Spustiť" -#: src/CollectionPage.vala:409 +#: src/CollectionPage.vala:415 msgid "Export Photo/Video" msgstr "Exportovať fotografiu/video" -#: src/CollectionPage.vala:409 +#: src/CollectionPage.vala:415 msgid "Export Photos/Videos" msgstr "Exportovať fotografie/videá" -#: src/CollectionPage.vala:411 src/Dialogs.vala:59 src/PhotoPage.vala:2994 +#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998 msgid "Export Photo" msgstr "Exportovať fotografiu" -#: src/CollectionPage.vala:411 src/Dialogs.vala:84 +#: src/CollectionPage.vala:417 src/Dialogs.vala:84 msgid "Export Photos" msgstr "Exportovať fotografie" -#: src/CollectionPage.vala:498 src/CollectionPage.vala:514 +#: src/CollectionPage.vala:504 src/CollectionPage.vala:520 msgid "Rotating" msgstr "Otáča sa" -#: src/CollectionPage.vala:498 src/CollectionPage.vala:514 +#: src/CollectionPage.vala:504 src/CollectionPage.vala:520 msgid "Undoing Rotate" msgstr "Vracia sa spať otáčanie" -#: src/CollectionPage.vala:523 +#: src/CollectionPage.vala:529 msgid "Flipping Horizontally" msgstr "Prevracia sa horizontálne" -#: src/CollectionPage.vala:524 +#: src/CollectionPage.vala:530 msgid "Undoing Flip Horizontally" msgstr "Vracia sa prevrátenie horizontálne" -#: src/CollectionPage.vala:533 +#: src/CollectionPage.vala:539 msgid "Flipping Vertically" msgstr "Prevracia sa vertikálne" -#: src/CollectionPage.vala:534 +#: src/CollectionPage.vala:540 msgid "Undoing Flip Vertically" msgstr "Vracia sa prevrátenie vertikálne" @@ -2997,8 +2968,7 @@ msgid "Create Tag" msgstr "Vytvoriť značku" #: src/Commands.vala:1695 -#, fuzzy, c-format -#| msgid "Move Tag \"%s\"" +#, c-format msgid "Move Tag “%s”" msgstr "Presunúť značku „%s“" @@ -3085,7 +3055,7 @@ msgstr "" msgid "Database file:" msgstr "Súbor databázy:" -#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:773 +#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775 msgid "_Import" msgstr "_Importovať" @@ -3172,8 +3142,8 @@ msgstr[2] "" "Táto operácia odstráni značku „%s“ z %d fotografií. Chcete pokračovať?" #: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388 -#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:414 -#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/tags.ui:458 ui/trash.ui:63 +#: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415 +#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:460 ui/trash.ui:63 #: ui/trash.ui:216 ui/trash.ui:258 msgid "_Delete" msgstr "O_dstrániť" @@ -3731,7 +3701,7 @@ msgstr[2] "%d hodiny" msgid "1 day" msgstr "1 deň" -#: src/Dialogs.vala:1317 src/Resources.vala:231 +#: src/Dialogs.vala:1317 src/Resources.vala:232 msgid "Rename Event" msgstr "Premenovať udalosť" @@ -3752,7 +3722,7 @@ msgstr "Názov:" # DK: https://bugzilla.gnome.org/show_bug.cgi?id=736632 #. Dialog title -#: src/Dialogs.vala:1345 src/Resources.vala:307 +#: src/Dialogs.vala:1345 src/Resources.vala:308 msgid "Edit Event Comment" msgstr "Upravenie komentára k udalosti" @@ -3785,21 +3755,19 @@ msgid "Revert External Edits?" msgstr "Vrátiť externé úpravy?" #: src/Dialogs.vala:1412 -#, fuzzy, c-format -#| msgid "This will destroy all changes made to the external file. Continue?" -#| msgid_plural "" -#| "This will destroy all changes made to %d external files. Continue?" +#, c-format msgid "This will destroy all changes made to the external file. Continue?" msgid_plural "" "This will destroy all changes made to %d external files. Continue?" msgstr[0] "" -"Táto operácia zničí všetky zmeny vykonané na %d externých súboroch. " -"Pokračovať?" +"Táto operácia zničí všetky zmeny vykonané na %d externých súboroch. Chcete " +"pokračovať?" msgstr[1] "" -"Táto operácia zničí všetky zmeny vykonané na externom súbore. Pokračovať?" +"Táto operácia zničí všetky zmeny vykonané na externom súbore. Chcete " +"pokračovať?" msgstr[2] "" -"Táto operácia zničí všetky zmeny vykonané na %d externých súboroch. " -"Pokračovať?" +"Táto operácia zničí všetky zmeny vykonané na %d externých súboroch. Chcete " +"pokračovať?" #: src/Dialogs.vala:1416 msgid "Re_vert External Edit" @@ -3810,16 +3778,14 @@ msgid "Re_vert External Edits" msgstr "V_rátiť externé úpravy" #: src/Dialogs.vala:1437 -#, fuzzy, c-format -#| msgid "This will remove the photo from the library. Continue?" -#| msgid_plural "This will remove %d photos from the library. Continue?" +#, c-format msgid "This will remove the photo from the library. Continue?" msgid_plural "This will remove %d photos from the library. Continue?" msgstr[0] "Táto operácia odstráni %d fotografií z knižnice. Chcete pokračovať?" msgstr[1] "Táto operácia odstráni fotografiu z knižnice. Chcete pokračovať?" msgstr[2] "Táto operácia odstráni %d fotografie z knižnice. Chcete pokračovať?" -#: src/Dialogs.vala:1444 src/Resources.vala:173 +#: src/Dialogs.vala:1444 src/Resources.vala:174 msgid "_Remove" msgstr "O_dstrániť" @@ -3838,11 +3804,11 @@ msgstr "%d%%" #: src/Dialogs.vala:1697 msgid "AM" -msgstr "AM" +msgstr "dopoludnia" #: src/Dialogs.vala:1698 msgid "PM" -msgstr "PM" +msgstr "popoludní" #: src/Dialogs.vala:1699 msgid "24 Hr" @@ -4055,11 +4021,11 @@ msgstr "_Importovať na mieste" msgid "Import to Library" msgstr "Importovať do knižnice" -#: src/Dialogs.vala:2709 src/PhotoPage.vala:2870 +#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874 msgid "Remove From Library" msgstr "Odstrániť z knižnice" -#: src/Dialogs.vala:2710 src/PhotoPage.vala:2870 +#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874 msgid "Removing Photo From Library" msgstr "Odstraňuje sa fotografia z knižnice" @@ -4068,17 +4034,7 @@ msgid "Removing Photos From Library" msgstr "Odstraňujú sa fotografie z knižnice" #: src/Dialogs.vala:2724 -#, fuzzy, c-format -#| msgid "" -#| "This will remove the photo/video from your Shotwell library. Would you " -#| "also like to move the file to your desktop trash?\n" -#| "\n" -#| "This action cannot be undone." -#| msgid_plural "" -#| "This will remove %d photos/videos from your Shotwell library. Would you " -#| "also like to move the files to your desktop trash?\n" -#| "\n" -#| "This action cannot be undone." +#, c-format msgid "" "This will remove the photo/video from your Shotwell library. Would you also " "like to move the file to your desktop trash?\n" @@ -4091,34 +4047,24 @@ msgid_plural "" "This action cannot be undone." msgstr[0] "" "Táto operácia odstráni %d fotografií/videí z vašej knižnice programu " -"Shotwell. Chcete tieto súbory tiež presunúť do koša na vašej pracovnej " +"Shotwell. Chcete tieto súbory tiež presunúť do koša na vašej pracovnej " "ploche?\n" "\n" "Táto operácia sa nedá vrátiť späť." msgstr[1] "" -"Táto operácia odstráni fotografiu/video z vašej knižnice programu Shotwell. " +"Táto operácia odstráni fotografiu/video z vašej knižnice programu Shotwell. " "Chcete tento súbor tiež presunúť do koša na vašej pracovnej ploche?\n" "\n" "Táto operácia sa nedá vrátiť späť." msgstr[2] "" "Táto operácia odstráni %d fotografie/videá z vašej knižnice programu " -"Shotwell. Chcete tieto súbory tiež presunúť do koša na vašej pracovnej " +"Shotwell. Chcete tieto súbory tiež presunúť do koša na vašej pracovnej " "ploche?\n" "\n" "Táto operácia sa nedá vrátiť späť." #: src/Dialogs.vala:2728 -#, fuzzy, c-format -#| msgid "" -#| "This will remove the video from your Shotwell library. Would you also " -#| "like to move the file to your desktop trash?\n" -#| "\n" -#| "This action cannot be undone." -#| msgid_plural "" -#| "This will remove %d videos from your Shotwell library. Would you also " -#| "like to move the files to your desktop trash?\n" -#| "\n" -#| "This action cannot be undone." +#, c-format msgid "" "This will remove the video from your Shotwell library. Would you also like " "to move the file to your desktop trash?\n" @@ -4130,33 +4076,23 @@ msgid_plural "" "\n" "This action cannot be undone." msgstr[0] "" -"Táto operácia odstráni %d videí z vašej knižnice programu Shotwell. Chcete " +"Táto operácia odstráni %d videí z vašej knižnice programu Shotwell. Chcete " "tieto súbory tiež presunúť do koša na vašej pracovnej ploche?\n" "\n" "Táto operácia sa nedá vrátiť späť." msgstr[1] "" -"Táto operácia odstráni video z vašej knižnice programu Shotwell. Chcete " +"Táto operácia odstráni video z vašej knižnice programu Shotwell. Chcete " "tento súbor tiež presunúť do koša na vašej pracovnej ploche?\n" "\n" "Táto operácia sa nedá vrátiť späť." msgstr[2] "" -"Táto operácia odstráni %d videá z vašej knižnice programu Shotwell. Chcete " +"Táto operácia odstráni %d videá z vašej knižnice programu Shotwell. Chcete " "tieto súbory tiež presunúť do koša na vašej pracovnej ploche?\n" "\n" "Táto operácia sa nedá vrátiť späť." #: src/Dialogs.vala:2732 -#, fuzzy, c-format -#| msgid "" -#| "This will remove the photo from your Shotwell library. Would you also " -#| "like to move the file to your desktop trash?\n" -#| "\n" -#| "This action cannot be undone." -#| msgid_plural "" -#| "This will remove %d photos from your Shotwell library. Would you also " -#| "like to move the files to your desktop trash?\n" -#| "\n" -#| "This action cannot be undone." +#, c-format msgid "" "This will remove the photo from your Shotwell library. Would you also like " "to move the file to your desktop trash?\n" @@ -4184,26 +4120,20 @@ msgstr[2] "" "Táto akcie nemôže byť vrátená späť." #: src/Dialogs.vala:2764 -#, fuzzy, c-format -#| msgid "" -#| "The photo or video cannot be moved to your desktop trash. Delete this " -#| "file?" -#| msgid_plural "" -#| "%d photos/videos cannot be moved to your desktop trash. Delete these " -#| "files?" +#, c-format msgid "" "The photo or video cannot be moved to your desktop trash. Delete this file?" msgid_plural "" "%d photos/videos cannot be moved to your desktop trash. Delete these files?" msgstr[0] "" -"%d fotografií/videí sa nedá presunúť do koša na vašej pracovnej ploche. " -"Chcete tieto súbory odstrániť?" +"%d fotografií alebo videí sa nedá presunúť do koša na vašej pracovnej " +"ploche. Majú sa tieto súbory odstrániť?" msgstr[1] "" -"Fotografia/video sa nedá presunúť do koša na vašej pracovnej ploche. Chcete " -"tento súbor odstrániť?" +"Fotografia alebo video sa nedá presunúť do koša na vašej pracovnej ploche. " +"Má sa tento súbor odstrániť?" msgstr[2] "" -"%d fotografie/videá sa nedajú presunúť do koša na vašej pracovnej ploche. " -"Chcete tieto súbory odstrániť?" +"%d fotografie alebo videá sa nedajú presunúť do koša na vašej pracovnej " +"ploche. Majú sa tieto súbory odstrániť?" #. Alert the user that the files were not removed. #: src/Dialogs.vala:2781 @@ -4246,29 +4176,29 @@ msgstr "" msgid "Unable open photo %s. Sorry." msgstr "Nie je možné otvoriť fotografiu %s. Prepáčte." -#: src/direct/DirectPhotoPage.vala:304 src/Resources.vala:175 ui/direct.ui:8 +#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8 msgid "_Save" msgstr "_Uložiť" -#: src/direct/DirectPhotoPage.vala:304 +#: src/direct/DirectPhotoPage.vala:316 msgid "_Save a Copy" msgstr "_Uložiť kópiu" -#: src/direct/DirectPhotoPage.vala:307 +#: src/direct/DirectPhotoPage.vala:319 #, c-format msgid "Lose changes to %s?" msgstr "Zahodiť zmeny vo %s?" -#: src/direct/DirectPhotoPage.vala:308 +#: src/direct/DirectPhotoPage.vala:320 msgid "Close _without Saving" msgstr "Zavrieť _bez uloženia" -#: src/direct/DirectPhotoPage.vala:341 +#: src/direct/DirectPhotoPage.vala:353 #, c-format msgid "Error while saving to %s: %s" msgstr "Chyba počas ukladania do %s: %s" -#: src/direct/DirectPhotoPage.vala:369 src/direct/DirectPhotoPage.vala:390 +#: src/direct/DirectPhotoPage.vala:383 src/direct/DirectPhotoPage.vala:404 msgid "Save As" msgstr "Uložiť ako" @@ -4313,106 +4243,82 @@ msgid "-" msgstr "-" #: src/editing_tools/EditingTools.vala:759 -#| msgid "SD Video (4 : 3)" msgid "SD Video (4 ∶ 3)" msgstr "Video v nízkom rozlíšení (4 ∶ 3)" #: src/editing_tools/EditingTools.vala:760 -#| msgid "HD Video (16 : 9)" msgid "HD Video (16 ∶ 9)" msgstr "Video vo vysokom rozlíšení (16 ∶ 9)" -#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:818 -#| msgid "Wallet (2 x 3 in.)" +#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792 msgid "Wallet (2 × 3 in.)" msgstr "Peňaženka (2 × 3 palcov)" -#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:821 -#, fuzzy -#| msgid "Notecard (3 x 5 in.)" +#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795 msgid "Notecard (3 × 5 in.)" -msgstr "Zápisník (3 x 5 palcov)" +msgstr "Zápisník (3 × 5 palcov)" -#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:824 -#| msgid "4 x 6 in." +#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798 msgid "4 × 6 in." msgstr "4 × 6 palcov" -#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:827 -#| msgid "5 x 7 in." +#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801 msgid "5 × 7 in." msgstr "5 × 7 palcov" -#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:830 -#| msgid "8 x 10 in." +#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804 msgid "8 × 10 in." msgstr "8 × 10 palcov" #: src/editing_tools/EditingTools.vala:767 -#, fuzzy -#| msgid "Letter (8.5 x 11 in.)" msgid "Letter (8.5 × 11 in.)" -msgstr "Dopis (8.5 x 11 in.)" +msgstr "Dopis (8.5 × 11 palcov)" -#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:833 -#| msgid "11 x 14 in." +#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807 msgid "11 × 14 in." msgstr "11 × 14 palcov" #: src/editing_tools/EditingTools.vala:769 -#, fuzzy -#| msgid "Tabloid (11 x 17 in.)" msgid "Tabloid (11 × 17 in.)" -msgstr "Tabloid (11 x 17 palca)" +msgstr "Tabloid (11 × 17 palcov)" -#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:836 -#| msgid "16 x 20 in." +#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810 msgid "16 × 20 in." msgstr "16 × 20 palcov" -#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:842 -#, fuzzy -#| msgid "Metric Wallet (9 x 13 cm)" +#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816 msgid "Metric Wallet (9 × 13 cm)" -msgstr "Metrická peňaženka (9 x 13 cm)" +msgstr "Metrická peňaženka (9 × 13 cm)" -#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:845 -#| msgid "Postcard (10 x 15 cm)" +#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819 msgid "Postcard (10 × 15 cm)" msgstr "Pohľadnica (10 × 15 cm)" -#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:848 -#| msgid "13 x 18 cm" +#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822 msgid "13 × 18 cm" msgstr "13 × 18 cm" -#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:851 -#| msgid "18 x 24 cm" +#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825 msgid "18 × 24 cm" msgstr "18 × 24 cm" #: src/editing_tools/EditingTools.vala:776 -#| msgid "A4 (210 x 297 mm)" msgid "A4 (210 × 297 mm)" msgstr "A4 (210 × 297 mm)" -#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:854 -#| msgid "20 x 30 cm" +#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828 msgid "20 × 30 cm" msgstr "20 × 30 cm" -#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:857 -#| msgid "24 x 40 cm" +#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831 msgid "24 × 40 cm" msgstr "24 × 40 cm" -#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:860 -#| msgid "30 x 40 cm" +#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834 msgid "30 × 40 cm" msgstr "30 × 40 cm" #: src/editing_tools/EditingTools.vala:780 -#| msgid "A3 (297 x 420 mm)" msgid "A3 (297 × 420 mm)" msgstr "A3 (297 × 420 mm)" @@ -4507,7 +4413,7 @@ msgstr "Rozšíriť kontrast" msgid "Angle:" msgstr "Uhol:" -#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202 +#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:203 #: ui/direct.ui:144 ui/photo.ui:233 msgid "_Straighten" msgstr "_Vyrovnať" @@ -4639,19 +4545,19 @@ msgstr "Importovaný súbor „%s“" msgid "Last Import" msgstr "Posledné importovanie" -#: src/library/LibraryWindow.vala:505 +#: src/library/LibraryWindow.vala:507 msgid "Import From Folder" msgstr "Importovať z priečinka" -#: src/library/LibraryWindow.vala:574 ui/trash.ui:288 +#: src/library/LibraryWindow.vala:576 ui/trash.ui:288 msgid "Empty Trash" msgstr "Vyprázdniť kôš" -#: src/library/LibraryWindow.vala:574 +#: src/library/LibraryWindow.vala:576 msgid "Emptying Trash…" msgstr "Vyprázdňuje sa kôš…" -#: src/library/LibraryWindow.vala:770 +#: src/library/LibraryWindow.vala:772 #, c-format msgid "" "Shotwell is configured to import photos to your home directory.\n" @@ -4665,41 +4571,35 @@ msgstr "" "programu %s</span>.\n" "Chcete pokračovať s importovaním fotografií?" -#: src/library/LibraryWindow.vala:773 ui/shotwell.ui:142 +#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142 msgid "Library Location" msgstr "Umiestnenie knižnice" #. TODO: Specify which directory/file. -#: src/library/LibraryWindow.vala:786 +#: src/library/LibraryWindow.vala:788 msgid "Photos cannot be imported from this directory." msgstr "Fotografie sa nedajú importovať z tohto adresára." -#: src/library/LibraryWindow.vala:1066 +#: src/library/LibraryWindow.vala:1068 #, c-format msgid "%s (%d%%)" msgstr "%s (%d%%)" -#: src/library/LibraryWindow.vala:1110 src/library/LibraryWindow.vala:1121 +#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123 msgid "Updating library…" msgstr "Aktualizuje sa knižnica…" -#: src/library/LibraryWindow.vala:1127 -#, fuzzy -#| msgid "Preparing to auto-import photos..." +#: src/library/LibraryWindow.vala:1129 msgid "Preparing to auto-import photos…" -msgstr "Pripravuje sa automatické importovanie fotografií..." +msgstr "Pripravuje sa automatické importovanie fotografií…" -#: src/library/LibraryWindow.vala:1132 -#, fuzzy -#| msgid "Auto-importing photos..." +#: src/library/LibraryWindow.vala:1134 msgid "Auto-importing photos…" -msgstr "Prebieha automatické importovanie fotografií..." +msgstr "Prebieha automatické importovanie fotografií…" -#: src/library/LibraryWindow.vala:1140 -#, fuzzy -#| msgid "Writing metadata to files..." +#: src/library/LibraryWindow.vala:1142 msgid "Writing metadata to files…" -msgstr "Zapisujú sa metaúdaje do súborov..." +msgstr "Zapisujú sa metaúdaje do súborov…" #: src/library/OfflinePage.vala:8 msgid "Missing Files" @@ -4726,43 +4626,29 @@ msgid "Deleting Photos" msgstr "Odstraňujú sa fotografie" #: src/main.vala:54 -#, fuzzy, c-format -#| msgid "" -#| "Your photo library is not compatible with this version of Shotwell. It " -#| "appears it was created by Shotwell %s (schema %d). This version is %s " -#| "(schema %d). Please use the latest version of Shotwell." +#, c-format msgid "" "Your photo library is not compatible with this version of Shotwell. It " "appears it was created by Shotwell %s (schema %d). This version is %s " "(schema %d). Please use the latest version of Shotwell." msgstr "" "Vaša knižnica fotografií nie je kompatibilná s touto verziou programu " -"Shotwell. Zdá sa, že bola vytvorená programom Shotwell %s (schéma %d). Táto " -"verzia je %s (schéma %d). Prosím, použite najnovšiu verziu programu " -"Shotwell." +"Shotwell. Zdá sa, že bola vytvorená programom Shotwell %s (schéma %d). Táto " +"verzia je %s (schéma %d). Prosím, použite najnovšiu verziu programu Shotwell." #: src/main.vala:59 -#, fuzzy, c-format -#| msgid "" -#| "Shotwell was unable to upgrade your photo library from version %s (schema " -#| "%d) to %s (schema %d). For more information please check the Shotwell " -#| "Wiki at %s" +#, c-format msgid "" "Shotwell was unable to upgrade your photo library from version %s (schema " "%d) to %s (schema %d). For more information please check the Shotwell Wiki " "at %s" msgstr "" -"Shotwell nebol schopný zmeniť verziu vašej knižnice fotografií z %s (schéma " -"%d) na %s (schéma %d). Pre viac informácií si, prosím, pozrite wiki stránku " -"programu Shotwell na %s" +"Program Shotwell nebol schopný aktualizovať vašu knižnicu fotografií z " +"verzie %s (schéma %d) na verziu %s (schéma %d). Pre viac informácií si, " +"prosím, pozrite wiki stránku programu Shotwell na adrese %s" #: src/main.vala:65 -#, fuzzy, c-format -#| msgid "" -#| "Your photo library is not compatible with this version of Shotwell. It " -#| "appears it was created by Shotwell %s (schema %d). This version is %s " -#| "(schema %d). Please clear your library by deleting %s and re-import your " -#| "photos." +#, c-format msgid "" "Your photo library is not compatible with this version of Shotwell. It " "appears it was created by Shotwell %s (schema %d). This version is %s " @@ -4770,13 +4656,12 @@ msgid "" "photos." msgstr "" "Vaša knižnica fotografií nie je kompatibilná s touto verziou programu " -"Shotwell. Zdá sa, že bola vytvorená programom Shotwell %s (schéma %d). " -"Táto verzia je %s (schéma %d). Prosím, vyčistite vašu knižnicu odstránením " -"%s a znovu importujte vaše fotografie." +"Shotwell. Zdá sa, že bola vytvorená programom Shotwell %s (schéma %d). Táto " +"verzia je %s (schéma %d). Prosím, vyčistite vašu knižnicu odstránením %s a " +"znovu importujte vaše fotografie." #: src/main.vala:71 -#, fuzzy, c-format -#| msgid "Unknown error attempting to verify Shotwell's database: %s" +#, c-format msgid "Unknown error attempting to verify Shotwell’s database: %s" msgstr "Neznáma chyba pri pokuse o overenie databázy programu Shotwell: %s" @@ -4784,47 +4669,39 @@ msgstr "Neznáma chyba pri pokuse o overenie databázy programu Shotwell: %s" msgid "Loading Shotwell" msgstr "Načítavam Shotwell" -#: src/main.vala:294 -#, fuzzy -#| msgid "Path to Shotwell's private data" +#: src/main.vala:293 msgid "Path to Shotwell’s private data" msgstr "Cesta k súkromným údajom programu Shotwell" -#: src/main.vala:294 +#: src/main.vala:293 msgid "DIRECTORY" msgstr "ADRESÁR" # cmd desc -#: src/main.vala:298 +#: src/main.vala:297 msgid "Do not monitor library directory at runtime for changes" msgstr "Nebude sledovať zmeny v adresári s knižnicou pri spustení" # cmd desc -#: src/main.vala:302 -#, fuzzy -#| msgid "Don't display startup progress meter" +#: src/main.vala:301 msgid "Don’t display startup progress meter" msgstr "Po spustení nezobrazí ukazovateľ priebehu" # cmd desc -#: src/main.vala:306 -#, fuzzy -#| msgid "Show the application's version" +#: src/main.vala:305 msgid "Show the application’s version" msgstr "Zobrazí verziu aplikácie" #. init GTK (valac has already called g_threads_init()) -#: src/main.vala:338 +#: src/main.vala:342 msgid "[FILE]" msgstr "[SÚBOR]" -#: src/main.vala:342 -#, fuzzy, c-format -#| msgid "" -#| "Run '%s --help' to see a full list of available command line options.\n" +#: src/main.vala:346 +#, c-format msgid "Run “%s --help” to see a full list of available command line options.\n" msgstr "" -"Spustením '%s --help' zobrazíte úplný zoznam dostupných volieb príkazového " +"Spustením „%s --help“ zobrazíte úplný zoznam dostupných volieb príkazového " "riadku.\n" #: src/MediaMonitor.vala:400 @@ -4846,36 +4723,36 @@ msgstr "" "Shotwell nebol schopný prehrať vybrané video: \n" "%s" -#: src/Page.vala:1304 +#: src/Page.vala:1318 msgid "No photos/videos" msgstr "Žiadne fotografie/videá" -#: src/Page.vala:1308 +#: src/Page.vala:1322 msgid "No photos/videos found which match the current filter" msgstr "" "Nenašli sa žiadne fotografie alebo videá, ktoré by vyhovovali aktuálnemu " "filtru" -#: src/Page.vala:2614 +#: src/Page.vala:2628 msgid "Photos cannot be exported to this directory." msgstr "Fotografie nemôžu byť exportované do tohoto adresára." #. previous button -#: src/PhotoPage.vala:535 +#: src/PhotoPage.vala:538 msgid "Previous photo" msgstr "Predchádzajúca fotografia" #. next button -#: src/PhotoPage.vala:541 +#: src/PhotoPage.vala:544 msgid "Next photo" msgstr "Ďalšia fotografia" -#: src/PhotoPage.vala:1847 +#: src/PhotoPage.vala:1850 #, c-format msgid "Photo source file missing: %s" msgstr "Chýba zdrojový súbor fotografie: %s" -#: src/PhotoPage.vala:3014 +#: src/PhotoPage.vala:3018 #, c-format msgid "Unable to export %s: %s" msgstr "Nepodarilo sa exportovať %s: %s" @@ -4920,7 +4797,7 @@ msgstr "RAW" msgid "TIFF" msgstr "TIFF" -#: src/Photo.vala:3753 +#: src/Photo.vala:3755 msgid "modified" msgstr "upravené" @@ -4952,23 +4829,15 @@ msgstr "16 obrázkov na stranu" msgid "32 images per page" msgstr "32 obrázkov na stranu" -#: src/Printing.vala:348 -msgid "in." -msgstr "palcov" - -#: src/Printing.vala:349 -msgid "cm" -msgstr "cm" - -#: src/Printing.vala:876 +#: src/Printing.vala:851 msgid "Image Settings" msgstr "Nastavenia obrázka" -#: src/Printing.vala:889 +#: src/Printing.vala:864 msgid "Printing…" msgstr "Tlačí sa…" -#: src/Printing.vala:909 src/Printing.vala:1112 +#: src/Printing.vala:884 src/Printing.vala:1087 #, c-format msgid "" "Unable to print photo:\n" @@ -5111,10 +4980,10 @@ msgid "Uploading %d of %d" msgstr "Odovzdáva sa %d z %d" #: src/publishing/PublishingPluginHost.vala:81 -#, fuzzy, c-format -#| msgid "Publishing to %s can't continue because an error occurred:" +#, c-format msgid "Publishing to %s can’t continue because an error occurred:" -msgstr "Uverejňovanie na %s nemôže pokračovať, pretože sa vyskytla chyba:" +msgstr "" +"Uverejňovanie na službu %s nemôže pokračovať, pretože sa vyskytla chyba:" #: src/publishing/PublishingPluginHost.vala:84 msgid "To try publishing to another service, select one from the above menu." @@ -5125,32 +4994,26 @@ msgstr "" #. Here, we check whether more than one item is being uploaded, and if so, display #. an alternate message. #: src/publishing/PublishingUI.vala:104 -#, fuzzy -#| msgid "The selected video was successfully published." msgid "The selected video was successfully published." msgid_plural "The selected videos were successfully published." -msgstr[0] "Vybrané video bolo úspešne uverejnené." +msgstr[0] "Vybrané videá boli úspešne uverejnené." msgstr[1] "Vybrané video bolo úspešne uverejnené." -msgstr[2] "Vybrané video bolo úspešne uverejnené." +msgstr[2] "Vybrané videá boli úspešne uverejnené." #: src/publishing/PublishingUI.vala:109 -#, fuzzy -#| msgid "The selected photo was successfully published." msgid "The selected photo was successfully published." msgid_plural "The selected photos were successfully published." -msgstr[0] "Vybraná fotografia bola úspešne uverejnená." +msgstr[0] "Vybrané fotografie boli úspešne uverejnené." msgstr[1] "Vybraná fotografia bola úspešne uverejnená." -msgstr[2] "Vybraná fotografia bola úspešne uverejnená." +msgstr[2] "Vybrané fotografie boli úspešne uverejnené." #: src/publishing/PublishingUI.vala:115 msgid "The selected photos/videos were successfully published." msgstr "Vybrané fotografie/videá boli úspešne uverejnené." #: src/publishing/PublishingUI.vala:127 -#, fuzzy -#| msgid "Fetching account information..." msgid "Fetching account information…" -msgstr "Získavajú sa informácie o účte..." +msgstr "Získavajú sa informácie o účte…" #: src/publishing/PublishingUI.vala:133 msgid "Logging in…" @@ -5203,776 +5066,760 @@ msgstr "" msgid "Publishing" msgstr "Uverejňovanie" -#: src/Resources.vala:140 src/Resources.vala:145 ui/collection.ui:149 +#: src/Resources.vala:141 src/Resources.vala:146 ui/collection.ui:151 msgid "Rotate" msgstr "Otočiť" -#: src/Resources.vala:141 +#: src/Resources.vala:142 msgid "Rotate Right" msgstr "Otočiť doprava" -#: src/Resources.vala:142 ui/collection.ui:146 +#: src/Resources.vala:143 ui/collection.ui:148 msgid "Rotate the photos right (press Ctrl to rotate left)" msgstr "Otočí fotografie doprava (stlačte Ctrl na otočenie doľava)" -#: src/Resources.vala:146 +#: src/Resources.vala:147 msgid "Rotate Left" msgstr "Otočiť doľava" -#: src/Resources.vala:147 +#: src/Resources.vala:148 msgid "Rotate the photos left" msgstr "Otočiť fotografie doľava" -#: src/Resources.vala:150 +#: src/Resources.vala:151 msgid "Flip Horizontally" msgstr "Prevrátiť horizontálne" -#: src/Resources.vala:153 +#: src/Resources.vala:154 msgid "Flip Vertically" msgstr "Prevrátiť vertikálne" -#: src/Resources.vala:155 ui/direct.ui:191 ui/events_directory.ui:168 -#: ui/event.ui:436 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:419 -#: ui/offline.ui:198 ui/photo.ui:402 ui/tags.ui:438 ui/trash.ui:207 +#: src/Resources.vala:156 ui/direct.ui:191 ui/events_directory.ui:168 +#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:421 +#: ui/offline.ui:198 ui/photo.ui:404 ui/tags.ui:440 ui/trash.ui:207 msgid "_About" msgstr "_O programe" -#: src/Resources.vala:156 +#: src/Resources.vala:157 msgid "_Apply" msgstr "_Použiť" -#: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32 +#: src/Resources.vala:160 ui/direct.ui:44 ui/events_directory.ui:32 #: ui/event.ui:47 ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32 -#: ui/photo.ui:55 ui/tags.ui:47 ui/top.ui:10 ui/trash.ui:37 +#: ui/photo.ui:55 ui/tags.ui:47 ui/trash.ui:37 msgid "_Edit" msgstr "_Upraviť" -#: src/Resources.vala:160 +#: src/Resources.vala:161 msgid "_Forward" msgstr "_Dopredu" -#: src/Resources.vala:161 ui/direct.ui:62 ui/events_directory.ui:125 +#: src/Resources.vala:162 ui/direct.ui:62 ui/events_directory.ui:125 #: ui/photo.ui:173 msgid "Fulls_creen" msgstr "Na _celú obrazovku" -#: src/Resources.vala:162 ui/direct.ui:173 ui/direct.ui:176 -#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:418 -#: ui/event.ui:421 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183 -#: ui/import.ui:186 ui/media.ui:401 ui/media.ui:404 ui/offline.ui:180 -#: ui/offline.ui:183 ui/photo.ui:384 ui/photo.ui:387 ui/tags.ui:420 -#: ui/tags.ui:423 ui/top.ui:40 ui/trash.ui:189 ui/trash.ui:192 +#: src/Resources.vala:163 ui/direct.ui:173 ui/direct.ui:176 +#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420 +#: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183 +#: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180 +#: ui/offline.ui:183 ui/photo.ui:386 ui/photo.ui:389 ui/tags.ui:422 +#: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192 msgid "_Help" msgstr "_Pomocník" -#: src/Resources.vala:163 +#: src/Resources.vala:164 msgid "Leave _Fullscreen" msgstr "Opustiť režim _celej obrazovky" -#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448 +#: src/Resources.vala:165 src/Resources.vala:364 ui/tags.ui:450 msgid "_New" msgstr "_Nová" -#: src/Resources.vala:165 +#: src/Resources.vala:166 msgid "_Next" msgstr "Ď_alšia" -#: src/Resources.vala:168 src/Resources.vala:317 ui/events_directory.ui:65 +#: src/Resources.vala:169 src/Resources.vala:318 ui/events_directory.ui:65 #: ui/event.ui:93 ui/import.ui:68 ui/media.ui:93 ui/offline.ui:72 #: ui/photo.ui:89 ui/tags.ui:93 ui/trash.ui:81 msgid "_Preferences" msgstr "_Nastavenia" -#: src/Resources.vala:169 +#: src/Resources.vala:170 msgid "_Previous" msgstr "_Predchádzajúca" -#: src/Resources.vala:171 ui/direct.ui:37 ui/events_directory.ui:25 +#: src/Resources.vala:172 ui/direct.ui:37 ui/events_directory.ui:25 #: ui/event.ui:40 ui/import_queue.ui:31 ui/import.ui:33 ui/media.ui:40 #: ui/offline.ui:25 ui/photo.ui:48 ui/tags.ui:40 ui/trash.ui:30 msgid "_Quit" msgstr "U_končiť" -#: src/Resources.vala:172 +#: src/Resources.vala:173 msgid "_Refresh" msgstr "_Obnoviť" -#: src/Resources.vala:174 +#: src/Resources.vala:175 msgid "_Revert" msgstr "V_rátiť" -#: src/Resources.vala:176 +#: src/Resources.vala:177 msgid "Save _As" msgstr "Uložiť _ako" -#: src/Resources.vala:177 +#: src/Resources.vala:178 msgid "Sort _Ascending" msgstr "Usporiadať vz_ostupne" -#: src/Resources.vala:178 +#: src/Resources.vala:179 msgid "Sort _Descending" msgstr "Usporiadať zo_stupne" -#: src/Resources.vala:179 +#: src/Resources.vala:180 msgid "_Stop" msgstr "_Zastaviť" -#: src/Resources.vala:180 +#: src/Resources.vala:181 msgid "_Undelete" msgstr "Vrátiť o_dstránenie" -#: src/Resources.vala:181 +#: src/Resources.vala:182 msgid "_Normal Size" msgstr "_Normálna veľkosť" -#: src/Resources.vala:182 +#: src/Resources.vala:183 msgid "Best _Fit" msgstr "_Prispôsobiť" -#: src/Resources.vala:183 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260 +#: src/Resources.vala:184 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260 #: ui/photo.ui:144 ui/tags.ui:260 msgid "Zoom _In" msgstr "_Priblížiť" -#: src/Resources.vala:184 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265 +#: src/Resources.vala:185 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265 #: ui/photo.ui:149 ui/tags.ui:265 msgid "Zoom _Out" msgstr "_Vzdialiť" -#: src/Resources.vala:187 ui/collection.ui:165 +#: src/Resources.vala:188 ui/collection.ui:167 msgid "Enhance" msgstr "Vylepšiť" # tooltip -#: src/Resources.vala:188 ui/collection.ui:162 +#: src/Resources.vala:189 ui/collection.ui:164 msgid "Automatically improve the photo’s appearance" msgstr "Automaticky vylepší vzhľad fotografie" -#: src/Resources.vala:191 +#: src/Resources.vala:192 msgid "Copy Color Adjustments" msgstr "Kopírovať úpravu farieb" # tooltip -#: src/Resources.vala:192 +#: src/Resources.vala:193 msgid "Copy the color adjustments applied to the photo" msgstr "Skopíruje úpravu farieb aplikovanú na fotografiu" -#: src/Resources.vala:195 +#: src/Resources.vala:196 msgid "Paste Color Adjustments" msgstr "Vložiť úpravu farieb" # tooltip -#: src/Resources.vala:196 +#: src/Resources.vala:197 msgid "Apply copied color adjustments to the selected photos" msgstr "Aplikuje skopírovanú úpravu farieb na vybranú fotografiu" -#: src/Resources.vala:198 ui/direct.ui:139 ui/photo.ui:228 +#: src/Resources.vala:199 ui/direct.ui:139 ui/photo.ui:228 msgid "_Crop" msgstr "O_rezať" -#: src/Resources.vala:199 +#: src/Resources.vala:200 msgid "Crop" msgstr "Orezať" # tooltip -#: src/Resources.vala:200 +#: src/Resources.vala:201 msgid "Crop the photo’s size" msgstr "Oreže veľkosť fotografie" -#: src/Resources.vala:203 +#: src/Resources.vala:204 msgid "Straighten" msgstr "Vyrovnať" # tooltip -#: src/Resources.vala:204 +#: src/Resources.vala:205 msgid "Straighten the photo" msgstr "Vyrovná fotografiu" -#: src/Resources.vala:206 ui/direct.ui:149 ui/photo.ui:238 +#: src/Resources.vala:207 ui/direct.ui:149 ui/photo.ui:238 msgid "_Red-eye" msgstr "Červené _oči" -#: src/Resources.vala:207 +#: src/Resources.vala:208 msgid "Red-eye" msgstr "Červené oči" # tooltip -#: src/Resources.vala:208 +#: src/Resources.vala:209 msgid "Reduce or eliminate any red-eye effects in the photo" msgstr "Zmierni alebo odstráni efekt červených očí vo fotografii" -#: src/Resources.vala:210 ui/direct.ui:154 ui/photo.ui:243 +#: src/Resources.vala:211 ui/direct.ui:154 ui/photo.ui:243 msgid "_Adjust" msgstr "_Upraviť" -#: src/Resources.vala:211 +#: src/Resources.vala:212 msgid "Adjust" msgstr "Upraviť" # tooltip -#: src/Resources.vala:212 -#, fuzzy -#| msgid "Adjust the photo's color and tone" +#: src/Resources.vala:213 msgid "Adjust the photo’s color and tone" msgstr "Upraví farbu a tón fotografie" -#: src/Resources.vala:215 +#: src/Resources.vala:216 msgid "Revert to Original" msgstr "Vrátiť do pôvodného stavu" -#: src/Resources.vala:217 +#: src/Resources.vala:218 msgid "Revert External E_dits" msgstr "Vrátiť _externé úpravy" -#: src/Resources.vala:218 +#: src/Resources.vala:219 msgid "Revert to the master photo" msgstr "Vrátiť sa k pôvodnej fotografii" -#: src/Resources.vala:221 +#: src/Resources.vala:222 msgid "Set selected image to be the new desktop background" msgstr "Nastaviť vybraný obrázok ako pozadie pracovnej plochy" -#: src/Resources.vala:222 +#: src/Resources.vala:223 msgid "Set as _Desktop Slideshow…" msgstr "Nastaviť ako prezentáciu _pracovnej plochy…" -#: src/Resources.vala:224 ui/direct.ui:47 ui/events_directory.ui:35 +#: src/Resources.vala:225 ui/direct.ui:47 ui/events_directory.ui:35 #: ui/event.ui:50 ui/import.ui:43 ui/media.ui:50 ui/offline.ui:35 #: ui/photo.ui:58 ui/tags.ui:50 ui/trash.ui:40 msgid "_Undo" msgstr "Vrátiť _späť" -#: src/Resources.vala:225 +#: src/Resources.vala:226 msgid "Undo" msgstr "Vrátiť späť" -#: src/Resources.vala:227 ui/direct.ui:52 ui/events_directory.ui:40 +#: src/Resources.vala:228 ui/direct.ui:52 ui/events_directory.ui:40 #: ui/event.ui:55 ui/import.ui:48 ui/media.ui:55 ui/offline.ui:40 #: ui/photo.ui:63 ui/tags.ui:55 ui/trash.ui:45 msgid "_Redo" msgstr "_Opakovať vrátené" -#: src/Resources.vala:228 +#: src/Resources.vala:229 msgid "Redo" msgstr "Opakovať vrátené" -#: src/Resources.vala:230 ui/events_directory.ui:139 ui/events_directory.ui:181 -#: ui/event.ui:391 ui/event.ui:584 +#: src/Resources.vala:231 ui/events_directory.ui:139 ui/events_directory.ui:181 +#: ui/event.ui:393 ui/event.ui:588 msgid "Re_name Event…" msgstr "Preme_novať udalosť…" -#: src/Resources.vala:233 ui/event.ui:371 ui/event.ui:576 +#: src/Resources.vala:234 ui/event.ui:373 ui/event.ui:580 msgid "Make _Key Photo for Event" msgstr "Označiť ako _hlavnú fotografiu udalosti" -#: src/Resources.vala:234 +#: src/Resources.vala:235 msgid "Make Key Photo for Event" msgstr "Označiť ako hlavnú fotografiu udalosti" -#: src/Resources.vala:236 ui/event.ui:380 ui/media.ui:374 ui/tags.ui:374 +#: src/Resources.vala:237 ui/event.ui:382 ui/media.ui:376 ui/tags.ui:376 msgid "_New Event" msgstr "_Nová udalosť" -#: src/Resources.vala:237 +#: src/Resources.vala:238 msgid "New Event" msgstr "Nová udalosť" -#: src/Resources.vala:239 +#: src/Resources.vala:240 msgid "Move Photos" msgstr "Presunúť fotografie" -#: src/Resources.vala:240 +#: src/Resources.vala:241 msgid "Move photos to an event" msgstr "Presunúť fotografie do udalosti" -#: src/Resources.vala:242 ui/events_directory.ui:135 ui/events_directory.ui:177 +#: src/Resources.vala:243 ui/events_directory.ui:135 ui/events_directory.ui:177 msgid "_Merge Events" msgstr "_Zlúčiť udalosti" -#: src/Resources.vala:243 +#: src/Resources.vala:244 msgid "Merge" msgstr "Zlúčiť" -#: src/Resources.vala:244 +#: src/Resources.vala:245 msgid "Combine events into a single event" msgstr "Zlúčiť udalosti do jednej udalosti" -#: src/Resources.vala:246 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:476 +#: src/Resources.vala:247 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:478 #: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286 msgid "_Set Rating" msgstr "O_hodnotiť" -#: src/Resources.vala:247 +#: src/Resources.vala:248 msgid "Set Rating" msgstr "Ohodnotiť" -#: src/Resources.vala:248 +#: src/Resources.vala:249 msgid "Change the rating of your photo" msgstr "Zmeniť hodnotenie vašej fotografie" -#: src/Resources.vala:250 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:509 +#: src/Resources.vala:251 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:511 #: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326 msgid "_Increase" msgstr "Z_výšiť" -#: src/Resources.vala:251 +#: src/Resources.vala:252 msgid "Increase Rating" msgstr "Zvýšiť hodnotenie" -#: src/Resources.vala:253 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:513 +#: src/Resources.vala:254 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:515 #: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331 msgid "_Decrease" msgstr "_Znížiť" -#: src/Resources.vala:254 +#: src/Resources.vala:255 msgid "Decrease Rating" msgstr "Znížiť hodnotenie" -#: src/Resources.vala:256 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:499 +#: src/Resources.vala:257 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:501 #: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314 msgid "_Unrated" msgstr "_Neohodnotená" -#: src/Resources.vala:257 +#: src/Resources.vala:258 msgid "Unrated" msgstr "Neohodnotená" -#: src/Resources.vala:258 +#: src/Resources.vala:259 msgid "Rate Unrated" msgstr "Hodnotiť neohodnotené" -#: src/Resources.vala:259 +#: src/Resources.vala:260 msgid "Setting as unrated" msgstr "Nastavuje sa ako neohodnotená" -#: src/Resources.vala:260 +#: src/Resources.vala:261 msgid "Remove any ratings" msgstr "Odstrániť všetky hodnotenia" -#: src/Resources.vala:262 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:503 +#: src/Resources.vala:263 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:505 #: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319 msgid "_Rejected" msgstr "_Odmietnutá" -#: src/Resources.vala:263 +#: src/Resources.vala:264 msgid "Rejected" msgstr "Odmietnutá" -#: src/Resources.vala:264 +#: src/Resources.vala:265 msgid "Rate Rejected" msgstr "Hodnotiť odmietnuté" -#: src/Resources.vala:265 +#: src/Resources.vala:266 msgid "Setting as rejected" msgstr "Nastavuje sa ako odmietnutá" -#: src/Resources.vala:266 +#: src/Resources.vala:267 msgid "Set rating to rejected" msgstr "Nastaviť hodnotenie ako odmietnuté" -#: src/Resources.vala:268 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196 +#: src/Resources.vala:269 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196 #: ui/offline.ui:153 ui/search_bar.ui:6 ui/tags.ui:196 ui/trash.ui:162 msgid "Rejected _Only" msgstr "Len _odmietnuté" -#: src/Resources.vala:269 +#: src/Resources.vala:270 msgid "Rejected Only" msgstr "Len odmietnuté" -#: src/Resources.vala:270 +#: src/Resources.vala:271 msgid "Show only rejected photos" msgstr "Zobraziť len odmietnuté fotografie" -#: src/Resources.vala:272 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190 +#: src/Resources.vala:273 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190 #: ui/offline.ui:147 ui/search_bar.ui:12 ui/tags.ui:190 ui/trash.ui:156 msgid "All + _Rejected" msgstr "Všetky + o_dmietnuté" -#: src/Resources.vala:273 +#: src/Resources.vala:274 msgctxt "Tooltip" msgid "Show all photos, including rejected" msgstr "Zobrazí všetky fotografie, vrátane odmietnutých" -#: src/Resources.vala:275 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184 +#: src/Resources.vala:276 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184 #: ui/offline.ui:141 ui/search_bar.ui:18 ui/tags.ui:184 ui/trash.ui:150 msgid "_All Photos" msgstr "_Všetky fotografie" # DK: https://bugzilla.gnome.org/show_bug.cgi?id=744254 #. Button tooltip -#: src/Resources.vala:277 +#: src/Resources.vala:278 msgid "Show all photos" msgstr "Zobraziť všetky fotografie" -#: src/Resources.vala:279 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120 +#: src/Resources.vala:280 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120 #: ui/tags.ui:144 msgid "_Ratings" msgstr "_Hodnotenia" -#: src/Resources.vala:280 -#, fuzzy -#| msgid "Display each photo's rating" +#: src/Resources.vala:281 msgid "Display each photo’s rating" msgstr "Zobraziť hodnotenie každej fotografie" -#: src/Resources.vala:282 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151 +#: src/Resources.vala:283 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151 #: ui/offline.ui:108 ui/tags.ui:151 ui/trash.ui:117 msgid "_Filter Photos" msgstr "_Filtrovať fotografie" -#: src/Resources.vala:283 +#: src/Resources.vala:284 msgid "Filter Photos" msgstr "Filtrovať fotografie" -#: src/Resources.vala:284 +#: src/Resources.vala:285 msgid "Limit the number of photos displayed based on a filter" msgstr "Obmedziť počet zobrazených fotografií na základe filtra" -#: src/Resources.vala:287 +#: src/Resources.vala:288 msgid "Duplicate" msgstr "Duplikovať" -#: src/Resources.vala:288 +#: src/Resources.vala:289 msgid "Make a duplicate of the photo" msgstr "Vytvoriť duplikát fotografie" -#: src/Resources.vala:290 +#: src/Resources.vala:291 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17 +#: ui/tags.ui:17 msgid "_Export…" msgstr "_Exportovať…" -#: src/Resources.vala:292 +#: src/Resources.vala:293 msgid "_Print…" msgstr "_Tlačiť…" -#: src/Resources.vala:294 +#: src/Resources.vala:295 msgid "Pu_blish…" msgstr "Uvere_jniť…" -#: src/Resources.vala:296 ui/collection.ui:187 +#: src/Resources.vala:297 ui/collection.ui:189 msgid "Publish to various websites" msgstr "Uverejní na rôznych webových stránkach" # DK:https://bugzilla.gnome.org/show_bug.cgi?id=744251 -#: src/Resources.vala:298 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:535 +#: src/Resources.vala:299 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:537 #: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340 msgid "Edit _Title…" msgstr "_Upraviť názov…" # DK:https://bugzilla.gnome.org/show_bug.cgi?id=744251 #. Button label -#: src/Resources.vala:300 +#: src/Resources.vala:301 msgctxt "Button Label" msgid "Edit Title" msgstr "Upraviť názov" -#: src/Resources.vala:302 ui/collection.ui:102 ui/events_directory.ui:144 -#: ui/events_directory.ui:186 ui/event.ui:344 ui/event.ui:396 ui/event.ui:539 -#: ui/media.ui:344 ui/photo_context.ui:109 ui/photo.ui:331 ui/tags.ui:344 +#: src/Resources.vala:303 ui/collection.ui:103 ui/events_directory.ui:144 +#: ui/events_directory.ui:186 ui/event.ui:345 ui/event.ui:398 ui/event.ui:542 +#: ui/media.ui:345 ui/photo_context.ui:110 ui/photo.ui:332 ui/tags.ui:345 msgid "Edit _Comment…" msgstr "Upraviť _komentár…" #. Button label -#: src/Resources.vala:304 +#: src/Resources.vala:305 msgid "Edit Comment" msgstr "Upraviť komentár" # DK: https://bugzilla.gnome.org/show_bug.cgi?id=736632 -#: src/Resources.vala:306 ui/event.ui:588 +#: src/Resources.vala:307 ui/event.ui:592 msgid "Edit Event _Comment…" msgstr "Upraviť _komentár k udalosti…" # window title -#: src/Resources.vala:309 ui/direct.ui:167 ui/photo.ui:335 +#: src/Resources.vala:310 ui/direct.ui:167 ui/photo.ui:337 msgid "_Adjust Date and Time…" msgstr "_Upraviť dátum a čas…" # window title -#: src/Resources.vala:310 +#: src/Resources.vala:311 msgid "Adjust Date and Time" msgstr "Upráva dátumu a času" # DK: https://bugzilla.gnome.org/show_bug.cgi?id=744255 -#: src/Resources.vala:312 ui/collection.ui:19 ui/event.ui:405 ui/event.ui:456 -#: ui/media.ui:388 ui/photo.ui:372 ui/tags.ui:388 +#: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458 +#: ui/media.ui:390 ui/photo.ui:374 ui/tags.ui:390 msgid "Add _Tags…" msgstr "Pridať _značky…" # DK: https://bugzilla.gnome.org/show_bug.cgi?id=744255 -#: src/Resources.vala:313 ui/photo_context.ui:17 +#: src/Resources.vala:314 ui/photo_context.ui:17 msgid "_Add Tags…" msgstr "_Pridať značky…" # DK: https://bugzilla.gnome.org/show_bug.cgi?id=744255 #. Dialog title -#: src/Resources.vala:315 +#: src/Resources.vala:316 msgctxt "Dialog Title" msgid "Add Tags" msgstr "Pridanie značiek" # dialog title -#: src/Resources.vala:324 ui/photo_context.ui:133 +#: src/Resources.vala:325 ui/photo_context.ui:135 msgid "Send T_o…" msgstr "Odoslať _do…" -#: src/Resources.vala:326 +#: src/Resources.vala:327 msgid "_Find…" msgstr "_Nájsť…" -#: src/Resources.vala:327 ui/collection.ui:215 ui/offline.ui:239 +#: src/Resources.vala:328 ui/collection.ui:217 ui/offline.ui:239 #: ui/trash.ui:312 msgid "Find" msgstr "Nájsť" -#: src/Resources.vala:328 ui/collection.ui:212 ui/offline.ui:236 +#: src/Resources.vala:329 ui/collection.ui:214 ui/offline.ui:236 #: ui/trash.ui:309 msgid "Find an image by typing text that appears in its name or tags" msgstr "" "Nájdite obrázok napísaním textu ktorý sa nachádza v jeho názve alebo značke" -#: src/Resources.vala:330 +#: src/Resources.vala:331 msgid "_Flag" msgstr "_Označiť" -#: src/Resources.vala:332 +#: src/Resources.vala:333 msgid "Un_flag" msgstr "Odz_načiť" -#: src/Resources.vala:335 +#: src/Resources.vala:336 #, c-format msgid "Unable to launch editor: %s" msgstr "Nie je možné spustiť editor: %s" -#: src/Resources.vala:340 -#, fuzzy, c-format -#| msgid "Add Tag \"%s\"" +#: src/Resources.vala:341 +#, c-format msgid "Add Tag “%s”" msgstr "Pridať značku „%s“" #. Used when adding two tags to photo(s) -#: src/Resources.vala:343 -#, fuzzy, c-format -#| msgid "Add Tags \"%s\" and \"%s\"" +#: src/Resources.vala:344 +#, c-format msgid "Add Tags “%s” and “%s”" msgstr "Pridať značky „%s“ a „%s“" # DK: https://bugzilla.gnome.org/show_bug.cgi?id=744255 #. Undo/Redo command name (in Edit menu) -#: src/Resources.vala:348 +#: src/Resources.vala:349 msgctxt "UndoRedo menu entry" msgid "Add Tags" msgstr "Pridanie značiek" -#: src/Resources.vala:353 +#: src/Resources.vala:354 #, c-format msgid "_Delete Tag “%s”" msgstr "O_dstrániť značku „%s“" -#: src/Resources.vala:357 -#, fuzzy, c-format -#| msgid "Delete Tag \"%s\"" +#: src/Resources.vala:358 +#, c-format msgid "Delete Tag “%s”" msgstr "Odstrániť značku „%s“" -#: src/Resources.vala:360 +#: src/Resources.vala:361 msgid "Delete Tag" msgstr "Odstrániť značku" -#: src/Resources.vala:366 +#: src/Resources.vala:367 #, c-format msgid "Re_name Tag “%s”…" msgstr "Pre_menovať značku „%s“…" -#: src/Resources.vala:370 -#, fuzzy, c-format -#| msgid "Rename Tag \"%s\" to \"%s\"" +#: src/Resources.vala:371 +#, c-format msgid "Rename Tag “%s” to “%s”" msgstr "Premenovať značku „%s“ na „%s“" -#: src/Resources.vala:373 ui/tags.ui:454 +#: src/Resources.vala:374 ui/tags.ui:456 msgid "_Rename…" msgstr "_Premenovať…" # dialog title -#: src/Resources.vala:375 ui/collection.ui:24 ui/event.ui:410 ui/event.ui:461 -#: ui/media.ui:393 ui/photo_context.ui:22 ui/photo.ui:377 ui/tags.ui:393 +#: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463 +#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:379 ui/tags.ui:395 msgid "Modif_y Tags…" msgstr "Uprav_iť značky…" # dialog title -#: src/Resources.vala:376 +#: src/Resources.vala:377 msgid "Modify Tags" msgstr "Úprava značiek" -#: src/Resources.vala:379 -#, fuzzy, c-format -#| msgid "Tag Photo as \"%s\"" +#: src/Resources.vala:380 +#, c-format msgid "Tag Photo as “%s”" msgid_plural "Tag Photos as “%s”" msgstr[0] "Označiť fotografie ako „%s“" -msgstr[1] "Označiť fotografie ako „%s“" +msgstr[1] "Označiť fotografiu ako „%s“" msgstr[2] "Označiť fotografie ako „%s“" -#: src/Resources.vala:385 -#, fuzzy, c-format -#| msgid "Tag the selected photo as \"%s\"" +#: src/Resources.vala:386 +#, c-format msgid "Tag the selected photo as “%s”" msgid_plural "Tag the selected photos as “%s”" msgstr[0] "Označiť vybrané fotografie ako „%s“" -msgstr[1] "Označiť vybrané fotografie ako „%s“" +msgstr[1] "Označiť vybranú fotografiu ako „%s“" msgstr[2] "Označiť vybrané fotografie ako „%s“" -#: src/Resources.vala:391 -#, fuzzy, c-format -#| msgid "Remove Tag \"%s\" From _Photo" +#: src/Resources.vala:392 +#, c-format msgid "Remove Tag “%s” From _Photo" msgid_plural "Remove Tag “%s” From _Photos" msgstr[0] "Odstrániť značku „%s“ z _fotografií" -msgstr[1] "Odstrániť značku „%s“ z _fotografií" +msgstr[1] "Odstrániť značku „%s“ z _fotografie" msgstr[2] "Odstrániť značku „%s“ z _fotografií" -#: src/Resources.vala:397 -#, fuzzy, c-format -#| msgid "Remove Tag \"%s\" From Photo" +#: src/Resources.vala:398 +#, c-format msgid "Remove Tag “%s” From Photo" msgid_plural "Remove Tag “%s” From Photos" msgstr[0] "Odstrániť značku „%s“ z fotografií" -msgstr[1] "Odstrániť značku „%s“ z fotografií" +msgstr[1] "Odstrániť značku „%s“ z fotografie" msgstr[2] "Odstrániť značku „%s“ z fotografií" -#: src/Resources.vala:403 -#, fuzzy, c-format -#| msgid "Unable to rename tag to \"%s\" because the tag already exists." +#: src/Resources.vala:404 +#, c-format msgid "Unable to rename tag to “%s” because the tag already exists." -msgstr "Nie je možné premenovať značku na „%s“, lebo táto značka už existuje." +msgstr "Nie je možné premenovať značku na „%s“, pretože značka už existuje." -#: src/Resources.vala:407 -#, fuzzy, c-format -#| msgid "Unable to rename search to \"%s\" because the search already exists." +#: src/Resources.vala:408 +#, c-format msgid "Unable to rename search to “%s” because the search already exists." msgstr "" -"Nepodarilo sa premenovať vyhľadávanie na „%s“, lebo takéto vyhľadávanie už " +"Nepodarilo sa premenovať vyhľadávanie na „%s“, pretože vyhľadávanie už " "existuje." #. Saved search button -#: src/Resources.vala:410 src/SearchFilter.vala:1124 +#: src/Resources.vala:411 src/SearchFilter.vala:1124 msgid "Saved Search" msgstr "Uložené vyhľadávanie" -#: src/Resources.vala:412 +#: src/Resources.vala:413 msgid "Delete Search" msgstr "Odstrániť vyhľadávanie" -#: src/Resources.vala:415 ui/savedsearch.ui:11 +#: src/Resources.vala:416 ui/savedsearch.ui:11 msgid "_Edit…" msgstr "_Upraviť…" -#: src/Resources.vala:416 ui/savedsearch.ui:7 +#: src/Resources.vala:417 ui/savedsearch.ui:7 msgid "Re_name…" msgstr "_Premenovať…" -#: src/Resources.vala:419 -#, fuzzy, c-format -#| msgid "Rename Search \"%s\" to \"%s\"" +#: src/Resources.vala:420 +#, c-format msgid "Rename Search “%s” to “%s”" msgstr "Premenovať vyhľadávanie „%s“ na „%s“" -#: src/Resources.vala:423 -#, fuzzy, c-format -#| msgid "Delete Search \"%s\"" +#: src/Resources.vala:424 +#, c-format msgid "Delete Search “%s”" -msgstr "O_dstrániť vyhľadávanie „%s“" +msgstr "Odstrániť vyhľadávanie „%s“" -#: src/Resources.vala:560 +#: src/Resources.vala:561 #, c-format msgid "Rate %s" msgstr "Hodnotiť %s" -#: src/Resources.vala:561 +#: src/Resources.vala:562 #, c-format msgid "Set rating to %s" msgstr "Nastaviť hodnotenie na %s" -#: src/Resources.vala:562 +#: src/Resources.vala:563 #, c-format msgid "Setting rating to %s" msgstr "Nastavuje sa hodnotenie na %s" -#: src/Resources.vala:564 +#: src/Resources.vala:565 #, c-format msgid "Display %s" msgstr "Zobraziť %s" -#: src/Resources.vala:565 +#: src/Resources.vala:566 #, c-format msgid "Only show photos with a rating of %s" msgstr "Zobraziť len fotografie s hodnotením %s" -#: src/Resources.vala:566 +#: src/Resources.vala:567 #, c-format msgid "%s or Better" msgstr "%s alebo lepšie" -#: src/Resources.vala:567 +#: src/Resources.vala:568 #, c-format msgid "Display %s or Better" msgstr "Zobraziť %s alebo lepšie" -#: src/Resources.vala:568 +#: src/Resources.vala:569 #, c-format msgid "Only show photos with a rating of %s or better" msgstr "Zobraziť iba fotografie s hodnotením %s alebo lepšie" # tooltip -#: src/Resources.vala:659 ui/trash.ui:255 +#: src/Resources.vala:660 ui/trash.ui:255 msgid "Remove the selected photos from the trash" msgstr "Odstráni vybrané fotografie z koša" -#: src/Resources.vala:660 ui/offline.ui:221 +#: src/Resources.vala:661 ui/offline.ui:221 msgid "Remove the selected photos from the library" msgstr "Odstrániť vybrané fotografie z knižnice" -#: src/Resources.vala:662 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273 +#: src/Resources.vala:663 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273 msgid "_Restore" msgstr "_Obnoviť" # tooltip -#: src/Resources.vala:663 ui/trash.ui:270 +#: src/Resources.vala:664 ui/trash.ui:270 msgid "Move the selected photos back into the library" msgstr "Presunie vybrané fotografie naspäť do knižnice" -#: src/Resources.vala:665 ui/collection.ui:121 ui/direct_context.ui:20 -#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:558 ui/media.ui:27 -#: ui/photo_context.ui:128 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19 +#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:20 +#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27 +#: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19 #: ui/trash.ui:227 msgid "Show in File Mana_ger" msgstr "Zobraziť v správcovi sú_borov" -#: src/Resources.vala:666 -#, fuzzy -#| msgid "Open the selected photo's directory in the file manager" +# tooltip +#: src/Resources.vala:667 msgid "Open the selected photo’s directory in the file manager" -msgstr "Otvoriť priečinok zvolených fotografií v správcovi súborov" +msgstr "Otvorí priečinok vybraných fotografií v správcovi súborov" -#: src/Resources.vala:669 +#: src/Resources.vala:670 #, c-format msgid "Unable to open in file manager: %s" msgstr "Nie je možné otvoriť v správcovi súborov: %s" -#: src/Resources.vala:672 ui/offline.ui:224 +#: src/Resources.vala:673 ui/offline.ui:224 msgid "R_emove From Library" msgstr "_Odstrániť z knižnice" -#: src/Resources.vala:674 ui/collection.ui:132 ui/event.ui:79 ui/event.ui:569 -#: ui/media.ui:79 ui/photo_context.ui:139 ui/photo.ui:82 ui/tags.ui:79 +#: src/Resources.vala:675 ui/collection.ui:134 ui/event.ui:79 ui/event.ui:573 +#: ui/media.ui:79 ui/photo_context.ui:141 ui/photo.ui:82 ui/tags.ui:79 msgid "_Move to Trash" msgstr "Presunúť do _Koša" -#: src/Resources.vala:676 ui/events_directory.ui:58 ui/event.ui:86 +#: src/Resources.vala:677 ui/events_directory.ui:58 ui/event.ui:86 #: ui/import.ui:61 ui/media.ui:86 ui/offline.ui:65 ui/tags.ui:86 ui/trash.ui:74 msgid "Select _All" msgstr "Ozn_ačiť všetko" -#: src/Resources.vala:677 +#: src/Resources.vala:678 msgid "Select all items" msgstr "Vybrať všetky položky" @@ -6212,12 +6059,10 @@ msgid "Date" msgstr "Dátum" #: src/SearchFilter.vala:815 -#| msgid "Rating" msgid "★+ Rating" msgstr "Hodnotenie ★+" #: src/SearchFilter.vala:818 -#| msgid "Rating" msgid "★★+ Rating" msgstr "Hodnotenie ★★+" @@ -6234,10 +6079,9 @@ msgid "★★★★★+ Rating" msgstr "Hodnotenie ★★★★★+" #: src/SearchFilter.vala:1064 -#, fuzzy, c-format -#| msgid "Error loading UI file %s: %s" +#, c-format msgid "Error loading search bar UI: %s" -msgstr "Chyba pri nahrávaní súboru používateľského rozhrania %s: %s" +msgstr "Chyba pri načítavaní používateľského rozhrania lišty vyhľadávania: %s" #. Ticket #3260 - Add a 'close' context menu to #. the searchbar. @@ -6338,42 +6182,42 @@ msgid "untitled" msgstr "bez názvu" #. multiple videos -#: src/VideoSupport.vala:507 +#: src/VideoSupport.vala:523 msgid "Export Videos" msgstr "Exportovať videá" -#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:470 ui/media.ui:281 +#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:472 ui/media.ui:281 #: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281 msgid "Toggle _Flag" msgstr "Prepnúť _značku" -#: ui/collection.ui:82 ui/event.ui:351 ui/event.ui:519 ui/media.ui:351 -#: ui/photo_context.ui:88 ui/photo.ui:341 ui/tags.ui:351 +#: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353 +#: ui/photo_context.ui:88 ui/photo.ui:343 ui/tags.ui:353 msgid "_Developer" msgstr "_Vývojár" -#: ui/collection.ui:106 ui/event.ui:543 ui/photo_context.ui:113 ui/photo.ui:358 +#: ui/collection.ui:108 ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360 msgid "Open with E_xternal Editor" msgstr "Otvoriť pomocou e_xterného editora" -#: ui/collection.ui:117 ui/event.ui:385 ui/event.ui:554 ui/media.ui:379 -#: ui/photo_context.ui:124 ui/tags.ui:379 +#: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381 +#: ui/photo_context.ui:126 ui/tags.ui:381 msgid "View Eve_nt for Photo" msgstr "Zobraziť u_dalosť fotografie" #: ui/direct.ui:5 ui/events_directory.ui:5 ui/event.ui:5 ui/import_queue.ui:5 #: ui/import.ui:5 ui/media.ui:5 ui/offline.ui:5 ui/photo.ui:5 ui/tags.ui:5 -#: ui/top.ui:5 ui/trash.ui:5 +#: ui/trash.ui:5 msgid "_File" msgstr "_Súbor" -#: ui/direct.ui:13 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17 ui/tags.ui:17 +#: ui/direct.ui:13 msgid "Save _As…" msgstr "Uložiť _ako…" #: ui/direct.ui:59 ui/events_directory.ui:71 ui/event.ui:99 #: ui/import_queue.ui:38 ui/import.ui:74 ui/media.ui:99 ui/offline.ui:78 -#: ui/photo.ui:95 ui/tags.ui:99 ui/top.ui:15 ui/trash.ui:87 +#: ui/photo.ui:95 ui/tags.ui:99 ui/trash.ui:87 msgid "_View" msgstr "_Zobraziť" @@ -6389,7 +6233,7 @@ msgstr "Mierka _100%" msgid "Zoom _200%" msgstr "Mierka _200%" -#: ui/direct.ui:98 ui/photo.ui:187 ui/top.ui:20 +#: ui/direct.ui:98 ui/photo.ui:187 msgid "_Photo" msgstr "_Fotografia" @@ -6405,15 +6249,15 @@ msgstr "Ďa_lšia fotografia" msgid "T_ools" msgstr "Nás_troje" -#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:426 -#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:409 ui/offline.ui:188 -#: ui/photo.ui:392 ui/tags.ui:428 ui/trash.ui:197 +#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:428 +#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188 +#: ui/photo.ui:394 ui/tags.ui:430 ui/trash.ui:197 msgid "_Frequently Asked Questions" msgstr "Často _kladené otázky" -#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:430 -#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:413 ui/offline.ui:192 -#: ui/photo.ui:396 ui/tags.ui:432 ui/trash.ui:201 +#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:432 +#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192 +#: ui/photo.ui:398 ui/tags.ui:434 ui/trash.ui:201 msgid "_Report a Problem…" msgstr "_Nahlásiť problém…" @@ -6493,8 +6337,7 @@ msgstr "Vz_ostupne" msgid "D_escending" msgstr "Zo_stupne" -#: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371 -#: ui/top.ui:30 +#: ui/events_directory.ui:132 ui/event.ui:379 ui/media.ui:373 ui/tags.ui:373 msgid "Even_ts" msgstr "U_dalosti" @@ -6507,8 +6350,8 @@ msgstr "_Odstrániť z knižnice" msgid "_Titles" msgstr "_Názvy" -#: ui/event.ui:139 ui/event.ui:402 ui/media.ui:139 ui/media.ui:385 -#: ui/photo.ui:369 ui/tags.ui:139 ui/tags.ui:385 ui/top.ui:35 +#: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387 +#: ui/photo.ui:371 ui/tags.ui:139 ui/tags.ui:387 msgid "Ta_gs" msgstr "_Značky" @@ -6530,14 +6373,14 @@ msgstr "Podľa _dátumu vytvorenie" #: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224 msgid "By _Rating" -msgstr "Podľa _hodnotenia" +msgstr "Podľa _hodnotenia" #: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135 #: ui/tags.ui:251 msgid "_Descending" msgstr "Zo_stupne" -#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275 ui/top.ui:25 +#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275 msgid "_Photos" msgstr "_Fotografie" @@ -6545,6 +6388,56 @@ msgstr "_Fotografie" msgid "_Stop Import" msgstr "_Zastaviť importovanie" +#: ui/printing_widget.ui:19 +msgid "<b>Printed Image Size</b>" +msgstr "<b>Veľkosť tlačeného obrázku</b>" + +#: ui/printing_widget.ui:36 +msgid "Use a _standard size:" +msgstr "Použiť š_tandardnú veľkosť:" + +#: ui/printing_widget.ui:80 +msgid "Use a c_ustom size:" +msgstr "Použiť _vlastnú veľkosť:" + +#. Abbrevation for "inch" +#: ui/printing_widget.ui:146 +msgid "in." +msgstr "palcov" + +#. Abbrevation for "centimeters" +#: ui/printing_widget.ui:147 +msgid "cm" +msgstr "cm" + +#: ui/printing_widget.ui:173 +msgid "_Match photo aspect ratio" +msgstr "_Zachovať pomer strán fotografie" + +#: ui/printing_widget.ui:197 +msgid "_Autosize:" +msgstr "_Automatická veľkosť:" + +#: ui/printing_widget.ui:237 +msgid "<b>Titles</b>" +msgstr "<b>Názvy</b>" + +#: ui/printing_widget.ui:254 +msgid "Print image _title" +msgstr "Vytlačiť _názov obrázku" + +#: ui/printing_widget.ui:297 +msgid "<b>Pixel Resolution</b>" +msgstr "<b>Rozlíšenie pixelov</b>" + +#: ui/printing_widget.ui:317 +msgid "_Output photo at:" +msgstr "_Vytvoriť fotografiu v:" + +#: ui/printing_widget.ui:351 +msgid "pixels per inch" +msgstr "pixeloch na palec" + #: ui/set_background_dialog.ui:9 msgid "Set as Desktop Background" msgstr "Nastaviť ako _pozadie pracovnej plochy" @@ -6654,79 +6547,39 @@ msgstr "Externé editory" msgid "Plugins" msgstr "Zásuvné moduly" -#: ui/shotwell.ui:583 -msgid "<b>Printed Image Size</b>" -msgstr "<b>Veľkosť tlačeného obrázku</b>" - -#: ui/shotwell.ui:600 -msgid "Use a _standard size:" -msgstr "Použiť š_tandardnú veľkosť:" - -#: ui/shotwell.ui:643 -msgid "Use a c_ustom size:" -msgstr "Použiť _vlastnú veľkosť:" - -#: ui/shotwell.ui:731 -msgid "_Match photo aspect ratio" -msgstr "_Zachovať pomer strán fotografie" - -#: ui/shotwell.ui:755 -msgid "_Autosize:" -msgstr "_Automatická veľkosť:" - -#: ui/shotwell.ui:795 -msgid "<b>Titles</b>" -msgstr "<b>Názvy</b>" - -#: ui/shotwell.ui:812 -msgid "Print image _title" -msgstr "Vytlačiť _názov obrázku" - -#: ui/shotwell.ui:855 -msgid "<b>Pixel Resolution</b>" -msgstr "<b>Rozlíšenie pixelov</b>" - -#: ui/shotwell.ui:875 -msgid "_Output photo at:" -msgstr "_Vytvoriť fotografiu v:" - -#: ui/shotwell.ui:909 -msgid "pixels per inch" -msgstr "pixeloch na palec" - -#: ui/shotwell.ui:949 +#: ui/shotwell.ui:590 msgid "_Name of search:" msgstr "_Názov vyhľadávania:" -#: ui/shotwell.ui:1003 +#: ui/shotwell.ui:644 msgid "_Match" msgstr "_Zhoda" -#: ui/shotwell.ui:1030 +#: ui/shotwell.ui:671 msgid "of the following:" msgstr "z nasledujúcich:" -#: ui/shotwell.ui:1111 +#: ui/shotwell.ui:752 msgid "label" msgstr "štítok" -#: ui/shotwell.ui:1262 +#: ui/shotwell.ui:903 msgid "_Delay:" msgstr "_Oneskorenie:" -#: ui/shotwell.ui:1276 +#: ui/shotwell.ui:917 msgid "_Transition effect:" msgstr "_Efekt prechodu:" -#: ui/shotwell.ui:1290 +#: ui/shotwell.ui:931 msgid "Transition d_elay:" msgstr "Oneskorenie _prechodu:" -#: ui/shotwell.ui:1300 +#: ui/shotwell.ui:941 msgid "Show t_itle" msgstr "Zobraziť ná_zov" -#: ui/shotwell.ui:1375 ui/shotwell.ui:1386 +#: ui/shotwell.ui:1016 ui/shotwell.ui:1027 msgid "seconds" msgstr "sekúnd" @@ -6739,6 +6592,26 @@ msgstr "Nová _značka…" msgid "Delete all photos in the trash" msgstr "Odstráni všetky fotografie v koši" +#~ msgid "Testing connection to Facebook…" +#~ msgstr "Testuje sa pripojenie k službe Facebook…" + +#~ msgid "" +#~ "You have already logged in and out of Flickr during this Shotwell " +#~ "session.\n" +#~ "To continue publishing to Flickr, quit and restart Shotwell, then try " +#~ "publishing again." +#~ msgstr "" +#~ "Počas tohoto spustenia programu Shotwell ste sa už prihlásili a odhlásili " +#~ "k službe Flickr.\n" +#~ "Aby ste mohli naďalej uverejňovať fotografie pomocou služby Flickr, " +#~ "ukončite a znova spustite Shotwell, a potom to skúste znova." + +#~ msgid "L_ist album in public gallery" +#~ msgstr "_Zobraziť album vo verejnej galérii" + +#~ msgid "Videos will appear in “%s”" +#~ msgstr "Videá sa zobrazia v „%s“" + #~ msgid "Login" #~ msgstr "Prihlásiť sa" @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: shotwell-0.15\n" "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=shotwe" "ll&keywords=I18N+L10N&component=Internationalization\n" -"POT-Creation-Date: 2017-03-04 15:02+0000\n" -"PO-Revision-Date: 2017-03-05 20:45+0200\n" +"POT-Creation-Date: 2017-04-02 16:28+0000\n" +"PO-Revision-Date: 2017-05-05 06:58+0200\n" "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n" "Language-Team: српски <gnome-sr@googlegroups.org>\n" "Language: sr\n" @@ -23,9 +23,9 @@ msgstr "" #: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115 -#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:354 -#: ui/event.ui:522 ui/media.ui:354 ui/photo_context.ui:91 ui/photo.ui:344 -#: ui/tags.ui:354 +#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:356 +#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346 +#: ui/tags.ui:356 msgid "Shotwell" msgstr "Фото-бунар" @@ -63,7 +63,6 @@ msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats." msgstr "Фото-бунар подржава ЈПЕГ, ПНГ, ТИФФ и разне сирове записе датотека." #: misc/shotwell.appdata.xml.in:52 -#| msgid "Shotwell Viewer" msgid "The Shotwell developers" msgstr "Програмери Фото-бунара" @@ -729,7 +728,6 @@ msgid "Setting in export dialog: how to trim images" msgstr "Подешавање у прозорчету извоза: како да скрати слике" #: misc/org.yorba.shotwell.gschema.xml:358 -#| msgid "Export metadata" msgid "export metadata" msgstr "извоз метаподатака" @@ -1302,7 +1300,6 @@ msgstr "" "супротном поништено" #: misc/org.yorba.shotwell.gschema.xml:774 -#: misc/org.yorba.shotwell.gschema.xml:798 msgid "enable slideshow slide transition" msgstr "укључује клизање прелаза покретног приказа" @@ -1325,7 +1322,6 @@ msgstr "" "супротном поништено" #: misc/org.yorba.shotwell.gschema.xml:786 -#: misc/org.yorba.shotwell.gschema.xml:792 msgid "enable slideshow circle transition" msgstr "укључује круг прелаза покретног приказа" @@ -1336,13 +1332,23 @@ msgstr "" "Изабрано ако је укључен прикључак круга прелаза покретног приказа, у " "супротном поништено" +#: misc/org.yorba.shotwell.gschema.xml:792 +#| msgid "enable slideshow circle transition" +msgid "enable slideshow circles transition" +msgstr "укључује кружне прелазе покретног приказа" + #: misc/org.yorba.shotwell.gschema.xml:793 msgid "" "True if the Circles slideshow transition plugin is enabled, false otherwise" msgstr "" -"Изабрано ако је укључен прикључак кругова прелаза покретног приказа, у " +"Изабрано ако је укључен прикључак кружних прелаза покретног приказа, у " "супротном поништено" +#: misc/org.yorba.shotwell.gschema.xml:798 +#| msgid "enable slideshow slide transition" +msgid "enable slideshow blinds transition" +msgstr "укључује засторе прелаза покретног приказа" + #: misc/org.yorba.shotwell.gschema.xml:799 msgid "" "True if the Blinds slideshow transition plugin is enabled, false otherwise" @@ -1503,7 +1509,7 @@ msgstr "" msgid "Visit the Shotwell home page" msgstr "Посетите веб страницу Фото-бунара" -#: plugins/common/Resources.vala:31 src/AppWindow.vala:603 +#: plugins/common/Resources.vala:31 src/AppWindow.vala:605 msgid "translator-credits" msgstr "" "Никола Радовановић <nrad@eunet.rs>\n" @@ -1684,7 +1690,7 @@ msgid "Go _Back" msgstr "_Назад" #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125 -#: ui/shotwell.ui:1464 +#: ui/shotwell.ui:1105 msgid "_Log in" msgstr "_Пријави ме" @@ -1750,7 +1756,7 @@ msgstr "_Одјави ме" #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:141 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:156 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115 -#: src/CollectionPage.vala:76 src/PhotoPage.vala:2466 +#: src/CollectionPage.vala:82 src/PhotoPage.vala:2469 msgid "_Publish" msgstr "_Објави" @@ -1868,7 +1874,6 @@ msgstr "_Запамти" #: plugins/shotwell-publishing-extras/RajcePublishing.vala:895 #: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154 -#| msgid "Logging in..." msgid "Log in" msgstr "Пријави ме" @@ -2128,12 +2133,6 @@ msgstr "" #: plugins/shotwell-publishing/FlickrPublishing.vala:802 #, c-format -#| msgid "" -#| "Your free Flickr account limits how much data you can upload per month.\n" -#| "This month you have %d megabyte remaining in your upload quota." -#| msgid_plural "" -#| "Your free Flickr account limits how much data you can upload per month.\n" -#| "This month you have %d megabytes remaining in your upload quota." msgid "" "Your free Flickr account limits how much data you can upload per month.\n" "This month you have %s remaining in your upload quota." @@ -2189,7 +2188,6 @@ msgstr "_Величина фотографије:" #. or the new "Default album" album for Google Photos #: plugins/shotwell-publishing/PicasaPublishing.vala:96 #: plugins/shotwell-publishing/PicasaPublishing.vala:630 -#| msgid "last album" msgid "Default album" msgstr "Основни албум" @@ -2216,17 +2214,14 @@ msgid "Small (640 × 480 pixels)" msgstr "Мала (640 × 480 пиксела)" #: plugins/shotwell-publishing/PicasaPublishing.vala:611 -#| msgid "Medium (1024 x 768 pixels)" msgid "Medium (1024 × 768 pixels)" msgstr "Средња (1024 × 768 пиксела)" #: plugins/shotwell-publishing/PicasaPublishing.vala:612 -#| msgid "Recommended (1600 x 1200 pixels)" msgid "Recommended (1600 × 1200 pixels)" msgstr "Препоручено (1600 × 1200 пиксела)" #: plugins/shotwell-publishing/PicasaPublishing.vala:613 -#| msgid "Google+ (2048 x 1536 pixels)" msgid "Google+ (2048 × 1536 pixels)" msgstr "Гугл+ (2048 × 1536 пиксела)" @@ -2284,7 +2279,7 @@ msgid "Logout" msgstr "Одјави ме" #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268 -#: src/Resources.vala:295 ui/collection.ui:190 +#: src/Resources.vala:296 ui/collection.ui:192 msgid "Publish" msgstr "Објави" @@ -2315,7 +2310,7 @@ msgid "Certificate of %s" msgstr "Уверење „%sд" #: plugins/shotwell-publishing/PiwigoPublishing.vala:1051 -#: src/Resources.vala:166 +#: src/Resources.vala:167 msgid "_OK" msgstr "У _реду" @@ -2367,7 +2362,7 @@ msgstr "Прикажи уверење…" msgid "I understand, please _proceed." msgstr "Разумем, _настави" -#: plugins/shotwell-publishing/shotwell-publishing.vala:50 +#: plugins/shotwell-publishing/shotwell-publishing.vala:55 msgid "Core Publishing Services" msgstr "Кључне услуге објављивања" @@ -2495,16 +2490,16 @@ msgstr "Прибодите отворену траку лата" msgid "Leave fullscreen" msgstr "Напустите приказ преко целог екрана" -#: src/AppWindow.vala:532 src/AppWindow.vala:553 src/AppWindow.vala:570 +#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569 #: src/data_imports/DataImportsUI.vala:301 #: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20 #: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443 #: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525 -#: src/Resources.vala:157 +#: src/Resources.vala:158 msgid "_Cancel" msgstr "_Откажи" -#: src/AppWindow.vala:580 +#: src/AppWindow.vala:579 #, c-format msgid "" "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot " @@ -2517,21 +2512,27 @@ msgstr "" "\n" "%s" -#: src/AppWindow.vala:600 +#. translators: %s will be replaced by application version +#: src/AppWindow.vala:596 +#, c-format +msgid "%s – “Aachen”" +msgstr "%s – „Ахен“" + +#: src/AppWindow.vala:601 msgid "Visit the Shotwell web site" msgstr "Посетите веб страницу Фото-бунара" -#: src/AppWindow.vala:612 +#: src/AppWindow.vala:614 #, c-format msgid "Unable to display help: %s" msgstr "Не могу да прикажем помоћ: %s" -#: src/AppWindow.vala:620 +#: src/AppWindow.vala:622 #, c-format msgid "Unable to navigate to bug database: %s" msgstr "Не могу да приступим бази података грешака: %s" -#: src/AppWindow.vala:628 +#: src/AppWindow.vala:630 #, c-format msgid "Unable to display FAQ: %s" msgstr "Не могу да прикажем ЧПП: %s" @@ -2603,8 +2604,8 @@ msgstr "Фото-апарати" #: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718 #: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316 -#: ui/collection.ui:90 ui/event.ui:359 ui/event.ui:527 ui/media.ui:359 -#: ui/photo_context.ui:96 ui/photo.ui:349 ui/tags.ui:359 +#: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361 +#: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361 msgid "Camera" msgstr "Фото-апарат" @@ -2763,127 +2764,127 @@ msgstr[2] "" msgstr[3] "" "Не могу да обришем %d фотографију/снимак са фото-апарата, услед грешке." -#: src/CollectionPage.vala:74 src/direct/DirectPhotoPage.vala:85 -#: src/PhotoPage.vala:2461 src/Resources.vala:170 +#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85 +#: src/PhotoPage.vala:2464 src/Resources.vala:171 msgid "_Print" msgstr "_Штампај" -#: src/CollectionPage.vala:77 src/Resources.vala:323 ui/collection.ui:126 -#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:563 ui/photo.ui:28 +#: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128 +#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28 msgid "Send _To…" msgstr "Пошаљи _у…" -#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:90 -#: src/PhotoPage.vala:2471 src/Resources.vala:220 +#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90 +#: src/PhotoPage.vala:2474 src/Resources.vala:221 msgid "Set as _Desktop Background" msgstr "Постави за _позадину" -#: src/CollectionPage.vala:86 src/Resources.vala:286 +#: src/CollectionPage.vala:92 src/Resources.vala:287 msgid "_Duplicate" msgstr "_Удвостручи" -#: src/CollectionPage.vala:94 +#: src/CollectionPage.vala:100 msgid "Fullscreen" msgstr "Преко целог екрана" -#: src/CollectionPage.vala:96 ui/photo.ui:180 +#: src/CollectionPage.vala:102 ui/photo.ui:180 msgid "S_lideshow" msgstr "_Покретни приказ" -#: src/CollectionPage.vala:104 src/Resources.vala:139 ui/direct.ui:111 +#: src/CollectionPage.vala:110 src/Resources.vala:140 ui/direct.ui:111 #: ui/photo.ui:200 msgid "Rotate _Right" msgstr "Окрени на _десно" -#: src/CollectionPage.vala:107 src/Resources.vala:144 ui/direct.ui:116 +#: src/CollectionPage.vala:113 src/Resources.vala:145 ui/direct.ui:116 #: ui/photo.ui:205 msgid "Rotate _Left" msgstr "Окрени на _лево" -#: src/CollectionPage.vala:110 src/Resources.vala:149 ui/direct.ui:121 +#: src/CollectionPage.vala:116 src/Resources.vala:150 ui/direct.ui:121 #: ui/photo.ui:210 msgid "Flip Hori_zontally" msgstr "Изврни _водоравно" -#: src/CollectionPage.vala:111 src/Resources.vala:152 ui/direct.ui:125 +#: src/CollectionPage.vala:117 src/Resources.vala:153 ui/direct.ui:125 #: ui/photo.ui:214 msgid "Flip Verti_cally" msgstr "Изврни _усправно" -#: src/CollectionPage.vala:113 src/Resources.vala:186 ui/collection.ui:8 -#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:445 +#: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8 +#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:447 #: ui/photo_context.ui:6 ui/photo.ui:223 msgid "_Enhance" msgstr "_Побољшај" -#: src/CollectionPage.vala:114 src/Resources.vala:214 ui/collection.ui:13 -#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:450 +#: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13 +#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:452 #: ui/photo_context.ui:11 ui/photo.ui:250 msgid "Re_vert to Original" msgstr "_Врати на изворно" -#: src/CollectionPage.vala:116 src/Resources.vala:190 ui/photo.ui:256 +#: src/CollectionPage.vala:122 src/Resources.vala:191 ui/photo.ui:256 msgid "_Copy Color Adjustments" msgstr "_Умножи дотеривања боје" -#: src/CollectionPage.vala:119 src/Resources.vala:194 ui/photo.ui:261 +#: src/CollectionPage.vala:125 src/Resources.vala:195 ui/photo.ui:261 msgid "_Paste Color Adjustments" msgstr "_Убаци дотеривања боје" -#: src/CollectionPage.vala:129 +#: src/CollectionPage.vala:135 msgid "Adjust Date and Time…" msgstr "Подесите датум и време…" -#: src/CollectionPage.vala:137 src/Resources.vala:319 +#: src/CollectionPage.vala:143 src/Resources.vala:320 msgid "Open With E_xternal Editor" msgstr "_Отвори спољним уређивачем" -#: src/CollectionPage.vala:140 src/Resources.vala:321 ui/collection.ui:111 -#: ui/event.ui:548 ui/photo_context.ui:118 ui/photo.ui:363 +#: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113 +#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:365 msgid "Open With RA_W Editor" msgstr "Отвори уређивачем _сирових" -#: src/CollectionPage.vala:143 src/Resources.vala:167 +#: src/CollectionPage.vala:149 src/Resources.vala:168 msgid "_Play" msgstr "Пу_сти" -#: src/CollectionPage.vala:409 +#: src/CollectionPage.vala:415 msgid "Export Photo/Video" msgstr "Извезите фотографију/снимак" -#: src/CollectionPage.vala:409 +#: src/CollectionPage.vala:415 msgid "Export Photos/Videos" msgstr "Извезите фотографије/снимке" -#: src/CollectionPage.vala:411 src/Dialogs.vala:59 src/PhotoPage.vala:2995 +#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998 msgid "Export Photo" msgstr "Извезите фотографију" -#: src/CollectionPage.vala:411 src/Dialogs.vala:84 +#: src/CollectionPage.vala:417 src/Dialogs.vala:84 msgid "Export Photos" msgstr "Извезите фотографије" -#: src/CollectionPage.vala:498 src/CollectionPage.vala:514 +#: src/CollectionPage.vala:504 src/CollectionPage.vala:520 msgid "Rotating" msgstr "Окрећем" -#: src/CollectionPage.vala:498 src/CollectionPage.vala:514 +#: src/CollectionPage.vala:504 src/CollectionPage.vala:520 msgid "Undoing Rotate" msgstr "Поништавам окретање" -#: src/CollectionPage.vala:523 +#: src/CollectionPage.vala:529 msgid "Flipping Horizontally" msgstr "Изврћем водоравно" -#: src/CollectionPage.vala:524 +#: src/CollectionPage.vala:530 msgid "Undoing Flip Horizontally" msgstr "Поништавам водоравно извртање" -#: src/CollectionPage.vala:533 +#: src/CollectionPage.vala:539 msgid "Flipping Vertically" msgstr "Изврћем усправно" -#: src/CollectionPage.vala:534 +#: src/CollectionPage.vala:540 msgid "Undoing Flip Vertically" msgstr "Поништавам усправно извртање" @@ -3181,8 +3182,6 @@ msgstr "Не могу да припремим смењивање позадин #: src/Dialogs.vala:16 #, c-format -#| msgid "This will remove the tag \"%s\" from one photo. Continue?" -#| msgid_plural "This will remove the tag \"%s\" from %d photos. Continue?" msgid "This will remove the tag “%s” from one photo. Continue?" msgid_plural "This will remove the tag “%s” from %d photos. Continue?" msgstr[0] "Ово ће уклонити ознаку „%s“ из %d фотографије. Да наставим?" @@ -3191,8 +3190,8 @@ msgstr[2] "Ово ће уклонити ознаку „%s“ из %d фотог msgstr[3] " " #: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388 -#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:414 -#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/tags.ui:458 ui/trash.ui:63 +#: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415 +#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:460 ui/trash.ui:63 #: ui/trash.ui:216 ui/trash.ui:258 msgid "_Delete" msgstr "_Избриши" @@ -3291,7 +3290,6 @@ msgid "_Pixels:" msgstr "_Тачкица:" #: src/Dialogs.vala:234 -#| msgid "Export metadata" msgid "Export _metadata:" msgstr "Извези _метаподатке:" @@ -3764,7 +3762,7 @@ msgstr[3] "%d сат" msgid "1 day" msgstr "1 дан" -#: src/Dialogs.vala:1317 src/Resources.vala:231 +#: src/Dialogs.vala:1317 src/Resources.vala:232 msgid "Rename Event" msgstr "Преименујте догађај" @@ -3783,7 +3781,7 @@ msgid "Title:" msgstr "Наслов:" #. Dialog title -#: src/Dialogs.vala:1345 src/Resources.vala:307 +#: src/Dialogs.vala:1345 src/Resources.vala:308 msgid "Edit Event Comment" msgstr "Уредите напомену догађаја" @@ -3845,7 +3843,7 @@ msgstr[1] "Ово ће уклонити %d фотографије из фото msgstr[2] "Ово ће уклонити %d фотографија из фототеке. Да наставим?" msgstr[3] " " -#: src/Dialogs.vala:1444 src/Resources.vala:173 +#: src/Dialogs.vala:1444 src/Resources.vala:174 msgid "_Remove" msgstr "_Уклони" @@ -3883,7 +3881,6 @@ msgid "Set _all photos/videos to this time" msgstr "Постави _све фотографије/снимке на ово време" #: src/Dialogs.vala:1725 -#| msgid "_Modify original photo file" msgid "_Modify original photo file" msgid_plural "_Modify original photo files" msgstr[0] "_Измени изворну фотографију" @@ -3892,7 +3889,6 @@ msgstr[2] "_Измени изворне фотографије" msgstr[3] "_Измени изворну фотографију" #: src/Dialogs.vala:1729 -#| msgid "_Modify original file" msgid "_Modify original file" msgid_plural "_Modify original files" msgstr[0] "_Измени изворну датотеку" @@ -4093,11 +4089,11 @@ msgstr "Увези _на месту" msgid "Import to Library" msgstr "Увезите у фототеку" -#: src/Dialogs.vala:2709 src/PhotoPage.vala:2871 +#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874 msgid "Remove From Library" msgstr "Уклоните из фототеке" -#: src/Dialogs.vala:2710 src/PhotoPage.vala:2871 +#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874 msgid "Removing Photo From Library" msgstr "Уклањам фотографију из фототеке" @@ -4248,29 +4244,29 @@ msgstr "" msgid "Unable open photo %s. Sorry." msgstr "Не могу да отворим фотографију „%s“. Извините." -#: src/direct/DirectPhotoPage.vala:304 src/Resources.vala:175 ui/direct.ui:8 +#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8 msgid "_Save" msgstr "_Сачувај" -#: src/direct/DirectPhotoPage.vala:304 +#: src/direct/DirectPhotoPage.vala:316 msgid "_Save a Copy" msgstr "_Сачувај примерак" -#: src/direct/DirectPhotoPage.vala:307 +#: src/direct/DirectPhotoPage.vala:319 #, c-format msgid "Lose changes to %s?" msgstr "Да заборавим измене над „%s“?" -#: src/direct/DirectPhotoPage.vala:308 +#: src/direct/DirectPhotoPage.vala:320 msgid "Close _without Saving" msgstr "Затвори _без чувања" -#: src/direct/DirectPhotoPage.vala:341 +#: src/direct/DirectPhotoPage.vala:353 #, c-format msgid "Error while saving to %s: %s" msgstr "Грешка приликом чувања у „%s“: %s" -#: src/direct/DirectPhotoPage.vala:371 src/direct/DirectPhotoPage.vala:392 +#: src/direct/DirectPhotoPage.vala:383 src/direct/DirectPhotoPage.vala:404 msgid "Save As" msgstr "Сачувајте као" @@ -4319,23 +4315,23 @@ msgstr "СД видео (4 : 3)" msgid "HD Video (16 ∶ 9)" msgstr "ХД видео (16 : 9)" -#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:818 +#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792 msgid "Wallet (2 × 3 in.)" msgstr "Новчаник (2 × 3 инча)" -#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:821 +#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795 msgid "Notecard (3 × 5 in.)" msgstr "Забелешка (3 × 5 инча)" -#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:824 +#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798 msgid "4 × 6 in." msgstr "4 × 6 инча" -#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:827 +#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801 msgid "5 × 7 in." msgstr "5 × 7 инча" -#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:830 +#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804 msgid "8 × 10 in." msgstr "8 × 10 инча" @@ -4343,7 +4339,7 @@ msgstr "8 × 10 инча" msgid "Letter (8.5 × 11 in.)" msgstr "Писмо (8.5 × 11 ин.)" -#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:833 +#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807 msgid "11 × 14 in." msgstr "11 × 14 инча" @@ -4351,23 +4347,23 @@ msgstr "11 × 14 инча" msgid "Tabloid (11 × 17 in.)" msgstr "Таблоид (11 × 17 ин.)" -#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:836 +#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810 msgid "16 × 20 in." msgstr "16 × 20 инча" -#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:842 +#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816 msgid "Metric Wallet (9 × 13 cm)" msgstr "Метрички новчаник (9 × 13 cm)" -#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:845 +#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819 msgid "Postcard (10 × 15 cm)" msgstr "Честитка (10 × 15 cm)" -#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:848 +#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822 msgid "13 × 18 cm" msgstr "13 × 18 cm" -#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:851 +#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825 msgid "18 × 24 cm" msgstr "18 × 24 cm" @@ -4375,15 +4371,15 @@ msgstr "18 × 24 cm" msgid "A4 (210 × 297 mm)" msgstr "A4 (210 × 297 mm)" -#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:854 +#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828 msgid "20 × 30 cm" msgstr "20 × 30 cm" -#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:857 +#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831 msgid "24 × 40 cm" msgstr "24 × 40 cm" -#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:860 +#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834 msgid "30 × 40 cm" msgstr "30 × 40 cm" @@ -4455,7 +4451,6 @@ msgid "Tint" msgstr "Боја" #: src/editing_tools/EditingTools.vala:2746 -#| msgid "Contrast Expansion" msgid "Contrast" msgstr "Контраст" @@ -4483,7 +4478,7 @@ msgstr "Повећање контраста" msgid "Angle:" msgstr "Угао:" -#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202 +#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:203 #: ui/direct.ui:144 ui/photo.ui:233 msgid "_Straighten" msgstr "_Исправи" @@ -4739,32 +4734,32 @@ msgstr "" msgid "Loading Shotwell" msgstr "Учитавам Фото-бунар" -#: src/main.vala:294 +#: src/main.vala:293 msgid "Path to Shotwell’s private data" msgstr "Путања до личних података Фото-бунара" -#: src/main.vala:294 +#: src/main.vala:293 msgid "DIRECTORY" msgstr "ДИРЕКТОРИЈУМ" -#: src/main.vala:298 +#: src/main.vala:297 msgid "Do not monitor library directory at runtime for changes" msgstr "Не прати директоријум фототеке за изменама у време покретања" -#: src/main.vala:302 +#: src/main.vala:301 msgid "Don’t display startup progress meter" msgstr "Не приказује мерач напредовања покретања" -#: src/main.vala:306 +#: src/main.vala:305 msgid "Show the application’s version" msgstr "Приказује издање програма" #. init GTK (valac has already called g_threads_init()) -#: src/main.vala:338 +#: src/main.vala:342 msgid "[FILE]" msgstr "[ДАТОТЕКА]" -#: src/main.vala:342 +#: src/main.vala:346 #, c-format msgid "Run “%s --help” to see a full list of available command line options.\n" msgstr "" @@ -4789,34 +4784,34 @@ msgstr "" "Фото-бунар није успео да пусти изабрани снимак:\n" "%s" -#: src/Page.vala:1319 +#: src/Page.vala:1318 msgid "No photos/videos" msgstr "Нема фотографија/снимака" -#: src/Page.vala:1323 +#: src/Page.vala:1322 msgid "No photos/videos found which match the current filter" msgstr "Нисам пронашао фотографије/снимке који одговарају текућем филтеру" -#: src/Page.vala:2629 +#: src/Page.vala:2628 msgid "Photos cannot be exported to this directory." msgstr "Не могу да извезем фотографије у овај директоријум." #. previous button -#: src/PhotoPage.vala:535 +#: src/PhotoPage.vala:538 msgid "Previous photo" msgstr "Претходна фотографија" #. next button -#: src/PhotoPage.vala:541 +#: src/PhotoPage.vala:544 msgid "Next photo" msgstr "Наредна фотографија" -#: src/PhotoPage.vala:1847 +#: src/PhotoPage.vala:1850 #, c-format msgid "Photo source file missing: %s" msgstr "Недостаје изворна датотека фотографије: %s" -#: src/PhotoPage.vala:3015 +#: src/PhotoPage.vala:3018 #, c-format msgid "Unable to export %s: %s" msgstr "Не могу да извезем „%s“: %s" @@ -4893,23 +4888,15 @@ msgstr "16 фотографија по страници" msgid "32 images per page" msgstr "32 фотографије по страници" -#: src/Printing.vala:348 -msgid "in." -msgstr "инч" - -#: src/Printing.vala:349 -msgid "cm" -msgstr "cm" - -#: src/Printing.vala:876 +#: src/Printing.vala:851 msgid "Image Settings" msgstr "Подешавања фотографије" -#: src/Printing.vala:889 +#: src/Printing.vala:864 msgid "Printing…" msgstr "Штампам…" -#: src/Printing.vala:909 src/Printing.vala:1112 +#: src/Printing.vala:884 src/Printing.vala:1087 #, c-format msgid "" "Unable to print photo:\n" @@ -5066,7 +5053,6 @@ msgstr "" #. Here, we check whether more than one item is being uploaded, and if so, display #. an alternate message. #: src/publishing/PublishingUI.vala:104 -#| msgid "The selected video was successfully published." msgid "The selected video was successfully published." msgid_plural "The selected videos were successfully published." msgstr[0] "Изабрани снимак је успешно објављен." @@ -5075,7 +5061,6 @@ msgstr[2] "Изабрани снимци су успешно објављени. msgstr[3] "Изабрани снимак је успешно објављен." #: src/publishing/PublishingUI.vala:109 -#| msgid "The selected photo was successfully published." msgid "The selected photo was successfully published." msgid_plural "The selected photos were successfully published." msgstr[0] "Изабрана фотографија је успешно објављена." @@ -5142,581 +5127,580 @@ msgstr "" msgid "Publishing" msgstr "Објављивање" -#: src/Resources.vala:140 src/Resources.vala:145 ui/collection.ui:149 +#: src/Resources.vala:141 src/Resources.vala:146 ui/collection.ui:151 msgid "Rotate" msgstr "Окрените" -#: src/Resources.vala:141 +#: src/Resources.vala:142 msgid "Rotate Right" msgstr "Окрените на десно" -#: src/Resources.vala:142 ui/collection.ui:146 +#: src/Resources.vala:143 ui/collection.ui:148 msgid "Rotate the photos right (press Ctrl to rotate left)" msgstr "Окрените фотографије на десно (притисните Ктрл да окренете на лево)" -#: src/Resources.vala:146 +#: src/Resources.vala:147 msgid "Rotate Left" msgstr "Окрените на лево" -#: src/Resources.vala:147 +#: src/Resources.vala:148 msgid "Rotate the photos left" msgstr "Окрените фотографије на лево" -#: src/Resources.vala:150 +#: src/Resources.vala:151 msgid "Flip Horizontally" msgstr "Изврните водоравно" -#: src/Resources.vala:153 +#: src/Resources.vala:154 msgid "Flip Vertically" msgstr "Изврните усправно" -#: src/Resources.vala:155 ui/direct.ui:191 ui/events_directory.ui:168 -#: ui/event.ui:436 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:419 -#: ui/offline.ui:198 ui/photo.ui:402 ui/tags.ui:438 ui/trash.ui:207 +#: src/Resources.vala:156 ui/direct.ui:191 ui/events_directory.ui:168 +#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:421 +#: ui/offline.ui:198 ui/photo.ui:404 ui/tags.ui:440 ui/trash.ui:207 msgid "_About" msgstr "_О програму" -#: src/Resources.vala:156 +#: src/Resources.vala:157 msgid "_Apply" msgstr "_Примени" -#: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32 +#: src/Resources.vala:160 ui/direct.ui:44 ui/events_directory.ui:32 #: ui/event.ui:47 ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32 -#: ui/photo.ui:55 ui/tags.ui:47 ui/top.ui:10 ui/trash.ui:37 +#: ui/photo.ui:55 ui/tags.ui:47 ui/trash.ui:37 msgid "_Edit" msgstr "_Уређивање" -#: src/Resources.vala:160 +#: src/Resources.vala:161 msgid "_Forward" msgstr "Просл_еди" -#: src/Resources.vala:161 ui/direct.ui:62 ui/events_directory.ui:125 +#: src/Resources.vala:162 ui/direct.ui:62 ui/events_directory.ui:125 #: ui/photo.ui:173 msgid "Fulls_creen" msgstr "Преко _целог екрана" -#: src/Resources.vala:162 ui/direct.ui:173 ui/direct.ui:176 -#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:418 -#: ui/event.ui:421 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183 -#: ui/import.ui:186 ui/media.ui:401 ui/media.ui:404 ui/offline.ui:180 -#: ui/offline.ui:183 ui/photo.ui:384 ui/photo.ui:387 ui/tags.ui:420 -#: ui/tags.ui:423 ui/top.ui:40 ui/trash.ui:189 ui/trash.ui:192 +#: src/Resources.vala:163 ui/direct.ui:173 ui/direct.ui:176 +#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420 +#: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183 +#: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180 +#: ui/offline.ui:183 ui/photo.ui:386 ui/photo.ui:389 ui/tags.ui:422 +#: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192 msgid "_Help" msgstr "По_моћ" -#: src/Resources.vala:163 +#: src/Resources.vala:164 msgid "Leave _Fullscreen" msgstr "Напусти приказ преко _целог екрана" -#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448 +#: src/Resources.vala:165 src/Resources.vala:364 ui/tags.ui:450 msgid "_New" msgstr "_Ново" -#: src/Resources.vala:165 +#: src/Resources.vala:166 msgid "_Next" msgstr "_Следеће" -#: src/Resources.vala:168 src/Resources.vala:317 ui/events_directory.ui:65 +#: src/Resources.vala:169 src/Resources.vala:318 ui/events_directory.ui:65 #: ui/event.ui:93 ui/import.ui:68 ui/media.ui:93 ui/offline.ui:72 #: ui/photo.ui:89 ui/tags.ui:93 ui/trash.ui:81 msgid "_Preferences" msgstr "_Поставке" -#: src/Resources.vala:169 +#: src/Resources.vala:170 msgid "_Previous" msgstr "_Претходно" -#: src/Resources.vala:171 ui/direct.ui:37 ui/events_directory.ui:25 +#: src/Resources.vala:172 ui/direct.ui:37 ui/events_directory.ui:25 #: ui/event.ui:40 ui/import_queue.ui:31 ui/import.ui:33 ui/media.ui:40 #: ui/offline.ui:25 ui/photo.ui:48 ui/tags.ui:40 ui/trash.ui:30 msgid "_Quit" msgstr "_Изађи" -#: src/Resources.vala:172 +#: src/Resources.vala:173 msgid "_Refresh" msgstr "_Освежи" -#: src/Resources.vala:174 +#: src/Resources.vala:175 msgid "_Revert" msgstr "_Врати" -#: src/Resources.vala:176 +#: src/Resources.vala:177 msgid "Save _As" msgstr "Сачувај _као" -#: src/Resources.vala:177 +#: src/Resources.vala:178 msgid "Sort _Ascending" msgstr "Поређај _растућим редом" -#: src/Resources.vala:178 +#: src/Resources.vala:179 msgid "Sort _Descending" msgstr "Поређај _опадајућим редом" -#: src/Resources.vala:179 +#: src/Resources.vala:180 msgid "_Stop" msgstr "_Заустави" -#: src/Resources.vala:180 +#: src/Resources.vala:181 msgid "_Undelete" msgstr "_Поништи брисање" -#: src/Resources.vala:181 +#: src/Resources.vala:182 msgid "_Normal Size" msgstr "_Уобичајена величина" -#: src/Resources.vala:182 +#: src/Resources.vala:183 msgid "Best _Fit" msgstr "_Најбоље уклапање" -#: src/Resources.vala:183 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260 +#: src/Resources.vala:184 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260 #: ui/photo.ui:144 ui/tags.ui:260 msgid "Zoom _In" msgstr "У_већај" -#: src/Resources.vala:184 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265 +#: src/Resources.vala:185 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265 #: ui/photo.ui:149 ui/tags.ui:265 msgid "Zoom _Out" msgstr "У_мањи" -#: src/Resources.vala:187 ui/collection.ui:165 +#: src/Resources.vala:188 ui/collection.ui:167 msgid "Enhance" msgstr "Побољшајте" -#: src/Resources.vala:188 ui/collection.ui:162 +#: src/Resources.vala:189 ui/collection.ui:164 msgid "Automatically improve the photo’s appearance" msgstr "Самостално унапредите изглед фотографије" -#: src/Resources.vala:191 +#: src/Resources.vala:192 msgid "Copy Color Adjustments" msgstr "Умножите дотеривања боје" -#: src/Resources.vala:192 +#: src/Resources.vala:193 msgid "Copy the color adjustments applied to the photo" msgstr "Умножите дотеривања боје примењена на фотографији" -#: src/Resources.vala:195 +#: src/Resources.vala:196 msgid "Paste Color Adjustments" msgstr "Убаците дотеривања боје" -#: src/Resources.vala:196 +#: src/Resources.vala:197 msgid "Apply copied color adjustments to the selected photos" msgstr "Примените умножена дотеривања боје на изабраним фотографијама" -#: src/Resources.vala:198 ui/direct.ui:139 ui/photo.ui:228 +#: src/Resources.vala:199 ui/direct.ui:139 ui/photo.ui:228 msgid "_Crop" msgstr "_Исеци" -#: src/Resources.vala:199 +#: src/Resources.vala:200 msgid "Crop" msgstr "Исеците" -#: src/Resources.vala:200 +#: src/Resources.vala:201 msgid "Crop the photo’s size" msgstr "Исеците величину фотографије" -#: src/Resources.vala:203 +#: src/Resources.vala:204 msgid "Straighten" msgstr "Исправите" -#: src/Resources.vala:204 +#: src/Resources.vala:205 msgid "Straighten the photo" msgstr "Исправите фотографију" -#: src/Resources.vala:206 ui/direct.ui:149 ui/photo.ui:238 +#: src/Resources.vala:207 ui/direct.ui:149 ui/photo.ui:238 msgid "_Red-eye" msgstr "_Црвене очи" -#: src/Resources.vala:207 +#: src/Resources.vala:208 msgid "Red-eye" msgstr "Уклоните црвене очи" -#: src/Resources.vala:208 +#: src/Resources.vala:209 msgid "Reduce or eliminate any red-eye effects in the photo" msgstr "Умањите или уклоните дејства црвених очију са фотографије" -#: src/Resources.vala:210 ui/direct.ui:154 ui/photo.ui:243 +#: src/Resources.vala:211 ui/direct.ui:154 ui/photo.ui:243 msgid "_Adjust" msgstr "_Дотерај" -#: src/Resources.vala:211 +#: src/Resources.vala:212 msgid "Adjust" msgstr "Дотерајте" -#: src/Resources.vala:212 +#: src/Resources.vala:213 msgid "Adjust the photo’s color and tone" msgstr "Дотерајте боје и тоналитет фотографије" -#: src/Resources.vala:215 +#: src/Resources.vala:216 msgid "Revert to Original" msgstr "Вратите на изворно" -#: src/Resources.vala:217 +#: src/Resources.vala:218 msgid "Revert External E_dits" msgstr "Врати спољне _измене" -#: src/Resources.vala:218 +#: src/Resources.vala:219 msgid "Revert to the master photo" msgstr "Вратите изворну фотографију" -#: src/Resources.vala:221 +#: src/Resources.vala:222 msgid "Set selected image to be the new desktop background" msgstr "Поставите изабрану фотографију за позадину ваше радне површи" -#: src/Resources.vala:222 +#: src/Resources.vala:223 msgid "Set as _Desktop Slideshow…" msgstr "Постави као смењиву позадину _радне површи…" -#: src/Resources.vala:224 ui/direct.ui:47 ui/events_directory.ui:35 +#: src/Resources.vala:225 ui/direct.ui:47 ui/events_directory.ui:35 #: ui/event.ui:50 ui/import.ui:43 ui/media.ui:50 ui/offline.ui:35 #: ui/photo.ui:58 ui/tags.ui:50 ui/trash.ui:40 msgid "_Undo" msgstr "_Опозови" -#: src/Resources.vala:225 +#: src/Resources.vala:226 msgid "Undo" msgstr "Опозовите" -#: src/Resources.vala:227 ui/direct.ui:52 ui/events_directory.ui:40 +#: src/Resources.vala:228 ui/direct.ui:52 ui/events_directory.ui:40 #: ui/event.ui:55 ui/import.ui:48 ui/media.ui:55 ui/offline.ui:40 #: ui/photo.ui:63 ui/tags.ui:55 ui/trash.ui:45 msgid "_Redo" msgstr "_Понови" -#: src/Resources.vala:228 +#: src/Resources.vala:229 msgid "Redo" msgstr "Поновите" -#: src/Resources.vala:230 ui/events_directory.ui:139 ui/events_directory.ui:181 -#: ui/event.ui:391 ui/event.ui:584 +#: src/Resources.vala:231 ui/events_directory.ui:139 ui/events_directory.ui:181 +#: ui/event.ui:393 ui/event.ui:588 msgid "Re_name Event…" msgstr "_Преименуј догађај…" -#: src/Resources.vala:233 ui/event.ui:371 ui/event.ui:576 +#: src/Resources.vala:234 ui/event.ui:373 ui/event.ui:580 msgid "Make _Key Photo for Event" msgstr "Направи _кључну фотографију догађаја" -#: src/Resources.vala:234 +#: src/Resources.vala:235 msgid "Make Key Photo for Event" msgstr "Направите кључну фотографију за овај догађај" -#: src/Resources.vala:236 ui/event.ui:380 ui/media.ui:374 ui/tags.ui:374 +#: src/Resources.vala:237 ui/event.ui:382 ui/media.ui:376 ui/tags.ui:376 msgid "_New Event" msgstr "_Нови догађај" -#: src/Resources.vala:237 +#: src/Resources.vala:238 msgid "New Event" msgstr "Нови догађај" -#: src/Resources.vala:239 +#: src/Resources.vala:240 msgid "Move Photos" msgstr "Премести фотографије" -#: src/Resources.vala:240 +#: src/Resources.vala:241 msgid "Move photos to an event" msgstr "Преместите фотографије у догађај" -#: src/Resources.vala:242 ui/events_directory.ui:135 ui/events_directory.ui:177 +#: src/Resources.vala:243 ui/events_directory.ui:135 ui/events_directory.ui:177 msgid "_Merge Events" msgstr "_Спој догађаје" -#: src/Resources.vala:243 +#: src/Resources.vala:244 msgid "Merge" msgstr "Спојите" -#: src/Resources.vala:244 +#: src/Resources.vala:245 msgid "Combine events into a single event" msgstr "Обједините догађаје у један" -#: src/Resources.vala:246 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:476 +#: src/Resources.vala:247 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:478 #: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286 msgid "_Set Rating" msgstr "_Оцени" -#: src/Resources.vala:247 +#: src/Resources.vala:248 msgid "Set Rating" msgstr "Оцените" -#: src/Resources.vala:248 +#: src/Resources.vala:249 msgid "Change the rating of your photo" msgstr "Измените оцену фотографије" -#: src/Resources.vala:250 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:509 +#: src/Resources.vala:251 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:511 #: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326 msgid "_Increase" msgstr "_Повећај" -#: src/Resources.vala:251 +#: src/Resources.vala:252 msgid "Increase Rating" msgstr "Повећајте оцену" -#: src/Resources.vala:253 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:513 +#: src/Resources.vala:254 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:515 #: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331 msgid "_Decrease" msgstr "_Смањи" -#: src/Resources.vala:254 +#: src/Resources.vala:255 msgid "Decrease Rating" msgstr "Смањите оцену" -#: src/Resources.vala:256 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:499 +#: src/Resources.vala:257 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:501 #: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314 msgid "_Unrated" msgstr "_Без оцене" -#: src/Resources.vala:257 +#: src/Resources.vala:258 msgid "Unrated" msgstr "Неоцењене" -#: src/Resources.vala:258 +#: src/Resources.vala:259 msgid "Rate Unrated" msgstr "Оцените неоцењене" -#: src/Resources.vala:259 +#: src/Resources.vala:260 msgid "Setting as unrated" msgstr "Означите да фотографија није оцењена" -#: src/Resources.vala:260 +#: src/Resources.vala:261 msgid "Remove any ratings" msgstr "Уклоните било какве оцене" -#: src/Resources.vala:262 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:503 +#: src/Resources.vala:263 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:505 #: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319 msgid "_Rejected" msgstr "_Одбачене" -#: src/Resources.vala:263 +#: src/Resources.vala:264 msgid "Rejected" msgstr "Одбачене" -#: src/Resources.vala:264 +#: src/Resources.vala:265 msgid "Rate Rejected" msgstr "Оцените одбачене" -#: src/Resources.vala:265 +#: src/Resources.vala:266 msgid "Setting as rejected" msgstr "Означавам да је фотографија одбачена" -#: src/Resources.vala:266 +#: src/Resources.vala:267 msgid "Set rating to rejected" msgstr "Означите да је фотографија одбачена" -#: src/Resources.vala:268 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196 +#: src/Resources.vala:269 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196 #: ui/offline.ui:153 ui/search_bar.ui:6 ui/tags.ui:196 ui/trash.ui:162 msgid "Rejected _Only" msgstr "Само _одбачене" -#: src/Resources.vala:269 +#: src/Resources.vala:270 msgid "Rejected Only" msgstr "Само одбачене" -#: src/Resources.vala:270 +#: src/Resources.vala:271 msgid "Show only rejected photos" msgstr "Прикажите само одбачене фотографије" -#: src/Resources.vala:272 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190 +#: src/Resources.vala:273 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190 #: ui/offline.ui:147 ui/search_bar.ui:12 ui/tags.ui:190 ui/trash.ui:156 msgid "All + _Rejected" msgstr "Све + _одбачене" -#: src/Resources.vala:273 +#: src/Resources.vala:274 msgctxt "Tooltip" msgid "Show all photos, including rejected" msgstr "Прикажите све фотографије, укључујући и одбачене" -#: src/Resources.vala:275 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184 +#: src/Resources.vala:276 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184 #: ui/offline.ui:141 ui/search_bar.ui:18 ui/tags.ui:184 ui/trash.ui:150 msgid "_All Photos" msgstr "_Све фотографије" #. Button tooltip -#: src/Resources.vala:277 +#: src/Resources.vala:278 msgid "Show all photos" msgstr "Прикажите све фотографије" -#: src/Resources.vala:279 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120 +#: src/Resources.vala:280 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120 #: ui/tags.ui:144 msgid "_Ratings" msgstr "_Оцене" -#: src/Resources.vala:280 +#: src/Resources.vala:281 msgid "Display each photo’s rating" msgstr "Прикажите оцене свих фотографија" -#: src/Resources.vala:282 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151 +#: src/Resources.vala:283 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151 #: ui/offline.ui:108 ui/tags.ui:151 ui/trash.ui:117 msgid "_Filter Photos" msgstr "_Издвој фотографије" -#: src/Resources.vala:283 +#: src/Resources.vala:284 msgid "Filter Photos" msgstr "Издвојте фотографије" -#: src/Resources.vala:284 +#: src/Resources.vala:285 msgid "Limit the number of photos displayed based on a filter" msgstr "Ограничите број приказаних фотографија на основу пропусника" -#: src/Resources.vala:287 +#: src/Resources.vala:288 msgid "Duplicate" msgstr "Удвостручи" -#: src/Resources.vala:288 +#: src/Resources.vala:289 msgid "Make a duplicate of the photo" msgstr "Направите умножак фотографије" -#: src/Resources.vala:290 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17 +#: src/Resources.vala:291 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17 #: ui/tags.ui:17 msgid "_Export…" msgstr "_Извези…" -#: src/Resources.vala:292 +#: src/Resources.vala:293 msgid "_Print…" msgstr "_Штампај…" -#: src/Resources.vala:294 +#: src/Resources.vala:295 msgid "Pu_blish…" msgstr "_Објави…" -#: src/Resources.vala:296 ui/collection.ui:187 +#: src/Resources.vala:297 ui/collection.ui:189 msgid "Publish to various websites" msgstr "Објавите изабране фотографије на разним сајтовима" -#: src/Resources.vala:298 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:535 +#: src/Resources.vala:299 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:537 #: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340 msgid "Edit _Title…" msgstr "Измени _наслов…" #. Button label -#: src/Resources.vala:300 +#: src/Resources.vala:301 msgctxt "Button Label" msgid "Edit Title" msgstr "Уреди наслов" -#: src/Resources.vala:302 ui/collection.ui:102 ui/events_directory.ui:144 -#: ui/events_directory.ui:186 ui/event.ui:344 ui/event.ui:396 ui/event.ui:539 -#: ui/media.ui:344 ui/photo_context.ui:109 ui/photo.ui:331 ui/tags.ui:344 +#: src/Resources.vala:303 ui/collection.ui:103 ui/events_directory.ui:144 +#: ui/events_directory.ui:186 ui/event.ui:345 ui/event.ui:398 ui/event.ui:542 +#: ui/media.ui:345 ui/photo_context.ui:110 ui/photo.ui:332 ui/tags.ui:345 msgid "Edit _Comment…" msgstr "Измени _напомену…" #. Button label -#: src/Resources.vala:304 +#: src/Resources.vala:305 msgid "Edit Comment" msgstr "Измените напомену" -#: src/Resources.vala:306 ui/event.ui:588 +#: src/Resources.vala:307 ui/event.ui:592 msgid "Edit Event _Comment…" msgstr "Измени _напомену догађаја…" -#: src/Resources.vala:309 ui/direct.ui:167 ui/photo.ui:335 +#: src/Resources.vala:310 ui/direct.ui:167 ui/photo.ui:337 msgid "_Adjust Date and Time…" msgstr "_Подеси датум и време…" -#: src/Resources.vala:310 +#: src/Resources.vala:311 msgid "Adjust Date and Time" msgstr "Подесите датум и време" -#: src/Resources.vala:312 ui/collection.ui:19 ui/event.ui:405 ui/event.ui:456 -#: ui/media.ui:388 ui/photo.ui:372 ui/tags.ui:388 +#: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458 +#: ui/media.ui:390 ui/photo.ui:374 ui/tags.ui:390 msgid "Add _Tags…" msgstr "Додај _ознаке…" -#: src/Resources.vala:313 ui/photo_context.ui:17 +#: src/Resources.vala:314 ui/photo_context.ui:17 msgid "_Add Tags…" msgstr "Додај _ознаке…" #. Dialog title -#: src/Resources.vala:315 +#: src/Resources.vala:316 msgctxt "Dialog Title" msgid "Add Tags" msgstr "Додајте ознаке" -#: src/Resources.vala:324 ui/photo_context.ui:133 +#: src/Resources.vala:325 ui/photo_context.ui:135 msgid "Send T_o…" msgstr "Пошаљи _у…" -#: src/Resources.vala:326 +#: src/Resources.vala:327 msgid "_Find…" msgstr "_Нађи…" -#: src/Resources.vala:327 ui/collection.ui:215 ui/offline.ui:239 +#: src/Resources.vala:328 ui/collection.ui:217 ui/offline.ui:239 #: ui/trash.ui:312 msgid "Find" msgstr "Пронађите" -#: src/Resources.vala:328 ui/collection.ui:212 ui/offline.ui:236 +#: src/Resources.vala:329 ui/collection.ui:214 ui/offline.ui:236 #: ui/trash.ui:309 msgid "Find an image by typing text that appears in its name or tags" msgstr "Пронађите фотографије на основу назива или ознаке" -#: src/Resources.vala:330 +#: src/Resources.vala:331 msgid "_Flag" msgstr "_Постави обележје" -#: src/Resources.vala:332 +#: src/Resources.vala:333 msgid "Un_flag" msgstr "_Уклони обележје" -#: src/Resources.vala:335 +#: src/Resources.vala:336 #, c-format msgid "Unable to launch editor: %s" msgstr "Не могу да покренем уређивача: %s" -#: src/Resources.vala:340 +#: src/Resources.vala:341 #, c-format msgid "Add Tag “%s”" msgstr "Додај ознаку „%s“" #. Used when adding two tags to photo(s) -#: src/Resources.vala:343 +#: src/Resources.vala:344 #, c-format msgid "Add Tags “%s” and “%s”" msgstr "Додај ознаку „%s“ и „%s“" #. Undo/Redo command name (in Edit menu) -#: src/Resources.vala:348 +#: src/Resources.vala:349 msgctxt "UndoRedo menu entry" msgid "Add Tags" msgstr "Додај ознаке" -#: src/Resources.vala:353 +#: src/Resources.vala:354 #, c-format msgid "_Delete Tag “%s”" msgstr "_Обриши ознаку „%s“" -#: src/Resources.vala:357 +#: src/Resources.vala:358 #, c-format msgid "Delete Tag “%s”" msgstr "Обришите ознаку „%s“" -#: src/Resources.vala:360 +#: src/Resources.vala:361 msgid "Delete Tag" msgstr "Обришите ознаку" -#: src/Resources.vala:366 +#: src/Resources.vala:367 #, c-format msgid "Re_name Tag “%s”…" msgstr "_Преименуј ознаку „%s“…" -#: src/Resources.vala:370 +#: src/Resources.vala:371 #, c-format msgid "Rename Tag “%s” to “%s”" msgstr "Преименујте ознаку „%s“ у „%s“" -#: src/Resources.vala:373 ui/tags.ui:454 +#: src/Resources.vala:374 ui/tags.ui:456 msgid "_Rename…" msgstr "_Преименуј…" -#: src/Resources.vala:375 ui/collection.ui:24 ui/event.ui:410 ui/event.ui:461 -#: ui/media.ui:393 ui/photo_context.ui:22 ui/photo.ui:377 ui/tags.ui:393 +#: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463 +#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:379 ui/tags.ui:395 msgid "Modif_y Tags…" msgstr "Измени _ознаке…" -#: src/Resources.vala:376 +#: src/Resources.vala:377 msgid "Modify Tags" msgstr "Измените ознаке" -#: src/Resources.vala:379 +#: src/Resources.vala:380 #, c-format -#| msgid "Tag Photo as \"%s\"" msgid "Tag Photo as “%s”" msgid_plural "Tag Photos as “%s”" msgstr[0] "Означи фотографију као „%s“" @@ -5724,9 +5708,8 @@ msgstr[1] "Означи фотографије као „%s“" msgstr[2] "Означи фотографије као „%s“" msgstr[3] "Означи фотографије као „%s“" -#: src/Resources.vala:385 +#: src/Resources.vala:386 #, c-format -#| msgid "Tag the selected photo as \"%s\"" msgid "Tag the selected photo as “%s”" msgid_plural "Tag the selected photos as “%s”" msgstr[0] "Означи изабрану фотографију као „%s“" @@ -5734,9 +5717,8 @@ msgstr[1] "Означи изабране фотографије као „%s“" msgstr[2] "Означи изабране фотографије као „%s“" msgstr[3] "Означи изабрану фотографију као „%s“" -#: src/Resources.vala:391 +#: src/Resources.vala:392 #, c-format -#| msgid "Remove Tag \"%s\" From _Photo" msgid "Remove Tag “%s” From _Photo" msgid_plural "Remove Tag “%s” From _Photos" msgstr[0] "Уклони ознаку „%s“ са _фотографије" @@ -5744,9 +5726,8 @@ msgstr[1] "Уклони ознаку „%s“ са _фотографија" msgstr[2] "Уклони ознаку „%s“ са _фотографија" msgstr[3] "Уклони ознаку „%s“ са _фотографије" -#: src/Resources.vala:397 +#: src/Resources.vala:398 #, c-format -#| msgid "Remove Tag \"%s\" From Photo" msgid "Remove Tag “%s” From Photo" msgid_plural "Remove Tag “%s” From Photos" msgstr[0] "Уклоните ознаку „%s“ са фотографије" @@ -5754,131 +5735,130 @@ msgstr[1] "Уклоните ознаку „%s“ са фотографија" msgstr[2] "Уклоните ознаку „%s“ са фотографија" msgstr[3] "Уклоните ознаку „%s“ са фотографије" -#: src/Resources.vala:403 +#: src/Resources.vala:404 #, c-format msgid "Unable to rename tag to “%s” because the tag already exists." msgstr "Не могу да преименујем ознаку „%s“ јер већ постоји та ознака." -#: src/Resources.vala:407 +#: src/Resources.vala:408 #, c-format msgid "Unable to rename search to “%s” because the search already exists." msgstr "Не могу да преименујем претрагу „%s“ јер већ постоји та претрага." #. Saved search button -#: src/Resources.vala:410 src/SearchFilter.vala:1124 +#: src/Resources.vala:411 src/SearchFilter.vala:1124 msgid "Saved Search" msgstr "Сачуване претраге" -#: src/Resources.vala:412 +#: src/Resources.vala:413 msgid "Delete Search" msgstr "Избриши претрагу" -#: src/Resources.vala:415 ui/savedsearch.ui:11 -#| msgid "_Edit" +#: src/Resources.vala:416 ui/savedsearch.ui:11 msgid "_Edit…" msgstr "_Уреди…" -#: src/Resources.vala:416 ui/savedsearch.ui:7 +#: src/Resources.vala:417 ui/savedsearch.ui:7 msgid "Re_name…" msgstr "_Преименуј…" -#: src/Resources.vala:419 +#: src/Resources.vala:420 #, c-format msgid "Rename Search “%s” to “%s”" msgstr "Преименуј претрагу „%s“ у „%s“" -#: src/Resources.vala:423 +#: src/Resources.vala:424 #, c-format msgid "Delete Search “%s”" msgstr "Избриши претрагу „%s“" -#: src/Resources.vala:560 +#: src/Resources.vala:561 #, c-format msgid "Rate %s" msgstr "Оцени „%s“" -#: src/Resources.vala:561 +#: src/Resources.vala:562 #, c-format msgid "Set rating to %s" msgstr "Поставите оцену на „%s“" -#: src/Resources.vala:562 +#: src/Resources.vala:563 #, c-format msgid "Setting rating to %s" msgstr "Постављам оцену на „%s“" -#: src/Resources.vala:564 +#: src/Resources.vala:565 #, c-format msgid "Display %s" msgstr "Прикажи „%s“" -#: src/Resources.vala:565 +#: src/Resources.vala:566 #, c-format msgid "Only show photos with a rating of %s" msgstr "Прикажите само фотографије са оценом „%s“" -#: src/Resources.vala:566 +#: src/Resources.vala:567 #, c-format msgid "%s or Better" msgstr "%s или боље" -#: src/Resources.vala:567 +#: src/Resources.vala:568 #, c-format msgid "Display %s or Better" msgstr "Прикажи %s или боље" -#: src/Resources.vala:568 +#: src/Resources.vala:569 #, c-format msgid "Only show photos with a rating of %s or better" msgstr "Прикажите само фотографије са оценом %s или бољом" -#: src/Resources.vala:659 ui/trash.ui:255 +#: src/Resources.vala:660 ui/trash.ui:255 msgid "Remove the selected photos from the trash" msgstr "Уклоните изабране фотографије из корпе" -#: src/Resources.vala:660 ui/offline.ui:221 +#: src/Resources.vala:661 ui/offline.ui:221 msgid "Remove the selected photos from the library" msgstr "Уклоните изабране фотографије из фототеке" -#: src/Resources.vala:662 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273 +#: src/Resources.vala:663 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273 msgid "_Restore" msgstr "_Поврати" -#: src/Resources.vala:663 ui/trash.ui:270 +#: src/Resources.vala:664 ui/trash.ui:270 msgid "Move the selected photos back into the library" msgstr "Преместите изабране фотографије назад у фототеку" -#: src/Resources.vala:665 ui/collection.ui:121 ui/direct_context.ui:20 -#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:558 ui/media.ui:27 -#: ui/photo_context.ui:128 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19 +#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:20 +#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27 +#: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19 #: ui/trash.ui:227 msgid "Show in File Mana_ger" msgstr "Прикажи у _управнику датотека" -#: src/Resources.vala:666 +#: src/Resources.vala:667 msgid "Open the selected photo’s directory in the file manager" msgstr "Отворите директоријум изабраних фотографија у управнику датотека" -#: src/Resources.vala:669 +#: src/Resources.vala:670 #, c-format msgid "Unable to open in file manager: %s" msgstr "Не могу да отворим управника датотека: %s" -#: src/Resources.vala:672 ui/offline.ui:224 +#: src/Resources.vala:673 ui/offline.ui:224 msgid "R_emove From Library" msgstr "Уклони из _фототеке" -#: src/Resources.vala:674 ui/collection.ui:132 ui/event.ui:79 ui/event.ui:569 -#: ui/media.ui:79 ui/photo_context.ui:139 ui/photo.ui:82 ui/tags.ui:79 +#: src/Resources.vala:675 ui/collection.ui:134 ui/event.ui:79 ui/event.ui:573 +#: ui/media.ui:79 ui/photo_context.ui:141 ui/photo.ui:82 ui/tags.ui:79 msgid "_Move to Trash" msgstr "_Премести у корпу" -#: src/Resources.vala:676 ui/events_directory.ui:58 ui/event.ui:86 +#: src/Resources.vala:677 ui/events_directory.ui:58 ui/event.ui:86 #: ui/import.ui:61 ui/media.ui:86 ui/offline.ui:65 ui/tags.ui:86 ui/trash.ui:74 msgid "Select _All" msgstr "Изабери _све" -#: src/Resources.vala:677 +#: src/Resources.vala:678 msgid "Select all items" msgstr "Изаберите све ставке" @@ -6118,12 +6098,10 @@ msgid "Date" msgstr "Датум" #: src/SearchFilter.vala:815 -#| msgid "Rating" msgid "★+ Rating" msgstr "★+ оцена" #: src/SearchFilter.vala:818 -#| msgid "Rating" msgid "★★+ Rating" msgstr "★★+ оцена" @@ -6141,7 +6119,6 @@ msgstr "★★★★★+ оцена" #: src/SearchFilter.vala:1064 #, c-format -#| msgid "Error loading UI file %s: %s" msgid "Error loading search bar UI: %s" msgstr "Грешка учитавања корисничког сучеља траке претраге: %s" @@ -6247,28 +6224,28 @@ msgstr "безимено" msgid "Export Videos" msgstr "Извезите снимке" -#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:470 ui/media.ui:281 +#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:472 ui/media.ui:281 #: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281 msgid "Toggle _Flag" msgstr "Окини _заставицу" -#: ui/collection.ui:82 ui/event.ui:351 ui/event.ui:519 ui/media.ui:351 -#: ui/photo_context.ui:88 ui/photo.ui:341 ui/tags.ui:351 +#: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353 +#: ui/photo_context.ui:88 ui/photo.ui:343 ui/tags.ui:353 msgid "_Developer" msgstr "_Развијач" -#: ui/collection.ui:106 ui/event.ui:543 ui/photo_context.ui:113 ui/photo.ui:358 +#: ui/collection.ui:108 ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360 msgid "Open with E_xternal Editor" msgstr "_Отвори спољним уређивачем" -#: ui/collection.ui:117 ui/event.ui:385 ui/event.ui:554 ui/media.ui:379 -#: ui/photo_context.ui:124 ui/tags.ui:379 +#: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381 +#: ui/photo_context.ui:126 ui/tags.ui:381 msgid "View Eve_nt for Photo" msgstr "Прегледај _догађај за фотографију" #: ui/direct.ui:5 ui/events_directory.ui:5 ui/event.ui:5 ui/import_queue.ui:5 #: ui/import.ui:5 ui/media.ui:5 ui/offline.ui:5 ui/photo.ui:5 ui/tags.ui:5 -#: ui/top.ui:5 ui/trash.ui:5 +#: ui/trash.ui:5 msgid "_File" msgstr "_Датотека" @@ -6278,7 +6255,7 @@ msgstr "Сачувај _као…" #: ui/direct.ui:59 ui/events_directory.ui:71 ui/event.ui:99 #: ui/import_queue.ui:38 ui/import.ui:74 ui/media.ui:99 ui/offline.ui:78 -#: ui/photo.ui:95 ui/tags.ui:99 ui/top.ui:15 ui/trash.ui:87 +#: ui/photo.ui:95 ui/tags.ui:99 ui/trash.ui:87 msgid "_View" msgstr "_Преглед" @@ -6294,7 +6271,7 @@ msgstr "Увећај на _100%" msgid "Zoom _200%" msgstr "Увећај на _200%" -#: ui/direct.ui:98 ui/photo.ui:187 ui/top.ui:20 +#: ui/direct.ui:98 ui/photo.ui:187 msgid "_Photo" msgstr "_Фотографија" @@ -6310,15 +6287,15 @@ msgstr "_Следећа фотографија" msgid "T_ools" msgstr "_Алати" -#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:426 -#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:409 ui/offline.ui:188 -#: ui/photo.ui:392 ui/tags.ui:428 ui/trash.ui:197 +#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:428 +#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188 +#: ui/photo.ui:394 ui/tags.ui:430 ui/trash.ui:197 msgid "_Frequently Asked Questions" msgstr "_Често постаљана питања" -#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:430 -#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:413 ui/offline.ui:192 -#: ui/photo.ui:396 ui/tags.ui:432 ui/trash.ui:201 +#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:432 +#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192 +#: ui/photo.ui:398 ui/tags.ui:434 ui/trash.ui:201 msgid "_Report a Problem…" msgstr "_Пријави проблем…" @@ -6398,8 +6375,7 @@ msgstr "_Растуће" msgid "D_escending" msgstr "_Опадајуће" -#: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371 -#: ui/top.ui:30 +#: ui/events_directory.ui:132 ui/event.ui:379 ui/media.ui:373 ui/tags.ui:373 msgid "Even_ts" msgstr "_Догађаји" @@ -6412,8 +6388,8 @@ msgstr "Уклони из _фототеке" msgid "_Titles" msgstr "_Наслови" -#: ui/event.ui:139 ui/event.ui:402 ui/media.ui:139 ui/media.ui:385 -#: ui/photo.ui:369 ui/tags.ui:139 ui/tags.ui:385 ui/top.ui:35 +#: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387 +#: ui/photo.ui:371 ui/tags.ui:139 ui/tags.ui:387 msgid "Ta_gs" msgstr "_Ознаке" @@ -6442,7 +6418,7 @@ msgstr "Према _оцени" msgid "_Descending" msgstr "_Опадајуће" -#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275 ui/top.ui:25 +#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275 msgid "_Photos" msgstr "_Фотографије" @@ -6450,6 +6426,56 @@ msgstr "_Фотографије" msgid "_Stop Import" msgstr "_Заустави увоз" +#: ui/printing_widget.ui:19 +msgid "<b>Printed Image Size</b>" +msgstr "<b>Величина одштампане фотографије</b>" + +#: ui/printing_widget.ui:36 +msgid "Use a _standard size:" +msgstr "Користи _уобичајену величину:" + +#: ui/printing_widget.ui:80 +msgid "Use a c_ustom size:" +msgstr "Користи _произвољну величину:" + +#. Abbrevation for "inch" +#: ui/printing_widget.ui:146 +msgid "in." +msgstr "инч" + +#. Abbrevation for "centimeters" +#: ui/printing_widget.ui:147 +msgid "cm" +msgstr "cm" + +#: ui/printing_widget.ui:173 +msgid "_Match photo aspect ratio" +msgstr "_Одговара сразмери фотографије" + +#: ui/printing_widget.ui:197 +msgid "_Autosize:" +msgstr "_Самостална величина:" + +#: ui/printing_widget.ui:237 +msgid "<b>Titles</b>" +msgstr "<b>Наслови</b>" + +#: ui/printing_widget.ui:254 +msgid "Print image _title" +msgstr "Штампај _називе фотографија" + +#: ui/printing_widget.ui:297 +msgid "<b>Pixel Resolution</b>" +msgstr "<b>Резолуција у тачкицама</b>" + +#: ui/printing_widget.ui:317 +msgid "_Output photo at:" +msgstr "_Штампај фотографије у:" + +#: ui/printing_widget.ui:351 +msgid "pixels per inch" +msgstr "тачкица по инчу" + #: ui/set_background_dialog.ui:9 msgid "Set as Desktop Background" msgstr "Постави за позадину" @@ -6559,79 +6585,39 @@ msgstr "Спољни уређивачи" msgid "Plugins" msgstr "Прикључци" -#: ui/shotwell.ui:583 -msgid "<b>Printed Image Size</b>" -msgstr "<b>Величина одштампане фотографије</b>" - -#: ui/shotwell.ui:600 -msgid "Use a _standard size:" -msgstr "Користи _уобичајену величину:" - -#: ui/shotwell.ui:643 -msgid "Use a c_ustom size:" -msgstr "Користи _произвољну величину:" - -#: ui/shotwell.ui:731 -msgid "_Match photo aspect ratio" -msgstr "_Одговара сразмери фотографије" - -#: ui/shotwell.ui:755 -msgid "_Autosize:" -msgstr "_Самостална величина:" - -#: ui/shotwell.ui:795 -msgid "<b>Titles</b>" -msgstr "<b>Наслови</b>" - -#: ui/shotwell.ui:812 -msgid "Print image _title" -msgstr "Штампај _називе фотографија" - -#: ui/shotwell.ui:855 -msgid "<b>Pixel Resolution</b>" -msgstr "<b>Резолуција у тачкицама</b>" - -#: ui/shotwell.ui:875 -msgid "_Output photo at:" -msgstr "_Штампај фотографије у:" - -#: ui/shotwell.ui:909 -msgid "pixels per inch" -msgstr "тачкица по инчу" - -#: ui/shotwell.ui:949 +#: ui/shotwell.ui:590 msgid "_Name of search:" msgstr "_Назив претраге:" -#: ui/shotwell.ui:1003 +#: ui/shotwell.ui:644 msgid "_Match" msgstr "_Поклапа" -#: ui/shotwell.ui:1030 +#: ui/shotwell.ui:671 msgid "of the following:" msgstr "од следећег:" -#: ui/shotwell.ui:1111 +#: ui/shotwell.ui:752 msgid "label" msgstr "натпис" -#: ui/shotwell.ui:1262 +#: ui/shotwell.ui:903 msgid "_Delay:" msgstr "_Застој:" -#: ui/shotwell.ui:1276 +#: ui/shotwell.ui:917 msgid "_Transition effect:" msgstr "_Дејство прелаза:" -#: ui/shotwell.ui:1290 +#: ui/shotwell.ui:931 msgid "Transition d_elay:" msgstr "_Застој прелаза:" -#: ui/shotwell.ui:1300 +#: ui/shotwell.ui:941 msgid "Show t_itle" msgstr "Прикажи _наслов" -#: ui/shotwell.ui:1375 ui/shotwell.ui:1386 +#: ui/shotwell.ui:1016 ui/shotwell.ui:1027 msgid "seconds" msgstr "секунде" diff --git a/po/sr@latin.gmo b/po/sr@latin.gmo Binary files differindex a927546..6cd7ca6 100644 --- a/po/sr@latin.gmo +++ b/po/sr@latin.gmo diff --git a/po/sr@latin.po b/po/sr@latin.po index 0e5fb4e..463cf51 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: shotwell-0.15\n" "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=shotwe" "ll&keywords=I18N+L10N&component=Internationalization\n" -"POT-Creation-Date: 2017-03-04 15:02+0000\n" -"PO-Revision-Date: 2017-03-05 20:45+0200\n" +"POT-Creation-Date: 2017-04-02 16:28+0000\n" +"PO-Revision-Date: 2017-05-05 06:58+0200\n" "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n" "Language-Team: srpski <gnome-sr@googlegroups.org>\n" "Language: sr\n" @@ -23,9 +23,9 @@ msgstr "" #: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115 -#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:354 -#: ui/event.ui:522 ui/media.ui:354 ui/photo_context.ui:91 ui/photo.ui:344 -#: ui/tags.ui:354 +#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:356 +#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346 +#: ui/tags.ui:356 msgid "Shotwell" msgstr "Foto-bunar" @@ -63,7 +63,6 @@ msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats." msgstr "Foto-bunar podržava JPEG, PNG, TIFF i razne sirove zapise datoteka." #: misc/shotwell.appdata.xml.in:52 -#| msgid "Shotwell Viewer" msgid "The Shotwell developers" msgstr "Programeri Foto-bunara" @@ -729,7 +728,6 @@ msgid "Setting in export dialog: how to trim images" msgstr "Podešavanje u prozorčetu izvoza: kako da skrati slike" #: misc/org.yorba.shotwell.gschema.xml:358 -#| msgid "Export metadata" msgid "export metadata" msgstr "izvoz metapodataka" @@ -1302,7 +1300,6 @@ msgstr "" "suprotnom poništeno" #: misc/org.yorba.shotwell.gschema.xml:774 -#: misc/org.yorba.shotwell.gschema.xml:798 msgid "enable slideshow slide transition" msgstr "uključuje klizanje prelaza pokretnog prikaza" @@ -1325,7 +1322,6 @@ msgstr "" "suprotnom poništeno" #: misc/org.yorba.shotwell.gschema.xml:786 -#: misc/org.yorba.shotwell.gschema.xml:792 msgid "enable slideshow circle transition" msgstr "uključuje krug prelaza pokretnog prikaza" @@ -1336,13 +1332,23 @@ msgstr "" "Izabrano ako je uključen priključak kruga prelaza pokretnog prikaza, u " "suprotnom poništeno" +#: misc/org.yorba.shotwell.gschema.xml:792 +#| msgid "enable slideshow circle transition" +msgid "enable slideshow circles transition" +msgstr "uključuje kružne prelaze pokretnog prikaza" + #: misc/org.yorba.shotwell.gschema.xml:793 msgid "" "True if the Circles slideshow transition plugin is enabled, false otherwise" msgstr "" -"Izabrano ako je uključen priključak krugova prelaza pokretnog prikaza, u " +"Izabrano ako je uključen priključak kružnih prelaza pokretnog prikaza, u " "suprotnom poništeno" +#: misc/org.yorba.shotwell.gschema.xml:798 +#| msgid "enable slideshow slide transition" +msgid "enable slideshow blinds transition" +msgstr "uključuje zastore prelaza pokretnog prikaza" + #: misc/org.yorba.shotwell.gschema.xml:799 msgid "" "True if the Blinds slideshow transition plugin is enabled, false otherwise" @@ -1503,7 +1509,7 @@ msgstr "" msgid "Visit the Shotwell home page" msgstr "Posetite veb stranicu Foto-bunara" -#: plugins/common/Resources.vala:31 src/AppWindow.vala:603 +#: plugins/common/Resources.vala:31 src/AppWindow.vala:605 msgid "translator-credits" msgstr "" "Nikola Radovanović <nrad@eunet.rs>\n" @@ -1684,7 +1690,7 @@ msgid "Go _Back" msgstr "_Nazad" #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125 -#: ui/shotwell.ui:1464 +#: ui/shotwell.ui:1105 msgid "_Log in" msgstr "_Prijavi me" @@ -1750,7 +1756,7 @@ msgstr "_Odjavi me" #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:141 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:156 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115 -#: src/CollectionPage.vala:76 src/PhotoPage.vala:2466 +#: src/CollectionPage.vala:82 src/PhotoPage.vala:2469 msgid "_Publish" msgstr "_Objavi" @@ -1868,7 +1874,6 @@ msgstr "_Zapamti" #: plugins/shotwell-publishing-extras/RajcePublishing.vala:895 #: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154 -#| msgid "Logging in..." msgid "Log in" msgstr "Prijavi me" @@ -2128,12 +2133,6 @@ msgstr "" #: plugins/shotwell-publishing/FlickrPublishing.vala:802 #, c-format -#| msgid "" -#| "Your free Flickr account limits how much data you can upload per month.\n" -#| "This month you have %d megabyte remaining in your upload quota." -#| msgid_plural "" -#| "Your free Flickr account limits how much data you can upload per month.\n" -#| "This month you have %d megabytes remaining in your upload quota." msgid "" "Your free Flickr account limits how much data you can upload per month.\n" "This month you have %s remaining in your upload quota." @@ -2189,7 +2188,6 @@ msgstr "_Veličina fotografije:" #. or the new "Default album" album for Google Photos #: plugins/shotwell-publishing/PicasaPublishing.vala:96 #: plugins/shotwell-publishing/PicasaPublishing.vala:630 -#| msgid "last album" msgid "Default album" msgstr "Osnovni album" @@ -2216,17 +2214,14 @@ msgid "Small (640 × 480 pixels)" msgstr "Mala (640 × 480 piksela)" #: plugins/shotwell-publishing/PicasaPublishing.vala:611 -#| msgid "Medium (1024 x 768 pixels)" msgid "Medium (1024 × 768 pixels)" msgstr "Srednja (1024 × 768 piksela)" #: plugins/shotwell-publishing/PicasaPublishing.vala:612 -#| msgid "Recommended (1600 x 1200 pixels)" msgid "Recommended (1600 × 1200 pixels)" msgstr "Preporučeno (1600 × 1200 piksela)" #: plugins/shotwell-publishing/PicasaPublishing.vala:613 -#| msgid "Google+ (2048 x 1536 pixels)" msgid "Google+ (2048 × 1536 pixels)" msgstr "Gugl+ (2048 × 1536 piksela)" @@ -2284,7 +2279,7 @@ msgid "Logout" msgstr "Odjavi me" #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268 -#: src/Resources.vala:295 ui/collection.ui:190 +#: src/Resources.vala:296 ui/collection.ui:192 msgid "Publish" msgstr "Objavi" @@ -2315,7 +2310,7 @@ msgid "Certificate of %s" msgstr "Uverenje „%sd" #: plugins/shotwell-publishing/PiwigoPublishing.vala:1051 -#: src/Resources.vala:166 +#: src/Resources.vala:167 msgid "_OK" msgstr "U _redu" @@ -2367,7 +2362,7 @@ msgstr "Prikaži uverenje…" msgid "I understand, please _proceed." msgstr "Razumem, _nastavi" -#: plugins/shotwell-publishing/shotwell-publishing.vala:50 +#: plugins/shotwell-publishing/shotwell-publishing.vala:55 msgid "Core Publishing Services" msgstr "Ključne usluge objavljivanja" @@ -2495,16 +2490,16 @@ msgstr "Pribodite otvorenu traku lata" msgid "Leave fullscreen" msgstr "Napustite prikaz preko celog ekrana" -#: src/AppWindow.vala:532 src/AppWindow.vala:553 src/AppWindow.vala:570 +#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569 #: src/data_imports/DataImportsUI.vala:301 #: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20 #: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443 #: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525 -#: src/Resources.vala:157 +#: src/Resources.vala:158 msgid "_Cancel" msgstr "_Otkaži" -#: src/AppWindow.vala:580 +#: src/AppWindow.vala:579 #, c-format msgid "" "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot " @@ -2517,21 +2512,27 @@ msgstr "" "\n" "%s" -#: src/AppWindow.vala:600 +#. translators: %s will be replaced by application version +#: src/AppWindow.vala:596 +#, c-format +msgid "%s – “Aachen”" +msgstr "%s – „Ahen“" + +#: src/AppWindow.vala:601 msgid "Visit the Shotwell web site" msgstr "Posetite veb stranicu Foto-bunara" -#: src/AppWindow.vala:612 +#: src/AppWindow.vala:614 #, c-format msgid "Unable to display help: %s" msgstr "Ne mogu da prikažem pomoć: %s" -#: src/AppWindow.vala:620 +#: src/AppWindow.vala:622 #, c-format msgid "Unable to navigate to bug database: %s" msgstr "Ne mogu da pristupim bazi podataka grešaka: %s" -#: src/AppWindow.vala:628 +#: src/AppWindow.vala:630 #, c-format msgid "Unable to display FAQ: %s" msgstr "Ne mogu da prikažem ČPP: %s" @@ -2603,8 +2604,8 @@ msgstr "Foto-aparati" #: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718 #: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316 -#: ui/collection.ui:90 ui/event.ui:359 ui/event.ui:527 ui/media.ui:359 -#: ui/photo_context.ui:96 ui/photo.ui:349 ui/tags.ui:359 +#: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361 +#: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361 msgid "Camera" msgstr "Foto-aparat" @@ -2763,127 +2764,127 @@ msgstr[2] "" msgstr[3] "" "Ne mogu da obrišem %d fotografiju/snimak sa foto-aparata, usled greške." -#: src/CollectionPage.vala:74 src/direct/DirectPhotoPage.vala:85 -#: src/PhotoPage.vala:2461 src/Resources.vala:170 +#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85 +#: src/PhotoPage.vala:2464 src/Resources.vala:171 msgid "_Print" msgstr "_Štampaj" -#: src/CollectionPage.vala:77 src/Resources.vala:323 ui/collection.ui:126 -#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:563 ui/photo.ui:28 +#: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128 +#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28 msgid "Send _To…" msgstr "Pošalji _u…" -#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:90 -#: src/PhotoPage.vala:2471 src/Resources.vala:220 +#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90 +#: src/PhotoPage.vala:2474 src/Resources.vala:221 msgid "Set as _Desktop Background" msgstr "Postavi za _pozadinu" -#: src/CollectionPage.vala:86 src/Resources.vala:286 +#: src/CollectionPage.vala:92 src/Resources.vala:287 msgid "_Duplicate" msgstr "_Udvostruči" -#: src/CollectionPage.vala:94 +#: src/CollectionPage.vala:100 msgid "Fullscreen" msgstr "Preko celog ekrana" -#: src/CollectionPage.vala:96 ui/photo.ui:180 +#: src/CollectionPage.vala:102 ui/photo.ui:180 msgid "S_lideshow" msgstr "_Pokretni prikaz" -#: src/CollectionPage.vala:104 src/Resources.vala:139 ui/direct.ui:111 +#: src/CollectionPage.vala:110 src/Resources.vala:140 ui/direct.ui:111 #: ui/photo.ui:200 msgid "Rotate _Right" msgstr "Okreni na _desno" -#: src/CollectionPage.vala:107 src/Resources.vala:144 ui/direct.ui:116 +#: src/CollectionPage.vala:113 src/Resources.vala:145 ui/direct.ui:116 #: ui/photo.ui:205 msgid "Rotate _Left" msgstr "Okreni na _levo" -#: src/CollectionPage.vala:110 src/Resources.vala:149 ui/direct.ui:121 +#: src/CollectionPage.vala:116 src/Resources.vala:150 ui/direct.ui:121 #: ui/photo.ui:210 msgid "Flip Hori_zontally" msgstr "Izvrni _vodoravno" -#: src/CollectionPage.vala:111 src/Resources.vala:152 ui/direct.ui:125 +#: src/CollectionPage.vala:117 src/Resources.vala:153 ui/direct.ui:125 #: ui/photo.ui:214 msgid "Flip Verti_cally" msgstr "Izvrni _uspravno" -#: src/CollectionPage.vala:113 src/Resources.vala:186 ui/collection.ui:8 -#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:445 +#: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8 +#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:447 #: ui/photo_context.ui:6 ui/photo.ui:223 msgid "_Enhance" msgstr "_Poboljšaj" -#: src/CollectionPage.vala:114 src/Resources.vala:214 ui/collection.ui:13 -#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:450 +#: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13 +#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:452 #: ui/photo_context.ui:11 ui/photo.ui:250 msgid "Re_vert to Original" msgstr "_Vrati na izvorno" -#: src/CollectionPage.vala:116 src/Resources.vala:190 ui/photo.ui:256 +#: src/CollectionPage.vala:122 src/Resources.vala:191 ui/photo.ui:256 msgid "_Copy Color Adjustments" msgstr "_Umnoži doterivanja boje" -#: src/CollectionPage.vala:119 src/Resources.vala:194 ui/photo.ui:261 +#: src/CollectionPage.vala:125 src/Resources.vala:195 ui/photo.ui:261 msgid "_Paste Color Adjustments" msgstr "_Ubaci doterivanja boje" -#: src/CollectionPage.vala:129 +#: src/CollectionPage.vala:135 msgid "Adjust Date and Time…" msgstr "Podesite datum i vreme…" -#: src/CollectionPage.vala:137 src/Resources.vala:319 +#: src/CollectionPage.vala:143 src/Resources.vala:320 msgid "Open With E_xternal Editor" msgstr "_Otvori spoljnim uređivačem" -#: src/CollectionPage.vala:140 src/Resources.vala:321 ui/collection.ui:111 -#: ui/event.ui:548 ui/photo_context.ui:118 ui/photo.ui:363 +#: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113 +#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:365 msgid "Open With RA_W Editor" msgstr "Otvori uređivačem _sirovih" -#: src/CollectionPage.vala:143 src/Resources.vala:167 +#: src/CollectionPage.vala:149 src/Resources.vala:168 msgid "_Play" msgstr "Pu_sti" -#: src/CollectionPage.vala:409 +#: src/CollectionPage.vala:415 msgid "Export Photo/Video" msgstr "Izvezite fotografiju/snimak" -#: src/CollectionPage.vala:409 +#: src/CollectionPage.vala:415 msgid "Export Photos/Videos" msgstr "Izvezite fotografije/snimke" -#: src/CollectionPage.vala:411 src/Dialogs.vala:59 src/PhotoPage.vala:2995 +#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998 msgid "Export Photo" msgstr "Izvezite fotografiju" -#: src/CollectionPage.vala:411 src/Dialogs.vala:84 +#: src/CollectionPage.vala:417 src/Dialogs.vala:84 msgid "Export Photos" msgstr "Izvezite fotografije" -#: src/CollectionPage.vala:498 src/CollectionPage.vala:514 +#: src/CollectionPage.vala:504 src/CollectionPage.vala:520 msgid "Rotating" msgstr "Okrećem" -#: src/CollectionPage.vala:498 src/CollectionPage.vala:514 +#: src/CollectionPage.vala:504 src/CollectionPage.vala:520 msgid "Undoing Rotate" msgstr "Poništavam okretanje" -#: src/CollectionPage.vala:523 +#: src/CollectionPage.vala:529 msgid "Flipping Horizontally" msgstr "Izvrćem vodoravno" -#: src/CollectionPage.vala:524 +#: src/CollectionPage.vala:530 msgid "Undoing Flip Horizontally" msgstr "Poništavam vodoravno izvrtanje" -#: src/CollectionPage.vala:533 +#: src/CollectionPage.vala:539 msgid "Flipping Vertically" msgstr "Izvrćem uspravno" -#: src/CollectionPage.vala:534 +#: src/CollectionPage.vala:540 msgid "Undoing Flip Vertically" msgstr "Poništavam uspravno izvrtanje" @@ -3181,8 +3182,6 @@ msgstr "Ne mogu da pripremim smenjivanje pozadine radne površine: %s" #: src/Dialogs.vala:16 #, c-format -#| msgid "This will remove the tag \"%s\" from one photo. Continue?" -#| msgid_plural "This will remove the tag \"%s\" from %d photos. Continue?" msgid "This will remove the tag “%s” from one photo. Continue?" msgid_plural "This will remove the tag “%s” from %d photos. Continue?" msgstr[0] "Ovo će ukloniti oznaku „%s“ iz %d fotografije. Da nastavim?" @@ -3191,8 +3190,8 @@ msgstr[2] "Ovo će ukloniti oznaku „%s“ iz %d fotografija. Da nastavim?" msgstr[3] " " #: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388 -#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:414 -#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/tags.ui:458 ui/trash.ui:63 +#: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415 +#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:460 ui/trash.ui:63 #: ui/trash.ui:216 ui/trash.ui:258 msgid "_Delete" msgstr "_Izbriši" @@ -3291,7 +3290,6 @@ msgid "_Pixels:" msgstr "_Tačkica:" #: src/Dialogs.vala:234 -#| msgid "Export metadata" msgid "Export _metadata:" msgstr "Izvezi _metapodatke:" @@ -3764,7 +3762,7 @@ msgstr[3] "%d sat" msgid "1 day" msgstr "1 dan" -#: src/Dialogs.vala:1317 src/Resources.vala:231 +#: src/Dialogs.vala:1317 src/Resources.vala:232 msgid "Rename Event" msgstr "Preimenujte događaj" @@ -3783,7 +3781,7 @@ msgid "Title:" msgstr "Naslov:" #. Dialog title -#: src/Dialogs.vala:1345 src/Resources.vala:307 +#: src/Dialogs.vala:1345 src/Resources.vala:308 msgid "Edit Event Comment" msgstr "Uredite napomenu događaja" @@ -3845,7 +3843,7 @@ msgstr[1] "Ovo će ukloniti %d fotografije iz fototeke. Da nastavim?" msgstr[2] "Ovo će ukloniti %d fotografija iz fototeke. Da nastavim?" msgstr[3] " " -#: src/Dialogs.vala:1444 src/Resources.vala:173 +#: src/Dialogs.vala:1444 src/Resources.vala:174 msgid "_Remove" msgstr "_Ukloni" @@ -3883,7 +3881,6 @@ msgid "Set _all photos/videos to this time" msgstr "Postavi _sve fotografije/snimke na ovo vreme" #: src/Dialogs.vala:1725 -#| msgid "_Modify original photo file" msgid "_Modify original photo file" msgid_plural "_Modify original photo files" msgstr[0] "_Izmeni izvornu fotografiju" @@ -3892,7 +3889,6 @@ msgstr[2] "_Izmeni izvorne fotografije" msgstr[3] "_Izmeni izvornu fotografiju" #: src/Dialogs.vala:1729 -#| msgid "_Modify original file" msgid "_Modify original file" msgid_plural "_Modify original files" msgstr[0] "_Izmeni izvornu datoteku" @@ -4093,11 +4089,11 @@ msgstr "Uvezi _na mestu" msgid "Import to Library" msgstr "Uvezite u fototeku" -#: src/Dialogs.vala:2709 src/PhotoPage.vala:2871 +#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874 msgid "Remove From Library" msgstr "Uklonite iz fototeke" -#: src/Dialogs.vala:2710 src/PhotoPage.vala:2871 +#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874 msgid "Removing Photo From Library" msgstr "Uklanjam fotografiju iz fototeke" @@ -4248,29 +4244,29 @@ msgstr "" msgid "Unable open photo %s. Sorry." msgstr "Ne mogu da otvorim fotografiju „%s“. Izvinite." -#: src/direct/DirectPhotoPage.vala:304 src/Resources.vala:175 ui/direct.ui:8 +#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8 msgid "_Save" msgstr "_Sačuvaj" -#: src/direct/DirectPhotoPage.vala:304 +#: src/direct/DirectPhotoPage.vala:316 msgid "_Save a Copy" msgstr "_Sačuvaj primerak" -#: src/direct/DirectPhotoPage.vala:307 +#: src/direct/DirectPhotoPage.vala:319 #, c-format msgid "Lose changes to %s?" msgstr "Da zaboravim izmene nad „%s“?" -#: src/direct/DirectPhotoPage.vala:308 +#: src/direct/DirectPhotoPage.vala:320 msgid "Close _without Saving" msgstr "Zatvori _bez čuvanja" -#: src/direct/DirectPhotoPage.vala:341 +#: src/direct/DirectPhotoPage.vala:353 #, c-format msgid "Error while saving to %s: %s" msgstr "Greška prilikom čuvanja u „%s“: %s" -#: src/direct/DirectPhotoPage.vala:371 src/direct/DirectPhotoPage.vala:392 +#: src/direct/DirectPhotoPage.vala:383 src/direct/DirectPhotoPage.vala:404 msgid "Save As" msgstr "Sačuvajte kao" @@ -4319,23 +4315,23 @@ msgstr "SD video (4 : 3)" msgid "HD Video (16 ∶ 9)" msgstr "HD video (16 : 9)" -#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:818 +#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792 msgid "Wallet (2 × 3 in.)" msgstr "Novčanik (2 × 3 inča)" -#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:821 +#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795 msgid "Notecard (3 × 5 in.)" msgstr "Zabeleška (3 × 5 inča)" -#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:824 +#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798 msgid "4 × 6 in." msgstr "4 × 6 inča" -#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:827 +#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801 msgid "5 × 7 in." msgstr "5 × 7 inča" -#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:830 +#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804 msgid "8 × 10 in." msgstr "8 × 10 inča" @@ -4343,7 +4339,7 @@ msgstr "8 × 10 inča" msgid "Letter (8.5 × 11 in.)" msgstr "Pismo (8.5 × 11 in.)" -#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:833 +#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807 msgid "11 × 14 in." msgstr "11 × 14 inča" @@ -4351,23 +4347,23 @@ msgstr "11 × 14 inča" msgid "Tabloid (11 × 17 in.)" msgstr "Tabloid (11 × 17 in.)" -#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:836 +#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810 msgid "16 × 20 in." msgstr "16 × 20 inča" -#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:842 +#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816 msgid "Metric Wallet (9 × 13 cm)" msgstr "Metrički novčanik (9 × 13 cm)" -#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:845 +#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819 msgid "Postcard (10 × 15 cm)" msgstr "Čestitka (10 × 15 cm)" -#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:848 +#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822 msgid "13 × 18 cm" msgstr "13 × 18 cm" -#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:851 +#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825 msgid "18 × 24 cm" msgstr "18 × 24 cm" @@ -4375,15 +4371,15 @@ msgstr "18 × 24 cm" msgid "A4 (210 × 297 mm)" msgstr "A4 (210 × 297 mm)" -#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:854 +#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828 msgid "20 × 30 cm" msgstr "20 × 30 cm" -#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:857 +#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831 msgid "24 × 40 cm" msgstr "24 × 40 cm" -#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:860 +#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834 msgid "30 × 40 cm" msgstr "30 × 40 cm" @@ -4455,7 +4451,6 @@ msgid "Tint" msgstr "Boja" #: src/editing_tools/EditingTools.vala:2746 -#| msgid "Contrast Expansion" msgid "Contrast" msgstr "Kontrast" @@ -4483,7 +4478,7 @@ msgstr "Povećanje kontrasta" msgid "Angle:" msgstr "Ugao:" -#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202 +#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:203 #: ui/direct.ui:144 ui/photo.ui:233 msgid "_Straighten" msgstr "_Ispravi" @@ -4739,32 +4734,32 @@ msgstr "" msgid "Loading Shotwell" msgstr "Učitavam Foto-bunar" -#: src/main.vala:294 +#: src/main.vala:293 msgid "Path to Shotwell’s private data" msgstr "Putanja do ličnih podataka Foto-bunara" -#: src/main.vala:294 +#: src/main.vala:293 msgid "DIRECTORY" msgstr "DIREKTORIJUM" -#: src/main.vala:298 +#: src/main.vala:297 msgid "Do not monitor library directory at runtime for changes" msgstr "Ne prati direktorijum fototeke za izmenama u vreme pokretanja" -#: src/main.vala:302 +#: src/main.vala:301 msgid "Don’t display startup progress meter" msgstr "Ne prikazuje merač napredovanja pokretanja" -#: src/main.vala:306 +#: src/main.vala:305 msgid "Show the application’s version" msgstr "Prikazuje izdanje programa" #. init GTK (valac has already called g_threads_init()) -#: src/main.vala:338 +#: src/main.vala:342 msgid "[FILE]" msgstr "[DATOTEKA]" -#: src/main.vala:342 +#: src/main.vala:346 #, c-format msgid "Run “%s --help” to see a full list of available command line options.\n" msgstr "" @@ -4789,34 +4784,34 @@ msgstr "" "Foto-bunar nije uspeo da pusti izabrani snimak:\n" "%s" -#: src/Page.vala:1319 +#: src/Page.vala:1318 msgid "No photos/videos" msgstr "Nema fotografija/snimaka" -#: src/Page.vala:1323 +#: src/Page.vala:1322 msgid "No photos/videos found which match the current filter" msgstr "Nisam pronašao fotografije/snimke koji odgovaraju tekućem filteru" -#: src/Page.vala:2629 +#: src/Page.vala:2628 msgid "Photos cannot be exported to this directory." msgstr "Ne mogu da izvezem fotografije u ovaj direktorijum." #. previous button -#: src/PhotoPage.vala:535 +#: src/PhotoPage.vala:538 msgid "Previous photo" msgstr "Prethodna fotografija" #. next button -#: src/PhotoPage.vala:541 +#: src/PhotoPage.vala:544 msgid "Next photo" msgstr "Naredna fotografija" -#: src/PhotoPage.vala:1847 +#: src/PhotoPage.vala:1850 #, c-format msgid "Photo source file missing: %s" msgstr "Nedostaje izvorna datoteka fotografije: %s" -#: src/PhotoPage.vala:3015 +#: src/PhotoPage.vala:3018 #, c-format msgid "Unable to export %s: %s" msgstr "Ne mogu da izvezem „%s“: %s" @@ -4893,23 +4888,15 @@ msgstr "16 fotografija po stranici" msgid "32 images per page" msgstr "32 fotografije po stranici" -#: src/Printing.vala:348 -msgid "in." -msgstr "inč" - -#: src/Printing.vala:349 -msgid "cm" -msgstr "cm" - -#: src/Printing.vala:876 +#: src/Printing.vala:851 msgid "Image Settings" msgstr "Podešavanja fotografije" -#: src/Printing.vala:889 +#: src/Printing.vala:864 msgid "Printing…" msgstr "Štampam…" -#: src/Printing.vala:909 src/Printing.vala:1112 +#: src/Printing.vala:884 src/Printing.vala:1087 #, c-format msgid "" "Unable to print photo:\n" @@ -5066,7 +5053,6 @@ msgstr "" #. Here, we check whether more than one item is being uploaded, and if so, display #. an alternate message. #: src/publishing/PublishingUI.vala:104 -#| msgid "The selected video was successfully published." msgid "The selected video was successfully published." msgid_plural "The selected videos were successfully published." msgstr[0] "Izabrani snimak je uspešno objavljen." @@ -5075,7 +5061,6 @@ msgstr[2] "Izabrani snimci su uspešno objavljeni." msgstr[3] "Izabrani snimak je uspešno objavljen." #: src/publishing/PublishingUI.vala:109 -#| msgid "The selected photo was successfully published." msgid "The selected photo was successfully published." msgid_plural "The selected photos were successfully published." msgstr[0] "Izabrana fotografija je uspešno objavljena." @@ -5142,581 +5127,580 @@ msgstr "" msgid "Publishing" msgstr "Objavljivanje" -#: src/Resources.vala:140 src/Resources.vala:145 ui/collection.ui:149 +#: src/Resources.vala:141 src/Resources.vala:146 ui/collection.ui:151 msgid "Rotate" msgstr "Okrenite" -#: src/Resources.vala:141 +#: src/Resources.vala:142 msgid "Rotate Right" msgstr "Okrenite na desno" -#: src/Resources.vala:142 ui/collection.ui:146 +#: src/Resources.vala:143 ui/collection.ui:148 msgid "Rotate the photos right (press Ctrl to rotate left)" msgstr "Okrenite fotografije na desno (pritisnite Ktrl da okrenete na levo)" -#: src/Resources.vala:146 +#: src/Resources.vala:147 msgid "Rotate Left" msgstr "Okrenite na levo" -#: src/Resources.vala:147 +#: src/Resources.vala:148 msgid "Rotate the photos left" msgstr "Okrenite fotografije na levo" -#: src/Resources.vala:150 +#: src/Resources.vala:151 msgid "Flip Horizontally" msgstr "Izvrnite vodoravno" -#: src/Resources.vala:153 +#: src/Resources.vala:154 msgid "Flip Vertically" msgstr "Izvrnite uspravno" -#: src/Resources.vala:155 ui/direct.ui:191 ui/events_directory.ui:168 -#: ui/event.ui:436 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:419 -#: ui/offline.ui:198 ui/photo.ui:402 ui/tags.ui:438 ui/trash.ui:207 +#: src/Resources.vala:156 ui/direct.ui:191 ui/events_directory.ui:168 +#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:421 +#: ui/offline.ui:198 ui/photo.ui:404 ui/tags.ui:440 ui/trash.ui:207 msgid "_About" msgstr "_O programu" -#: src/Resources.vala:156 +#: src/Resources.vala:157 msgid "_Apply" msgstr "_Primeni" -#: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32 +#: src/Resources.vala:160 ui/direct.ui:44 ui/events_directory.ui:32 #: ui/event.ui:47 ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32 -#: ui/photo.ui:55 ui/tags.ui:47 ui/top.ui:10 ui/trash.ui:37 +#: ui/photo.ui:55 ui/tags.ui:47 ui/trash.ui:37 msgid "_Edit" msgstr "_Uređivanje" -#: src/Resources.vala:160 +#: src/Resources.vala:161 msgid "_Forward" msgstr "Prosl_edi" -#: src/Resources.vala:161 ui/direct.ui:62 ui/events_directory.ui:125 +#: src/Resources.vala:162 ui/direct.ui:62 ui/events_directory.ui:125 #: ui/photo.ui:173 msgid "Fulls_creen" msgstr "Preko _celog ekrana" -#: src/Resources.vala:162 ui/direct.ui:173 ui/direct.ui:176 -#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:418 -#: ui/event.ui:421 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183 -#: ui/import.ui:186 ui/media.ui:401 ui/media.ui:404 ui/offline.ui:180 -#: ui/offline.ui:183 ui/photo.ui:384 ui/photo.ui:387 ui/tags.ui:420 -#: ui/tags.ui:423 ui/top.ui:40 ui/trash.ui:189 ui/trash.ui:192 +#: src/Resources.vala:163 ui/direct.ui:173 ui/direct.ui:176 +#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420 +#: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183 +#: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180 +#: ui/offline.ui:183 ui/photo.ui:386 ui/photo.ui:389 ui/tags.ui:422 +#: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192 msgid "_Help" msgstr "Po_moć" -#: src/Resources.vala:163 +#: src/Resources.vala:164 msgid "Leave _Fullscreen" msgstr "Napusti prikaz preko _celog ekrana" -#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448 +#: src/Resources.vala:165 src/Resources.vala:364 ui/tags.ui:450 msgid "_New" msgstr "_Novo" -#: src/Resources.vala:165 +#: src/Resources.vala:166 msgid "_Next" msgstr "_Sledeće" -#: src/Resources.vala:168 src/Resources.vala:317 ui/events_directory.ui:65 +#: src/Resources.vala:169 src/Resources.vala:318 ui/events_directory.ui:65 #: ui/event.ui:93 ui/import.ui:68 ui/media.ui:93 ui/offline.ui:72 #: ui/photo.ui:89 ui/tags.ui:93 ui/trash.ui:81 msgid "_Preferences" msgstr "_Postavke" -#: src/Resources.vala:169 +#: src/Resources.vala:170 msgid "_Previous" msgstr "_Prethodno" -#: src/Resources.vala:171 ui/direct.ui:37 ui/events_directory.ui:25 +#: src/Resources.vala:172 ui/direct.ui:37 ui/events_directory.ui:25 #: ui/event.ui:40 ui/import_queue.ui:31 ui/import.ui:33 ui/media.ui:40 #: ui/offline.ui:25 ui/photo.ui:48 ui/tags.ui:40 ui/trash.ui:30 msgid "_Quit" msgstr "_Izađi" -#: src/Resources.vala:172 +#: src/Resources.vala:173 msgid "_Refresh" msgstr "_Osveži" -#: src/Resources.vala:174 +#: src/Resources.vala:175 msgid "_Revert" msgstr "_Vrati" -#: src/Resources.vala:176 +#: src/Resources.vala:177 msgid "Save _As" msgstr "Sačuvaj _kao" -#: src/Resources.vala:177 +#: src/Resources.vala:178 msgid "Sort _Ascending" msgstr "Poređaj _rastućim redom" -#: src/Resources.vala:178 +#: src/Resources.vala:179 msgid "Sort _Descending" msgstr "Poređaj _opadajućim redom" -#: src/Resources.vala:179 +#: src/Resources.vala:180 msgid "_Stop" msgstr "_Zaustavi" -#: src/Resources.vala:180 +#: src/Resources.vala:181 msgid "_Undelete" msgstr "_Poništi brisanje" -#: src/Resources.vala:181 +#: src/Resources.vala:182 msgid "_Normal Size" msgstr "_Uobičajena veličina" -#: src/Resources.vala:182 +#: src/Resources.vala:183 msgid "Best _Fit" msgstr "_Najbolje uklapanje" -#: src/Resources.vala:183 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260 +#: src/Resources.vala:184 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260 #: ui/photo.ui:144 ui/tags.ui:260 msgid "Zoom _In" msgstr "U_većaj" -#: src/Resources.vala:184 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265 +#: src/Resources.vala:185 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265 #: ui/photo.ui:149 ui/tags.ui:265 msgid "Zoom _Out" msgstr "U_manji" -#: src/Resources.vala:187 ui/collection.ui:165 +#: src/Resources.vala:188 ui/collection.ui:167 msgid "Enhance" msgstr "Poboljšajte" -#: src/Resources.vala:188 ui/collection.ui:162 +#: src/Resources.vala:189 ui/collection.ui:164 msgid "Automatically improve the photo’s appearance" msgstr "Samostalno unapredite izgled fotografije" -#: src/Resources.vala:191 +#: src/Resources.vala:192 msgid "Copy Color Adjustments" msgstr "Umnožite doterivanja boje" -#: src/Resources.vala:192 +#: src/Resources.vala:193 msgid "Copy the color adjustments applied to the photo" msgstr "Umnožite doterivanja boje primenjena na fotografiji" -#: src/Resources.vala:195 +#: src/Resources.vala:196 msgid "Paste Color Adjustments" msgstr "Ubacite doterivanja boje" -#: src/Resources.vala:196 +#: src/Resources.vala:197 msgid "Apply copied color adjustments to the selected photos" msgstr "Primenite umnožena doterivanja boje na izabranim fotografijama" -#: src/Resources.vala:198 ui/direct.ui:139 ui/photo.ui:228 +#: src/Resources.vala:199 ui/direct.ui:139 ui/photo.ui:228 msgid "_Crop" msgstr "_Iseci" -#: src/Resources.vala:199 +#: src/Resources.vala:200 msgid "Crop" msgstr "Isecite" -#: src/Resources.vala:200 +#: src/Resources.vala:201 msgid "Crop the photo’s size" msgstr "Isecite veličinu fotografije" -#: src/Resources.vala:203 +#: src/Resources.vala:204 msgid "Straighten" msgstr "Ispravite" -#: src/Resources.vala:204 +#: src/Resources.vala:205 msgid "Straighten the photo" msgstr "Ispravite fotografiju" -#: src/Resources.vala:206 ui/direct.ui:149 ui/photo.ui:238 +#: src/Resources.vala:207 ui/direct.ui:149 ui/photo.ui:238 msgid "_Red-eye" msgstr "_Crvene oči" -#: src/Resources.vala:207 +#: src/Resources.vala:208 msgid "Red-eye" msgstr "Uklonite crvene oči" -#: src/Resources.vala:208 +#: src/Resources.vala:209 msgid "Reduce or eliminate any red-eye effects in the photo" msgstr "Umanjite ili uklonite dejstva crvenih očiju sa fotografije" -#: src/Resources.vala:210 ui/direct.ui:154 ui/photo.ui:243 +#: src/Resources.vala:211 ui/direct.ui:154 ui/photo.ui:243 msgid "_Adjust" msgstr "_Doteraj" -#: src/Resources.vala:211 +#: src/Resources.vala:212 msgid "Adjust" msgstr "Doterajte" -#: src/Resources.vala:212 +#: src/Resources.vala:213 msgid "Adjust the photo’s color and tone" msgstr "Doterajte boje i tonalitet fotografije" -#: src/Resources.vala:215 +#: src/Resources.vala:216 msgid "Revert to Original" msgstr "Vratite na izvorno" -#: src/Resources.vala:217 +#: src/Resources.vala:218 msgid "Revert External E_dits" msgstr "Vrati spoljne _izmene" -#: src/Resources.vala:218 +#: src/Resources.vala:219 msgid "Revert to the master photo" msgstr "Vratite izvornu fotografiju" -#: src/Resources.vala:221 +#: src/Resources.vala:222 msgid "Set selected image to be the new desktop background" msgstr "Postavite izabranu fotografiju za pozadinu vaše radne površi" -#: src/Resources.vala:222 +#: src/Resources.vala:223 msgid "Set as _Desktop Slideshow…" msgstr "Postavi kao smenjivu pozadinu _radne površi…" -#: src/Resources.vala:224 ui/direct.ui:47 ui/events_directory.ui:35 +#: src/Resources.vala:225 ui/direct.ui:47 ui/events_directory.ui:35 #: ui/event.ui:50 ui/import.ui:43 ui/media.ui:50 ui/offline.ui:35 #: ui/photo.ui:58 ui/tags.ui:50 ui/trash.ui:40 msgid "_Undo" msgstr "_Opozovi" -#: src/Resources.vala:225 +#: src/Resources.vala:226 msgid "Undo" msgstr "Opozovite" -#: src/Resources.vala:227 ui/direct.ui:52 ui/events_directory.ui:40 +#: src/Resources.vala:228 ui/direct.ui:52 ui/events_directory.ui:40 #: ui/event.ui:55 ui/import.ui:48 ui/media.ui:55 ui/offline.ui:40 #: ui/photo.ui:63 ui/tags.ui:55 ui/trash.ui:45 msgid "_Redo" msgstr "_Ponovi" -#: src/Resources.vala:228 +#: src/Resources.vala:229 msgid "Redo" msgstr "Ponovite" -#: src/Resources.vala:230 ui/events_directory.ui:139 ui/events_directory.ui:181 -#: ui/event.ui:391 ui/event.ui:584 +#: src/Resources.vala:231 ui/events_directory.ui:139 ui/events_directory.ui:181 +#: ui/event.ui:393 ui/event.ui:588 msgid "Re_name Event…" msgstr "_Preimenuj događaj…" -#: src/Resources.vala:233 ui/event.ui:371 ui/event.ui:576 +#: src/Resources.vala:234 ui/event.ui:373 ui/event.ui:580 msgid "Make _Key Photo for Event" msgstr "Napravi _ključnu fotografiju događaja" -#: src/Resources.vala:234 +#: src/Resources.vala:235 msgid "Make Key Photo for Event" msgstr "Napravite ključnu fotografiju za ovaj događaj" -#: src/Resources.vala:236 ui/event.ui:380 ui/media.ui:374 ui/tags.ui:374 +#: src/Resources.vala:237 ui/event.ui:382 ui/media.ui:376 ui/tags.ui:376 msgid "_New Event" msgstr "_Novi događaj" -#: src/Resources.vala:237 +#: src/Resources.vala:238 msgid "New Event" msgstr "Novi događaj" -#: src/Resources.vala:239 +#: src/Resources.vala:240 msgid "Move Photos" msgstr "Premesti fotografije" -#: src/Resources.vala:240 +#: src/Resources.vala:241 msgid "Move photos to an event" msgstr "Premestite fotografije u događaj" -#: src/Resources.vala:242 ui/events_directory.ui:135 ui/events_directory.ui:177 +#: src/Resources.vala:243 ui/events_directory.ui:135 ui/events_directory.ui:177 msgid "_Merge Events" msgstr "_Spoj događaje" -#: src/Resources.vala:243 +#: src/Resources.vala:244 msgid "Merge" msgstr "Spojite" -#: src/Resources.vala:244 +#: src/Resources.vala:245 msgid "Combine events into a single event" msgstr "Objedinite događaje u jedan" -#: src/Resources.vala:246 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:476 +#: src/Resources.vala:247 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:478 #: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286 msgid "_Set Rating" msgstr "_Oceni" -#: src/Resources.vala:247 +#: src/Resources.vala:248 msgid "Set Rating" msgstr "Ocenite" -#: src/Resources.vala:248 +#: src/Resources.vala:249 msgid "Change the rating of your photo" msgstr "Izmenite ocenu fotografije" -#: src/Resources.vala:250 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:509 +#: src/Resources.vala:251 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:511 #: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326 msgid "_Increase" msgstr "_Povećaj" -#: src/Resources.vala:251 +#: src/Resources.vala:252 msgid "Increase Rating" msgstr "Povećajte ocenu" -#: src/Resources.vala:253 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:513 +#: src/Resources.vala:254 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:515 #: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331 msgid "_Decrease" msgstr "_Smanji" -#: src/Resources.vala:254 +#: src/Resources.vala:255 msgid "Decrease Rating" msgstr "Smanjite ocenu" -#: src/Resources.vala:256 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:499 +#: src/Resources.vala:257 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:501 #: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314 msgid "_Unrated" msgstr "_Bez ocene" -#: src/Resources.vala:257 +#: src/Resources.vala:258 msgid "Unrated" msgstr "Neocenjene" -#: src/Resources.vala:258 +#: src/Resources.vala:259 msgid "Rate Unrated" msgstr "Ocenite neocenjene" -#: src/Resources.vala:259 +#: src/Resources.vala:260 msgid "Setting as unrated" msgstr "Označite da fotografija nije ocenjena" -#: src/Resources.vala:260 +#: src/Resources.vala:261 msgid "Remove any ratings" msgstr "Uklonite bilo kakve ocene" -#: src/Resources.vala:262 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:503 +#: src/Resources.vala:263 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:505 #: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319 msgid "_Rejected" msgstr "_Odbačene" -#: src/Resources.vala:263 +#: src/Resources.vala:264 msgid "Rejected" msgstr "Odbačene" -#: src/Resources.vala:264 +#: src/Resources.vala:265 msgid "Rate Rejected" msgstr "Ocenite odbačene" -#: src/Resources.vala:265 +#: src/Resources.vala:266 msgid "Setting as rejected" msgstr "Označavam da je fotografija odbačena" -#: src/Resources.vala:266 +#: src/Resources.vala:267 msgid "Set rating to rejected" msgstr "Označite da je fotografija odbačena" -#: src/Resources.vala:268 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196 +#: src/Resources.vala:269 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196 #: ui/offline.ui:153 ui/search_bar.ui:6 ui/tags.ui:196 ui/trash.ui:162 msgid "Rejected _Only" msgstr "Samo _odbačene" -#: src/Resources.vala:269 +#: src/Resources.vala:270 msgid "Rejected Only" msgstr "Samo odbačene" -#: src/Resources.vala:270 +#: src/Resources.vala:271 msgid "Show only rejected photos" msgstr "Prikažite samo odbačene fotografije" -#: src/Resources.vala:272 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190 +#: src/Resources.vala:273 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190 #: ui/offline.ui:147 ui/search_bar.ui:12 ui/tags.ui:190 ui/trash.ui:156 msgid "All + _Rejected" msgstr "Sve + _odbačene" -#: src/Resources.vala:273 +#: src/Resources.vala:274 msgctxt "Tooltip" msgid "Show all photos, including rejected" msgstr "Prikažite sve fotografije, uključujući i odbačene" -#: src/Resources.vala:275 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184 +#: src/Resources.vala:276 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184 #: ui/offline.ui:141 ui/search_bar.ui:18 ui/tags.ui:184 ui/trash.ui:150 msgid "_All Photos" msgstr "_Sve fotografije" #. Button tooltip -#: src/Resources.vala:277 +#: src/Resources.vala:278 msgid "Show all photos" msgstr "Prikažite sve fotografije" -#: src/Resources.vala:279 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120 +#: src/Resources.vala:280 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120 #: ui/tags.ui:144 msgid "_Ratings" msgstr "_Ocene" -#: src/Resources.vala:280 +#: src/Resources.vala:281 msgid "Display each photo’s rating" msgstr "Prikažite ocene svih fotografija" -#: src/Resources.vala:282 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151 +#: src/Resources.vala:283 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151 #: ui/offline.ui:108 ui/tags.ui:151 ui/trash.ui:117 msgid "_Filter Photos" msgstr "_Izdvoj fotografije" -#: src/Resources.vala:283 +#: src/Resources.vala:284 msgid "Filter Photos" msgstr "Izdvojte fotografije" -#: src/Resources.vala:284 +#: src/Resources.vala:285 msgid "Limit the number of photos displayed based on a filter" msgstr "Ograničite broj prikazanih fotografija na osnovu propusnika" -#: src/Resources.vala:287 +#: src/Resources.vala:288 msgid "Duplicate" msgstr "Udvostruči" -#: src/Resources.vala:288 +#: src/Resources.vala:289 msgid "Make a duplicate of the photo" msgstr "Napravite umnožak fotografije" -#: src/Resources.vala:290 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17 +#: src/Resources.vala:291 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17 #: ui/tags.ui:17 msgid "_Export…" msgstr "_Izvezi…" -#: src/Resources.vala:292 +#: src/Resources.vala:293 msgid "_Print…" msgstr "_Štampaj…" -#: src/Resources.vala:294 +#: src/Resources.vala:295 msgid "Pu_blish…" msgstr "_Objavi…" -#: src/Resources.vala:296 ui/collection.ui:187 +#: src/Resources.vala:297 ui/collection.ui:189 msgid "Publish to various websites" msgstr "Objavite izabrane fotografije na raznim sajtovima" -#: src/Resources.vala:298 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:535 +#: src/Resources.vala:299 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:537 #: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340 msgid "Edit _Title…" msgstr "Izmeni _naslov…" #. Button label -#: src/Resources.vala:300 +#: src/Resources.vala:301 msgctxt "Button Label" msgid "Edit Title" msgstr "Uredi naslov" -#: src/Resources.vala:302 ui/collection.ui:102 ui/events_directory.ui:144 -#: ui/events_directory.ui:186 ui/event.ui:344 ui/event.ui:396 ui/event.ui:539 -#: ui/media.ui:344 ui/photo_context.ui:109 ui/photo.ui:331 ui/tags.ui:344 +#: src/Resources.vala:303 ui/collection.ui:103 ui/events_directory.ui:144 +#: ui/events_directory.ui:186 ui/event.ui:345 ui/event.ui:398 ui/event.ui:542 +#: ui/media.ui:345 ui/photo_context.ui:110 ui/photo.ui:332 ui/tags.ui:345 msgid "Edit _Comment…" msgstr "Izmeni _napomenu…" #. Button label -#: src/Resources.vala:304 +#: src/Resources.vala:305 msgid "Edit Comment" msgstr "Izmenite napomenu" -#: src/Resources.vala:306 ui/event.ui:588 +#: src/Resources.vala:307 ui/event.ui:592 msgid "Edit Event _Comment…" msgstr "Izmeni _napomenu događaja…" -#: src/Resources.vala:309 ui/direct.ui:167 ui/photo.ui:335 +#: src/Resources.vala:310 ui/direct.ui:167 ui/photo.ui:337 msgid "_Adjust Date and Time…" msgstr "_Podesi datum i vreme…" -#: src/Resources.vala:310 +#: src/Resources.vala:311 msgid "Adjust Date and Time" msgstr "Podesite datum i vreme" -#: src/Resources.vala:312 ui/collection.ui:19 ui/event.ui:405 ui/event.ui:456 -#: ui/media.ui:388 ui/photo.ui:372 ui/tags.ui:388 +#: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458 +#: ui/media.ui:390 ui/photo.ui:374 ui/tags.ui:390 msgid "Add _Tags…" msgstr "Dodaj _oznake…" -#: src/Resources.vala:313 ui/photo_context.ui:17 +#: src/Resources.vala:314 ui/photo_context.ui:17 msgid "_Add Tags…" msgstr "Dodaj _oznake…" #. Dialog title -#: src/Resources.vala:315 +#: src/Resources.vala:316 msgctxt "Dialog Title" msgid "Add Tags" msgstr "Dodajte oznake" -#: src/Resources.vala:324 ui/photo_context.ui:133 +#: src/Resources.vala:325 ui/photo_context.ui:135 msgid "Send T_o…" msgstr "Pošalji _u…" -#: src/Resources.vala:326 +#: src/Resources.vala:327 msgid "_Find…" msgstr "_Nađi…" -#: src/Resources.vala:327 ui/collection.ui:215 ui/offline.ui:239 +#: src/Resources.vala:328 ui/collection.ui:217 ui/offline.ui:239 #: ui/trash.ui:312 msgid "Find" msgstr "Pronađite" -#: src/Resources.vala:328 ui/collection.ui:212 ui/offline.ui:236 +#: src/Resources.vala:329 ui/collection.ui:214 ui/offline.ui:236 #: ui/trash.ui:309 msgid "Find an image by typing text that appears in its name or tags" msgstr "Pronađite fotografije na osnovu naziva ili oznake" -#: src/Resources.vala:330 +#: src/Resources.vala:331 msgid "_Flag" msgstr "_Postavi obeležje" -#: src/Resources.vala:332 +#: src/Resources.vala:333 msgid "Un_flag" msgstr "_Ukloni obeležje" -#: src/Resources.vala:335 +#: src/Resources.vala:336 #, c-format msgid "Unable to launch editor: %s" msgstr "Ne mogu da pokrenem uređivača: %s" -#: src/Resources.vala:340 +#: src/Resources.vala:341 #, c-format msgid "Add Tag “%s”" msgstr "Dodaj oznaku „%s“" #. Used when adding two tags to photo(s) -#: src/Resources.vala:343 +#: src/Resources.vala:344 #, c-format msgid "Add Tags “%s” and “%s”" msgstr "Dodaj oznaku „%s“ i „%s“" #. Undo/Redo command name (in Edit menu) -#: src/Resources.vala:348 +#: src/Resources.vala:349 msgctxt "UndoRedo menu entry" msgid "Add Tags" msgstr "Dodaj oznake" -#: src/Resources.vala:353 +#: src/Resources.vala:354 #, c-format msgid "_Delete Tag “%s”" msgstr "_Obriši oznaku „%s“" -#: src/Resources.vala:357 +#: src/Resources.vala:358 #, c-format msgid "Delete Tag “%s”" msgstr "Obrišite oznaku „%s“" -#: src/Resources.vala:360 +#: src/Resources.vala:361 msgid "Delete Tag" msgstr "Obrišite oznaku" -#: src/Resources.vala:366 +#: src/Resources.vala:367 #, c-format msgid "Re_name Tag “%s”…" msgstr "_Preimenuj oznaku „%s“…" -#: src/Resources.vala:370 +#: src/Resources.vala:371 #, c-format msgid "Rename Tag “%s” to “%s”" msgstr "Preimenujte oznaku „%s“ u „%s“" -#: src/Resources.vala:373 ui/tags.ui:454 +#: src/Resources.vala:374 ui/tags.ui:456 msgid "_Rename…" msgstr "_Preimenuj…" -#: src/Resources.vala:375 ui/collection.ui:24 ui/event.ui:410 ui/event.ui:461 -#: ui/media.ui:393 ui/photo_context.ui:22 ui/photo.ui:377 ui/tags.ui:393 +#: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463 +#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:379 ui/tags.ui:395 msgid "Modif_y Tags…" msgstr "Izmeni _oznake…" -#: src/Resources.vala:376 +#: src/Resources.vala:377 msgid "Modify Tags" msgstr "Izmenite oznake" -#: src/Resources.vala:379 +#: src/Resources.vala:380 #, c-format -#| msgid "Tag Photo as \"%s\"" msgid "Tag Photo as “%s”" msgid_plural "Tag Photos as “%s”" msgstr[0] "Označi fotografiju kao „%s“" @@ -5724,9 +5708,8 @@ msgstr[1] "Označi fotografije kao „%s“" msgstr[2] "Označi fotografije kao „%s“" msgstr[3] "Označi fotografije kao „%s“" -#: src/Resources.vala:385 +#: src/Resources.vala:386 #, c-format -#| msgid "Tag the selected photo as \"%s\"" msgid "Tag the selected photo as “%s”" msgid_plural "Tag the selected photos as “%s”" msgstr[0] "Označi izabranu fotografiju kao „%s“" @@ -5734,9 +5717,8 @@ msgstr[1] "Označi izabrane fotografije kao „%s“" msgstr[2] "Označi izabrane fotografije kao „%s“" msgstr[3] "Označi izabranu fotografiju kao „%s“" -#: src/Resources.vala:391 +#: src/Resources.vala:392 #, c-format -#| msgid "Remove Tag \"%s\" From _Photo" msgid "Remove Tag “%s” From _Photo" msgid_plural "Remove Tag “%s” From _Photos" msgstr[0] "Ukloni oznaku „%s“ sa _fotografije" @@ -5744,9 +5726,8 @@ msgstr[1] "Ukloni oznaku „%s“ sa _fotografija" msgstr[2] "Ukloni oznaku „%s“ sa _fotografija" msgstr[3] "Ukloni oznaku „%s“ sa _fotografije" -#: src/Resources.vala:397 +#: src/Resources.vala:398 #, c-format -#| msgid "Remove Tag \"%s\" From Photo" msgid "Remove Tag “%s” From Photo" msgid_plural "Remove Tag “%s” From Photos" msgstr[0] "Uklonite oznaku „%s“ sa fotografije" @@ -5754,131 +5735,130 @@ msgstr[1] "Uklonite oznaku „%s“ sa fotografija" msgstr[2] "Uklonite oznaku „%s“ sa fotografija" msgstr[3] "Uklonite oznaku „%s“ sa fotografije" -#: src/Resources.vala:403 +#: src/Resources.vala:404 #, c-format msgid "Unable to rename tag to “%s” because the tag already exists." msgstr "Ne mogu da preimenujem oznaku „%s“ jer već postoji ta oznaka." -#: src/Resources.vala:407 +#: src/Resources.vala:408 #, c-format msgid "Unable to rename search to “%s” because the search already exists." msgstr "Ne mogu da preimenujem pretragu „%s“ jer već postoji ta pretraga." #. Saved search button -#: src/Resources.vala:410 src/SearchFilter.vala:1124 +#: src/Resources.vala:411 src/SearchFilter.vala:1124 msgid "Saved Search" msgstr "Sačuvane pretrage" -#: src/Resources.vala:412 +#: src/Resources.vala:413 msgid "Delete Search" msgstr "Izbriši pretragu" -#: src/Resources.vala:415 ui/savedsearch.ui:11 -#| msgid "_Edit" +#: src/Resources.vala:416 ui/savedsearch.ui:11 msgid "_Edit…" msgstr "_Uredi…" -#: src/Resources.vala:416 ui/savedsearch.ui:7 +#: src/Resources.vala:417 ui/savedsearch.ui:7 msgid "Re_name…" msgstr "_Preimenuj…" -#: src/Resources.vala:419 +#: src/Resources.vala:420 #, c-format msgid "Rename Search “%s” to “%s”" msgstr "Preimenuj pretragu „%s“ u „%s“" -#: src/Resources.vala:423 +#: src/Resources.vala:424 #, c-format msgid "Delete Search “%s”" msgstr "Izbriši pretragu „%s“" -#: src/Resources.vala:560 +#: src/Resources.vala:561 #, c-format msgid "Rate %s" msgstr "Oceni „%s“" -#: src/Resources.vala:561 +#: src/Resources.vala:562 #, c-format msgid "Set rating to %s" msgstr "Postavite ocenu na „%s“" -#: src/Resources.vala:562 +#: src/Resources.vala:563 #, c-format msgid "Setting rating to %s" msgstr "Postavljam ocenu na „%s“" -#: src/Resources.vala:564 +#: src/Resources.vala:565 #, c-format msgid "Display %s" msgstr "Prikaži „%s“" -#: src/Resources.vala:565 +#: src/Resources.vala:566 #, c-format msgid "Only show photos with a rating of %s" msgstr "Prikažite samo fotografije sa ocenom „%s“" -#: src/Resources.vala:566 +#: src/Resources.vala:567 #, c-format msgid "%s or Better" msgstr "%s ili bolje" -#: src/Resources.vala:567 +#: src/Resources.vala:568 #, c-format msgid "Display %s or Better" msgstr "Prikaži %s ili bolje" -#: src/Resources.vala:568 +#: src/Resources.vala:569 #, c-format msgid "Only show photos with a rating of %s or better" msgstr "Prikažite samo fotografije sa ocenom %s ili boljom" -#: src/Resources.vala:659 ui/trash.ui:255 +#: src/Resources.vala:660 ui/trash.ui:255 msgid "Remove the selected photos from the trash" msgstr "Uklonite izabrane fotografije iz korpe" -#: src/Resources.vala:660 ui/offline.ui:221 +#: src/Resources.vala:661 ui/offline.ui:221 msgid "Remove the selected photos from the library" msgstr "Uklonite izabrane fotografije iz fototeke" -#: src/Resources.vala:662 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273 +#: src/Resources.vala:663 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273 msgid "_Restore" msgstr "_Povrati" -#: src/Resources.vala:663 ui/trash.ui:270 +#: src/Resources.vala:664 ui/trash.ui:270 msgid "Move the selected photos back into the library" msgstr "Premestite izabrane fotografije nazad u fototeku" -#: src/Resources.vala:665 ui/collection.ui:121 ui/direct_context.ui:20 -#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:558 ui/media.ui:27 -#: ui/photo_context.ui:128 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19 +#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:20 +#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27 +#: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19 #: ui/trash.ui:227 msgid "Show in File Mana_ger" msgstr "Prikaži u _upravniku datoteka" -#: src/Resources.vala:666 +#: src/Resources.vala:667 msgid "Open the selected photo’s directory in the file manager" msgstr "Otvorite direktorijum izabranih fotografija u upravniku datoteka" -#: src/Resources.vala:669 +#: src/Resources.vala:670 #, c-format msgid "Unable to open in file manager: %s" msgstr "Ne mogu da otvorim upravnika datoteka: %s" -#: src/Resources.vala:672 ui/offline.ui:224 +#: src/Resources.vala:673 ui/offline.ui:224 msgid "R_emove From Library" msgstr "Ukloni iz _fototeke" -#: src/Resources.vala:674 ui/collection.ui:132 ui/event.ui:79 ui/event.ui:569 -#: ui/media.ui:79 ui/photo_context.ui:139 ui/photo.ui:82 ui/tags.ui:79 +#: src/Resources.vala:675 ui/collection.ui:134 ui/event.ui:79 ui/event.ui:573 +#: ui/media.ui:79 ui/photo_context.ui:141 ui/photo.ui:82 ui/tags.ui:79 msgid "_Move to Trash" msgstr "_Premesti u korpu" -#: src/Resources.vala:676 ui/events_directory.ui:58 ui/event.ui:86 +#: src/Resources.vala:677 ui/events_directory.ui:58 ui/event.ui:86 #: ui/import.ui:61 ui/media.ui:86 ui/offline.ui:65 ui/tags.ui:86 ui/trash.ui:74 msgid "Select _All" msgstr "Izaberi _sve" -#: src/Resources.vala:677 +#: src/Resources.vala:678 msgid "Select all items" msgstr "Izaberite sve stavke" @@ -6118,12 +6098,10 @@ msgid "Date" msgstr "Datum" #: src/SearchFilter.vala:815 -#| msgid "Rating" msgid "★+ Rating" msgstr "★+ ocena" #: src/SearchFilter.vala:818 -#| msgid "Rating" msgid "★★+ Rating" msgstr "★★+ ocena" @@ -6141,7 +6119,6 @@ msgstr "★★★★★+ ocena" #: src/SearchFilter.vala:1064 #, c-format -#| msgid "Error loading UI file %s: %s" msgid "Error loading search bar UI: %s" msgstr "Greška učitavanja korisničkog sučelja trake pretrage: %s" @@ -6247,28 +6224,28 @@ msgstr "bezimeno" msgid "Export Videos" msgstr "Izvezite snimke" -#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:470 ui/media.ui:281 +#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:472 ui/media.ui:281 #: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281 msgid "Toggle _Flag" msgstr "Okini _zastavicu" -#: ui/collection.ui:82 ui/event.ui:351 ui/event.ui:519 ui/media.ui:351 -#: ui/photo_context.ui:88 ui/photo.ui:341 ui/tags.ui:351 +#: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353 +#: ui/photo_context.ui:88 ui/photo.ui:343 ui/tags.ui:353 msgid "_Developer" msgstr "_Razvijač" -#: ui/collection.ui:106 ui/event.ui:543 ui/photo_context.ui:113 ui/photo.ui:358 +#: ui/collection.ui:108 ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360 msgid "Open with E_xternal Editor" msgstr "_Otvori spoljnim uređivačem" -#: ui/collection.ui:117 ui/event.ui:385 ui/event.ui:554 ui/media.ui:379 -#: ui/photo_context.ui:124 ui/tags.ui:379 +#: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381 +#: ui/photo_context.ui:126 ui/tags.ui:381 msgid "View Eve_nt for Photo" msgstr "Pregledaj _događaj za fotografiju" #: ui/direct.ui:5 ui/events_directory.ui:5 ui/event.ui:5 ui/import_queue.ui:5 #: ui/import.ui:5 ui/media.ui:5 ui/offline.ui:5 ui/photo.ui:5 ui/tags.ui:5 -#: ui/top.ui:5 ui/trash.ui:5 +#: ui/trash.ui:5 msgid "_File" msgstr "_Datoteka" @@ -6278,7 +6255,7 @@ msgstr "Sačuvaj _kao…" #: ui/direct.ui:59 ui/events_directory.ui:71 ui/event.ui:99 #: ui/import_queue.ui:38 ui/import.ui:74 ui/media.ui:99 ui/offline.ui:78 -#: ui/photo.ui:95 ui/tags.ui:99 ui/top.ui:15 ui/trash.ui:87 +#: ui/photo.ui:95 ui/tags.ui:99 ui/trash.ui:87 msgid "_View" msgstr "_Pregled" @@ -6294,7 +6271,7 @@ msgstr "Uvećaj na _100%" msgid "Zoom _200%" msgstr "Uvećaj na _200%" -#: ui/direct.ui:98 ui/photo.ui:187 ui/top.ui:20 +#: ui/direct.ui:98 ui/photo.ui:187 msgid "_Photo" msgstr "_Fotografija" @@ -6310,15 +6287,15 @@ msgstr "_Sledeća fotografija" msgid "T_ools" msgstr "_Alati" -#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:426 -#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:409 ui/offline.ui:188 -#: ui/photo.ui:392 ui/tags.ui:428 ui/trash.ui:197 +#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:428 +#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188 +#: ui/photo.ui:394 ui/tags.ui:430 ui/trash.ui:197 msgid "_Frequently Asked Questions" msgstr "_Često postaljana pitanja" -#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:430 -#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:413 ui/offline.ui:192 -#: ui/photo.ui:396 ui/tags.ui:432 ui/trash.ui:201 +#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:432 +#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192 +#: ui/photo.ui:398 ui/tags.ui:434 ui/trash.ui:201 msgid "_Report a Problem…" msgstr "_Prijavi problem…" @@ -6398,8 +6375,7 @@ msgstr "_Rastuće" msgid "D_escending" msgstr "_Opadajuće" -#: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371 -#: ui/top.ui:30 +#: ui/events_directory.ui:132 ui/event.ui:379 ui/media.ui:373 ui/tags.ui:373 msgid "Even_ts" msgstr "_Događaji" @@ -6412,8 +6388,8 @@ msgstr "Ukloni iz _fototeke" msgid "_Titles" msgstr "_Naslovi" -#: ui/event.ui:139 ui/event.ui:402 ui/media.ui:139 ui/media.ui:385 -#: ui/photo.ui:369 ui/tags.ui:139 ui/tags.ui:385 ui/top.ui:35 +#: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387 +#: ui/photo.ui:371 ui/tags.ui:139 ui/tags.ui:387 msgid "Ta_gs" msgstr "_Oznake" @@ -6442,7 +6418,7 @@ msgstr "Prema _oceni" msgid "_Descending" msgstr "_Opadajuće" -#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275 ui/top.ui:25 +#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275 msgid "_Photos" msgstr "_Fotografije" @@ -6450,6 +6426,56 @@ msgstr "_Fotografije" msgid "_Stop Import" msgstr "_Zaustavi uvoz" +#: ui/printing_widget.ui:19 +msgid "<b>Printed Image Size</b>" +msgstr "<b>Veličina odštampane fotografije</b>" + +#: ui/printing_widget.ui:36 +msgid "Use a _standard size:" +msgstr "Koristi _uobičajenu veličinu:" + +#: ui/printing_widget.ui:80 +msgid "Use a c_ustom size:" +msgstr "Koristi _proizvoljnu veličinu:" + +#. Abbrevation for "inch" +#: ui/printing_widget.ui:146 +msgid "in." +msgstr "inč" + +#. Abbrevation for "centimeters" +#: ui/printing_widget.ui:147 +msgid "cm" +msgstr "cm" + +#: ui/printing_widget.ui:173 +msgid "_Match photo aspect ratio" +msgstr "_Odgovara srazmeri fotografije" + +#: ui/printing_widget.ui:197 +msgid "_Autosize:" +msgstr "_Samostalna veličina:" + +#: ui/printing_widget.ui:237 +msgid "<b>Titles</b>" +msgstr "<b>Naslovi</b>" + +#: ui/printing_widget.ui:254 +msgid "Print image _title" +msgstr "Štampaj _nazive fotografija" + +#: ui/printing_widget.ui:297 +msgid "<b>Pixel Resolution</b>" +msgstr "<b>Rezolucija u tačkicama</b>" + +#: ui/printing_widget.ui:317 +msgid "_Output photo at:" +msgstr "_Štampaj fotografije u:" + +#: ui/printing_widget.ui:351 +msgid "pixels per inch" +msgstr "tačkica po inču" + #: ui/set_background_dialog.ui:9 msgid "Set as Desktop Background" msgstr "Postavi za pozadinu" @@ -6559,79 +6585,39 @@ msgstr "Spoljni uređivači" msgid "Plugins" msgstr "Priključci" -#: ui/shotwell.ui:583 -msgid "<b>Printed Image Size</b>" -msgstr "<b>Veličina odštampane fotografije</b>" - -#: ui/shotwell.ui:600 -msgid "Use a _standard size:" -msgstr "Koristi _uobičajenu veličinu:" - -#: ui/shotwell.ui:643 -msgid "Use a c_ustom size:" -msgstr "Koristi _proizvoljnu veličinu:" - -#: ui/shotwell.ui:731 -msgid "_Match photo aspect ratio" -msgstr "_Odgovara srazmeri fotografije" - -#: ui/shotwell.ui:755 -msgid "_Autosize:" -msgstr "_Samostalna veličina:" - -#: ui/shotwell.ui:795 -msgid "<b>Titles</b>" -msgstr "<b>Naslovi</b>" - -#: ui/shotwell.ui:812 -msgid "Print image _title" -msgstr "Štampaj _nazive fotografija" - -#: ui/shotwell.ui:855 -msgid "<b>Pixel Resolution</b>" -msgstr "<b>Rezolucija u tačkicama</b>" - -#: ui/shotwell.ui:875 -msgid "_Output photo at:" -msgstr "_Štampaj fotografije u:" - -#: ui/shotwell.ui:909 -msgid "pixels per inch" -msgstr "tačkica po inču" - -#: ui/shotwell.ui:949 +#: ui/shotwell.ui:590 msgid "_Name of search:" msgstr "_Naziv pretrage:" -#: ui/shotwell.ui:1003 +#: ui/shotwell.ui:644 msgid "_Match" msgstr "_Poklapa" -#: ui/shotwell.ui:1030 +#: ui/shotwell.ui:671 msgid "of the following:" msgstr "od sledećeg:" -#: ui/shotwell.ui:1111 +#: ui/shotwell.ui:752 msgid "label" msgstr "natpis" -#: ui/shotwell.ui:1262 +#: ui/shotwell.ui:903 msgid "_Delay:" msgstr "_Zastoj:" -#: ui/shotwell.ui:1276 +#: ui/shotwell.ui:917 msgid "_Transition effect:" msgstr "_Dejstvo prelaza:" -#: ui/shotwell.ui:1290 +#: ui/shotwell.ui:931 msgid "Transition d_elay:" msgstr "_Zastoj prelaza:" -#: ui/shotwell.ui:1300 +#: ui/shotwell.ui:941 msgid "Show t_itle" msgstr "Prikaži _naslov" -#: ui/shotwell.ui:1375 ui/shotwell.ui:1386 +#: ui/shotwell.ui:1016 ui/shotwell.ui:1027 msgid "seconds" msgstr "sekunde" diff --git a/src/BatchImport.c b/src/BatchImport.c index 382a63c..0f80e48 100644 --- a/src/BatchImport.c +++ b/src/BatchImport.c @@ -2124,9 +2124,9 @@ enum { }; static void work_sniffer_real_execute (BackgroundJob* base); static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GError** error); -static gint __lambda10_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b); +static gint __lambda11_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b); gint utf8_cs_compare (void* a, void* b); -static gint ___lambda10__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); +static gint ___lambda11__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); void disassemble_filename (const gchar* basename, gchar** name, gchar** ext); gboolean is_string_empty (const gchar* s); gpointer photo_file_format_properties_ref (gpointer instance); @@ -11771,7 +11771,7 @@ WorkSniffer* work_sniffer_new (BatchImport* owner, GeeIterable* jobs, Completion } -static gint __lambda10_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b) { +static gint __lambda11_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b) { gint result = 0; FileToPrepare* file_a = NULL; FileToPrepare* _tmp0_ = NULL; @@ -11826,9 +11826,9 @@ static gint __lambda10_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b) } -static gint ___lambda10__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gint ___lambda11__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { gint result; - result = __lambda10_ ((WorkSniffer*) self, (FileToPrepare*) a, (FileToPrepare*) b); + result = __lambda11_ ((WorkSniffer*) self, (FileToPrepare*) a, (FileToPrepare*) b); #line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; #line 11828 "BatchImport.c" @@ -12106,7 +12106,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) { #line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp42_ = sorted; #line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_list_sort (_tmp42_, ___lambda10__gcompare_data_func, background_job_ref (self), background_job_unref); + gee_list_sort (_tmp42_, ___lambda11__gcompare_data_func, background_job_ref (self), background_job_unref); #line 12104 "BatchImport.c" { gint i = 0; diff --git a/src/DirectoryMonitor.c b/src/DirectoryMonitor.c index 6467ece..045e3ec 100644 --- a/src/DirectoryMonitor.c +++ b/src/DirectoryMonitor.c @@ -395,10 +395,10 @@ struct _DirectoryMonitorExploreAsyncData { gchar* _tmp29_; gchar* _tmp30_; gboolean _tmp31_; - GFile* _tmp32_; - gchar* _tmp33_; + GFileInfo* _tmp32_; + GFile* _tmp33_; gchar* _tmp34_; - gboolean _tmp35_; + gchar* _tmp35_; GFileInfo* _tmp36_; GFileType _tmp37_; const gchar* _tmp38_; @@ -429,83 +429,91 @@ struct _DirectoryMonitorExploreAsyncData { GFileInfo* _tmp57_; GFileInfo* info; GFileInfo* _tmp58_; - gboolean _tmp59_; - GFile* _tmp60_; - GFileInfo* _tmp61_; - const gchar* _tmp62_; + gchar* _tmp59_; + gchar* _tmp60_; + gboolean _tmp61_; + GFileInfo* _tmp62_; GFile* _tmp63_; - GFile* _tmp64_; + gchar* _tmp64_; gchar* _tmp65_; - gchar* _tmp66_; - GFileInfo* _tmp67_; - gboolean _tmp68_; + GFileInfo* _tmp66_; + gboolean _tmp67_; + GFile* _tmp68_; GFileInfo* _tmp69_; - GFileType _tmp70_; - GeeHashMap* _tmp71_; - GeeHashMap* _tmp72_; - GeeHashMap* _tmp73_; - GFile* _tmp74_; + const gchar* _tmp70_; + GFile* _tmp71_; + GFile* _tmp72_; + gchar* _tmp73_; + gchar* _tmp74_; GFileInfo* _tmp75_; - const gchar* _tmp76_; - GFile* _tmp77_; - GFile* _tmp78_; - GFileInfo* _tmp79_; + gboolean _tmp76_; + GFileInfo* _tmp77_; + GFileType _tmp78_; + GeeHashMap* _tmp79_; GeeHashMap* _tmp80_; GeeHashMap* _tmp81_; - GeeHashMap* _tmp82_; - GFile* _tmp83_; - GFileInfo* _tmp84_; - const gchar* _tmp85_; + GFile* _tmp82_; + GFileInfo* _tmp83_; + const gchar* _tmp84_; + GFile* _tmp85_; GFile* _tmp86_; - GFile* _tmp87_; - GFileInfo* _tmp88_; - GError* err2; - GFile* _tmp89_; - gchar* _tmp90_; - gchar* _tmp91_; - GError* _tmp92_; + GFileInfo* _tmp87_; + GeeHashMap* _tmp88_; + GeeHashMap* _tmp89_; + GeeHashMap* _tmp90_; + GFile* _tmp91_; + GFileInfo* _tmp92_; const gchar* _tmp93_; - gboolean _tmp94_; - gboolean _tmp95_; - GFile* _tmp96_; - GFileInfo* _tmp97_; - GFile* _tmp98_; - GFileInfo* _tmp99_; - GFile* _tmp100_; - GFileInfo* _tmp101_; - GeeHashMap* _tmp102_; - GeeHashMap* _tmp103_; - gboolean _tmp104_; - gboolean _tmp105_; - gboolean _tmp106_; - GeeHashMap* _tmp107_; + GFile* _tmp94_; + GFile* _tmp95_; + GFileInfo* _tmp96_; + GError* err2; + GFile* _tmp97_; + gchar* _tmp98_; + gchar* _tmp99_; + GError* _tmp100_; + const gchar* _tmp101_; + gboolean _tmp102_; + gboolean _tmp103_; + GFile* _tmp104_; + GFileInfo* _tmp105_; + GFile* _tmp106_; + GFileInfo* _tmp107_; + GFile* _tmp108_; + GFileInfo* _tmp109_; + GeeHashMap* _tmp110_; + GeeHashMap* _tmp111_; + gboolean _tmp112_; + gboolean _tmp113_; + gboolean _tmp114_; + GeeHashMap* _tmp115_; GeeIterator* _subdir_it; - GeeHashMap* _tmp108_; - GeeSet* _tmp109_; - GeeSet* _tmp110_; - GeeSet* _tmp111_; - GeeIterator* _tmp112_; - GeeIterator* _tmp113_; - GeeIterator* _tmp114_; - gboolean _tmp115_; + GeeHashMap* _tmp116_; + GeeSet* _tmp117_; + GeeSet* _tmp118_; + GeeSet* _tmp119_; + GeeIterator* _tmp120_; + GeeIterator* _tmp121_; + GeeIterator* _tmp122_; + gboolean _tmp123_; GFile* subdir; - GeeIterator* _tmp116_; - gpointer _tmp117_; - gint _tmp118_; - gint _tmp119_; - GFile* _tmp120_; - GeeHashMap* _tmp121_; - GFile* _tmp122_; - gpointer _tmp123_; - GFileInfo* _tmp124_; - gboolean _tmp125_; - GFile* _tmp126_; - GeeHashMap* _tmp127_; + GeeIterator* _tmp124_; + gpointer _tmp125_; + gint _tmp126_; + gint _tmp127_; GFile* _tmp128_; - gpointer _tmp129_; - GFileInfo* _tmp130_; - gboolean _tmp131_; - gboolean _tmp132_; + GeeHashMap* _tmp129_; + GFile* _tmp130_; + gpointer _tmp131_; + GFileInfo* _tmp132_; + gboolean _tmp133_; + GFile* _tmp134_; + GeeHashMap* _tmp135_; + GFile* _tmp136_; + gpointer _tmp137_; + GFileInfo* _tmp138_; + gboolean _tmp139_; + gboolean _tmp140_; GError * _inner_error_; }; @@ -796,9 +804,9 @@ static GType directory_monitor_ftype_get_type (void) { static gpointer _g_object_ref0 (gpointer self) { -#line 459 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 465 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return self ? g_object_ref (self) : NULL; -#line 802 "DirectoryMonitor.c" +#line 810 "DirectoryMonitor.c" } @@ -808,73 +816,73 @@ DirectoryMonitor* directory_monitor_construct (GType object_type, GFile* root, g GFile* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; -#line 458 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE (root), NULL); -#line 458 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self = (DirectoryMonitor*) g_object_new (object_type, NULL); -#line 459 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 465 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = root; -#line 459 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 465 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 459 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 465 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (self->priv->root); -#line 459 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 465 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->root = _tmp1_; -#line 460 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 466 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = recurse; -#line 460 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 466 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->recurse = _tmp2_; -#line 461 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 467 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = monitoring; -#line 461 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 467 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->monitoring = _tmp3_; -#line 458 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return self; -#line 834 "DirectoryMonitor.c" +#line 842 "DirectoryMonitor.c" } DirectoryMonitor* directory_monitor_new (GFile* root, gboolean recurse, gboolean monitoring) { -#line 458 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return directory_monitor_construct (TYPE_DIRECTORY_MONITOR, root, recurse, monitoring); -#line 841 "DirectoryMonitor.c" +#line 849 "DirectoryMonitor.c" } void directory_monitor_mdbg (const gchar* msg) { -#line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 470 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (msg != NULL); -#line 848 "DirectoryMonitor.c" +#line 856 "DirectoryMonitor.c" } gboolean directory_monitor_is_recursive (DirectoryMonitor* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 470 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 476 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); -#line 471 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 477 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->recurse; -#line 471 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 477 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = _tmp0_; -#line 471 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 477 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 863 "DirectoryMonitor.c" +#line 871 "DirectoryMonitor.c" } gboolean directory_monitor_is_monitoring (DirectoryMonitor* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 474 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 480 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); -#line 475 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 481 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->monitoring; -#line 475 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 481 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = _tmp0_; -#line 475 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 481 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 878 "DirectoryMonitor.c" +#line 886 "DirectoryMonitor.c" } @@ -883,32 +891,32 @@ static void directory_monitor_real_notify_root_deleted (DirectoryMonitor* self, GFile* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; GFile* _tmp3_ = NULL; -#line 478 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 484 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (root)); -#line 479 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->root; -#line 479 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = root; -#line 479 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = g_file_equal (_tmp0_, _tmp1_); -#line 479 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp2_, "this.root.equal(root)"); -#line 481 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 487 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg ("root deleted"); -#line 482 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 488 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = root; -#line 482 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 488 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit_by_name (self, "root-deleted", _tmp3_); -#line 903 "DirectoryMonitor.c" +#line 911 "DirectoryMonitor.c" } void directory_monitor_notify_root_deleted (DirectoryMonitor* self, GFile* root) { -#line 478 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 484 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 478 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 484 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_root_deleted (self, root); -#line 912 "DirectoryMonitor.c" +#line 920 "DirectoryMonitor.c" } @@ -927,53 +935,53 @@ static void directory_monitor_internal_notify_root_moved (DirectoryMonitor* self GFile* _tmp9_ = NULL; GFile* _tmp10_ = NULL; GFileInfo* _tmp11_ = NULL; -#line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 491 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 491 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (old_root)); -#line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 491 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (new_root)); -#line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 491 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_root_info)); -#line 486 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 492 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->files; -#line 486 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 492 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = old_root; -#line 486 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 492 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = directory_monitor_file_info_map_remove (_tmp0_, _tmp1_, NULL); -#line 486 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 492 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" removed = _tmp2_; -#line 487 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 493 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (removed, "removed"); -#line 489 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 495 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = self->priv->files; -#line 489 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 495 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = new_root; -#line 489 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 495 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = new_root_info; -#line 489 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 495 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = directory_monitor_file_info_map_update (_tmp3_, _tmp4_, _tmp5_); -#line 489 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 495 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" updated = _tmp6_; -#line 490 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 496 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (updated, "updated"); -#line 492 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 498 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = new_root; -#line 492 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 498 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = _g_object_ref0 (_tmp7_); -#line 492 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 498 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (self->priv->root); -#line 492 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 498 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->root = _tmp8_; -#line 494 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = old_root; -#line 494 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = new_root; -#line 494 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp11_ = new_root_info; -#line 494 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_root_moved (self, _tmp9_, _tmp10_, _tmp11_); -#line 977 "DirectoryMonitor.c" +#line 985 "DirectoryMonitor.c" } @@ -992,80 +1000,80 @@ static void directory_monitor_real_notify_root_moved (DirectoryMonitor* self, GF GFile* _tmp11_ = NULL; GFile* _tmp12_ = NULL; GFileInfo* _tmp13_ = NULL; -#line 497 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 503 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (old_root)); -#line 497 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 503 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (new_root)); -#line 497 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 503 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_root_info)); -#line 498 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 504 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->root; -#line 498 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 504 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = old_root; -#line 498 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 504 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = g_file_equal (_tmp0_, _tmp1_); -#line 498 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 504 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp2_, "this.root.equal(old_root)"); -#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = old_root; -#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = g_file_get_path (_tmp3_); -#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = _tmp4_; -#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = new_root; -#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = g_file_get_path (_tmp6_); -#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = _tmp7_; -#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = g_strdup_printf ("root moved: %s -> %s", _tmp5_, _tmp8_); -#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = _tmp9_; -#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp10_); -#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp10_); -#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp8_); -#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp5_); -#line 501 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 507 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp11_ = old_root; -#line 501 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 507 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = new_root; -#line 501 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 507 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = new_root_info; -#line 501 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 507 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit_by_name (self, "root-moved", _tmp11_, _tmp12_, _tmp13_); -#line 1042 "DirectoryMonitor.c" +#line 1050 "DirectoryMonitor.c" } void directory_monitor_notify_root_moved (DirectoryMonitor* self, GFile* old_root, GFile* new_root, GFileInfo* new_root_info) { -#line 497 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 503 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 497 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 503 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_root_moved (self, old_root, new_root, new_root_info); -#line 1051 "DirectoryMonitor.c" +#line 1059 "DirectoryMonitor.c" } static void directory_monitor_real_notify_discovery_started (DirectoryMonitor* self) { -#line 505 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 511 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg ("discovery started"); -#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 512 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit_by_name (self, "discovery-started"); -#line 1060 "DirectoryMonitor.c" +#line 1068 "DirectoryMonitor.c" } void directory_monitor_notify_discovery_started (DirectoryMonitor* self) { -#line 504 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 510 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 504 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 510 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_discovery_started (self); -#line 1069 "DirectoryMonitor.c" +#line 1077 "DirectoryMonitor.c" } @@ -1076,55 +1084,55 @@ static void directory_monitor_real_internal_notify_file_discovered (DirectoryMon gboolean _tmp3_ = FALSE; GFile* _tmp7_ = NULL; GFileInfo* _tmp8_ = NULL; -#line 509 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 515 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 509 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 515 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 510 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 516 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->files; -#line 510 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 516 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = file; -#line 510 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 516 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = info; -#line 510 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 516 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = directory_monitor_file_info_map_update (_tmp0_, _tmp1_, _tmp2_); -#line 510 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 516 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_tmp3_) { -#line 1094 "DirectoryMonitor.c" +#line 1102 "DirectoryMonitor.c" GFile* _tmp4_ = NULL; gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 511 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = file; -#line 511 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = g_file_get_path (_tmp4_); -#line 511 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = _tmp5_; -#line 511 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_debug ("DirectoryMonitor.vala:511: DirectoryMonitor.internal_notify_file_disco" \ +#line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_debug ("DirectoryMonitor.vala:517: DirectoryMonitor.internal_notify_file_disco" \ "vered: %s discovered but not added to file map", _tmp6_); -#line 511 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp6_); -#line 514 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 520 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return; -#line 1110 "DirectoryMonitor.c" +#line 1118 "DirectoryMonitor.c" } -#line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 523 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = file; -#line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 523 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = info; -#line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 523 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_file_discovered (self, _tmp7_, _tmp8_); -#line 1118 "DirectoryMonitor.c" +#line 1126 "DirectoryMonitor.c" } void directory_monitor_internal_notify_file_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info) { -#line 509 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 515 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 509 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 515 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->internal_notify_file_discovered (self, file, info); -#line 1127 "DirectoryMonitor.c" +#line 1135 "DirectoryMonitor.c" } @@ -1136,42 +1144,42 @@ static void directory_monitor_real_notify_file_discovered (DirectoryMonitor* sel gchar* _tmp4_ = NULL; GFile* _tmp5_ = NULL; GFileInfo* _tmp6_ = NULL; -#line 520 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 520 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 521 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = file; -#line 521 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = g_file_get_path (_tmp0_); -#line 521 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp1_; -#line 521 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = g_strdup_printf ("file discovered: %s", _tmp2_); -#line 521 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = _tmp3_; -#line 521 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp4_); -#line 521 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp4_); -#line 521 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp2_); -#line 522 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 528 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = file; -#line 522 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 528 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = info; -#line 522 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 528 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit_by_name (self, "file-discovered", _tmp5_, _tmp6_); -#line 1165 "DirectoryMonitor.c" +#line 1173 "DirectoryMonitor.c" } void directory_monitor_notify_file_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info) { -#line 520 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 520 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_discovered (self, file, info); -#line 1174 "DirectoryMonitor.c" +#line 1182 "DirectoryMonitor.c" } @@ -1183,38 +1191,38 @@ static void directory_monitor_real_internal_notify_directory_discovered (Directo gboolean _tmp3_ = FALSE; GFile* _tmp4_ = NULL; GFileInfo* _tmp5_ = NULL; -#line 525 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 531 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 525 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 531 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->files; -#line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = dir; -#line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = info; -#line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = directory_monitor_file_info_map_update (_tmp0_, _tmp1_, _tmp2_); -#line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" updated = _tmp3_; -#line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 533 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (updated, "updated"); -#line 529 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 535 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = dir; -#line 529 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 535 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = info; -#line 529 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 535 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_directory_discovered (self, _tmp4_, _tmp5_); -#line 1208 "DirectoryMonitor.c" +#line 1216 "DirectoryMonitor.c" } void directory_monitor_internal_notify_directory_discovered (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { -#line 525 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 531 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 525 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 531 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->internal_notify_directory_discovered (self, dir, info); -#line 1217 "DirectoryMonitor.c" +#line 1225 "DirectoryMonitor.c" } @@ -1226,84 +1234,84 @@ static void directory_monitor_real_notify_directory_discovered (DirectoryMonitor gchar* _tmp4_ = NULL; GFile* _tmp5_ = NULL; GFileInfo* _tmp6_ = NULL; -#line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 533 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = dir; -#line 533 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = g_file_get_path (_tmp0_); -#line 533 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp1_; -#line 533 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = g_strdup_printf ("directory discovered: %s", _tmp2_); -#line 533 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = _tmp3_; -#line 533 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp4_); -#line 533 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp4_); -#line 533 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp2_); -#line 534 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 540 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = dir; -#line 534 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 540 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = info; -#line 534 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 540 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit_by_name (self, "directory-discovered", _tmp5_, _tmp6_); -#line 1255 "DirectoryMonitor.c" +#line 1263 "DirectoryMonitor.c" } void directory_monitor_notify_directory_discovered (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { -#line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_discovered (self, dir, info); -#line 1264 "DirectoryMonitor.c" +#line 1272 "DirectoryMonitor.c" } static void directory_monitor_real_notify_discovery_failed (DirectoryMonitor* self, const gchar* reason) { const gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 537 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 543 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (reason != NULL); -#line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 544 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = reason; -#line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:538: discovery failed: %s", _tmp0_); -#line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 544 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_warning ("DirectoryMonitor.vala:544: discovery failed: %s", _tmp0_); +#line 545 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = reason; -#line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 545 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit_by_name (self, "discovery-failed", _tmp1_); -#line 1281 "DirectoryMonitor.c" +#line 1289 "DirectoryMonitor.c" } void directory_monitor_notify_discovery_failed (DirectoryMonitor* self, const gchar* reason) { -#line 537 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 543 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 537 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 543 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_discovery_failed (self, reason); -#line 1290 "DirectoryMonitor.c" +#line 1298 "DirectoryMonitor.c" } static void directory_monitor_real_notify_discovery_completed (DirectoryMonitor* self) { -#line 543 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 549 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit_by_name (self, "discovery-completed"); -#line 1297 "DirectoryMonitor.c" +#line 1305 "DirectoryMonitor.c" } void directory_monitor_notify_discovery_completed (DirectoryMonitor* self) { -#line 542 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 548 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 542 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 548 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_discovery_completed (self); -#line 1306 "DirectoryMonitor.c" +#line 1314 "DirectoryMonitor.c" } @@ -1315,41 +1323,41 @@ static void directory_monitor_internal_notify_file_created (DirectoryMonitor* se GFile* _tmp2_ = NULL; GFileInfo* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 546 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 546 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 546 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 549 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = file; -#line 549 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = info; -#line 549 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = directory_monitor_is_file_create_move (self, _tmp0_, _tmp1_, &_tmp2_, &_tmp3_); -#line 549 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_file); -#line 549 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" old_file = _tmp2_; -#line 549 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_file_info); -#line 549 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" old_file_info = _tmp3_; -#line 549 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp4_) { -#line 1340 "DirectoryMonitor.c" +#line 1348 "DirectoryMonitor.c" GFile* _tmp5_ = NULL; GFile* _tmp6_ = NULL; GFileInfo* _tmp7_ = NULL; -#line 550 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 556 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = old_file; -#line 550 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 556 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = file; -#line 550 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 556 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = info; -#line 550 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 556 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_internal_notify_file_moved (self, _tmp5_, _tmp6_, _tmp7_); -#line 1352 "DirectoryMonitor.c" +#line 1360 "DirectoryMonitor.c" } else { gboolean updated = FALSE; DirectoryMonitorFileInfoMap* _tmp8_ = NULL; @@ -1359,33 +1367,33 @@ static void directory_monitor_internal_notify_file_created (DirectoryMonitor* se gboolean _tmp12_ = FALSE; GFile* _tmp13_ = NULL; GFileInfo* _tmp14_ = NULL; -#line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 558 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = self->priv->files; -#line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 558 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = file; -#line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 558 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = info; -#line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 558 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp11_ = directory_monitor_file_info_map_update (_tmp8_, _tmp9_, _tmp10_); -#line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 558 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" updated = _tmp11_; -#line 553 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 559 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = updated; -#line 553 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 559 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp12_, "updated"); -#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 561 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = file; -#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 561 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp14_ = info; -#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 561 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_file_created (self, _tmp13_, _tmp14_); -#line 1382 "DirectoryMonitor.c" +#line 1390 "DirectoryMonitor.c" } -#line 546 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_file_info); -#line 546 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_file); -#line 1388 "DirectoryMonitor.c" +#line 1396 "DirectoryMonitor.c" } @@ -1397,42 +1405,42 @@ static void directory_monitor_real_notify_file_created (DirectoryMonitor* self, gchar* _tmp4_ = NULL; GFile* _tmp5_ = NULL; GFileInfo* _tmp6_ = NULL; -#line 559 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 565 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 559 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 565 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 560 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = file; -#line 560 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = g_file_get_path (_tmp0_); -#line 560 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp1_; -#line 560 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = g_strdup_printf ("file created: %s", _tmp2_); -#line 560 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = _tmp3_; -#line 560 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp4_); -#line 560 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp4_); -#line 560 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp2_); -#line 561 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 567 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = file; -#line 561 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 567 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = info; -#line 561 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 567 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit_by_name (self, "file-created", _tmp5_, _tmp6_); -#line 1426 "DirectoryMonitor.c" +#line 1434 "DirectoryMonitor.c" } void directory_monitor_notify_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info) { -#line 559 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 565 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 559 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 565 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_created (self, file, info); -#line 1435 "DirectoryMonitor.c" +#line 1443 "DirectoryMonitor.c" } @@ -1447,41 +1455,41 @@ static void directory_monitor_internal_notify_file_moved (DirectoryMonitor* self GFile* _tmp6_ = NULL; GFile* _tmp7_ = NULL; GFileInfo* _tmp8_ = NULL; -#line 564 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 570 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 564 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 570 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (old_file)); -#line 564 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 570 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (new_file)); -#line 564 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 570 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_file_info)); -#line 567 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 573 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->files; -#line 567 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 573 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = old_file; -#line 567 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 573 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_remove (_tmp0_, _tmp1_, NULL); -#line 569 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = self->priv->files; -#line 569 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = new_file; -#line 569 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = new_file_info; -#line 569 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = directory_monitor_file_info_map_update (_tmp2_, _tmp3_, _tmp4_); -#line 569 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" updated = _tmp5_; -#line 570 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (updated, "updated"); -#line 572 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 578 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = old_file; -#line 572 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 578 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = new_file; -#line 572 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 578 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = new_file_info; -#line 572 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 578 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_file_moved (self, _tmp6_, _tmp7_, _tmp8_); -#line 1484 "DirectoryMonitor.c" +#line 1492 "DirectoryMonitor.c" } @@ -1497,54 +1505,54 @@ static void directory_monitor_real_notify_file_moved (DirectoryMonitor* self, GF GFile* _tmp8_ = NULL; GFile* _tmp9_ = NULL; GFileInfo* _tmp10_ = NULL; -#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (old_file)); -#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (new_file)); -#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_file_info)); -#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = old_file; -#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = g_file_get_path (_tmp0_); -#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp1_; -#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = new_file; -#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = g_file_get_path (_tmp3_); -#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = _tmp4_; -#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = g_strdup_printf ("file moved: %s -> %s", _tmp2_, _tmp5_); -#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = _tmp6_; -#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp7_); -#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp7_); -#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp5_); -#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp2_); -#line 577 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 583 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = old_file; -#line 577 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 583 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = new_file; -#line 577 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 583 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = new_file_info; -#line 577 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 583 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit_by_name (self, "file-moved", _tmp8_, _tmp9_, _tmp10_); -#line 1538 "DirectoryMonitor.c" +#line 1546 "DirectoryMonitor.c" } void directory_monitor_notify_file_moved (DirectoryMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info) { -#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_moved (self, old_file, new_file, new_file_info); -#line 1547 "DirectoryMonitor.c" +#line 1555 "DirectoryMonitor.c" } @@ -1555,38 +1563,38 @@ static void directory_monitor_real_notify_file_altered (DirectoryMonitor* self, gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; GFile* _tmp5_ = NULL; -#line 580 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = file; -#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = g_file_get_path (_tmp0_); -#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp1_; -#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = g_strdup_printf ("file altered: %s", _tmp2_); -#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = _tmp3_; -#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp4_); -#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp4_); -#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp2_); -#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 588 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = file; -#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 588 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit_by_name (self, "file-altered", _tmp5_); -#line 1580 "DirectoryMonitor.c" +#line 1588 "DirectoryMonitor.c" } void directory_monitor_notify_file_altered (DirectoryMonitor* self, GFile* file) { -#line 580 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 580 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_altered (self, file); -#line 1589 "DirectoryMonitor.c" +#line 1597 "DirectoryMonitor.c" } @@ -1598,31 +1606,31 @@ static void directory_monitor_internal_notify_file_alteration_completed (Directo gboolean _tmp3_ = FALSE; GFile* _tmp4_ = NULL; GFileInfo* _tmp5_ = NULL; -#line 585 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 591 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 585 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 591 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 585 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 591 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->files; -#line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = file; -#line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = info; -#line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = directory_monitor_file_info_map_update (_tmp0_, _tmp1_, _tmp2_); -#line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" updated = _tmp3_; -#line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 593 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (updated, "updated"); -#line 589 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 595 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = file; -#line 589 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 595 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = info; -#line 589 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 595 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_file_alteration_completed (self, _tmp4_, _tmp5_); -#line 1625 "DirectoryMonitor.c" +#line 1633 "DirectoryMonitor.c" } @@ -1634,42 +1642,42 @@ static void directory_monitor_real_notify_file_alteration_completed (DirectoryMo gchar* _tmp4_ = NULL; GFile* _tmp5_ = NULL; GFileInfo* _tmp6_ = NULL; -#line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 593 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = file; -#line 593 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = g_file_get_path (_tmp0_); -#line 593 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp1_; -#line 593 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = g_strdup_printf ("file alteration completed: %s", _tmp2_); -#line 593 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = _tmp3_; -#line 593 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp4_); -#line 593 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp4_); -#line 593 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp2_); -#line 594 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 600 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = file; -#line 594 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 600 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = info; -#line 594 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 600 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit_by_name (self, "file-alteration-completed", _tmp5_, _tmp6_); -#line 1663 "DirectoryMonitor.c" +#line 1671 "DirectoryMonitor.c" } void directory_monitor_notify_file_alteration_completed (DirectoryMonitor* self, GFile* file, GFileInfo* info) { -#line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_alteration_completed (self, file, info); -#line 1672 "DirectoryMonitor.c" +#line 1680 "DirectoryMonitor.c" } @@ -1680,38 +1688,38 @@ static void directory_monitor_real_notify_file_attributes_altered (DirectoryMoni gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; GFile* _tmp5_ = NULL; -#line 597 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 603 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = file; -#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = g_file_get_path (_tmp0_); -#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp1_; -#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = g_strdup_printf ("file attributes altered: %s", _tmp2_); -#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = _tmp3_; -#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp4_); -#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp4_); -#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp2_); -#line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 605 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = file; -#line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 605 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit_by_name (self, "file-attributes-altered", _tmp5_); -#line 1705 "DirectoryMonitor.c" +#line 1713 "DirectoryMonitor.c" } void directory_monitor_notify_file_attributes_altered (DirectoryMonitor* self, GFile* file) { -#line 597 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 603 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 597 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 603 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_attributes_altered (self, file); -#line 1714 "DirectoryMonitor.c" +#line 1722 "DirectoryMonitor.c" } @@ -1721,25 +1729,25 @@ static void directory_monitor_internal_notify_file_deleted (DirectoryMonitor* se GFile* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; GFile* _tmp3_ = NULL; -#line 602 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 608 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 602 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 608 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 603 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 609 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->files; -#line 603 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 609 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = file; -#line 603 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 609 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = directory_monitor_file_info_map_remove (_tmp0_, _tmp1_, NULL); -#line 603 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 609 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" removed = _tmp2_; -#line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 610 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (removed, "removed"); -#line 606 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 612 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = file; -#line 606 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 612 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_file_deleted (self, _tmp3_); -#line 1742 "DirectoryMonitor.c" +#line 1750 "DirectoryMonitor.c" } @@ -1750,38 +1758,38 @@ static void directory_monitor_real_notify_file_deleted (DirectoryMonitor* self, gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; GFile* _tmp5_ = NULL; -#line 609 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 615 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 610 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = file; -#line 610 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = g_file_get_path (_tmp0_); -#line 610 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp1_; -#line 610 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = g_strdup_printf ("file deleted: %s", _tmp2_); -#line 610 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = _tmp3_; -#line 610 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp4_); -#line 610 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp4_); -#line 610 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp2_); -#line 611 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = file; -#line 611 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit_by_name (self, "file-deleted", _tmp5_); -#line 1775 "DirectoryMonitor.c" +#line 1783 "DirectoryMonitor.c" } void directory_monitor_notify_file_deleted (DirectoryMonitor* self, GFile* file) { -#line 609 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 615 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 609 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 615 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_deleted (self, file); -#line 1784 "DirectoryMonitor.c" +#line 1792 "DirectoryMonitor.c" } @@ -1793,29 +1801,29 @@ static void directory_monitor_internal_notify_directory_created (DirectoryMonito GFile* _tmp2_ = NULL; GFileInfo* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 614 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 614 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 614 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = dir; -#line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = info; -#line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = directory_monitor_is_file_create_move (self, _tmp0_, _tmp1_, &_tmp2_, &_tmp3_); -#line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_dir); -#line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" old_dir = _tmp2_; -#line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_dir_info); -#line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" old_dir_info = _tmp3_; -#line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp4_) { -#line 1818 "DirectoryMonitor.c" +#line 1826 "DirectoryMonitor.c" DirectoryMonitorFileInfoMap* _tmp5_ = NULL; GFile* _tmp6_ = NULL; DirectoryMonitorFileInfoMap* _tmp7_ = NULL; @@ -1823,25 +1831,25 @@ static void directory_monitor_internal_notify_directory_created (DirectoryMonito GFileInfo* _tmp9_ = NULL; GFile* _tmp10_ = NULL; GFileInfo* _tmp11_ = NULL; -#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 629 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = self->priv->files; -#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 629 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = old_dir; -#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 629 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = self->priv->parent_moved; -#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 629 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_remove_descendents (_tmp5_, _tmp6_, _tmp7_); -#line 625 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 631 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = old_dir; -#line 625 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 631 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = old_dir_info; -#line 625 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 631 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = dir; -#line 625 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 631 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp11_ = info; -#line 625 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 631 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_internal_notify_directory_moved (self, _tmp8_, _tmp9_, _tmp10_, _tmp11_); -#line 1844 "DirectoryMonitor.c" +#line 1852 "DirectoryMonitor.c" } else { gboolean updated = FALSE; DirectoryMonitorFileInfoMap* _tmp12_ = NULL; @@ -1851,33 +1859,33 @@ static void directory_monitor_internal_notify_directory_created (DirectoryMonito gboolean _tmp16_ = FALSE; GFile* _tmp17_ = NULL; GFileInfo* _tmp18_ = NULL; -#line 627 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 633 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = self->priv->files; -#line 627 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 633 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = dir; -#line 627 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 633 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp14_ = info; -#line 627 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 633 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp15_ = directory_monitor_file_info_map_update (_tmp12_, _tmp13_, _tmp14_); -#line 627 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 633 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" updated = _tmp15_; -#line 628 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 634 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp16_ = updated; -#line 628 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 634 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp16_, "updated"); -#line 630 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 636 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp17_ = dir; -#line 630 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 636 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp18_ = info; -#line 630 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 636 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_directory_created (self, _tmp17_, _tmp18_); -#line 1874 "DirectoryMonitor.c" +#line 1882 "DirectoryMonitor.c" } -#line 614 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_dir_info); -#line 614 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_dir); -#line 1880 "DirectoryMonitor.c" +#line 1888 "DirectoryMonitor.c" } @@ -1889,42 +1897,42 @@ static void directory_monitor_real_notify_directory_created (DirectoryMonitor* s gchar* _tmp4_ = NULL; GFile* _tmp5_ = NULL; GFileInfo* _tmp6_ = NULL; -#line 634 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 640 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 634 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 640 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 635 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = dir; -#line 635 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = g_file_get_path (_tmp0_); -#line 635 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp1_; -#line 635 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = g_strdup_printf ("directory created: %s", _tmp2_); -#line 635 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = _tmp3_; -#line 635 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp4_); -#line 635 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp4_); -#line 635 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp2_); -#line 636 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 642 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = dir; -#line 636 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 642 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = info; -#line 636 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 642 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit_by_name (self, "directory-created", _tmp5_, _tmp6_); -#line 1918 "DirectoryMonitor.c" +#line 1926 "DirectoryMonitor.c" } void directory_monitor_notify_directory_created (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { -#line 634 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 640 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 634 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 640 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_created (self, dir, info); -#line 1927 "DirectoryMonitor.c" +#line 1935 "DirectoryMonitor.c" } @@ -1933,27 +1941,27 @@ static void directory_monitor_internal_notify_directory_moved (DirectoryMonitor* GFileInfo* _tmp1_ = NULL; GFile* _tmp2_ = NULL; GFileInfo* _tmp3_ = NULL; -#line 639 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 645 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 639 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 645 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (old_dir)); -#line 639 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 645 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (old_dir_info)); -#line 639 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 645 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (new_dir)); -#line 639 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 645 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_dir_info)); -#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = old_dir; -#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = old_dir_info; -#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = new_dir; -#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = new_dir_info; -#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_internal_notify_directory_moved (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_, NULL, NULL); -#line 1956 "DirectoryMonitor.c" +#line 1964 "DirectoryMonitor.c" } @@ -1972,7 +1980,7 @@ static void directory_monitor_async_internal_notify_directory_moved_data_free (g _g_object_unref0 (_data_->self); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_slice_free (DirectoryMonitorAsyncInternalNotifyDirectoryMovedData, _data_); -#line 1975 "DirectoryMonitor.c" +#line 1983 "DirectoryMonitor.c" } @@ -2031,7 +2039,7 @@ static void directory_monitor_async_internal_notify_directory_moved (DirectoryMo _data_->new_dir_info = _tmp8_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_internal_notify_directory_moved_co (_data_); -#line 2034 "DirectoryMonitor.c" +#line 2042 "DirectoryMonitor.c" } @@ -2039,521 +2047,521 @@ static void directory_monitor_async_internal_notify_directory_moved_finish (Dire DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _data_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 2042 "DirectoryMonitor.c" +#line 2050 "DirectoryMonitor.c" } static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { gboolean result; result = file_equal ((GFile*) a, (GFile*) b); -#line 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 652 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 2051 "DirectoryMonitor.c" +#line 2059 "DirectoryMonitor.c" } static void directory_monitor_async_internal_notify_directory_moved_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _data_; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = _user_data_; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_source_object_ = source_object; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_res_ = _res_; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_internal_notify_directory_moved_co (_data_); -#line 2065 "DirectoryMonitor.c" +#line 2073 "DirectoryMonitor.c" } static gboolean _directory_monitor_async_internal_notify_directory_moved_co_gsource_func (gpointer self) { gboolean result; result = directory_monitor_async_internal_notify_directory_moved_co (self); -#line 677 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 683 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 2074 "DirectoryMonitor.c" +#line 2082 "DirectoryMonitor.c" } static gboolean directory_monitor_async_internal_notify_directory_moved_co (DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _data_) { -#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" switch (_data_->_state_) { -#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 0: -#line 2083 "DirectoryMonitor.c" +#line 2091 "DirectoryMonitor.c" goto _state_0; -#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 1: -#line 2087 "DirectoryMonitor.c" +#line 2095 "DirectoryMonitor.c" goto _state_1; -#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 2: -#line 2091 "DirectoryMonitor.c" +#line 2099 "DirectoryMonitor.c" goto _state_2; default: -#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_assert_not_reached (); -#line 2096 "DirectoryMonitor.c" +#line 2104 "DirectoryMonitor.c" } _state_0: -#line 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 652 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp0_ = NULL; -#line 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 652 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); -#line 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 652 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->file_children = _data_->_tmp0_; -#line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp1_ = NULL; -#line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); -#line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->dir_children = _data_->_tmp1_; -#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp2_ = NULL; -#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp2_ = _data_->self->priv->files; -#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp3_ = NULL; -#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp3_ = _data_->old_dir; -#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp4_ = NULL; -#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp4_ = _data_->file_children; -#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp5_ = NULL; -#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp5_ = _data_->dir_children; -#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp6_ = 0; -#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp6_ = directory_monitor_file_info_map_get_children (_data_->_tmp2_, _data_->_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->count = _data_->_tmp6_; -#line 649 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 655 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp7_ = 0; -#line 649 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 655 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp7_ = _data_->count; -#line 649 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 655 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_tmp7_ > 0) { -#line 2139 "DirectoryMonitor.c" +#line 2147 "DirectoryMonitor.c" { -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp8_ = NULL; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp8_ = _data_->dir_children; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp9_ = NULL; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp9_ = _g_object_ref0 (_data_->_tmp8_); -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_dir_child_list = _data_->_tmp9_; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp10_ = NULL; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp10_ = _data_->_dir_child_list; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp11_ = 0; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp12_ = 0; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp12_ = _data_->_tmp11_; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_dir_child_size = _data_->_tmp12_; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_dir_child_index = -1; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp13_ = 0; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp13_ = _data_->_dir_child_index; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_dir_child_index = _data_->_tmp13_ + 1; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp14_ = 0; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp14_ = _data_->_dir_child_index; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp15_ = 0; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp15_ = _data_->_dir_child_size; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!(_data_->_tmp14_ < _data_->_tmp15_)) { -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 2187 "DirectoryMonitor.c" +#line 2195 "DirectoryMonitor.c" } -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp16_ = NULL; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp16_ = _data_->_dir_child_list; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp17_ = 0; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp17_ = _data_->_dir_child_index; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp18_ = NULL; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp18_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp17_); -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->dir_child = (GFile*) _data_->_tmp18_; -#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp19_ = NULL; -#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp19_ = _data_->self->priv->files; -#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp20_ = NULL; -#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp20_ = _data_->dir_child; -#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp21_ = NULL; -#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp21_ = directory_monitor_file_info_map_get_info (_data_->_tmp19_, _data_->_tmp20_); -#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->dir_info = _data_->_tmp21_; -#line 655 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp22_ = NULL; -#line 655 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp22_ = _data_->dir_info; -#line 655 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_tmp22_ == NULL) { -#line 656 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp23_ = NULL; -#line 656 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp23_ = _data_->dir_child; -#line 656 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp24_ = NULL; -#line 656 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp24_ = g_file_get_path (_data_->_tmp23_); -#line 656 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp25_ = NULL; -#line 656 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp25_ = _data_->_tmp24_; -#line 656 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:656: Unable to retrieve directory-moved info for" \ +#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_warning ("DirectoryMonitor.vala:662: Unable to retrieve directory-moved info for" \ " %s", _data_->_tmp25_); -#line 656 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_data_->_tmp25_); -#line 658 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 664 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_info); -#line 658 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 664 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_child); -#line 658 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 664 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 2245 "DirectoryMonitor.c" +#line 2253 "DirectoryMonitor.c" } -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp26_ = NULL; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp26_ = _data_->dir_child; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp27_ = NULL; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp27_ = _data_->dir_info; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp28_ = NULL; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp28_ = _data_->new_dir; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp29_ = NULL; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp29_ = _data_->dir_child; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp30_ = NULL; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp30_ = g_file_get_basename (_data_->_tmp29_); -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp31_ = NULL; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp31_ = _data_->_tmp30_; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp32_ = NULL; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp32_ = g_file_get_child (_data_->_tmp28_, _data_->_tmp31_); -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp33_ = NULL; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp33_ = _data_->_tmp32_; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp34_ = NULL; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp34_ = _data_->dir_info; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 1; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_internal_notify_directory_moved (_data_->self, _data_->_tmp26_, _data_->_tmp27_, _data_->_tmp33_, _data_->_tmp34_, directory_monitor_async_internal_notify_directory_moved_ready, _data_); -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 2289 "DirectoryMonitor.c" +#line 2297 "DirectoryMonitor.c" _state_1: -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_internal_notify_directory_moved_finish (_data_->self, _data_->_res_); -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_tmp33_); -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_data_->_tmp31_); -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_info); -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_child); -#line 2301 "DirectoryMonitor.c" +#line 2309 "DirectoryMonitor.c" } -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_dir_child_list); -#line 2305 "DirectoryMonitor.c" +#line 2313 "DirectoryMonitor.c" } { -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp35_ = NULL; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp35_ = _data_->file_children; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp36_ = NULL; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp36_ = _g_object_ref0 (_data_->_tmp35_); -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_file_child_list = _data_->_tmp36_; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp37_ = NULL; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp37_ = _data_->_file_child_list; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp38_ = 0; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp38_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp39_ = 0; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp39_ = _data_->_tmp38_; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_file_child_size = _data_->_tmp39_; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_file_child_index = -1; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp40_ = 0; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp40_ = _data_->_file_child_index; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_file_child_index = _data_->_tmp40_ + 1; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp41_ = 0; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp41_ = _data_->_file_child_index; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp42_ = 0; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp42_ = _data_->_file_child_size; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!(_data_->_tmp41_ < _data_->_tmp42_)) { -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 2354 "DirectoryMonitor.c" +#line 2362 "DirectoryMonitor.c" } -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp43_ = NULL; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp43_ = _data_->_file_child_list; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp44_ = 0; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp44_ = _data_->_file_child_index; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp45_ = NULL; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp45_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp43_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp44_); -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->file_child = (GFile*) _data_->_tmp45_; -#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp46_ = NULL; -#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp46_ = _data_->self->priv->files; -#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp47_ = NULL; -#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp47_ = _data_->file_child; -#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp48_ = NULL; -#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp48_ = directory_monitor_file_info_map_get_info (_data_->_tmp46_, _data_->_tmp47_); -#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->file_info = _data_->_tmp48_; -#line 668 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp49_ = NULL; -#line 668 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp49_ = _data_->file_info; -#line 668 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_tmp49_ == NULL) { -#line 669 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp50_ = NULL; -#line 669 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp50_ = _data_->file_child; -#line 669 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp51_ = NULL; -#line 669 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp51_ = g_file_get_path (_data_->_tmp50_); -#line 669 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp52_ = NULL; -#line 669 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp52_ = _data_->_tmp51_; -#line 669 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:669: Unable to retrieve directory-moved info for" \ +#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_warning ("DirectoryMonitor.vala:675: Unable to retrieve directory-moved info for" \ " %s", _data_->_tmp52_); -#line 669 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_data_->_tmp52_); -#line 671 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 677 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_info); -#line 671 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 677 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_child); -#line 671 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 677 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 2412 "DirectoryMonitor.c" +#line 2420 "DirectoryMonitor.c" } -#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp53_ = NULL; -#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp53_ = _data_->file_child; -#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp54_ = NULL; -#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp54_ = _data_->new_dir; -#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp55_ = NULL; -#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp55_ = _data_->file_child; -#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp56_ = NULL; -#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp56_ = g_file_get_basename (_data_->_tmp55_); -#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp57_ = NULL; -#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp57_ = _data_->_tmp56_; -#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp58_ = NULL; -#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp58_ = g_file_get_child (_data_->_tmp54_, _data_->_tmp57_); -#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp59_ = NULL; -#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp59_ = _data_->_tmp58_; -#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp60_ = NULL; -#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp60_ = _data_->file_info; -#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_internal_notify_file_moved (_data_->self, _data_->_tmp53_, _data_->_tmp59_, _data_->_tmp60_); -#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_tmp59_); -#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_data_->_tmp57_); -#line 677 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 683 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_idle_add_full (DIRECTORY_MONITOR_DEFAULT_PRIORITY, _directory_monitor_async_internal_notify_directory_moved_co_gsource_func, _data_, NULL); -#line 678 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 684 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 2; -#line 678 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 684 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 2458 "DirectoryMonitor.c" +#line 2466 "DirectoryMonitor.c" _state_2: ; -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_info); -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_child); -#line 2465 "DirectoryMonitor.c" +#line 2473 "DirectoryMonitor.c" } -#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_file_child_list); -#line 2469 "DirectoryMonitor.c" +#line 2477 "DirectoryMonitor.c" } } -#line 684 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp61_ = NULL; -#line 684 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp61_ = _data_->self->priv->files; -#line 684 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp62_ = NULL; -#line 684 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp62_ = _data_->old_dir; -#line 684 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_remove (_data_->_tmp61_, _data_->_tmp62_, NULL); -#line 686 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp63_ = NULL; -#line 686 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp63_ = _data_->self->priv->files; -#line 686 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp64_ = NULL; -#line 686 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp64_ = _data_->new_dir; -#line 686 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp65_ = NULL; -#line 686 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp65_ = _data_->new_dir_info; -#line 686 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp66_ = FALSE; -#line 686 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp66_ = directory_monitor_file_info_map_update (_data_->_tmp63_, _data_->_tmp64_, _data_->_tmp65_); -#line 686 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->updated = _data_->_tmp66_; -#line 687 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 693 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_data_->updated, "updated"); -#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp67_ = NULL; -#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp67_ = _data_->old_dir; -#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp68_ = NULL; -#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp68_ = _data_->old_dir_info; -#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_remove_monitor (_data_->self, _data_->_tmp67_, _data_->_tmp68_); -#line 691 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp69_ = NULL; -#line 691 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp69_ = _data_->new_dir; -#line 691 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp70_ = NULL; -#line 691 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp70_ = _data_->new_dir_info; -#line 691 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_add_monitor (_data_->self, _data_->_tmp69_, _data_->_tmp70_); -#line 693 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp71_ = NULL; -#line 693 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp71_ = _data_->old_dir; -#line 693 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp72_ = NULL; -#line 693 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp72_ = _data_->new_dir; -#line 693 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp73_ = NULL; -#line 693 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp73_ = _data_->new_dir_info; -#line 693 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_directory_moved (_data_->self, _data_->_tmp71_, _data_->_tmp72_, _data_->_tmp73_); -#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_children); -#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_children); -#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_state_ == 0) { -#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2544 "DirectoryMonitor.c" +#line 2552 "DirectoryMonitor.c" } else { -#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2548 "DirectoryMonitor.c" +#line 2556 "DirectoryMonitor.c" } -#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); -#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 2554 "DirectoryMonitor.c" +#line 2562 "DirectoryMonitor.c" } @@ -2572,75 +2580,75 @@ static void directory_monitor_real_notify_directory_moved (DirectoryMonitor* sel GFile* _tmp11_ = NULL; GFile* _tmp12_ = NULL; gboolean _tmp13_ = FALSE; -#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 702 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (old_dir)); -#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 702 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (new_dir)); -#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 702 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_dir_info)); -#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = old_dir; -#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = g_file_get_path (_tmp0_); -#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp1_; -#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = new_dir; -#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = g_file_get_path (_tmp3_); -#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = _tmp4_; -#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = g_strdup_printf ("directory moved: %s -> %s", _tmp2_, _tmp5_); -#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = _tmp6_; -#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp7_); -#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp7_); -#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp5_); -#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp2_); -#line 698 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = old_dir; -#line 698 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = new_dir; -#line 698 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = new_dir_info; -#line 698 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit_by_name (self, "directory-moved", _tmp8_, _tmp9_, _tmp10_); -#line 700 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp11_ = old_dir; -#line 700 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = self->priv->root; -#line 700 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = g_file_equal (_tmp11_, _tmp12_); -#line 700 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp13_) { -#line 2619 "DirectoryMonitor.c" +#line 2627 "DirectoryMonitor.c" GFile* _tmp14_ = NULL; GFile* _tmp15_ = NULL; GFileInfo* _tmp16_ = NULL; -#line 701 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 707 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp14_ = old_dir; -#line 701 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 707 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp15_ = new_dir; -#line 701 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 707 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp16_ = new_dir_info; -#line 701 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 707 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_internal_notify_root_moved (self, _tmp14_, _tmp15_, _tmp16_); -#line 2631 "DirectoryMonitor.c" +#line 2639 "DirectoryMonitor.c" } } void directory_monitor_notify_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFile* new_dir, GFileInfo* new_dir_info) { -#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 702 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 702 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_moved (self, old_dir, new_dir, new_dir_info); -#line 2641 "DirectoryMonitor.c" +#line 2649 "DirectoryMonitor.c" } @@ -2651,38 +2659,38 @@ static void directory_monitor_real_notify_directory_altered (DirectoryMonitor* s gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; GFile* _tmp5_ = NULL; -#line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 705 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = dir; -#line 705 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = g_file_get_path (_tmp0_); -#line 705 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp1_; -#line 705 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = g_strdup_printf ("directory altered: %s", _tmp2_); -#line 705 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = _tmp3_; -#line 705 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp4_); -#line 705 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp4_); -#line 705 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp2_); -#line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 712 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = dir; -#line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 712 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit_by_name (self, "directory-altered", _tmp5_); -#line 2674 "DirectoryMonitor.c" +#line 2682 "DirectoryMonitor.c" } void directory_monitor_notify_directory_altered (DirectoryMonitor* self, GFile* dir) { -#line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_altered (self, dir); -#line 2683 "DirectoryMonitor.c" +#line 2691 "DirectoryMonitor.c" } @@ -2694,31 +2702,31 @@ static void directory_monitor_internal_notify_directory_alteration_completed (Di gboolean _tmp3_ = FALSE; GFile* _tmp4_ = NULL; GFileInfo* _tmp5_ = NULL; -#line 709 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 715 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 709 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 715 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 709 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 715 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->files; -#line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = dir; -#line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = info; -#line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = directory_monitor_file_info_map_update (_tmp0_, _tmp1_, _tmp2_); -#line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" updated = _tmp3_; -#line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 717 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (updated, "updated"); -#line 713 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 719 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = dir; -#line 713 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 719 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = info; -#line 713 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 719 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_directory_alteration_completed (self, _tmp4_, _tmp5_); -#line 2719 "DirectoryMonitor.c" +#line 2727 "DirectoryMonitor.c" } @@ -2730,42 +2738,42 @@ static void directory_monitor_real_notify_directory_alteration_completed (Direct gchar* _tmp4_ = NULL; GFile* _tmp5_ = NULL; GFileInfo* _tmp6_ = NULL; -#line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 717 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = dir; -#line 717 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = g_file_get_path (_tmp0_); -#line 717 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp1_; -#line 717 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = g_strdup_printf ("directory alteration completed: %s", _tmp2_); -#line 717 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = _tmp3_; -#line 717 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp4_); -#line 717 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp4_); -#line 717 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp2_); -#line 718 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 724 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = dir; -#line 718 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 724 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = info; -#line 718 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 724 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit_by_name (self, "directory-alteration-completed", _tmp5_, _tmp6_); -#line 2757 "DirectoryMonitor.c" +#line 2765 "DirectoryMonitor.c" } void directory_monitor_notify_directory_alteration_completed (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { -#line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_alteration_completed (self, dir, info); -#line 2766 "DirectoryMonitor.c" +#line 2774 "DirectoryMonitor.c" } @@ -2776,38 +2784,38 @@ static void directory_monitor_real_notify_directory_attributes_altered (Director gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; GFile* _tmp5_ = NULL; -#line 721 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 727 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = dir; -#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = g_file_get_path (_tmp0_); -#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp1_; -#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = g_strdup_printf ("directory attributes altered: %s", _tmp2_); -#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = _tmp3_; -#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp4_); -#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp4_); -#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp2_); -#line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 729 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = dir; -#line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 729 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit_by_name (self, "directory-attributes-altered", _tmp5_); -#line 2799 "DirectoryMonitor.c" +#line 2807 "DirectoryMonitor.c" } void directory_monitor_notify_directory_attributes_altered (DirectoryMonitor* self, GFile* dir) { -#line 721 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 727 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 721 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 727 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_attributes_altered (self, dir); -#line 2808 "DirectoryMonitor.c" +#line 2816 "DirectoryMonitor.c" } @@ -2818,31 +2826,31 @@ static void directory_monitor_internal_notify_directory_deleted (DirectoryMonito GFileInfo* _tmp2_ = NULL; GFile* _tmp3_ = NULL; GFile* _tmp4_ = NULL; -#line 726 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 732 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 726 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 732 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 727 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 733 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->files; -#line 727 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 733 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = dir; -#line 727 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 733 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = directory_monitor_file_info_map_get_info (_tmp0_, _tmp1_); -#line 727 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 733 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" info = _tmp2_; -#line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 734 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (info != NULL, "info != null"); -#line 731 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 737 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = dir; -#line 731 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 737 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_remove_monitor (self, _tmp3_, info); -#line 733 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 739 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = dir; -#line 733 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 739 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_notify_directory_deleted (self, _tmp4_, FALSE, NULL, NULL); -#line 726 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 732 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (info); -#line 2843 "DirectoryMonitor.c" +#line 2851 "DirectoryMonitor.c" } @@ -2855,7 +2863,7 @@ static void directory_monitor_async_notify_directory_deleted_data_free (gpointer _g_object_unref0 (_data_->self); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_slice_free (DirectoryMonitorAsyncNotifyDirectoryDeletedData, _data_); -#line 2856 "DirectoryMonitor.c" +#line 2864 "DirectoryMonitor.c" } @@ -2889,7 +2897,7 @@ static void directory_monitor_async_notify_directory_deleted (DirectoryMonitor* _data_->already_removed = _tmp3_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_notify_directory_deleted_co (_data_); -#line 2890 "DirectoryMonitor.c" +#line 2898 "DirectoryMonitor.c" } @@ -2897,320 +2905,320 @@ static void directory_monitor_async_notify_directory_deleted_finish (DirectoryMo DirectoryMonitorAsyncNotifyDirectoryDeletedData* _data_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 2898 "DirectoryMonitor.c" +#line 2906 "DirectoryMonitor.c" } static void directory_monitor_async_notify_directory_deleted_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { DirectoryMonitorAsyncNotifyDirectoryDeletedData* _data_; -#line 756 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = _user_data_; -#line 756 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_source_object_ = source_object; -#line 756 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_res_ = _res_; -#line 756 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_notify_directory_deleted_co (_data_); -#line 2912 "DirectoryMonitor.c" +#line 2920 "DirectoryMonitor.c" } static gboolean _directory_monitor_async_notify_directory_deleted_co_gsource_func (gpointer self) { gboolean result; result = directory_monitor_async_notify_directory_deleted_co (self); -#line 765 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 771 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 2921 "DirectoryMonitor.c" +#line 2929 "DirectoryMonitor.c" } static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMonitorAsyncNotifyDirectoryDeletedData* _data_) { -#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" switch (_data_->_state_) { -#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 0: -#line 2930 "DirectoryMonitor.c" +#line 2938 "DirectoryMonitor.c" goto _state_0; -#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 1: -#line 2934 "DirectoryMonitor.c" +#line 2942 "DirectoryMonitor.c" goto _state_1; -#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 2: -#line 2938 "DirectoryMonitor.c" +#line 2946 "DirectoryMonitor.c" goto _state_2; default: -#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_assert_not_reached (); -#line 2943 "DirectoryMonitor.c" +#line 2951 "DirectoryMonitor.c" } _state_0: -#line 744 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 750 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp0_ = NULL; -#line 744 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 750 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); -#line 744 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 750 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->file_children = _data_->_tmp0_; -#line 745 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 751 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp1_ = NULL; -#line 745 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 751 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); -#line 745 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 751 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->dir_children = _data_->_tmp1_; -#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp2_ = NULL; -#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp2_ = _data_->self->priv->files; -#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp3_ = NULL; -#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp3_ = _data_->dir; -#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp4_ = NULL; -#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp4_ = _data_->file_children; -#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp5_ = NULL; -#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp5_ = _data_->dir_children; -#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp6_ = 0; -#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp6_ = directory_monitor_file_info_map_get_children (_data_->_tmp2_, _data_->_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->count = _data_->_tmp6_; -#line 747 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 753 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp7_ = 0; -#line 747 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 753 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp7_ = _data_->count; -#line 747 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 753 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_tmp7_ > 0) { -#line 2986 "DirectoryMonitor.c" +#line 2994 "DirectoryMonitor.c" { -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp8_ = NULL; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp8_ = _data_->dir_children; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp9_ = NULL; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp9_ = _g_object_ref0 (_data_->_tmp8_); -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_dir_child_list = _data_->_tmp9_; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp10_ = NULL; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp10_ = _data_->_dir_child_list; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp11_ = 0; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp12_ = 0; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp12_ = _data_->_tmp11_; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_dir_child_size = _data_->_tmp12_; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_dir_child_index = -1; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp13_ = 0; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp13_ = _data_->_dir_child_index; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_dir_child_index = _data_->_tmp13_ + 1; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp14_ = 0; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp14_ = _data_->_dir_child_index; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp15_ = 0; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp15_ = _data_->_dir_child_size; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!(_data_->_tmp14_ < _data_->_tmp15_)) { -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 3034 "DirectoryMonitor.c" +#line 3042 "DirectoryMonitor.c" } -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp16_ = NULL; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp16_ = _data_->_dir_child_list; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp17_ = 0; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp17_ = _data_->_dir_child_index; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp18_ = NULL; -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp18_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp17_); -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->dir_child = (GFile*) _data_->_tmp18_; -#line 756 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp19_ = NULL; -#line 756 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp19_ = _data_->dir_child; -#line 756 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 1; -#line 756 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_notify_directory_deleted (_data_->self, _data_->_tmp19_, FALSE, directory_monitor_async_notify_directory_deleted_ready, _data_); -#line 756 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3060 "DirectoryMonitor.c" +#line 3068 "DirectoryMonitor.c" _state_1: -#line 756 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_notify_directory_deleted_finish (_data_->self, _data_->_res_); -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_child); -#line 3066 "DirectoryMonitor.c" +#line 3074 "DirectoryMonitor.c" } -#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_dir_child_list); -#line 3070 "DirectoryMonitor.c" +#line 3078 "DirectoryMonitor.c" } { -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp20_ = NULL; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp20_ = _data_->file_children; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp21_ = NULL; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp21_ = _g_object_ref0 (_data_->_tmp20_); -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_file_child_list = _data_->_tmp21_; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp22_ = NULL; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp22_ = _data_->_file_child_list; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp23_ = 0; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp23_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp24_ = 0; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp24_ = _data_->_tmp23_; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_file_child_size = _data_->_tmp24_; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_file_child_index = -1; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp25_ = 0; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp25_ = _data_->_file_child_index; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_file_child_index = _data_->_tmp25_ + 1; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp26_ = 0; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp26_ = _data_->_file_child_index; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp27_ = 0; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp27_ = _data_->_file_child_size; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!(_data_->_tmp26_ < _data_->_tmp27_)) { -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 3119 "DirectoryMonitor.c" +#line 3127 "DirectoryMonitor.c" } -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp28_ = NULL; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp28_ = _data_->_file_child_list; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp29_ = 0; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp29_ = _data_->_file_child_index; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp30_ = NULL; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp30_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp28_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp29_); -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->file_child = (GFile*) _data_->_tmp30_; -#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp31_ = NULL; -#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp31_ = _data_->self->priv->files; -#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp32_ = NULL; -#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp32_ = _data_->file_child; -#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_remove (_data_->_tmp31_, _data_->_tmp32_, NULL); -#line 763 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 769 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp33_ = NULL; -#line 763 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 769 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp33_ = _data_->file_child; -#line 763 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 769 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_file_deleted (_data_->self, _data_->_tmp33_); -#line 765 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 771 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_idle_add_full (DIRECTORY_MONITOR_DEFAULT_PRIORITY, _directory_monitor_async_notify_directory_deleted_co_gsource_func, _data_, NULL); -#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 772 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 2; -#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 772 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3157 "DirectoryMonitor.c" +#line 3165 "DirectoryMonitor.c" _state_2: ; -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_child); -#line 3162 "DirectoryMonitor.c" +#line 3170 "DirectoryMonitor.c" } -#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_file_child_list); -#line 3166 "DirectoryMonitor.c" +#line 3174 "DirectoryMonitor.c" } } -#line 770 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 776 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp34_ = FALSE; -#line 770 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 776 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp34_ = _data_->already_removed; -#line 770 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 776 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_data_->_tmp34_) { -#line 771 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp35_ = NULL; -#line 771 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp35_ = _data_->self->priv->files; -#line 771 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp36_ = NULL; -#line 771 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp36_ = _data_->dir; -#line 771 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_remove (_data_->_tmp35_, _data_->_tmp36_, NULL); -#line 3185 "DirectoryMonitor.c" +#line 3193 "DirectoryMonitor.c" } -#line 773 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 779 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp37_ = NULL; -#line 773 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 779 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp37_ = _data_->dir; -#line 773 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 779 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_directory_deleted (_data_->self, _data_->_tmp37_); -#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_children); -#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_children); -#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_state_ == 0) { -#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3201 "DirectoryMonitor.c" +#line 3209 "DirectoryMonitor.c" } else { -#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3205 "DirectoryMonitor.c" +#line 3213 "DirectoryMonitor.c" } -#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); -#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3211 "DirectoryMonitor.c" +#line 3219 "DirectoryMonitor.c" } @@ -3224,53 +3232,53 @@ static void directory_monitor_real_notify_directory_deleted (DirectoryMonitor* s GFile* _tmp6_ = NULL; GFile* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; -#line 776 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 782 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = dir; -#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = g_file_get_path (_tmp0_); -#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp1_; -#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = g_strdup_printf ("directory deleted: %s", _tmp2_); -#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = _tmp3_; -#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp4_); -#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp4_); -#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp2_); -#line 778 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 784 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = dir; -#line 778 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 784 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit_by_name (self, "directory-deleted", _tmp5_); -#line 780 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 786 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = dir; -#line 780 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 786 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = self->priv->root; -#line 780 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 786 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = g_file_equal (_tmp6_, _tmp7_); -#line 780 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 786 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp8_) { -#line 3255 "DirectoryMonitor.c" +#line 3263 "DirectoryMonitor.c" GFile* _tmp9_ = NULL; -#line 781 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 787 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = dir; -#line 781 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 787 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_root_deleted (self, _tmp9_); -#line 3261 "DirectoryMonitor.c" +#line 3269 "DirectoryMonitor.c" } } void directory_monitor_notify_directory_deleted (DirectoryMonitor* self, GFile* dir) { -#line 776 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 782 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 776 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 782 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_deleted (self, dir); -#line 3271 "DirectoryMonitor.c" +#line 3279 "DirectoryMonitor.c" } @@ -3280,34 +3288,34 @@ static void directory_monitor_real_notify_closed (DirectoryMonitor* self) { gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; -#line 785 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->root; -#line 785 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = g_file_get_path (_tmp0_); -#line 785 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp1_; -#line 785 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = g_strdup_printf ("monitoring of %s closed", _tmp2_); -#line 785 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = _tmp3_; -#line 785 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp4_); -#line 785 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp4_); -#line 785 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp2_); -#line 786 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 792 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit_by_name (self, "closed"); -#line 3299 "DirectoryMonitor.c" +#line 3307 "DirectoryMonitor.c" } void directory_monitor_notify_closed (DirectoryMonitor* self) { -#line 784 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 790 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 784 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 790 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_closed (self); -#line 3308 "DirectoryMonitor.c" +#line 3316 "DirectoryMonitor.c" } @@ -3315,17 +3323,17 @@ GFile* directory_monitor_get_root (DirectoryMonitor* self) { GFile* result = NULL; GFile* _tmp0_ = NULL; GFile* _tmp1_ = NULL; -#line 789 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 795 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), NULL); -#line 790 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 796 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->root; -#line 790 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 796 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 790 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 796 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = _tmp1_; -#line 790 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 796 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 3326 "DirectoryMonitor.c" +#line 3334 "DirectoryMonitor.c" } @@ -3334,72 +3342,72 @@ gboolean directory_monitor_is_in_root (DirectoryMonitor* self, GFile* file) { GFile* _tmp0_ = NULL; GFile* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 793 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 799 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); -#line 793 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 799 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); -#line 794 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 800 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = file; -#line 794 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 800 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = self->priv->root; -#line 794 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 800 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = g_file_has_prefix (_tmp0_, _tmp1_); -#line 794 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 800 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = _tmp2_; -#line 794 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 800 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 3349 "DirectoryMonitor.c" +#line 3357 "DirectoryMonitor.c" } gboolean directory_monitor_has_started (DirectoryMonitor* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 797 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 803 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); -#line 798 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 804 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->started; -#line 798 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 804 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = _tmp0_; -#line 798 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 804 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 3364 "DirectoryMonitor.c" +#line 3372 "DirectoryMonitor.c" } void directory_monitor_start_discovery (DirectoryMonitor* self) { gboolean _tmp0_ = FALSE; GFile* _tmp1_ = NULL; -#line 801 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 807 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 802 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 808 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->started; -#line 802 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 808 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (!_tmp0_, "!started"); -#line 804 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 810 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->has_discovery_started = TRUE; -#line 805 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 811 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->started = TRUE; -#line 807 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 813 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_discovery_started (self); -#line 810 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 816 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->outstanding_exploration_dirs = 1; -#line 811 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 817 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = self->priv->root; -#line 811 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 817 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_explore_async (self, _tmp1_, NULL, TRUE, NULL, NULL); -#line 3389 "DirectoryMonitor.c" +#line 3397 "DirectoryMonitor.c" } static void directory_monitor_real_close (DirectoryMonitor* self) { GCancellable* _tmp0_ = NULL; GeeHashMap* _tmp12_ = NULL; -#line 818 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 824 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->cancellable; -#line 818 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 824 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_cancellable_cancel (_tmp0_); -#line 3400 "DirectoryMonitor.c" +#line 3408 "DirectoryMonitor.c" { GeeIterator* _monitor_it = NULL; GeeHashMap* _tmp1_ = NULL; @@ -3408,75 +3416,75 @@ static void directory_monitor_real_close (DirectoryMonitor* self) { GeeCollection* _tmp4_ = NULL; GeeIterator* _tmp5_ = NULL; GeeIterator* _tmp6_ = NULL; -#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = self->priv->monitors; -#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); -#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = _tmp2_; -#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = _tmp3_; -#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = _tmp5_; -#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_tmp4_); -#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _monitor_it = _tmp6_; -#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 3427 "DirectoryMonitor.c" +#line 3435 "DirectoryMonitor.c" GeeIterator* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; GFileMonitor* monitor = NULL; GeeIterator* _tmp9_ = NULL; gpointer _tmp10_ = NULL; GFileMonitor* _tmp11_ = NULL; -#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = _monitor_it; -#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = gee_iterator_next (_tmp7_); -#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_tmp8_) { -#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 3442 "DirectoryMonitor.c" +#line 3450 "DirectoryMonitor.c" } -#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = _monitor_it; -#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = gee_iterator_get (_tmp9_); -#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" monitor = (GFileMonitor*) _tmp10_; -#line 822 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 828 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp11_ = monitor; -#line 822 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 828 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_cancel_monitor (self, _tmp11_); -#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (monitor); -#line 3456 "DirectoryMonitor.c" +#line 3464 "DirectoryMonitor.c" } -#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_monitor_it); -#line 3460 "DirectoryMonitor.c" +#line 3468 "DirectoryMonitor.c" } -#line 824 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 830 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = self->priv->monitors; -#line 824 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 830 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" gee_abstract_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); -#line 826 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 832 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_closed (self); -#line 3468 "DirectoryMonitor.c" +#line 3476 "DirectoryMonitor.c" } void directory_monitor_close (DirectoryMonitor* self) { -#line 816 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 822 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 816 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 822 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->close (self); -#line 3477 "DirectoryMonitor.c" +#line 3485 "DirectoryMonitor.c" } @@ -3486,37 +3494,37 @@ static DirectoryMonitorFType directory_monitor_get_ftype (GFileInfo* info) { GFileInfo* _tmp0_ = NULL; GFileType _tmp1_ = 0; GFileType _tmp2_ = 0; -#line 829 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 835 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), 0); -#line 830 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 836 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = info; -#line 830 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 836 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = g_file_info_get_file_type (_tmp0_); -#line 830 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 836 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" file_type = _tmp1_; -#line 831 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 837 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = file_type; -#line 831 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 837 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" switch (_tmp2_) { -#line 831 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 837 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_TYPE_REGULAR: -#line 3501 "DirectoryMonitor.c" +#line 3509 "DirectoryMonitor.c" { -#line 833 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = DIRECTORY_MONITOR_FTYPE_FILE; -#line 833 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 3507 "DirectoryMonitor.c" +#line 3515 "DirectoryMonitor.c" } -#line 831 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 837 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_TYPE_DIRECTORY: -#line 3511 "DirectoryMonitor.c" +#line 3519 "DirectoryMonitor.c" { -#line 836 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 842 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = DIRECTORY_MONITOR_FTYPE_DIRECTORY; -#line 836 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 842 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 3517 "DirectoryMonitor.c" +#line 3525 "DirectoryMonitor.c" } default: { @@ -3524,23 +3532,23 @@ static DirectoryMonitorFType directory_monitor_get_ftype (GFileInfo* info) { GEnumValue* _tmp4_; gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = file_type; -#line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = g_enum_get_value (g_type_class_ref (g_file_type_get_type ()), _tmp3_); -#line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = g_strdup_printf ("query_ftype: Unknown file type %s", (_tmp4_ != NULL) ? _tmp4_->value_name : NULL); -#line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = _tmp5_; -#line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp6_); -#line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp6_); -#line 840 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = DIRECTORY_MONITOR_FTYPE_UNSUPPORTED; -#line 840 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 3541 "DirectoryMonitor.c" +#line 3549 "DirectoryMonitor.c" } } } @@ -3557,7 +3565,7 @@ static void directory_monitor_explore_async_data_free (gpointer _data) { _g_object_unref0 (_data_->self); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_slice_free (DirectoryMonitorExploreAsyncData, _data_); -#line 3558 "DirectoryMonitor.c" +#line 3566 "DirectoryMonitor.c" } @@ -3601,7 +3609,7 @@ static void directory_monitor_explore_async (DirectoryMonitor* self, GFile* dir, _data_->in_discovery = _tmp5_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_explore_async_co (_data_); -#line 3602 "DirectoryMonitor.c" +#line 3610 "DirectoryMonitor.c" } @@ -3609,1104 +3617,1128 @@ static void directory_monitor_explore_finish (DirectoryMonitor* self, GAsyncResu DirectoryMonitorExploreAsyncData* _data_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 3610 "DirectoryMonitor.c" +#line 3618 "DirectoryMonitor.c" } static void directory_monitor_explore_async_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { DirectoryMonitorExploreAsyncData* _data_; -#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = _user_data_; -#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_source_object_ = source_object; -#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_res_ = _res_; -#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_explore_async_co (_data_); -#line 3624 "DirectoryMonitor.c" +#line 3632 "DirectoryMonitor.c" } static void _g_object_unref0_ (gpointer var) { -#line 911 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); -#line 3631 "DirectoryMonitor.c" +#line 3639 "DirectoryMonitor.c" } static void _g_list_free__g_object_unref0_ (GList* self) { -#line 911 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_list_foreach (self, (GFunc) _g_object_unref0_, NULL); -#line 911 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_list_free (self); -#line 3640 "DirectoryMonitor.c" +#line 3648 "DirectoryMonitor.c" } static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { guint result; result = file_hash ((GFile*) v); -#line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 3649 "DirectoryMonitor.c" +#line 3657 "DirectoryMonitor.c" } static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsyncData* _data_) { -#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" switch (_data_->_state_) { -#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 0: -#line 3658 "DirectoryMonitor.c" +#line 3666 "DirectoryMonitor.c" goto _state_0; -#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 1: -#line 3662 "DirectoryMonitor.c" +#line 3670 "DirectoryMonitor.c" goto _state_1; -#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 2: -#line 3666 "DirectoryMonitor.c" +#line 3674 "DirectoryMonitor.c" goto _state_2; -#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 3: -#line 3670 "DirectoryMonitor.c" +#line 3678 "DirectoryMonitor.c" goto _state_3; -#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 4: -#line 3674 "DirectoryMonitor.c" +#line 3682 "DirectoryMonitor.c" goto _state_4; -#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 5: -#line 3678 "DirectoryMonitor.c" +#line 3686 "DirectoryMonitor.c" goto _state_5; default: -#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_assert_not_reached (); -#line 3683 "DirectoryMonitor.c" +#line 3691 "DirectoryMonitor.c" } _state_0: -#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp0_ = NULL; -#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp0_ = _data_->self->priv->files; -#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp1_ = NULL; -#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp1_ = _data_->dir; -#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp2_ = NULL; -#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp2_ = _data_->dir_info; -#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp3_ = FALSE; -#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp3_ = directory_monitor_file_info_map_contains (_data_->_tmp0_, _data_->_tmp1_, _data_->_tmp2_); -#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_tmp3_) { -#line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp4_ = NULL; -#line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp4_ = _data_->dir; -#line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp5_ = NULL; -#line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp5_ = g_file_get_path (_data_->_tmp4_); -#line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp6_ = NULL; -#line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp6_ = _data_->_tmp5_; -#line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:846: Directory loop detected at %s, not explorin" \ +#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_warning ("DirectoryMonitor.vala:852: Directory loop detected at %s, not explorin" \ "g", _data_->_tmp6_); -#line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_data_->_tmp6_); -#line 848 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp7_ = FALSE; -#line 848 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp7_ = _data_->in_discovery; -#line 848 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp7_); -#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_state_ == 0) { -#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3730 "DirectoryMonitor.c" +#line 3738 "DirectoryMonitor.c" } else { -#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3734 "DirectoryMonitor.c" +#line 3742 "DirectoryMonitor.c" } -#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); -#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3740 "DirectoryMonitor.c" +#line 3748 "DirectoryMonitor.c" } -#line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp8_ = NULL; -#line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp8_ = _data_->dir_info; -#line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp9_ = NULL; -#line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp9_ = _g_object_ref0 (_data_->_tmp8_); -#line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->local_dir_info = _data_->_tmp9_; -#line 855 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 861 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp10_ = NULL; -#line 855 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 861 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp10_ = _data_->local_dir_info; -#line 855 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 861 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_tmp10_ == NULL) { -#line 3758 "DirectoryMonitor.c" +#line 3766 "DirectoryMonitor.c" { -#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp12_ = NULL; -#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp12_ = _data_->dir; -#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp13_ = NULL; -#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp13_ = _data_->self->priv->cancellable; -#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 1; -#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_file_query_info_async (_data_->_tmp12_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_DIR_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp13_, directory_monitor_explore_async_ready, _data_); -#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3774 "DirectoryMonitor.c" +#line 3782 "DirectoryMonitor.c" _state_1: -#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp14_ = NULL; -#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp14_ = g_file_query_info_finish (_data_->_tmp12_, _data_->_res_, &_data_->_inner_error_); -#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp11_ = _data_->_tmp14_; -#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 3784 "DirectoryMonitor.c" +#line 3792 "DirectoryMonitor.c" goto __catch480_g_error; } -#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp15_ = NULL; -#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp15_ = _data_->_tmp11_; -#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp11_ = NULL; -#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->local_dir_info); -#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->local_dir_info = _data_->_tmp15_; -#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_tmp11_); -#line 3799 "DirectoryMonitor.c" +#line 3807 "DirectoryMonitor.c" } goto __finally480; __catch480_g_error: { -#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->err = _data_->_inner_error_; -#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_inner_error_ = NULL; -#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp16_ = NULL; -#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp16_ = _data_->dir; -#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp17_ = NULL; -#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp17_ = g_file_get_path (_data_->_tmp16_); -#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp18_ = NULL; -#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp18_ = _data_->_tmp17_; -#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp19_ = NULL; -#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp19_ = _data_->err; -#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp20_ = NULL; -#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp20_ = _data_->_tmp19_->message; -#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:860: Unable to retrieve info on %s: %s", _data_->_tmp18_, _data_->_tmp20_); -#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_warning ("DirectoryMonitor.vala:866: Unable to retrieve info on %s: %s", _data_->_tmp18_, _data_->_tmp20_); +#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_data_->_tmp18_); -#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp21_ = FALSE; -#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp21_ = _data_->in_discovery; -#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp21_); -#line 864 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_error_free0 (_data_->err); -#line 864 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->local_dir_info); -#line 864 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_state_ == 0) { -#line 864 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3846 "DirectoryMonitor.c" +#line 3854 "DirectoryMonitor.c" } else { -#line 864 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3850 "DirectoryMonitor.c" +#line 3858 "DirectoryMonitor.c" } -#line 864 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); -#line 864 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3856 "DirectoryMonitor.c" +#line 3864 "DirectoryMonitor.c" } __finally480: -#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->local_dir_info); -#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); -#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_clear_error (&_data_->_inner_error_); -#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3869 "DirectoryMonitor.c" +#line 3877 "DirectoryMonitor.c" } } -#line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp22_ = NULL; -#line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp22_ = _data_->local_dir_info; -#line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp23_ = FALSE; -#line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp23_ = g_file_info_get_is_hidden (_data_->_tmp22_); -#line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_tmp23_) { -#line 869 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp24_ = NULL; -#line 869 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp24_ = _data_->dir; -#line 869 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp25_ = NULL; -#line 869 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp25_ = g_file_get_path (_data_->_tmp24_); -#line 869 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp26_ = NULL; -#line 869 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp26_ = _data_->_tmp25_; -#line 869 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:869: Ignoring hidden directory %s", _data_->_tmp26_); -#line 869 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_warning ("DirectoryMonitor.vala:875: Ignoring hidden directory %s", _data_->_tmp26_); +#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_data_->_tmp26_); -#line 871 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 877 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp27_ = FALSE; -#line 871 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 877 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp27_ = _data_->in_discovery; -#line 871 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 877 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp27_); -#line 873 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->local_dir_info); -#line 873 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_state_ == 0) { -#line 873 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3910 "DirectoryMonitor.c" +#line 3918 "DirectoryMonitor.c" } else { -#line 873 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3914 "DirectoryMonitor.c" +#line 3922 "DirectoryMonitor.c" } -#line 873 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); -#line 873 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3920 "DirectoryMonitor.c" +#line 3928 "DirectoryMonitor.c" } -#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp28_ = NULL; -#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp28_ = _data_->local_dir_info; -#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp29_ = NULL; -#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp29_ = get_file_info_id (_data_->_tmp28_); -#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp30_ = NULL; -#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp30_ = _data_->_tmp29_; -#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp31_ = FALSE; -#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp31_ = _data_->_tmp30_ == NULL; -#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_data_->_tmp30_); -#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_tmp31_) { -#line 880 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp32_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp32_ = _data_->dir; -#line 880 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp32_ = _data_->local_dir_info; +#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp33_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp33_ = g_file_get_path (_data_->_tmp32_); -#line 880 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp33_ = _data_->dir; +#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp34_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp34_ = _data_->_tmp33_; -#line 880 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:880: Unable to retrieve file ID on %s: skipping", _data_->_tmp34_); -#line 880 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp34_); -#line 882 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp35_ = FALSE; -#line 882 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp35_ = _data_->in_discovery; -#line 882 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp35_); -#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->local_dir_info); -#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_state_ == 0) { -#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); +#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp34_ = g_file_get_uri (_data_->_tmp33_); +#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp35_ = NULL; +#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp35_ = _data_->_tmp34_; +#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_file_info_set_attribute_string (_data_->_tmp32_, G_FILE_ATTRIBUTE_ID_FILE, _data_->_tmp35_); +#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_free0 (_data_->_tmp35_); #line 3970 "DirectoryMonitor.c" - } else { -#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 3974 "DirectoryMonitor.c" - } -#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_object_unref (_data_->_async_result); -#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - return FALSE; -#line 3980 "DirectoryMonitor.c" } -#line 888 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp36_ = NULL; -#line 888 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp36_ = _data_->local_dir_info; -#line 888 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp37_ = 0; -#line 888 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp37_ = g_file_info_get_file_type (_data_->_tmp36_); -#line 888 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_tmp37_ != G_FILE_TYPE_DIRECTORY) { -#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp38_ = NULL; -#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp38_ = _ ("Unable to monitor %s: Not a directory (%s)"); -#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp39_ = NULL; -#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp39_ = _data_->dir; -#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp40_ = NULL; -#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp40_ = g_file_get_path (_data_->_tmp39_); -#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp41_ = NULL; -#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp41_ = _data_->_tmp40_; -#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp42_ = NULL; -#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp42_ = _data_->local_dir_info; -#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp43_ = 0; -#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp43_ = g_file_info_get_file_type (_data_->_tmp42_); -#line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 892 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" memset (&_data_->_tmp44_, 0, sizeof (GEnumValue*)); -#line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 892 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp44_ = g_enum_get_value (g_type_class_ref (g_file_type_get_type ()), _data_->_tmp43_); -#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp45_ = NULL; -#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp45_ = g_strdup_printf (_data_->_tmp38_, _data_->_tmp41_, (_data_->_tmp44_ != NULL) ? _data_->_tmp44_->value_name : NULL); -#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp46_ = NULL; -#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp46_ = _data_->_tmp45_; -#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_discovery_failed (_data_->self, _data_->_tmp46_); -#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_data_->_tmp46_); -#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_data_->_tmp41_); -#line 892 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp47_ = FALSE; -#line 892 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp47_ = _data_->in_discovery; -#line 892 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp47_); #line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp47_); +#line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->local_dir_info); -#line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_state_ == 0) { -#line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 4046 "DirectoryMonitor.c" +#line 4036 "DirectoryMonitor.c" } else { -#line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_simple_async_result_complete (_data_->_async_result); -#line 4050 "DirectoryMonitor.c" +#line 4040 "DirectoryMonitor.c" } -#line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); -#line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4056 "DirectoryMonitor.c" +#line 4046 "DirectoryMonitor.c" } -#line 901 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 903 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->dir_map = NULL; -#line 902 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->file_map = NULL; -#line 4062 "DirectoryMonitor.c" +#line 4052 "DirectoryMonitor.c" { -#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp48_ = NULL; -#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp48_ = _data_->dir; -#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp49_ = NULL; -#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp49_ = _data_->self->priv->cancellable; -#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 2; -#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_file_enumerate_children_async (_data_->_tmp48_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp49_, directory_monitor_explore_async_ready, _data_); -#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4078 "DirectoryMonitor.c" +#line 4068 "DirectoryMonitor.c" _state_2: -#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp50_ = NULL; -#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp50_ = g_file_enumerate_children_finish (_data_->_tmp48_, _data_->_res_, &_data_->_inner_error_); -#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->enumerator = _data_->_tmp50_; -#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 4088 "DirectoryMonitor.c" +#line 4078 "DirectoryMonitor.c" goto __catch481_g_error; } { -#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp51_ = TRUE; -#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_data_->_tmp51_) { -#line 4098 "DirectoryMonitor.c" +#line 4088 "DirectoryMonitor.c" } -#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp51_ = FALSE; -#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp52_ = NULL; -#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp52_ = _data_->enumerator; -#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp53_ = NULL; -#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp53_ = _data_->self->priv->cancellable; -#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 3; -#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_file_enumerator_next_files_async (_data_->_tmp52_, 10, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp53_, directory_monitor_explore_async_ready, _data_); -#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4116 "DirectoryMonitor.c" +#line 4106 "DirectoryMonitor.c" _state_3: -#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp54_ = NULL; -#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp54_ = g_file_enumerator_next_files_finish (_data_->_tmp52_, _data_->_res_, &_data_->_inner_error_); -#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->infos = _data_->_tmp54_; -#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->enumerator); -#line 4128 "DirectoryMonitor.c" +#line 4118 "DirectoryMonitor.c" goto __catch481_g_error; } -#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 912 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp55_ = NULL; -#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 912 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp55_ = _data_->infos; -#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 912 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_tmp55_ == NULL) { -#line 911 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" __g_list_free__g_object_unref0_0 (_data_->infos); -#line 911 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 4141 "DirectoryMonitor.c" +#line 4131 "DirectoryMonitor.c" } -#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp56_ = NULL; -#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp56_ = _data_->infos; -#line 4147 "DirectoryMonitor.c" +#line 4137 "DirectoryMonitor.c" { -#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->info_collection = _data_->_tmp56_; -#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" for (_data_->info_it = _data_->info_collection; _data_->info_it != NULL; _data_->info_it = _data_->info_it->next) { -#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp57_ = NULL; -#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp57_ = _g_object_ref0 ((GFileInfo*) _data_->info_it->data); -#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->info = _data_->_tmp57_; -#line 4159 "DirectoryMonitor.c" +#line 4149 "DirectoryMonitor.c" { -#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp58_ = NULL; -#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp58_ = _data_->info; -#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp59_ = FALSE; -#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp59_ = g_file_info_get_is_hidden (_data_->_tmp58_); -#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp59_) { #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp60_ = NULL; + _data_->_tmp58_ = _data_->info; #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp60_ = _data_->dir; + _data_->_tmp59_ = NULL; #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp61_ = NULL; + _data_->_tmp59_ = get_file_info_id (_data_->_tmp58_); #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp61_ = _data_->info; + _data_->_tmp60_ = NULL; #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp62_ = NULL; + _data_->_tmp60_ = _data_->_tmp59_; #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp62_ = g_file_info_get_name (_data_->_tmp61_); + _data_->_tmp61_ = FALSE; #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp63_ = NULL; + _data_->_tmp61_ = _data_->_tmp60_ == NULL; #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp63_ = g_file_get_child (_data_->_tmp60_, _data_->_tmp62_); + _g_free0 (_data_->_tmp60_); #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + if (_data_->_tmp61_) { +#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp62_ = NULL; +#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp62_ = _data_->info; +#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp63_ = NULL; +#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp63_ = _data_->dir; +#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp64_ = NULL; -#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp64_ = _data_->_tmp63_; -#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp64_ = g_file_get_uri (_data_->_tmp63_); +#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp65_ = NULL; -#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp65_ = g_file_get_path (_data_->_tmp64_); -#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp66_ = NULL; -#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp66_ = _data_->_tmp65_; -#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:916: Skipping hidden file/directory %s", _data_->_tmp66_); -#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp66_); -#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp64_); -#line 919 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->info); -#line 919 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - continue; -#line 4209 "DirectoryMonitor.c" +#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp65_ = _data_->_tmp64_; +#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_file_info_set_attribute_string (_data_->_tmp62_, G_FILE_ATTRIBUTE_ID_FILE, _data_->_tmp65_); +#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_free0 (_data_->_tmp65_); +#line 4191 "DirectoryMonitor.c" } -#line 923 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp67_ = NULL; -#line 923 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp67_ = _data_->info; -#line 923 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp68_ = FALSE; -#line 923 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp68_ = directory_monitor_is_file_symlink_supported (_data_->_tmp67_); -#line 923 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_data_->_tmp68_) { -#line 924 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp66_ = NULL; +#line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp66_ = _data_->info; +#line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp67_ = FALSE; +#line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp67_ = g_file_info_get_is_hidden (_data_->_tmp66_); +#line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + if (_data_->_tmp67_) { +#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp68_ = NULL; +#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp68_ = _data_->dir; +#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp69_ = NULL; +#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp69_ = _data_->info; +#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp70_ = NULL; +#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp70_ = g_file_info_get_name (_data_->_tmp69_); +#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp71_ = NULL; +#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp71_ = g_file_get_child (_data_->_tmp68_, _data_->_tmp70_); +#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp72_ = NULL; +#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp72_ = _data_->_tmp71_; +#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp73_ = NULL; +#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp73_ = g_file_get_path (_data_->_tmp72_); +#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp74_ = NULL; +#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp74_ = _data_->_tmp73_; +#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_warning ("DirectoryMonitor.vala:922: Skipping hidden file/directory %s", _data_->_tmp74_); +#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_free0 (_data_->_tmp74_); +#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_object_unref0 (_data_->_tmp72_); +#line 925 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->info); -#line 924 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 925 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 4225 "DirectoryMonitor.c" +#line 4241 "DirectoryMonitor.c" } -#line 926 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp69_ = NULL; -#line 926 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp69_ = _data_->info; -#line 926 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp70_ = 0; -#line 926 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp70_ = g_file_info_get_file_type (_data_->_tmp69_); -#line 926 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - switch (_data_->_tmp70_) { -#line 926 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - case G_FILE_TYPE_REGULAR: -#line 4239 "DirectoryMonitor.c" - { -#line 928 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp71_ = NULL; -#line 928 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp71_ = _data_->file_map; -#line 928 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp71_ == NULL) { #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp72_ = NULL; + _data_->_tmp75_ = NULL; #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp72_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _data_->_tmp75_ = _data_->info; #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->file_map); + _data_->_tmp76_ = FALSE; #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->file_map = _data_->_tmp72_; -#line 4255 "DirectoryMonitor.c" - } -#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp73_ = NULL; -#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp73_ = _data_->file_map; -#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp74_ = NULL; -#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp74_ = _data_->dir; -#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp75_ = NULL; -#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp75_ = _data_->info; -#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp76_ = NULL; -#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp76_ = g_file_info_get_name (_data_->_tmp75_); -#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp77_ = NULL; -#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp77_ = g_file_get_child (_data_->_tmp74_, _data_->_tmp76_); -#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp78_ = NULL; -#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp78_ = _data_->_tmp77_; -#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp79_ = NULL; -#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp79_ = _data_->info; -#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp73_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp78_, _data_->_tmp79_); -#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp78_); + _data_->_tmp76_ = directory_monitor_is_file_symlink_supported (_data_->_tmp75_); +#line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + if (!_data_->_tmp76_) { +#line 930 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_object_unref0 (_data_->info); +#line 930 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + continue; +#line 4257 "DirectoryMonitor.c" + } #line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - break; -#line 4291 "DirectoryMonitor.c" - } -#line 926 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - case G_FILE_TYPE_DIRECTORY: -#line 4295 "DirectoryMonitor.c" + _data_->_tmp77_ = NULL; +#line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp77_ = _data_->info; +#line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp78_ = 0; +#line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp78_ = g_file_info_get_file_type (_data_->_tmp77_); +#line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + switch (_data_->_tmp78_) { +#line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + case G_FILE_TYPE_REGULAR: +#line 4271 "DirectoryMonitor.c" { +#line 934 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp79_ = NULL; +#line 934 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp79_ = _data_->file_map; +#line 934 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + if (_data_->_tmp79_ == NULL) { #line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp80_ = NULL; + _data_->_tmp80_ = NULL; #line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp80_ = _data_->dir_map; + _data_->_tmp80_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp80_ == NULL) { -#line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp81_ = NULL; -#line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp81_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); -#line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->dir_map); -#line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->dir_map = _data_->_tmp81_; -#line 4311 "DirectoryMonitor.c" + _g_object_unref0 (_data_->file_map); +#line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->file_map = _data_->_tmp80_; +#line 4287 "DirectoryMonitor.c" } -#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp81_ = NULL; +#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp81_ = _data_->file_map; +#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp82_ = NULL; -#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp82_ = _data_->dir_map; -#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp82_ = _data_->dir; +#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp83_ = NULL; -#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp83_ = _data_->dir; -#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp83_ = _data_->info; +#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp84_ = NULL; -#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp84_ = _data_->info; -#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp84_ = g_file_info_get_name (_data_->_tmp83_); +#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp85_ = NULL; -#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp85_ = g_file_info_get_name (_data_->_tmp84_); -#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp85_ = g_file_get_child (_data_->_tmp82_, _data_->_tmp84_); +#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp86_ = NULL; -#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp86_ = g_file_get_child (_data_->_tmp83_, _data_->_tmp85_); -#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp86_ = _data_->_tmp85_; +#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp87_ = NULL; +#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp87_ = _data_->info; +#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp81_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp86_, _data_->_tmp87_); +#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_object_unref0 (_data_->_tmp86_); #line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp87_ = _data_->_tmp86_; -#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + break; +#line 4323 "DirectoryMonitor.c" + } +#line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + case G_FILE_TYPE_DIRECTORY: +#line 4327 "DirectoryMonitor.c" + { +#line 941 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp88_ = NULL; -#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp88_ = _data_->info; -#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp82_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp87_, _data_->_tmp88_); -#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp87_); -#line 939 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 941 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp88_ = _data_->dir_map; +#line 941 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + if (_data_->_tmp88_ == NULL) { +#line 942 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp89_ = NULL; +#line 942 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp89_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); +#line 942 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_object_unref0 (_data_->dir_map); +#line 942 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->dir_map = _data_->_tmp89_; +#line 4343 "DirectoryMonitor.c" + } +#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp90_ = NULL; +#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp90_ = _data_->dir_map; +#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp91_ = NULL; +#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp91_ = _data_->dir; +#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp92_ = NULL; +#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp92_ = _data_->info; +#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp93_ = NULL; +#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp93_ = g_file_info_get_name (_data_->_tmp92_); +#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp94_ = NULL; +#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp94_ = g_file_get_child (_data_->_tmp91_, _data_->_tmp93_); +#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp95_ = NULL; +#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp95_ = _data_->_tmp94_; +#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp96_ = NULL; +#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp96_ = _data_->info; +#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp90_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp95_, _data_->_tmp96_); +#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_object_unref0 (_data_->_tmp95_); +#line 945 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 4347 "DirectoryMonitor.c" +#line 4379 "DirectoryMonitor.c" } default: { -#line 943 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 949 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 4353 "DirectoryMonitor.c" +#line 4385 "DirectoryMonitor.c" } } -#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->info); -#line 4358 "DirectoryMonitor.c" +#line 4390 "DirectoryMonitor.c" } } } -#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" __g_list_free__g_object_unref0_0 (_data_->infos); -#line 4364 "DirectoryMonitor.c" +#line 4396 "DirectoryMonitor.c" } } -#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->enumerator); -#line 4369 "DirectoryMonitor.c" +#line 4401 "DirectoryMonitor.c" } goto __finally481; __catch481_g_error: { -#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->err2 = _data_->_inner_error_; -#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_inner_error_ = NULL; -#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp89_ = NULL; -#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp89_ = _data_->dir; -#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp90_ = NULL; -#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp90_ = g_file_get_path (_data_->_tmp89_); -#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp91_ = NULL; -#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp91_ = _data_->_tmp90_; -#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp92_ = NULL; -#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp92_ = _data_->err2; -#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp93_ = NULL; -#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp93_ = _data_->_tmp92_->message; -#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:948: Aborted directory traversal of %s: %s", _data_->_tmp91_, _data_->_tmp93_); -#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp91_); -#line 950 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp94_ = FALSE; -#line 950 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp94_ = _data_->in_discovery; -#line 950 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp94_); -#line 952 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp97_ = NULL; +#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp97_ = _data_->dir; +#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp98_ = NULL; +#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp98_ = g_file_get_path (_data_->_tmp97_); +#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp99_ = NULL; +#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp99_ = _data_->_tmp98_; +#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp100_ = NULL; +#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp100_ = _data_->err2; +#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp101_ = NULL; +#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp101_ = _data_->_tmp100_->message; +#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_warning ("DirectoryMonitor.vala:954: Aborted directory traversal of %s: %s", _data_->_tmp99_, _data_->_tmp101_); +#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_free0 (_data_->_tmp99_); +#line 956 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp102_ = FALSE; +#line 956 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp102_ = _data_->in_discovery; +#line 956 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp102_); +#line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_error_free0 (_data_->err2); -#line 952 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_map); -#line 952 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_map); -#line 952 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->local_dir_info); -#line 952 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_state_ == 0) { -#line 952 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 4420 "DirectoryMonitor.c" +#line 4452 "DirectoryMonitor.c" } else { -#line 952 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_simple_async_result_complete (_data_->_async_result); -#line 4424 "DirectoryMonitor.c" +#line 4456 "DirectoryMonitor.c" } -#line 952 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); -#line 952 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4430 "DirectoryMonitor.c" +#line 4462 "DirectoryMonitor.c" } __finally481: -#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_map); -#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_map); -#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->local_dir_info); -#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); -#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_clear_error (&_data_->_inner_error_); -#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4447 "DirectoryMonitor.c" - } -#line 956 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp95_ = FALSE; -#line 956 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp95_ = _data_->in_discovery; -#line 956 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp95_) { -#line 957 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp96_ = NULL; -#line 957 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp96_ = _data_->dir; -#line 957 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp97_ = NULL; -#line 957 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp97_ = _data_->local_dir_info; -#line 957 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_internal_notify_directory_discovered (_data_->self, _data_->_tmp96_, _data_->_tmp97_); -#line 4465 "DirectoryMonitor.c" - } else { -#line 959 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp98_ = NULL; -#line 959 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp98_ = _data_->dir; -#line 959 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp99_ = NULL; -#line 959 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp99_ = _data_->local_dir_info; -#line 959 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_internal_notify_directory_created (_data_->self, _data_->_tmp98_, _data_->_tmp99_); -#line 4477 "DirectoryMonitor.c" +#line 4479 "DirectoryMonitor.c" } +#line 962 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp103_ = FALSE; +#line 962 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp103_ = _data_->in_discovery; +#line 962 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + if (_data_->_tmp103_) { #line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp100_ = NULL; + _data_->_tmp104_ = NULL; #line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp100_ = _data_->dir; + _data_->_tmp104_ = _data_->dir; #line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp101_ = NULL; + _data_->_tmp105_ = NULL; #line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp101_ = _data_->local_dir_info; + _data_->_tmp105_ = _data_->local_dir_info; #line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_add_monitor (_data_->self, _data_->_tmp100_, _data_->_tmp101_); -#line 966 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp102_ = NULL; -#line 966 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp102_ = _data_->file_map; -#line 966 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp102_ != NULL) { -#line 967 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp103_ = NULL; -#line 967 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp103_ = _data_->file_map; -#line 967 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp104_ = FALSE; -#line 967 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp104_ = _data_->in_discovery; -#line 967 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_state_ = 4; -#line 967 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_directory_files (_data_->self, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp103_, GEE_TYPE_MAP, GeeMap), _data_->_tmp104_, directory_monitor_explore_async_ready, _data_); -#line 967 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - return FALSE; -#line 4509 "DirectoryMonitor.c" - _state_4: -#line 967 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_directory_files_finish (_data_->self, _data_->_res_); -#line 4513 "DirectoryMonitor.c" - } -#line 970 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp106_ = FALSE; -#line 970 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp106_ = _data_->self->priv->recurse; -#line 970 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp106_) { -#line 970 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp107_ = NULL; -#line 970 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp107_ = _data_->dir_map; -#line 970 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp105_ = _data_->_tmp107_ != NULL; -#line 4527 "DirectoryMonitor.c" + directory_monitor_internal_notify_directory_discovered (_data_->self, _data_->_tmp104_, _data_->_tmp105_); +#line 4497 "DirectoryMonitor.c" } else { -#line 970 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp105_ = FALSE; -#line 4531 "DirectoryMonitor.c" +#line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp106_ = NULL; +#line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp106_ = _data_->dir; +#line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp107_ = NULL; +#line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp107_ = _data_->local_dir_info; +#line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + directory_monitor_internal_notify_directory_created (_data_->self, _data_->_tmp106_, _data_->_tmp107_); +#line 4509 "DirectoryMonitor.c" } -#line 970 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp105_) { -#line 4535 "DirectoryMonitor.c" - { -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp108_ = NULL; -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp108_ = _data_->dir_map; -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp109_ = NULL; -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp109_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp108_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp110_ = NULL; -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp110_ = _data_->_tmp109_; -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp111_ = NULL; -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp111_ = _data_->_tmp110_; -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp112_ = NULL; -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp112_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp111_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp113_ = NULL; -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp113_ = _data_->_tmp112_; -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp111_); -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_subdir_it = _data_->_tmp113_; -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - while (TRUE) { -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp114_ = NULL; -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp114_ = _data_->_subdir_it; -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp115_ = FALSE; -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp115_ = gee_iterator_next (_data_->_tmp114_); -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_data_->_tmp115_) { -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - break; -#line 4579 "DirectoryMonitor.c" - } -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp116_ = NULL; -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp116_ = _data_->_subdir_it; -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp117_ = NULL; -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp117_ = gee_iterator_get (_data_->_tmp116_); -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->subdir = (GFile*) _data_->_tmp117_; -#line 972 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp118_ = 0; -#line 972 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp118_ = _data_->self->priv->outstanding_exploration_dirs; +#line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp108_ = NULL; +#line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp108_ = _data_->dir; +#line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp109_ = NULL; +#line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp109_ = _data_->local_dir_info; +#line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + directory_monitor_add_monitor (_data_->self, _data_->_tmp108_, _data_->_tmp109_); #line 972 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->self->priv->outstanding_exploration_dirs = _data_->_tmp118_ + 1; + _data_->_tmp110_ = NULL; #line 972 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp119_ = 0; + _data_->_tmp110_ = _data_->file_map; #line 972 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp119_ = _data_->self->priv->outstanding_exploration_dirs; -#line 972 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp119_ > DIRECTORY_MONITOR_MAX_EXPLORATION_DIRS) { -#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp120_ = NULL; -#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp120_ = _data_->subdir; -#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp121_ = NULL; -#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp121_ = _data_->dir_map; + if (_data_->_tmp110_ != NULL) { #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp122_ = NULL; + _data_->_tmp111_ = NULL; #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp122_ = _data_->subdir; + _data_->_tmp111_ = _data_->file_map; #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp123_ = NULL; + _data_->_tmp112_ = FALSE; #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp123_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp121_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp122_); + _data_->_tmp112_ = _data_->in_discovery; #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp124_ = NULL; -#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp124_ = (GFileInfo*) _data_->_tmp123_; + _data_->_state_ = 4; #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp125_ = FALSE; + directory_monitor_notify_directory_files (_data_->self, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp111_, GEE_TYPE_MAP, GeeMap), _data_->_tmp112_, directory_monitor_explore_async_ready, _data_); #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp125_ = _data_->in_discovery; + return FALSE; +#line 4541 "DirectoryMonitor.c" + _state_4: #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + directory_monitor_notify_directory_files_finish (_data_->self, _data_->_res_); +#line 4545 "DirectoryMonitor.c" + } +#line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp114_ = FALSE; +#line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp114_ = _data_->self->priv->recurse; +#line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + if (_data_->_tmp114_) { +#line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp115_ = NULL; +#line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp115_ = _data_->dir_map; +#line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp113_ = _data_->_tmp115_ != NULL; +#line 4559 "DirectoryMonitor.c" + } else { +#line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp113_ = FALSE; +#line 4563 "DirectoryMonitor.c" + } +#line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + if (_data_->_tmp113_) { +#line 4567 "DirectoryMonitor.c" + { +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp116_ = NULL; +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp116_ = _data_->dir_map; +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp117_ = NULL; +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp117_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp116_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp118_ = NULL; +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp118_ = _data_->_tmp117_; +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp119_ = NULL; +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp119_ = _data_->_tmp118_; +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp120_ = NULL; +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp120_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp119_, GEE_TYPE_ITERABLE, GeeIterable)); +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp121_ = NULL; +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp121_ = _data_->_tmp120_; +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_object_unref0 (_data_->_tmp119_); +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_subdir_it = _data_->_tmp121_; +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + while (TRUE) { +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp122_ = NULL; +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp122_ = _data_->_subdir_it; +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp123_ = FALSE; +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp123_ = gee_iterator_next (_data_->_tmp122_); +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + if (!_data_->_tmp123_) { +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + break; +#line 4611 "DirectoryMonitor.c" + } +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp124_ = NULL; +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp124_ = _data_->_subdir_it; +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp125_ = NULL; +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp125_ = gee_iterator_get (_data_->_tmp124_); +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->subdir = (GFile*) _data_->_tmp125_; +#line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp126_ = 0; +#line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp126_ = _data_->self->priv->outstanding_exploration_dirs; +#line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->self->priv->outstanding_exploration_dirs = _data_->_tmp126_ + 1; +#line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp127_ = 0; +#line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp127_ = _data_->self->priv->outstanding_exploration_dirs; +#line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + if (_data_->_tmp127_ > DIRECTORY_MONITOR_MAX_EXPLORATION_DIRS) { +#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp128_ = NULL; +#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp128_ = _data_->subdir; +#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp129_ = NULL; +#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp129_ = _data_->dir_map; +#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp130_ = NULL; +#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp130_ = _data_->subdir; +#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp131_ = NULL; +#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp131_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp129_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp130_); +#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp132_ = NULL; +#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp132_ = (GFileInfo*) _data_->_tmp131_; +#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp133_ = FALSE; +#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp133_ = _data_->in_discovery; +#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 5; -#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_explore_async (_data_->self, _data_->_tmp120_, _data_->_tmp124_, _data_->_tmp125_, directory_monitor_explore_async_ready, _data_); -#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + directory_monitor_explore_async (_data_->self, _data_->_tmp128_, _data_->_tmp132_, _data_->_tmp133_, directory_monitor_explore_async_ready, _data_); +#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4633 "DirectoryMonitor.c" +#line 4665 "DirectoryMonitor.c" _state_5: -#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_explore_finish (_data_->self, _data_->_res_); -#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp124_); -#line 4639 "DirectoryMonitor.c" +#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_object_unref0 (_data_->_tmp132_); +#line 4671 "DirectoryMonitor.c" } else { -#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp126_ = NULL; -#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp126_ = _data_->subdir; -#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp127_ = NULL; -#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp127_ = _data_->dir_map; -#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp128_ = NULL; -#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp128_ = _data_->subdir; -#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp129_ = NULL; -#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp129_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp127_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp128_); -#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp130_ = NULL; -#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp130_ = (GFileInfo*) _data_->_tmp129_; -#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp131_ = FALSE; -#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp131_ = _data_->in_discovery; -#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_explore_async (_data_->self, _data_->_tmp126_, _data_->_tmp130_, _data_->_tmp131_, NULL, NULL); -#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp130_); -#line 4669 "DirectoryMonitor.c" +#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp134_ = NULL; +#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp134_ = _data_->subdir; +#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp135_ = NULL; +#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp135_ = _data_->dir_map; +#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp136_ = NULL; +#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp136_ = _data_->subdir; +#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp137_ = NULL; +#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp137_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp135_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp136_); +#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp138_ = NULL; +#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp138_ = (GFileInfo*) _data_->_tmp137_; +#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp139_ = FALSE; +#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp139_ = _data_->in_discovery; +#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + directory_monitor_explore_async (_data_->self, _data_->_tmp134_, _data_->_tmp138_, _data_->_tmp139_, NULL, NULL); +#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_object_unref0 (_data_->_tmp138_); +#line 4701 "DirectoryMonitor.c" } -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->subdir); -#line 4673 "DirectoryMonitor.c" +#line 4705 "DirectoryMonitor.c" } -#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_subdir_it); -#line 4677 "DirectoryMonitor.c" +#line 4709 "DirectoryMonitor.c" } } -#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp132_ = FALSE; -#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp132_ = _data_->in_discovery; -#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp132_); -#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 985 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp140_ = FALSE; +#line 985 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_tmp140_ = _data_->in_discovery; +#line 985 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp140_); +#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_map); -#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_map); -#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->local_dir_info); -#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_state_ == 0) { -#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 4696 "DirectoryMonitor.c" +#line 4728 "DirectoryMonitor.c" } else { -#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_simple_async_result_complete (_data_->_async_result); -#line 4700 "DirectoryMonitor.c" +#line 4732 "DirectoryMonitor.c" } -#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); -#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4706 "DirectoryMonitor.c" +#line 4738 "DirectoryMonitor.c" } @@ -4719,7 +4751,7 @@ static void directory_monitor_notify_directory_files_data_free (gpointer _data) _g_object_unref0 (_data_->self); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_slice_free (DirectoryMonitorNotifyDirectoryFilesData, _data_); -#line 4719 "DirectoryMonitor.c" +#line 4751 "DirectoryMonitor.c" } @@ -4753,7 +4785,7 @@ static void directory_monitor_notify_directory_files (DirectoryMonitor* self, Ge _data_->in_discovery = _tmp3_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_directory_files_co (_data_); -#line 4753 "DirectoryMonitor.c" +#line 4785 "DirectoryMonitor.c" } @@ -4761,159 +4793,159 @@ static void directory_monitor_notify_directory_files_finish (DirectoryMonitor* s DirectoryMonitorNotifyDirectoryFilesData* _data_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 4761 "DirectoryMonitor.c" +#line 4793 "DirectoryMonitor.c" } static gboolean _directory_monitor_notify_directory_files_co_gsource_func (gpointer self) { gboolean result; result = directory_monitor_notify_directory_files_co (self); -#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 996 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 4770 "DirectoryMonitor.c" +#line 4802 "DirectoryMonitor.c" } static gboolean directory_monitor_notify_directory_files_co (DirectoryMonitorNotifyDirectoryFilesData* _data_) { -#line 982 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" switch (_data_->_state_) { -#line 982 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 0: -#line 4779 "DirectoryMonitor.c" +#line 4811 "DirectoryMonitor.c" goto _state_0; -#line 982 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 1: -#line 4783 "DirectoryMonitor.c" +#line 4815 "DirectoryMonitor.c" goto _state_1; default: -#line 982 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_assert_not_reached (); -#line 4788 "DirectoryMonitor.c" +#line 4820 "DirectoryMonitor.c" } _state_0: -#line 983 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp0_ = NULL; -#line 983 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp0_ = _data_->map; -#line 983 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp1_ = NULL; -#line 983 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp1_ = gee_map_map_iterator (_data_->_tmp0_); -#line 983 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->iter = _data_->_tmp1_; -#line 984 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 984 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp2_ = NULL; -#line 984 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp2_ = _data_->iter; -#line 984 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp3_ = FALSE; -#line 984 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp3_ = gee_map_iterator_next (_data_->_tmp2_); -#line 984 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_data_->_tmp3_) { -#line 984 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 4815 "DirectoryMonitor.c" +#line 4847 "DirectoryMonitor.c" } -#line 985 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 991 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp4_ = FALSE; -#line 985 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 991 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp4_ = _data_->in_discovery; -#line 985 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 991 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_tmp4_) { -#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp5_ = NULL; -#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp5_ = _data_->iter; -#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp6_ = NULL; -#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp6_ = gee_map_iterator_get_key (_data_->_tmp5_); -#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp7_ = NULL; -#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp7_ = (GFile*) _data_->_tmp6_; -#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp8_ = NULL; -#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp8_ = _data_->iter; -#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp9_ = NULL; -#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp9_ = gee_map_iterator_get_value (_data_->_tmp8_); -#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp10_ = NULL; -#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp10_ = (GFileInfo*) _data_->_tmp9_; -#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_internal_notify_file_discovered (_data_->self, _data_->_tmp7_, _data_->_tmp10_); -#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_tmp10_); -#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_tmp7_); -#line 4853 "DirectoryMonitor.c" +#line 4885 "DirectoryMonitor.c" } else { -#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp11_ = NULL; -#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp11_ = _data_->iter; -#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp12_ = NULL; -#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp12_ = gee_map_iterator_get_key (_data_->_tmp11_); -#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp13_ = NULL; -#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp13_ = (GFile*) _data_->_tmp12_; -#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp14_ = NULL; -#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp14_ = _data_->iter; -#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp15_ = NULL; -#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp15_ = gee_map_iterator_get_value (_data_->_tmp14_); -#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp16_ = NULL; -#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp16_ = (GFileInfo*) _data_->_tmp15_; -#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_internal_notify_file_created (_data_->self, _data_->_tmp13_, _data_->_tmp16_); -#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_tmp16_); -#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_tmp13_); -#line 4885 "DirectoryMonitor.c" +#line 4917 "DirectoryMonitor.c" } -#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 996 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_idle_add_full (DIRECTORY_MONITOR_DEFAULT_PRIORITY, _directory_monitor_notify_directory_files_co_gsource_func, _data_, NULL); -#line 991 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 997 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 1; -#line 991 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 997 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4893 "DirectoryMonitor.c" +#line 4925 "DirectoryMonitor.c" _state_1: ; } -#line 982 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->iter); -#line 982 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_state_ == 0) { -#line 982 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 4903 "DirectoryMonitor.c" +#line 4935 "DirectoryMonitor.c" } else { -#line 982 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_simple_async_result_complete (_data_->_async_result); -#line 4907 "DirectoryMonitor.c" +#line 4939 "DirectoryMonitor.c" } -#line 982 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); -#line 982 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4913 "DirectoryMonitor.c" +#line 4945 "DirectoryMonitor.c" } @@ -4922,45 +4954,45 @@ static void directory_monitor_explore_directory_completed (DirectoryMonitor* sel gint _tmp1_ = 0; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; -#line 997 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1003 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 998 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1004 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->outstanding_exploration_dirs; -#line 998 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1004 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp0_ > 0, "outstanding_exploration_dirs > 0"); -#line 999 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1005 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = self->priv->outstanding_exploration_dirs; -#line 999 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1005 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->outstanding_exploration_dirs = _tmp1_ - 1; -#line 1001 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = in_discovery; -#line 1001 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp3_) { -#line 4936 "DirectoryMonitor.c" +#line 4968 "DirectoryMonitor.c" gint _tmp4_ = 0; -#line 1001 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = self->priv->outstanding_exploration_dirs; -#line 1001 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp4_ == 0; -#line 4942 "DirectoryMonitor.c" +#line 4974 "DirectoryMonitor.c" } else { -#line 1001 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = FALSE; -#line 4946 "DirectoryMonitor.c" +#line 4978 "DirectoryMonitor.c" } -#line 1001 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp2_) { -#line 1002 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1008 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_discovery_completed (self); -#line 4952 "DirectoryMonitor.c" +#line 4984 "DirectoryMonitor.c" } } static void _directory_monitor_on_monitor_notification_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self) { -#line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1036 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_on_monitor_notification ((DirectoryMonitor*) self, file, other_file, event_type); -#line 4960 "DirectoryMonitor.c" +#line 4992 "DirectoryMonitor.c" } @@ -4987,90 +5019,90 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di gchar* _tmp26_ = NULL; gchar* _tmp27_ = NULL; GError * _inner_error_ = NULL; -#line 1008 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1014 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); -#line 1008 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1014 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE (dir), FALSE); -#line 1008 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1014 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); -#line 1009 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1015 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->monitoring; -#line 1009 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1015 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_tmp0_) { -#line 1010 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1016 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; -#line 1010 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1016 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5001 "DirectoryMonitor.c" +#line 5033 "DirectoryMonitor.c" } -#line 1012 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = self->priv->files; -#line 1012 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = dir; -#line 1012 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = info; -#line 1012 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = directory_monitor_file_info_map_get_id (_tmp1_, _tmp2_, _tmp3_); -#line 1012 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" id = _tmp4_; -#line 1013 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1019 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = id; -#line 1013 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1019 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp5_ == NULL) { -#line 1014 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1020 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; -#line 1014 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1020 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 1014 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1020 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5023 "DirectoryMonitor.c" +#line 5055 "DirectoryMonitor.c" } -#line 1017 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1023 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = self->priv->monitors; -#line 1017 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1023 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = id; -#line 1017 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1023 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_); -#line 1017 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1023 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp8_) { -#line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; -#line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5039 "DirectoryMonitor.c" +#line 5071 "DirectoryMonitor.c" } -#line 1020 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1026 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" monitor = NULL; -#line 5043 "DirectoryMonitor.c" +#line 5075 "DirectoryMonitor.c" { GFileMonitor* _tmp9_ = NULL; GFile* _tmp10_ = NULL; GFileMonitor* _tmp11_ = NULL; GFileMonitor* _tmp12_ = NULL; -#line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = dir; -#line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp11_ = g_file_monitor_directory (_tmp10_, DIRECTORY_MONITOR_FILE_MONITOR_FLAGS, NULL, &_inner_error_); -#line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = _tmp11_; -#line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5057 "DirectoryMonitor.c" +#line 5089 "DirectoryMonitor.c" goto __catch482_g_error; } -#line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = _tmp9_; -#line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = NULL; -#line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (monitor); -#line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" monitor = _tmp12_; -#line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_tmp9_); -#line 5070 "DirectoryMonitor.c" +#line 5102 "DirectoryMonitor.c" } goto __finally482; __catch482_g_error: @@ -5081,90 +5113,90 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di gchar* _tmp15_ = NULL; GError* _tmp16_ = NULL; const gchar* _tmp17_ = NULL; -#line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" err = _inner_error_; -#line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _inner_error_ = NULL; -#line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = dir; -#line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp14_ = g_file_get_path (_tmp13_); -#line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp15_ = _tmp14_; -#line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp16_ = err; -#line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp17_ = _tmp16_->message; -#line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:1024: Unable to monitor %s: %s", _tmp15_, _tmp17_); -#line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_warning ("DirectoryMonitor.vala:1030: Unable to monitor %s: %s", _tmp15_, _tmp17_); +#line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp15_); -#line 1026 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; -#line 1026 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_error_free0 (err); -#line 1026 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (monitor); -#line 1026 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 1026 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5109 "DirectoryMonitor.c" +#line 5141 "DirectoryMonitor.c" } __finally482: -#line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5114 "DirectoryMonitor.c" +#line 5146 "DirectoryMonitor.c" gboolean _tmp18_ = FALSE; -#line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (monitor); -#line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_clear_error (&_inner_error_); -#line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return _tmp18_; -#line 5126 "DirectoryMonitor.c" +#line 5158 "DirectoryMonitor.c" } -#line 1029 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1035 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = self->priv->monitors; -#line 1029 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1035 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp20_ = id; -#line 1029 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1035 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp21_ = monitor; -#line 1029 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1035 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_, _tmp21_); -#line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1036 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp22_ = monitor; -#line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1036 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_connect_object (_tmp22_, "changed", (GCallback) _directory_monitor_on_monitor_notification_g_file_monitor_changed, self, 0); -#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp23_ = dir; -#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp24_ = g_file_get_path (_tmp23_); -#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp25_ = _tmp24_; -#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp26_ = g_strdup_printf ("Added monitor for %s", _tmp25_); -#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp27_ = _tmp26_; -#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp27_); -#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp27_); -#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp25_); -#line 1034 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1040 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = TRUE; -#line 1034 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1040 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (monitor); -#line 1034 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1040 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 1034 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1040 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5164 "DirectoryMonitor.c" +#line 5196 "DirectoryMonitor.c" } @@ -5193,107 +5225,107 @@ static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile* gchar* _tmp17_ = NULL; gchar* _tmp18_ = NULL; gchar* _tmp19_ = NULL; -#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1044 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); -#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1044 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE (dir), FALSE); -#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1044 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); -#line 1039 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1045 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->monitoring; -#line 1039 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1045 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_tmp0_) { -#line 1040 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1046 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; -#line 1040 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1046 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5207 "DirectoryMonitor.c" +#line 5239 "DirectoryMonitor.c" } -#line 1042 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = self->priv->files; -#line 1042 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = dir; -#line 1042 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = info; -#line 1042 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = directory_monitor_file_info_map_get_id (_tmp1_, _tmp2_, _tmp3_); -#line 1042 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" id = _tmp4_; -#line 1043 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1049 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = id; -#line 1043 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1049 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp5_ == NULL) { -#line 1044 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1050 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; -#line 1044 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1050 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 1044 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1050 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5229 "DirectoryMonitor.c" +#line 5261 "DirectoryMonitor.c" } -#line 1046 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1052 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = self->priv->monitors; -#line 1046 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1052 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = id; -#line 1046 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1052 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_); -#line 1046 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1052 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" monitor = (GFileMonitor*) _tmp8_; -#line 1047 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1053 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = monitor; -#line 1047 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1053 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp9_ == NULL) { -#line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1054 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; -#line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1054 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (monitor); -#line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1054 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1054 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5251 "DirectoryMonitor.c" +#line 5283 "DirectoryMonitor.c" } -#line 1050 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1056 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = self->priv->monitors; -#line 1050 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1056 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp11_ = id; -#line 1050 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1056 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, NULL); -#line 1050 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1056 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" removed = _tmp12_; -#line 1051 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1057 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = removed; -#line 1051 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1057 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp13_, "removed"); -#line 1053 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1059 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp14_ = monitor; -#line 1053 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1059 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_cancel_monitor (self, _tmp14_); -#line 1055 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp15_ = dir; -#line 1055 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp16_ = g_file_get_path (_tmp15_); -#line 1055 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp17_ = _tmp16_; -#line 1055 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp18_ = g_strdup_printf ("Removed monitor for %s", _tmp17_); -#line 1055 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = _tmp18_; -#line 1055 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp19_); -#line 1055 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp19_); -#line 1055 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp17_); -#line 1057 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1063 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = TRUE; -#line 1057 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1063 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (monitor); -#line 1057 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1063 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 1057 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1063 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5293 "DirectoryMonitor.c" +#line 5325 "DirectoryMonitor.c" } @@ -5301,39 +5333,39 @@ static void directory_monitor_cancel_monitor (DirectoryMonitor* self, GFileMonit GFileMonitor* _tmp0_ = NULL; guint _tmp1_ = 0U; GFileMonitor* _tmp2_ = NULL; -#line 1060 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 1060 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_MONITOR (monitor)); -#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = monitor; -#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_parse_name ("changed", g_file_monitor_get_type (), &_tmp1_, NULL, FALSE); -#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _directory_monitor_on_monitor_notification_g_file_monitor_changed, self); -#line 1062 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1068 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = monitor; -#line 1062 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1068 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_file_monitor_cancel (_tmp2_); -#line 5315 "DirectoryMonitor.c" +#line 5347 "DirectoryMonitor.c" } static void _directory_monitor_query_info_queue_element_on_completed_gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { -#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_on_completed ((DirectoryMonitorQueryInfoQueueElement*) self, source_object, res); -#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_unref (self); -#line 5324 "DirectoryMonitor.c" +#line 5356 "DirectoryMonitor.c" } static gboolean _directory_monitor_check_for_expired_delete_events_gsource_func (gpointer self) { gboolean result; result = directory_monitor_check_for_expired_delete_events ((DirectoryMonitor*) self); -#line 1091 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5333 "DirectoryMonitor.c" +#line 5365 "DirectoryMonitor.c" } @@ -5355,182 +5387,182 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G GeeQueue* _tmp16_ = NULL; DirectoryMonitorQueryInfoQueueElement* _tmp17_ = NULL; GFileMonitorEvent _tmp18_ = 0; -#line 1065 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 1065 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 1065 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail ((other_file == NULL) || G_IS_FILE (other_file)); -#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = other_file; -#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp1_ != NULL) { -#line 5365 "DirectoryMonitor.c" +#line 5397 "DirectoryMonitor.c" GFile* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = other_file; -#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = g_file_get_path (_tmp2_); -#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp0_); -#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = _tmp3_; -#line 5376 "DirectoryMonitor.c" +#line 5408 "DirectoryMonitor.c" } else { gchar* _tmp4_ = NULL; -#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = g_strdup ("(none)"); -#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp0_); -#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = _tmp4_; -#line 5385 "DirectoryMonitor.c" +#line 5417 "DirectoryMonitor.c" } -#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = event; -#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp5_); -#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = file; -#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = g_file_get_path (_tmp7_); -#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = _tmp8_; -#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = g_strdup_printf ("NOTIFY %s: file=%s other_file=%s", (_tmp6_ != NULL) ? _tmp6_->value_name : NULL, _tmp9_, _tmp0_); -#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp11_ = _tmp10_; -#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp11_); -#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp11_); -#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp9_); -#line 1076 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = file; -#line 1076 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = other_file; -#line 1076 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp14_ = event; -#line 1076 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp15_ = directory_monitor_query_info_queue_element_new (self, _tmp12_, _tmp13_, _tmp14_); -#line 1076 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" query_info = _tmp15_; -#line 1077 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1083 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp16_ = self->priv->query_info_queue; -#line 1077 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1083 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp17_ = query_info; -#line 1077 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1083 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" gee_queue_offer (_tmp16_, _tmp17_); -#line 1079 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp18_ = event; -#line 1079 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" switch (_tmp18_) { -#line 1079 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_CREATED: -#line 1079 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: -#line 5431 "DirectoryMonitor.c" +#line 5463 "DirectoryMonitor.c" { GFile* _tmp19_ = NULL; GCancellable* _tmp20_ = NULL; DirectoryMonitorQueryInfoQueueElement* _tmp21_ = NULL; -#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = file; -#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp20_ = self->priv->cancellable; -#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp21_ = query_info; -#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_file_query_info_async (_tmp19_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _tmp20_, _directory_monitor_query_info_queue_element_on_completed_gasync_ready_callback, directory_monitor_query_info_queue_element_ref (_tmp21_)); -#line 1084 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1090 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5446 "DirectoryMonitor.c" +#line 5478 "DirectoryMonitor.c" } -#line 1079 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_DELETED: -#line 5450 "DirectoryMonitor.c" +#line 5482 "DirectoryMonitor.c" { guint _tmp22_ = 0U; -#line 1090 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1096 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp22_ = self->priv->delete_timer_id; -#line 1090 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1096 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp22_ == ((guint) 0)) { -#line 5457 "DirectoryMonitor.c" +#line 5489 "DirectoryMonitor.c" guint _tmp23_ = 0U; -#line 1091 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp23_ = g_timeout_add_full (G_PRIORITY_DEFAULT, DIRECTORY_MONITOR_DELETED_EXPIRATION_MSEC / 2, _directory_monitor_check_for_expired_delete_events_gsource_func, g_object_ref (self), g_object_unref); -#line 1091 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->delete_timer_id = _tmp23_; -#line 5463 "DirectoryMonitor.c" +#line 5495 "DirectoryMonitor.c" } -#line 1092 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1098 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5467 "DirectoryMonitor.c" +#line 5499 "DirectoryMonitor.c" } -#line 1079 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_MOVED: -#line 5471 "DirectoryMonitor.c" +#line 5503 "DirectoryMonitor.c" { GFile* _tmp24_ = NULL; -#line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1103 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp24_ = other_file; -#line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1103 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp24_ != NULL) { -#line 5478 "DirectoryMonitor.c" +#line 5510 "DirectoryMonitor.c" GFile* _tmp25_ = NULL; GCancellable* _tmp26_ = NULL; DirectoryMonitorQueryInfoQueueElement* _tmp27_ = NULL; -#line 1098 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp25_ = other_file; -#line 1098 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp26_ = self->priv->cancellable; -#line 1098 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp27_ = query_info; -#line 1098 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_file_query_info_async (_tmp25_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _tmp26_, _directory_monitor_query_info_queue_element_on_completed_gasync_ready_callback, directory_monitor_query_info_queue_element_ref (_tmp27_)); -#line 5490 "DirectoryMonitor.c" +#line 5522 "DirectoryMonitor.c" } else { GeeQueue* _tmp28_ = NULL; DirectoryMonitorQueryInfoQueueElement* _tmp29_ = NULL; -#line 1101 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:1101: Unable to process MOVED event: no other_fi" \ +#line 1107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_warning ("DirectoryMonitor.vala:1107: Unable to process MOVED event: no other_fi" \ "le"); -#line 1102 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1108 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp28_ = self->priv->query_info_queue; -#line 1102 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1108 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp29_ = query_info; -#line 1102 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1108 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection), _tmp29_); -#line 5502 "DirectoryMonitor.c" +#line 5534 "DirectoryMonitor.c" } -#line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5506 "DirectoryMonitor.c" +#line 5538 "DirectoryMonitor.c" } default: { DirectoryMonitorQueryInfoQueueElement* _tmp30_ = NULL; DirectoryMonitorQueryInfoQueueElement* _tmp31_ = NULL; -#line 1108 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1114 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp30_ = query_info; -#line 1108 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1114 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp30_->completed = TRUE; -#line 1109 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1115 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp31_ = query_info; -#line 1109 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1115 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_process_query_queue (self, _tmp31_); -#line 1110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1116 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5522 "DirectoryMonitor.c" +#line 5554 "DirectoryMonitor.c" } } -#line 1065 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (query_info); -#line 1065 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp0_); -#line 5529 "DirectoryMonitor.c" +#line 5561 "DirectoryMonitor.c" } @@ -5538,88 +5570,88 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; DirectoryMonitorQueryInfoQueueElement* _tmp2_ = NULL; -#line 1114 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 1114 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail ((query_info == NULL) || DIRECTORY_MONITOR_IS_QUERY_INFO_QUEUE_ELEMENT (query_info)); -#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = query_info; -#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp2_ != NULL) { -#line 5545 "DirectoryMonitor.c" +#line 5577 "DirectoryMonitor.c" DirectoryMonitorQueryInfoQueueElement* _tmp3_ = NULL; GFileInfo* _tmp4_ = NULL; -#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = query_info; -#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = _tmp3_->info; -#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = _tmp4_ != NULL; -#line 5554 "DirectoryMonitor.c" +#line 5586 "DirectoryMonitor.c" } else { -#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = FALSE; -#line 5558 "DirectoryMonitor.c" +#line 5590 "DirectoryMonitor.c" } -#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp1_) { -#line 5562 "DirectoryMonitor.c" +#line 5594 "DirectoryMonitor.c" DirectoryMonitorQueryInfoQueueElement* _tmp5_ = NULL; GFileMonitorEvent _tmp6_ = 0; -#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = query_info; -#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = _tmp5_->event; -#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = _tmp6_ == G_FILE_MONITOR_EVENT_CREATED; -#line 5571 "DirectoryMonitor.c" +#line 5603 "DirectoryMonitor.c" } else { -#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = FALSE; -#line 5575 "DirectoryMonitor.c" +#line 5607 "DirectoryMonitor.c" } -#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp0_) { -#line 5579 "DirectoryMonitor.c" +#line 5611 "DirectoryMonitor.c" GFile* match = NULL; DirectoryMonitorFileInfoMap* _tmp7_ = NULL; DirectoryMonitorQueryInfoQueueElement* _tmp8_ = NULL; GFileInfo* _tmp9_ = NULL; GFile* _tmp10_ = NULL; GFile* _tmp11_ = NULL; -#line 1120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = self->priv->files; -#line 1120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = query_info; -#line 1120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = _tmp8_->info; -#line 1120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = directory_monitor_file_info_map_find_match (_tmp7_, _tmp9_); -#line 1120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" match = _tmp10_; -#line 1121 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1127 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp11_ = match; -#line 1121 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1127 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp11_ != NULL) { -#line 5600 "DirectoryMonitor.c" +#line 5632 "DirectoryMonitor.c" gboolean matched = FALSE; gboolean _tmp48_ = FALSE; -#line 1122 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" matched = FALSE; -#line 5605 "DirectoryMonitor.c" +#line 5637 "DirectoryMonitor.c" { GeeIterator* _enqueued_it = NULL; GeeQueue* _tmp12_ = NULL; GeeIterator* _tmp13_ = NULL; -#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = self->priv->query_info_queue; -#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _enqueued_it = _tmp13_; -#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 5618 "DirectoryMonitor.c" +#line 5650 "DirectoryMonitor.c" GeeIterator* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; DirectoryMonitorQueryInfoQueueElement* enqueued = NULL; @@ -5649,171 +5681,171 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc GFileInfo* _tmp45_ = NULL; GFileInfo* _tmp46_ = NULL; DirectoryMonitorQueryInfoQueueElement* _tmp47_ = NULL; -#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp14_ = _enqueued_it; -#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp15_ = gee_iterator_next (_tmp14_); -#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_tmp15_) { -#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5656 "DirectoryMonitor.c" +#line 5688 "DirectoryMonitor.c" } -#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp16_ = _enqueued_it; -#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp17_ = gee_iterator_get (_tmp16_); -#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" enqueued = (DirectoryMonitorQueryInfoQueueElement*) _tmp17_; -#line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp20_ = enqueued; -#line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp21_ = _tmp20_->event; -#line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp21_ != G_FILE_MONITOR_EVENT_DELETED) { -#line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = TRUE; -#line 5672 "DirectoryMonitor.c" +#line 5704 "DirectoryMonitor.c" } else { DirectoryMonitorQueryInfoQueueElement* _tmp22_ = NULL; gboolean _tmp23_ = FALSE; -#line 1125 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp22_ = enqueued; -#line 1125 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp23_ = _tmp22_->completed; -#line 1125 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = _tmp23_; -#line 5682 "DirectoryMonitor.c" +#line 5714 "DirectoryMonitor.c" } -#line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp19_) { -#line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp18_ = TRUE; -#line 5688 "DirectoryMonitor.c" +#line 5720 "DirectoryMonitor.c" } else { GFile* _tmp24_ = NULL; DirectoryMonitorQueryInfoQueueElement* _tmp25_ = NULL; GFile* _tmp26_ = NULL; gboolean _tmp27_ = FALSE; -#line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp24_ = match; -#line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp25_ = enqueued; -#line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp26_ = _tmp25_->file; -#line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp27_ = g_file_equal (_tmp24_, _tmp26_); -#line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp18_ = !_tmp27_; -#line 5704 "DirectoryMonitor.c" +#line 5736 "DirectoryMonitor.c" } -#line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp18_) { -#line 1127 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1133 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (enqueued); -#line 1127 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1133 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 5712 "DirectoryMonitor.c" +#line 5744 "DirectoryMonitor.c" } -#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp28_ = query_info; -#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp29_ = _tmp28_->file; -#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp30_ = g_file_get_path (_tmp29_); -#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp31_ = _tmp30_; -#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp32_ = enqueued; -#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp33_ = _tmp32_->file; -#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp34_ = g_file_get_path (_tmp33_); -#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp35_ = _tmp34_; -#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp36_ = g_strdup_printf ("Matching CREATED %s to DELETED %s for MOVED", _tmp31_, _tmp35_); -#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp37_ = _tmp36_; -#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp37_); -#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp37_); -#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp35_); -#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp31_); -#line 1133 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1139 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp38_ = enqueued; -#line 1133 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1139 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp38_->event = G_FILE_MONITOR_EVENT_MOVED; -#line 1134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp39_ = enqueued; -#line 1134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp40_ = query_info; -#line 1134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp41_ = _tmp40_->file; -#line 1134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp42_ = _g_object_ref0 (_tmp41_); -#line 1134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_tmp39_->other_file); -#line 1134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp39_->other_file = _tmp42_; -#line 1135 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp43_ = enqueued; -#line 1135 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp44_ = query_info; -#line 1135 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp45_ = _tmp44_->info; -#line 1135 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp46_ = _g_object_ref0 (_tmp45_); -#line 1135 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_tmp43_->info); -#line 1135 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp43_->info = _tmp46_; -#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1142 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp47_ = enqueued; -#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1142 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp47_->completed = TRUE; -#line 1138 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" matched = TRUE; -#line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (enqueued); -#line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5780 "DirectoryMonitor.c" +#line 5812 "DirectoryMonitor.c" } -#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_enqueued_it); -#line 5784 "DirectoryMonitor.c" +#line 5816 "DirectoryMonitor.c" } -#line 1143 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp48_ = matched; -#line 1143 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp48_) { -#line 5790 "DirectoryMonitor.c" +#line 5822 "DirectoryMonitor.c" GeeQueue* _tmp49_ = NULL; DirectoryMonitorQueryInfoQueueElement* _tmp50_ = NULL; -#line 1144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1150 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp49_ = self->priv->query_info_queue; -#line 1144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1150 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp50_ = query_info; -#line 1144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1150 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_COLLECTION, GeeCollection), _tmp50_); -#line 5799 "DirectoryMonitor.c" +#line 5831 "DirectoryMonitor.c" } } -#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (match); -#line 5804 "DirectoryMonitor.c" +#line 5836 "DirectoryMonitor.c" } { gboolean _tmp51_ = FALSE; -#line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp51_ = TRUE; -#line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 5812 "DirectoryMonitor.c" +#line 5844 "DirectoryMonitor.c" DirectoryMonitorQueryInfoQueueElement* next = NULL; GeeQueue* _tmp52_ = NULL; gpointer _tmp53_ = NULL; @@ -5851,91 +5883,91 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc GFileInfo* _tmp123_ = NULL; DirectoryMonitorQueryInfoQueueElement* _tmp124_ = NULL; GFileMonitorEvent _tmp125_ = 0; -#line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_tmp51_) { -#line 5852 "DirectoryMonitor.c" +#line 5884 "DirectoryMonitor.c" } -#line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp51_ = FALSE; -#line 1151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1157 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp52_ = self->priv->query_info_queue; -#line 1151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1157 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp53_ = gee_queue_peek (_tmp52_); -#line 1151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1157 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" next = (DirectoryMonitorQueryInfoQueueElement*) _tmp53_; -#line 1152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp55_ = next; -#line 1152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp55_ == NULL) { -#line 1152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp54_ = TRUE; -#line 5868 "DirectoryMonitor.c" +#line 5900 "DirectoryMonitor.c" } else { DirectoryMonitorQueryInfoQueueElement* _tmp56_ = NULL; gboolean _tmp57_ = FALSE; -#line 1152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp56_ = next; -#line 1152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp57_ = _tmp56_->completed; -#line 1152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp54_ = !_tmp57_; -#line 5878 "DirectoryMonitor.c" +#line 5910 "DirectoryMonitor.c" } -#line 1152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp54_) { -#line 1153 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (next); -#line 1153 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5886 "DirectoryMonitor.c" +#line 5918 "DirectoryMonitor.c" } -#line 1156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp58_ = self->priv->query_info_queue; -#line 1156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp59_ = gee_queue_poll (_tmp58_); -#line 1156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" n = (DirectoryMonitorQueryInfoQueueElement*) _tmp59_; -#line 1157 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp60_ = next; -#line 1157 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp61_ = n; -#line 1157 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp60_ == _tmp61_, "next == n"); -#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp62_ = next; -#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp63_ = _tmp62_->position; -#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp64_ = next; -#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp65_ = _tmp64_->event; -#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp66_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp65_); -#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp67_ = next; -#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp68_ = _tmp67_->file; -#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp69_ = g_file_get_path (_tmp68_); -#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp70_ = _tmp69_; -#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp71_ = g_strdup_printf ("Completed info query %u for %s on %s", _tmp63_, (_tmp66_ != NULL) ? _tmp66_->value_name : NULL, _tmp70_); -#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp72_ = _tmp71_; -#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp72_); -#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp72_); -#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp70_); -#line 1162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp73_ = next; -#line 1162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp74_ = _tmp73_->err; -#line 1162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp74_ != NULL) { -#line 5934 "DirectoryMonitor.c" +#line 5966 "DirectoryMonitor.c" DirectoryMonitorQueryInfoQueueElement* _tmp75_ = NULL; GFile* _tmp76_ = NULL; gchar* _tmp77_ = NULL; @@ -5948,76 +5980,76 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc const gchar* _tmp84_ = NULL; gchar* _tmp85_ = NULL; gchar* _tmp86_ = NULL; -#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp75_ = next; -#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp76_ = _tmp75_->file; -#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp77_ = g_file_get_path (_tmp76_); -#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp78_ = _tmp77_; -#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp79_ = next; -#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp80_ = _tmp79_->event; -#line 1164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp81_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp80_); -#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp82_ = next; -#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp83_ = _tmp82_->err; -#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp84_ = _tmp83_->message; -#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp85_ = g_strdup_printf ("Unable to retrieve file information for %s, dropping %s: %s", _tmp78_, (_tmp81_ != NULL) ? _tmp81_->value_name : NULL, _tmp84_); -#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp86_ = _tmp85_; -#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp86_); -#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp86_); -#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp78_); -#line 1166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1172 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (n); -#line 1166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1172 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (next); -#line 1166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1172 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 5983 "DirectoryMonitor.c" +#line 6015 "DirectoryMonitor.c" } -#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp88_ = next; -#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp89_ = _tmp88_->info; -#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp89_ != NULL) { -#line 5991 "DirectoryMonitor.c" +#line 6023 "DirectoryMonitor.c" DirectoryMonitorQueryInfoQueueElement* _tmp90_ = NULL; GFileInfo* _tmp91_ = NULL; gchar* _tmp92_ = NULL; gchar* _tmp93_ = NULL; -#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp90_ = next; -#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp91_ = _tmp90_->info; -#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp92_ = get_file_info_id (_tmp91_); -#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp93_ = _tmp92_; -#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp87_ = _tmp93_ == NULL; -#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp93_); -#line 6008 "DirectoryMonitor.c" +#line 6040 "DirectoryMonitor.c" } else { -#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp87_ = FALSE; -#line 6012 "DirectoryMonitor.c" +#line 6044 "DirectoryMonitor.c" } -#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp87_) { -#line 6016 "DirectoryMonitor.c" +#line 6048 "DirectoryMonitor.c" DirectoryMonitorQueryInfoQueueElement* _tmp94_ = NULL; GFile* _tmp95_ = NULL; gchar* _tmp96_ = NULL; @@ -6027,65 +6059,65 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc GEnumValue* _tmp100_; gchar* _tmp101_ = NULL; gchar* _tmp102_ = NULL; -#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp94_ = next; -#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp95_ = _tmp94_->file; -#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp96_ = g_file_get_path (_tmp95_); -#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp97_ = _tmp96_; -#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp98_ = next; -#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp99_ = _tmp98_->event; -#line 1172 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp100_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp99_); -#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp101_ = g_strdup_printf ("Unable to retrieve file ID for %s, dropping %s", _tmp97_, (_tmp100_ != NULL) ? _tmp100_->value_name : NULL); -#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp102_ = _tmp101_; -#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp102_); -#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp102_); -#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp97_); -#line 1174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (n); -#line 1174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (next); -#line 1174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 6056 "DirectoryMonitor.c" +#line 6088 "DirectoryMonitor.c" } -#line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp104_ = next; -#line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp105_ = _tmp104_->info; -#line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp105_ != NULL) { -#line 6064 "DirectoryMonitor.c" +#line 6096 "DirectoryMonitor.c" DirectoryMonitorQueryInfoQueueElement* _tmp106_ = NULL; GFileInfo* _tmp107_ = NULL; gboolean _tmp108_ = FALSE; -#line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp106_ = next; -#line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp107_ = _tmp106_->info; -#line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp108_ = directory_monitor_is_file_symlink_supported (_tmp107_); -#line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp103_ = !_tmp108_; -#line 6076 "DirectoryMonitor.c" +#line 6108 "DirectoryMonitor.c" } else { -#line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp103_ = FALSE; -#line 6080 "DirectoryMonitor.c" +#line 6112 "DirectoryMonitor.c" } -#line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp103_) { -#line 6084 "DirectoryMonitor.c" +#line 6116 "DirectoryMonitor.c" DirectoryMonitorQueryInfoQueueElement* _tmp109_ = NULL; GFile* _tmp110_ = NULL; gchar* _tmp111_ = NULL; @@ -6095,61 +6127,61 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc GEnumValue* _tmp115_; gchar* _tmp116_ = NULL; gchar* _tmp117_ = NULL; -#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp109_ = next; -#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp110_ = _tmp109_->file; -#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp111_ = g_file_get_path (_tmp110_); -#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp112_ = _tmp111_; -#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp113_ = next; -#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp114_ = _tmp113_->event; -#line 1180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1186 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp115_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp114_); -#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp116_ = g_strdup_printf ("No symlink support for %s, dropping %s", _tmp112_, (_tmp115_ != NULL) ? _tmp115_->value_name : NULL); -#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp117_ = _tmp116_; -#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp117_); -#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp117_); -#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp112_); -#line 1182 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (n); -#line 1182 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (next); -#line 1182 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 6124 "DirectoryMonitor.c" +#line 6156 "DirectoryMonitor.c" } -#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp118_ = next; -#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp119_ = _tmp118_->file; -#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp120_ = next; -#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp121_ = _tmp120_->other_file; -#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp122_ = next; -#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp123_ = _tmp122_->info; -#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp124_ = next; -#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp125_ = _tmp124_->event; -#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_on_monitor_notification_ready (self, _tmp119_, _tmp121_, _tmp123_, _tmp125_); -#line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (n); -#line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (next); -#line 6148 "DirectoryMonitor.c" +#line 6180 "DirectoryMonitor.c" } } } @@ -6166,143 +6198,143 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s gchar* _tmp10_ = NULL; gchar* _tmp11_ = NULL; GFileMonitorEvent _tmp12_ = 0; -#line 1189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); -#line 1189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 1189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail ((other_file == NULL) || G_IS_FILE (other_file)); -#line 1189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail ((info == NULL) || G_IS_FILE_INFO (info)); -#line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = other_file; -#line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp1_ != NULL) { -#line 6177 "DirectoryMonitor.c" +#line 6209 "DirectoryMonitor.c" GFile* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = other_file; -#line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = g_file_get_path (_tmp2_); -#line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp0_); -#line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = _tmp3_; -#line 6188 "DirectoryMonitor.c" +#line 6220 "DirectoryMonitor.c" } else { gchar* _tmp4_ = NULL; -#line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = g_strdup ("(null)"); -#line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp0_); -#line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = _tmp4_; -#line 6197 "DirectoryMonitor.c" +#line 6229 "DirectoryMonitor.c" } -#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = event; -#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp5_); -#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = file; -#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = g_file_get_path (_tmp7_); -#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = _tmp8_; -#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = g_strdup_printf ("READY %s: file=%s other_file=%s", (_tmp6_ != NULL) ? _tmp6_->value_name : NULL, _tmp9_, _tmp0_); -#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp11_ = _tmp10_; -#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp11_); -#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp11_); -#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp9_); -#line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = event; -#line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" switch (_tmp12_) { -#line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_CREATED: -#line 6225 "DirectoryMonitor.c" +#line 6257 "DirectoryMonitor.c" { GFileInfo* _tmp13_ = NULL; DirectoryMonitorFType ftype = 0; GFileInfo* _tmp14_ = NULL; DirectoryMonitorFType _tmp15_ = 0; DirectoryMonitorFType _tmp16_ = 0; -#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1204 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = info; -#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1204 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp13_ != NULL, "info != null"); -#line 1200 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1206 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp14_ = info; -#line 1200 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1206 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp15_ = directory_monitor_get_ftype (_tmp14_); -#line 1200 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1206 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" ftype = _tmp15_; -#line 1201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp16_ = ftype; -#line 1201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" switch (_tmp16_) { -#line 1201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6248 "DirectoryMonitor.c" +#line 6280 "DirectoryMonitor.c" { GFile* _tmp17_ = NULL; GFileInfo* _tmp18_ = NULL; -#line 1203 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1209 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp17_ = file; -#line 1203 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1209 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp18_ = info; -#line 1203 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1209 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_internal_notify_file_created (self, _tmp17_, _tmp18_); -#line 1204 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1210 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6260 "DirectoryMonitor.c" +#line 6292 "DirectoryMonitor.c" } -#line 1201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6264 "DirectoryMonitor.c" +#line 6296 "DirectoryMonitor.c" { gint _tmp19_ = 0; GFile* _tmp20_ = NULL; GFileInfo* _tmp21_ = NULL; -#line 1211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = self->priv->outstanding_exploration_dirs; -#line 1211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->outstanding_exploration_dirs = _tmp19_ + 1; -#line 1212 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp20_ = file; -#line 1212 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp21_ = info; -#line 1212 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_explore_async (self, _tmp20_, _tmp21_, FALSE, NULL, NULL); -#line 1213 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6281 "DirectoryMonitor.c" +#line 6313 "DirectoryMonitor.c" } default: { DirectoryMonitorFType _tmp22_ = 0; -#line 1216 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1222 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp22_ = ftype; -#line 1216 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1222 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp22_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); -#line 1217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1223 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6292 "DirectoryMonitor.c" +#line 6324 "DirectoryMonitor.c" } } -#line 1219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1225 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6297 "DirectoryMonitor.c" +#line 6329 "DirectoryMonitor.c" } -#line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_CHANGED: -#line 6301 "DirectoryMonitor.c" +#line 6333 "DirectoryMonitor.c" { GFileInfo* _tmp23_ = NULL; GFileInfo* local_info = NULL; @@ -6313,176 +6345,176 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s GFileInfo* _tmp32_ = NULL; DirectoryMonitorFType _tmp33_ = 0; DirectoryMonitorFType _tmp34_ = 0; -#line 1223 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1229 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp23_ = info; -#line 1223 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1229 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp23_ == NULL, "info == null"); -#line 1225 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp24_ = file; -#line 1225 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp25_ = directory_monitor_get_file_info (self, _tmp24_); -#line 1225 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" local_info = _tmp25_; -#line 1226 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp26_ = local_info; -#line 1226 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp26_ == NULL) { -#line 6326 "DirectoryMonitor.c" +#line 6358 "DirectoryMonitor.c" GFile* _tmp27_ = NULL; gchar* _tmp28_ = NULL; gchar* _tmp29_ = NULL; gchar* _tmp30_ = NULL; gchar* _tmp31_ = NULL; -#line 1227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp27_ = file; -#line 1227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp28_ = g_file_get_path (_tmp27_); -#line 1227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp29_ = _tmp28_; -#line 1227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp30_ = g_strdup_printf ("Changed event for unknown file %s", _tmp29_); -#line 1227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp31_ = _tmp30_; -#line 1227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg (_tmp31_); -#line 1227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp31_); -#line 1227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp29_); -#line 1229 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1235 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); -#line 1229 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1235 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6352 "DirectoryMonitor.c" +#line 6384 "DirectoryMonitor.c" } -#line 1232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp32_ = local_info; -#line 1232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp33_ = directory_monitor_get_ftype (_tmp32_); -#line 1232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" ftype = _tmp33_; -#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp34_ = ftype; -#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" switch (_tmp34_) { -#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6366 "DirectoryMonitor.c" +#line 6398 "DirectoryMonitor.c" { GFile* _tmp35_ = NULL; -#line 1235 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp35_ = file; -#line 1235 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_file_altered (self, _tmp35_); -#line 1236 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1242 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6375 "DirectoryMonitor.c" +#line 6407 "DirectoryMonitor.c" } -#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6379 "DirectoryMonitor.c" +#line 6411 "DirectoryMonitor.c" { GFile* _tmp36_ = NULL; -#line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp36_ = file; -#line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_directory_altered (self, _tmp36_); -#line 1240 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6388 "DirectoryMonitor.c" +#line 6420 "DirectoryMonitor.c" } default: { DirectoryMonitorFType _tmp37_ = 0; -#line 1243 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp37_ = ftype; -#line 1243 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp37_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); -#line 1244 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1250 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6399 "DirectoryMonitor.c" +#line 6431 "DirectoryMonitor.c" } } -#line 1246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); -#line 1246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6406 "DirectoryMonitor.c" +#line 6438 "DirectoryMonitor.c" } -#line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: -#line 6410 "DirectoryMonitor.c" +#line 6442 "DirectoryMonitor.c" { GFileInfo* _tmp38_ = NULL; DirectoryMonitorFType ftype = 0; GFileInfo* _tmp39_ = NULL; DirectoryMonitorFType _tmp40_ = 0; DirectoryMonitorFType _tmp41_ = 0; -#line 1249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp38_ = info; -#line 1249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp38_ != NULL, "info != null"); -#line 1251 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1257 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp39_ = info; -#line 1251 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1257 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp40_ = directory_monitor_get_ftype (_tmp39_); -#line 1251 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1257 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" ftype = _tmp40_; -#line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp41_ = ftype; -#line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" switch (_tmp41_) { -#line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6433 "DirectoryMonitor.c" +#line 6465 "DirectoryMonitor.c" { GFile* _tmp42_ = NULL; GFileInfo* _tmp43_ = NULL; -#line 1254 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1260 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp42_ = file; -#line 1254 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1260 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp43_ = info; -#line 1254 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1260 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_internal_notify_file_alteration_completed (self, _tmp42_, _tmp43_); -#line 1255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1261 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6445 "DirectoryMonitor.c" +#line 6477 "DirectoryMonitor.c" } -#line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6449 "DirectoryMonitor.c" +#line 6481 "DirectoryMonitor.c" { GFile* _tmp44_ = NULL; GFileInfo* _tmp45_ = NULL; -#line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1264 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp44_ = file; -#line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1264 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp45_ = info; -#line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1264 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_internal_notify_directory_alteration_completed (self, _tmp44_, _tmp45_); -#line 1259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6461 "DirectoryMonitor.c" +#line 6493 "DirectoryMonitor.c" } default: { DirectoryMonitorFType _tmp46_ = 0; -#line 1262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1268 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp46_ = ftype; -#line 1262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1268 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp46_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); -#line 1263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1269 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6472 "DirectoryMonitor.c" +#line 6504 "DirectoryMonitor.c" } } -#line 1265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1271 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6477 "DirectoryMonitor.c" +#line 6509 "DirectoryMonitor.c" } -#line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_MOVED: -#line 6481 "DirectoryMonitor.c" +#line 6513 "DirectoryMonitor.c" { GFileInfo* _tmp47_ = NULL; GFile* _tmp48_ = NULL; @@ -6490,46 +6522,46 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s GFileInfo* _tmp49_ = NULL; DirectoryMonitorFType _tmp50_ = 0; DirectoryMonitorFType _tmp51_ = 0; -#line 1268 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp47_ = info; -#line 1268 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp47_ != NULL, "info != null"); -#line 1269 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp48_ = other_file; -#line 1269 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp48_ != NULL, "other_file != null"); -#line 1273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp49_ = info; -#line 1273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp50_ = directory_monitor_get_ftype (_tmp49_); -#line 1273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" ftype = _tmp50_; -#line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp51_ = ftype; -#line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" switch (_tmp51_) { -#line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6509 "DirectoryMonitor.c" +#line 6541 "DirectoryMonitor.c" { GFile* _tmp52_ = NULL; GFile* _tmp53_ = NULL; GFileInfo* _tmp54_ = NULL; -#line 1276 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp52_ = file; -#line 1276 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp53_ = other_file; -#line 1276 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp54_ = info; -#line 1276 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_internal_notify_file_moved (self, _tmp52_, _tmp53_, _tmp54_); -#line 1277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6524 "DirectoryMonitor.c" +#line 6556 "DirectoryMonitor.c" } -#line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6528 "DirectoryMonitor.c" +#line 6560 "DirectoryMonitor.c" { GFileInfo* old_dir_info = NULL; DirectoryMonitorFileInfoMap* _tmp55_ = NULL; @@ -6540,73 +6572,73 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s GFileInfo* _tmp63_ = NULL; GFile* _tmp64_ = NULL; GFileInfo* _tmp65_ = NULL; -#line 1281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp55_ = self->priv->files; -#line 1281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp56_ = file; -#line 1281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp57_ = directory_monitor_file_info_map_get_info (_tmp55_, _tmp56_); -#line 1281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" old_dir_info = _tmp57_; -#line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp58_ = old_dir_info; -#line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp58_ == NULL) { -#line 6551 "DirectoryMonitor.c" +#line 6583 "DirectoryMonitor.c" GFile* _tmp59_ = NULL; gchar* _tmp60_ = NULL; gchar* _tmp61_ = NULL; -#line 1283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp59_ = file; -#line 1283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp60_ = g_file_get_path (_tmp59_); -#line 1283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp61_ = _tmp60_; -#line 1283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:1283: Directory moved event for unknown file %s", _tmp61_); -#line 1283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_warning ("DirectoryMonitor.vala:1289: Directory moved event for unknown file %s", _tmp61_); +#line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp61_); -#line 1285 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1291 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_dir_info); -#line 1285 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1291 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6569 "DirectoryMonitor.c" +#line 6601 "DirectoryMonitor.c" } -#line 1288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp62_ = file; -#line 1288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp63_ = old_dir_info; -#line 1288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp64_ = other_file; -#line 1288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp65_ = info; -#line 1288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_internal_notify_directory_moved (self, _tmp62_, _tmp63_, _tmp64_, _tmp65_); -#line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_dir_info); -#line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6585 "DirectoryMonitor.c" +#line 6617 "DirectoryMonitor.c" } default: { DirectoryMonitorFType _tmp66_ = 0; -#line 1292 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp66_ = ftype; -#line 1292 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp66_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); -#line 1293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6596 "DirectoryMonitor.c" +#line 6628 "DirectoryMonitor.c" } } -#line 1295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1301 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6601 "DirectoryMonitor.c" +#line 6633 "DirectoryMonitor.c" } -#line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_DELETED: -#line 6605 "DirectoryMonitor.c" +#line 6637 "DirectoryMonitor.c" { GFileInfo* _tmp67_ = NULL; GFileInfo* local_info = NULL; @@ -6617,97 +6649,97 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s GFileInfo* _tmp74_ = NULL; DirectoryMonitorFType _tmp75_ = 0; DirectoryMonitorFType _tmp76_ = 0; -#line 1298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp67_ = info; -#line 1298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp67_ == NULL, "info == null"); -#line 1300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1306 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp68_ = file; -#line 1300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1306 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp69_ = directory_monitor_get_file_info (self, _tmp68_); -#line 1300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1306 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" local_info = _tmp69_; -#line 1301 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1307 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp70_ = local_info; -#line 1301 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1307 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp70_ == NULL) { -#line 6630 "DirectoryMonitor.c" +#line 6662 "DirectoryMonitor.c" GFile* _tmp71_ = NULL; gchar* _tmp72_ = NULL; gchar* _tmp73_ = NULL; -#line 1302 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp71_ = file; -#line 1302 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp72_ = g_file_get_path (_tmp71_); -#line 1302 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp73_ = _tmp72_; -#line 1302 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:1302: Deleted event for unknown file %s", _tmp73_); -#line 1302 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_warning ("DirectoryMonitor.vala:1308: Deleted event for unknown file %s", _tmp73_); +#line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp73_); -#line 1304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1310 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); -#line 1304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1310 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6648 "DirectoryMonitor.c" +#line 6680 "DirectoryMonitor.c" } -#line 1307 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp74_ = local_info; -#line 1307 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp75_ = directory_monitor_get_ftype (_tmp74_); -#line 1307 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" ftype = _tmp75_; -#line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp76_ = ftype; -#line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" switch (_tmp76_) { -#line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6662 "DirectoryMonitor.c" +#line 6694 "DirectoryMonitor.c" { GFile* _tmp77_ = NULL; -#line 1310 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp77_ = file; -#line 1310 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_internal_notify_file_deleted (self, _tmp77_); -#line 1311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6671 "DirectoryMonitor.c" +#line 6703 "DirectoryMonitor.c" } -#line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6675 "DirectoryMonitor.c" +#line 6707 "DirectoryMonitor.c" { GFile* _tmp78_ = NULL; -#line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp78_ = file; -#line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_internal_notify_directory_deleted (self, _tmp78_); -#line 1315 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6684 "DirectoryMonitor.c" +#line 6716 "DirectoryMonitor.c" } default: { DirectoryMonitorFType _tmp79_ = 0; -#line 1318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp79_ = ftype; -#line 1318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp79_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); -#line 1319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1325 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6695 "DirectoryMonitor.c" +#line 6727 "DirectoryMonitor.c" } } -#line 1321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); -#line 1321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6702 "DirectoryMonitor.c" +#line 6734 "DirectoryMonitor.c" } -#line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED: -#line 6706 "DirectoryMonitor.c" +#line 6738 "DirectoryMonitor.c" { GFileInfo* _tmp80_ = NULL; GFileInfo* local_info = NULL; @@ -6718,123 +6750,123 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s GFileInfo* _tmp87_ = NULL; DirectoryMonitorFType _tmp88_ = 0; DirectoryMonitorFType _tmp89_ = 0; -#line 1325 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp80_ = info; -#line 1325 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp80_ == NULL, "info == null"); -#line 1327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1333 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp81_ = file; -#line 1327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1333 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp82_ = directory_monitor_get_file_info (self, _tmp81_); -#line 1327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1333 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" local_info = _tmp82_; -#line 1328 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1334 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp83_ = local_info; -#line 1328 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1334 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp83_ == NULL) { -#line 6731 "DirectoryMonitor.c" +#line 6763 "DirectoryMonitor.c" GFile* _tmp84_ = NULL; gchar* _tmp85_ = NULL; gchar* _tmp86_ = NULL; -#line 1329 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp84_ = file; -#line 1329 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp85_ = g_file_get_path (_tmp84_); -#line 1329 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp86_ = _tmp85_; -#line 1329 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:1329: Attribute changed event for unknown file %" \ +#line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_warning ("DirectoryMonitor.vala:1335: Attribute changed event for unknown file %" \ "s", _tmp86_); -#line 1329 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp86_); -#line 1331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); -#line 1331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6749 "DirectoryMonitor.c" +#line 6781 "DirectoryMonitor.c" } -#line 1334 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp87_ = local_info; -#line 1334 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp88_ = directory_monitor_get_ftype (_tmp87_); -#line 1334 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" ftype = _tmp88_; -#line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp89_ = ftype; -#line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" switch (_tmp89_) { -#line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6763 "DirectoryMonitor.c" +#line 6795 "DirectoryMonitor.c" { GFile* _tmp90_ = NULL; -#line 1337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp90_ = file; -#line 1337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_file_attributes_altered (self, _tmp90_); -#line 1338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6772 "DirectoryMonitor.c" +#line 6804 "DirectoryMonitor.c" } -#line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6776 "DirectoryMonitor.c" +#line 6808 "DirectoryMonitor.c" { GFile* _tmp91_ = NULL; -#line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp91_ = file; -#line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_directory_attributes_altered (self, _tmp91_); -#line 1342 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1348 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6785 "DirectoryMonitor.c" +#line 6817 "DirectoryMonitor.c" } default: { DirectoryMonitorFType _tmp92_ = 0; -#line 1345 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1351 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp92_ = ftype; -#line 1345 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1351 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp92_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); -#line 1346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6796 "DirectoryMonitor.c" +#line 6828 "DirectoryMonitor.c" } } -#line 1348 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1354 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); -#line 1348 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1354 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6803 "DirectoryMonitor.c" +#line 6835 "DirectoryMonitor.c" } -#line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_PRE_UNMOUNT: -#line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_UNMOUNTED: -#line 6809 "DirectoryMonitor.c" +#line 6841 "DirectoryMonitor.c" { -#line 1353 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1359 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6813 "DirectoryMonitor.c" +#line 6845 "DirectoryMonitor.c" } default: { GFileMonitorEvent _tmp93_ = 0; GEnumValue* _tmp94_; -#line 1356 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1362 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp93_ = event; -#line 1356 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1362 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp94_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp93_); -#line 1356 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:1356: Unknown directory monitor event %s", (_tmp94_ != NULL) ? _tmp94_->value_name : NULL); -#line 1357 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1362 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_warning ("DirectoryMonitor.vala:1362: Unknown directory monitor event %s", (_tmp94_ != NULL) ? _tmp94_->value_name : NULL); +#line 1363 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6827 "DirectoryMonitor.c" +#line 6859 "DirectoryMonitor.c" } } -#line 1189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp0_); -#line 6832 "DirectoryMonitor.c" +#line 6864 "DirectoryMonitor.c" } @@ -6847,25 +6879,25 @@ static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, G GFileInfo* _tmp1_ = NULL; GFile* _tmp2_ = NULL; GFile* _tmp3_ = NULL; -#line 1363 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); -#line 1363 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); -#line 1363 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); -#line 1366 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1372 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->parent_moved; -#line 1366 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1372 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = info; -#line 1366 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1372 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = directory_monitor_file_info_map_find_match (_tmp0_, _tmp1_); -#line 1366 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1372 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" match = _tmp2_; -#line 1367 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = match; -#line 1367 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp3_ != NULL) { -#line 6863 "DirectoryMonitor.c" +#line 6895 "DirectoryMonitor.c" GFile* _tmp4_ = NULL; GFile* _tmp5_ = NULL; DirectoryMonitorFileInfoMap* _tmp6_ = NULL; @@ -6874,95 +6906,95 @@ static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, G DirectoryMonitorFileInfoMap* _tmp9_ = NULL; GFile* _tmp10_ = NULL; GFileInfo* _tmp11_ = NULL; -#line 1368 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = match; -#line 1368 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = _g_object_ref0 (_tmp4_); -#line 1368 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file); -#line 1368 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_old_file = _tmp5_; -#line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = self->priv->parent_moved; -#line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = match; -#line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = directory_monitor_file_info_map_get_info (_tmp6_, _tmp7_); -#line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file_info); -#line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_old_file_info = _tmp8_; -#line 1371 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = self->priv->parent_moved; -#line 1371 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = match; -#line 1371 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp11_ = info; -#line 1371 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_remove (_tmp9_, _tmp10_, _tmp11_); -#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = TRUE; -#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (match); -#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old_file) { -#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *old_file = _vala_old_file; -#line 6906 "DirectoryMonitor.c" +#line 6938 "DirectoryMonitor.c" } else { -#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file); -#line 6910 "DirectoryMonitor.c" +#line 6942 "DirectoryMonitor.c" } -#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old_file_info) { -#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *old_file_info = _vala_old_file_info; -#line 6916 "DirectoryMonitor.c" +#line 6948 "DirectoryMonitor.c" } else { -#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file_info); -#line 6920 "DirectoryMonitor.c" +#line 6952 "DirectoryMonitor.c" } -#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 6924 "DirectoryMonitor.c" +#line 6956 "DirectoryMonitor.c" } -#line 1376 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1382 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file); -#line 1376 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1382 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_old_file = NULL; -#line 1377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1383 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file_info); -#line 1377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1383 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_old_file_info = NULL; -#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; -#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (match); -#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old_file) { -#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *old_file = _vala_old_file; -#line 6942 "DirectoryMonitor.c" +#line 6974 "DirectoryMonitor.c" } else { -#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file); -#line 6946 "DirectoryMonitor.c" +#line 6978 "DirectoryMonitor.c" } -#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old_file_info) { -#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *old_file_info = _vala_old_file_info; -#line 6952 "DirectoryMonitor.c" +#line 6984 "DirectoryMonitor.c" } else { -#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file_info); -#line 6956 "DirectoryMonitor.c" +#line 6988 "DirectoryMonitor.c" } -#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 6960 "DirectoryMonitor.c" +#line 6992 "DirectoryMonitor.c" } @@ -6974,30 +7006,30 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni gboolean any_expired = FALSE; gboolean _tmp13_ = FALSE; gboolean _tmp14_ = FALSE; -#line 1382 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1388 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); -#line 1383 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1389 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = now_ms (); -#line 1383 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1389 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" expiration = _tmp0_ - DIRECTORY_MONITOR_DELETED_EXPIRATION_MSEC; -#line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1391 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" any_deleted = FALSE; -#line 1386 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1392 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" any_expired = FALSE; -#line 6982 "DirectoryMonitor.c" +#line 7014 "DirectoryMonitor.c" { GeeIterator* _element_it = NULL; GeeQueue* _tmp1_ = NULL; GeeIterator* _tmp2_ = NULL; -#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = self->priv->query_info_queue; -#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _element_it = _tmp2_; -#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 6995 "DirectoryMonitor.c" +#line 7027 "DirectoryMonitor.c" GeeIterator* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; DirectoryMonitorQueryInfoQueueElement* element = NULL; @@ -7009,85 +7041,85 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni gulong _tmp10_ = 0UL; gulong _tmp11_ = 0UL; DirectoryMonitorQueryInfoQueueElement* _tmp12_ = NULL; -#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = _element_it; -#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = gee_iterator_next (_tmp3_); -#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_tmp4_) { -#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 7015 "DirectoryMonitor.c" +#line 7047 "DirectoryMonitor.c" } -#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = _element_it; -#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = gee_iterator_get (_tmp5_); -#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" element = (DirectoryMonitorQueryInfoQueueElement*) _tmp6_; -#line 1388 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = element; -#line 1388 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = _tmp7_->event; -#line 1388 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp8_ != G_FILE_MONITOR_EVENT_DELETED) { -#line 1389 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1395 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (element); -#line 1389 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1395 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 7033 "DirectoryMonitor.c" +#line 7065 "DirectoryMonitor.c" } -#line 1391 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1397 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" any_deleted = TRUE; -#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1399 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = element; -#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1399 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = _tmp9_->time_created_msec; -#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1399 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp11_ = expiration; -#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1399 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp10_ > _tmp11_) { -#line 1394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1400 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (element); -#line 1394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1400 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 7049 "DirectoryMonitor.c" +#line 7081 "DirectoryMonitor.c" } -#line 1397 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1403 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = element; -#line 1397 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1403 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_->completed = TRUE; -#line 1398 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1404 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" any_expired = TRUE; -#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (element); -#line 7059 "DirectoryMonitor.c" +#line 7091 "DirectoryMonitor.c" } -#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_element_it); -#line 7063 "DirectoryMonitor.c" +#line 7095 "DirectoryMonitor.c" } -#line 1401 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1407 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = any_expired; -#line 1401 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1407 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp13_) { -#line 1402 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1408 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_process_query_queue (self, NULL); -#line 7071 "DirectoryMonitor.c" +#line 7103 "DirectoryMonitor.c" } -#line 1404 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1410 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp14_ = any_deleted; -#line 1404 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1410 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_tmp14_) { -#line 1405 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1411 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->delete_timer_id = (guint) 0; -#line 7079 "DirectoryMonitor.c" +#line 7111 "DirectoryMonitor.c" } -#line 1407 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = any_deleted; -#line 1407 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7085 "DirectoryMonitor.c" +#line 7117 "DirectoryMonitor.c" } @@ -7096,21 +7128,21 @@ GFileInfo* directory_monitor_get_file_info (DirectoryMonitor* self, GFile* file) DirectoryMonitorFileInfoMap* _tmp0_ = NULL; GFile* _tmp1_ = NULL; GFileInfo* _tmp2_ = NULL; -#line 1411 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1417 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), NULL); -#line 1411 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1417 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 1412 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->files; -#line 1412 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = file; -#line 1412 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = directory_monitor_file_info_map_get_info (_tmp0_, _tmp1_); -#line 1412 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = _tmp2_; -#line 1412 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7108 "DirectoryMonitor.c" +#line 7140 "DirectoryMonitor.c" } @@ -7118,17 +7150,17 @@ GeeCollection* directory_monitor_get_files (DirectoryMonitor* self) { GeeCollection* result = NULL; DirectoryMonitorFileInfoMap* _tmp0_ = NULL; GeeCollection* _tmp1_ = NULL; -#line 1417 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1423 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), NULL); -#line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1424 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->files; -#line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1424 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = directory_monitor_file_info_map_get_all (_tmp0_); -#line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1424 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = _tmp1_; -#line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1424 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7126 "DirectoryMonitor.c" +#line 7158 "DirectoryMonitor.c" } @@ -7138,23 +7170,23 @@ GFileInfo* directory_monitor_query_file_info (DirectoryMonitor* self, GFile* fil GFile* _tmp1_ = NULL; GCancellable* _tmp2_ = NULL; GFileInfo* _tmp3_ = NULL; -#line 1424 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1430 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), NULL); -#line 1424 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1430 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 1425 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->files; -#line 1425 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = file; -#line 1425 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = self->priv->cancellable; -#line 1425 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = directory_monitor_file_info_map_query_info (_tmp0_, _tmp1_, _tmp2_); -#line 1425 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = _tmp3_; -#line 1425 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7152 "DirectoryMonitor.c" +#line 7184 "DirectoryMonitor.c" } @@ -7166,75 +7198,75 @@ gboolean directory_monitor_is_file_symlink_supported (GFileInfo* info) { GFileInfo* _tmp2_ = NULL; DirectoryMonitorFType _tmp3_ = 0; DirectoryMonitorFType _tmp4_ = 0; -#line 1435 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1441 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); -#line 1436 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = info; -#line 1436 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = g_file_info_get_is_symlink (_tmp0_); -#line 1436 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_tmp1_) { -#line 1437 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1443 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = TRUE; -#line 1437 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1443 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7176 "DirectoryMonitor.c" +#line 7208 "DirectoryMonitor.c" } -#line 1439 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = info; -#line 1439 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = directory_monitor_get_ftype (_tmp2_); -#line 1439 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" ftype = _tmp3_; -#line 1440 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1446 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = ftype; -#line 1440 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1446 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" switch (_tmp4_) { -#line 1440 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1446 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 7190 "DirectoryMonitor.c" +#line 7222 "DirectoryMonitor.c" { -#line 1442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1448 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = DIRECTORY_MONITOR_SUPPORT_DIR_SYMLINKS; -#line 1442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1448 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7196 "DirectoryMonitor.c" +#line 7228 "DirectoryMonitor.c" } -#line 1440 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1446 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 7200 "DirectoryMonitor.c" +#line 7232 "DirectoryMonitor.c" { -#line 1445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1451 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = DIRECTORY_MONITOR_SUPPORT_FILE_SYMLINKS; -#line 1445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1451 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7206 "DirectoryMonitor.c" +#line 7238 "DirectoryMonitor.c" } default: { DirectoryMonitorFType _tmp5_ = 0; -#line 1448 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1454 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = ftype; -#line 1448 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1454 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp5_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); -#line 1450 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1456 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; -#line 1450 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 1456 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7219 "DirectoryMonitor.c" +#line 7251 "DirectoryMonitor.c" } } } static void directory_monitor_real_root_moved (DirectoryMonitor* self, GFile* old_root, GFile* new_root, GFileInfo* new_root_info) { -#line 380 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 386 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (old_root)); -#line 380 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 386 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (new_root)); -#line 380 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 386 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_root_info)); -#line 7232 "DirectoryMonitor.c" +#line 7264 "DirectoryMonitor.c" } @@ -7253,26 +7285,26 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT (GClosure * closu data1 = closure->data; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data2 = param_values->data[0].v_pointer; -#line 7251 "DirectoryMonitor.c" +#line 7283 "DirectoryMonitor.c" } else { #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data1 = param_values->data[0].v_pointer; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data2 = closure->data; -#line 7257 "DirectoryMonitor.c" +#line 7289 "DirectoryMonitor.c" } #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_object (param_values + 3), data2); -#line 7263 "DirectoryMonitor.c" +#line 7295 "DirectoryMonitor.c" } static void directory_monitor_real_root_deleted (DirectoryMonitor* self, GFile* root) { -#line 388 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (root)); -#line 7270 "DirectoryMonitor.c" +#line 7302 "DirectoryMonitor.c" } @@ -7281,11 +7313,11 @@ static void directory_monitor_real_discovery_started (DirectoryMonitor* self) { static void directory_monitor_real_file_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info) { -#line 394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 400 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 400 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 7283 "DirectoryMonitor.c" +#line 7315 "DirectoryMonitor.c" } @@ -7304,144 +7336,144 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa data1 = closure->data; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data2 = param_values->data[0].v_pointer; -#line 7302 "DirectoryMonitor.c" +#line 7334 "DirectoryMonitor.c" } else { #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data1 = param_values->data[0].v_pointer; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data2 = closure->data; -#line 7308 "DirectoryMonitor.c" +#line 7340 "DirectoryMonitor.c" } #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 7314 "DirectoryMonitor.c" +#line 7346 "DirectoryMonitor.c" } static void directory_monitor_real_directory_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info) { -#line 397 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 403 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 397 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 403 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 7323 "DirectoryMonitor.c" +#line 7355 "DirectoryMonitor.c" } static void directory_monitor_real_discovery_failed (DirectoryMonitor* self, const gchar* reason) { -#line 402 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 408 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (reason != NULL); -#line 7330 "DirectoryMonitor.c" +#line 7362 "DirectoryMonitor.c" } static void directory_monitor_real_discovery_completed (DirectoryMonitor* self) { -#line 406 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 412 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->has_discovery_started = FALSE; -#line 407 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg ("discovery completed"); -#line 7339 "DirectoryMonitor.c" +#line 7371 "DirectoryMonitor.c" } static void directory_monitor_real_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info) { -#line 410 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 416 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 410 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 416 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 7348 "DirectoryMonitor.c" +#line 7380 "DirectoryMonitor.c" } static void directory_monitor_real_file_moved (DirectoryMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info) { -#line 413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 419 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (old_file)); -#line 413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 419 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (new_file)); -#line 413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 419 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_file_info)); -#line 7359 "DirectoryMonitor.c" +#line 7391 "DirectoryMonitor.c" } static void directory_monitor_real_file_altered (DirectoryMonitor* self, GFile* file) { -#line 417 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 423 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 7366 "DirectoryMonitor.c" +#line 7398 "DirectoryMonitor.c" } static void directory_monitor_real_file_alteration_completed (DirectoryMonitor* self, GFile* file, GFileInfo* info) { -#line 422 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 428 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 422 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 428 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 7375 "DirectoryMonitor.c" +#line 7407 "DirectoryMonitor.c" } static void directory_monitor_real_file_attributes_altered (DirectoryMonitor* self, GFile* file) { -#line 425 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 7382 "DirectoryMonitor.c" +#line 7414 "DirectoryMonitor.c" } static void directory_monitor_real_file_deleted (DirectoryMonitor* self, GFile* file) { -#line 428 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 434 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 7389 "DirectoryMonitor.c" +#line 7421 "DirectoryMonitor.c" } static void directory_monitor_real_directory_created (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { -#line 432 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 438 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 432 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 438 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 7398 "DirectoryMonitor.c" +#line 7430 "DirectoryMonitor.c" } static void directory_monitor_real_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFile* new_dir, GFileInfo* new_dir_info) { -#line 436 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (old_dir)); -#line 436 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (new_dir)); -#line 436 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_dir_info)); -#line 7409 "DirectoryMonitor.c" +#line 7441 "DirectoryMonitor.c" } static void directory_monitor_real_directory_altered (DirectoryMonitor* self, GFile* dir) { -#line 440 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 446 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 7416 "DirectoryMonitor.c" +#line 7448 "DirectoryMonitor.c" } static void directory_monitor_real_directory_alteration_completed (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { -#line 445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 451 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 451 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 7425 "DirectoryMonitor.c" +#line 7457 "DirectoryMonitor.c" } static void directory_monitor_real_directory_attributes_altered (DirectoryMonitor* self, GFile* dir) { -#line 448 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 454 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 7432 "DirectoryMonitor.c" +#line 7464 "DirectoryMonitor.c" } static void directory_monitor_real_directory_deleted (DirectoryMonitor* self, GFile* dir) { -#line 452 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 458 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 7439 "DirectoryMonitor.c" +#line 7471 "DirectoryMonitor.c" } @@ -7508,21 +7540,21 @@ static DirectoryMonitorQueryInfoQueueElement* directory_monitor_query_info_queue self->time_created_msec = _tmp8_; #line 96 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return self; -#line 7506 "DirectoryMonitor.c" +#line 7538 "DirectoryMonitor.c" } static DirectoryMonitorQueryInfoQueueElement* directory_monitor_query_info_queue_element_new (DirectoryMonitor* owner, GFile* file, GFile* other_file, GFileMonitorEvent event) { #line 96 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return directory_monitor_query_info_queue_element_construct (DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT, owner, file, other_file, event); -#line 7513 "DirectoryMonitor.c" +#line 7545 "DirectoryMonitor.c" } static gpointer _g_error_copy0 (gpointer self) { -#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return self ? g_error_copy (self) : NULL; -#line 7520 "DirectoryMonitor.c" +#line 7552 "DirectoryMonitor.c" } @@ -7530,7 +7562,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo GFile* source_file = NULL; GObject* _tmp0_ = NULL; GFile* _tmp1_ = NULL; - DirectoryMonitor* _tmp8_ = NULL; + DirectoryMonitor* _tmp16_ = NULL; GError * _inner_error_ = NULL; #line 106 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (DIRECTORY_MONITOR_IS_QUERY_INFO_QUEUE_ELEMENT (self)); @@ -7544,12 +7576,16 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_file_get_type (), GFile)); #line 107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" source_file = _tmp1_; -#line 7542 "DirectoryMonitor.c" +#line 7574 "DirectoryMonitor.c" { GFileInfo* _tmp2_ = NULL; GAsyncResult* _tmp3_ = NULL; GFileInfo* _tmp4_ = NULL; GFileInfo* _tmp5_ = NULL; + GFileInfo* _tmp6_ = NULL; + gchar* _tmp7_ = NULL; + gchar* _tmp8_ = NULL; + gboolean _tmp9_ = FALSE; #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = aresult; #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7558,7 +7594,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo _tmp2_ = _tmp4_; #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7556 "DirectoryMonitor.c" +#line 7592 "DirectoryMonitor.c" goto __catch483_g_error; } #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7569,31 +7605,62 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo _g_object_unref0 (self->info); #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->info = _tmp5_; +#line 112 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _tmp6_ = self->info; +#line 112 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _tmp7_ = get_file_info_id (_tmp6_); +#line 112 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _tmp8_ = _tmp7_; +#line 112 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _tmp9_ = _tmp8_ == NULL; +#line 112 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_free0 (_tmp8_); +#line 112 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + if (_tmp9_) { +#line 7615 "DirectoryMonitor.c" + GFileInfo* _tmp10_ = NULL; + GFile* _tmp11_ = NULL; + gchar* _tmp12_ = NULL; + gchar* _tmp13_ = NULL; +#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _tmp10_ = self->info; +#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _tmp11_ = self->file; +#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _tmp12_ = g_file_get_uri (_tmp11_); +#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _tmp13_ = _tmp12_; +#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_file_info_set_attribute_string (_tmp10_, G_FILE_ATTRIBUTE_ID_FILE, _tmp13_); +#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_free0 (_tmp13_); +#line 7632 "DirectoryMonitor.c" + } #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_tmp2_); -#line 7569 "DirectoryMonitor.c" +#line 7636 "DirectoryMonitor.c" } goto __finally483; __catch483_g_error: { GError* err = NULL; - GError* _tmp6_ = NULL; - GError* _tmp7_ = NULL; + GError* _tmp14_ = NULL; + GError* _tmp15_ = NULL; #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" err = _inner_error_; #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _inner_error_ = NULL; -#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = err; -#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = _g_error_copy0 (_tmp6_); -#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _tmp14_ = err; +#line 117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _tmp15_ = _g_error_copy0 (_tmp14_); +#line 117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_error_free0 (self->err); -#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - self->err = _tmp7_; +#line 117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + self->err = _tmp15_; #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_error_free0 (err); -#line 7591 "DirectoryMonitor.c" +#line 7658 "DirectoryMonitor.c" } __finally483: #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7606,24 +7673,24 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo g_clear_error (&_inner_error_); #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return; -#line 7604 "DirectoryMonitor.c" +#line 7671 "DirectoryMonitor.c" } -#line 117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 121 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->completed = TRUE; -#line 120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = self->owner; -#line 120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_process_query_queue (_tmp8_, self); +#line 124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _tmp16_ = self->owner; +#line 124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + directory_monitor_process_query_queue (_tmp16_, self); #line 106 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (source_file); -#line 7614 "DirectoryMonitor.c" +#line 7681 "DirectoryMonitor.c" } static void directory_monitor_value_query_info_queue_element_init (GValue* value) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 7621 "DirectoryMonitor.c" +#line 7688 "DirectoryMonitor.c" } @@ -7632,7 +7699,7 @@ static void directory_monitor_value_query_info_queue_element_free_value (GValue* if (value->data[0].v_pointer) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_unref (value->data[0].v_pointer); -#line 7630 "DirectoryMonitor.c" +#line 7697 "DirectoryMonitor.c" } } @@ -7642,11 +7709,11 @@ static void directory_monitor_value_query_info_queue_element_copy_value (const G if (src_value->data[0].v_pointer) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" dest_value->data[0].v_pointer = directory_monitor_query_info_queue_element_ref (src_value->data[0].v_pointer); -#line 7640 "DirectoryMonitor.c" +#line 7707 "DirectoryMonitor.c" } else { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" dest_value->data[0].v_pointer = NULL; -#line 7644 "DirectoryMonitor.c" +#line 7711 "DirectoryMonitor.c" } } @@ -7654,37 +7721,37 @@ static void directory_monitor_value_query_info_queue_element_copy_value (const G static gpointer directory_monitor_value_query_info_queue_element_peek_pointer (const GValue* value) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return value->data[0].v_pointer; -#line 7652 "DirectoryMonitor.c" +#line 7719 "DirectoryMonitor.c" } static gchar* directory_monitor_value_query_info_queue_element_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (collect_values[0].v_pointer) { -#line 7659 "DirectoryMonitor.c" +#line 7726 "DirectoryMonitor.c" DirectoryMonitorQueryInfoQueueElement* object; object = collect_values[0].v_pointer; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (object->parent_instance.g_class == NULL) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 7666 "DirectoryMonitor.c" +#line 7733 "DirectoryMonitor.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 7670 "DirectoryMonitor.c" +#line 7737 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = directory_monitor_query_info_queue_element_ref (object); -#line 7674 "DirectoryMonitor.c" +#line 7741 "DirectoryMonitor.c" } else { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 7678 "DirectoryMonitor.c" +#line 7745 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return NULL; -#line 7682 "DirectoryMonitor.c" +#line 7749 "DirectoryMonitor.c" } @@ -7695,25 +7762,25 @@ static gchar* directory_monitor_value_query_info_queue_element_lcopy_value (cons if (!object_p) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 7693 "DirectoryMonitor.c" +#line 7760 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!value->data[0].v_pointer) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = NULL; -#line 7699 "DirectoryMonitor.c" +#line 7766 "DirectoryMonitor.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = value->data[0].v_pointer; -#line 7703 "DirectoryMonitor.c" +#line 7770 "DirectoryMonitor.c" } else { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = directory_monitor_query_info_queue_element_ref (value->data[0].v_pointer); -#line 7707 "DirectoryMonitor.c" +#line 7774 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return NULL; -#line 7711 "DirectoryMonitor.c" +#line 7778 "DirectoryMonitor.c" } @@ -7727,7 +7794,7 @@ static GParamSpec* directory_monitor_param_spec_query_info_queue_element (const G_PARAM_SPEC (spec)->value_type = object_type; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return G_PARAM_SPEC (spec); -#line 7725 "DirectoryMonitor.c" +#line 7792 "DirectoryMonitor.c" } @@ -7736,7 +7803,7 @@ static gpointer directory_monitor_value_get_query_info_queue_element (const GVal g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT), NULL); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return value->data[0].v_pointer; -#line 7734 "DirectoryMonitor.c" +#line 7801 "DirectoryMonitor.c" } @@ -7756,17 +7823,17 @@ static void directory_monitor_value_set_query_info_queue_element (GValue* value, value->data[0].v_pointer = v_object; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_ref (value->data[0].v_pointer); -#line 7754 "DirectoryMonitor.c" +#line 7821 "DirectoryMonitor.c" } else { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 7758 "DirectoryMonitor.c" +#line 7825 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_unref (old); -#line 7764 "DirectoryMonitor.c" +#line 7831 "DirectoryMonitor.c" } } @@ -7785,17 +7852,17 @@ static void directory_monitor_value_take_query_info_queue_element (GValue* value g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = v_object; -#line 7783 "DirectoryMonitor.c" +#line 7850 "DirectoryMonitor.c" } else { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 7787 "DirectoryMonitor.c" +#line 7854 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_unref (old); -#line 7793 "DirectoryMonitor.c" +#line 7860 "DirectoryMonitor.c" } } @@ -7805,7 +7872,7 @@ static void directory_monitor_query_info_queue_element_class_init (DirectoryMoni directory_monitor_query_info_queue_element_parent_class = g_type_class_peek_parent (klass); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" ((DirectoryMonitorQueryInfoQueueElementClass *) klass)->finalize = directory_monitor_query_info_queue_element_finalize; -#line 7803 "DirectoryMonitor.c" +#line 7870 "DirectoryMonitor.c" } @@ -7818,7 +7885,7 @@ static void directory_monitor_query_info_queue_element_instance_init (DirectoryM self->completed = FALSE; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->ref_count = 1; -#line 7816 "DirectoryMonitor.c" +#line 7883 "DirectoryMonitor.c" } @@ -7838,7 +7905,7 @@ static void directory_monitor_query_info_queue_element_finalize (DirectoryMonito _g_object_unref0 (self->info); #line 93 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_error_free0 (self->err); -#line 7836 "DirectoryMonitor.c" +#line 7903 "DirectoryMonitor.c" } @@ -7863,7 +7930,7 @@ static gpointer directory_monitor_query_info_queue_element_ref (gpointer instanc g_atomic_int_inc (&self->ref_count); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return instance; -#line 7861 "DirectoryMonitor.c" +#line 7928 "DirectoryMonitor.c" } @@ -7876,25 +7943,25 @@ static void directory_monitor_query_info_queue_element_unref (gpointer instance) DIRECTORY_MONITOR_QUERY_INFO_QUEUE_ELEMENT_GET_CLASS (self)->finalize (self); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_type_free_instance ((GTypeInstance *) self); -#line 7874 "DirectoryMonitor.c" +#line 7941 "DirectoryMonitor.c" } } static DirectoryMonitorFileInfoMap* directory_monitor_file_info_map_construct (GType object_type) { DirectoryMonitorFileInfoMap* self = NULL; -#line 134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 138 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self = (DirectoryMonitorFileInfoMap*) g_type_create_instance (object_type); -#line 134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 138 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return self; -#line 7885 "DirectoryMonitor.c" +#line 7952 "DirectoryMonitor.c" } static DirectoryMonitorFileInfoMap* directory_monitor_file_info_map_new (void) { -#line 134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 138 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return directory_monitor_file_info_map_construct (DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP); -#line 7892 "DirectoryMonitor.c" +#line 7959 "DirectoryMonitor.c" } @@ -7919,198 +7986,198 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor GFile* _tmp15_ = NULL; GFile* _tmp16_ = NULL; GFile* _tmp19_ = NULL; -#line 137 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), FALSE); -#line 137 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); -#line 137 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail ((info == NULL) || G_IS_FILE_INFO (info), FALSE); -#line 140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = info; -#line 140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" local_info = _tmp1_; -#line 141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 145 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = local_info; -#line 141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 145 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp2_ == NULL) { -#line 7933 "DirectoryMonitor.c" +#line 8000 "DirectoryMonitor.c" GeeHashMap* _tmp3_ = NULL; GFile* _tmp4_ = NULL; gpointer _tmp5_ = NULL; GFileInfo* _tmp6_ = NULL; -#line 142 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = self->priv->map; -#line 142 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = file; -#line 142 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); -#line 142 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); -#line 142 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" local_info = (GFileInfo*) _tmp5_; -#line 143 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = local_info; -#line 143 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp6_ == NULL) { -#line 144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 148 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_normalized); -#line 144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 148 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_normalized = NULL; -#line 145 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_vala_id); -#line 145 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_id = NULL; -#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; -#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); -#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (normalized) { -#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *normalized = _vala_normalized; -#line 7968 "DirectoryMonitor.c" +#line 8035 "DirectoryMonitor.c" } else { -#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_normalized); -#line 7972 "DirectoryMonitor.c" +#line 8039 "DirectoryMonitor.c" } -#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (id) { -#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *id = _vala_id; -#line 7978 "DirectoryMonitor.c" +#line 8045 "DirectoryMonitor.c" } else { -#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_vala_id); -#line 7982 "DirectoryMonitor.c" +#line 8049 "DirectoryMonitor.c" } -#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7986 "DirectoryMonitor.c" +#line 8053 "DirectoryMonitor.c" } } -#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = local_info; -#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = get_file_info_id (_tmp7_); -#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" file_id = _tmp8_; -#line 152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = file_id; -#line 152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp9_ == NULL) { -#line 153 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 157 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_normalized); -#line 153 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 157 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_normalized = NULL; -#line 154 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_vala_id); -#line 154 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_id = NULL; -#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; -#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (file_id); -#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); -#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (normalized) { -#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *normalized = _vala_normalized; -#line 8017 "DirectoryMonitor.c" +#line 8084 "DirectoryMonitor.c" } else { -#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_normalized); -#line 8021 "DirectoryMonitor.c" +#line 8088 "DirectoryMonitor.c" } -#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (id) { -#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *id = _vala_id; -#line 8027 "DirectoryMonitor.c" +#line 8094 "DirectoryMonitor.c" } else { -#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_vala_id); -#line 8031 "DirectoryMonitor.c" +#line 8098 "DirectoryMonitor.c" } -#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8035 "DirectoryMonitor.c" +#line 8102 "DirectoryMonitor.c" } -#line 159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = self->priv->id_map; -#line 159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp11_ = file_id; -#line 159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_); -#line 159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" known_file = (GFile*) _tmp12_; -#line 161 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = file_id; -#line 161 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp14_ = g_strdup ((const gchar*) _tmp13_); -#line 161 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_vala_id); -#line 161 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_id = _tmp14_; -#line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp16_ = known_file; -#line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp16_ != NULL) { -#line 8057 "DirectoryMonitor.c" +#line 8124 "DirectoryMonitor.c" GFile* _tmp17_ = NULL; -#line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp17_ = known_file; -#line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp15_ = _tmp17_; -#line 8063 "DirectoryMonitor.c" +#line 8130 "DirectoryMonitor.c" } else { GFile* _tmp18_ = NULL; -#line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp18_ = file; -#line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp15_ = _tmp18_; -#line 8070 "DirectoryMonitor.c" +#line 8137 "DirectoryMonitor.c" } -#line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = _g_object_ref0 (_tmp15_); -#line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_normalized); -#line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_normalized = _tmp19_; -#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = TRUE; -#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (known_file); -#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (file_id); -#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); -#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (normalized) { -#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *normalized = _vala_normalized; -#line 8090 "DirectoryMonitor.c" +#line 8157 "DirectoryMonitor.c" } else { -#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_normalized); -#line 8094 "DirectoryMonitor.c" +#line 8161 "DirectoryMonitor.c" } -#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (id) { -#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *id = _vala_id; -#line 8100 "DirectoryMonitor.c" +#line 8167 "DirectoryMonitor.c" } else { -#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_vala_id); -#line 8104 "DirectoryMonitor.c" +#line 8171 "DirectoryMonitor.c" } -#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8108 "DirectoryMonitor.c" +#line 8175 "DirectoryMonitor.c" } @@ -8137,145 +8204,145 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo GeeHashMap* _tmp26_ = NULL; const gchar* _tmp27_ = NULL; GFile* _tmp28_ = NULL; -#line 167 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), FALSE); -#line 167 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); -#line 167 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); -#line 169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 173 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->map; -#line 169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 173 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = file; -#line 169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 173 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 173 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp2_) { -#line 8149 "DirectoryMonitor.c" +#line 8216 "DirectoryMonitor.c" gboolean removed = FALSE; GeeHashMap* _tmp3_ = NULL; GFile* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; gboolean _tmp6_ = FALSE; -#line 170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = self->priv->map; -#line 170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = file; -#line 170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, NULL); -#line 170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" removed = _tmp5_; -#line 171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 175 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = removed; -#line 171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 175 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp6_, "removed"); -#line 8167 "DirectoryMonitor.c" +#line 8234 "DirectoryMonitor.c" } -#line 175 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = info; -#line 175 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = get_file_info_id (_tmp7_); -#line 175 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" existing_id = _tmp8_; -#line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = existing_id; -#line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp10_ != NULL) { -#line 8179 "DirectoryMonitor.c" +#line 8246 "DirectoryMonitor.c" GeeHashMap* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; gboolean _tmp13_ = FALSE; -#line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp11_ = self->priv->id_map; -#line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = existing_id; -#line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_); -#line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = _tmp13_; -#line 8191 "DirectoryMonitor.c" +#line 8258 "DirectoryMonitor.c" } else { -#line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = FALSE; -#line 8195 "DirectoryMonitor.c" +#line 8262 "DirectoryMonitor.c" } -#line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp9_) { -#line 8199 "DirectoryMonitor.c" +#line 8266 "DirectoryMonitor.c" gboolean removed = FALSE; GeeHashMap* _tmp14_ = NULL; const gchar* _tmp15_ = NULL; gboolean _tmp16_ = FALSE; gboolean _tmp17_ = FALSE; -#line 177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 181 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp14_ = self->priv->id_map; -#line 177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 181 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp15_ = existing_id; -#line 177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 181 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp16_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_, NULL); -#line 177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 181 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" removed = _tmp16_; -#line 178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 182 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp17_ = removed; -#line 178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 182 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp17_, "removed"); -#line 8217 "DirectoryMonitor.c" +#line 8284 "DirectoryMonitor.c" } -#line 183 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp18_ = file; -#line 183 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = info; -#line 183 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp22_ = directory_monitor_file_info_map_normalize_file (self, _tmp18_, _tmp19_, &_tmp20_, &_tmp21_); -#line 183 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); -#line 183 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" normalized = _tmp20_; -#line 183 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 183 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" id = _tmp21_; -#line 183 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_tmp22_) { -#line 184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; -#line 184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); -#line 184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (existing_id); -#line 184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8245 "DirectoryMonitor.c" +#line 8312 "DirectoryMonitor.c" } -#line 186 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 190 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp23_ = self->priv->map; -#line 186 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 190 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp24_ = normalized; -#line 186 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 190 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp25_ = info; -#line 186 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 190 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_, _tmp25_); -#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp26_ = self->priv->id_map; -#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp27_ = id; -#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp28_ = normalized; -#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_, _tmp28_); -#line 189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 193 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = TRUE; -#line 189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 193 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); -#line 189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 193 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 193 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (existing_id); -#line 189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 193 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8273 "DirectoryMonitor.c" +#line 8340 "DirectoryMonitor.c" } @@ -8292,114 +8359,114 @@ static gboolean directory_monitor_file_info_map_remove (DirectoryMonitorFileInfo GFile* _tmp6_ = NULL; GeeHashMap* _tmp7_ = NULL; const gchar* _tmp8_ = NULL; -#line 192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), FALSE); -#line 192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); -#line 192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail ((info == NULL) || G_IS_FILE_INFO (info), FALSE); -#line 195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = file; -#line 195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = info; -#line 195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = directory_monitor_file_info_map_normalize_file (self, _tmp0_, _tmp1_, &_tmp2_, &_tmp3_); -#line 195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); -#line 195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" normalized = _tmp2_; -#line 195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" id = _tmp3_; -#line 195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_tmp4_) { -#line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 200 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; -#line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 200 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); -#line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 200 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 200 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8320 "DirectoryMonitor.c" +#line 8387 "DirectoryMonitor.c" } -#line 198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = self->priv->map; -#line 198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = normalized; -#line 198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_, NULL); -#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 203 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = self->priv->id_map; -#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 203 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = id; -#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 203 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_, NULL); -#line 201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 205 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = TRUE; -#line 201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 205 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); -#line 201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 205 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 205 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8342 "DirectoryMonitor.c" +#line 8409 "DirectoryMonitor.c" } static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfoMap* self, GeeCollection* files) { -#line 206 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 210 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self)); -#line 206 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 210 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (GEE_IS_COLLECTION (files)); -#line 8351 "DirectoryMonitor.c" +#line 8418 "DirectoryMonitor.c" { GeeIterator* _file_it = NULL; GeeCollection* _tmp0_ = NULL; GeeIterator* _tmp1_ = NULL; -#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = files; -#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _file_it = _tmp1_; -#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 8364 "DirectoryMonitor.c" +#line 8431 "DirectoryMonitor.c" GeeIterator* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; GFile* file = NULL; GeeIterator* _tmp4_ = NULL; gpointer _tmp5_ = NULL; GFile* _tmp6_ = NULL; -#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _file_it; -#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = gee_iterator_next (_tmp2_); -#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_tmp3_) { -#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 8379 "DirectoryMonitor.c" +#line 8446 "DirectoryMonitor.c" } -#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = _file_it; -#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = gee_iterator_get (_tmp4_); -#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" file = (GFile*) _tmp5_; -#line 208 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 212 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = file; -#line 208 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 212 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_remove (self, _tmp6_, NULL); -#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (file); -#line 8393 "DirectoryMonitor.c" +#line 8460 "DirectoryMonitor.c" } -#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_file_it); -#line 8397 "DirectoryMonitor.c" +#line 8464 "DirectoryMonitor.c" } } @@ -8416,53 +8483,53 @@ static gboolean directory_monitor_file_info_map_contains (DirectoryMonitorFileIn GeeHashMap* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; -#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), FALSE); -#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); -#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail ((info == NULL) || G_IS_FILE_INFO (info), FALSE); -#line 214 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = file; -#line 214 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = info; -#line 214 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = directory_monitor_file_info_map_normalize_file (self, _tmp0_, _tmp1_, &_tmp2_, &_tmp3_); -#line 214 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); -#line 214 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" normalized = _tmp2_; -#line 214 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 214 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" id = _tmp3_; -#line 214 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_tmp4_) { -#line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; -#line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); -#line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8444 "DirectoryMonitor.c" +#line 8511 "DirectoryMonitor.c" } -#line 217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = self->priv->id_map; -#line 217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = id; -#line 217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_); -#line 217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = _tmp7_; -#line 217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); -#line 217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8460 "DirectoryMonitor.c" +#line 8527 "DirectoryMonitor.c" } @@ -8475,60 +8542,60 @@ static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMa GFile* _tmp4_ = NULL; gchar* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; -#line 220 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 224 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL); -#line 220 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 224 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 220 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 224 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail ((info == NULL) || G_IS_FILE_INFO (info), NULL); -#line 222 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 226 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = info; -#line 222 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 226 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp0_ != NULL) { -#line 8483 "DirectoryMonitor.c" +#line 8550 "DirectoryMonitor.c" GFileInfo* _tmp1_ = NULL; gchar* _tmp2_ = NULL; -#line 223 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = info; -#line 223 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = get_file_info_id (_tmp1_); -#line 223 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = _tmp2_; -#line 223 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8494 "DirectoryMonitor.c" +#line 8561 "DirectoryMonitor.c" } -#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = file; -#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = directory_monitor_file_info_map_normalize_file (self, _tmp3_, NULL, &_tmp4_, &_tmp5_); -#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); -#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" normalized = _tmp4_; -#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" id = _tmp5_; -#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_tmp6_) { -#line 228 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = NULL; -#line 228 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); -#line 228 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 228 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8518 "DirectoryMonitor.c" +#line 8585 "DirectoryMonitor.c" } -#line 230 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = id; -#line 230 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); -#line 230 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8526 "DirectoryMonitor.c" +#line 8593 "DirectoryMonitor.c" } @@ -8537,19 +8604,19 @@ static GeeCollection* directory_monitor_file_info_map_get_all (DirectoryMonitorF GeeHashMap* _tmp0_ = NULL; GeeSet* _tmp1_ = NULL; GeeSet* _tmp2_ = NULL; -#line 233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 237 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL); -#line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->map; -#line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); -#line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp1_; -#line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); -#line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8547 "DirectoryMonitor.c" +#line 8614 "DirectoryMonitor.c" } @@ -8569,71 +8636,71 @@ static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFile GeeHashMap* _tmp8_ = NULL; GFile* _tmp9_ = NULL; gpointer _tmp10_ = NULL; -#line 237 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL); -#line 237 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 243 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->map; -#line 239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 243 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = file; -#line 239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 243 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 243 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" info = (GFileInfo*) _tmp2_; -#line 240 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 244 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = info; -#line 240 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 244 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp3_ != NULL) { -#line 241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = info; -#line 241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8587 "DirectoryMonitor.c" +#line 8654 "DirectoryMonitor.c" } -#line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = file; -#line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = directory_monitor_file_info_map_normalize_file (self, _tmp4_, NULL, &_tmp5_, &_tmp6_); -#line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); -#line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" normalized = _tmp5_; -#line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" id = _tmp6_; -#line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_tmp7_) { -#line 246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 250 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = NULL; -#line 246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 250 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); -#line 246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 250 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 250 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (info); -#line 246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 250 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8613 "DirectoryMonitor.c" +#line 8680 "DirectoryMonitor.c" } -#line 248 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = self->priv->map; -#line 248 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = normalized; -#line 248 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_); -#line 248 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = (GFileInfo*) _tmp10_; -#line 248 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); -#line 248 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 248 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (info); -#line 248 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8631 "DirectoryMonitor.c" +#line 8698 "DirectoryMonitor.c" } @@ -8651,35 +8718,35 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi gchar* _tmp17_ = NULL; const gchar* _tmp18_ = NULL; GFile* normalized = NULL; - GeeHashMap* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - gpointer _tmp21_ = NULL; - GFile* _tmp22_ = NULL; GeeHashMap* _tmp23_ = NULL; - GFile* _tmp24_ = NULL; + const gchar* _tmp24_ = NULL; gpointer _tmp25_ = NULL; + GFile* _tmp26_ = NULL; + GeeHashMap* _tmp27_ = NULL; + GFile* _tmp28_ = NULL; + gpointer _tmp29_ = NULL; GError * _inner_error_ = NULL; -#line 251 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL); -#line 251 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 251 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable), NULL); -#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 256 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = file; -#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 256 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = directory_monitor_file_info_map_get_info (self, _tmp0_); -#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 256 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" info = _tmp1_; -#line 253 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 257 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = info; -#line 253 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 257 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp2_ != NULL) { -#line 254 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = info; -#line 254 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8677 "DirectoryMonitor.c" +#line 8744 "DirectoryMonitor.c" } { GFileInfo* _tmp3_ = NULL; @@ -8687,30 +8754,30 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi GCancellable* _tmp5_ = NULL; GFileInfo* _tmp6_ = NULL; GFileInfo* _tmp7_ = NULL; -#line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = file; -#line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = cancellable; -#line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = g_file_query_info (_tmp4_, G_FILE_ATTRIBUTE_ID_FILE, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, _tmp5_, &_inner_error_); -#line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = _tmp6_; -#line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8695 "DirectoryMonitor.c" +#line 8762 "DirectoryMonitor.c" goto __catch484_g_error; } -#line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = _tmp3_; -#line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = NULL; -#line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (info); -#line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" info = _tmp7_; -#line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_tmp3_); -#line 8708 "DirectoryMonitor.c" +#line 8775 "DirectoryMonitor.c" } goto __finally484; __catch484_g_error: @@ -8721,124 +8788,133 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi gchar* _tmp10_ = NULL; GError* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; -#line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" err = _inner_error_; -#line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _inner_error_ = NULL; -#line 261 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = file; -#line 261 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = g_file_get_path (_tmp8_); -#line 261 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = _tmp9_; -#line 261 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp11_ = err; -#line 261 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = _tmp11_->message; -#line 261 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:261: Unable to query file ID of %s: %s", _tmp10_, _tmp12_); -#line 261 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_warning ("DirectoryMonitor.vala:265: Unable to query file ID of %s: %s", _tmp10_, _tmp12_); +#line 265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp10_); -#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 267 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = NULL; -#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 267 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_error_free0 (err); -#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 267 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (info); -#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 267 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8745 "DirectoryMonitor.c" +#line 8812 "DirectoryMonitor.c" } __finally484: -#line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (info); -#line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_clear_error (&_inner_error_); -#line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return NULL; -#line 8758 "DirectoryMonitor.c" +#line 8825 "DirectoryMonitor.c" } -#line 266 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 270 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = info; -#line 266 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp14_ = directory_monitor_is_file_symlink_supported (_tmp13_); -#line 266 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_tmp14_) { -#line 267 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - result = NULL; -#line 267 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (info); -#line 267 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - return result; -#line 8772 "DirectoryMonitor.c" - } -#line 269 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp15_ = info; -#line 269 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp16_ = g_file_info_get_attribute_string (_tmp15_, G_FILE_ATTRIBUTE_ID_FILE); -#line 269 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp17_ = g_strdup (_tmp16_); -#line 269 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - id = _tmp17_; #line 270 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp18_ = id; + _tmp14_ = directory_monitor_is_file_symlink_supported (_tmp13_); #line 270 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp18_ == NULL) { + if (!_tmp14_) { #line 271 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = NULL; #line 271 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (id); -#line 271 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (info); #line 271 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8794 "DirectoryMonitor.c" +#line 8839 "DirectoryMonitor.c" } #line 273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp19_ = self->priv->id_map; + _tmp15_ = info; #line 273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp20_ = id; + _tmp16_ = g_file_info_get_attribute_string (_tmp15_, G_FILE_ATTRIBUTE_ID_FILE); #line 273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp21_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_); + _tmp17_ = g_strdup (_tmp16_); #line 273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - normalized = (GFile*) _tmp21_; + id = _tmp17_; #line 274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp22_ = normalized; + _tmp18_ = id; #line 274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp22_ == NULL) { + if (_tmp18_ == NULL) { +#line 8853 "DirectoryMonitor.c" + GFileInfo* _tmp19_ = NULL; + GFile* _tmp20_ = NULL; + gchar* _tmp21_ = NULL; + gchar* _tmp22_ = NULL; #line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - result = NULL; + _tmp19_ = info; #line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (normalized); + _tmp20_ = file; #line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (id); + _tmp21_ = g_file_get_uri (_tmp20_); #line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (info); + _tmp22_ = _tmp21_; #line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - return result; -#line 8818 "DirectoryMonitor.c" + g_file_info_set_attribute_string (_tmp19_, G_FILE_ATTRIBUTE_ID_FILE, _tmp22_); +#line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_free0 (_tmp22_); +#line 8870 "DirectoryMonitor.c" } -#line 277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp23_ = self->priv->map; -#line 277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp24_ = file; -#line 277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _tmp23_ = self->priv->id_map; +#line 279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _tmp24_ = id; +#line 279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp25_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_); -#line 277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - result = (GFileInfo*) _tmp25_; -#line 277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + normalized = (GFile*) _tmp25_; +#line 280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _tmp26_ = normalized; +#line 280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + if (_tmp26_ == NULL) { +#line 281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + result = NULL; +#line 281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_object_unref0 (normalized); +#line 281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_free0 (id); +#line 281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_object_unref0 (info); +#line 281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + return result; +#line 8894 "DirectoryMonitor.c" + } +#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _tmp27_ = self->priv->map; +#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _tmp28_ = file; +#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _tmp29_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp28_); +#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + result = (GFileInfo*) _tmp29_; +#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); -#line 277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); -#line 277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (info); -#line 277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8836 "DirectoryMonitor.c" +#line 8912 "DirectoryMonitor.c" } @@ -8854,41 +8930,41 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn GTimeVal match_time = {0}; GFileInfo* _tmp5_ = NULL; GTimeVal _tmp6_ = {0}; -#line 280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 286 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL); -#line 280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 286 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (match), NULL); -#line 281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = match; -#line 281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = get_file_info_id (_tmp0_); -#line 281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" match_id = _tmp1_; -#line 282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = match_id; -#line 282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp2_ == NULL) { -#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = NULL; -#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (match_id); -#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8872 "DirectoryMonitor.c" +#line 8948 "DirectoryMonitor.c" } -#line 286 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 292 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = match; -#line 286 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 292 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = g_file_info_get_size (_tmp3_); -#line 286 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 292 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" match_size = _tmp4_; -#line 287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = match; -#line 287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_file_info_get_modification_time (_tmp5_, &_tmp6_); -#line 287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" match_time = _tmp6_; -#line 8886 "DirectoryMonitor.c" +#line 8962 "DirectoryMonitor.c" { GeeIterator* _file_it = NULL; GeeHashMap* _tmp7_ = NULL; @@ -8897,25 +8973,25 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn GeeSet* _tmp10_ = NULL; GeeIterator* _tmp11_ = NULL; GeeIterator* _tmp12_ = NULL; -#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = self->priv->map; -#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); -#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = _tmp8_; -#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = _tmp9_; -#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = _tmp11_; -#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_tmp10_); -#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _file_it = _tmp12_; -#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 8913 "DirectoryMonitor.c" +#line 8989 "DirectoryMonitor.c" GeeIterator* _tmp13_ = NULL; gboolean _tmp14_ = FALSE; GFile* file = NULL; @@ -8940,134 +9016,134 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn glong _tmp31_ = 0L; GTimeVal _tmp32_ = {0}; glong _tmp33_ = 0L; -#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = _file_it; -#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp14_ = gee_iterator_next (_tmp13_); -#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_tmp14_) { -#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 8946 "DirectoryMonitor.c" +#line 9022 "DirectoryMonitor.c" } -#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp15_ = _file_it; -#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp16_ = gee_iterator_get (_tmp15_); -#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" file = (GFile*) _tmp16_; -#line 290 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 296 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp17_ = self->priv->map; -#line 290 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 296 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp18_ = file; -#line 290 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 296 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp18_); -#line 290 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 296 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" info = (GFileInfo*) _tmp19_; -#line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp20_ = info; -#line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp21_ = get_file_info_id (_tmp20_); -#line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp22_ = _tmp21_; -#line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp23_ = match_id; -#line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp24_ = g_strcmp0 (_tmp22_, _tmp23_) == 0; -#line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp22_); -#line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp24_) { -#line 294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = file; -#line 294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (info); -#line 294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_file_it); -#line 294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (match_id); -#line 294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8986 "DirectoryMonitor.c" +#line 9062 "DirectoryMonitor.c" } -#line 297 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp25_ = match_size; -#line 297 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp26_ = info; -#line 297 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp27_ = g_file_info_get_size (_tmp26_); -#line 297 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp25_ != _tmp27_) { -#line 298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (info); -#line 298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (file); -#line 298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 9002 "DirectoryMonitor.c" +#line 9078 "DirectoryMonitor.c" } -#line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 306 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp28_ = info; -#line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 306 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_file_info_get_modification_time (_tmp28_, &_tmp29_); -#line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 306 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" time = _tmp29_; -#line 302 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp30_ = time; -#line 302 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp31_ = _tmp30_.tv_sec; -#line 302 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp32_ = match_time; -#line 302 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp33_ = _tmp32_.tv_sec; -#line 302 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp31_ != _tmp33_) { -#line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 309 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (info); -#line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 309 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (file); -#line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 309 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 9026 "DirectoryMonitor.c" +#line 9102 "DirectoryMonitor.c" } -#line 305 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = file; -#line 305 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (info); -#line 305 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_file_it); -#line 305 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (match_id); -#line 305 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 9038 "DirectoryMonitor.c" +#line 9114 "DirectoryMonitor.c" } -#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_file_it); -#line 9042 "DirectoryMonitor.c" +#line 9118 "DirectoryMonitor.c" } -#line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = NULL; -#line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (match_id); -#line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 9050 "DirectoryMonitor.c" +#line 9126 "DirectoryMonitor.c" } static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitorFileInfoMap* self, GFile* root, DirectoryMonitorFileInfoMap* descendents) { GeeArrayList* pruned = NULL; GeeArrayList* _tmp28_ = NULL; -#line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self)); -#line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (root)); -#line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (descendents)); -#line 312 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" pruned = NULL; -#line 9065 "DirectoryMonitor.c" +#line 9141 "DirectoryMonitor.c" { GeeIterator* _file_it = NULL; GeeHashMap* _tmp0_ = NULL; @@ -9076,25 +9152,25 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor GeeSet* _tmp3_ = NULL; GeeIterator* _tmp4_ = NULL; GeeIterator* _tmp5_ = NULL; -#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->map; -#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); -#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp1_; -#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = _tmp2_; -#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = _tmp4_; -#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_tmp3_); -#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _file_it = _tmp5_; -#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 9092 "DirectoryMonitor.c" +#line 9168 "DirectoryMonitor.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; GFile* file = NULL; @@ -9103,54 +9179,54 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor GFile* parent = NULL; GFile* _tmp10_ = NULL; GFile* _tmp11_ = NULL; -#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = _file_it; -#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = gee_iterator_next (_tmp6_); -#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_tmp7_) { -#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9109 "DirectoryMonitor.c" +#line 9185 "DirectoryMonitor.c" } -#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = _file_it; -#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = gee_iterator_get (_tmp8_); -#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" file = (GFile*) _tmp9_; -#line 314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = file; -#line 314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp11_ = g_file_get_parent (_tmp10_); -#line 314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" parent = _tmp11_; -#line 315 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 9125 "DirectoryMonitor.c" +#line 9201 "DirectoryMonitor.c" GFile* _tmp12_ = NULL; GFile* _tmp13_ = NULL; GFile* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; GFile* _tmp26_ = NULL; GFile* _tmp27_ = NULL; -#line 315 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = parent; -#line 315 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!(_tmp12_ != NULL)) { -#line 315 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9138 "DirectoryMonitor.c" +#line 9214 "DirectoryMonitor.c" } -#line 316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 322 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = parent; -#line 316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 322 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp14_ = root; -#line 316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 322 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp15_ = g_file_equal (_tmp13_, _tmp14_); -#line 316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 322 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp15_) { -#line 9148 "DirectoryMonitor.c" +#line 9224 "DirectoryMonitor.c" GeeArrayList* _tmp16_ = NULL; GeeArrayList* _tmp18_ = NULL; GFile* _tmp19_ = NULL; @@ -9160,98 +9236,98 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor GFile* _tmp23_ = NULL; gpointer _tmp24_ = NULL; GFileInfo* _tmp25_ = NULL; -#line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 323 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp16_ = pruned; -#line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 323 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp16_ == NULL) { -#line 9162 "DirectoryMonitor.c" +#line 9238 "DirectoryMonitor.c" GeeArrayList* _tmp17_ = NULL; -#line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp17_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); -#line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (pruned); -#line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" pruned = _tmp17_; -#line 9170 "DirectoryMonitor.c" +#line 9246 "DirectoryMonitor.c" } -#line 320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp18_ = pruned; -#line 320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = file; -#line 320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_); -#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp20_ = descendents; -#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp21_ = file; -#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp22_ = self->priv->map; -#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp23_ = file; -#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp24_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp23_); -#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp25_ = (GFileInfo*) _tmp24_; -#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_update (_tmp20_, _tmp21_, _tmp25_); -#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_tmp25_); -#line 323 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 329 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9196 "DirectoryMonitor.c" +#line 9272 "DirectoryMonitor.c" } -#line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 332 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp26_ = parent; -#line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 332 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp27_ = g_file_get_parent (_tmp26_); -#line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 332 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (parent); -#line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 332 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" parent = _tmp27_; -#line 9206 "DirectoryMonitor.c" +#line 9282 "DirectoryMonitor.c" } -#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (parent); -#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (file); -#line 9212 "DirectoryMonitor.c" +#line 9288 "DirectoryMonitor.c" } -#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_file_it); -#line 9216 "DirectoryMonitor.c" +#line 9292 "DirectoryMonitor.c" } -#line 330 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 336 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp28_ = pruned; -#line 330 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 336 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp28_ != NULL) { -#line 9222 "DirectoryMonitor.c" +#line 9298 "DirectoryMonitor.c" GeeArrayList* _tmp29_ = NULL; -#line 331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp29_ = pruned; -#line 331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_remove_all (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 9228 "DirectoryMonitor.c" +#line 9304 "DirectoryMonitor.c" } -#line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (pruned); -#line 9232 "DirectoryMonitor.c" +#line 9308 "DirectoryMonitor.c" } static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileInfoMap* self, GFile* root, GeeCollection* files, GeeCollection* dirs) { gint result = 0; gint count = 0; -#line 336 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 342 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), 0); -#line 336 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 342 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE (root), 0); -#line 336 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 342 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (GEE_IS_COLLECTION (files), 0); -#line 336 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 342 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (GEE_IS_COLLECTION (dirs), 0); -#line 337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" count = 0; -#line 9249 "DirectoryMonitor.c" +#line 9325 "DirectoryMonitor.c" { GeeIterator* _file_it = NULL; GeeHashMap* _tmp0_ = NULL; @@ -9260,25 +9336,25 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn GeeSet* _tmp3_ = NULL; GeeIterator* _tmp4_ = NULL; GeeIterator* _tmp5_ = NULL; -#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->map; -#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); -#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp1_; -#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = _tmp2_; -#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = _tmp4_; -#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_tmp3_); -#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _file_it = _tmp5_; -#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 9276 "DirectoryMonitor.c" +#line 9352 "DirectoryMonitor.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; GFile* file = NULL; @@ -9297,372 +9373,372 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn DirectoryMonitorFType _tmp21_ = 0; DirectoryMonitorFType _tmp22_ = 0; DirectoryMonitorFType _tmp23_ = 0; -#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = _file_it; -#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = gee_iterator_next (_tmp6_); -#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_tmp7_) { -#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9303 "DirectoryMonitor.c" +#line 9379 "DirectoryMonitor.c" } -#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = _file_it; -#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = gee_iterator_get (_tmp8_); -#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" file = (GFile*) _tmp9_; -#line 339 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 345 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = file; -#line 339 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 345 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp11_ = g_file_get_parent (_tmp10_); -#line 339 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 345 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" parent = _tmp11_; -#line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = parent; -#line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp13_ == NULL) { -#line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = TRUE; -#line 9323 "DirectoryMonitor.c" +#line 9399 "DirectoryMonitor.c" } else { GFile* _tmp14_ = NULL; GFile* _tmp15_ = NULL; gboolean _tmp16_ = FALSE; -#line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp14_ = parent; -#line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp15_ = root; -#line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp16_ = g_file_equal (_tmp14_, _tmp15_); -#line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = !_tmp16_; -#line 9336 "DirectoryMonitor.c" +#line 9412 "DirectoryMonitor.c" } -#line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp12_) { -#line 341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (parent); -#line 341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (file); -#line 341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 9346 "DirectoryMonitor.c" +#line 9422 "DirectoryMonitor.c" } -#line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp17_ = self->priv->map; -#line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp18_ = file; -#line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp18_); -#line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp20_ = (GFileInfo*) _tmp19_; -#line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp21_ = directory_monitor_get_ftype (_tmp20_); -#line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp22_ = _tmp21_; -#line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_tmp20_); -#line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" ftype = _tmp22_; -#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 350 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp23_ = ftype; -#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 350 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" switch (_tmp23_) { -#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 350 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 9370 "DirectoryMonitor.c" +#line 9446 "DirectoryMonitor.c" { GeeCollection* _tmp24_ = NULL; GFile* _tmp25_ = NULL; gint _tmp26_ = 0; -#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp24_ = files; -#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp25_ = file; -#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" gee_collection_add (_tmp24_, _tmp25_); -#line 347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 353 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp26_ = count; -#line 347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 353 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" count = _tmp26_ + 1; -#line 348 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 354 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9387 "DirectoryMonitor.c" +#line 9463 "DirectoryMonitor.c" } -#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 350 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 9391 "DirectoryMonitor.c" +#line 9467 "DirectoryMonitor.c" { GeeCollection* _tmp27_ = NULL; GFile* _tmp28_ = NULL; gint _tmp29_ = 0; -#line 351 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 357 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp27_ = dirs; -#line 351 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 357 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp28_ = file; -#line 351 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 357 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" gee_collection_add (_tmp27_, _tmp28_); -#line 352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 358 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp29_ = count; -#line 352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 358 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" count = _tmp29_ + 1; -#line 353 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 359 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9408 "DirectoryMonitor.c" +#line 9484 "DirectoryMonitor.c" } default: { DirectoryMonitorFType _tmp30_ = 0; -#line 356 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 362 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp30_ = ftype; -#line 356 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 362 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp30_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); -#line 357 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 363 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9419 "DirectoryMonitor.c" +#line 9495 "DirectoryMonitor.c" } } -#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (parent); -#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (file); -#line 9426 "DirectoryMonitor.c" +#line 9502 "DirectoryMonitor.c" } -#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_file_it); -#line 9430 "DirectoryMonitor.c" +#line 9506 "DirectoryMonitor.c" } -#line 361 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 367 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = count; -#line 361 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 367 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 9436 "DirectoryMonitor.c" +#line 9512 "DirectoryMonitor.c" } static void directory_monitor_value_file_info_map_init (GValue* value) { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 9443 "DirectoryMonitor.c" +#line 9519 "DirectoryMonitor.c" } static void directory_monitor_value_file_info_map_free_value (GValue* value) { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (value->data[0].v_pointer) { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_unref (value->data[0].v_pointer); -#line 9452 "DirectoryMonitor.c" +#line 9528 "DirectoryMonitor.c" } } static void directory_monitor_value_file_info_map_copy_value (const GValue* src_value, GValue* dest_value) { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (src_value->data[0].v_pointer) { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" dest_value->data[0].v_pointer = directory_monitor_file_info_map_ref (src_value->data[0].v_pointer); -#line 9462 "DirectoryMonitor.c" +#line 9538 "DirectoryMonitor.c" } else { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" dest_value->data[0].v_pointer = NULL; -#line 9466 "DirectoryMonitor.c" +#line 9542 "DirectoryMonitor.c" } } static gpointer directory_monitor_value_file_info_map_peek_pointer (const GValue* value) { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return value->data[0].v_pointer; -#line 9474 "DirectoryMonitor.c" +#line 9550 "DirectoryMonitor.c" } static gchar* directory_monitor_value_file_info_map_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (collect_values[0].v_pointer) { -#line 9481 "DirectoryMonitor.c" +#line 9557 "DirectoryMonitor.c" DirectoryMonitorFileInfoMap* object; object = collect_values[0].v_pointer; -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (object->parent_instance.g_class == NULL) { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 9488 "DirectoryMonitor.c" +#line 9564 "DirectoryMonitor.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 9492 "DirectoryMonitor.c" +#line 9568 "DirectoryMonitor.c" } -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = directory_monitor_file_info_map_ref (object); -#line 9496 "DirectoryMonitor.c" +#line 9572 "DirectoryMonitor.c" } else { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 9500 "DirectoryMonitor.c" +#line 9576 "DirectoryMonitor.c" } -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return NULL; -#line 9504 "DirectoryMonitor.c" +#line 9580 "DirectoryMonitor.c" } static gchar* directory_monitor_value_file_info_map_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { DirectoryMonitorFileInfoMap** object_p; object_p = collect_values[0].v_pointer; -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!object_p) { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 9515 "DirectoryMonitor.c" +#line 9591 "DirectoryMonitor.c" } -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!value->data[0].v_pointer) { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = NULL; -#line 9521 "DirectoryMonitor.c" +#line 9597 "DirectoryMonitor.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = value->data[0].v_pointer; -#line 9525 "DirectoryMonitor.c" +#line 9601 "DirectoryMonitor.c" } else { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = directory_monitor_file_info_map_ref (value->data[0].v_pointer); -#line 9529 "DirectoryMonitor.c" +#line 9605 "DirectoryMonitor.c" } -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return NULL; -#line 9533 "DirectoryMonitor.c" +#line 9609 "DirectoryMonitor.c" } static GParamSpec* directory_monitor_param_spec_file_info_map (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { DirectoryMonitorParamSpecFileInfoMap* spec; -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (g_type_is_a (object_type, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP), NULL); -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return G_PARAM_SPEC (spec); -#line 9547 "DirectoryMonitor.c" +#line 9623 "DirectoryMonitor.c" } static gpointer directory_monitor_value_get_file_info_map (const GValue* value) { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP), NULL); -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return value->data[0].v_pointer; -#line 9556 "DirectoryMonitor.c" +#line 9632 "DirectoryMonitor.c" } static void directory_monitor_value_set_file_info_map (GValue* value, gpointer v_object) { DirectoryMonitorFileInfoMap* old; -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP)); -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" old = value->data[0].v_pointer; -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (v_object) { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP)); -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = v_object; -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_ref (value->data[0].v_pointer); -#line 9576 "DirectoryMonitor.c" +#line 9652 "DirectoryMonitor.c" } else { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 9580 "DirectoryMonitor.c" +#line 9656 "DirectoryMonitor.c" } -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old) { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_unref (old); -#line 9586 "DirectoryMonitor.c" +#line 9662 "DirectoryMonitor.c" } } static void directory_monitor_value_take_file_info_map (GValue* value, gpointer v_object) { DirectoryMonitorFileInfoMap* old; -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP)); -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" old = value->data[0].v_pointer; -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (v_object) { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP)); -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = v_object; -#line 9605 "DirectoryMonitor.c" +#line 9681 "DirectoryMonitor.c" } else { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 9609 "DirectoryMonitor.c" +#line 9685 "DirectoryMonitor.c" } -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old) { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_unref (old); -#line 9615 "DirectoryMonitor.c" +#line 9691 "DirectoryMonitor.c" } } static void directory_monitor_file_info_map_class_init (DirectoryMonitorFileInfoMapClass * klass) { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_parent_class = g_type_class_peek_parent (klass); -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" ((DirectoryMonitorFileInfoMapClass *) klass)->finalize = directory_monitor_file_info_map_finalize; -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_type_class_add_private (klass, sizeof (DirectoryMonitorFileInfoMapPrivate)); -#line 9627 "DirectoryMonitor.c" +#line 9703 "DirectoryMonitor.c" } static void directory_monitor_file_info_map_instance_init (DirectoryMonitorFileInfoMap * self) { GeeHashMap* _tmp0_ = NULL; GeeHashMap* _tmp1_ = NULL; -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv = DIRECTORY_MONITOR_FILE_INFO_MAP_GET_PRIVATE (self); -#line 129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 133 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); -#line 129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 133 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->map = _tmp0_; -#line 131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 135 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); -#line 131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 135 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->id_map = _tmp1_; -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->ref_count = 1; -#line 9646 "DirectoryMonitor.c" +#line 9722 "DirectoryMonitor.c" } static void directory_monitor_file_info_map_finalize (DirectoryMonitorFileInfoMap* obj) { DirectoryMonitorFileInfoMap * self; -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP, DirectoryMonitorFileInfoMap); -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_handlers_destroy (self); -#line 129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 133 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (self->priv->map); -#line 131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 135 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (self->priv->id_map); -#line 9660 "DirectoryMonitor.c" +#line 9736 "DirectoryMonitor.c" } @@ -9683,24 +9759,24 @@ static GType directory_monitor_file_info_map_get_type (void) { static gpointer directory_monitor_file_info_map_ref (gpointer instance) { DirectoryMonitorFileInfoMap* self; self = instance; -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_atomic_int_inc (&self->ref_count); -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return instance; -#line 9685 "DirectoryMonitor.c" +#line 9761 "DirectoryMonitor.c" } static void directory_monitor_file_info_map_unref (gpointer instance) { DirectoryMonitorFileInfoMap* self; self = instance; -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_FILE_INFO_MAP_GET_CLASS (self)->finalize (self); -#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_type_free_instance ((GTypeInstance *) self); -#line 9698 "DirectoryMonitor.c" +#line 9774 "DirectoryMonitor.c" } } @@ -9838,7 +9914,7 @@ static void directory_monitor_class_init (DirectoryMonitorClass * klass) { g_signal_new ("directory_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_new ("closed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, closed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 9836 "DirectoryMonitor.c" +#line 9912 "DirectoryMonitor.c" } @@ -9850,35 +9926,35 @@ static void directory_monitor_instance_init (DirectoryMonitor * self) { GCancellable* _tmp4_ = NULL; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv = DIRECTORY_MONITOR_GET_PRIVATE (self); -#line 368 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, g_file_monitor_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -#line 368 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->monitors = _tmp0_; -#line 369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = gee_linked_list_new (DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT, (GBoxedCopyFunc) directory_monitor_query_info_queue_element_ref, (GDestroyNotify) directory_monitor_query_info_queue_element_unref, NULL, NULL, NULL); -#line 369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->query_info_queue = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_QUEUE, GeeQueue); -#line 371 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = directory_monitor_file_info_map_new (); -#line 371 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->files = _tmp2_; -#line 372 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 378 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = directory_monitor_file_info_map_new (); -#line 372 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 378 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->parent_moved = _tmp3_; -#line 373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = g_cancellable_new (); -#line 373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->cancellable = _tmp4_; -#line 374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 380 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->outstanding_exploration_dirs = 0; -#line 375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 381 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->started = FALSE; -#line 376 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 382 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->has_discovery_started = FALSE; -#line 377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 383 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->delete_timer_id = (guint) 0; -#line 9876 "DirectoryMonitor.c" +#line 9952 "DirectoryMonitor.c" } @@ -9886,21 +9962,21 @@ static void directory_monitor_finalize (GObject* obj) { DirectoryMonitor * self; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECTORY_MONITOR, DirectoryMonitor); -#line 365 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 371 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (self->priv->root); -#line 368 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (self->priv->monitors); -#line 369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (self->priv->query_info_queue); -#line 371 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_file_info_map_unref0 (self->priv->files); -#line 372 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 378 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_file_info_map_unref0 (self->priv->parent_moved); -#line 373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" +#line 379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (self->priv->cancellable); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" G_OBJECT_CLASS (directory_monitor_parent_class)->finalize (obj); -#line 9898 "DirectoryMonitor.c" +#line 9974 "DirectoryMonitor.c" } diff --git a/src/DirectoryMonitor.vala b/src/DirectoryMonitor.vala index 50d0048..a37b124 100644 --- a/src/DirectoryMonitor.vala +++ b/src/DirectoryMonitor.vala @@ -109,6 +109,10 @@ public class DirectoryMonitor : Object { // finish the async operation to get the result try { info = source_file.query_info_async.end(aresult); + if (get_file_info_id(info) == null) { + info.set_attribute_string(FileAttribute.ID_FILE, + file.get_uri()); + } } catch (Error err) { this.err = err; } @@ -267,8 +271,10 @@ public class DirectoryMonitor : Object { return null; string? id = info.get_attribute_string(FileAttribute.ID_FILE); - if (id == null) - return null; + if (id == null) { + info.set_attribute_string(FileAttribute.ID_FILE, + file.get_uri()); + } File? normalized = id_map.get(id); if (normalized == null) @@ -874,14 +880,10 @@ public class DirectoryMonitor : Object { } // File ID is required for directory monitoring. No ID, no ride! - // TODO: Replace the warning with notify_discovery_failed() and provide a user-visible - // string. + // So we just fake it by using the URI if (get_file_info_id(local_dir_info) == null) { - warning("Unable to retrieve file ID on %s: skipping", dir.get_path()); - - explore_directory_completed(in_discovery); - - return; + local_dir_info.set_attribute_string(FileAttribute.ID_FILE, + dir.get_uri()); } // verify this is a directory @@ -911,6 +913,10 @@ public class DirectoryMonitor : Object { break; foreach (FileInfo info in infos) { + if (get_file_info_id(info) == null) { + info.set_attribute_string(FileAttribute.ID_FILE, + dir.get_uri()); + } // we don't deal with hidden files or directories if (info.get_is_hidden()) { warning("Skipping hidden file/directory %s", diff --git a/src/data_imports/DataImportsPluginHost.c b/src/data_imports/DataImportsPluginHost.c index 3203518..6fea799 100644 --- a/src/data_imports/DataImportsPluginHost.c +++ b/src/data_imports/DataImportsPluginHost.c @@ -624,9 +624,9 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled); gchar* plugins_get_pluggable_module_id (SpitPluggable* needle); static void _vala_array_add69 (SpitDataImportsService*** array, int* length, int* size, SpitDataImportsService* value); -static gint __lambda21_ (void* a, void* b); +static gint __lambda22_ (void* a, void* b); gint utf8_cs_compare (void* a, void* b); -static gint ___lambda21____compar_fn_t (void* key1, void* key2); +static gint ___lambda22____compar_fn_t (void* key1, void* key2); GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; @@ -3060,7 +3060,7 @@ static void _vala_array_add69 (SpitDataImportsService*** array, int* length, int } -static gint __lambda21_ (void* a, void* b) { +static gint __lambda22_ (void* a, void* b) { gint result = 0; void* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; @@ -3085,9 +3085,9 @@ static gint __lambda21_ (void* a, void* b) { } -static gint ___lambda21____compar_fn_t (void* key1, void* key2) { +static gint ___lambda22____compar_fn_t (void* key1, void* key2) { gint result; - result = __lambda21_ (key1, key2); + result = __lambda22_ (key1, key2); #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return result; #line 3086 "DataImportsPluginHost.c" @@ -3259,7 +3259,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp27__length1 = loaded_services_length1; #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - qsort (_tmp26_, (gsize) _tmp27__length1, (gsize) sizeof (SpitDataImportsService*), ___lambda21____compar_fn_t); + qsort (_tmp26_, (gsize) _tmp27__length1, (gsize) sizeof (SpitDataImportsService*), ___lambda22____compar_fn_t); #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp28_ = loaded_services; #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" diff --git a/src/data_imports/DataImportsUI.c b/src/data_imports/DataImportsUI.c index 5a1c46a..c5428ba 100644 --- a/src/data_imports/DataImportsUI.c +++ b/src/data_imports/DataImportsUI.c @@ -54,8 +54,8 @@ typedef struct _DataImportsUILibrarySelectionPane DataImportsUILibrarySelectionP typedef struct _DataImportsUILibrarySelectionPaneClass DataImportsUILibrarySelectionPaneClass; typedef struct _DataImportsUILibrarySelectionPanePrivate DataImportsUILibrarySelectionPanePrivate; #define _g_free0(var) (var = (g_free (var), NULL)) -typedef struct _Block10Data Block10Data; typedef struct _Block11Data Block11Data; +typedef struct _Block12Data Block12Data; #define DATA_IMPORTS_UI_TYPE_PROGRESS_PANE (data_imports_ui_progress_pane_get_type ()) #define DATA_IMPORTS_UI_PROGRESS_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_UI_TYPE_PROGRESS_PANE, DataImportsUIProgressPane)) @@ -162,13 +162,13 @@ struct _DataImportsUILibrarySelectionPanePrivate { GtkRadioButton* file_radio; }; -struct _Block10Data { +struct _Block11Data { int _ref_count_; DataImportsUILibrarySelectionPane* self; GtkFileChooserButton* file_chooser; }; -struct _Block11Data { +struct _Block12Data { int _ref_count_; DataImportsUILibrarySelectionPane* self; GtkRadioButton* button; @@ -251,18 +251,18 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_new (S DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_construct (GType object_type, SpitDataImportsPluginHost* host, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label); static void data_imports_ui_library_selection_pane_on_file_selected (DataImportsUILibrarySelectionPane* self, GFile* file); static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_button (DataImportsUILibrarySelectionPane* self, GtkBox* box, GtkRadioButton* group, SpitDataImportsImportableLibrary* library, const gchar* label, gint margin_left, gint margin_right); -static Block10Data* block10_data_ref (Block10Data* _data10_); -static void block10_data_unref (void * _userdata_); -static void ___lambda19_ (Block10Data* _data10_); -static void data_imports_ui_library_selection_pane_set_import_button_sensitivity (DataImportsUILibrarySelectionPane* self); -static void ____lambda19__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self); -static void __lambda20_ (DataImportsUILibrarySelectionPane* self); -static void data_imports_ui_library_selection_pane_on_library_selected (DataImportsUILibrarySelectionPane* self, SpitDataImportsImportableLibrary* library); -static void ___lambda20__gtk_button_clicked (GtkButton* _sender, gpointer self); static Block11Data* block11_data_ref (Block11Data* _data11_); static void block11_data_unref (void * _userdata_); -static void __lambda18_ (Block11Data* _data11_); -static void ___lambda18__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self); +static void ___lambda20_ (Block11Data* _data11_); +static void data_imports_ui_library_selection_pane_set_import_button_sensitivity (DataImportsUILibrarySelectionPane* self); +static void ____lambda20__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self); +static void __lambda21_ (DataImportsUILibrarySelectionPane* self); +static void data_imports_ui_library_selection_pane_on_library_selected (DataImportsUILibrarySelectionPane* self, SpitDataImportsImportableLibrary* library); +static void ___lambda21__gtk_button_clicked (GtkButton* _sender, gpointer self); +static Block12Data* block12_data_ref (Block12Data* _data12_); +static void block12_data_unref (void * _userdata_); +static void __lambda19_ (Block12Data* _data12_); +static void ___lambda19__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self); static void data_imports_ui_library_selection_pane_finalize (GObject* obj); GType data_imports_ui_progress_pane_get_type (void) G_GNUC_CONST; #define DATA_IMPORTS_UI_PROGRESS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_UI_TYPE_PROGRESS_PANE, DataImportsUIProgressPanePrivate)) @@ -596,44 +596,44 @@ GType data_imports_ui_static_message_pane_get_type (void) { } -static Block10Data* block10_data_ref (Block10Data* _data10_) { +static Block11Data* block11_data_ref (Block11Data* _data11_) { #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_atomic_int_inc (&_data10_->_ref_count_); + g_atomic_int_inc (&_data11_->_ref_count_); #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - return _data10_; + return _data11_; #line 601 "DataImportsUI.c" } -static void block10_data_unref (void * _userdata_) { - Block10Data* _data10_; - _data10_ = (Block10Data*) _userdata_; +static void block11_data_unref (void * _userdata_) { + Block11Data* _data11_; + _data11_ = (Block11Data*) _userdata_; #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (g_atomic_int_dec_and_test (&_data10_->_ref_count_)) { + if (g_atomic_int_dec_and_test (&_data11_->_ref_count_)) { #line 610 "DataImportsUI.c" DataImportsUILibrarySelectionPane* self; #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - self = _data10_->self; + self = _data11_->self; #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _g_object_unref0 (_data10_->file_chooser); + _g_object_unref0 (_data11_->file_chooser); #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (self); #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_slice_free (Block10Data, _data10_); + g_slice_free (Block11Data, _data11_); #line 620 "DataImportsUI.c" } } -static void ___lambda19_ (Block10Data* _data10_) { +static void ___lambda20_ (Block11Data* _data11_) { DataImportsUILibrarySelectionPane* self; GtkFileChooserButton* _tmp0_ = NULL; GFile* _tmp1_ = NULL; GtkRadioButton* _tmp2_ = NULL; #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - self = _data10_->self; + self = _data11_->self; #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp0_ = _data10_->file_chooser; + _tmp0_ = _data11_->file_chooser; #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp1_ = gtk_file_chooser_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -658,14 +658,14 @@ static void ___lambda19_ (Block10Data* _data10_) { } -static void ____lambda19__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self) { +static void ____lambda20__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self) { #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - ___lambda19_ (self); + ___lambda20_ (self); #line 661 "DataImportsUI.c" } -static void __lambda20_ (DataImportsUILibrarySelectionPane* self) { +static void __lambda21_ (DataImportsUILibrarySelectionPane* self) { SpitDataImportsImportableLibrary* _tmp0_ = NULL; #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = self->priv->selected_library; @@ -701,9 +701,9 @@ static void __lambda20_ (DataImportsUILibrarySelectionPane* self) { } -static void ___lambda20__gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void ___lambda21__gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - __lambda20_ ((DataImportsUILibrarySelectionPane*) self); + __lambda21_ ((DataImportsUILibrarySelectionPane*) self); #line 703 "DataImportsUI.c" } @@ -954,7 +954,7 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" if (_tmp37_ != NULL) { #line 952 "DataImportsUI.c" - Block10Data* _data10_; + Block11Data* _data11_; const gchar* _tmp38_ = NULL; GtkFileChooserButton* _tmp39_ = NULL; GtkFileChooserButton* _tmp40_ = NULL; @@ -965,11 +965,11 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr GtkBox* _tmp45_ = NULL; GtkFileChooserButton* _tmp46_ = NULL; #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _data10_ = g_slice_new0 (Block10Data); + _data11_ = g_slice_new0 (Block11Data); #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _data10_->_ref_count_ = 1; + _data11_->_ref_count_ = 1; #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _data10_->self = g_object_ref (self); + _data11_->self = g_object_ref (self); #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp38_ = _ ("Database file:"); #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -977,19 +977,19 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_object_ref_sink (_tmp39_); #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _data10_->file_chooser = _tmp39_; + _data11_->file_chooser = _tmp39_; #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp40_ = _data10_->file_chooser; + _tmp40_ = _data11_->file_chooser; #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "selection-changed", (GCallback) ____lambda19__gtk_file_chooser_selection_changed, block10_data_ref (_data10_), (GClosureNotify) block10_data_unref, 0); + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "selection-changed", (GCallback) ____lambda20__gtk_file_chooser_selection_changed, block11_data_ref (_data11_), (GClosureNotify) block11_data_unref, 0); #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp41_ = _data10_->file_chooser; + _tmp41_ = _data11_->file_chooser; #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp42_ = chooser_margin_left; #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), _tmp42_); #line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp43_ = _data10_->file_chooser; + _tmp43_ = _data11_->file_chooser; #line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp44_ = chooser_margin_right; #line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -997,13 +997,13 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp45_ = content_box; #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp46_ = _data10_->file_chooser; + _tmp46_ = _data11_->file_chooser; #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_box_pack_start (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6); #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - block10_data_unref (_data10_); + block11_data_unref (_data11_); #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _data10_ = NULL; + _data11_ = NULL; #line 1003 "DataImportsUI.c" } #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -1019,7 +1019,7 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr #line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp49_ = self->priv->import_button; #line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_signal_connect_object (_tmp49_, "clicked", (GCallback) ___lambda20__gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp49_, "clicked", (GCallback) ___lambda21__gtk_button_clicked, self, 0); #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp50_ = (GtkButtonBox*) gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -1077,46 +1077,46 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_new (S } -static Block11Data* block11_data_ref (Block11Data* _data11_) { +static Block12Data* block12_data_ref (Block12Data* _data12_) { #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_atomic_int_inc (&_data11_->_ref_count_); + g_atomic_int_inc (&_data12_->_ref_count_); #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - return _data11_; + return _data12_; #line 1081 "DataImportsUI.c" } -static void block11_data_unref (void * _userdata_) { - Block11Data* _data11_; - _data11_ = (Block11Data*) _userdata_; +static void block12_data_unref (void * _userdata_) { + Block12Data* _data12_; + _data12_ = (Block12Data*) _userdata_; #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (g_atomic_int_dec_and_test (&_data11_->_ref_count_)) { + if (g_atomic_int_dec_and_test (&_data12_->_ref_count_)) { #line 1090 "DataImportsUI.c" DataImportsUILibrarySelectionPane* self; #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - self = _data11_->self; + self = _data12_->self; #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _g_object_unref0 (_data11_->button); + _g_object_unref0 (_data12_->button); #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _g_object_unref0 (_data11_->library); + _g_object_unref0 (_data12_->library); #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (self); #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_slice_free (Block11Data, _data11_); + g_slice_free (Block12Data, _data12_); #line 1102 "DataImportsUI.c" } } -static void __lambda18_ (Block11Data* _data11_) { +static void __lambda19_ (Block12Data* _data12_) { DataImportsUILibrarySelectionPane* self; GtkRadioButton* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - self = _data11_->self; + self = _data12_->self; #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp0_ = _data11_->button; + _tmp0_ = _data12_->button; #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -1127,7 +1127,7 @@ static void __lambda18_ (Block11Data* _data11_) { SpitDataImportsImportableLibrary* _tmp3_ = NULL; SpitDataImportsImportableLibrary* _tmp4_ = NULL; #line 142 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp3_ = _data11_->library; + _tmp3_ = _data12_->library; #line 142 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp4_ = _g_object_ref0 (_tmp3_); #line 142 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -1141,16 +1141,16 @@ static void __lambda18_ (Block11Data* _data11_) { } -static void ___lambda18__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) { +static void ___lambda19__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) { #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - __lambda18_ (self); + __lambda19_ (self); #line 1143 "DataImportsUI.c" } static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_button (DataImportsUILibrarySelectionPane* self, GtkBox* box, GtkRadioButton* group, SpitDataImportsImportableLibrary* library, const gchar* label, gint margin_left, gint margin_right) { GtkRadioButton* result = NULL; - Block11Data* _data11_; + Block12Data* _data12_; SpitDataImportsImportableLibrary* _tmp0_ = NULL; SpitDataImportsImportableLibrary* _tmp1_ = NULL; GtkRadioButton* _tmp2_ = NULL; @@ -1177,19 +1177,19 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_val_if_fail (label != NULL, NULL); #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _data11_ = g_slice_new0 (Block11Data); + _data12_ = g_slice_new0 (Block12Data); #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _data11_->_ref_count_ = 1; + _data12_->_ref_count_ = 1; #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _data11_->self = g_object_ref (self); + _data12_->self = g_object_ref (self); #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = library; #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp1_ = _g_object_ref0 (_tmp0_); #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _g_object_unref0 (_data11_->library); + _g_object_unref0 (_data12_->library); #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _data11_->library = _tmp1_; + _data12_->library = _tmp1_; #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp2_ = group; #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -1199,7 +1199,7 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_object_ref_sink (_tmp4_); #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _data11_->button = _tmp4_; + _data12_->button = _tmp4_; #line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp5_ = group; #line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -1209,11 +1209,11 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto SpitDataImportsImportableLibrary* _tmp7_ = NULL; SpitDataImportsImportableLibrary* _tmp8_ = NULL; #line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp6_ = _data11_->button; + _tmp6_ = _data12_->button; #line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); #line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp7_ = _data11_->library; + _tmp7_ = _data12_->library; #line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp8_ = _g_object_ref0 (_tmp7_); #line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -1223,17 +1223,17 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto #line 1219 "DataImportsUI.c" } #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp9_ = _data11_->button; + _tmp9_ = _data12_->button; #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) ___lambda18__gtk_toggle_button_toggled, block11_data_ref (_data11_), (GClosureNotify) block11_data_unref, 0); + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) ___lambda19__gtk_toggle_button_toggled, block12_data_ref (_data12_), (GClosureNotify) block12_data_unref, 0); #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp10_ = _data11_->button; + _tmp10_ = _data12_->button; #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp11_ = margin_left; #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), _tmp11_); #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp12_ = _data11_->button; + _tmp12_ = _data12_->button; #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp13_ = margin_right; #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -1241,19 +1241,19 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto #line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp14_ = box; #line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp15_ = _data11_->button; + _tmp15_ = _data12_->button; #line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6); #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp16_ = _data11_->button; + _tmp16_ = _data12_->button; #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp17_ = _g_object_ref0 (_tmp16_); #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" result = _tmp17_; #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - block11_data_unref (_data11_); + block12_data_unref (_data12_); #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _data11_ = NULL; + _data12_ = NULL; #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return result; #line 1255 "DataImportsUI.c" @@ -1582,7 +1582,7 @@ static void _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_bo static void _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 306 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_on_close_cancel_clicked ((DataImportsUIDataImportsDialog*) self); #line 1583 "DataImportsUI.c" } @@ -1613,9 +1613,9 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G GtkBox* _tmp68_ = NULL; GtkBox* _tmp69_ = NULL; gboolean _tmp70_ = FALSE; - GtkButton* _tmp80_ = NULL; - SpitDataImportsService** _tmp81_ = NULL; - gint _tmp81__length1 = 0; + GtkButton* _tmp81_ = NULL; + SpitDataImportsService** _tmp82_ = NULL; + gint _tmp82__length1 = 0; #line 211 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" use_header = FALSE; #line 212 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -2023,8 +2023,7 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G GtkButton* _tmp72_ = NULL; GtkWidget* _tmp73_ = NULL; GtkButton* _tmp74_ = NULL; - GtkWidget* _tmp75_ = NULL; - GtkComboBoxText* _tmp76_ = NULL; + GtkComboBoxText* _tmp75_ = NULL; #line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp71_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel"); #line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -2044,61 +2043,69 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G #line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget)); #line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp75_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); -#line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp76_ = self->priv->service_selector_box; + _tmp75_ = self->priv->service_selector_box; #line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_widget_get_type (), GtkWidget)); -#line 2048 "DataImportsUI.c" + if (_tmp75_ != NULL) { +#line 2045 "DataImportsUI.c" + GtkWidget* _tmp76_ = NULL; + GtkComboBoxText* _tmp77_ = NULL; +#line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + _tmp76_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); +#line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + _tmp77_ = self->priv->service_selector_box; +#line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget)); +#line 2054 "DataImportsUI.c" + } } else { - const gchar* _tmp77_ = NULL; - GtkWidget* _tmp78_ = NULL; - GtkButton* _tmp79_ = NULL; -#line 301 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp77_ = _ ("_Cancel"); -#line 301 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _tmp77_, (gint) GTK_RESPONSE_CANCEL); -#line 302 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp78_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL); -#line 302 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp79_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp78_, gtk_button_get_type ()) ? ((GtkButton*) _tmp78_) : NULL); -#line 302 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _g_object_unref0 (self->priv->close_cancel_button); -#line 302 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - self->priv->close_cancel_button = _tmp79_; -#line 2065 "DataImportsUI.c" - } + const gchar* _tmp78_ = NULL; + GtkWidget* _tmp79_ = NULL; + GtkButton* _tmp80_ = NULL; +#line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + _tmp78_ = _ ("_Cancel"); +#line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _tmp78_, (gint) GTK_RESPONSE_CANCEL); +#line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + _tmp79_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL); #line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp80_ = self->priv->close_cancel_button; + _tmp80_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp79_, gtk_button_get_type ()) ? ((GtkButton*) _tmp79_) : NULL); #line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_signal_connect_object (_tmp80_, "clicked", (GCallback) _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0); + _g_object_unref0 (self->priv->close_cancel_button); +#line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + self->priv->close_cancel_button = _tmp80_; +#line 2072 "DataImportsUI.c" + } #line 306 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - data_imports_ui_data_imports_dialog_set_standard_window_mode (self); -#line 308 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp81_ = loaded_services; -#line 308 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp81__length1 = loaded_services_length1; + _tmp81_ = self->priv->close_cancel_button; +#line 306 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + g_signal_connect_object (_tmp81_, "clicked", (GCallback) _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0); #line 308 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (_tmp81__length1 > 0) { + data_imports_ui_data_imports_dialog_set_standard_window_mode (self); +#line 310 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + _tmp82_ = loaded_services; #line 310 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + _tmp82__length1 = loaded_services_length1; +#line 310 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + if (_tmp82__length1 > 0) { +#line 312 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_on_service_changed (self); -#line 2081 "DataImportsUI.c" +#line 2088 "DataImportsUI.c" } else { - DataImportsUIStaticMessagePane* _tmp82_ = NULL; DataImportsUIStaticMessagePane* _tmp83_ = NULL; -#line 313 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp82_ = data_imports_ui_static_message_pane_new_with_pango (DATA_IMPORTS_UI_NO_PLUGINS_ENABLED_MESSAGE); -#line 313 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp83_ = _tmp82_; -#line 313 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - data_imports_ui_data_imports_dialog_install_pane (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); -#line 313 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _g_object_unref0 (_tmp83_); -#line 314 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + DataImportsUIStaticMessagePane* _tmp84_ = NULL; +#line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + _tmp83_ = data_imports_ui_static_message_pane_new_with_pango (DATA_IMPORTS_UI_NO_PLUGINS_ENABLED_MESSAGE); +#line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + _tmp84_ = _tmp83_; +#line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + data_imports_ui_data_imports_dialog_install_pane (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); +#line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + _g_object_unref0 (_tmp84_); +#line 316 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_set_close_button_mode (self); -#line 2095 "DataImportsUI.c" +#line 2102 "DataImportsUI.c" } -#line 317 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 319 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" loaded_services = (_vala_array_free (loaded_services, loaded_services_length1, (GDestroyNotify) g_object_unref), NULL); @@ -2108,14 +2115,14 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G _g_free0 (title); #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return self; -#line 2107 "DataImportsUI.c" +#line 2114 "DataImportsUI.c" } DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_new (void) { #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return data_imports_ui_data_imports_dialog_construct (DATA_IMPORTS_UI_TYPE_DATA_IMPORTS_DIALOG); -#line 2114 "DataImportsUI.c" +#line 2121 "DataImportsUI.c" } @@ -2124,72 +2131,72 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_creat DataImportsUIDataImportsDialog* _tmp0_ = NULL; DataImportsUIDataImportsDialog* _tmp2_ = NULL; DataImportsUIDataImportsDialog* _tmp3_ = NULL; -#line 321 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = data_imports_ui_data_imports_dialog_instance; -#line 321 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" if (_tmp0_ == NULL) { -#line 2127 "DataImportsUI.c" +#line 2134 "DataImportsUI.c" DataImportsUIDataImportsDialog* _tmp1_ = NULL; -#line 322 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp1_ = data_imports_ui_data_imports_dialog_new (); -#line 322 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_object_ref_sink (_tmp1_); -#line 322 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (data_imports_ui_data_imports_dialog_instance); -#line 322 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_instance = _tmp1_; -#line 2137 "DataImportsUI.c" +#line 2144 "DataImportsUI.c" } -#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 326 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp2_ = data_imports_ui_data_imports_dialog_instance; -#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 326 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp3_ = _g_object_ref0 (_tmp2_); -#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 326 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" result = _tmp3_; -#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 326 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return result; -#line 2147 "DataImportsUI.c" +#line 2154 "DataImportsUI.c" } void data_imports_ui_data_imports_dialog_terminate_instance (void) { DataImportsUIDataImportsDialog* _tmp0_ = NULL; -#line 328 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 330 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = data_imports_ui_data_imports_dialog_instance; -#line 328 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 330 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" if (_tmp0_ != NULL) { -#line 2157 "DataImportsUI.c" +#line 2164 "DataImportsUI.c" DataImportsUIDataImportsDialog* _tmp1_ = NULL; -#line 329 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 331 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp1_ = data_imports_ui_data_imports_dialog_instance; -#line 329 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 331 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_terminate (_tmp1_); -#line 2163 "DataImportsUI.c" +#line 2170 "DataImportsUI.c" } -#line 331 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 333 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (data_imports_ui_data_imports_dialog_instance); -#line 331 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 333 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_instance = NULL; -#line 2169 "DataImportsUI.c" +#line 2176 "DataImportsUI.c" } static gboolean data_imports_ui_data_imports_dialog_on_window_close (DataImportsUIDataImportsDialog* self, GdkEventAny* evt) { gboolean result = FALSE; -#line 334 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 336 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_val_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self), FALSE); -#line 334 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 336 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_val_if_fail (evt != NULL, FALSE); -#line 335 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_debug ("DataImportsUI.vala:335: DataImportsDialog: on_window_close( ): invoked" \ +#line 337 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + g_debug ("DataImportsUI.vala:337: DataImportsDialog: on_window_close( ): invoked" \ "."); -#line 336 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - data_imports_ui_data_imports_dialog_terminate (self); #line 338 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + data_imports_ui_data_imports_dialog_terminate (self); +#line 340 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" result = TRUE; -#line 338 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 340 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return result; -#line 2187 "DataImportsUI.c" +#line 2194 "DataImportsUI.c" } @@ -2213,232 +2220,232 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU SpitDataImportsService* _tmp16_ = NULL; SpitDataImportsConcreteDataImportsHost* _tmp17_ = NULL; SpitDataImportsConcreteDataImportsHost* _tmp18_ = NULL; -#line 341 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); -#line 342 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_debug ("DataImportsUI.vala:342: DataImportsDialog: on_service_changed invoked."); #line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); +#line 344 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + g_debug ("DataImportsUI.vala:344: DataImportsDialog: on_service_changed invoked."); +#line 345 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = self->priv->service_selector_box; -#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 345 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp1_ = gtk_combo_box_text_get_active_text (_tmp0_); -#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - service_name = _tmp1_; #line 345 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + service_name = _tmp1_; +#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" selected_service = NULL; -#line 346 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp3_ = spit_data_imports_load_all_services (&_tmp2_); -#line 346 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" services = _tmp3_; -#line 346 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" services_length1 = _tmp2_; -#line 346 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _services_size_ = services_length1; -#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp4_ = services; -#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp4__length1 = services_length1; -#line 2235 "DataImportsUI.c" +#line 2242 "DataImportsUI.c" { SpitDataImportsService** service_collection = NULL; gint service_collection_length1 = 0; gint _service_collection_size_ = 0; gint service_it = 0; -#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" service_collection = _tmp4_; -#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" service_collection_length1 = _tmp4__length1; -#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" for (service_it = 0; service_it < _tmp4__length1; service_it = service_it + 1) { -#line 2247 "DataImportsUI.c" +#line 2254 "DataImportsUI.c" SpitDataImportsService* _tmp5_ = NULL; SpitDataImportsService* service = NULL; -#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp5_ = _g_object_ref0 (service_collection[service_it]); -#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" service = _tmp5_; -#line 2254 "DataImportsUI.c" +#line 2261 "DataImportsUI.c" { SpitDataImportsService* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; const gchar* _tmp8_ = NULL; -#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp6_ = service; -#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp7_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); -#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp8_ = service_name; -#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" if (g_strcmp0 (_tmp7_, _tmp8_) == 0) { -#line 2267 "DataImportsUI.c" +#line 2274 "DataImportsUI.c" SpitDataImportsService* _tmp9_ = NULL; SpitDataImportsService* _tmp10_ = NULL; -#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp9_ = service; -#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp10_ = _g_object_ref0 (_tmp9_); -#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (selected_service); -#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" selected_service = _tmp10_; -#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 352 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (service); -#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 352 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" break; -#line 2282 "DataImportsUI.c" +#line 2289 "DataImportsUI.c" } -#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (service); -#line 2286 "DataImportsUI.c" +#line 2293 "DataImportsUI.c" } } } -#line 353 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp11_ = selected_service; -#line 353 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _vala_assert (_tmp11_ != NULL, "selected_service != null"); #line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + _vala_assert (_tmp11_ != NULL, "selected_service != null"); +#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp12_ = config_facade_get_instance (); -#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp13_ = _tmp12_; -#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp14_ = selected_service; -#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp15_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); -#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" configuration_facade_set_last_used_dataimports_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp15_); -#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _g_object_unref0 (_tmp13_); #line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + _g_object_unref0 (_tmp13_); +#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp16_ = selected_service; -#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp17_ = spit_data_imports_concrete_data_imports_host_new (_tmp16_, self); -#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (self->priv->host); -#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" self->priv->host = _tmp17_; -#line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 360 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp18_ = self->priv->host; -#line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 360 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" spit_data_imports_plugin_host_start_importing (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); -#line 341 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" services = (_vala_array_free (services, services_length1, (GDestroyNotify) g_object_unref), NULL); -#line 341 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (selected_service); -#line 341 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_free0 (service_name); -#line 2324 "DataImportsUI.c" +#line 2331 "DataImportsUI.c" } static void data_imports_ui_data_imports_dialog_on_close_cancel_clicked (DataImportsUIDataImportsDialog* self) { -#line 361 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 363 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); -#line 362 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_debug ("DataImportsUI.vala:362: DataImportsDialog: on_close_cancel_clicked( ):" \ -" invoked."); #line 364 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + g_debug ("DataImportsUI.vala:364: DataImportsDialog: on_close_cancel_clicked( ):" \ +" invoked."); +#line 366 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_terminate (self); -#line 2335 "DataImportsUI.c" +#line 2342 "DataImportsUI.c" } static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImportsDialog* self) { SpitDataImportsConcreteDataImportsHost* _tmp0_ = NULL; -#line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 369 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); -#line 368 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_debug ("DataImportsUI.vala:368: DataImportsDialog: terminate( ): invoked."); #line 370 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + g_debug ("DataImportsUI.vala:370: DataImportsDialog: terminate( ): invoked."); +#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = self->priv->host; -#line 370 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" if (_tmp0_ != NULL) { -#line 2349 "DataImportsUI.c" +#line 2356 "DataImportsUI.c" SpitDataImportsConcreteDataImportsHost* _tmp1_ = NULL; -#line 371 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 373 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp1_ = self->priv->host; -#line 371 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 373 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" spit_data_imports_plugin_host_stop_importing (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); -#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 374 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (self->priv->host); -#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 374 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" self->priv->host = NULL; -#line 2359 "DataImportsUI.c" +#line 2366 "DataImportsUI.c" } -#line 375 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 376 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 379 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (data_imports_ui_data_imports_dialog_instance); -#line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 379 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_instance = NULL; -#line 2369 "DataImportsUI.c" +#line 2376 "DataImportsUI.c" } static void data_imports_ui_data_imports_dialog_set_large_window_mode (DataImportsUIDataImportsDialog* self) { GtkBox* _tmp0_ = NULL; -#line 380 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); -#line 381 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 383 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_HEIGHT); -#line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 384 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = self->priv->central_area_layouter; -#line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT); #line 384 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT); +#line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); -#line 2385 "DataImportsUI.c" +#line 2392 "DataImportsUI.c" } static void data_imports_ui_data_imports_dialog_set_colossal_window_mode (DataImportsUIDataImportsDialog* self) { GtkBox* _tmp0_ = NULL; -#line 387 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 389 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); -#line 388 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 390 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_HEIGHT); -#line 389 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 391 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = self->priv->central_area_layouter; -#line 389 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT); #line 391 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT); +#line 393 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); -#line 2401 "DataImportsUI.c" +#line 2408 "DataImportsUI.c" } static void data_imports_ui_data_imports_dialog_set_standard_window_mode (DataImportsUIDataImportsDialog* self) { GtkBox* _tmp0_ = NULL; -#line 394 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); -#line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 397 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_HEIGHT); -#line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 398 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = self->priv->central_area_layouter; -#line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT); #line 398 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT); +#line 400 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); -#line 2417 "DataImportsUI.c" +#line 2424 "DataImportsUI.c" } static void data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (DataImportsUIDataImportsDialog* self) { -#line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 403 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); -#line 402 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 404 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE); -#line 2426 "DataImportsUI.c" +#line 2433 "DataImportsUI.c" } static void data_imports_ui_data_imports_dialog_clear_free_sizable_window_mode (DataImportsUIDataImportsDialog* self) { -#line 405 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 407 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); -#line 406 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 408 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); -#line 2435 "DataImportsUI.c" +#line 2442 "DataImportsUI.c" } @@ -2446,17 +2453,17 @@ SpitDataImportsDialogPane* data_imports_ui_data_imports_dialog_get_active_pane ( SpitDataImportsDialogPane* result = NULL; SpitDataImportsDialogPane* _tmp0_ = NULL; SpitDataImportsDialogPane* _tmp1_ = NULL; -#line 409 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_val_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self), NULL); -#line 410 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = self->priv->active_pane; -#line 410 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 410 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" result = _tmp1_; -#line 410 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return result; -#line 2453 "DataImportsUI.c" +#line 2460 "DataImportsUI.c" } @@ -2464,58 +2471,58 @@ void data_imports_ui_data_imports_dialog_set_close_button_mode (DataImportsUIDat GtkButton* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; GtkButton* _tmp2_ = NULL; -#line 413 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 415 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); -#line 414 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 416 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = self->priv->close_cancel_button; -#line 414 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 416 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp1_ = _ ("_Close"); -#line 414 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 416 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_button_set_label (_tmp0_, _tmp1_); -#line 415 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 417 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp2_ = self->priv->close_cancel_button; -#line 415 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 417 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); -#line 2473 "DataImportsUI.c" +#line 2480 "DataImportsUI.c" } void data_imports_ui_data_imports_dialog_set_cancel_button_mode (DataImportsUIDataImportsDialog* self) { GtkButton* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 420 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); -#line 419 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 421 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = self->priv->close_cancel_button; -#line 419 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 421 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp1_ = _ ("_Cancel"); -#line 419 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 421 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_button_set_label (_tmp0_, _tmp1_); -#line 2488 "DataImportsUI.c" +#line 2495 "DataImportsUI.c" } void data_imports_ui_data_imports_dialog_lock_service (DataImportsUIDataImportsDialog* self) { GtkComboBoxText* _tmp0_ = NULL; -#line 422 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 424 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); -#line 423 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 425 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = self->priv->service_selector_box; -#line 423 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 425 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 2500 "DataImportsUI.c" +#line 2507 "DataImportsUI.c" } void data_imports_ui_data_imports_dialog_unlock_service (DataImportsUIDataImportsDialog* self) { GtkComboBoxText* _tmp0_ = NULL; -#line 426 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 428 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); -#line 427 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = self->priv->service_selector_box; -#line 427 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 2512 "DataImportsUI.c" +#line 2519 "DataImportsUI.c" } @@ -2533,110 +2540,110 @@ void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsD SpitDataImportsDialogPane* _tmp15_ = NULL; SpitDataImportsDialogPane* _tmp16_ = NULL; SpitDataImportsDialogPane* _tmp17_ = NULL; -#line 430 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 432 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); -#line 430 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 432 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (pane)); -#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_debug ("DataImportsUI.vala:431: DataImportsDialog: install_pane( ): invoked."); #line 433 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + g_debug ("DataImportsUI.vala:433: DataImportsDialog: install_pane( ): invoked."); +#line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = self->priv->active_pane; -#line 433 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" if (_tmp0_ != NULL) { -#line 2540 "DataImportsUI.c" +#line 2547 "DataImportsUI.c" SpitDataImportsDialogPane* _tmp1_ = NULL; GtkBox* _tmp2_ = NULL; SpitDataImportsDialogPane* _tmp3_ = NULL; GtkWidget* _tmp4_ = NULL; GtkWidget* _tmp5_ = NULL; -#line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_debug ("DataImportsUI.vala:434: DataImportsDialog: install_pane( ): a pane is " \ -"already installed; removing it."); #line 436 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + g_debug ("DataImportsUI.vala:436: DataImportsDialog: install_pane( ): a pane is " \ +"already installed; removing it."); +#line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp1_ = self->priv->active_pane; -#line 436 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" spit_data_imports_dialog_pane_on_pane_uninstalled (_tmp1_); -#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp2_ = self->priv->central_area_layouter; -#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp3_ = self->priv->active_pane; -#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp4_ = spit_data_imports_dialog_pane_get_widget (_tmp3_); -#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp5_ = _tmp4_; -#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), _tmp5_); -#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (_tmp5_); -#line 2564 "DataImportsUI.c" +#line 2571 "DataImportsUI.c" } -#line 440 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp6_ = self->priv->central_area_layouter; -#line 440 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp7_ = pane; -#line 440 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp8_ = spit_data_imports_dialog_pane_get_widget (_tmp7_); -#line 440 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp9_ = _tmp8_; -#line 440 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_box_pack_start (_tmp6_, _tmp9_, TRUE, TRUE, (guint) 0); -#line 440 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (_tmp9_); -#line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 443 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); +#line 445 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp10_ = pane; -#line 443 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 445 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp11_ = spit_data_imports_dialog_pane_get_preferred_geometry (_tmp10_); -#line 443 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - geometry_options = _tmp11_; #line 445 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" + geometry_options = _tmp11_; +#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp12_ = geometry_options; -#line 445 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" if ((_tmp12_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) { -#line 446 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 448 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_set_large_window_mode (self); -#line 2592 "DataImportsUI.c" +#line 2599 "DataImportsUI.c" } else { SpitDataImportsDialogPaneGeometryOptions _tmp13_ = 0; -#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 449 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp13_ = geometry_options; -#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 449 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" if ((_tmp13_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE) != 0) { -#line 448 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 450 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_set_colossal_window_mode (self); -#line 2601 "DataImportsUI.c" +#line 2608 "DataImportsUI.c" } else { -#line 450 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_set_standard_window_mode (self); -#line 2605 "DataImportsUI.c" +#line 2612 "DataImportsUI.c" } } -#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 454 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp14_ = geometry_options; -#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 454 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" if ((_tmp14_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) { -#line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 455 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (self); -#line 2614 "DataImportsUI.c" +#line 2621 "DataImportsUI.c" } else { -#line 455 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_clear_free_sizable_window_mode (self); -#line 2618 "DataImportsUI.c" +#line 2625 "DataImportsUI.c" } -#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp15_ = pane; -#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp16_ = _g_object_ref0 (_tmp15_); -#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (self->priv->active_pane); -#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" self->priv->active_pane = _tmp16_; -#line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 460 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp17_ = pane; -#line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" +#line 460 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" spit_data_imports_dialog_pane_on_pane_installed (_tmp17_); -#line 2632 "DataImportsUI.c" +#line 2639 "DataImportsUI.c" } @@ -2647,14 +2654,14 @@ static void data_imports_ui_data_imports_dialog_class_init (DataImportsUIDataImp g_type_class_add_private (klass, sizeof (DataImportsUIDataImportsDialogPrivate)); #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" G_OBJECT_CLASS (klass)->finalize = data_imports_ui_data_imports_dialog_finalize; -#line 2643 "DataImportsUI.c" +#line 2650 "DataImportsUI.c" } static void data_imports_ui_data_imports_dialog_instance_init (DataImportsUIDataImportsDialog * self) { #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" self->priv = DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_GET_PRIVATE (self); -#line 2650 "DataImportsUI.c" +#line 2657 "DataImportsUI.c" } @@ -2674,7 +2681,7 @@ static void data_imports_ui_data_imports_dialog_finalize (GObject* obj) { _g_object_unref0 (self->priv->host); #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" G_OBJECT_CLASS (data_imports_ui_data_imports_dialog_parent_class)->finalize (obj); -#line 2670 "DataImportsUI.c" +#line 2677 "DataImportsUI.c" } diff --git a/src/data_imports/DataImportsUI.vala b/src/data_imports/DataImportsUI.vala index 5b94dcb..2c0cd40 100644 --- a/src/data_imports/DataImportsUI.vala +++ b/src/data_imports/DataImportsUI.vala @@ -295,7 +295,9 @@ public class DataImportsDialog : Gtk.Dialog { close_cancel_button = new Gtk.Button.with_mnemonic("_Cancel"); close_cancel_button.set_can_default(true); ((Gtk.HeaderBar) get_header_bar()).pack_start(close_cancel_button); - ((Gtk.HeaderBar) get_header_bar()).pack_end(service_selector_box); + if (service_selector_box != null) { + ((Gtk.HeaderBar) get_header_bar()).pack_end(service_selector_box); + } } else { add_button (_("_Cancel"), Gtk.ResponseType.CANCEL); diff --git a/src/direct/DirectPhotoPage.c b/src/direct/DirectPhotoPage.c index 6f15462..08a3c07 100644 --- a/src/direct/DirectPhotoPage.c +++ b/src/direct/DirectPhotoPage.c @@ -359,7 +359,7 @@ typedef struct _AppWindowClass AppWindowClass; typedef struct _PrintManager PrintManager; typedef struct _PrintManagerClass PrintManagerClass; #define _print_manager_unref0(var) ((var == NULL) ? NULL : (var = (print_manager_unref (var), NULL))) -typedef struct _Block6Data Block6Data; +typedef struct _Block7Data Block7Data; #define TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE (direct_fullscreen_photo_page_get_type ()) #define DIRECT_FULLSCREEN_PHOTO_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE, DirectFullscreenPhotoPage)) @@ -577,7 +577,7 @@ struct _ExportFormatParameters { gboolean export_metadata; }; -struct _Block6Data { +struct _Block7Data { int _ref_count_; DirectPhotoPage* self; gboolean should_allow_rotation; @@ -844,11 +844,11 @@ GType print_manager_get_type (void) G_GNUC_CONST; PrintManager* print_manager_get_instance (void); void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print); GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t); -static Block6Data* block6_data_ref (Block6Data* _data6_); -static void block6_data_unref (void * _userdata_); -static gboolean __lambda15_ (Block6Data* _data6_); +static Block7Data* block7_data_ref (Block7Data* _data7_); +static void block7_data_unref (void * _userdata_); +static gboolean __lambda16_ (Block7Data* _data7_); void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_enable); -static gboolean ___lambda15__gsource_func (gpointer self); +static gboolean ___lambda16__gsource_func (gpointer self); static DataView* direct_photo_page_real_create_photo_view (EditingHostPage* base, DataSource* source); static void direct_photo_page_finalize (GObject* obj); GType direct_fullscreen_photo_page_get_type (void) G_GNUC_CONST; @@ -3679,41 +3679,41 @@ static void direct_photo_page_on_print (DirectPhotoPage* self) { } -static Block6Data* block6_data_ref (Block6Data* _data6_) { +static Block7Data* block7_data_ref (Block7Data* _data7_) { #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - g_atomic_int_inc (&_data6_->_ref_count_); + g_atomic_int_inc (&_data7_->_ref_count_); #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - return _data6_; + return _data7_; #line 3688 "DirectPhotoPage.c" } -static void block6_data_unref (void * _userdata_) { - Block6Data* _data6_; - _data6_ = (Block6Data*) _userdata_; +static void block7_data_unref (void * _userdata_) { + Block7Data* _data7_; + _data7_ = (Block7Data*) _userdata_; #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) { + if (g_atomic_int_dec_and_test (&_data7_->_ref_count_)) { #line 3697 "DirectPhotoPage.c" DirectPhotoPage* self; #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - self = _data6_->self; + self = _data7_->self; #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (self); #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - g_slice_free (Block6Data, _data6_); + g_slice_free (Block7Data, _data7_); #line 3705 "DirectPhotoPage.c" } } -static gboolean __lambda15_ (Block6Data* _data6_) { +static gboolean __lambda16_ (Block7Data* _data7_) { DirectPhotoPage* self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; #line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - self = _data6_->self; + self = _data7_->self; #line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp0_ = _data6_->should_allow_rotation; + _tmp0_ = _data7_->should_allow_rotation; #line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" editing_host_page_enable_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp0_); #line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -3724,9 +3724,9 @@ static gboolean __lambda15_ (Block6Data* _data6_) { } -static gboolean ___lambda15__gsource_func (gpointer self) { +static gboolean ___lambda16__gsource_func (gpointer self) { gboolean result; - result = __lambda15_ (self); + result = __lambda16_ (self); #line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; #line 3733 "DirectPhotoPage.c" @@ -3734,26 +3734,26 @@ static gboolean ___lambda15__gsource_func (gpointer self) { static void direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* self, gboolean should_allow_rotation) { - Block6Data* _data6_; + Block7Data* _data7_; gboolean _tmp0_ = FALSE; #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _data6_ = g_slice_new0 (Block6Data); + _data7_ = g_slice_new0 (Block7Data); #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _data6_->_ref_count_ = 1; + _data7_->_ref_count_ = 1; #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _data6_->self = g_object_ref (self); + _data7_->self = g_object_ref (self); #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = should_allow_rotation; #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _data6_->should_allow_rotation = _tmp0_; + _data7_->should_allow_rotation = _tmp0_; #line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda15__gsource_func, block6_data_ref (_data6_), block6_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda16__gsource_func, block7_data_ref (_data7_), block7_data_unref); #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - block6_data_unref (_data6_); + block7_data_unref (_data7_); #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _data6_ = NULL; + _data7_ = NULL; #line 3758 "DirectPhotoPage.c" } diff --git a/src/events/Branch.c b/src/events/Branch.c index 2320a00..c73d166 100644 --- a/src/events/Branch.c +++ b/src/events/Branch.c @@ -303,8 +303,8 @@ typedef struct _EventID EventID; typedef struct _SidebarRenameableEntry SidebarRenameableEntry; typedef struct _SidebarRenameableEntryIface SidebarRenameableEntryIface; #define _alteration_unref0(var) ((var == NULL) ? NULL : (var = (alteration_unref (var), NULL))) -typedef struct _Block7Data Block7Data; typedef struct _Block8Data Block8Data; +typedef struct _Block9Data Block9Data; #define SIDEBAR_TYPE_SELECTABLE_ENTRY (sidebar_selectable_entry_get_type ()) #define SIDEBAR_SELECTABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_SELECTABLE_ENTRY, SidebarSelectableEntry)) @@ -594,14 +594,14 @@ struct _SidebarRenameableEntryIface { gboolean (*is_user_renameable) (SidebarRenameableEntry* self); }; -struct _Block7Data { +struct _Block8Data { int _ref_count_; EventsBranch* self; gint event_month; }; typedef gboolean (*Locator) (gconstpointer item, void* user_data); -struct _Block8Data { +struct _Block9Data { int _ref_count_; EventsBranch* self; gint event_year; @@ -871,16 +871,16 @@ static void events_branch_reparent_event (EventsBranch* self, Event* event, Side SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entry); void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry); gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent); -static Block7Data* block7_data_ref (Block7Data* _data7_); -static void block7_data_unref (void * _userdata_); +static Block8Data* block8_data_ref (Block8Data* _data8_); +static void block8_data_unref (void * _userdata_); static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* event, struct tm* event_tm); SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry* parent, Locator locator, void* locator_target); -static gboolean __lambda17_ (Block7Data* _data7_, SidebarEntry* entry); +static gboolean __lambda18_ (Block8Data* _data8_, SidebarEntry* entry); +static gboolean ___lambda18__locator (gconstpointer item, gpointer self); +static Block9Data* block9_data_ref (Block9Data* _data9_); +static void block9_data_unref (void * _userdata_); +static gboolean __lambda17_ (Block9Data* _data9_, SidebarEntry* entry); static gboolean ___lambda17__locator (gconstpointer item, gpointer self); -static Block8Data* block8_data_ref (Block8Data* _data8_); -static void block8_data_unref (void * _userdata_); -static gboolean __lambda16_ (Block8Data* _data8_, SidebarEntry* entry); -static gboolean ___lambda16__locator (gconstpointer item, gpointer self); gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry); static gint _events_branch_undated_event_comparator_gcompare_func (gconstpointer a, gconstpointer b); EventsEventEntry* events_event_entry_new (Event* event); @@ -2646,41 +2646,41 @@ static void events_branch_remove_event (EventsBranch* self, Event* event) { } -static Block7Data* block7_data_ref (Block7Data* _data7_) { +static Block8Data* block8_data_ref (Block8Data* _data8_) { #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" - g_atomic_int_inc (&_data7_->_ref_count_); + g_atomic_int_inc (&_data8_->_ref_count_); #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" - return _data7_; + return _data8_; #line 2655 "Branch.c" } -static void block7_data_unref (void * _userdata_) { - Block7Data* _data7_; - _data7_ = (Block7Data*) _userdata_; +static void block8_data_unref (void * _userdata_) { + Block8Data* _data8_; + _data8_ = (Block8Data*) _userdata_; #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" - if (g_atomic_int_dec_and_test (&_data7_->_ref_count_)) { + if (g_atomic_int_dec_and_test (&_data8_->_ref_count_)) { #line 2664 "Branch.c" EventsBranch* self; #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" - self = _data7_->self; + self = _data8_->self; #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (self); #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" - g_slice_free (Block7Data, _data7_); + g_slice_free (Block8Data, _data8_); #line 2672 "Branch.c" } } -static gboolean __lambda17_ (Block7Data* _data7_, SidebarEntry* entry) { +static gboolean __lambda18_ (Block8Data* _data8_, SidebarEntry* entry) { EventsBranch* self; gboolean result = FALSE; SidebarEntry* _tmp0_ = NULL; gint _tmp1_ = 0; gint _tmp2_ = 0; #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" - self = _data7_->self; + self = _data8_->self; #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE); #line 308 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2688,7 +2688,7 @@ static gboolean __lambda17_ (Block7Data* _data7_, SidebarEntry* entry) { #line 308 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp1_ = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry)); #line 308 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp2_ = _data7_->event_month; + _tmp2_ = _data8_->event_month; #line 308 "/home/jens/Source/shotwell/src/events/Branch.vala" result = _tmp1_ == _tmp2_; #line 308 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2697,9 +2697,9 @@ static gboolean __lambda17_ (Block7Data* _data7_, SidebarEntry* entry) { } -static gboolean ___lambda17__locator (gconstpointer item, gpointer self) { +static gboolean ___lambda18__locator (gconstpointer item, gpointer self) { gboolean result; - result = __lambda17_ (self, (SidebarEntry*) item); + result = __lambda18_ (self, (SidebarEntry*) item); #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; #line 2706 "Branch.c" @@ -2709,7 +2709,7 @@ static gboolean ___lambda17__locator (gconstpointer item, gpointer self) { static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* event, struct tm* event_tm, SidebarEntry** found_year) { SidebarEntry* _vala_found_year = NULL; SidebarEntry* result = NULL; - Block7Data* _data7_; + Block8Data* _data8_; Event* _tmp0_ = NULL; struct tm _tmp1_ = {0}; SidebarEntry* _tmp2_ = NULL; @@ -2725,11 +2725,11 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (event_tm != NULL, NULL); #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data7_ = g_slice_new0 (Block7Data); + _data8_ = g_slice_new0 (Block8Data); #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data7_->_ref_count_ = 1; + _data8_->_ref_count_ = 1; #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data7_->self = g_object_ref (self); + _data8_->self = g_object_ref (self); #line 300 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp0_ = event; #line 300 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2747,9 +2747,9 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* #line 302 "/home/jens/Source/shotwell/src/events/Branch.vala" result = NULL; #line 302 "/home/jens/Source/shotwell/src/events/Branch.vala" - block7_data_unref (_data7_); + block8_data_unref (_data8_); #line 302 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data7_ = NULL; + _data8_ = NULL; #line 302 "/home/jens/Source/shotwell/src/events/Branch.vala" if (found_year) { #line 302 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2769,17 +2769,17 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* #line 304 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp5_ = _tmp4_.tm_mon; #line 304 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data7_->event_month = _tmp5_ + 1; + _data8_->event_month = _tmp5_ + 1; #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp6_ = _vala_found_year; #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp7_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp6_, ___lambda17__locator, _data7_); + _tmp7_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp6_, ___lambda18__locator, _data8_); #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" result = _tmp7_; #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" - block7_data_unref (_data7_); + block8_data_unref (_data8_); #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data7_ = NULL; + _data8_ = NULL; #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" if (found_year) { #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2796,41 +2796,41 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* } -static Block8Data* block8_data_ref (Block8Data* _data8_) { +static Block9Data* block9_data_ref (Block9Data* _data9_) { #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" - g_atomic_int_inc (&_data8_->_ref_count_); + g_atomic_int_inc (&_data9_->_ref_count_); #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" - return _data8_; + return _data9_; #line 2805 "Branch.c" } -static void block8_data_unref (void * _userdata_) { - Block8Data* _data8_; - _data8_ = (Block8Data*) _userdata_; +static void block9_data_unref (void * _userdata_) { + Block9Data* _data9_; + _data9_ = (Block9Data*) _userdata_; #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" - if (g_atomic_int_dec_and_test (&_data8_->_ref_count_)) { + if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) { #line 2814 "Branch.c" EventsBranch* self; #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" - self = _data8_->self; + self = _data9_->self; #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (self); #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" - g_slice_free (Block8Data, _data8_); + g_slice_free (Block9Data, _data9_); #line 2822 "Branch.c" } } -static gboolean __lambda16_ (Block8Data* _data8_, SidebarEntry* entry) { +static gboolean __lambda17_ (Block9Data* _data9_, SidebarEntry* entry) { EventsBranch* self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; SidebarEntry* _tmp2_ = NULL; #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" - self = _data8_->self; + self = _data9_->self; #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE); #line 316 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2876,7 +2876,7 @@ static gboolean __lambda16_ (Block8Data* _data8_, SidebarEntry* entry) { #line 320 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp6_ = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry)); #line 320 "/home/jens/Source/shotwell/src/events/Branch.vala" - result = _tmp6_ == _data8_->event_year; + result = _tmp6_ == _data9_->event_year; #line 320 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; #line 2883 "Branch.c" @@ -2884,9 +2884,9 @@ static gboolean __lambda16_ (Block8Data* _data8_, SidebarEntry* entry) { } -static gboolean ___lambda16__locator (gconstpointer item, gpointer self) { +static gboolean ___lambda17__locator (gconstpointer item, gpointer self) { gboolean result; - result = __lambda16_ (self, (SidebarEntry*) item); + result = __lambda17_ (self, (SidebarEntry*) item); #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; #line 2893 "Branch.c" @@ -2895,7 +2895,7 @@ static gboolean ___lambda16__locator (gconstpointer item, gpointer self) { static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* event, struct tm* event_tm) { SidebarEntry* result = NULL; - Block8Data* _data8_; + Block9Data* _data9_; struct tm _tmp0_ = {0}; gint _tmp1_ = 0; SidebarEntry* _tmp2_ = NULL; @@ -2909,23 +2909,23 @@ static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* e #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (event_tm != NULL, NULL); #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data8_ = g_slice_new0 (Block8Data); + _data9_ = g_slice_new0 (Block9Data); #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data8_->_ref_count_ = 1; + _data9_->_ref_count_ = 1; #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data8_->self = g_object_ref (self); + _data9_->self = g_object_ref (self); #line 313 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp0_ = *event_tm; #line 313 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp1_ = _tmp0_.tm_year; #line 313 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data8_->event_year = _tmp1_ + 1900; + _data9_->event_year = _tmp1_ + 1900; #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp3_ = _tmp2_; #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp4_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, ___lambda16__locator, _data8_); + _tmp4_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, ___lambda17__locator, _data9_); #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp5_ = _tmp4_; #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2933,9 +2933,9 @@ static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* e #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" result = _tmp5_; #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" - block8_data_unref (_data8_); + block9_data_unref (_data9_); #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data8_ = NULL; + _data9_ = NULL; #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; #line 2942 "Branch.c" diff --git a/src/photos/PhotoFileFormat.c b/src/photos/PhotoFileFormat.c index f34e451..578b1b3 100644 --- a/src/photos/PhotoFileFormat.c +++ b/src/photos/PhotoFileFormat.c @@ -270,14 +270,14 @@ gboolean photo_file_format_can_write (PhotoFileFormat self); static gboolean ____lambda4__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self); static PhotoFileFormat* _vala_array_dup1 (PhotoFileFormat* self, int length); PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1); -static gboolean ___lambda22_ (PhotoFileFormat format); +static gboolean ___lambda23_ (PhotoFileFormat format); gboolean photo_file_format_can_write_image (PhotoFileFormat self); -static gboolean ____lambda22__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self); +static gboolean ____lambda23__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self); static PhotoFileFormat* _vala_array_dup2 (PhotoFileFormat* self, int length); PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_length1); -static gboolean ___lambda23_ (PhotoFileFormat format); +static gboolean ___lambda24_ (PhotoFileFormat format); gboolean photo_file_format_can_write_metadata (PhotoFileFormat self); -static gboolean ____lambda23__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self); +static gboolean ____lambda24__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self); static PhotoFileFormat* _vala_array_dup3 (PhotoFileFormat* self, int length); PhotoFileFormat* photo_file_format_get_writeable (int* result_length1); PhotoFileFormat* photo_file_format_get_image_writeable (int* result_length1); @@ -610,7 +610,7 @@ PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) { } -static gboolean ___lambda22_ (PhotoFileFormat format) { +static gboolean ___lambda23_ (PhotoFileFormat format) { gboolean result = FALSE; PhotoFileFormat _tmp0_ = 0; gboolean _tmp1_ = FALSE; @@ -626,9 +626,9 @@ static gboolean ___lambda22_ (PhotoFileFormat format) { } -static gboolean ____lambda22__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) { +static gboolean ____lambda23__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) { gboolean result; - result = ___lambda22_ (format); + result = ___lambda23_ (format); #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; #line 635 "PhotoFileFormat.c" @@ -662,7 +662,7 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1 gint _tmp1_ = 0; PhotoFileFormat* _tmp2_ = NULL; #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = photo_file_format_data_find_applicable (____lambda22__photo_file_format_data_applicable_test, NULL, &_tmp1_); + _tmp2_ = photo_file_format_data_find_applicable (____lambda23__photo_file_format_data_applicable_test, NULL, &_tmp1_); #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_data_image_writeable = (g_free (photo_file_format_data_image_writeable), NULL); #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -699,7 +699,7 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1 } -static gboolean ___lambda23_ (PhotoFileFormat format) { +static gboolean ___lambda24_ (PhotoFileFormat format) { gboolean result = FALSE; PhotoFileFormat _tmp0_ = 0; gboolean _tmp1_ = FALSE; @@ -715,9 +715,9 @@ static gboolean ___lambda23_ (PhotoFileFormat format) { } -static gboolean ____lambda23__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) { +static gboolean ____lambda24__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) { gboolean result; - result = ___lambda23_ (format); + result = ___lambda24_ (format); #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; #line 724 "PhotoFileFormat.c" @@ -751,7 +751,7 @@ PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_leng gint _tmp1_ = 0; PhotoFileFormat* _tmp2_ = NULL; #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = photo_file_format_data_find_applicable (____lambda23__photo_file_format_data_applicable_test, NULL, &_tmp1_); + _tmp2_ = photo_file_format_data_find_applicable (____lambda24__photo_file_format_data_applicable_test, NULL, &_tmp1_); #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_data_metadata_writeable = (g_free (photo_file_format_data_metadata_writeable), NULL); #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" diff --git a/src/photos/PhotoMetadata.c b/src/photos/PhotoMetadata.c index a30a3b4..6f7c8c7 100644 --- a/src/photos/PhotoMetadata.c +++ b/src/photos/PhotoMetadata.c @@ -164,6 +164,7 @@ typedef struct _Block5Data Block5Data; typedef struct _PhotoMetadataInternalPhotoPreview PhotoMetadataInternalPhotoPreview; typedef struct _PhotoMetadataInternalPhotoPreviewClass PhotoMetadataInternalPhotoPreviewClass; +typedef struct _Block6Data Block6Data; #define TYPE_HIERARCHICAL_TAG_INDEX (hierarchical_tag_index_get_type ()) #define HIERARCHICAL_TAG_INDEX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_HIERARCHICAL_TAG_INDEX, HierarchicalTagIndex)) @@ -373,6 +374,12 @@ struct _Block5Data { MetadataDateTime* date_time; }; +struct _Block6Data { + int _ref_count_; + PhotoMetadata* self; + gchar* comment; +}; + typedef enum { ORIENTATION_MIN = 1, ORIENTATION_TOP_LEFT = 1, @@ -681,6 +688,10 @@ gboolean is_string_empty (const gchar* s); void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMetadataSetOption option); static gchar* photo_metadata_real_get_comment (MediaMetadata* base); void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, PhotoMetadataSetOption option); +static Block6Data* block6_data_ref (Block6Data* _data6_); +static void block6_data_unref (void * _userdata_); +static void ___lambda10_ (Block6Data* _data6_, const gchar* tag); +static void ____lambda10__photo_metadata_set_generic_value (const gchar* tag, gpointer self); GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify); gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag); gpointer hierarchical_tag_index_ref (gpointer instance); @@ -761,7 +772,7 @@ static GeeList* keyword_transformer_real_transform (KeywordTransformer* self, co g_critical ("Type `%s' does not implement abstract method `keyword_transformer_transform'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 32 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 765 "PhotoMetadata.c" +#line 776 "PhotoMetadata.c" } @@ -770,7 +781,7 @@ GeeList* keyword_transformer_transform (KeywordTransformer* self, const gchar* i g_return_val_if_fail (IS_KEYWORD_TRANSFORMER (self), NULL); #line 32 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return KEYWORD_TRANSFORMER_GET_CLASS (self)->transform (self, input, error); -#line 774 "PhotoMetadata.c" +#line 785 "PhotoMetadata.c" } @@ -780,14 +791,14 @@ KeywordTransformer* keyword_transformer_construct (GType object_type) { self = (KeywordTransformer*) g_type_create_instance (object_type); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 784 "PhotoMetadata.c" +#line 795 "PhotoMetadata.c" } static void value_keyword_transformer_init (GValue* value) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 791 "PhotoMetadata.c" +#line 802 "PhotoMetadata.c" } @@ -796,7 +807,7 @@ static void value_keyword_transformer_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" keyword_transformer_unref (value->data[0].v_pointer); -#line 800 "PhotoMetadata.c" +#line 811 "PhotoMetadata.c" } } @@ -806,11 +817,11 @@ static void value_keyword_transformer_copy_value (const GValue* src_value, GValu if (src_value->data[0].v_pointer) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dest_value->data[0].v_pointer = keyword_transformer_ref (src_value->data[0].v_pointer); -#line 810 "PhotoMetadata.c" +#line 821 "PhotoMetadata.c" } else { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 814 "PhotoMetadata.c" +#line 825 "PhotoMetadata.c" } } @@ -818,37 +829,37 @@ static void value_keyword_transformer_copy_value (const GValue* src_value, GValu static gpointer value_keyword_transformer_peek_pointer (const GValue* value) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return value->data[0].v_pointer; -#line 822 "PhotoMetadata.c" +#line 833 "PhotoMetadata.c" } static gchar* value_keyword_transformer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (collect_values[0].v_pointer) { -#line 829 "PhotoMetadata.c" +#line 840 "PhotoMetadata.c" KeywordTransformer* object; object = collect_values[0].v_pointer; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (object->parent_instance.g_class == NULL) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 836 "PhotoMetadata.c" +#line 847 "PhotoMetadata.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 840 "PhotoMetadata.c" +#line 851 "PhotoMetadata.c" } #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = keyword_transformer_ref (object); -#line 844 "PhotoMetadata.c" +#line 855 "PhotoMetadata.c" } else { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 848 "PhotoMetadata.c" +#line 859 "PhotoMetadata.c" } #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 852 "PhotoMetadata.c" +#line 863 "PhotoMetadata.c" } @@ -859,25 +870,25 @@ static gchar* value_keyword_transformer_lcopy_value (const GValue* value, guint if (!object_p) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 863 "PhotoMetadata.c" +#line 874 "PhotoMetadata.c" } #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!value->data[0].v_pointer) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = NULL; -#line 869 "PhotoMetadata.c" +#line 880 "PhotoMetadata.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = value->data[0].v_pointer; -#line 873 "PhotoMetadata.c" +#line 884 "PhotoMetadata.c" } else { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = keyword_transformer_ref (value->data[0].v_pointer); -#line 877 "PhotoMetadata.c" +#line 888 "PhotoMetadata.c" } #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 881 "PhotoMetadata.c" +#line 892 "PhotoMetadata.c" } @@ -891,7 +902,7 @@ GParamSpec* param_spec_keyword_transformer (const gchar* name, const gchar* nick G_PARAM_SPEC (spec)->value_type = object_type; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return G_PARAM_SPEC (spec); -#line 895 "PhotoMetadata.c" +#line 906 "PhotoMetadata.c" } @@ -900,7 +911,7 @@ gpointer value_get_keyword_transformer (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEYWORD_TRANSFORMER), NULL); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return value->data[0].v_pointer; -#line 904 "PhotoMetadata.c" +#line 915 "PhotoMetadata.c" } @@ -920,17 +931,17 @@ void value_set_keyword_transformer (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" keyword_transformer_ref (value->data[0].v_pointer); -#line 924 "PhotoMetadata.c" +#line 935 "PhotoMetadata.c" } else { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 928 "PhotoMetadata.c" +#line 939 "PhotoMetadata.c" } #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (old) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" keyword_transformer_unref (old); -#line 934 "PhotoMetadata.c" +#line 945 "PhotoMetadata.c" } } @@ -949,17 +960,17 @@ void value_take_keyword_transformer (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = v_object; -#line 953 "PhotoMetadata.c" +#line 964 "PhotoMetadata.c" } else { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 957 "PhotoMetadata.c" +#line 968 "PhotoMetadata.c" } #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (old) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" keyword_transformer_unref (old); -#line 963 "PhotoMetadata.c" +#line 974 "PhotoMetadata.c" } } @@ -971,14 +982,14 @@ static void keyword_transformer_class_init (KeywordTransformerClass * klass) { ((KeywordTransformerClass *) klass)->finalize = keyword_transformer_finalize; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((KeywordTransformerClass *) klass)->transform = (GeeList* (*)(KeywordTransformer*, const gchar*, GError**)) keyword_transformer_real_transform; -#line 975 "PhotoMetadata.c" +#line 986 "PhotoMetadata.c" } static void keyword_transformer_instance_init (KeywordTransformer * self) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->ref_count = 1; -#line 982 "PhotoMetadata.c" +#line 993 "PhotoMetadata.c" } @@ -988,7 +999,7 @@ static void keyword_transformer_finalize (KeywordTransformer* obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_signal_handlers_destroy (self); -#line 992 "PhotoMetadata.c" +#line 1003 "PhotoMetadata.c" } @@ -1013,7 +1024,7 @@ gpointer keyword_transformer_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return instance; -#line 1017 "PhotoMetadata.c" +#line 1028 "PhotoMetadata.c" } @@ -1026,7 +1037,7 @@ void keyword_transformer_unref (gpointer instance) { KEYWORD_TRANSFORMER_GET_CLASS (self)->finalize (self); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1030 "PhotoMetadata.c" +#line 1041 "PhotoMetadata.c" } } @@ -1053,7 +1064,7 @@ static GeeList* null_keyword_transformer_real_transform (KeywordTransformer* bas result = G_TYPE_CHECK_INSTANCE_CAST (_result_, GEE_TYPE_LIST, GeeList); #line 40 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 1057 "PhotoMetadata.c" +#line 1068 "PhotoMetadata.c" } @@ -1063,14 +1074,14 @@ NullKeywordTransformer* null_keyword_transformer_construct (GType object_type) { self = (NullKeywordTransformer*) keyword_transformer_construct (object_type); #line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 1067 "PhotoMetadata.c" +#line 1078 "PhotoMetadata.c" } NullKeywordTransformer* null_keyword_transformer_new (void) { #line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return null_keyword_transformer_construct (TYPE_NULL_KEYWORD_TRANSFORMER); -#line 1074 "PhotoMetadata.c" +#line 1085 "PhotoMetadata.c" } @@ -1079,7 +1090,7 @@ static void null_keyword_transformer_class_init (NullKeywordTransformerClass * k null_keyword_transformer_parent_class = g_type_class_peek_parent (klass); #line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((KeywordTransformerClass *) klass)->transform = (GeeList* (*)(KeywordTransformer*, const gchar*, GError**)) null_keyword_transformer_real_transform; -#line 1083 "PhotoMetadata.c" +#line 1094 "PhotoMetadata.c" } @@ -1102,28 +1113,28 @@ GType null_keyword_transformer_get_type (void) { static void _acd_see_keyword_transformer_on_start_gmarkup_parser_start_element_func (GMarkupParseContext* context, const gchar* element_name, gchar** attribute_names, gchar** attribute_values, gpointer self, GError** error) { #line 64 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" acd_see_keyword_transformer_on_start ((ACDSeeKeywordTransformer*) self, context, element_name, attribute_names, attribute_values, error); -#line 1106 "PhotoMetadata.c" +#line 1117 "PhotoMetadata.c" } static void _acd_see_keyword_transformer_on_end_gmarkup_parser_end_element_func (GMarkupParseContext* context, const gchar* element_name, gpointer self, GError** error) { #line 65 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" acd_see_keyword_transformer_on_end ((ACDSeeKeywordTransformer*) self, context, element_name, error); -#line 1113 "PhotoMetadata.c" +#line 1124 "PhotoMetadata.c" } static void _acd_see_keyword_transformer_on_text_gmarkup_parser_text_func (GMarkupParseContext* context, const gchar* text, gsize text_len, gpointer self, GError** error) { #line 66 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" acd_see_keyword_transformer_on_text ((ACDSeeKeywordTransformer*) self, context, text, error); -#line 1120 "PhotoMetadata.c" +#line 1131 "PhotoMetadata.c" } static void _acd_see_keyword_transformer_on_error_gmarkup_parser_error_func (GMarkupParseContext* context, GError* _error_, gpointer self) { #line 67 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" acd_see_keyword_transformer_on_error ((ACDSeeKeywordTransformer*) self, context, _error_); -#line 1127 "PhotoMetadata.c" +#line 1138 "PhotoMetadata.c" } @@ -1157,21 +1168,21 @@ ACDSeeKeywordTransformer* acd_see_keyword_transformer_construct (GType object_ty self->priv->stack = _tmp1_; #line 62 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 1161 "PhotoMetadata.c" +#line 1172 "PhotoMetadata.c" } ACDSeeKeywordTransformer* acd_see_keyword_transformer_new (void) { #line 62 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return acd_see_keyword_transformer_construct (TYPE_ACD_SEE_KEYWORD_TRANSFORMER); -#line 1168 "PhotoMetadata.c" +#line 1179 "PhotoMetadata.c" } static gpointer _g_object_ref0 (gpointer self) { #line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? g_object_ref (self) : NULL; -#line 1175 "PhotoMetadata.c" +#line 1186 "PhotoMetadata.c" } @@ -1216,7 +1227,7 @@ static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer* _g_markup_parse_context_unref0 (ctx); #line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 1220 "PhotoMetadata.c" +#line 1231 "PhotoMetadata.c" } #line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = self->priv->result; @@ -1228,7 +1239,7 @@ static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer* _g_markup_parse_context_unref0 (ctx); #line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 1232 "PhotoMetadata.c" +#line 1243 "PhotoMetadata.c" } @@ -1255,7 +1266,7 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self if (g_strcmp0 (_tmp0_, "Categories") == 0) { #line 90 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1259 "PhotoMetadata.c" +#line 1270 "PhotoMetadata.c" } #line 93 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = name; @@ -1263,7 +1274,7 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self if (g_strcmp0 (_tmp1_, "Category") != 0) { #line 94 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1267 "PhotoMetadata.c" +#line 1278 "PhotoMetadata.c" } #line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = name; @@ -1285,7 +1296,7 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self g_propagate_error (error, _inner_error_); #line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1289 "PhotoMetadata.c" +#line 1300 "PhotoMetadata.c" } else { #line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1293,7 +1304,7 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self g_clear_error (&_inner_error_); #line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1297 "PhotoMetadata.c" +#line 1308 "PhotoMetadata.c" } } } @@ -1311,7 +1322,7 @@ static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self, _tmp0_ = name; #line 106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_strcmp0 (_tmp0_, "Category") == 0) { -#line 1315 "PhotoMetadata.c" +#line 1326 "PhotoMetadata.c" GeeArrayQueue* _tmp1_ = NULL; gpointer _tmp2_ = NULL; gchar* _tmp3_ = NULL; @@ -1323,7 +1334,7 @@ static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self, _tmp3_ = (gchar*) _tmp2_; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp3_); -#line 1327 "PhotoMetadata.c" +#line 1338 "PhotoMetadata.c" } } @@ -1345,7 +1356,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, if (g_strcmp0 (_tmp0_, "") == 0) { #line 114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1349 "PhotoMetadata.c" +#line 1360 "PhotoMetadata.c" } #line 117 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = self->priv->stack; @@ -1357,7 +1368,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, _tmp3_ = self->priv->assigned; #line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_) { -#line 1361 "PhotoMetadata.c" +#line 1372 "PhotoMetadata.c" GString* builder = NULL; GString* _tmp4_ = NULL; GString* _tmp13_ = NULL; @@ -1369,7 +1380,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, _tmp4_ = g_string_new (""); #line 119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" builder = _tmp4_; -#line 1373 "PhotoMetadata.c" +#line 1384 "PhotoMetadata.c" { GeeIterator* _f_it = NULL; GeeArrayQueue* _tmp5_ = NULL; @@ -1382,7 +1393,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, _f_it = _tmp6_; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 1386 "PhotoMetadata.c" +#line 1397 "PhotoMetadata.c" GeeIterator* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; gchar* f = NULL; @@ -1398,7 +1409,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, if (!_tmp8_) { #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 1402 "PhotoMetadata.c" +#line 1413 "PhotoMetadata.c" } #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = _f_it; @@ -1414,11 +1425,11 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, g_string_append_printf (_tmp11_, "%s|", _tmp12_); #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (f); -#line 1418 "PhotoMetadata.c" +#line 1429 "PhotoMetadata.c" } #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_f_it); -#line 1422 "PhotoMetadata.c" +#line 1433 "PhotoMetadata.c" } #line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = builder; @@ -1426,7 +1437,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, _tmp14_ = _tmp13_->len; #line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp14_ > ((gssize) 0)) { -#line 1430 "PhotoMetadata.c" +#line 1441 "PhotoMetadata.c" GString* _tmp15_ = NULL; GString* _tmp16_ = NULL; gssize _tmp17_ = 0L; @@ -1438,7 +1449,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, _tmp17_ = _tmp16_->len; #line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_string_truncate (_tmp15_, (gsize) (_tmp17_ - 1)); -#line 1442 "PhotoMetadata.c" +#line 1453 "PhotoMetadata.c" } #line 126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = self->priv->result; @@ -1450,7 +1461,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_); #line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_string_free0 (builder); -#line 1454 "PhotoMetadata.c" +#line 1465 "PhotoMetadata.c" } } @@ -1458,7 +1469,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, static gpointer _g_error_copy0 (gpointer self) { #line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? g_error_copy (self) : NULL; -#line 1462 "PhotoMetadata.c" +#line 1473 "PhotoMetadata.c" } @@ -1477,7 +1488,7 @@ static void acd_see_keyword_transformer_on_error (ACDSeeKeywordTransformer* self _g_error_free0 (self->priv->error); #line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->error = _tmp1_; -#line 1481 "PhotoMetadata.c" +#line 1492 "PhotoMetadata.c" } @@ -1490,14 +1501,14 @@ static void acd_see_keyword_transformer_class_init (ACDSeeKeywordTransformerClas g_type_class_add_private (klass, sizeof (ACDSeeKeywordTransformerPrivate)); #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((KeywordTransformerClass *) klass)->transform = (GeeList* (*)(KeywordTransformer*, const gchar*, GError**)) acd_see_keyword_transformer_real_transform; -#line 1494 "PhotoMetadata.c" +#line 1505 "PhotoMetadata.c" } static void acd_see_keyword_transformer_instance_init (ACDSeeKeywordTransformer * self) { #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv = ACD_SEE_KEYWORD_TRANSFORMER_GET_PRIVATE (self); -#line 1501 "PhotoMetadata.c" +#line 1512 "PhotoMetadata.c" } @@ -1513,7 +1524,7 @@ static void acd_see_keyword_transformer_finalize (KeywordTransformer* obj) { _g_object_unref0 (self->priv->result); #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" KEYWORD_TRANSFORMER_CLASS (acd_see_keyword_transformer_parent_class)->finalize (obj); -#line 1517 "PhotoMetadata.c" +#line 1528 "PhotoMetadata.c" } @@ -1532,7 +1543,7 @@ GType acd_see_keyword_transformer_get_type (void) { static gpointer _keyword_transformer_ref0 (gpointer self) { #line 154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? keyword_transformer_ref (self) : NULL; -#line 1536 "PhotoMetadata.c" +#line 1547 "PhotoMetadata.c" } @@ -1588,21 +1599,21 @@ HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_typ self->transformer = _tmp7_; #line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 1592 "PhotoMetadata.c" +#line 1603 "PhotoMetadata.c" } HierarchicalKeywordField* hierarchical_keyword_field_new (const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer) { #line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return hierarchical_keyword_field_construct (TYPE_HIERARCHICAL_KEYWORD_FIELD, field_name, path_separator, wants_leading_separator, is_writeable, transformer); -#line 1599 "PhotoMetadata.c" +#line 1610 "PhotoMetadata.c" } static void value_hierarchical_keyword_field_init (GValue* value) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1606 "PhotoMetadata.c" +#line 1617 "PhotoMetadata.c" } @@ -1611,7 +1622,7 @@ static void value_hierarchical_keyword_field_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" hierarchical_keyword_field_unref (value->data[0].v_pointer); -#line 1615 "PhotoMetadata.c" +#line 1626 "PhotoMetadata.c" } } @@ -1621,11 +1632,11 @@ static void value_hierarchical_keyword_field_copy_value (const GValue* src_value if (src_value->data[0].v_pointer) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dest_value->data[0].v_pointer = hierarchical_keyword_field_ref (src_value->data[0].v_pointer); -#line 1625 "PhotoMetadata.c" +#line 1636 "PhotoMetadata.c" } else { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 1629 "PhotoMetadata.c" +#line 1640 "PhotoMetadata.c" } } @@ -1633,37 +1644,37 @@ static void value_hierarchical_keyword_field_copy_value (const GValue* src_value static gpointer value_hierarchical_keyword_field_peek_pointer (const GValue* value) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return value->data[0].v_pointer; -#line 1637 "PhotoMetadata.c" +#line 1648 "PhotoMetadata.c" } static gchar* value_hierarchical_keyword_field_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (collect_values[0].v_pointer) { -#line 1644 "PhotoMetadata.c" +#line 1655 "PhotoMetadata.c" HierarchicalKeywordField* object; object = collect_values[0].v_pointer; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (object->parent_instance.g_class == NULL) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1651 "PhotoMetadata.c" +#line 1662 "PhotoMetadata.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1655 "PhotoMetadata.c" +#line 1666 "PhotoMetadata.c" } #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = hierarchical_keyword_field_ref (object); -#line 1659 "PhotoMetadata.c" +#line 1670 "PhotoMetadata.c" } else { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1663 "PhotoMetadata.c" +#line 1674 "PhotoMetadata.c" } #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 1667 "PhotoMetadata.c" +#line 1678 "PhotoMetadata.c" } @@ -1674,25 +1685,25 @@ static gchar* value_hierarchical_keyword_field_lcopy_value (const GValue* value, if (!object_p) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1678 "PhotoMetadata.c" +#line 1689 "PhotoMetadata.c" } #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!value->data[0].v_pointer) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = NULL; -#line 1684 "PhotoMetadata.c" +#line 1695 "PhotoMetadata.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = value->data[0].v_pointer; -#line 1688 "PhotoMetadata.c" +#line 1699 "PhotoMetadata.c" } else { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = hierarchical_keyword_field_ref (value->data[0].v_pointer); -#line 1692 "PhotoMetadata.c" +#line 1703 "PhotoMetadata.c" } #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 1696 "PhotoMetadata.c" +#line 1707 "PhotoMetadata.c" } @@ -1706,7 +1717,7 @@ GParamSpec* param_spec_hierarchical_keyword_field (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return G_PARAM_SPEC (spec); -#line 1710 "PhotoMetadata.c" +#line 1721 "PhotoMetadata.c" } @@ -1715,7 +1726,7 @@ gpointer value_get_hierarchical_keyword_field (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_KEYWORD_FIELD), NULL); #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return value->data[0].v_pointer; -#line 1719 "PhotoMetadata.c" +#line 1730 "PhotoMetadata.c" } @@ -1735,17 +1746,17 @@ void value_set_hierarchical_keyword_field (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" hierarchical_keyword_field_ref (value->data[0].v_pointer); -#line 1739 "PhotoMetadata.c" +#line 1750 "PhotoMetadata.c" } else { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1743 "PhotoMetadata.c" +#line 1754 "PhotoMetadata.c" } #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (old) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" hierarchical_keyword_field_unref (old); -#line 1749 "PhotoMetadata.c" +#line 1760 "PhotoMetadata.c" } } @@ -1764,17 +1775,17 @@ void value_take_hierarchical_keyword_field (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = v_object; -#line 1768 "PhotoMetadata.c" +#line 1779 "PhotoMetadata.c" } else { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1772 "PhotoMetadata.c" +#line 1783 "PhotoMetadata.c" } #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (old) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" hierarchical_keyword_field_unref (old); -#line 1778 "PhotoMetadata.c" +#line 1789 "PhotoMetadata.c" } } @@ -1784,14 +1795,14 @@ static void hierarchical_keyword_field_class_init (HierarchicalKeywordFieldClass hierarchical_keyword_field_parent_class = g_type_class_peek_parent (klass); #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((HierarchicalKeywordFieldClass *) klass)->finalize = hierarchical_keyword_field_finalize; -#line 1788 "PhotoMetadata.c" +#line 1799 "PhotoMetadata.c" } static void hierarchical_keyword_field_instance_init (HierarchicalKeywordField * self) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->ref_count = 1; -#line 1795 "PhotoMetadata.c" +#line 1806 "PhotoMetadata.c" } @@ -1807,7 +1818,7 @@ static void hierarchical_keyword_field_finalize (HierarchicalKeywordField* obj) _g_free0 (self->path_separator); #line 142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _keyword_transformer_unref0 (self->transformer); -#line 1811 "PhotoMetadata.c" +#line 1822 "PhotoMetadata.c" } @@ -1832,7 +1843,7 @@ gpointer hierarchical_keyword_field_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return instance; -#line 1836 "PhotoMetadata.c" +#line 1847 "PhotoMetadata.c" } @@ -1845,7 +1856,7 @@ void hierarchical_keyword_field_unref (gpointer instance) { HIERARCHICAL_KEYWORD_FIELD_GET_CLASS (self)->finalize (self); #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1849 "PhotoMetadata.c" +#line 1860 "PhotoMetadata.c" } } @@ -1904,7 +1915,7 @@ PhotoPreview* photo_preview_construct (GType object_type, const gchar* name, Dim self->priv->extension = _tmp7_; #line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 1908 "PhotoMetadata.c" +#line 1919 "PhotoMetadata.c" } @@ -1922,7 +1933,7 @@ gchar* photo_preview_get_name (PhotoPreview* self) { result = _tmp1_; #line 174 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 1926 "PhotoMetadata.c" +#line 1937 "PhotoMetadata.c" } @@ -1936,7 +1947,7 @@ void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result) *result = _tmp0_; #line 178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1940 "PhotoMetadata.c" +#line 1951 "PhotoMetadata.c" } @@ -1951,7 +1962,7 @@ guint32 photo_preview_get_size (PhotoPreview* self) { result = _tmp0_; #line 182 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 1955 "PhotoMetadata.c" +#line 1966 "PhotoMetadata.c" } @@ -1969,7 +1980,7 @@ gchar* photo_preview_get_mime_type (PhotoPreview* self) { result = _tmp1_; #line 186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 1973 "PhotoMetadata.c" +#line 1984 "PhotoMetadata.c" } @@ -1987,7 +1998,7 @@ gchar* photo_preview_get_extension (PhotoPreview* self) { result = _tmp1_; #line 190 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 1991 "PhotoMetadata.c" +#line 2002 "PhotoMetadata.c" } @@ -1996,7 +2007,7 @@ static guint8* photo_preview_real_flatten (PhotoPreview* self, int* result_lengt g_critical ("Type `%s' does not implement abstract method `photo_preview_flatten'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 2000 "PhotoMetadata.c" +#line 2011 "PhotoMetadata.c" } @@ -2005,14 +2016,14 @@ guint8* photo_preview_flatten (PhotoPreview* self, int* result_length1, GError** g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL); #line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return PHOTO_PREVIEW_GET_CLASS (self)->flatten (self, result_length1, error); -#line 2009 "PhotoMetadata.c" +#line 2020 "PhotoMetadata.c" } static guint8* _vala_array_dup4 (guint8* self, int length) { #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_memdup (self, length * sizeof (guint8)); -#line 2016 "PhotoMetadata.c" +#line 2027 "PhotoMetadata.c" } @@ -2038,7 +2049,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er g_propagate_error (error, _inner_error_); #line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 2042 "PhotoMetadata.c" +#line 2053 "PhotoMetadata.c" } { GdkPixbuf* _tmp2_ = NULL; @@ -2067,7 +2078,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er _tmp2_ = _tmp7_; #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2071 "PhotoMetadata.c" +#line 2082 "PhotoMetadata.c" goto __catch25_g_error; } #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2082,7 +2093,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er flattened = (g_free (flattened), NULL); #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2086 "PhotoMetadata.c" +#line 2097 "PhotoMetadata.c" } goto __finally25; __catch25_g_error: @@ -2111,7 +2122,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er flattened = (g_free (flattened), NULL); #line 206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2115 "PhotoMetadata.c" +#line 2126 "PhotoMetadata.c" } __finally25: #line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2120,7 +2131,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er flattened = (g_free (flattened), NULL); #line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 2124 "PhotoMetadata.c" +#line 2135 "PhotoMetadata.c" } @@ -2129,14 +2140,14 @@ GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error) { g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL); #line 195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return PHOTO_PREVIEW_GET_CLASS (self)->get_pixbuf (self, error); -#line 2133 "PhotoMetadata.c" +#line 2144 "PhotoMetadata.c" } static void value_photo_preview_init (GValue* value) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2140 "PhotoMetadata.c" +#line 2151 "PhotoMetadata.c" } @@ -2145,7 +2156,7 @@ static void value_photo_preview_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_preview_unref (value->data[0].v_pointer); -#line 2149 "PhotoMetadata.c" +#line 2160 "PhotoMetadata.c" } } @@ -2155,11 +2166,11 @@ static void value_photo_preview_copy_value (const GValue* src_value, GValue* des if (src_value->data[0].v_pointer) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dest_value->data[0].v_pointer = photo_preview_ref (src_value->data[0].v_pointer); -#line 2159 "PhotoMetadata.c" +#line 2170 "PhotoMetadata.c" } else { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 2163 "PhotoMetadata.c" +#line 2174 "PhotoMetadata.c" } } @@ -2167,37 +2178,37 @@ static void value_photo_preview_copy_value (const GValue* src_value, GValue* des static gpointer value_photo_preview_peek_pointer (const GValue* value) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return value->data[0].v_pointer; -#line 2171 "PhotoMetadata.c" +#line 2182 "PhotoMetadata.c" } static gchar* value_photo_preview_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (collect_values[0].v_pointer) { -#line 2178 "PhotoMetadata.c" +#line 2189 "PhotoMetadata.c" PhotoPreview* object; object = collect_values[0].v_pointer; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (object->parent_instance.g_class == NULL) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2185 "PhotoMetadata.c" +#line 2196 "PhotoMetadata.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2189 "PhotoMetadata.c" +#line 2200 "PhotoMetadata.c" } #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = photo_preview_ref (object); -#line 2193 "PhotoMetadata.c" +#line 2204 "PhotoMetadata.c" } else { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2197 "PhotoMetadata.c" +#line 2208 "PhotoMetadata.c" } #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 2201 "PhotoMetadata.c" +#line 2212 "PhotoMetadata.c" } @@ -2208,25 +2219,25 @@ static gchar* value_photo_preview_lcopy_value (const GValue* value, guint n_coll if (!object_p) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2212 "PhotoMetadata.c" +#line 2223 "PhotoMetadata.c" } #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!value->data[0].v_pointer) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = NULL; -#line 2218 "PhotoMetadata.c" +#line 2229 "PhotoMetadata.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = value->data[0].v_pointer; -#line 2222 "PhotoMetadata.c" +#line 2233 "PhotoMetadata.c" } else { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = photo_preview_ref (value->data[0].v_pointer); -#line 2226 "PhotoMetadata.c" +#line 2237 "PhotoMetadata.c" } #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 2230 "PhotoMetadata.c" +#line 2241 "PhotoMetadata.c" } @@ -2240,7 +2251,7 @@ GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, cons G_PARAM_SPEC (spec)->value_type = object_type; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return G_PARAM_SPEC (spec); -#line 2244 "PhotoMetadata.c" +#line 2255 "PhotoMetadata.c" } @@ -2249,7 +2260,7 @@ gpointer value_get_photo_preview (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_PREVIEW), NULL); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return value->data[0].v_pointer; -#line 2253 "PhotoMetadata.c" +#line 2264 "PhotoMetadata.c" } @@ -2269,17 +2280,17 @@ void value_set_photo_preview (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_preview_ref (value->data[0].v_pointer); -#line 2273 "PhotoMetadata.c" +#line 2284 "PhotoMetadata.c" } else { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2277 "PhotoMetadata.c" +#line 2288 "PhotoMetadata.c" } #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (old) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_preview_unref (old); -#line 2283 "PhotoMetadata.c" +#line 2294 "PhotoMetadata.c" } } @@ -2298,17 +2309,17 @@ void value_take_photo_preview (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = v_object; -#line 2302 "PhotoMetadata.c" +#line 2313 "PhotoMetadata.c" } else { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2306 "PhotoMetadata.c" +#line 2317 "PhotoMetadata.c" } #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (old) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_preview_unref (old); -#line 2312 "PhotoMetadata.c" +#line 2323 "PhotoMetadata.c" } } @@ -2324,7 +2335,7 @@ static void photo_preview_class_init (PhotoPreviewClass * klass) { ((PhotoPreviewClass *) klass)->flatten = (guint8* (*)(PhotoPreview*, int*, GError**)) photo_preview_real_flatten; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((PhotoPreviewClass *) klass)->get_pixbuf = (GdkPixbuf* (*)(PhotoPreview*, GError**)) photo_preview_real_get_pixbuf; -#line 2328 "PhotoMetadata.c" +#line 2339 "PhotoMetadata.c" } @@ -2333,7 +2344,7 @@ static void photo_preview_instance_init (PhotoPreview * self) { self->priv = PHOTO_PREVIEW_GET_PRIVATE (self); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->ref_count = 1; -#line 2337 "PhotoMetadata.c" +#line 2348 "PhotoMetadata.c" } @@ -2349,7 +2360,7 @@ static void photo_preview_finalize (PhotoPreview* obj) { _g_free0 (self->priv->mime_type); #line 163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->priv->extension); -#line 2353 "PhotoMetadata.c" +#line 2364 "PhotoMetadata.c" } @@ -2374,7 +2385,7 @@ gpointer photo_preview_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return instance; -#line 2378 "PhotoMetadata.c" +#line 2389 "PhotoMetadata.c" } @@ -2387,7 +2398,7 @@ void photo_preview_unref (gpointer instance) { PHOTO_PREVIEW_GET_CLASS (self)->finalize (self); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2391 "PhotoMetadata.c" +#line 2402 "PhotoMetadata.c" } } @@ -2410,14 +2421,14 @@ PhotoMetadata* photo_metadata_construct (GType object_type) { self = (PhotoMetadata*) media_metadata_construct (object_type); #line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 2414 "PhotoMetadata.c" +#line 2425 "PhotoMetadata.c" } PhotoMetadata* photo_metadata_new (void) { #line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return photo_metadata_construct (TYPE_PHOTO_METADATA); -#line 2421 "PhotoMetadata.c" +#line 2432 "PhotoMetadata.c" } @@ -2467,7 +2478,7 @@ static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file g_propagate_error (error, _inner_error_); #line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 2471 "PhotoMetadata.c" +#line 2482 "PhotoMetadata.c" } #line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = file; @@ -2491,7 +2502,7 @@ static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file _g_free0 (self->priv->source_name); #line 260 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->source_name = _tmp10_; -#line 2495 "PhotoMetadata.c" +#line 2506 "PhotoMetadata.c" } @@ -2523,7 +2534,7 @@ void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** er g_propagate_error (error, _inner_error_); #line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 2527 "PhotoMetadata.c" +#line 2538 "PhotoMetadata.c" } } @@ -2551,7 +2562,7 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b _tmp0_ = length; #line 268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ <= 0) { -#line 2555 "PhotoMetadata.c" +#line 2566 "PhotoMetadata.c" guint8* _tmp1_ = NULL; gint _tmp1__length1 = 0; #line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2560,7 +2571,7 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b _tmp1__length1 = buffer_length1; #line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" length = _tmp1__length1; -#line 2564 "PhotoMetadata.c" +#line 2575 "PhotoMetadata.c" } #line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = buffer; @@ -2596,7 +2607,7 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b g_propagate_error (error, _inner_error_); #line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 2600 "PhotoMetadata.c" +#line 2611 "PhotoMetadata.c" } #line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = buffer; @@ -2618,7 +2629,7 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b _g_free0 (self->priv->source_name); #line 278 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->source_name = _tmp12_; -#line 2622 "PhotoMetadata.c" +#line 2633 "PhotoMetadata.c" } @@ -2645,7 +2656,7 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer, _tmp0_ = length; #line 282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ <= 0) { -#line 2649 "PhotoMetadata.c" +#line 2660 "PhotoMetadata.c" guint8* _tmp1_ = NULL; gint _tmp1__length1 = 0; #line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2654,7 +2665,7 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer, _tmp1__length1 = buffer_length1; #line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" length = _tmp1__length1; -#line 2658 "PhotoMetadata.c" +#line 2669 "PhotoMetadata.c" } #line 285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = buffer; @@ -2690,7 +2701,7 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer, g_propagate_error (error, _inner_error_); #line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 2694 "PhotoMetadata.c" +#line 2705 "PhotoMetadata.c" } #line 291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = buffer; @@ -2712,7 +2723,7 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer, _g_free0 (self->priv->source_name); #line 292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->source_name = _tmp12_; -#line 2716 "PhotoMetadata.c" +#line 2727 "PhotoMetadata.c" } @@ -2736,7 +2747,7 @@ MetadataDomain photo_metadata_get_tag_domain (const gchar* tag) { result = METADATA_DOMAIN_EXIF; #line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2740 "PhotoMetadata.c" +#line 2751 "PhotoMetadata.c" } #line 299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tag; @@ -2748,7 +2759,7 @@ MetadataDomain photo_metadata_get_tag_domain (const gchar* tag) { result = METADATA_DOMAIN_XMP; #line 300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2752 "PhotoMetadata.c" +#line 2763 "PhotoMetadata.c" } #line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = tag; @@ -2760,13 +2771,13 @@ MetadataDomain photo_metadata_get_tag_domain (const gchar* tag) { result = METADATA_DOMAIN_IPTC; #line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2764 "PhotoMetadata.c" +#line 2775 "PhotoMetadata.c" } #line 305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = METADATA_DOMAIN_UNKNOWN; #line 305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2770 "PhotoMetadata.c" +#line 2781 "PhotoMetadata.c" } @@ -2781,7 +2792,7 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain) switch (_tmp0_) { #line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 2785 "PhotoMetadata.c" +#line 2796 "PhotoMetadata.c" { GExiv2Metadata* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; @@ -2793,11 +2804,11 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain) result = _tmp2_; #line 311 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2797 "PhotoMetadata.c" +#line 2808 "PhotoMetadata.c" } #line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 2801 "PhotoMetadata.c" +#line 2812 "PhotoMetadata.c" { GExiv2Metadata* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; @@ -2809,11 +2820,11 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain) result = _tmp4_; #line 314 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2813 "PhotoMetadata.c" +#line 2824 "PhotoMetadata.c" } #line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 2817 "PhotoMetadata.c" +#line 2828 "PhotoMetadata.c" { GExiv2Metadata* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; @@ -2825,18 +2836,18 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain) result = _tmp6_; #line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2829 "PhotoMetadata.c" +#line 2840 "PhotoMetadata.c" } default: #line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_UNKNOWN: -#line 2834 "PhotoMetadata.c" +#line 2845 "PhotoMetadata.c" { #line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = FALSE; #line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2840 "PhotoMetadata.c" +#line 2851 "PhotoMetadata.c" } } } @@ -2853,7 +2864,7 @@ gboolean photo_metadata_has_exif (PhotoMetadata* self) { result = _tmp0_; #line 326 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2857 "PhotoMetadata.c" +#line 2868 "PhotoMetadata.c" } @@ -2868,7 +2879,7 @@ gboolean photo_metadata_has_xmp (PhotoMetadata* self) { result = _tmp0_; #line 330 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2872 "PhotoMetadata.c" +#line 2883 "PhotoMetadata.c" } @@ -2883,7 +2894,7 @@ gboolean photo_metadata_has_iptc (PhotoMetadata* self) { result = _tmp0_; #line 334 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2887 "PhotoMetadata.c" +#line 2898 "PhotoMetadata.c" } @@ -2898,7 +2909,7 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain switch (_tmp0_) { #line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 2902 "PhotoMetadata.c" +#line 2913 "PhotoMetadata.c" { GExiv2Metadata* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; @@ -2910,11 +2921,11 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain result = _tmp2_; #line 340 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2914 "PhotoMetadata.c" +#line 2925 "PhotoMetadata.c" } #line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 2918 "PhotoMetadata.c" +#line 2929 "PhotoMetadata.c" { GExiv2Metadata* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; @@ -2926,11 +2937,11 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain result = _tmp4_; #line 343 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2930 "PhotoMetadata.c" +#line 2941 "PhotoMetadata.c" } #line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 2934 "PhotoMetadata.c" +#line 2945 "PhotoMetadata.c" { GExiv2Metadata* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; @@ -2942,18 +2953,18 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain result = _tmp6_; #line 346 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2946 "PhotoMetadata.c" +#line 2957 "PhotoMetadata.c" } default: #line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_UNKNOWN: -#line 2951 "PhotoMetadata.c" +#line 2962 "PhotoMetadata.c" { #line 350 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = FALSE; #line 350 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2957 "PhotoMetadata.c" +#line 2968 "PhotoMetadata.c" } } } @@ -2970,7 +2981,7 @@ gboolean photo_metadata_can_write_exif (PhotoMetadata* self) { result = _tmp0_; #line 355 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2974 "PhotoMetadata.c" +#line 2985 "PhotoMetadata.c" } @@ -2985,7 +2996,7 @@ gboolean photo_metadata_can_write_xmp (PhotoMetadata* self) { result = _tmp0_; #line 359 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2989 "PhotoMetadata.c" +#line 3000 "PhotoMetadata.c" } @@ -3000,7 +3011,7 @@ gboolean photo_metadata_can_write_iptc (PhotoMetadata* self) { result = _tmp0_; #line 363 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3004 "PhotoMetadata.c" +#line 3015 "PhotoMetadata.c" } @@ -3023,7 +3034,7 @@ gboolean photo_metadata_has_tag (PhotoMetadata* self, const gchar* tag) { result = _tmp2_; #line 367 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3027 "PhotoMetadata.c" +#line 3038 "PhotoMetadata.c" } @@ -3039,7 +3050,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa _tmp0__target = compare_func_target; #line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ == NULL) { -#line 3043 "PhotoMetadata.c" +#line 3054 "PhotoMetadata.c" GeeHashSet* _tmp1_ = NULL; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); @@ -3055,7 +3066,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa compare_func_target_destroy_notify = NULL; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3059 "PhotoMetadata.c" +#line 3070 "PhotoMetadata.c" } else { GCompareDataFunc _tmp2_ = NULL; void* _tmp2__target = NULL; @@ -3087,7 +3098,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa compare_func_target_destroy_notify = NULL; #line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3091 "PhotoMetadata.c" +#line 3102 "PhotoMetadata.c" } #line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL); @@ -3097,7 +3108,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa compare_func_target = NULL; #line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target_destroy_notify = NULL; -#line 3101 "PhotoMetadata.c" +#line 3112 "PhotoMetadata.c" } @@ -3131,7 +3142,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma switch (_tmp0_) { #line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 3135 "PhotoMetadata.c" +#line 3146 "PhotoMetadata.c" { GExiv2Metadata* _tmp1_ = NULL; gchar** _tmp2_ = NULL; @@ -3150,11 +3161,11 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma _tags_size_ = tags_length1; #line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 3154 "PhotoMetadata.c" +#line 3165 "PhotoMetadata.c" } #line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 3158 "PhotoMetadata.c" +#line 3169 "PhotoMetadata.c" { GExiv2Metadata* _tmp4_ = NULL; gchar** _tmp5_ = NULL; @@ -3173,11 +3184,11 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma _tags_size_ = tags_length1; #line 388 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 3177 "PhotoMetadata.c" +#line 3188 "PhotoMetadata.c" } #line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 3181 "PhotoMetadata.c" +#line 3192 "PhotoMetadata.c" { GExiv2Metadata* _tmp7_ = NULL; gchar** _tmp8_ = NULL; @@ -3196,12 +3207,12 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma _tags_size_ = tags_length1; #line 392 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 3200 "PhotoMetadata.c" +#line 3211 "PhotoMetadata.c" } default: #line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 3205 "PhotoMetadata.c" +#line 3216 "PhotoMetadata.c" } #line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = tags; @@ -3211,7 +3222,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma if (_tmp11_ == NULL) { #line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = TRUE; -#line 3215 "PhotoMetadata.c" +#line 3226 "PhotoMetadata.c" } else { gchar** _tmp12_ = NULL; gint _tmp12__length1 = 0; @@ -3221,7 +3232,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma _tmp12__length1 = tags_length1; #line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = _tmp12__length1 == 0; -#line 3225 "PhotoMetadata.c" +#line 3236 "PhotoMetadata.c" } #line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp10_) { @@ -3239,7 +3250,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma compare_func_target_destroy_notify = NULL; #line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3243 "PhotoMetadata.c" +#line 3254 "PhotoMetadata.c" } #line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = compare_func; @@ -3261,7 +3272,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma _tmp15_ = tags; #line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15__length1 = tags_length1; -#line 3265 "PhotoMetadata.c" +#line 3276 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; @@ -3273,14 +3284,14 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma tag_collection_length1 = _tmp15__length1; #line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp15__length1; tag_it = tag_it + 1) { -#line 3277 "PhotoMetadata.c" +#line 3288 "PhotoMetadata.c" gchar* _tmp16_ = NULL; gchar* tag = NULL; #line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = g_strdup (tag_collection[tag_it]); #line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp16_; -#line 3284 "PhotoMetadata.c" +#line 3295 "PhotoMetadata.c" { GeeCollection* _tmp17_ = NULL; const gchar* _tmp18_ = NULL; @@ -3292,7 +3303,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma gee_collection_add (_tmp17_, _tmp18_); #line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 3296 "PhotoMetadata.c" +#line 3307 "PhotoMetadata.c" } } } @@ -3310,7 +3321,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma compare_func_target_destroy_notify = NULL; #line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3314 "PhotoMetadata.c" +#line 3325 "PhotoMetadata.c" } @@ -3364,7 +3375,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp4_ = exif_tags; #line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_ != NULL) { -#line 3368 "PhotoMetadata.c" +#line 3379 "PhotoMetadata.c" GeeCollection* _tmp5_ = NULL; gint _tmp6_ = 0; gint _tmp7_ = 0; @@ -3376,15 +3387,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp7_ = _tmp6_; #line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp7_ > 0; -#line 3380 "PhotoMetadata.c" +#line 3391 "PhotoMetadata.c" } else { #line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = FALSE; -#line 3384 "PhotoMetadata.c" +#line 3395 "PhotoMetadata.c" } #line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_) { -#line 3388 "PhotoMetadata.c" +#line 3399 "PhotoMetadata.c" GeeCollection* _tmp8_ = NULL; GeeCollection* _tmp9_ = NULL; #line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3393,7 +3404,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp9_ = exif_tags; #line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add_all (_tmp8_, _tmp9_); -#line 3397 "PhotoMetadata.c" +#line 3408 "PhotoMetadata.c" } #line 413 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = photo_metadata_get_tags (self, METADATA_DOMAIN_XMP, NULL, NULL, NULL); @@ -3403,7 +3414,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp12_ = xmp_tags; #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp12_ != NULL) { -#line 3407 "PhotoMetadata.c" +#line 3418 "PhotoMetadata.c" GeeCollection* _tmp13_ = NULL; gint _tmp14_ = 0; gint _tmp15_ = 0; @@ -3415,15 +3426,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp15_ = _tmp14_; #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = _tmp15_ > 0; -#line 3419 "PhotoMetadata.c" +#line 3430 "PhotoMetadata.c" } else { #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = FALSE; -#line 3423 "PhotoMetadata.c" +#line 3434 "PhotoMetadata.c" } #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp11_) { -#line 3427 "PhotoMetadata.c" +#line 3438 "PhotoMetadata.c" GeeCollection* _tmp16_ = NULL; GeeCollection* _tmp17_ = NULL; #line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3432,7 +3443,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp17_ = xmp_tags; #line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add_all (_tmp16_, _tmp17_); -#line 3436 "PhotoMetadata.c" +#line 3447 "PhotoMetadata.c" } #line 417 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = photo_metadata_get_tags (self, METADATA_DOMAIN_IPTC, NULL, NULL, NULL); @@ -3442,7 +3453,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp20_ = iptc_tags; #line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp20_ != NULL) { -#line 3446 "PhotoMetadata.c" +#line 3457 "PhotoMetadata.c" GeeCollection* _tmp21_ = NULL; gint _tmp22_ = 0; gint _tmp23_ = 0; @@ -3454,15 +3465,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp23_ = _tmp22_; #line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = _tmp23_ > 0; -#line 3458 "PhotoMetadata.c" +#line 3469 "PhotoMetadata.c" } else { #line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = FALSE; -#line 3462 "PhotoMetadata.c" +#line 3473 "PhotoMetadata.c" } #line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp19_) { -#line 3466 "PhotoMetadata.c" +#line 3477 "PhotoMetadata.c" GeeCollection* _tmp24_ = NULL; GeeCollection* _tmp25_ = NULL; #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3471,7 +3482,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp25_ = iptc_tags; #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add_all (_tmp24_, _tmp25_); -#line 3475 "PhotoMetadata.c" +#line 3486 "PhotoMetadata.c" } #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp27_ = all_tags; @@ -3481,17 +3492,17 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp29_ = _tmp28_; #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp29_ > 0) { -#line 3485 "PhotoMetadata.c" +#line 3496 "PhotoMetadata.c" GeeCollection* _tmp30_ = NULL; #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp30_ = all_tags; #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = _tmp30_; -#line 3491 "PhotoMetadata.c" +#line 3502 "PhotoMetadata.c" } else { #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = NULL; -#line 3495 "PhotoMetadata.c" +#line 3506 "PhotoMetadata.c" } #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp31_ = _g_object_ref0 (_tmp26_); @@ -3515,7 +3526,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun compare_func_target_destroy_notify = NULL; #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3519 "PhotoMetadata.c" +#line 3530 "PhotoMetadata.c" } @@ -3538,7 +3549,7 @@ gchar* photo_metadata_get_tag_label (PhotoMetadata* self, const gchar* tag) { result = _tmp2_; #line 425 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3542 "PhotoMetadata.c" +#line 3553 "PhotoMetadata.c" } @@ -3561,7 +3572,7 @@ gchar* photo_metadata_get_tag_description (PhotoMetadata* self, const gchar* tag result = _tmp2_; #line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3565 "PhotoMetadata.c" +#line 3576 "PhotoMetadata.c" } @@ -3598,7 +3609,7 @@ gchar* photo_metadata_get_string (PhotoMetadata* self, const gchar* tag, Prepare result = _tmp6_; #line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3602 "PhotoMetadata.c" +#line 3613 "PhotoMetadata.c" } @@ -3635,7 +3646,7 @@ gchar* photo_metadata_get_string_interpreted (PhotoMetadata* self, const gchar* result = _tmp6_; #line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3639 "PhotoMetadata.c" +#line 3650 "PhotoMetadata.c" } @@ -3649,7 +3660,7 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t _tmp0_ = tags; #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = tags_length1; -#line 3653 "PhotoMetadata.c" +#line 3664 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; @@ -3661,14 +3672,14 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t tag_collection_length1 = _tmp0__length1; #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 3665 "PhotoMetadata.c" +#line 3676 "PhotoMetadata.c" gchar* _tmp1_ = NULL; gchar* tag = NULL; #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp1_; -#line 3672 "PhotoMetadata.c" +#line 3683 "PhotoMetadata.c" { gchar* value = NULL; const gchar* _tmp2_ = NULL; @@ -3690,13 +3701,13 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t _g_free0 (tag); #line 444 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3694 "PhotoMetadata.c" +#line 3705 "PhotoMetadata.c" } #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 3700 "PhotoMetadata.c" +#line 3711 "PhotoMetadata.c" } } } @@ -3704,7 +3715,7 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t result = NULL; #line 447 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3708 "PhotoMetadata.c" +#line 3719 "PhotoMetadata.c" } @@ -3718,7 +3729,7 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar** _tmp0_ = tags; #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = tags_length1; -#line 3722 "PhotoMetadata.c" +#line 3733 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; @@ -3730,14 +3741,14 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar** tag_collection_length1 = _tmp0__length1; #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 3734 "PhotoMetadata.c" +#line 3745 "PhotoMetadata.c" gchar* _tmp1_ = NULL; gchar* tag = NULL; #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp1_; -#line 3741 "PhotoMetadata.c" +#line 3752 "PhotoMetadata.c" { gchar* value = NULL; const gchar* _tmp2_ = NULL; @@ -3759,13 +3770,13 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar** _g_free0 (tag); #line 454 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3763 "PhotoMetadata.c" +#line 3774 "PhotoMetadata.c" } #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 3769 "PhotoMetadata.c" +#line 3780 "PhotoMetadata.c" } } } @@ -3773,7 +3784,7 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar** result = NULL; #line 457 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3777 "PhotoMetadata.c" +#line 3788 "PhotoMetadata.c" } @@ -3824,7 +3835,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t if (_tmp5_ == NULL) { #line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = TRUE; -#line 3828 "PhotoMetadata.c" +#line 3839 "PhotoMetadata.c" } else { gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; @@ -3834,7 +3845,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t _tmp6__length1 = values_length1; #line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = _tmp6__length1 == 0; -#line 3838 "PhotoMetadata.c" +#line 3849 "PhotoMetadata.c" } #line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_) { @@ -3844,7 +3855,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL); #line 469 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3848 "PhotoMetadata.c" +#line 3859 "PhotoMetadata.c" } #line 471 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); @@ -3858,7 +3869,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t _tmp9_ = values; #line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9__length1 = values_length1; -#line 3862 "PhotoMetadata.c" +#line 3873 "PhotoMetadata.c" { gchar** value_collection = NULL; gint value_collection_length1 = 0; @@ -3870,14 +3881,14 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t value_collection_length1 = _tmp9__length1; #line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (value_it = 0; value_it < _tmp9__length1; value_it = value_it + 1) { -#line 3874 "PhotoMetadata.c" +#line 3885 "PhotoMetadata.c" gchar* _tmp10_ = NULL; gchar* value = NULL; #line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = g_strdup (value_collection[value_it]); #line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value = _tmp10_; -#line 3881 "PhotoMetadata.c" +#line 3892 "PhotoMetadata.c" { gchar* prepped = NULL; const gchar* _tmp11_ = NULL; @@ -3894,7 +3905,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t _tmp14_ = prepped; #line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp14_ != NULL) { -#line 3898 "PhotoMetadata.c" +#line 3909 "PhotoMetadata.c" GeeHashSet* _tmp15_ = NULL; const gchar* _tmp16_ = NULL; gboolean _tmp17_ = FALSE; @@ -3906,15 +3917,15 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t _tmp17_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_); #line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = !_tmp17_; -#line 3910 "PhotoMetadata.c" +#line 3921 "PhotoMetadata.c" } else { #line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = FALSE; -#line 3914 "PhotoMetadata.c" +#line 3925 "PhotoMetadata.c" } #line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp13_) { -#line 3918 "PhotoMetadata.c" +#line 3929 "PhotoMetadata.c" GeeList* _tmp18_ = NULL; const gchar* _tmp19_ = NULL; GeeHashSet* _tmp20_ = NULL; @@ -3931,13 +3942,13 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t _tmp21_ = prepped; #line 480 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_); -#line 3935 "PhotoMetadata.c" +#line 3946 "PhotoMetadata.c" } #line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (prepped); #line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); -#line 3941 "PhotoMetadata.c" +#line 3952 "PhotoMetadata.c" } } } @@ -3949,17 +3960,17 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t _tmp25_ = _tmp24_; #line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp25_ > 0) { -#line 3953 "PhotoMetadata.c" +#line 3964 "PhotoMetadata.c" GeeList* _tmp26_ = NULL; #line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = list; #line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp22_ = _tmp26_; -#line 3959 "PhotoMetadata.c" +#line 3970 "PhotoMetadata.c" } else { #line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp22_ = NULL; -#line 3963 "PhotoMetadata.c" +#line 3974 "PhotoMetadata.c" } #line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp27_ = _g_object_ref0 (_tmp22_); @@ -3973,7 +3984,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL); #line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3977 "PhotoMetadata.c" +#line 3988 "PhotoMetadata.c" } @@ -3987,7 +3998,7 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar** _tmp0_ = tags; #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = tags_length1; -#line 3991 "PhotoMetadata.c" +#line 4002 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; @@ -3999,14 +4010,14 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar** tag_collection_length1 = _tmp0__length1; #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 4003 "PhotoMetadata.c" +#line 4014 "PhotoMetadata.c" gchar* _tmp1_ = NULL; gchar* tag = NULL; #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp1_; -#line 4010 "PhotoMetadata.c" +#line 4021 "PhotoMetadata.c" { GeeList* values = NULL; const gchar* _tmp2_ = NULL; @@ -4023,7 +4034,7 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar** _tmp5_ = values; #line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp5_ != NULL) { -#line 4027 "PhotoMetadata.c" +#line 4038 "PhotoMetadata.c" GeeList* _tmp6_ = NULL; gint _tmp7_ = 0; gint _tmp8_ = 0; @@ -4035,11 +4046,11 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar** _tmp8_ = _tmp7_; #line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = _tmp8_ > 0; -#line 4039 "PhotoMetadata.c" +#line 4050 "PhotoMetadata.c" } else { #line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = FALSE; -#line 4043 "PhotoMetadata.c" +#line 4054 "PhotoMetadata.c" } #line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_) { @@ -4049,13 +4060,13 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar** _g_free0 (tag); #line 497 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4053 "PhotoMetadata.c" +#line 4064 "PhotoMetadata.c" } #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 4059 "PhotoMetadata.c" +#line 4070 "PhotoMetadata.c" } } } @@ -4063,7 +4074,7 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar** result = NULL; #line 500 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4067 "PhotoMetadata.c" +#line 4078 "PhotoMetadata.c" } @@ -4095,7 +4106,7 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch _tmp3_ = prepped; #line 505 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_ == NULL) { -#line 4099 "PhotoMetadata.c" +#line 4110 "PhotoMetadata.c" const gchar* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; #line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4108,7 +4119,7 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch _g_free0 (prepped); #line 508 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 4112 "PhotoMetadata.c" +#line 4123 "PhotoMetadata.c" } #line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = self->priv->exiv2; @@ -4120,7 +4131,7 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch _tmp9_ = gexiv2_metadata_set_tag_string (_tmp6_, _tmp7_, _tmp8_); #line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp9_) { -#line 4124 "PhotoMetadata.c" +#line 4135 "PhotoMetadata.c" const gchar* _tmp10_ = NULL; const gchar* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; @@ -4133,11 +4144,11 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch #line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_warning ("PhotoMetadata.vala:512: Unable to set tag %s to string %s from source " \ "%s", _tmp10_, _tmp11_, _tmp12_); -#line 4136 "PhotoMetadata.c" +#line 4147 "PhotoMetadata.c" } #line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (prepped); -#line 4140 "PhotoMetadata.c" +#line 4151 "PhotoMetadata.c" } @@ -4156,7 +4167,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i _tmp0_ = tags; #line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = tags_length1; -#line 4159 "PhotoMetadata.c" +#line 4170 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; @@ -4168,14 +4179,14 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i tag_collection_length1 = _tmp0__length1; #line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 4171 "PhotoMetadata.c" +#line 4182 "PhotoMetadata.c" gchar* _tmp1_ = NULL; gchar* tag = NULL; #line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); #line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp1_; -#line 4178 "PhotoMetadata.c" +#line 4189 "PhotoMetadata.c" { gboolean _tmp2_ = FALSE; PhotoMetadataSetOption _tmp3_ = 0; @@ -4185,7 +4196,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i if (_tmp3_ == PHOTO_METADATA_SET_OPTION_ALL_DOMAINS) { #line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = TRUE; -#line 4188 "PhotoMetadata.c" +#line 4199 "PhotoMetadata.c" } else { const gchar* _tmp4_ = NULL; MetadataDomain _tmp5_ = 0; @@ -4198,11 +4209,11 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i _tmp6_ = photo_metadata_has_domain (self, _tmp5_); #line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = _tmp6_; -#line 4201 "PhotoMetadata.c" +#line 4212 "PhotoMetadata.c" } #line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp2_) { -#line 4205 "PhotoMetadata.c" +#line 4216 "PhotoMetadata.c" PhotoMetadataSetGenericValue _tmp7_ = NULL; void* _tmp7__target = NULL; const gchar* _tmp8_ = NULL; @@ -4216,11 +4227,11 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i _tmp7_ (_tmp8_, _tmp7__target); #line 522 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" written = TRUE; -#line 4219 "PhotoMetadata.c" +#line 4230 "PhotoMetadata.c" } #line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 4223 "PhotoMetadata.c" +#line 4234 "PhotoMetadata.c" } } } @@ -4228,21 +4239,21 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i _tmp11_ = option; #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp11_ == PHOTO_METADATA_SET_OPTION_AT_LEAST_DEFAULT_DOMAIN) { -#line 4231 "PhotoMetadata.c" +#line 4242 "PhotoMetadata.c" gboolean _tmp12_ = FALSE; #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = written; #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = !_tmp12_; -#line 4237 "PhotoMetadata.c" +#line 4248 "PhotoMetadata.c" } else { #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = FALSE; -#line 4241 "PhotoMetadata.c" +#line 4252 "PhotoMetadata.c" } #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp10_) { -#line 4245 "PhotoMetadata.c" +#line 4256 "PhotoMetadata.c" gchar** _tmp13_ = NULL; gint _tmp13__length1 = 0; #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4251,15 +4262,15 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i _tmp13__length1 = tags_length1; #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = _tmp13__length1 > 0; -#line 4254 "PhotoMetadata.c" +#line 4265 "PhotoMetadata.c" } else { #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = FALSE; -#line 4258 "PhotoMetadata.c" +#line 4269 "PhotoMetadata.c" } #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp9_) { -#line 4262 "PhotoMetadata.c" +#line 4273 "PhotoMetadata.c" MetadataDomain default_domain = 0; gchar** _tmp14_ = NULL; gint _tmp14__length1 = 0; @@ -4292,19 +4303,19 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i _tmp19_ = _tmp18_[0]; #line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ (_tmp19_, _tmp17__target); -#line 4295 "PhotoMetadata.c" +#line 4306 "PhotoMetadata.c" { gint ctr = 0; #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ctr = 1; -#line 4300 "PhotoMetadata.c" +#line 4311 "PhotoMetadata.c" { gboolean _tmp20_ = FALSE; #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp20_ = TRUE; #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 4307 "PhotoMetadata.c" +#line 4318 "PhotoMetadata.c" gint _tmp22_ = 0; gchar** _tmp23_ = NULL; gint _tmp23__length1 = 0; @@ -4316,13 +4327,13 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i MetadataDomain _tmp28_ = 0; #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp20_) { -#line 4319 "PhotoMetadata.c" +#line 4330 "PhotoMetadata.c" gint _tmp21_ = 0; #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp21_ = ctr; #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ctr = _tmp21_ + 1; -#line 4325 "PhotoMetadata.c" +#line 4336 "PhotoMetadata.c" } #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp20_ = FALSE; @@ -4336,7 +4347,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i if (!(_tmp22_ < _tmp23__length1)) { #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 4339 "PhotoMetadata.c" +#line 4350 "PhotoMetadata.c" } #line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp24_ = tags; @@ -4352,7 +4363,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i _tmp28_ = default_domain; #line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp27_ == _tmp28_) { -#line 4355 "PhotoMetadata.c" +#line 4366 "PhotoMetadata.c" PhotoMetadataSetGenericValue _tmp29_ = NULL; void* _tmp29__target = NULL; gchar** _tmp30_ = NULL; @@ -4373,7 +4384,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i _tmp32_ = _tmp30_[_tmp31_]; #line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp29_ (_tmp32_, _tmp29__target); -#line 4376 "PhotoMetadata.c" +#line 4387 "PhotoMetadata.c" } } } @@ -4387,7 +4398,7 @@ static Block1Data* block1_data_ref (Block1Data* _data1_) { g_atomic_int_inc (&_data1_->_ref_count_); #line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data1_; -#line 4390 "PhotoMetadata.c" +#line 4401 "PhotoMetadata.c" } @@ -4396,7 +4407,7 @@ static void block1_data_unref (void * _userdata_) { _data1_ = (Block1Data*) _userdata_; #line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { -#line 4399 "PhotoMetadata.c" +#line 4410 "PhotoMetadata.c" PhotoMetadata* self; #line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data1_->self; @@ -4406,7 +4417,7 @@ static void block1_data_unref (void * _userdata_) { _media_metadata_unref0 (self); #line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block1Data, _data1_); -#line 4409 "PhotoMetadata.c" +#line 4420 "PhotoMetadata.c" } } @@ -4425,14 +4436,14 @@ static void __lambda5_ (Block1Data* _data1_, const gchar* tag) { _tmp1_ = _data1_->value; #line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, _tmp0_, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 4428 "PhotoMetadata.c" +#line 4439 "PhotoMetadata.c" } static void ___lambda5__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { #line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __lambda5_ (self, tag); -#line 4435 "PhotoMetadata.c" +#line 4446 "PhotoMetadata.c" } @@ -4473,7 +4484,7 @@ void photo_metadata_set_all_string (PhotoMetadata* self, gchar** tags, int tags_ block1_data_unref (_data1_); #line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data1_ = NULL; -#line 4476 "PhotoMetadata.c" +#line 4487 "PhotoMetadata.c" } @@ -4484,13 +4495,13 @@ static void _vala_array_add45 (gchar*** array, int* length, int* size, gchar* va *size = (*size) ? (2 * (*size)) : 4; #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 4487 "PhotoMetadata.c" +#line 4498 "PhotoMetadata.c" } #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (*array)[(*length)++] = value; #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (*array)[*length] = NULL; -#line 4493 "PhotoMetadata.c" +#line 4504 "PhotoMetadata.c" } @@ -4501,13 +4512,13 @@ static void _vala_array_add46 (gchar*** array, int* length, int* size, gchar* va *size = (*size) ? (2 * (*size)) : 4; #line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 4504 "PhotoMetadata.c" +#line 4515 "PhotoMetadata.c" } #line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (*array)[(*length)++] = value; #line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (*array)[*length] = NULL; -#line 4510 "PhotoMetadata.c" +#line 4521 "PhotoMetadata.c" } @@ -4539,7 +4550,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, values_length1 = 0; #line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _values_size_ = values_length1; -#line 4542 "PhotoMetadata.c" +#line 4553 "PhotoMetadata.c" { GeeIterator* _value_it = NULL; GeeCollection* _tmp1_ = NULL; @@ -4552,7 +4563,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, _value_it = _tmp2_; #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 4555 "PhotoMetadata.c" +#line 4566 "PhotoMetadata.c" GeeIterator* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; gchar* value = NULL; @@ -4570,7 +4581,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, if (!_tmp4_) { #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 4573 "PhotoMetadata.c" +#line 4584 "PhotoMetadata.c" } #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _value_it; @@ -4588,7 +4599,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, _tmp9_ = prepped; #line 548 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp9_ != NULL) { -#line 4591 "PhotoMetadata.c" +#line 4602 "PhotoMetadata.c" gchar** _tmp10_ = NULL; gint _tmp10__length1 = 0; const gchar* _tmp11_ = NULL; @@ -4603,7 +4614,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, _tmp12_ = g_strdup (_tmp11_); #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_array_add45 (&values, &values_length1, &_values_size_, _tmp12_); -#line 4606 "PhotoMetadata.c" +#line 4617 "PhotoMetadata.c" } else { const gchar* _tmp13_ = NULL; const gchar* _tmp14_ = NULL; @@ -4613,17 +4624,17 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, _tmp14_ = tag; #line 551 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_warning ("PhotoMetadata.vala:551: Unable to set string %s to %s: invalid UTF-8", _tmp13_, _tmp14_); -#line 4616 "PhotoMetadata.c" +#line 4627 "PhotoMetadata.c" } #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (prepped); #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); -#line 4622 "PhotoMetadata.c" +#line 4633 "PhotoMetadata.c" } #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_value_it); -#line 4626 "PhotoMetadata.c" +#line 4637 "PhotoMetadata.c" } #line 554 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = values; @@ -4635,7 +4646,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL); #line 555 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 4638 "PhotoMetadata.c" +#line 4649 "PhotoMetadata.c" } #line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = values; @@ -4655,7 +4666,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, _tmp20_ = gexiv2_metadata_set_tag_multiple (_tmp17_, _tmp18_, _tmp19_); #line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp20_) { -#line 4658 "PhotoMetadata.c" +#line 4669 "PhotoMetadata.c" gchar** _tmp21_ = NULL; gint _tmp21__length1 = 0; const gchar* _tmp22_ = NULL; @@ -4671,11 +4682,11 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, #line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_warning ("PhotoMetadata.vala:564: Unable to set %d strings to tag %s from source" \ " %s", _tmp21__length1, _tmp22_, _tmp23_); -#line 4673 "PhotoMetadata.c" +#line 4684 "PhotoMetadata.c" } #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL); -#line 4677 "PhotoMetadata.c" +#line 4688 "PhotoMetadata.c" } @@ -4684,7 +4695,7 @@ static Block2Data* block2_data_ref (Block2Data* _data2_) { g_atomic_int_inc (&_data2_->_ref_count_); #line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data2_; -#line 4686 "PhotoMetadata.c" +#line 4697 "PhotoMetadata.c" } @@ -4693,7 +4704,7 @@ static void block2_data_unref (void * _userdata_) { _data2_ = (Block2Data*) _userdata_; #line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { -#line 4695 "PhotoMetadata.c" +#line 4706 "PhotoMetadata.c" PhotoMetadata* self; #line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data2_->self; @@ -4703,7 +4714,7 @@ static void block2_data_unref (void * _userdata_) { _media_metadata_unref0 (self); #line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block2Data, _data2_); -#line 4705 "PhotoMetadata.c" +#line 4716 "PhotoMetadata.c" } } @@ -4722,14 +4733,14 @@ static void __lambda6_ (Block2Data* _data2_, const gchar* tag) { _tmp1_ = _data2_->values; #line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string_multiple (self, _tmp0_, _tmp1_); -#line 4724 "PhotoMetadata.c" +#line 4735 "PhotoMetadata.c" } static void ___lambda6__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { #line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __lambda6_ (self, tag); -#line 4731 "PhotoMetadata.c" +#line 4742 "PhotoMetadata.c" } @@ -4770,7 +4781,7 @@ void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags, block2_data_unref (_data2_); #line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data2_ = NULL; -#line 4772 "PhotoMetadata.c" +#line 4783 "PhotoMetadata.c" } @@ -4800,11 +4811,11 @@ gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong* if (value) { #line 575 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *value = _vala_value; -#line 4802 "PhotoMetadata.c" +#line 4813 "PhotoMetadata.c" } #line 575 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4806 "PhotoMetadata.c" +#line 4817 "PhotoMetadata.c" } #line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = self->priv->exiv2; @@ -4820,11 +4831,11 @@ gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong* if (value) { #line 580 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *value = _vala_value; -#line 4822 "PhotoMetadata.c" +#line 4833 "PhotoMetadata.c" } #line 580 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4826 "PhotoMetadata.c" +#line 4837 "PhotoMetadata.c" } @@ -4839,7 +4850,7 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t _tmp0_ = tags; #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = tags_length1; -#line 4841 "PhotoMetadata.c" +#line 4852 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; @@ -4851,14 +4862,14 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t tag_collection_length1 = _tmp0__length1; #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 4853 "PhotoMetadata.c" +#line 4864 "PhotoMetadata.c" gchar* _tmp1_ = NULL; gchar* tag = NULL; #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp1_; -#line 4860 "PhotoMetadata.c" +#line 4871 "PhotoMetadata.c" { const gchar* _tmp2_ = NULL; glong _tmp3_ = 0L; @@ -4879,15 +4890,15 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t if (value) { #line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *value = _vala_value; -#line 4881 "PhotoMetadata.c" +#line 4892 "PhotoMetadata.c" } #line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4885 "PhotoMetadata.c" +#line 4896 "PhotoMetadata.c" } #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 4889 "PhotoMetadata.c" +#line 4900 "PhotoMetadata.c" } } } @@ -4899,11 +4910,11 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t if (value) { #line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *value = _vala_value; -#line 4901 "PhotoMetadata.c" +#line 4912 "PhotoMetadata.c" } #line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4905 "PhotoMetadata.c" +#line 4916 "PhotoMetadata.c" } @@ -4926,7 +4937,7 @@ void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value _tmp3_ = gexiv2_metadata_set_tag_long (_tmp0_, _tmp1_, _tmp2_); #line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp3_) { -#line 4928 "PhotoMetadata.c" +#line 4939 "PhotoMetadata.c" const gchar* _tmp4_ = NULL; glong _tmp5_ = 0L; const gchar* _tmp6_ = NULL; @@ -4939,7 +4950,7 @@ void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value #line 596 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_warning ("PhotoMetadata.vala:596: Unable to set tag %s to long %ld from source %" \ "s", _tmp4_, _tmp5_, _tmp6_); -#line 4940 "PhotoMetadata.c" +#line 4951 "PhotoMetadata.c" } } @@ -4949,7 +4960,7 @@ static Block3Data* block3_data_ref (Block3Data* _data3_) { g_atomic_int_inc (&_data3_->_ref_count_); #line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data3_; -#line 4950 "PhotoMetadata.c" +#line 4961 "PhotoMetadata.c" } @@ -4958,7 +4969,7 @@ static void block3_data_unref (void * _userdata_) { _data3_ = (Block3Data*) _userdata_; #line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { -#line 4959 "PhotoMetadata.c" +#line 4970 "PhotoMetadata.c" PhotoMetadata* self; #line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data3_->self; @@ -4966,7 +4977,7 @@ static void block3_data_unref (void * _userdata_) { _media_metadata_unref0 (self); #line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block3Data, _data3_); -#line 4967 "PhotoMetadata.c" +#line 4978 "PhotoMetadata.c" } } @@ -4985,14 +4996,14 @@ static void __lambda7_ (Block3Data* _data3_, const gchar* tag) { _tmp1_ = _data3_->value; #line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_long (self, _tmp0_, _tmp1_); -#line 4986 "PhotoMetadata.c" +#line 4997 "PhotoMetadata.c" } static void ___lambda7__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { #line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __lambda7_ (self, tag); -#line 4993 "PhotoMetadata.c" +#line 5004 "PhotoMetadata.c" } @@ -5026,7 +5037,7 @@ void photo_metadata_set_all_long (PhotoMetadata* self, gchar** tags, int tags_le block3_data_unref (_data3_); #line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data3_ = NULL; -#line 5027 "PhotoMetadata.c" +#line 5038 "PhotoMetadata.c" } @@ -5065,11 +5076,11 @@ gboolean photo_metadata_get_rational (PhotoMetadata* self, const gchar* tag, Met if (rational) { #line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *rational = _vala_rational; -#line 5066 "PhotoMetadata.c" +#line 5077 "PhotoMetadata.c" } #line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5070 "PhotoMetadata.c" +#line 5081 "PhotoMetadata.c" } @@ -5084,7 +5095,7 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i _tmp0_ = tags; #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = tags_length1; -#line 5085 "PhotoMetadata.c" +#line 5096 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; @@ -5096,14 +5107,14 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i tag_collection_length1 = _tmp0__length1; #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 5097 "PhotoMetadata.c" +#line 5108 "PhotoMetadata.c" gchar* _tmp1_ = NULL; gchar* tag = NULL; #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp1_; -#line 5104 "PhotoMetadata.c" +#line 5115 "PhotoMetadata.c" { const gchar* _tmp2_ = NULL; MetadataRational _tmp3_ = {0}; @@ -5124,15 +5135,15 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i if (rational) { #line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *rational = _vala_rational; -#line 5125 "PhotoMetadata.c" +#line 5136 "PhotoMetadata.c" } #line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5129 "PhotoMetadata.c" +#line 5140 "PhotoMetadata.c" } #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 5133 "PhotoMetadata.c" +#line 5144 "PhotoMetadata.c" } } } @@ -5144,11 +5155,11 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i if (rational) { #line 620 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *rational = _vala_rational; -#line 5145 "PhotoMetadata.c" +#line 5156 "PhotoMetadata.c" } #line 620 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5149 "PhotoMetadata.c" +#line 5160 "PhotoMetadata.c" } @@ -5182,7 +5193,7 @@ void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, Metadat _tmp6_ = gexiv2_metadata_set_exif_tag_rational (_tmp0_, _tmp1_, _tmp3_, _tmp5_); #line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp6_) { -#line 5183 "PhotoMetadata.c" +#line 5194 "PhotoMetadata.c" const gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; @@ -5200,7 +5211,7 @@ void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, Metadat "e %s", _tmp7_, _tmp9_, _tmp10_); #line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp9_); -#line 5200 "PhotoMetadata.c" +#line 5211 "PhotoMetadata.c" } } @@ -5210,7 +5221,7 @@ static Block4Data* block4_data_ref (Block4Data* _data4_) { g_atomic_int_inc (&_data4_->_ref_count_); #line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data4_; -#line 5210 "PhotoMetadata.c" +#line 5221 "PhotoMetadata.c" } @@ -5219,7 +5230,7 @@ static void block4_data_unref (void * _userdata_) { _data4_ = (Block4Data*) _userdata_; #line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) { -#line 5219 "PhotoMetadata.c" +#line 5230 "PhotoMetadata.c" PhotoMetadata* self; #line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data4_->self; @@ -5227,7 +5238,7 @@ static void block4_data_unref (void * _userdata_) { _media_metadata_unref0 (self); #line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block4Data, _data4_); -#line 5227 "PhotoMetadata.c" +#line 5238 "PhotoMetadata.c" } } @@ -5246,14 +5257,14 @@ static void __lambda8_ (Block4Data* _data4_, const gchar* tag) { _tmp1_ = _data4_->rational; #line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_rational (self, _tmp0_, &_tmp1_); -#line 5246 "PhotoMetadata.c" +#line 5257 "PhotoMetadata.c" } static void ___lambda8__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { #line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __lambda8_ (self, tag); -#line 5253 "PhotoMetadata.c" +#line 5264 "PhotoMetadata.c" } @@ -5289,7 +5300,7 @@ void photo_metadata_set_all_rational (PhotoMetadata* self, gchar** tags, int tag block4_data_unref (_data4_); #line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data4_ = NULL; -#line 5289 "PhotoMetadata.c" +#line 5300 "PhotoMetadata.c" } @@ -5320,7 +5331,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar _g_free0 (value); #line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5320 "PhotoMetadata.c" +#line 5331 "PhotoMetadata.c" } { const gchar* _tmp3_ = NULL; @@ -5333,7 +5344,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar switch (_tmp4_) { #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 5333 "PhotoMetadata.c" +#line 5344 "PhotoMetadata.c" { MetadataDateTime* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; @@ -5347,7 +5358,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar _tmp5_ = _tmp7_; #line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5347 "PhotoMetadata.c" +#line 5358 "PhotoMetadata.c" goto __catch26_g_error; } #line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5362,11 +5373,11 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar _g_free0 (value); #line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5362 "PhotoMetadata.c" +#line 5373 "PhotoMetadata.c" } #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 5366 "PhotoMetadata.c" +#line 5377 "PhotoMetadata.c" { #line 647 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; @@ -5374,12 +5385,12 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar _g_free0 (value); #line 647 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5374 "PhotoMetadata.c" +#line 5385 "PhotoMetadata.c" } default: #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 5379 "PhotoMetadata.c" +#line 5390 "PhotoMetadata.c" { MetadataDateTime* _tmp9_ = NULL; const gchar* _tmp10_ = NULL; @@ -5393,7 +5404,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar _tmp9_ = _tmp11_; #line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5393 "PhotoMetadata.c" +#line 5404 "PhotoMetadata.c" goto __catch26_g_error; } #line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5408,7 +5419,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar _g_free0 (value); #line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5408 "PhotoMetadata.c" +#line 5419 "PhotoMetadata.c" } } } @@ -5442,7 +5453,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar _g_free0 (value); #line 656 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5442 "PhotoMetadata.c" +#line 5453 "PhotoMetadata.c" } __finally26: #line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5453,7 +5464,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar g_clear_error (&_inner_error_); #line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 5453 "PhotoMetadata.c" +#line 5464 "PhotoMetadata.c" } @@ -5467,7 +5478,7 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar _tmp0_ = tags; #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = tags_length1; -#line 5467 "PhotoMetadata.c" +#line 5478 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; @@ -5479,14 +5490,14 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar tag_collection_length1 = _tmp0__length1; #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 5479 "PhotoMetadata.c" +#line 5490 "PhotoMetadata.c" gchar* _tmp1_ = NULL; gchar* tag = NULL; #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp1_; -#line 5486 "PhotoMetadata.c" +#line 5497 "PhotoMetadata.c" { MetadataDateTime* date_time = NULL; const gchar* _tmp2_ = NULL; @@ -5508,13 +5519,13 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar _g_free0 (tag); #line 664 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5508 "PhotoMetadata.c" +#line 5519 "PhotoMetadata.c" } #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _metadata_date_time_unref0 (date_time); #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 5514 "PhotoMetadata.c" +#line 5525 "PhotoMetadata.c" } } } @@ -5522,7 +5533,7 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar result = NULL; #line 667 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5522 "PhotoMetadata.c" +#line 5533 "PhotoMetadata.c" } @@ -5543,7 +5554,7 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada switch (_tmp1_) { #line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 5543 "PhotoMetadata.c" +#line 5554 "PhotoMetadata.c" { const gchar* _tmp2_ = NULL; MetadataDateTime* _tmp3_ = NULL; @@ -5563,11 +5574,11 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada _g_free0 (_tmp5_); #line 674 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 5563 "PhotoMetadata.c" +#line 5574 "PhotoMetadata.c" } #line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 5567 "PhotoMetadata.c" +#line 5578 "PhotoMetadata.c" { const gchar* _tmp6_ = NULL; MetadataDateTime* _tmp7_ = NULL; @@ -5587,12 +5598,12 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada _g_free0 (_tmp9_); #line 678 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 5587 "PhotoMetadata.c" +#line 5598 "PhotoMetadata.c" } default: #line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 5592 "PhotoMetadata.c" +#line 5603 "PhotoMetadata.c" { const gchar* _tmp10_ = NULL; const gchar* _tmp11_ = NULL; @@ -5614,7 +5625,7 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada "supported metadata domain %s", _tmp10_, _tmp11_, (_tmp14_ != NULL) ? _tmp14_->value_name : NULL); #line 685 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 5613 "PhotoMetadata.c" +#line 5624 "PhotoMetadata.c" } } } @@ -5623,7 +5634,7 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada static gpointer _metadata_date_time_ref0 (gpointer self) { #line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? metadata_date_time_ref (self) : NULL; -#line 5622 "PhotoMetadata.c" +#line 5633 "PhotoMetadata.c" } @@ -5632,7 +5643,7 @@ static Block5Data* block5_data_ref (Block5Data* _data5_) { g_atomic_int_inc (&_data5_->_ref_count_); #line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data5_; -#line 5631 "PhotoMetadata.c" +#line 5642 "PhotoMetadata.c" } @@ -5641,7 +5652,7 @@ static void block5_data_unref (void * _userdata_) { _data5_ = (Block5Data*) _userdata_; #line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data5_->_ref_count_)) { -#line 5640 "PhotoMetadata.c" +#line 5651 "PhotoMetadata.c" PhotoMetadata* self; #line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data5_->self; @@ -5651,7 +5662,7 @@ static void block5_data_unref (void * _userdata_) { _media_metadata_unref0 (self); #line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block5Data, _data5_); -#line 5650 "PhotoMetadata.c" +#line 5661 "PhotoMetadata.c" } } @@ -5670,14 +5681,14 @@ static void __lambda9_ (Block5Data* _data5_, const gchar* tag) { _tmp1_ = _data5_->date_time; #line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_date_time (self, _tmp0_, _tmp1_); -#line 5669 "PhotoMetadata.c" +#line 5680 "PhotoMetadata.c" } static void ___lambda9__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { #line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __lambda9_ (self, tag); -#line 5676 "PhotoMetadata.c" +#line 5687 "PhotoMetadata.c" } @@ -5718,7 +5729,7 @@ void photo_metadata_set_all_date_time (PhotoMetadata* self, gchar** tags, int ta block5_data_unref (_data5_); #line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data5_ = NULL; -#line 5717 "PhotoMetadata.c" +#line 5728 "PhotoMetadata.c" } @@ -5752,7 +5763,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ _tmp0_ = self->priv->exif; #line 695 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ == NULL) { -#line 5751 "PhotoMetadata.c" +#line 5762 "PhotoMetadata.c" guint8* _tmp1_ = NULL; gint _tmp1__length1 = 0; #line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5763,13 +5774,13 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ if (result_length1) { #line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *result_length1 = _tmp1__length1; -#line 5762 "PhotoMetadata.c" +#line 5773 "PhotoMetadata.c" } #line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp1_; #line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5768 "PhotoMetadata.c" +#line 5779 "PhotoMetadata.c" } #line 700 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = self->priv->exif; @@ -5787,7 +5798,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ _tmp6_ = include_preview; #line 702 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp6_) { -#line 5786 "PhotoMetadata.c" +#line 5797 "PhotoMetadata.c" ExifData* _tmp7_ = NULL; ExifData* _tmp8_ = NULL; #line 703 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5798,7 +5809,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ _tmp8_ = self->priv->exif; #line 704 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_->size = (guint) 0; -#line 5797 "PhotoMetadata.c" +#line 5808 "PhotoMetadata.c" } #line 707 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" flattened = NULL; @@ -5818,21 +5829,21 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ _tmp11_ = saved_size; #line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp11_ > ((guint) 0)) { -#line 5817 "PhotoMetadata.c" +#line 5828 "PhotoMetadata.c" guchar* _tmp12_ = NULL; #line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = saved_data; #line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = _tmp12_ != NULL; -#line 5823 "PhotoMetadata.c" +#line 5834 "PhotoMetadata.c" } else { #line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = FALSE; -#line 5827 "PhotoMetadata.c" +#line 5838 "PhotoMetadata.c" } #line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp10_) { -#line 5831 "PhotoMetadata.c" +#line 5842 "PhotoMetadata.c" guint _tmp13_ = 0U; guint8* _tmp14_ = NULL; guint8* _tmp15_ = NULL; @@ -5874,7 +5885,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ exif_mem_free (_tmp19_, _tmp20_); #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _exif_mem_unref0 (_tmp19_); -#line 5873 "PhotoMetadata.c" +#line 5884 "PhotoMetadata.c" } #line 721 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp21_ = self->priv->exif; @@ -5896,20 +5907,20 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ if (result_length1) { #line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *result_length1 = _tmp25__length1; -#line 5895 "PhotoMetadata.c" +#line 5906 "PhotoMetadata.c" } #line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp25_; #line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5901 "PhotoMetadata.c" +#line 5912 "PhotoMetadata.c" } static guint8* _vala_array_dup5 (guint8* self, int length) { #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_memdup (self, length * sizeof (guint8)); -#line 5908 "PhotoMetadata.c" +#line 5919 "PhotoMetadata.c" } @@ -5945,7 +5956,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le _buffer_size_ = buffer_length1; #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_) { -#line 5944 "PhotoMetadata.c" +#line 5955 "PhotoMetadata.c" guchar* _tmp5_ = NULL; gint _tmp5__length1 = 0; #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5958,7 +5969,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le _tmp0__length1 = _tmp5__length1; #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __tmp0__size_ = _tmp0__length1; -#line 5957 "PhotoMetadata.c" +#line 5968 "PhotoMetadata.c" } else { #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = NULL; @@ -5966,7 +5977,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le _tmp0__length1 = 0; #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __tmp0__size_ = _tmp0__length1; -#line 5965 "PhotoMetadata.c" +#line 5976 "PhotoMetadata.c" } #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = (_tmp0_ != NULL) ? _vala_array_dup5 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); @@ -5980,7 +5991,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le if (result_length1) { #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *result_length1 = _tmp7__length1; -#line 5979 "PhotoMetadata.c" +#line 5990 "PhotoMetadata.c" } #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp7_; @@ -5988,7 +5999,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le buffer = (g_free (buffer), NULL); #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5987 "PhotoMetadata.c" +#line 5998 "PhotoMetadata.c" } @@ -6021,7 +6032,7 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) { _tmp4__length1 = props_length1; #line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_ != NULL) { -#line 6020 "PhotoMetadata.c" +#line 6031 "PhotoMetadata.c" GExiv2PreviewProperties** _tmp5_ = NULL; gint _tmp5__length1 = 0; #line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6030,17 +6041,17 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) { _tmp5__length1 = props_length1; #line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp5__length1; -#line 6029 "PhotoMetadata.c" +#line 6040 "PhotoMetadata.c" } else { #line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = 0; -#line 6033 "PhotoMetadata.c" +#line 6044 "PhotoMetadata.c" } #line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = (guint) _tmp3_; #line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6039 "PhotoMetadata.c" +#line 6050 "PhotoMetadata.c" } @@ -6082,7 +6093,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) { if (_tmp4_ == NULL) { #line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = TRUE; -#line 6081 "PhotoMetadata.c" +#line 6092 "PhotoMetadata.c" } else { GExiv2PreviewProperties** _tmp5_ = NULL; gint _tmp5__length1 = 0; @@ -6095,7 +6106,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) { _tmp6_ = number; #line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = ((guint) _tmp5__length1) <= _tmp6_; -#line 6094 "PhotoMetadata.c" +#line 6105 "PhotoMetadata.c" } #line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_) { @@ -6103,7 +6114,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) { result = NULL; #line 743 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6102 "PhotoMetadata.c" +#line 6113 "PhotoMetadata.c" } #line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = self->priv->source_name; @@ -6123,7 +6134,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_PREVIEW, PhotoPreview); #line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6122 "PhotoMetadata.c" +#line 6133 "PhotoMetadata.c" } @@ -6140,7 +6151,7 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) { _tmp1_ = self->priv->exif; #line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp1_ != NULL) { -#line 6139 "PhotoMetadata.c" +#line 6150 "PhotoMetadata.c" ExifMem* _tmp2_ = NULL; ExifMem* _tmp3_ = NULL; ExifData* _tmp4_ = NULL; @@ -6167,7 +6178,7 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) { _tmp7_ = self->priv->exif; #line 753 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_->size = (guint) 0; -#line 6166 "PhotoMetadata.c" +#line 6177 "PhotoMetadata.c" } } @@ -6185,7 +6196,7 @@ void photo_metadata_remove_tag (PhotoMetadata* self, const gchar* tag) { _tmp1_ = tag; #line 758 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gexiv2_metadata_clear_tag (_tmp0_, _tmp1_); -#line 6184 "PhotoMetadata.c" +#line 6195 "PhotoMetadata.c" } @@ -6198,7 +6209,7 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len _tmp0_ = tags; #line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = tags_length1; -#line 6197 "PhotoMetadata.c" +#line 6208 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; @@ -6210,14 +6221,14 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len tag_collection_length1 = _tmp0__length1; #line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 6209 "PhotoMetadata.c" +#line 6220 "PhotoMetadata.c" gchar* _tmp1_ = NULL; gchar* tag = NULL; #line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); #line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp1_; -#line 6216 "PhotoMetadata.c" +#line 6227 "PhotoMetadata.c" { const gchar* _tmp2_ = NULL; #line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6226,7 +6237,7 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len photo_metadata_remove_tag (self, _tmp2_); #line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 6225 "PhotoMetadata.c" +#line 6236 "PhotoMetadata.c" } } } @@ -6243,7 +6254,7 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) { switch (_tmp0_) { #line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 6242 "PhotoMetadata.c" +#line 6253 "PhotoMetadata.c" { GExiv2Metadata* _tmp1_ = NULL; #line 769 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6252,11 +6263,11 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) { gexiv2_metadata_clear_exif (_tmp1_); #line 770 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 6251 "PhotoMetadata.c" +#line 6262 "PhotoMetadata.c" } #line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 6255 "PhotoMetadata.c" +#line 6266 "PhotoMetadata.c" { GExiv2Metadata* _tmp2_ = NULL; #line 773 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6265,11 +6276,11 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) { gexiv2_metadata_clear_xmp (_tmp2_); #line 774 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 6264 "PhotoMetadata.c" +#line 6275 "PhotoMetadata.c" } #line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 6268 "PhotoMetadata.c" +#line 6279 "PhotoMetadata.c" { GExiv2Metadata* _tmp3_ = NULL; #line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6278,12 +6289,12 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) { gexiv2_metadata_clear_iptc (_tmp3_); #line 778 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 6277 "PhotoMetadata.c" +#line 6288 "PhotoMetadata.c" } default: #line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 6282 "PhotoMetadata.c" +#line 6293 "PhotoMetadata.c" } } @@ -6296,7 +6307,7 @@ void photo_metadata_clear (PhotoMetadata* self) { _tmp0_ = self->priv->exiv2; #line 783 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gexiv2_metadata_clear (_tmp0_); -#line 6295 "PhotoMetadata.c" +#line 6306 "PhotoMetadata.c" } @@ -6317,7 +6328,7 @@ MetadataDateTime* photo_metadata_get_modification_date_time (PhotoMetadata* self result = _tmp1_; #line 794 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6316 "PhotoMetadata.c" +#line 6327 "PhotoMetadata.c" } @@ -6331,7 +6342,7 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat _tmp0_ = date_time; #line 799 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ != NULL) { -#line 6330 "PhotoMetadata.c" +#line 6341 "PhotoMetadata.c" gchar** _tmp1_ = NULL; gint _tmp1__length1 = 0; MetadataDateTime* _tmp2_ = NULL; @@ -6346,7 +6357,7 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat _tmp3_ = option; #line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_); -#line 6345 "PhotoMetadata.c" +#line 6356 "PhotoMetadata.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; @@ -6356,7 +6367,7 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat _tmp4__length1 = photo_metadata_DATE_TIME_TAGS_length1; #line 802 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1); -#line 6355 "PhotoMetadata.c" +#line 6366 "PhotoMetadata.c" } } @@ -6378,7 +6389,7 @@ MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self) { result = _tmp1_; #line 815 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6377 "PhotoMetadata.c" +#line 6388 "PhotoMetadata.c" } @@ -6392,7 +6403,7 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim _tmp0_ = date_time; #line 820 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ != NULL) { -#line 6391 "PhotoMetadata.c" +#line 6402 "PhotoMetadata.c" gchar** _tmp1_ = NULL; gint _tmp1__length1 = 0; MetadataDateTime* _tmp2_ = NULL; @@ -6407,7 +6418,7 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim _tmp3_ = option; #line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_); -#line 6406 "PhotoMetadata.c" +#line 6417 "PhotoMetadata.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; @@ -6417,7 +6428,7 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim _tmp4__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1; #line 823 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1); -#line 6416 "PhotoMetadata.c" +#line 6427 "PhotoMetadata.c" } } @@ -6439,7 +6450,7 @@ MetadataDateTime* photo_metadata_get_digitized_date_time (PhotoMetadata* self) { result = _tmp1_; #line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6438 "PhotoMetadata.c" +#line 6449 "PhotoMetadata.c" } @@ -6453,7 +6464,7 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi _tmp0_ = date_time; #line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ != NULL) { -#line 6452 "PhotoMetadata.c" +#line 6463 "PhotoMetadata.c" gchar** _tmp1_ = NULL; gint _tmp1__length1 = 0; MetadataDateTime* _tmp2_ = NULL; @@ -6468,7 +6479,7 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi _tmp3_ = option; #line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_); -#line 6467 "PhotoMetadata.c" +#line 6478 "PhotoMetadata.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; @@ -6478,7 +6489,7 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi _tmp4__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1; #line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1); -#line 6477 "PhotoMetadata.c" +#line 6488 "PhotoMetadata.c" } } @@ -6499,7 +6510,7 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada _tmp1_ = creation; #line 845 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp1_ == NULL) { -#line 6498 "PhotoMetadata.c" +#line 6509 "PhotoMetadata.c" MetadataDateTime* _tmp2_ = NULL; #line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = photo_metadata_get_digitized_date_time (self); @@ -6507,20 +6518,20 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada _metadata_date_time_unref0 (creation); #line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" creation = _tmp2_; -#line 6506 "PhotoMetadata.c" +#line 6517 "PhotoMetadata.c" } #line 848 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = creation; #line 848 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6512 "PhotoMetadata.c" +#line 6523 "PhotoMetadata.c" } static gpointer _dimensions_dup0 (gpointer self) { #line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? dimensions_dup (self) : NULL; -#line 6519 "PhotoMetadata.c" +#line 6530 "PhotoMetadata.c" } @@ -6542,19 +6553,19 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { _tmp1__length1 = photo_metadata_HEIGHT_TAGS_length1; #line 867 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_assert (_tmp0__length1 == _tmp1__length1, "WIDTH_TAGS.length == HEIGHT_TAGS.length"); -#line 6541 "PhotoMetadata.c" +#line 6552 "PhotoMetadata.c" { gint ctr = 0; #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ctr = 0; -#line 6546 "PhotoMetadata.c" +#line 6557 "PhotoMetadata.c" { gboolean _tmp2_ = FALSE; #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = TRUE; #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 6553 "PhotoMetadata.c" +#line 6564 "PhotoMetadata.c" gint _tmp4_ = 0; gchar** _tmp5_ = NULL; gint _tmp5__length1 = 0; @@ -6578,13 +6589,13 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { Dimensions* _tmp19_ = NULL; #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp2_) { -#line 6577 "PhotoMetadata.c" +#line 6588 "PhotoMetadata.c" gint _tmp3_ = 0; #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = ctr; #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ctr = _tmp3_ + 1; -#line 6583 "PhotoMetadata.c" +#line 6594 "PhotoMetadata.c" } #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = FALSE; @@ -6598,7 +6609,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { if (!(_tmp4_ < _tmp5__length1)) { #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 6597 "PhotoMetadata.c" +#line 6608 "PhotoMetadata.c" } #line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = photo_metadata_WIDTH_TAGS; @@ -6616,7 +6627,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { if (!_tmp10_) { #line 873 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" continue; -#line 6615 "PhotoMetadata.c" +#line 6626 "PhotoMetadata.c" } #line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = photo_metadata_HEIGHT_TAGS; @@ -6634,7 +6645,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { if (!_tmp15_) { #line 877 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" continue; -#line 6633 "PhotoMetadata.c" +#line 6644 "PhotoMetadata.c" } #line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = width; @@ -6648,7 +6659,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { result = _tmp19_; #line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6647 "PhotoMetadata.c" +#line 6658 "PhotoMetadata.c" } } } @@ -6656,7 +6667,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { result = NULL; #line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6655 "PhotoMetadata.c" +#line 6666 "PhotoMetadata.c" } @@ -6668,7 +6679,7 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim, _tmp0_ = dim; #line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ != NULL) { -#line 6667 "PhotoMetadata.c" +#line 6678 "PhotoMetadata.c" gchar** _tmp1_ = NULL; gint _tmp1__length1 = 0; Dimensions* _tmp2_ = NULL; @@ -6703,7 +6714,7 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim, _tmp8_ = option; #line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_all_long (self, _tmp5_, _tmp5__length1, (glong) _tmp7_, _tmp8_); -#line 6702 "PhotoMetadata.c" +#line 6713 "PhotoMetadata.c" } else { gchar** _tmp9_ = NULL; gint _tmp9__length1 = 0; @@ -6721,7 +6732,7 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim, _tmp10__length1 = photo_metadata_HEIGHT_TAGS_length1; #line 891 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tags (self, _tmp10_, _tmp10__length1); -#line 6720 "PhotoMetadata.c" +#line 6731 "PhotoMetadata.c" } } @@ -6745,7 +6756,7 @@ static gchar* string_strip (const gchar* self) { result = _result_; #line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 6744 "PhotoMetadata.c" +#line 6755 "PhotoMetadata.c" } @@ -6765,7 +6776,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) { result = _tmp1_ != NULL; #line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 6764 "PhotoMetadata.c" +#line 6775 "PhotoMetadata.c" } @@ -6794,7 +6805,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { _tmp1_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG); #line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp1_) { -#line 6793 "PhotoMetadata.c" +#line 6804 "PhotoMetadata.c" GeeList* _tmp2_ = NULL; #line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = photo_metadata_get_string_multiple (self, PHOTO_METADATA_IPHOTO_TITLE_TAG); @@ -6802,7 +6813,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { _g_object_unref0 (_tmp0_); #line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = _tmp2_; -#line 6801 "PhotoMetadata.c" +#line 6812 "PhotoMetadata.c" } else { gchar** _tmp3_ = NULL; gint _tmp3__length1 = 0; @@ -6817,7 +6828,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { _g_object_unref0 (_tmp0_); #line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = _tmp4_; -#line 6816 "PhotoMetadata.c" +#line 6827 "PhotoMetadata.c" } #line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _g_object_ref0 (_tmp0_); @@ -6827,7 +6838,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { _tmp8_ = titles; #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp8_ != NULL) { -#line 6826 "PhotoMetadata.c" +#line 6837 "PhotoMetadata.c" GeeList* _tmp9_ = NULL; gint _tmp10_ = 0; gint _tmp11_ = 0; @@ -6839,15 +6850,15 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { _tmp11_ = _tmp10_; #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = _tmp11_ > 0; -#line 6838 "PhotoMetadata.c" +#line 6849 "PhotoMetadata.c" } else { #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = FALSE; -#line 6842 "PhotoMetadata.c" +#line 6853 "PhotoMetadata.c" } #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp7_) { -#line 6846 "PhotoMetadata.c" +#line 6857 "PhotoMetadata.c" GeeList* _tmp12_ = NULL; gpointer _tmp13_ = NULL; #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6858,13 +6869,13 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { _g_free0 (_tmp6_); #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = (gchar*) _tmp13_; -#line 6857 "PhotoMetadata.c" +#line 6868 "PhotoMetadata.c" } else { #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp6_); #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = NULL; -#line 6863 "PhotoMetadata.c" +#line 6874 "PhotoMetadata.c" } #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = g_strdup (_tmp6_); @@ -6874,7 +6885,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { _tmp15_ = title; #line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp15_ != NULL) { -#line 6873 "PhotoMetadata.c" +#line 6884 "PhotoMetadata.c" const gchar* _tmp16_ = NULL; gchar* _tmp17_ = NULL; #line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6885,7 +6896,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { _g_free0 (title); #line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" title = _tmp17_; -#line 6884 "PhotoMetadata.c" +#line 6895 "PhotoMetadata.c" } #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp21_ = title; @@ -6893,7 +6904,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { _tmp22_ = is_string_empty (_tmp21_); #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp22_) { -#line 6892 "PhotoMetadata.c" +#line 6903 "PhotoMetadata.c" const gchar* _tmp23_ = NULL; gboolean _tmp24_ = FALSE; #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6902,15 +6913,15 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { _tmp24_ = string_contains (_tmp23_, "\n"); #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp20_ = !_tmp24_; -#line 6901 "PhotoMetadata.c" +#line 6912 "PhotoMetadata.c" } else { #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp20_ = FALSE; -#line 6905 "PhotoMetadata.c" +#line 6916 "PhotoMetadata.c" } #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp20_) { -#line 6909 "PhotoMetadata.c" +#line 6920 "PhotoMetadata.c" const gchar* _tmp25_ = NULL; gboolean _tmp26_ = FALSE; #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6919,25 +6930,25 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { _tmp26_ = string_contains (_tmp25_, "\r"); #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = !_tmp26_; -#line 6918 "PhotoMetadata.c" +#line 6929 "PhotoMetadata.c" } else { #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = FALSE; -#line 6922 "PhotoMetadata.c" +#line 6933 "PhotoMetadata.c" } #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp19_) { -#line 6926 "PhotoMetadata.c" +#line 6937 "PhotoMetadata.c" const gchar* _tmp27_ = NULL; #line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp27_ = title; #line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = _tmp27_; -#line 6932 "PhotoMetadata.c" +#line 6943 "PhotoMetadata.c" } else { #line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = NULL; -#line 6936 "PhotoMetadata.c" +#line 6947 "PhotoMetadata.c" } #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp28_ = g_strdup (_tmp18_); @@ -6953,7 +6964,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { _g_object_unref0 (_tmp0_); #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6952 "PhotoMetadata.c" +#line 6963 "PhotoMetadata.c" } @@ -6968,19 +6979,19 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet _tmp1_ = is_string_empty (_tmp0_); #line 952 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp1_) { -#line 6967 "PhotoMetadata.c" +#line 6978 "PhotoMetadata.c" gboolean _tmp2_ = FALSE; #line 953 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG); #line 953 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp2_) { -#line 6973 "PhotoMetadata.c" +#line 6984 "PhotoMetadata.c" const gchar* _tmp3_ = NULL; #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = title; #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, PHOTO_METADATA_IPHOTO_TITLE_TAG, _tmp3_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 6979 "PhotoMetadata.c" +#line 6990 "PhotoMetadata.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; @@ -6996,7 +7007,7 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet _tmp6_ = option; #line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_all_string (self, _tmp4_, _tmp4__length1, _tmp5_, _tmp6_); -#line 6995 "PhotoMetadata.c" +#line 7006 "PhotoMetadata.c" } } else { gchar** _tmp7_ = NULL; @@ -7007,7 +7018,7 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet _tmp7__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1; #line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tags (self, _tmp7_, _tmp7__length1); -#line 7006 "PhotoMetadata.c" +#line 7017 "PhotoMetadata.c" } } @@ -7030,48 +7041,121 @@ static gchar* photo_metadata_real_get_comment (MediaMetadata* base) { result = _tmp1_; #line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 7029 "PhotoMetadata.c" +#line 7040 "PhotoMetadata.c" +} + + +static Block6Data* block6_data_ref (Block6Data* _data6_) { +#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + g_atomic_int_inc (&_data6_->_ref_count_); +#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + return _data6_; +#line 7049 "PhotoMetadata.c" +} + + +static void block6_data_unref (void * _userdata_) { + Block6Data* _data6_; + _data6_ = (Block6Data*) _userdata_; +#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) { +#line 7058 "PhotoMetadata.c" + PhotoMetadata* self; +#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + self = _data6_->self; +#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _g_free0 (_data6_->comment); +#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _media_metadata_unref0 (self); +#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + g_slice_free (Block6Data, _data6_); +#line 7068 "PhotoMetadata.c" + } +} + + +static void ___lambda10_ (Block6Data* _data6_, const gchar* tag) { + PhotoMetadata* self; + const gchar* _tmp0_ = NULL; + const gchar* _tmp1_ = NULL; +#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + self = _data6_->self; +#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + g_return_if_fail (tag != NULL); +#line 977 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp0_ = tag; +#line 977 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp1_ = _data6_->comment; +#line 977 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + photo_metadata_set_string (self, _tmp0_, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS & (~PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF)); +#line 7087 "PhotoMetadata.c" +} + + +static void ____lambda10__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { +#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + ___lambda10_ (self, tag); +#line 7094 "PhotoMetadata.c" } void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, PhotoMetadataSetOption option) { + Block6Data* _data6_; const gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + gchar* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; + gboolean _tmp3_ = FALSE; #line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 973 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _data6_ = g_slice_new0 (Block6Data); +#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _data6_->_ref_count_ = 1; +#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _data6_->self = media_metadata_ref (self); +#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = comment; -#line 973 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = is_string_empty (_tmp0_); -#line 973 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp1_) { -#line 7044 "PhotoMetadata.c" - gchar** _tmp2_ = NULL; - gint _tmp2__length1 = 0; - const gchar* _tmp3_ = NULL; - PhotoMetadataSetOption _tmp4_ = 0; -#line 974 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = photo_metadata_COMMENT_TAGS; -#line 974 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2__length1 = photo_metadata_COMMENT_TAGS_length1; -#line 974 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = comment; -#line 974 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = option; -#line 974 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_all_string (self, _tmp2_, _tmp2__length1, _tmp3_, _tmp4_); -#line 7059 "PhotoMetadata.c" - } else { - gchar** _tmp5_ = NULL; - gint _tmp5__length1 = 0; +#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp1_ = g_strdup (_tmp0_); +#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _g_free0 (_data6_->comment); +#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _data6_->comment = _tmp1_; +#line 975 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp2_ = _data6_->comment; +#line 975 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp3_ = is_string_empty (_tmp2_); +#line 975 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + if (!_tmp3_) { +#line 7126 "PhotoMetadata.c" + gchar** _tmp4_ = NULL; + gint _tmp4__length1 = 0; + PhotoMetadataSetOption _tmp5_ = 0; #line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = photo_metadata_COMMENT_TAGS; + _tmp4_ = photo_metadata_COMMENT_TAGS; #line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5__length1 = photo_metadata_COMMENT_TAGS_length1; + _tmp4__length1 = photo_metadata_COMMENT_TAGS_length1; #line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_remove_tags (self, _tmp5_, _tmp5__length1); -#line 7069 "PhotoMetadata.c" + _tmp5_ = option; +#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + photo_metadata_set_all_generic (self, _tmp4_, _tmp4__length1, _tmp5_, ____lambda10__photo_metadata_set_generic_value, _data6_); +#line 7138 "PhotoMetadata.c" + } else { + gchar** _tmp6_ = NULL; + gint _tmp6__length1 = 0; +#line 981 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp6_ = photo_metadata_COMMENT_TAGS; +#line 981 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp6__length1 = photo_metadata_COMMENT_TAGS_length1; +#line 981 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + photo_metadata_remove_tags (self, _tmp6_, _tmp6__length1); +#line 7148 "PhotoMetadata.c" } +#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + block6_data_unref (_data6_); +#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _data6_ = NULL; +#line 7154 "PhotoMetadata.c" } @@ -7084,114 +7168,114 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa gboolean _tmp23_ = FALSE; GeeSet* _tmp24_ = NULL; GeeSet* _tmp29_ = NULL; -#line 996 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1001 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 997 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" keywords = NULL; -#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_KEYWORD_TAGS; -#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_KEYWORD_TAGS_length1; -#line 7091 "PhotoMetadata.c" +#line 7175 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; -#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection = _tmp0_; -#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection_length1 = _tmp0__length1; -#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 7103 "PhotoMetadata.c" +#line 7187 "PhotoMetadata.c" gchar* _tmp1_ = NULL; gchar* tag = NULL; -#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); -#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp1_; -#line 7110 "PhotoMetadata.c" +#line 7194 "PhotoMetadata.c" { GeeCollection* values = NULL; const gchar* _tmp2_ = NULL; GeeList* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; GeeCollection* _tmp5_ = NULL; -#line 999 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tag; -#line 999 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = photo_metadata_get_string_multiple (self, _tmp2_); -#line 999 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); -#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = values; -#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp5_ != NULL) { -#line 7127 "PhotoMetadata.c" +#line 7211 "PhotoMetadata.c" GeeCollection* _tmp6_ = NULL; gint _tmp7_ = 0; gint _tmp8_ = 0; -#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = values; -#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = gee_collection_get_size (_tmp6_); -#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = _tmp7_; -#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = _tmp8_ > 0; -#line 7139 "PhotoMetadata.c" +#line 7223 "PhotoMetadata.c" } else { -#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = FALSE; -#line 7143 "PhotoMetadata.c" +#line 7227 "PhotoMetadata.c" } -#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_) { -#line 7147 "PhotoMetadata.c" +#line 7231 "PhotoMetadata.c" GeeSet* _tmp9_ = NULL; -#line 1001 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1006 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = keywords; -#line 1001 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1006 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp9_ == NULL) { -#line 7153 "PhotoMetadata.c" +#line 7237 "PhotoMetadata.c" GCompareDataFunc _tmp10_ = NULL; void* _tmp10__target = NULL; GDestroyNotify _tmp10__target_destroy_notify = NULL; GeeSet* _tmp11_ = NULL; -#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = compare_func; -#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10__target = compare_func_target; -#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10__target_destroy_notify = compare_func_target_destroy_notify; -#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func = NULL; -#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target = NULL; -#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target_destroy_notify = NULL; -#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = photo_metadata_create_string_set (self, _tmp10_, _tmp10__target, _tmp10__target_destroy_notify); -#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (keywords); -#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" keywords = _tmp11_; -#line 7176 "PhotoMetadata.c" +#line 7260 "PhotoMetadata.c" } { GeeIterator* _current_value_it = NULL; GeeCollection* _tmp12_ = NULL; GeeIterator* _tmp13_ = NULL; -#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = values; -#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _current_value_it = _tmp13_; -#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 7190 "PhotoMetadata.c" +#line 7274 "PhotoMetadata.c" GeeIterator* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; gchar* current_value = NULL; @@ -7201,111 +7285,111 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa const gchar* _tmp19_ = NULL; gchar* _tmp20_ = NULL; gchar* _tmp21_ = NULL; -#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = _current_value_it; -#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = gee_iterator_next (_tmp14_); -#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp15_) { -#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 7208 "PhotoMetadata.c" +#line 7292 "PhotoMetadata.c" } -#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = _current_value_it; -#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = gee_iterator_get (_tmp16_); -#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_value = (gchar*) _tmp17_; -#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = keywords; -#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = current_value; -#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp20_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp19_); -#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp21_ = _tmp20_; -#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_); -#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp21_); -#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (current_value); -#line 7230 "PhotoMetadata.c" +#line 7314 "PhotoMetadata.c" } -#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_current_value_it); -#line 7234 "PhotoMetadata.c" +#line 7318 "PhotoMetadata.c" } } -#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); -#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 7241 "PhotoMetadata.c" +#line 7325 "PhotoMetadata.c" } } } -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp24_ = keywords; -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp24_ != NULL) { -#line 7249 "PhotoMetadata.c" +#line 7333 "PhotoMetadata.c" GeeSet* _tmp25_ = NULL; gint _tmp26_ = 0; gint _tmp27_ = 0; -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp25_ = keywords; -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp27_ = _tmp26_; -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp23_ = _tmp27_ > 0; -#line 7261 "PhotoMetadata.c" +#line 7345 "PhotoMetadata.c" } else { -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp23_ = FALSE; -#line 7265 "PhotoMetadata.c" +#line 7349 "PhotoMetadata.c" } -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp23_) { -#line 7269 "PhotoMetadata.c" +#line 7353 "PhotoMetadata.c" GeeSet* _tmp28_ = NULL; -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp28_ = keywords; -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp22_ = _tmp28_; -#line 7275 "PhotoMetadata.c" +#line 7359 "PhotoMetadata.c" } else { -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp22_ = NULL; -#line 7279 "PhotoMetadata.c" +#line 7363 "PhotoMetadata.c" } -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp29_ = _g_object_ref0 (_tmp22_); -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp29_; -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (keywords); -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL); -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func = NULL; -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target = NULL; -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target_destroy_notify = NULL; -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 7297 "PhotoMetadata.c" +#line 7381 "PhotoMetadata.c" } static gpointer _hierarchical_keyword_field_ref0 (gpointer self) { -#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? hierarchical_keyword_field_ref (self) : NULL; -#line 7304 "PhotoMetadata.c" +#line 7388 "PhotoMetadata.c" } @@ -7318,7 +7402,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_return_val_if_fail (old != NULL, NULL); #line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 7317 "PhotoMetadata.c" +#line 7401 "PhotoMetadata.c" { GRegex* regex = NULL; const gchar* _tmp0_ = NULL; @@ -7349,7 +7433,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 7348 "PhotoMetadata.c" +#line 7432 "PhotoMetadata.c" goto __catch27_g_regex_error; } #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -7358,7 +7442,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_clear_error (&_inner_error_); #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; -#line 7357 "PhotoMetadata.c" +#line 7441 "PhotoMetadata.c" } #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = regex; @@ -7374,7 +7458,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* _g_regex_unref0 (regex); #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 7373 "PhotoMetadata.c" +#line 7457 "PhotoMetadata.c" goto __catch27_g_regex_error; } #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -7385,7 +7469,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_clear_error (&_inner_error_); #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; -#line 7384 "PhotoMetadata.c" +#line 7468 "PhotoMetadata.c" } #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = _tmp5_; @@ -7399,7 +7483,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* _g_regex_unref0 (regex); #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 7398 "PhotoMetadata.c" +#line 7482 "PhotoMetadata.c" } goto __finally27; __catch27_g_regex_error: @@ -7413,7 +7497,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_assert_not_reached (); #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 7412 "PhotoMetadata.c" +#line 7496 "PhotoMetadata.c" } __finally27: #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -7424,7 +7508,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_clear_error (&_inner_error_); #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; -#line 7423 "PhotoMetadata.c" +#line 7507 "PhotoMetadata.c" } } @@ -7448,7 +7532,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { _tmp3_ = end; #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { -#line 7447 "PhotoMetadata.c" +#line 7531 "PhotoMetadata.c" glong _tmp4_ = 0L; #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = maxlen; @@ -7456,7 +7540,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { result = _tmp4_; #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 7455 "PhotoMetadata.c" +#line 7539 "PhotoMetadata.c" } else { gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; @@ -7468,7 +7552,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { result = (glong) (_tmp5_ - _tmp6_); #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 7467 "PhotoMetadata.c" +#line 7551 "PhotoMetadata.c" } } @@ -7492,21 +7576,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp1_ = offset; #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { -#line 7491 "PhotoMetadata.c" +#line 7575 "PhotoMetadata.c" glong _tmp2_ = 0L; #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = len; #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); -#line 7497 "PhotoMetadata.c" +#line 7581 "PhotoMetadata.c" } else { #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 7501 "PhotoMetadata.c" +#line 7585 "PhotoMetadata.c" } #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 7505 "PhotoMetadata.c" +#line 7589 "PhotoMetadata.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; glong _tmp5_ = 0L; @@ -7518,7 +7602,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = _tmp5_; -#line 7517 "PhotoMetadata.c" +#line 7601 "PhotoMetadata.c" } else { gint _tmp6_ = 0; gint _tmp7_ = 0; @@ -7528,13 +7612,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp7_ = _tmp6_; #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; -#line 7527 "PhotoMetadata.c" +#line 7611 "PhotoMetadata.c" } #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = offset; #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { -#line 7533 "PhotoMetadata.c" +#line 7617 "PhotoMetadata.c" glong _tmp9_ = 0L; glong _tmp10_ = 0L; glong _tmp11_ = 0L; @@ -7548,7 +7632,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp11_ = offset; #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 7547 "PhotoMetadata.c" +#line 7631 "PhotoMetadata.c" } else { glong _tmp12_ = 0L; glong _tmp13_ = 0L; @@ -7558,13 +7642,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp13_ = string_length; #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 7557 "PhotoMetadata.c" +#line 7641 "PhotoMetadata.c" } #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = len; #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { -#line 7563 "PhotoMetadata.c" +#line 7647 "PhotoMetadata.c" glong _tmp15_ = 0L; glong _tmp16_ = 0L; #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -7573,7 +7657,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp16_ = offset; #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; -#line 7572 "PhotoMetadata.c" +#line 7656 "PhotoMetadata.c" } #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = offset; @@ -7593,7 +7677,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { result = _tmp22_; #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 7592 "PhotoMetadata.c" +#line 7676 "PhotoMetadata.c" } @@ -7603,81 +7687,81 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se HierarchicalTagIndex* _tmp4_ = NULL; HierarchicalKeywordField** _tmp5_ = NULL; gint _tmp5__length1 = 0; -#line 1012 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 1012 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail ((index == NULL) || IS_HIERARCHICAL_TAG_INDEX (index)); -#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; -#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; -#line 7610 "PhotoMetadata.c" +#line 7694 "PhotoMetadata.c" { HierarchicalKeywordField** current_field_collection = NULL; gint current_field_collection_length1 = 0; gint _current_field_collection_size_ = 0; gint current_field_it = 0; -#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_field_collection = _tmp0_; -#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_field_collection_length1 = _tmp0__length1; -#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (current_field_it = 0; current_field_it < _tmp0__length1; current_field_it = current_field_it + 1) { -#line 7622 "PhotoMetadata.c" +#line 7706 "PhotoMetadata.c" HierarchicalKeywordField* _tmp1_ = NULL; HierarchicalKeywordField* current_field = NULL; -#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]); -#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_field = _tmp1_; -#line 7629 "PhotoMetadata.c" +#line 7713 "PhotoMetadata.c" { HierarchicalKeywordField* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = current_field; -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp2_->field_name; -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tag (self, _tmp3_); -#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (current_field); -#line 7641 "PhotoMetadata.c" +#line 7725 "PhotoMetadata.c" } } } -#line 1016 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = index; -#line 1016 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_ == NULL) { -#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1022 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 7651 "PhotoMetadata.c" +#line 7735 "PhotoMetadata.c" } -#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; -#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; -#line 7657 "PhotoMetadata.c" +#line 7741 "PhotoMetadata.c" { HierarchicalKeywordField** current_field_collection = NULL; gint current_field_collection_length1 = 0; gint _current_field_collection_size_ = 0; gint current_field_it = 0; -#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_field_collection = _tmp5_; -#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_field_collection_length1 = _tmp5__length1; -#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (current_field_it = 0; current_field_it < _tmp5__length1; current_field_it = current_field_it + 1) { -#line 7669 "PhotoMetadata.c" +#line 7753 "PhotoMetadata.c" HierarchicalKeywordField* _tmp6_ = NULL; HierarchicalKeywordField* current_field = NULL; -#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]); -#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_field = _tmp6_; -#line 7676 "PhotoMetadata.c" +#line 7760 "PhotoMetadata.c" { HierarchicalKeywordField* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; @@ -7686,23 +7770,23 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se HierarchicalKeywordField* _tmp29_ = NULL; const gchar* _tmp30_ = NULL; GeeSet* _tmp31_ = NULL; -#line 1020 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = current_field; -#line 1020 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = _tmp7_->is_writeable; -#line 1020 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp8_) { -#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (current_field); -#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" continue; -#line 7695 "PhotoMetadata.c" +#line 7779 "PhotoMetadata.c" } -#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); -#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" writeable_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_SET, GeeSet); -#line 7701 "PhotoMetadata.c" +#line 7785 "PhotoMetadata.c" { GeeIterator* _current_path_it = NULL; HierarchicalTagIndex* _tmp10_ = NULL; @@ -7710,23 +7794,23 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se GeeCollection* _tmp12_ = NULL; GeeIterator* _tmp13_ = NULL; GeeIterator* _tmp14_ = NULL; -#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = index; -#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = hierarchical_tag_index_get_all_paths (_tmp10_); -#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = _tmp11_; -#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = _tmp13_; -#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_tmp12_); -#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _current_path_it = _tmp14_; -#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 7725 "PhotoMetadata.c" +#line 7809 "PhotoMetadata.c" GeeIterator* _tmp15_ = NULL; gboolean _tmp16_ = FALSE; gchar* current_path = NULL; @@ -7741,80 +7825,80 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se gboolean _tmp24_ = FALSE; GeeSet* _tmp27_ = NULL; const gchar* _tmp28_ = NULL; -#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = _current_path_it; -#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = gee_iterator_next (_tmp15_); -#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp16_) { -#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 7748 "PhotoMetadata.c" +#line 7832 "PhotoMetadata.c" } -#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = _current_path_it; -#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = gee_iterator_get (_tmp17_); -#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_path = (gchar*) _tmp18_; -#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = current_path; -#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp20_ = current_field; -#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp21_ = _tmp20_->path_separator; -#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp22_ = string_replace (_tmp19_, TAG_PATH_SEPARATOR_STRING, _tmp21_); -#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" writeable_path = _tmp22_; -#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1033 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp23_ = current_field; -#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1033 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp24_ = _tmp23_->wants_leading_separator; -#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1033 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp24_) { -#line 7772 "PhotoMetadata.c" +#line 7856 "PhotoMetadata.c" const gchar* _tmp25_ = NULL; gchar* _tmp26_ = NULL; -#line 1029 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp25_ = writeable_path; -#line 1029 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = string_substring (_tmp25_, (glong) 1, (glong) -1); -#line 1029 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (writeable_path); -#line 1029 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" writeable_path = _tmp26_; -#line 7783 "PhotoMetadata.c" +#line 7867 "PhotoMetadata.c" } -#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp27_ = writeable_set; -#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp28_ = writeable_path; -#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), _tmp28_); -#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (writeable_path); -#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (current_path); -#line 7795 "PhotoMetadata.c" +#line 7879 "PhotoMetadata.c" } -#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_current_path_it); -#line 7799 "PhotoMetadata.c" +#line 7883 "PhotoMetadata.c" } -#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp29_ = current_field; -#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp30_ = _tmp29_->field_name; -#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp31_ = writeable_set; -#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string_multiple (self, _tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (writeable_set); -#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (current_field); -#line 7813 "PhotoMetadata.c" +#line 7897 "PhotoMetadata.c" } } } @@ -7828,23 +7912,23 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, GeeTreeSet* _tmp1_ = NULL; GeeCollection* _tmp2_ = NULL; GeeCollection* _tmp28_ = NULL; -#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail ((keywords == NULL) || GEE_IS_COLLECTION (keywords)); -#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = hierarchical_tag_index_new (); -#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" htag_index = _tmp0_; -#line 1040 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); -#line 1040 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" flat_keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SET, GeeSet); -#line 1042 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = keywords; -#line 1042 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp2_ != NULL) { -#line 7843 "PhotoMetadata.c" +#line 7927 "PhotoMetadata.c" GeeSet* _tmp24_ = NULL; HierarchicalTagIndex* _tmp25_ = NULL; GeeCollection* _tmp26_ = NULL; @@ -7853,15 +7937,15 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, GeeIterator* _keyword_it = NULL; GeeCollection* _tmp3_ = NULL; GeeIterator* _tmp4_ = NULL; -#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = keywords; -#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _keyword_it = _tmp4_; -#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 7860 "PhotoMetadata.c" +#line 7944 "PhotoMetadata.c" GeeIterator* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; gchar* keyword = NULL; @@ -7869,52 +7953,52 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, gpointer _tmp8_ = NULL; const gchar* _tmp9_ = NULL; gboolean _tmp10_ = FALSE; -#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _keyword_it; -#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = gee_iterator_next (_tmp5_); -#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp6_) { -#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 7876 "PhotoMetadata.c" +#line 7960 "PhotoMetadata.c" } -#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = _keyword_it; -#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = gee_iterator_get (_tmp7_); -#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" keyword = (gchar*) _tmp8_; -#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1049 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = keyword; -#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1049 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = g_str_has_prefix (_tmp9_, TAG_PATH_SEPARATOR_STRING); -#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1049 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp10_) { -#line 7890 "PhotoMetadata.c" +#line 7974 "PhotoMetadata.c" GeeCollection* path_components = NULL; const gchar* _tmp11_ = NULL; GeeList* _tmp12_ = NULL; -#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = keyword; -#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = hierarchical_tag_utilities_enumerate_path_components (_tmp11_); -#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" path_components = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection); -#line 7900 "PhotoMetadata.c" +#line 7984 "PhotoMetadata.c" { GeeIterator* _component_it = NULL; GeeCollection* _tmp13_ = NULL; GeeIterator* _tmp14_ = NULL; -#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = path_components; -#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _component_it = _tmp14_; -#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 7913 "PhotoMetadata.c" +#line 7997 "PhotoMetadata.c" GeeIterator* _tmp15_ = NULL; gboolean _tmp16_ = FALSE; gchar* component = NULL; @@ -7923,117 +8007,117 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, HierarchicalTagIndex* _tmp19_ = NULL; const gchar* _tmp20_ = NULL; const gchar* _tmp21_ = NULL; -#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = _component_it; -#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = gee_iterator_next (_tmp15_); -#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp16_) { -#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 7930 "PhotoMetadata.c" +#line 8014 "PhotoMetadata.c" } -#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = _component_it; -#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = gee_iterator_get (_tmp17_); -#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" component = (gchar*) _tmp18_; -#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = htag_index; -#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp20_ = component; -#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp21_ = keyword; -#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" hierarchical_tag_index_add_path (_tmp19_, _tmp20_, _tmp21_); -#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (component); -#line 7948 "PhotoMetadata.c" +#line 8032 "PhotoMetadata.c" } -#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_component_it); -#line 7952 "PhotoMetadata.c" +#line 8036 "PhotoMetadata.c" } -#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1049 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (path_components); -#line 7956 "PhotoMetadata.c" +#line 8040 "PhotoMetadata.c" } else { GeeSet* _tmp22_ = NULL; const gchar* _tmp23_ = NULL; -#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1055 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp22_ = flat_keywords; -#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1055 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp23_ = keyword; -#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1055 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_); -#line 7966 "PhotoMetadata.c" +#line 8050 "PhotoMetadata.c" } -#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (keyword); -#line 7970 "PhotoMetadata.c" +#line 8054 "PhotoMetadata.c" } -#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_keyword_it); -#line 7974 "PhotoMetadata.c" +#line 8058 "PhotoMetadata.c" } -#line 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp24_ = flat_keywords; -#line 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp25_ = htag_index; -#line 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = hierarchical_tag_index_get_all_tags (_tmp25_); -#line 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp27_ = _tmp26_; -#line 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_); -#line 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_tmp27_); -#line 7988 "PhotoMetadata.c" +#line 8072 "PhotoMetadata.c" } -#line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp28_ = keywords; -#line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp28_ != NULL) { -#line 7994 "PhotoMetadata.c" +#line 8078 "PhotoMetadata.c" gchar** _tmp29_ = NULL; gint _tmp29__length1 = 0; GeeSet* _tmp30_ = NULL; PhotoMetadataSetOption _tmp31_ = 0; HierarchicalTagIndex* _tmp32_ = NULL; -#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp29_ = photo_metadata_KEYWORD_TAGS; -#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp29__length1 = photo_metadata_KEYWORD_TAGS_length1; -#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp30_ = flat_keywords; -#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp31_ = option; -#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_all_string_multiple (self, _tmp29_, _tmp29__length1, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), _tmp31_); -#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp32_ = htag_index; -#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_internal_set_hierarchical_keywords (self, _tmp32_); -#line 8014 "PhotoMetadata.c" +#line 8098 "PhotoMetadata.c" } else { gchar** _tmp33_ = NULL; gint _tmp33__length1 = 0; -#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp33_ = photo_metadata_KEYWORD_TAGS; -#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp33__length1 = photo_metadata_KEYWORD_TAGS_length1; -#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tags (self, _tmp33_, _tmp33__length1); -#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_internal_set_hierarchical_keywords (self, NULL); -#line 8026 "PhotoMetadata.c" +#line 8110 "PhotoMetadata.c" } -#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (flat_keywords); -#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_tag_index_unref0 (htag_index); -#line 8032 "PhotoMetadata.c" +#line 8116 "PhotoMetadata.c" } @@ -8041,32 +8125,32 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { gboolean result = FALSE; HierarchicalKeywordField** _tmp0_ = NULL; gint _tmp0__length1 = 0; -#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1071 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; -#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; -#line 8046 "PhotoMetadata.c" +#line 8130 "PhotoMetadata.c" { HierarchicalKeywordField** field_collection = NULL; gint field_collection_length1 = 0; gint _field_collection_size_ = 0; gint field_it = 0; -#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" field_collection = _tmp0_; -#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" field_collection_length1 = _tmp0__length1; -#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (field_it = 0; field_it < _tmp0__length1; field_it = field_it + 1) { -#line 8058 "PhotoMetadata.c" +#line 8142 "PhotoMetadata.c" HierarchicalKeywordField* _tmp1_ = NULL; HierarchicalKeywordField* field = NULL; -#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]); -#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" field = _tmp1_; -#line 8065 "PhotoMetadata.c" +#line 8149 "PhotoMetadata.c" { GeeCollection* values = NULL; HierarchicalKeywordField* _tmp2_ = NULL; @@ -8074,61 +8158,61 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { GeeList* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; GeeCollection* _tmp6_ = NULL; -#line 1068 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = field; -#line 1068 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp2_->field_name; -#line 1068 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = photo_metadata_get_string_multiple (self, _tmp3_); -#line 1068 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection); -#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = values; -#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp6_ != NULL) { -#line 8085 "PhotoMetadata.c" +#line 8169 "PhotoMetadata.c" GeeCollection* _tmp7_ = NULL; gint _tmp8_ = 0; gint _tmp9_ = 0; -#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = values; -#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = gee_collection_get_size (_tmp7_); -#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = _tmp8_; -#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _tmp9_ > 0; -#line 8097 "PhotoMetadata.c" +#line 8181 "PhotoMetadata.c" } else { -#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = FALSE; -#line 8101 "PhotoMetadata.c" +#line 8185 "PhotoMetadata.c" } -#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp5_) { -#line 1071 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = TRUE; -#line 1071 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); -#line 1071 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (field); -#line 1071 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8113 "PhotoMetadata.c" +#line 8197 "PhotoMetadata.c" } -#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); -#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (field); -#line 8119 "PhotoMetadata.c" +#line 8203 "PhotoMetadata.c" } } } -#line 1074 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1079 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = FALSE; -#line 1074 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1079 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8127 "PhotoMetadata.c" +#line 8211 "PhotoMetadata.c" } @@ -8140,40 +8224,40 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { HierarchicalKeywordField** _tmp2_ = NULL; gint _tmp2__length1 = 0; GError * _inner_error_ = NULL; -#line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1078 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1083 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_has_hierarchical_keywords (self); -#line 1078 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1083 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_assert (_tmp0_, "has_hierarchical_keywords()"); -#line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_create_string_set (self, NULL, NULL, NULL); -#line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" h_keywords = _tmp1_; -#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; -#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; -#line 8153 "PhotoMetadata.c" +#line 8237 "PhotoMetadata.c" { HierarchicalKeywordField** field_collection = NULL; gint field_collection_length1 = 0; gint _field_collection_size_ = 0; gint field_it = 0; -#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" field_collection = _tmp2_; -#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" field_collection_length1 = _tmp2__length1; -#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (field_it = 0; field_it < _tmp2__length1; field_it = field_it + 1) { -#line 8165 "PhotoMetadata.c" +#line 8249 "PhotoMetadata.c" HierarchicalKeywordField* _tmp3_ = NULL; HierarchicalKeywordField* field = NULL; -#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]); -#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" field = _tmp3_; -#line 8172 "PhotoMetadata.c" +#line 8256 "PhotoMetadata.c" { GeeCollection* values = NULL; HierarchicalKeywordField* _tmp4_ = NULL; @@ -8183,85 +8267,85 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { GeeCollection* _tmp8_ = NULL; GeeArrayList* transformed_values = NULL; GeeArrayList* _tmp12_ = NULL; -#line 1083 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = field; -#line 1083 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _tmp4_->field_name; -#line 1083 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = photo_metadata_get_string_multiple (self, _tmp5_); -#line 1083 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection); -#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = values; -#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp8_ == NULL) { -#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = TRUE; -#line 8196 "PhotoMetadata.c" +#line 8280 "PhotoMetadata.c" } else { GeeCollection* _tmp9_ = NULL; gint _tmp10_ = 0; gint _tmp11_ = 0; -#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = values; -#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = gee_collection_get_size (_tmp9_); -#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = _tmp10_; -#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = _tmp11_ < 1; -#line 8209 "PhotoMetadata.c" +#line 8293 "PhotoMetadata.c" } -#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp7_) { -#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); -#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (field); -#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" continue; -#line 8219 "PhotoMetadata.c" +#line 8303 "PhotoMetadata.c" } -#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1093 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); -#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1093 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" transformed_values = _tmp12_; -#line 8225 "PhotoMetadata.c" +#line 8309 "PhotoMetadata.c" { GeeIterator* _current_value_it = NULL; GeeCollection* _tmp13_ = NULL; GeeIterator* _tmp14_ = NULL; -#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = values; -#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _current_value_it = _tmp14_; -#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 8238 "PhotoMetadata.c" +#line 8322 "PhotoMetadata.c" GeeIterator* _tmp15_ = NULL; gboolean _tmp16_ = FALSE; gchar* current_value = NULL; GeeIterator* _tmp17_ = NULL; gpointer _tmp18_ = NULL; -#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = _current_value_it; -#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = gee_iterator_next (_tmp15_); -#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp16_) { -#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 8252 "PhotoMetadata.c" +#line 8336 "PhotoMetadata.c" } -#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = _current_value_it; -#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = gee_iterator_get (_tmp17_); -#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_value = (gchar*) _tmp18_; -#line 8260 "PhotoMetadata.c" +#line 8344 "PhotoMetadata.c" { GeeList* transformed = NULL; HierarchicalKeywordField* _tmp19_ = NULL; @@ -8270,30 +8354,30 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { GeeList* _tmp22_ = NULL; GeeArrayList* _tmp23_ = NULL; GeeList* _tmp24_ = NULL; -#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = field; -#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp20_ = _tmp19_->transformer; -#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp21_ = current_value; -#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp22_ = keyword_transformer_transform (_tmp20_, _tmp21_, &_inner_error_); -#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" transformed = _tmp22_; -#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8281 "PhotoMetadata.c" +#line 8365 "PhotoMetadata.c" goto __catch28_g_error; } -#line 1092 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp23_ = transformed_values; -#line 1092 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp24_ = transformed; -#line 1092 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_array_list_add_all (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (transformed); -#line 8292 "PhotoMetadata.c" +#line 8376 "PhotoMetadata.c" } goto __finally28; __catch28_g_error: @@ -8302,52 +8386,52 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { const gchar* _tmp25_ = NULL; GError* _tmp26_ = NULL; const gchar* _tmp27_ = NULL; -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _error_ = _inner_error_; -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _inner_error_ = NULL; -#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp25_ = current_value; -#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = _error_; -#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp27_ = _tmp26_->message; -#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_critical ("PhotoMetadata.vala:1094: Failed to transform tag value %s: %s", _tmp25_, _tmp27_); -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + g_critical ("PhotoMetadata.vala:1099: Failed to transform tag value %s: %s", _tmp25_, _tmp27_); +#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_error_free0 (_error_); -#line 8315 "PhotoMetadata.c" +#line 8399 "PhotoMetadata.c" } __finally28: -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (current_value); -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_current_value_it); -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (transformed_values); -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (field); -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (h_keywords); -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_clear_error (&_inner_error_); -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 8338 "PhotoMetadata.c" +#line 8422 "PhotoMetadata.c" } -#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (current_value); -#line 8342 "PhotoMetadata.c" +#line 8426 "PhotoMetadata.c" } -#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_current_value_it); -#line 8346 "PhotoMetadata.c" +#line 8430 "PhotoMetadata.c" } { GeeArrayList* _current_value_list = NULL; @@ -8358,25 +8442,25 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { gint _tmp31_ = 0; gint _tmp32_ = 0; gint _current_value_index = 0; -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp28_ = transformed_values; -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp29_ = _g_object_ref0 (_tmp28_); -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _current_value_list = _tmp29_; -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp30_ = _current_value_list; -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp31_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp32_ = _tmp31_; -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _current_value_size = _tmp32_; -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _current_value_index = -1; -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 8375 "PhotoMetadata.c" +#line 8459 "PhotoMetadata.c" gint _tmp33_ = 0; gint _tmp34_ = 0; gint _tmp35_ = 0; @@ -8390,78 +8474,78 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { const gchar* _tmp41_ = NULL; gchar* _tmp42_ = NULL; const gchar* _tmp43_ = NULL; -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp33_ = _current_value_index; -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _current_value_index = _tmp33_ + 1; -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp34_ = _current_value_index; -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp35_ = _current_value_size; -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!(_tmp34_ < _tmp35_)) { -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 8401 "PhotoMetadata.c" +#line 8485 "PhotoMetadata.c" } -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp36_ = _current_value_list; -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp37_ = _current_value_index; -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp38_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp37_); -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_value = (gchar*) _tmp38_; -#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp39_ = current_value; -#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp40_ = field; -#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp41_ = _tmp40_->path_separator; -#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp42_ = hierarchical_tag_utilities_canonicalize (_tmp39_, _tmp41_); -#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" canonicalized = _tmp42_; -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp43_ = canonicalized; -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp43_ != NULL) { -#line 8425 "PhotoMetadata.c" +#line 8509 "PhotoMetadata.c" GeeSet* _tmp44_ = NULL; const gchar* _tmp45_ = NULL; -#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp44_ = h_keywords; -#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp45_ = canonicalized; -#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection), _tmp45_); -#line 8434 "PhotoMetadata.c" +#line 8518 "PhotoMetadata.c" } -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (canonicalized); -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (current_value); -#line 8440 "PhotoMetadata.c" +#line 8524 "PhotoMetadata.c" } -#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_current_value_list); -#line 8444 "PhotoMetadata.c" +#line 8528 "PhotoMetadata.c" } -#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (transformed_values); -#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); -#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (field); -#line 8452 "PhotoMetadata.c" +#line 8536 "PhotoMetadata.c" } } } -#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1115 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = h_keywords; -#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1115 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8460 "PhotoMetadata.c" +#line 8544 "PhotoMetadata.c" } @@ -8469,17 +8553,17 @@ gboolean photo_metadata_has_orientation (PhotoMetadata* self) { gboolean result = FALSE; GExiv2Metadata* _tmp0_ = NULL; GExiv2Orientation _tmp1_ = 0; -#line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 1114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; -#line 1114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = gexiv2_metadata_get_orientation (_tmp0_); -#line 1114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp1_ == GEXIV2_ORIENTATION_UNSPECIFIED; -#line 1114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8478 "PhotoMetadata.c" +#line 8562 "PhotoMetadata.c" } @@ -8491,58 +8575,58 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) { gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; GExiv2Orientation _tmp4_ = 0; -#line 1118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), 0); -#line 1121 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; -#line 1121 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = gexiv2_metadata_get_orientation (_tmp0_); -#line 1121 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" orientation = _tmp1_; -#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = orientation; -#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_ == GEXIV2_ORIENTATION_UNSPECIFIED) { -#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = TRUE; -#line 8504 "PhotoMetadata.c" +#line 8588 "PhotoMetadata.c" } else { GExiv2Orientation _tmp5_ = 0; -#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = orientation; -#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp5_ < ORIENTATION_MIN; -#line 8511 "PhotoMetadata.c" +#line 8595 "PhotoMetadata.c" } -#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_) { -#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = TRUE; -#line 8517 "PhotoMetadata.c" +#line 8601 "PhotoMetadata.c" } else { GExiv2Orientation _tmp6_ = 0; -#line 1123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = orientation; -#line 1123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = _tmp6_ > ORIENTATION_MAX; -#line 8524 "PhotoMetadata.c" +#line 8608 "PhotoMetadata.c" } -#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp2_) { -#line 1124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = ORIENTATION_TOP_LEFT; -#line 1124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8532 "PhotoMetadata.c" +#line 8616 "PhotoMetadata.c" } else { GExiv2Orientation _tmp7_ = 0; -#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = orientation; -#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = (Orientation) _tmp7_; -#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8541 "PhotoMetadata.c" +#line 8625 "PhotoMetadata.c" } } @@ -8550,15 +8634,15 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) { void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientation) { GExiv2Metadata* _tmp0_ = NULL; Orientation _tmp1_ = 0; -#line 1129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1134 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; -#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = orientation; -#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gexiv2_metadata_set_orientation (_tmp0_, (GExiv2Orientation) _tmp1_); -#line 8557 "PhotoMetadata.c" +#line 8641 "PhotoMetadata.c" } @@ -8576,127 +8660,127 @@ gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar* gboolean _tmp4_ = FALSE; gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 1134 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1139 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; -#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = gexiv2_metadata_get_gps_info (_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_); -#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_longitude = _tmp1_; -#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_latitude = _tmp2_; -#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_altitude = _tmp3_; -#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp4_) { -#line 1137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_long_ref); -#line 1137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_long_ref = NULL; -#line 1138 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_lat_ref); -#line 1138 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_lat_ref = NULL; -#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = FALSE; -#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (longitude) { -#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *longitude = _vala_longitude; -#line 8603 "PhotoMetadata.c" +#line 8687 "PhotoMetadata.c" } -#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (long_ref) { -#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *long_ref = _vala_long_ref; -#line 8609 "PhotoMetadata.c" +#line 8693 "PhotoMetadata.c" } else { -#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_long_ref); -#line 8613 "PhotoMetadata.c" +#line 8697 "PhotoMetadata.c" } -#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (latitude) { -#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *latitude = _vala_latitude; -#line 8619 "PhotoMetadata.c" +#line 8703 "PhotoMetadata.c" } -#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (lat_ref) { -#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *lat_ref = _vala_lat_ref; -#line 8625 "PhotoMetadata.c" +#line 8709 "PhotoMetadata.c" } else { -#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_lat_ref); -#line 8629 "PhotoMetadata.c" +#line 8713 "PhotoMetadata.c" } -#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (altitude) { -#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *altitude = _vala_altitude; -#line 8635 "PhotoMetadata.c" +#line 8719 "PhotoMetadata.c" } -#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8639 "PhotoMetadata.c" +#line 8723 "PhotoMetadata.c" } -#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = photo_metadata_get_string (self, "Exif.GPSInfo.GPSLongitudeRef", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_long_ref); -#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_long_ref = _tmp5_; -#line 1144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1149 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = photo_metadata_get_string (self, "Exif.GPSInfo.GPSLatitudeRef", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1149 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_lat_ref); -#line 1144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1149 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_lat_ref = _tmp6_; -#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = TRUE; -#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (longitude) { -#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *longitude = _vala_longitude; -#line 8659 "PhotoMetadata.c" +#line 8743 "PhotoMetadata.c" } -#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (long_ref) { -#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *long_ref = _vala_long_ref; -#line 8665 "PhotoMetadata.c" +#line 8749 "PhotoMetadata.c" } else { -#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_long_ref); -#line 8669 "PhotoMetadata.c" +#line 8753 "PhotoMetadata.c" } -#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (latitude) { -#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *latitude = _vala_latitude; -#line 8675 "PhotoMetadata.c" +#line 8759 "PhotoMetadata.c" } -#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (lat_ref) { -#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *lat_ref = _vala_lat_ref; -#line 8681 "PhotoMetadata.c" +#line 8765 "PhotoMetadata.c" } else { -#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_lat_ref); -#line 8685 "PhotoMetadata.c" +#line 8769 "PhotoMetadata.c" } -#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (altitude) { -#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *altitude = _vala_altitude; -#line 8691 "PhotoMetadata.c" +#line 8775 "PhotoMetadata.c" } -#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8695 "PhotoMetadata.c" +#line 8779 "PhotoMetadata.c" } @@ -8705,23 +8789,23 @@ gboolean photo_metadata_get_exposure (PhotoMetadata* self, MetadataRational* exp gboolean result = FALSE; MetadataRational _tmp0_ = {0}; gboolean _tmp1_ = FALSE; -#line 1149 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_rational (self, "Exif.Photo.ExposureTime", &_tmp0_); -#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_exposure = _tmp0_; -#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp1_; -#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (exposure) { -#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *exposure = _vala_exposure; -#line 8716 "PhotoMetadata.c" +#line 8800 "PhotoMetadata.c" } -#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8720 "PhotoMetadata.c" +#line 8804 "PhotoMetadata.c" } @@ -8732,37 +8816,37 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) { gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; gchar* _tmp3_ = NULL; -#line 1153 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1160 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_rational (self, "Exif.Photo.ExposureTime", &_tmp0_); -#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1160 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" exposure_time = _tmp0_; -#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1160 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp1_) { -#line 1156 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; -#line 1156 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8743 "PhotoMetadata.c" +#line 8827 "PhotoMetadata.c" } -#line 1158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = metadata_rational_is_valid (&exposure_time); -#line 1158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp2_) { -#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; -#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8753 "PhotoMetadata.c" +#line 8837 "PhotoMetadata.c" } -#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ExposureTime", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp3_; -#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8761 "PhotoMetadata.c" +#line 8845 "PhotoMetadata.c" } @@ -8775,70 +8859,70 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) { gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; glong _tmp4_ = 0L; -#line 1164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_long (self, "Exif.Photo.ISOSpeedRatings", &_tmp0_); -#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_iso = _tmp0_; -#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" fetched_ok = _tmp1_; -#line 1167 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = fetched_ok; -#line 1167 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp2_ == FALSE) { -#line 1168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = FALSE; -#line 1168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (iso) { -#line 1168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *iso = _vala_iso; -#line 8792 "PhotoMetadata.c" +#line 8876 "PhotoMetadata.c" } -#line 1168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8796 "PhotoMetadata.c" +#line 8880 "PhotoMetadata.c" } -#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = _vala_iso; -#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_ < ((glong) 6)) { -#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = TRUE; -#line 8804 "PhotoMetadata.c" +#line 8888 "PhotoMetadata.c" } else { glong _tmp5_ = 0L; -#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _vala_iso; -#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp5_ > ((glong) 409600); -#line 8811 "PhotoMetadata.c" +#line 8895 "PhotoMetadata.c" } -#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_) { -#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = FALSE; -#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (iso) { -#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *iso = _vala_iso; -#line 8821 "PhotoMetadata.c" +#line 8905 "PhotoMetadata.c" } -#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8825 "PhotoMetadata.c" +#line 8909 "PhotoMetadata.c" } -#line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = TRUE; -#line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (iso) { -#line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *iso = _vala_iso; -#line 8833 "PhotoMetadata.c" +#line 8917 "PhotoMetadata.c" } -#line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8837 "PhotoMetadata.c" +#line 8921 "PhotoMetadata.c" } @@ -8848,27 +8932,27 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) { glong _tmp0_ = 0L; gboolean _tmp1_ = FALSE; gchar* _tmp2_ = NULL; -#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1185 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_iso (self, &_tmp0_); -#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1185 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" iso = _tmp0_; -#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1185 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp1_) { -#line 1181 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; -#line 1181 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8859 "PhotoMetadata.c" +#line 8943 "PhotoMetadata.c" } -#line 1183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1188 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ISOSpeedRatings", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1188 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp2_; -#line 1183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1188 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8867 "PhotoMetadata.c" +#line 8951 "PhotoMetadata.c" } @@ -8877,23 +8961,23 @@ gboolean photo_metadata_get_aperture (PhotoMetadata* self, MetadataRational* ape gboolean result = FALSE; MetadataRational _tmp0_ = {0}; gboolean _tmp1_ = FALSE; -#line 1186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_rational (self, "Exif.Photo.FNumber", &_tmp0_); -#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_aperture = _tmp0_; -#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp1_; -#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (aperture) { -#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *aperture = _vala_aperture; -#line 8888 "PhotoMetadata.c" +#line 8972 "PhotoMetadata.c" } -#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8892 "PhotoMetadata.c" +#line 8976 "PhotoMetadata.c" } @@ -8917,105 +9001,105 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f gchar* _tmp13_ = NULL; gchar* _tmp14_ = NULL; gchar* _tmp15_ = NULL; -#line 1190 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_aperture (self, &_tmp0_); -#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" aperture = _tmp0_; -#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp1_) { -#line 1193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; -#line 1193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8928 "PhotoMetadata.c" +#line 9012 "PhotoMetadata.c" } -#line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = aperture; -#line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp2_.numerator; -#line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = aperture; -#line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _tmp4_.denominator; -#line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" aperture_value = ((gdouble) _tmp3_) / ((gdouble) _tmp5_); -#line 1196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = aperture_value; -#line 1196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" aperture_value = ((gint) (_tmp6_ * 10.0)) / 10.0; -#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = pango_formatted; -#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp8_) { -#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = "<i>f</i>/"; -#line 8950 "PhotoMetadata.c" +#line 9034 "PhotoMetadata.c" } else { -#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = "f/"; -#line 8954 "PhotoMetadata.c" +#line 9038 "PhotoMetadata.c" } -#line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = aperture_value; -#line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (fmod (_tmp10_, 1) == ((gdouble) 0)) { -#line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = "%.0f"; -#line 8962 "PhotoMetadata.c" +#line 9046 "PhotoMetadata.c" } else { -#line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = "%.1f"; -#line 8966 "PhotoMetadata.c" +#line 9050 "PhotoMetadata.c" } -#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = aperture_value; -#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = g_strdup_printf (_tmp9_, _tmp11_); -#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = _tmp12_; -#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = g_strconcat (_tmp7_, _tmp13_, NULL); -#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = _tmp14_; -#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp13_); -#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp15_; -#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8984 "PhotoMetadata.c" +#line 9068 "PhotoMetadata.c" } gchar* photo_metadata_get_camera_make (PhotoMetadata* self) { gchar* result = NULL; gchar* _tmp0_ = NULL; -#line 1202 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1207 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1208 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Image.Make", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1208 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp0_; -#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1208 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8999 "PhotoMetadata.c" +#line 9083 "PhotoMetadata.c" } gchar* photo_metadata_get_camera_model (PhotoMetadata* self) { gchar* result = NULL; gchar* _tmp0_ = NULL; -#line 1206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1207 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Image.Model", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1207 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp0_; -#line 1207 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9014 "PhotoMetadata.c" +#line 9098 "PhotoMetadata.c" } @@ -9024,38 +9108,38 @@ gboolean photo_metadata_get_flash (PhotoMetadata* self, glong* flash) { gboolean result = FALSE; glong _tmp0_ = 0L; gboolean _tmp1_ = FALSE; -#line 1210 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1215 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_long (self, "Exif.Photo.Flash", &_tmp0_); -#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_flash = _tmp0_; -#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp1_; -#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (flash) { -#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *flash = _vala_flash; -#line 9035 "PhotoMetadata.c" +#line 9119 "PhotoMetadata.c" } -#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9039 "PhotoMetadata.c" +#line 9123 "PhotoMetadata.c" } gchar* photo_metadata_get_flash_string (PhotoMetadata* self) { gchar* result = NULL; gchar* _tmp0_ = NULL; -#line 1215 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1220 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.Flash", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp0_; -#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9054 "PhotoMetadata.c" +#line 9138 "PhotoMetadata.c" } @@ -9064,38 +9148,38 @@ gboolean photo_metadata_get_focal_length (PhotoMetadata* self, MetadataRational* gboolean result = FALSE; MetadataRational _tmp0_ = {0}; gboolean _tmp1_ = FALSE; -#line 1220 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_rational (self, "Exif.Photo.FocalLength", &_tmp0_); -#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_focal_length = _tmp0_; -#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp1_; -#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (focal_length) { -#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *focal_length = _vala_focal_length; -#line 9075 "PhotoMetadata.c" +#line 9159 "PhotoMetadata.c" } -#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9079 "PhotoMetadata.c" +#line 9163 "PhotoMetadata.c" } gchar* photo_metadata_get_focal_length_string (PhotoMetadata* self) { gchar* result = NULL; gchar* _tmp0_ = NULL; -#line 1224 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1229 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.FocalLength", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp0_; -#line 1225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9094 "PhotoMetadata.c" +#line 9178 "PhotoMetadata.c" } @@ -9104,49 +9188,49 @@ gchar* photo_metadata_get_artist (PhotoMetadata* self) { gchar** _tmp0_ = NULL; gint _tmp0__length1 = 0; gchar* _tmp1_ = NULL; -#line 1234 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_ARTIST_TAGS; -#line 1235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_ARTIST_TAGS_length1; -#line 1235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_first_string_interpreted (self, _tmp0_, _tmp0__length1); -#line 1235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp1_; -#line 1235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9115 "PhotoMetadata.c" +#line 9199 "PhotoMetadata.c" } gchar* photo_metadata_get_copyright (PhotoMetadata* self) { gchar* result = NULL; gchar* _tmp0_ = NULL; -#line 1238 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Image.Copyright", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp0_; -#line 1239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9130 "PhotoMetadata.c" +#line 9214 "PhotoMetadata.c" } gchar* photo_metadata_get_software (PhotoMetadata* self) { gchar* result = NULL; gchar* _tmp0_ = NULL; -#line 1242 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Image.Software", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp0_; -#line 1243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9145 "PhotoMetadata.c" +#line 9229 "PhotoMetadata.c" } @@ -9156,69 +9240,69 @@ void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, co gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 1246 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 1246 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (software != NULL); -#line 1246 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (version != NULL); -#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = software; -#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = version; -#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = g_strdup_printf ("%s %s", _tmp0_, _tmp1_); -#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp2_; -#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, "Exif.Image.Software", _tmp3_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp3_); -#line 1250 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = photo_metadata_has_iptc (self); -#line 1250 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_) { -#line 9177 "PhotoMetadata.c" +#line 9261 "PhotoMetadata.c" const gchar* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; -#line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1256 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = software; -#line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1256 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, "Iptc.Application2.Program", _tmp5_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1252 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = version; -#line 1252 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, "Iptc.Application2.ProgramVersion", _tmp6_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 9188 "PhotoMetadata.c" +#line 9272 "PhotoMetadata.c" } } void photo_metadata_remove_software (PhotoMetadata* self) { -#line 1256 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 1257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tag (self, "Exif.Image.Software"); -#line 1258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tag (self, "Iptc.Application2.Program"); -#line 1259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tag (self, "Iptc.Application2.ProgramVersion"); -#line 9202 "PhotoMetadata.c" +#line 9286 "PhotoMetadata.c" } gchar* photo_metadata_get_exposure_bias (PhotoMetadata* self) { gchar* result = NULL; gchar* _tmp0_ = NULL; -#line 1262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ExposureBiasValue", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp0_; -#line 1263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9217 "PhotoMetadata.c" +#line 9301 "PhotoMetadata.c" } @@ -9235,134 +9319,134 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) { const gchar* _tmp8_ = NULL; gint _tmp9_ = 0; Rating _tmp18_ = 0; -#line 1274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), 0); -#line 1275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_RATING_TAGS; -#line 1275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_RATING_TAGS_length1; -#line 1275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_first_string (self, _tmp0_, _tmp0__length1); -#line 1275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" rating_string = _tmp1_; -#line 1276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = rating_string; -#line 1276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp2_ != NULL) { -#line 9248 "PhotoMetadata.c" +#line 9332 "PhotoMetadata.c" const gchar* _tmp3_ = NULL; gint _tmp4_ = 0; Rating _tmp5_ = 0; -#line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = rating_string; -#line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = atoi (_tmp3_); -#line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = rating_unserialize (_tmp4_); -#line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp5_; -#line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (rating_string); -#line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9264 "PhotoMetadata.c" +#line 9348 "PhotoMetadata.c" } -#line 1279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = photo_metadata_get_string (self, "Exif.Image.RatingPercent", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (rating_string); -#line 1279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" rating_string = _tmp6_; -#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = rating_string; -#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp7_ == NULL) { -#line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = RATING_UNRATED; -#line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (rating_string); -#line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9282 "PhotoMetadata.c" +#line 9366 "PhotoMetadata.c" } -#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = rating_string; -#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = atoi (_tmp8_); -#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" int_percent_rating = _tmp9_; -#line 9290 "PhotoMetadata.c" +#line 9374 "PhotoMetadata.c" { gint i = 0; -#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" i = 5; -#line 9295 "PhotoMetadata.c" +#line 9379 "PhotoMetadata.c" { gboolean _tmp10_ = FALSE; -#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = TRUE; -#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 9302 "PhotoMetadata.c" +#line 9386 "PhotoMetadata.c" gint _tmp12_ = 0; gint _tmp13_ = 0; gint _tmp14_ = 0; gint _tmp15_ = 0; -#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp10_) { -#line 9309 "PhotoMetadata.c" +#line 9393 "PhotoMetadata.c" gint _tmp11_ = 0; -#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = i; -#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" i = _tmp11_ - 1; -#line 9315 "PhotoMetadata.c" +#line 9399 "PhotoMetadata.c" } -#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = FALSE; -#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = i; -#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!(_tmp12_ >= 0)) { -#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 9325 "PhotoMetadata.c" +#line 9409 "PhotoMetadata.c" } -#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = int_percent_rating; -#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = i; -#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = RESOURCES_rating_thresholds[_tmp14_]; -#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp13_ >= _tmp15_) { -#line 9335 "PhotoMetadata.c" +#line 9419 "PhotoMetadata.c" gint _tmp16_ = 0; Rating _tmp17_ = 0; -#line 1287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = i; -#line 1287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = rating_unserialize (_tmp16_); -#line 1287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp17_; -#line 1287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (rating_string); -#line 1287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9348 "PhotoMetadata.c" +#line 9432 "PhotoMetadata.c" } } } } -#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = rating_unserialize (-1); -#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp18_; -#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (rating_string); -#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9361 "PhotoMetadata.c" +#line 9445 "PhotoMetadata.c" } @@ -9377,71 +9461,71 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) { gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; gint _tmp8_ = 0; -#line 1297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 1298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = rating; -#line 1298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = rating_serialize (_tmp0_); -#line 1298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" int_rating = _tmp1_; -#line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = int_rating; -#line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = g_strdup_printf ("%i", _tmp2_); -#line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = _tmp3_; -#line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, "Xmp.xmp.Rating", _tmp4_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp4_); -#line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = int_rating; -#line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = g_strdup_printf ("%i", _tmp5_); -#line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = _tmp6_; -#line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, "Exif.Image.Rating", _tmp7_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp7_); -#line 1302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = int_rating; -#line 1302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (0 <= _tmp8_) { -#line 9408 "PhotoMetadata.c" +#line 9492 "PhotoMetadata.c" gint _tmp9_ = 0; gint _tmp10_ = 0; gchar* _tmp11_ = NULL; gchar* _tmp12_ = NULL; -#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = int_rating; -#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = RESOURCES_rating_thresholds[_tmp9_]; -#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = g_strdup_printf ("%i", _tmp10_); -#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = _tmp11_; -#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp12_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp12_); -#line 9425 "PhotoMetadata.c" +#line 9509 "PhotoMetadata.c" } else { gint _tmp13_ = 0; gchar* _tmp14_ = NULL; gchar* _tmp15_ = NULL; -#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = int_rating; -#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = g_strdup_printf ("%i", _tmp13_); -#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = _tmp14_; -#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp15_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp15_); -#line 9440 "PhotoMetadata.c" +#line 9524 "PhotoMetadata.c" } } @@ -9449,7 +9533,7 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) { static gpointer _media_metadata_ref0 (gpointer self) { #line 235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? media_metadata_ref (self) : NULL; -#line 9448 "PhotoMetadata.c" +#line 9532 "PhotoMetadata.c" } @@ -9516,21 +9600,21 @@ static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_ self->number = _tmp14_; #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 9515 "PhotoMetadata.c" +#line 9599 "PhotoMetadata.c" } static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_new (PhotoMetadata* owner, const gchar* name, guint number, GExiv2PreviewProperties* props) { #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return photo_metadata_internal_photo_preview_construct (PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, owner, name, number, props); -#line 9522 "PhotoMetadata.c" +#line 9606 "PhotoMetadata.c" } static guint8* _vala_array_dup6 (guint8* self, int length) { #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_memdup (self, length * sizeof (guint8)); -#line 9529 "PhotoMetadata.c" +#line 9613 "PhotoMetadata.c" } @@ -9583,7 +9667,7 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* _tmp5__length1 = props_length1; #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp5_ != NULL) { -#line 9582 "PhotoMetadata.c" +#line 9666 "PhotoMetadata.c" GExiv2PreviewProperties** _tmp6_ = NULL; gint _tmp6__length1 = 0; guint _tmp7_ = 0U; @@ -9595,11 +9679,11 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* _tmp7_ = self->number; #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = ((guint) _tmp6__length1) > _tmp7_; -#line 9594 "PhotoMetadata.c" +#line 9678 "PhotoMetadata.c" } else { #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = FALSE; -#line 9598 "PhotoMetadata.c" +#line 9682 "PhotoMetadata.c" } #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_assert (_tmp4_, "props != null && props.length > number"); @@ -9639,13 +9723,13 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* if (result_length1) { #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *result_length1 = _tmp19__length1; -#line 9638 "PhotoMetadata.c" +#line 9722 "PhotoMetadata.c" } #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp19_; #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9644 "PhotoMetadata.c" +#line 9728 "PhotoMetadata.c" } @@ -9656,7 +9740,7 @@ static void photo_metadata_internal_photo_preview_class_init (PhotoMetadataInter ((PhotoPreviewClass *) klass)->finalize = photo_metadata_internal_photo_preview_finalize; #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((PhotoPreviewClass *) klass)->flatten = (guint8* (*)(PhotoPreview*, int*, GError**)) photo_metadata_internal_photo_preview_real_flatten; -#line 9655 "PhotoMetadata.c" +#line 9739 "PhotoMetadata.c" } @@ -9672,7 +9756,7 @@ static void photo_metadata_internal_photo_preview_finalize (PhotoPreview* obj) { _media_metadata_unref0 (self->owner); #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" PHOTO_PREVIEW_CLASS (photo_metadata_internal_photo_preview_parent_class)->finalize (obj); -#line 9671 "PhotoMetadata.c" +#line 9755 "PhotoMetadata.c" } @@ -9917,115 +10001,115 @@ static void photo_metadata_class_init (PhotoMetadataClass * klass) { photo_metadata_COMMENT_TAGS = _tmp33_; #line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_COMMENT_TAGS_length1 = 2; -#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp34_ = g_strdup ("Xmp.dc.subject"); -#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp35_ = g_strdup ("Iptc.Application2.Keywords"); -#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp36_ = g_strdup ("Xmp.xmp.Label"); -#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp37_ = g_new0 (gchar*, 3 + 1); -#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp37_[0] = _tmp34_; -#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp37_[1] = _tmp35_; -#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp37_[2] = _tmp36_; -#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_KEYWORD_TAGS = _tmp37_; -#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_KEYWORD_TAGS_length1 = 3; -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp38_ = null_keyword_transformer_new (); -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp39_ = _tmp38_; -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp40_ = hierarchical_keyword_field_new ("Xmp.lr.hierarchicalSubject", "|", FALSE, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer)); -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp41_ = null_keyword_transformer_new (); -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp42_ = _tmp41_; -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp43_ = hierarchical_keyword_field_new ("Xmp.acdsee.keywords", "|", FALSE, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer)); -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp44_ = acd_see_keyword_transformer_new (); -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp45_ = _tmp44_; -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp46_ = hierarchical_keyword_field_new ("Xmp.acdsee.categories", "|", FALSE, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer)); -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp47_ = null_keyword_transformer_new (); -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp48_ = _tmp47_; -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp49_ = hierarchical_keyword_field_new ("Xmp.digiKam.TagsList", "/", FALSE, TRUE, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer)); -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp50_ = null_keyword_transformer_new (); -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp51_ = _tmp50_; -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp52_ = hierarchical_keyword_field_new ("Xmp.MicrosoftPhoto.LastKeywordXMP", "/", FALSE, TRUE, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer)); -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp53_ = g_new0 (HierarchicalKeywordField*, 5 + 1); -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp53_[0] = _tmp40_; -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp53_[1] = _tmp43_; -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp53_[2] = _tmp46_; -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp53_[3] = _tmp49_; -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp53_[4] = _tmp52_; -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_HIERARCHICAL_KEYWORD_TAGS = _tmp53_; -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1 = 5; -#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp54_ = g_strdup ("Exif.Image.Artist"); -#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp55_ = g_strdup ("Exif.Canon.OwnerName"); -#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp56_ = g_strdup ("Xmp.acdsee.author"); -#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp57_ = g_new0 (gchar*, 3 + 1); -#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp57_[0] = _tmp54_; -#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp57_[1] = _tmp55_; -#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp57_[2] = _tmp56_; -#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_ARTIST_TAGS = _tmp57_; -#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_ARTIST_TAGS_length1 = 3; -#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp58_ = g_strdup ("Xmp.xmp.Rating"); -#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp59_ = g_strdup ("Iptc.Application2.Urgency"); -#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp60_ = g_strdup ("Xmp.photoshop.Urgency"); -#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp61_ = g_strdup ("Exif.Image.Rating"); -#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp62_ = g_strdup ("Xmp.acdsee.rating"); -#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp63_ = g_new0 (gchar*, 5 + 1); -#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp63_[0] = _tmp58_; -#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp63_[1] = _tmp59_; -#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp63_[2] = _tmp60_; -#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp63_[3] = _tmp61_; -#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp63_[4] = _tmp62_; -#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_RATING_TAGS = _tmp63_; -#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_RATING_TAGS_length1 = 5; -#line 10024 "PhotoMetadata.c" +#line 10108 "PhotoMetadata.c" } @@ -10044,7 +10128,7 @@ static void photo_metadata_instance_init (PhotoMetadata * self) { _tmp1_ = g_strdup ("<uninitialized>"); #line 249 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->source_name = _tmp1_; -#line 10043 "PhotoMetadata.c" +#line 10127 "PhotoMetadata.c" } @@ -10060,7 +10144,7 @@ static void photo_metadata_finalize (MediaMetadata* obj) { _g_free0 (self->priv->source_name); #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" MEDIA_METADATA_CLASS (photo_metadata_parent_class)->finalize (obj); -#line 10059 "PhotoMetadata.c" +#line 10143 "PhotoMetadata.c" } diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala index 7764415..e9a9042 100644 --- a/src/photos/PhotoMetadata.vala +++ b/src/photos/PhotoMetadata.vala @@ -970,8 +970,13 @@ public class PhotoMetadata : MediaMetadata { public void set_comment(string? comment, SetOption option = SetOption.ALL_DOMAINS) { + /* https://bugzilla.gnome.org/show_bug.cgi?id=781897 - Do not strip + * newlines from comments */ if (!is_string_empty(comment)) - set_all_string(COMMENT_TAGS, comment, option); + set_all_generic(COMMENT_TAGS, option, (tag) => { + set_string(tag, comment, PREPARE_STRING_OPTIONS & + ~PrepareInputTextOptions.STRIP_CRLF); + }); else remove_tags(COMMENT_TAGS); } diff --git a/src/publishing/PublishingUI.c b/src/publishing/PublishingUI.c index c54634b..0da6971 100644 --- a/src/publishing/PublishingUI.c +++ b/src/publishing/PublishingUI.c @@ -171,6 +171,26 @@ typedef struct _ThumbnailSourceClass ThumbnailSourceClass; typedef struct _MediaSource MediaSource; typedef struct _MediaSourceClass MediaSourceClass; +#define TYPE_PAGE_WINDOW (page_window_get_type ()) +#define PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_WINDOW, PageWindow)) +#define PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE_WINDOW, PageWindowClass)) +#define IS_PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE_WINDOW)) +#define IS_PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE_WINDOW)) +#define PAGE_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE_WINDOW, PageWindowClass)) + +typedef struct _PageWindow PageWindow; +typedef struct _PageWindowClass PageWindowClass; + +#define TYPE_APP_WINDOW (app_window_get_type ()) +#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow)) +#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass)) +#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW)) +#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW)) +#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass)) + +typedef struct _AppWindow AppWindow; +typedef struct _AppWindowClass AppWindowClass; + #define PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER (publishing_glue_media_source_publishable_wrapper_get_type ()) #define PUBLISHING_GLUE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper)) #define PUBLISHING_GLUE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapperClass)) @@ -455,6 +475,9 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; PublishingUIPublishingDialog* publishing_ui_publishing_dialog_new (GeeCollection* to_publish); PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType object_type, GeeCollection* to_publish); +GType page_window_get_type (void) G_GNUC_CONST; +GType app_window_get_type (void) G_GNUC_CONST; +AppWindow* app_window_get_instance (void); static gboolean publishing_ui_publishing_dialog_on_window_close (PublishingUIPublishingDialog* self, GdkEventAny* evt); static gboolean _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self); PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_new (MediaSource* to_wrap); @@ -478,9 +501,9 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled); gchar* plugins_get_pluggable_module_id (SpitPluggable* needle); static void _vala_array_add56 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value); -static gint __lambda14_ (void* a, void* b); +static gint __lambda15_ (void* a, void* b); gint utf8_cs_compare (void* a, void* b); -static gint ___lambda14____compar_fn_t (void* key1, void* key2); +static gint ___lambda15____compar_fn_t (void* key1, void* key2); static void _vala_array_add57 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value); static void _vala_array_add58 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value); static void _vala_array_add59 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value); @@ -525,21 +548,21 @@ PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_construct (GT self->builder = _tmp0_; #line 13 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return self; -#line 529 "PublishingUI.c" +#line 552 "PublishingUI.c" } PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_new (void) { #line 13 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return publishing_ui_concrete_dialog_pane_construct (PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE); -#line 536 "PublishingUI.c" +#line 559 "PublishingUI.c" } static gpointer _g_object_ref0 (gpointer self) { #line 18 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return self ? g_object_ref (self) : NULL; -#line 543 "PublishingUI.c" +#line 566 "PublishingUI.c" } @@ -558,7 +581,7 @@ static GtkWidget* publishing_ui_concrete_dialog_pane_real_get_widget (SpitPublis result = _tmp1_; #line 18 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return result; -#line 562 "PublishingUI.c" +#line 585 "PublishingUI.c" } @@ -571,7 +594,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_ui_concrete_dialog_pan result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 22 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return result; -#line 575 "PublishingUI.c" +#line 598 "PublishingUI.c" } @@ -579,7 +602,7 @@ static void publishing_ui_concrete_dialog_pane_real_on_pane_installed (SpitPubli PublishingUIConcreteDialogPane * self; #line 25 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane); -#line 583 "PublishingUI.c" +#line 606 "PublishingUI.c" } @@ -587,7 +610,7 @@ static void publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitPub PublishingUIConcreteDialogPane * self; #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane); -#line 591 "PublishingUI.c" +#line 614 "PublishingUI.c" } @@ -596,7 +619,7 @@ static void publishing_ui_concrete_dialog_pane_class_init (PublishingUIConcreteD publishing_ui_concrete_dialog_pane_parent_class = g_type_class_peek_parent (klass); #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_OBJECT_CLASS (klass)->finalize = publishing_ui_concrete_dialog_pane_finalize; -#line 600 "PublishingUI.c" +#line 623 "PublishingUI.c" } @@ -611,7 +634,7 @@ static void publishing_ui_concrete_dialog_pane_spit_publishing_dialog_pane_inter iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_ui_concrete_dialog_pane_real_on_pane_installed; #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled; -#line 615 "PublishingUI.c" +#line 638 "PublishingUI.c" } @@ -620,7 +643,7 @@ static void publishing_ui_concrete_dialog_pane_instance_init (PublishingUIConcre self->pane_widget = NULL; #line 11 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->builder = NULL; -#line 624 "PublishingUI.c" +#line 647 "PublishingUI.c" } @@ -634,7 +657,7 @@ static void publishing_ui_concrete_dialog_pane_finalize (GObject* obj) { _g_object_unref0 (self->builder); #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_OBJECT_CLASS (publishing_ui_concrete_dialog_pane_parent_class)->finalize (obj); -#line 638 "PublishingUI.c" +#line 661 "PublishingUI.c" } @@ -689,7 +712,7 @@ PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GTyp _tmp6_ = enable_markup; #line 40 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (_tmp6_) { -#line 693 "PublishingUI.c" +#line 716 "PublishingUI.c" GtkLabel* _tmp7_ = NULL; const gchar* _tmp8_ = NULL; GtkLabel* _tmp9_ = NULL; @@ -708,7 +731,7 @@ PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GTyp _tmp10_ = self->priv->msg_label; #line 43 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_label_set_use_markup (_tmp10_, TRUE); -#line 712 "PublishingUI.c" +#line 735 "PublishingUI.c" } else { GtkLabel* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; @@ -718,18 +741,18 @@ PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GTyp _tmp12_ = message_string; #line 45 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_label_set_label (_tmp11_, _tmp12_); -#line 722 "PublishingUI.c" +#line 745 "PublishingUI.c" } #line 35 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return self; -#line 726 "PublishingUI.c" +#line 749 "PublishingUI.c" } PublishingUIStaticMessagePane* publishing_ui_static_message_pane_new (const gchar* message_string, gboolean enable_markup) { #line 35 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return publishing_ui_static_message_pane_construct (PUBLISHING_UI_TYPE_STATIC_MESSAGE_PANE, message_string, enable_markup); -#line 733 "PublishingUI.c" +#line 756 "PublishingUI.c" } @@ -740,7 +763,7 @@ static void publishing_ui_static_message_pane_class_init (PublishingUIStaticMess g_type_class_add_private (klass, sizeof (PublishingUIStaticMessagePanePrivate)); #line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_OBJECT_CLASS (klass)->finalize = publishing_ui_static_message_pane_finalize; -#line 744 "PublishingUI.c" +#line 767 "PublishingUI.c" } @@ -749,7 +772,7 @@ static void publishing_ui_static_message_pane_instance_init (PublishingUIStaticM self->priv = PUBLISHING_UI_STATIC_MESSAGE_PANE_GET_PRIVATE (self); #line 33 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->priv->msg_label = NULL; -#line 753 "PublishingUI.c" +#line 776 "PublishingUI.c" } @@ -761,7 +784,7 @@ static void publishing_ui_static_message_pane_finalize (GObject* obj) { _g_object_unref0 (self->priv->msg_label); #line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_OBJECT_CLASS (publishing_ui_static_message_pane_parent_class)->finalize (obj); -#line 765 "PublishingUI.c" +#line 788 "PublishingUI.c" } @@ -780,7 +803,7 @@ GType publishing_ui_static_message_pane_get_type (void) { static void _publishing_ui_login_welcome_pane_on_login_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 62 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_login_welcome_pane_on_login_clicked ((PublishingUILoginWelcomePane*) self); -#line 784 "PublishingUI.c" +#line 807 "PublishingUI.c" } @@ -849,14 +872,14 @@ PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType gtk_label_set_markup (_tmp11_, _tmp12_); #line 56 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return self; -#line 853 "PublishingUI.c" +#line 876 "PublishingUI.c" } PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_new (const gchar* service_welcome_message) { #line 56 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return publishing_ui_login_welcome_pane_construct (PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, service_welcome_message); -#line 860 "PublishingUI.c" +#line 883 "PublishingUI.c" } @@ -865,7 +888,7 @@ static void publishing_ui_login_welcome_pane_on_login_clicked (PublishingUILogin g_return_if_fail (PUBLISHING_UI_IS_LOGIN_WELCOME_PANE (self)); #line 68 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_signal_emit_by_name (self, "login-requested"); -#line 869 "PublishingUI.c" +#line 892 "PublishingUI.c" } @@ -878,7 +901,7 @@ static void publishing_ui_login_welcome_pane_class_init (PublishingUILoginWelcom G_OBJECT_CLASS (klass)->finalize = publishing_ui_login_welcome_pane_finalize; #line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_signal_new ("login_requested", PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 882 "PublishingUI.c" +#line 905 "PublishingUI.c" } @@ -889,7 +912,7 @@ static void publishing_ui_login_welcome_pane_instance_init (PublishingUILoginWel self->priv->login_button = NULL; #line 52 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->priv->not_logged_in_label = NULL; -#line 893 "PublishingUI.c" +#line 916 "PublishingUI.c" } @@ -903,7 +926,7 @@ static void publishing_ui_login_welcome_pane_finalize (GObject* obj) { _g_object_unref0 (self->priv->not_logged_in_label); #line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_OBJECT_CLASS (publishing_ui_login_welcome_pane_parent_class)->finalize (obj); -#line 907 "PublishingUI.c" +#line 930 "PublishingUI.c" } @@ -951,14 +974,14 @@ PublishingUIProgressPane* publishing_ui_progress_pane_construct (GType object_ty self->priv->progress_bar = _tmp5_; #line 75 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return self; -#line 955 "PublishingUI.c" +#line 978 "PublishingUI.c" } PublishingUIProgressPane* publishing_ui_progress_pane_new (void) { #line 75 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return publishing_ui_progress_pane_construct (PUBLISHING_UI_TYPE_PROGRESS_PANE); -#line 962 "PublishingUI.c" +#line 985 "PublishingUI.c" } @@ -975,7 +998,7 @@ void publishing_ui_progress_pane_set_text (PublishingUIProgressPane* self, const _tmp1_ = text; #line 82 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_progress_bar_set_text (_tmp0_, _tmp1_); -#line 979 "PublishingUI.c" +#line 1002 "PublishingUI.c" } @@ -990,7 +1013,7 @@ void publishing_ui_progress_pane_set_progress (PublishingUIProgressPane* self, g _tmp1_ = progress; #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_progress_bar_set_fraction (_tmp0_, _tmp1_); -#line 994 "PublishingUI.c" +#line 1017 "PublishingUI.c" } @@ -1011,7 +1034,7 @@ void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, con _tmp2_ = gtk_progress_bar_get_text (_tmp1_); #line 90 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (g_strcmp0 (_tmp0_, _tmp2_) != 0) { -#line 1015 "PublishingUI.c" +#line 1038 "PublishingUI.c" GtkProgressBar* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; #line 91 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -1020,13 +1043,13 @@ void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, con _tmp4_ = status_text; #line 91 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_progress_bar_set_text (_tmp3_, _tmp4_); -#line 1024 "PublishingUI.c" +#line 1047 "PublishingUI.c" } #line 93 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp5_ = progress; #line 93 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_progress_pane_set_progress (self, _tmp5_); -#line 1030 "PublishingUI.c" +#line 1053 "PublishingUI.c" } @@ -1037,7 +1060,7 @@ static void publishing_ui_progress_pane_class_init (PublishingUIProgressPaneClas g_type_class_add_private (klass, sizeof (PublishingUIProgressPanePrivate)); #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_OBJECT_CLASS (klass)->finalize = publishing_ui_progress_pane_finalize; -#line 1041 "PublishingUI.c" +#line 1064 "PublishingUI.c" } @@ -1046,7 +1069,7 @@ static void publishing_ui_progress_pane_instance_init (PublishingUIProgressPane self->priv = PUBLISHING_UI_PROGRESS_PANE_GET_PRIVATE (self); #line 73 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->priv->progress_bar = NULL; -#line 1050 "PublishingUI.c" +#line 1073 "PublishingUI.c" } @@ -1058,7 +1081,7 @@ static void publishing_ui_progress_pane_finalize (GObject* obj) { _g_object_unref0 (self->priv->progress_bar); #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_OBJECT_CLASS (publishing_ui_progress_pane_parent_class)->finalize (obj); -#line 1062 "PublishingUI.c" +#line 1085 "PublishingUI.c" } @@ -1085,7 +1108,7 @@ PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type _tmp0_ = published_media; #line 103 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 1089 "PublishingUI.c" +#line 1112 "PublishingUI.c" gint _tmp1_ = 0; const gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; @@ -1099,14 +1122,14 @@ PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type _g_free0 (message_string); #line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" message_string = _tmp3_; -#line 1103 "PublishingUI.c" +#line 1126 "PublishingUI.c" } else { SpitPublishingPublisherMediaType _tmp4_ = 0; #line 108 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp4_ = published_media; #line 108 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (_tmp4_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) { -#line 1110 "PublishingUI.c" +#line 1133 "PublishingUI.c" gint _tmp5_ = 0; const gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; @@ -1120,14 +1143,14 @@ PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type _g_free0 (message_string); #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" message_string = _tmp7_; -#line 1124 "PublishingUI.c" +#line 1147 "PublishingUI.c" } else { SpitPublishingPublisherMediaType _tmp8_ = 0; #line 113 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp8_ = published_media; #line 113 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (_tmp8_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) { -#line 1131 "PublishingUI.c" +#line 1154 "PublishingUI.c" const gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; #line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -1138,11 +1161,11 @@ PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type _g_free0 (message_string); #line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" message_string = _tmp10_; -#line 1142 "PublishingUI.c" +#line 1165 "PublishingUI.c" } else { #line 118 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_assert_not_reached (); -#line 1146 "PublishingUI.c" +#line 1169 "PublishingUI.c" } } } @@ -1154,21 +1177,21 @@ PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type _g_free0 (message_string); #line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return self; -#line 1158 "PublishingUI.c" +#line 1181 "PublishingUI.c" } PublishingUISuccessPane* publishing_ui_success_pane_new (SpitPublishingPublisherMediaType published_media, gint num_uploaded) { #line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return publishing_ui_success_pane_construct (PUBLISHING_UI_TYPE_SUCCESS_PANE, published_media, num_uploaded); -#line 1165 "PublishingUI.c" +#line 1188 "PublishingUI.c" } static void publishing_ui_success_pane_class_init (PublishingUISuccessPaneClass * klass) { #line 97 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_success_pane_parent_class = g_type_class_peek_parent (klass); -#line 1172 "PublishingUI.c" +#line 1195 "PublishingUI.c" } @@ -1197,21 +1220,21 @@ PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_construc self = (PublishingUIAccountFetchWaitPane*) publishing_ui_static_message_pane_construct (object_type, _tmp0_, FALSE); #line 126 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return self; -#line 1201 "PublishingUI.c" +#line 1224 "PublishingUI.c" } PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_new (void) { #line 126 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return publishing_ui_account_fetch_wait_pane_construct (PUBLISHING_UI_TYPE_ACCOUNT_FETCH_WAIT_PANE); -#line 1208 "PublishingUI.c" +#line 1231 "PublishingUI.c" } static void publishing_ui_account_fetch_wait_pane_class_init (PublishingUIAccountFetchWaitPaneClass * klass) { #line 125 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_account_fetch_wait_pane_parent_class = g_type_class_peek_parent (klass); -#line 1215 "PublishingUI.c" +#line 1238 "PublishingUI.c" } @@ -1240,21 +1263,21 @@ PublishingUILoginWaitPane* publishing_ui_login_wait_pane_construct (GType object self = (PublishingUILoginWaitPane*) publishing_ui_static_message_pane_construct (object_type, _tmp0_, FALSE); #line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return self; -#line 1244 "PublishingUI.c" +#line 1267 "PublishingUI.c" } PublishingUILoginWaitPane* publishing_ui_login_wait_pane_new (void) { #line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return publishing_ui_login_wait_pane_construct (PUBLISHING_UI_TYPE_LOGIN_WAIT_PANE); -#line 1251 "PublishingUI.c" +#line 1274 "PublishingUI.c" } static void publishing_ui_login_wait_pane_class_init (PublishingUILoginWaitPaneClass * klass) { #line 131 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_login_wait_pane_parent_class = g_type_class_peek_parent (klass); -#line 1258 "PublishingUI.c" +#line 1281 "PublishingUI.c" } @@ -1277,40 +1300,40 @@ GType publishing_ui_login_wait_pane_get_type (void) { static gboolean _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) { gboolean result; result = publishing_ui_publishing_dialog_on_window_close ((PublishingUIPublishingDialog*) self, event); -#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return result; -#line 1283 "PublishingUI.c" +#line 1306 "PublishingUI.c" } static void _vala_array_add55 (SpitPublishingPublishable*** array, int* length, int* size, SpitPublishingPublishable* value) { -#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if ((*length) == (*size)) { -#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *array = g_renew (SpitPublishingPublishable*, *array, (*size) + 1); -#line 1294 "PublishingUI.c" +#line 1317 "PublishingUI.c" } -#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" (*array)[(*length)++] = value; -#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" (*array)[*length] = NULL; -#line 1300 "PublishingUI.c" +#line 1323 "PublishingUI.c" } static void _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { -#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_on_service_changed ((PublishingUIPublishingDialog*) self); -#line 1307 "PublishingUI.c" +#line 1330 "PublishingUI.c" } static void _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_on_close_cancel_clicked ((PublishingUIPublishingDialog*) self); -#line 1314 "PublishingUI.c" +#line 1337 "PublishingUI.c" } @@ -1324,52 +1347,54 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o gint _tmp4_ = 0; gboolean _tmp5_ = FALSE; gboolean _tmp6_ = FALSE; - SpitPublishingPublishable** _tmp8_ = NULL; + AppWindow* _tmp8_ = NULL; + AppWindow* _tmp9_ = NULL; + SpitPublishingPublishable** _tmp10_ = NULL; gboolean has_photos = FALSE; gboolean has_videos = FALSE; gchar* title = NULL; gchar* label = NULL; - gboolean _tmp24_ = FALSE; - gboolean _tmp25_ = FALSE; - const gchar* _tmp42_ = NULL; - GtkListStore* _tmp43_ = NULL; - GtkListStore* _tmp44_ = NULL; - GtkComboBox* _tmp45_ = NULL; - GtkCellRendererPixbuf* renderer_pix = NULL; - GtkCellRendererPixbuf* _tmp46_ = NULL; + gboolean _tmp26_ = FALSE; + gboolean _tmp27_ = FALSE; + const gchar* _tmp44_ = NULL; + GtkListStore* _tmp45_ = NULL; + GtkListStore* _tmp46_ = NULL; GtkComboBox* _tmp47_ = NULL; + GtkCellRendererPixbuf* renderer_pix = NULL; GtkCellRendererPixbuf* _tmp48_ = NULL; GtkComboBox* _tmp49_ = NULL; GtkCellRendererPixbuf* _tmp50_ = NULL; + GtkComboBox* _tmp51_ = NULL; + GtkCellRendererPixbuf* _tmp52_ = NULL; GtkCellRendererText* renderer_text = NULL; - GtkCellRendererText* _tmp51_ = NULL; - GtkComboBox* _tmp52_ = NULL; GtkCellRendererText* _tmp53_ = NULL; GtkComboBox* _tmp54_ = NULL; GtkCellRendererText* _tmp55_ = NULL; GtkComboBox* _tmp56_ = NULL; + GtkCellRendererText* _tmp57_ = NULL; + GtkComboBox* _tmp58_ = NULL; gchar* last_used_service = NULL; - ConfigFacade* _tmp57_ = NULL; - ConfigFacade* _tmp58_ = NULL; - gchar* _tmp59_ = NULL; - gchar* _tmp60_ = NULL; + ConfigFacade* _tmp59_ = NULL; + ConfigFacade* _tmp60_ = NULL; + gchar* _tmp61_ = NULL; + gchar* _tmp62_ = NULL; SpitPublishingService** loaded_services = NULL; - gboolean _tmp61_ = FALSE; - gboolean _tmp62_ = FALSE; - gint _tmp63_ = 0; - SpitPublishingService** _tmp64_ = NULL; + gboolean _tmp63_ = FALSE; + gboolean _tmp64_ = FALSE; + gint _tmp65_ = 0; + SpitPublishingService** _tmp66_ = NULL; gint loaded_services_length1 = 0; gint _loaded_services_size_ = 0; GtkTreeIter iter = {0}; - SpitPublishingService** _tmp65_ = NULL; - gint _tmp65__length1 = 0; - GtkComboBox* _tmp103_ = NULL; - gboolean _tmp104_ = FALSE; - GtkBox* _tmp134_ = NULL; - GtkBox* _tmp135_ = NULL; + SpitPublishingService** _tmp67_ = NULL; + gint _tmp67__length1 = 0; + GtkComboBox* _tmp105_ = NULL; + gboolean _tmp106_ = FALSE; GtkBox* _tmp136_ = NULL; - gboolean _tmp137_ = FALSE; - GtkButton* _tmp147_ = NULL; + GtkBox* _tmp137_ = NULL; + GtkBox* _tmp138_ = NULL; + gboolean _tmp139_ = FALSE; + GtkButton* _tmp149_ = NULL; #line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_val_if_fail (GEE_IS_COLLECTION (to_publish), NULL); #line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -1392,11 +1417,11 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o if (_tmp5_) { #line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp4_ = 1; -#line 1396 "PublishingUI.c" +#line 1421 "PublishingUI.c" } else { #line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp4_ = 0; -#line 1400 "PublishingUI.c" +#line 1425 "PublishingUI.c" } #line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self = (PublishingUIPublishingDialog*) g_object_new (object_type, "use-header-bar", _tmp4_, NULL); @@ -1404,760 +1429,770 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o _tmp6_ = use_header; #line 167 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (_tmp6_) { -#line 1408 "PublishingUI.c" +#line 1433 "PublishingUI.c" GtkWidget* _tmp7_ = NULL; #line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp7_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); #line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE); -#line 1414 "PublishingUI.c" +#line 1439 "PublishingUI.c" } #line 170 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); #line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event, self, 0); -#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp8_ = g_new0 (SpitPublishingPublishable*, 0 + 1); + gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE); +#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp8_ = app_window_get_instance (); +#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp9_ = _tmp8_; +#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow)); +#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _g_object_unref0 (_tmp9_); #line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event, self, 0); +#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp10_ = g_new0 (SpitPublishingPublishable*, 0 + 1); +#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL); -#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - self->priv->publishables = _tmp8_; -#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + self->priv->publishables = _tmp10_; +#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->priv->publishables_length1 = 0; -#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->priv->_publishables_size_ = self->priv->publishables_length1; -#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" has_photos = FALSE; -#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" has_videos = FALSE; -#line 1434 "PublishingUI.c" +#line 1469 "PublishingUI.c" { GeeIterator* _media_it = NULL; - GeeCollection* _tmp9_ = NULL; - GeeIterator* _tmp10_ = NULL; -#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp9_ = to_publish; -#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _media_it = _tmp10_; -#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + GeeCollection* _tmp11_ = NULL; + GeeIterator* _tmp12_ = NULL; +#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp11_ = to_publish; +#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); +#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _media_it = _tmp12_; +#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" while (TRUE) { -#line 1447 "PublishingUI.c" - GeeIterator* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - MediaSource* media = NULL; +#line 1482 "PublishingUI.c" GeeIterator* _tmp13_ = NULL; - gpointer _tmp14_ = NULL; + gboolean _tmp14_ = FALSE; + MediaSource* media = NULL; + GeeIterator* _tmp15_ = NULL; + gpointer _tmp16_ = NULL; SpitPublishingPublishable* publishable = NULL; - MediaSource* _tmp15_ = NULL; - PublishingGlueMediaSourcePublishableWrapper* _tmp16_ = NULL; - SpitPublishingPublishable* _tmp17_ = NULL; - SpitPublishingPublisherMediaType _tmp18_ = 0; - SpitPublishingPublishable** _tmp21_ = NULL; - gint _tmp21__length1 = 0; - SpitPublishingPublishable* _tmp22_ = NULL; - SpitPublishingPublishable* _tmp23_ = NULL; -#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp11_ = _media_it; -#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp12_ = gee_iterator_next (_tmp11_); -#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (!_tmp12_) { -#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + MediaSource* _tmp17_ = NULL; + PublishingGlueMediaSourcePublishableWrapper* _tmp18_ = NULL; + SpitPublishingPublishable* _tmp19_ = NULL; + SpitPublishingPublisherMediaType _tmp20_ = 0; + SpitPublishingPublishable** _tmp23_ = NULL; + gint _tmp23__length1 = 0; + SpitPublishingPublishable* _tmp24_ = NULL; + SpitPublishingPublishable* _tmp25_ = NULL; +#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp13_ = _media_it; +#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp14_ = gee_iterator_next (_tmp13_); +#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + if (!_tmp14_) { +#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" break; -#line 1470 "PublishingUI.c" +#line 1505 "PublishingUI.c" } -#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp13_ = _media_it; -#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp14_ = gee_iterator_get (_tmp13_); -#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - media = (MediaSource*) _tmp14_; -#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp15_ = media; -#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp16_ = publishing_glue_media_source_publishable_wrapper_new (_tmp15_); -#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - publishable = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_PUBLISHING_TYPE_PUBLISHABLE, SpitPublishingPublishable); +#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp15_ = _media_it; +#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp16_ = gee_iterator_get (_tmp15_); +#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + media = (MediaSource*) _tmp16_; #line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp17_ = publishable; + _tmp17_ = media; #line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp18_ = spit_publishing_publishable_get_media_type (_tmp17_); + _tmp18_ = publishing_glue_media_source_publishable_wrapper_new (_tmp17_); #line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp18_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) { -#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - has_photos = TRUE; -#line 1492 "PublishingUI.c" - } else { - SpitPublishingPublishable* _tmp19_ = NULL; - SpitPublishingPublisherMediaType _tmp20_ = 0; + publishable = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_PUBLISHABLE, SpitPublishingPublishable); #line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp19_ = publishable; + _tmp19_ = publishable; #line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp20_ = spit_publishing_publishable_get_media_type (_tmp19_); + _tmp20_ = spit_publishing_publishable_get_media_type (_tmp19_); #line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp20_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { + if (_tmp20_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) { #line 182 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + has_photos = TRUE; +#line 1527 "PublishingUI.c" + } else { + SpitPublishingPublishable* _tmp21_ = NULL; + SpitPublishingPublisherMediaType _tmp22_ = 0; +#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp21_ = publishable; +#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp22_ = spit_publishing_publishable_get_media_type (_tmp21_); +#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + if (_tmp22_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { +#line 184 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" has_videos = TRUE; -#line 1504 "PublishingUI.c" +#line 1539 "PublishingUI.c" } else { -#line 184 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_assert_not_reached (); -#line 1508 "PublishingUI.c" +#line 1543 "PublishingUI.c" } } -#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp21_ = self->priv->publishables; -#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp21__length1 = self->priv->publishables_length1; -#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp22_ = publishable; -#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp23_ = _g_object_ref0 (_tmp22_); -#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _vala_array_add55 (&self->priv->publishables, &self->priv->publishables_length1, &self->priv->_publishables_size_, _tmp23_); -#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp23_ = self->priv->publishables; +#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp23__length1 = self->priv->publishables_length1; +#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp24_ = publishable; +#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp25_ = _g_object_ref0 (_tmp24_); +#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _vala_array_add55 (&self->priv->publishables, &self->priv->publishables_length1, &self->priv->_publishables_size_, _tmp25_); +#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (publishable); -#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (media); -#line 1525 "PublishingUI.c" +#line 1560 "PublishingUI.c" } -#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (_media_it); -#line 1529 "PublishingUI.c" +#line 1564 "PublishingUI.c" } -#line 189 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 191 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" title = NULL; -#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - label = NULL; -#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp25_ = has_photos; -#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp25_) { -#line 1539 "PublishingUI.c" - gboolean _tmp26_ = FALSE; -#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp26_ = has_videos; -#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp24_ = !_tmp26_; -#line 1545 "PublishingUI.c" - } else { #line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp24_ = FALSE; -#line 1549 "PublishingUI.c" - } -#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp24_) { -#line 1553 "PublishingUI.c" - const gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; -#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp27_ = _ ("Publish Photos"); -#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp28_ = g_strdup (_tmp27_); -#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _g_free0 (title); -#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - title = _tmp28_; + label = NULL; #line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp29_ = _ ("Publish photos _to:"); + _tmp27_ = has_photos; #line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp30_ = g_strdup (_tmp29_); + if (_tmp27_) { +#line 1574 "PublishingUI.c" + gboolean _tmp28_ = FALSE; #line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _g_free0 (label); + _tmp28_ = has_videos; #line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - label = _tmp30_; -#line 1574 "PublishingUI.c" + _tmp26_ = !_tmp28_; +#line 1580 "PublishingUI.c" } else { - gboolean _tmp31_ = FALSE; - gboolean _tmp32_ = FALSE; -#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp32_ = has_photos; -#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (!_tmp32_) { -#line 1582 "PublishingUI.c" - gboolean _tmp33_ = FALSE; +#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp26_ = FALSE; +#line 1584 "PublishingUI.c" + } +#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + if (_tmp26_) { +#line 1588 "PublishingUI.c" + const gchar* _tmp29_ = NULL; + gchar* _tmp30_ = NULL; + const gchar* _tmp31_ = NULL; + gchar* _tmp32_ = NULL; #line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp33_ = has_videos; + _tmp29_ = _ ("Publish Photos"); #line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp31_ = _tmp33_; -#line 1588 "PublishingUI.c" - } else { + _tmp30_ = g_strdup (_tmp29_); #line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp31_ = FALSE; -#line 1592 "PublishingUI.c" - } + _g_free0 (title); #line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp31_) { -#line 1596 "PublishingUI.c" - const gchar* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; - const gchar* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; + title = _tmp30_; #line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp34_ = _ ("Publish Videos"); + _tmp31_ = _ ("Publish photos _to:"); #line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp35_ = g_strdup (_tmp34_); + _tmp32_ = g_strdup (_tmp31_); #line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _g_free0 (title); + _g_free0 (label); #line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - title = _tmp35_; + label = _tmp32_; +#line 1609 "PublishingUI.c" + } else { + gboolean _tmp33_ = FALSE; + gboolean _tmp34_ = FALSE; #line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp36_ = _ ("Publish videos _to"); + _tmp34_ = has_photos; #line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp37_ = g_strdup (_tmp36_); + if (!_tmp34_) { +#line 1617 "PublishingUI.c" + gboolean _tmp35_ = FALSE; #line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _g_free0 (label); + _tmp35_ = has_videos; #line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - label = _tmp37_; -#line 1617 "PublishingUI.c" + _tmp33_ = _tmp35_; +#line 1623 "PublishingUI.c" } else { +#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp33_ = FALSE; +#line 1627 "PublishingUI.c" + } +#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + if (_tmp33_) { +#line 1631 "PublishingUI.c" + const gchar* _tmp36_ = NULL; + gchar* _tmp37_ = NULL; const gchar* _tmp38_ = NULL; gchar* _tmp39_ = NULL; - const gchar* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; +#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp36_ = _ ("Publish Videos"); +#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp37_ = g_strdup (_tmp36_); +#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _g_free0 (title); +#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + title = _tmp37_; #line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp38_ = _ ("Publish Photos and Videos"); + _tmp38_ = _ ("Publish videos _to"); #line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp39_ = g_strdup (_tmp38_); #line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _g_free0 (title); + _g_free0 (label); #line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - title = _tmp39_; -#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp40_ = _ ("Publish photos and videos _to"); -#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + label = _tmp39_; +#line 1652 "PublishingUI.c" + } else { + const gchar* _tmp40_ = NULL; + gchar* _tmp41_ = NULL; + const gchar* _tmp42_ = NULL; + gchar* _tmp43_ = NULL; +#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp40_ = _ ("Publish Photos and Videos"); +#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp41_ = g_strdup (_tmp40_); -#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _g_free0 (title); +#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + title = _tmp41_; +#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp42_ = _ ("Publish photos and videos _to"); +#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp43_ = g_strdup (_tmp42_); +#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_free0 (label); -#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - label = _tmp41_; -#line 1639 "PublishingUI.c" +#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + label = _tmp43_; +#line 1674 "PublishingUI.c" } } -#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp42_ = title; -#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp42_); #line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp43_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1); + _tmp44_ = title; #line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp44_); +#line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp45_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1); +#line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (self->priv->service_selector_box_model); -#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - self->priv->service_selector_box_model = _tmp43_; -#line 205 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp44_ = self->priv->service_selector_box_model; -#line 205 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp45_ = (GtkComboBox*) gtk_combo_box_new_with_model (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GTK_TYPE_TREE_MODEL, GtkTreeModel)); -#line 205 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_object_ref_sink (_tmp45_); -#line 205 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _g_object_unref0 (self->priv->service_selector_box); -#line 205 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - self->priv->service_selector_box = _tmp45_; +#line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + self->priv->service_selector_box_model = _tmp45_; +#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp46_ = self->priv->service_selector_box_model; #line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp46_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new (); + _tmp47_ = (GtkComboBox*) gtk_combo_box_new_with_model (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GTK_TYPE_TREE_MODEL, GtkTreeModel)); #line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_object_ref_sink (_tmp46_); + g_object_ref_sink (_tmp47_); #line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - renderer_pix = _tmp46_; -#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp47_ = self->priv->service_selector_box; -#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp48_ = renderer_pix; -#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); + _g_object_unref0 (self->priv->service_selector_box); +#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + self->priv->service_selector_box = _tmp47_; #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp49_ = self->priv->service_selector_box; + _tmp48_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new (); #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp50_ = renderer_pix; + g_object_ref_sink (_tmp48_); #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0); + renderer_pix = _tmp48_; +#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp49_ = self->priv->service_selector_box; +#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp50_ = renderer_pix; +#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); #line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp51_ = (GtkCellRendererText*) gtk_cell_renderer_text_new (); + _tmp51_ = self->priv->service_selector_box; #line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_object_ref_sink (_tmp51_); + _tmp52_ = renderer_pix; #line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - renderer_text = _tmp51_; -#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp52_ = self->priv->service_selector_box; -#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp53_ = renderer_text; -#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); + gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0); #line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp54_ = self->priv->service_selector_box; + _tmp53_ = (GtkCellRendererText*) gtk_cell_renderer_text_new (); #line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp55_ = renderer_text; + g_object_ref_sink (_tmp53_); #line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1); + renderer_text = _tmp53_; +#line 214 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp54_ = self->priv->service_selector_box; +#line 214 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp55_ = renderer_text; +#line 214 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp56_ = self->priv->service_selector_box; #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_combo_box_set_active (_tmp56_, 0); -#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp57_ = config_facade_get_instance (); -#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp58_ = _tmp57_; -#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp59_ = configuration_facade_get_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp60_ = _tmp59_; -#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _g_object_unref0 (_tmp58_); -#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - last_used_service = _tmp60_; + _tmp57_ = renderer_text; +#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1); +#line 217 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp58_ = self->priv->service_selector_box; +#line 217 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_combo_box_set_active (_tmp58_, 0); #line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp61_ = has_photos; + _tmp59_ = config_facade_get_instance (); #line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp62_ = has_videos; + _tmp60_ = _tmp59_; #line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp64_ = publishing_ui_publishing_dialog_load_services (_tmp61_, _tmp62_, &_tmp63_); + _tmp61_ = configuration_facade_get_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - loaded_services = _tmp64_; + _tmp62_ = _tmp61_; #line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - loaded_services_length1 = _tmp63_; + _g_object_unref0 (_tmp60_); #line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + last_used_service = _tmp62_; +#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp63_ = has_photos; +#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp64_ = has_videos; +#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp66_ = publishing_ui_publishing_dialog_load_services (_tmp63_, _tmp64_, &_tmp65_); +#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + loaded_services = _tmp66_; +#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + loaded_services_length1 = _tmp65_; +#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _loaded_services_size_ = loaded_services_length1; -#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp65_ = loaded_services; -#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp65__length1 = loaded_services_length1; -#line 1730 "PublishingUI.c" +#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp67_ = loaded_services; +#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp67__length1 = loaded_services_length1; +#line 1765 "PublishingUI.c" { SpitPublishingService** service_collection = NULL; gint service_collection_length1 = 0; gint _service_collection_size_ = 0; gint service_it = 0; -#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - service_collection = _tmp65_; -#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - service_collection_length1 = _tmp65__length1; -#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - for (service_it = 0; service_it < _tmp65__length1; service_it = service_it + 1) { -#line 1742 "PublishingUI.c" - SpitPublishingService* _tmp66_ = NULL; +#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + service_collection = _tmp67_; +#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + service_collection_length1 = _tmp67__length1; +#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + for (service_it = 0; service_it < _tmp67__length1; service_it = service_it + 1) { +#line 1777 "PublishingUI.c" + SpitPublishingService* _tmp68_ = NULL; SpitPublishingService* service = NULL; -#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp66_ = _g_object_ref0 (service_collection[service_it]); -#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - service = _tmp66_; -#line 1749 "PublishingUI.c" +#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp68_ = _g_object_ref0 (service_collection[service_it]); +#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + service = _tmp68_; +#line 1784 "PublishingUI.c" { - GtkListStore* _tmp67_ = NULL; - GtkTreeIter _tmp68_ = {0}; + GtkListStore* _tmp69_ = NULL; + GtkTreeIter _tmp70_ = {0}; gchar* curr_service_id = NULL; - SpitPublishingService* _tmp69_ = NULL; - const gchar* _tmp70_ = NULL; - gchar* _tmp71_ = NULL; - SpitPublishingService* _tmp72_ = NULL; - gboolean _tmp73_ = FALSE; - SpitPluggableInfo _tmp74_ = {0}; - GdkPixbuf** _tmp75_ = NULL; - gint _tmp75__length1 = 0; - const gchar* _tmp93_ = NULL; -#line 225 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp67_ = self->priv->service_selector_box_model; -#line 225 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_list_store_append (_tmp67_, &_tmp68_); -#line 225 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - iter = _tmp68_; -#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp69_ = service; + SpitPublishingService* _tmp71_ = NULL; + const gchar* _tmp72_ = NULL; + gchar* _tmp73_ = NULL; + SpitPublishingService* _tmp74_ = NULL; + gboolean _tmp75_ = FALSE; + SpitPluggableInfo _tmp76_ = {0}; + GdkPixbuf** _tmp77_ = NULL; + gint _tmp77__length1 = 0; + const gchar* _tmp95_ = NULL; #line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp70_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp69_ = self->priv->service_selector_box_model; #line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp71_ = g_strdup (_tmp70_); + gtk_list_store_append (_tmp69_, &_tmp70_); #line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - curr_service_id = _tmp71_; + iter = _tmp70_; #line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp72_ = service; + _tmp71_ = service; #line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - spit_pluggable_get_info (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, SPIT_TYPE_PLUGGABLE, SpitPluggable), &self->priv->info); -#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp74_ = self->priv->info; -#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp75_ = _tmp74_.icons; -#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp75__length1 = _tmp74_.icons_length1; -#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (NULL != _tmp75_) { -#line 1789 "PublishingUI.c" - SpitPluggableInfo _tmp76_ = {0}; - GdkPixbuf** _tmp77_ = NULL; - gint _tmp77__length1 = 0; -#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp76_ = self->priv->info; -#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp77_ = _tmp76_.icons; -#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp77__length1 = _tmp76_.icons_length1; -#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp73_ = 0 < _tmp77__length1; -#line 1801 "PublishingUI.c" - } else { + _tmp72_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); +#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp73_ = g_strdup (_tmp72_); +#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + curr_service_id = _tmp73_; #line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp73_ = FALSE; -#line 1805 "PublishingUI.c" - } + _tmp74_ = service; #line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp73_) { -#line 1809 "PublishingUI.c" - GtkListStore* _tmp78_ = NULL; - GtkTreeIter _tmp79_ = {0}; - SpitPluggableInfo _tmp80_ = {0}; - GdkPixbuf** _tmp81_ = NULL; - gint _tmp81__length1 = 0; - GdkPixbuf* _tmp82_ = NULL; - SpitPublishingService* _tmp83_ = NULL; - const gchar* _tmp84_ = NULL; - GdkPixbuf* _tmp85_ = NULL; - GdkPixbuf* _tmp86_ = NULL; + spit_pluggable_get_info (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, SPIT_TYPE_PLUGGABLE, SpitPluggable), &self->priv->info); #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp78_ = self->priv->service_selector_box_model; + _tmp76_ = self->priv->info; #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp79_ = iter; + _tmp77_ = _tmp76_.icons; #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp80_ = self->priv->info; + _tmp77__length1 = _tmp76_.icons_length1; #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp81_ = _tmp80_.icons; + if (NULL != _tmp77_) { +#line 1824 "PublishingUI.c" + SpitPluggableInfo _tmp78_ = {0}; + GdkPixbuf** _tmp79_ = NULL; + gint _tmp79__length1 = 0; #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp81__length1 = _tmp80_.icons_length1; + _tmp78_ = self->priv->info; #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp82_ = _tmp81_[0]; + _tmp79_ = _tmp78_.icons; #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp83_ = service; + _tmp79__length1 = _tmp78_.icons_length1; #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp84_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp75_ = 0 < _tmp79__length1; +#line 1836 "PublishingUI.c" + } else { #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_list_store_set (_tmp78_, &_tmp79_, 0, _tmp82_, 1, _tmp84_, -1); -#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp85_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE); -#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp75_ = FALSE; +#line 1840 "PublishingUI.c" + } +#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + if (_tmp75_) { +#line 1844 "PublishingUI.c" + GtkListStore* _tmp80_ = NULL; + GtkTreeIter _tmp81_ = {0}; + SpitPluggableInfo _tmp82_ = {0}; + GdkPixbuf** _tmp83_ = NULL; + gint _tmp83__length1 = 0; + GdkPixbuf* _tmp84_ = NULL; + SpitPublishingService* _tmp85_ = NULL; + const gchar* _tmp86_ = NULL; + GdkPixbuf* _tmp87_ = NULL; + GdkPixbuf* _tmp88_ = NULL; +#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp80_ = self->priv->service_selector_box_model; +#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp81_ = iter; +#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp82_ = self->priv->info; +#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp83_ = _tmp82_.icons; +#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp83__length1 = _tmp82_.icons_length1; +#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp84_ = _tmp83_[0]; +#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp85_ = service; +#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp86_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); +#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_list_store_set (_tmp80_, &_tmp81_, 0, _tmp84_, 1, _tmp86_, -1); +#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp87_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE); +#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (self->priv->info.icons[0]); -#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - self->priv->info.icons[0] = _tmp85_; -#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp86_ = self->priv->info.icons[0]; -#line 1846 "PublishingUI.c" +#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + self->priv->info.icons[0] = _tmp87_; +#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp88_ = self->priv->info.icons[0]; +#line 1881 "PublishingUI.c" } else { - GtkListStore* _tmp87_ = NULL; - GtkTreeIter _tmp88_ = {0}; - GdkPixbuf* _tmp89_ = NULL; - GdkPixbuf* _tmp90_ = NULL; - SpitPublishingService* _tmp91_ = NULL; - const gchar* _tmp92_ = NULL; -#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp87_ = self->priv->service_selector_box_model; -#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp88_ = iter; -#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp89_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE); -#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp90_ = _tmp89_; -#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp91_ = service; -#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp92_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); -#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_list_store_set (_tmp87_, &_tmp88_, 0, _tmp90_, 1, _tmp92_, -1); -#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _g_object_unref0 (_tmp90_); -#line 1870 "PublishingUI.c" + GtkListStore* _tmp89_ = NULL; + GtkTreeIter _tmp90_ = {0}; + GdkPixbuf* _tmp91_ = NULL; + GdkPixbuf* _tmp92_ = NULL; + SpitPublishingService* _tmp93_ = NULL; + const gchar* _tmp94_ = NULL; +#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp89_ = self->priv->service_selector_box_model; +#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp90_ = iter; +#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp91_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE); +#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp92_ = _tmp91_; +#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp93_ = service; +#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp94_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); +#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_list_store_set (_tmp89_, &_tmp90_, 0, _tmp92_, 1, _tmp94_, -1); +#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _g_object_unref0 (_tmp92_); +#line 1905 "PublishingUI.c" } -#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp93_ = last_used_service; -#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp93_ == NULL) { -#line 1876 "PublishingUI.c" - GtkComboBox* _tmp94_ = NULL; - GtkTreeIter _tmp95_ = {0}; - SpitPublishingService* _tmp96_ = NULL; - const gchar* _tmp97_ = NULL; - gchar* _tmp98_ = NULL; -#line 245 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp94_ = self->priv->service_selector_box; -#line 245 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp95_ = iter; -#line 245 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_combo_box_set_active_iter (_tmp94_, &_tmp95_); -#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp96_ = service; -#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp97_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp98_ = g_strdup (_tmp97_); -#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _g_free0 (last_used_service); + _tmp95_ = last_used_service; #line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - last_used_service = _tmp98_; -#line 1898 "PublishingUI.c" - } else { + if (_tmp95_ == NULL) { +#line 1911 "PublishingUI.c" + GtkComboBox* _tmp96_ = NULL; + GtkTreeIter _tmp97_ = {0}; + SpitPublishingService* _tmp98_ = NULL; const gchar* _tmp99_ = NULL; - const gchar* _tmp100_ = NULL; + gchar* _tmp100_ = NULL; #line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp99_ = last_used_service; + _tmp96_ = self->priv->service_selector_box; #line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp100_ = curr_service_id; + _tmp97_ = iter; #line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (g_strcmp0 (_tmp99_, _tmp100_) == 0) { -#line 1908 "PublishingUI.c" - GtkComboBox* _tmp101_ = NULL; - GtkTreeIter _tmp102_ = {0}; + gtk_combo_box_set_active_iter (_tmp96_, &_tmp97_); +#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp98_ = service; #line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp101_ = self->priv->service_selector_box; + _tmp99_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp102_ = iter; + _tmp100_ = g_strdup (_tmp99_); +#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _g_free0 (last_used_service); #line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_combo_box_set_active_iter (_tmp101_, &_tmp102_); -#line 1917 "PublishingUI.c" + last_used_service = _tmp100_; +#line 1933 "PublishingUI.c" + } else { + const gchar* _tmp101_ = NULL; + const gchar* _tmp102_ = NULL; +#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp101_ = last_used_service; +#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp102_ = curr_service_id; +#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + if (g_strcmp0 (_tmp101_, _tmp102_) == 0) { +#line 1943 "PublishingUI.c" + GtkComboBox* _tmp103_ = NULL; + GtkTreeIter _tmp104_ = {0}; +#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp103_ = self->priv->service_selector_box; +#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp104_ = iter; +#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_combo_box_set_active_iter (_tmp103_, &_tmp104_); +#line 1952 "PublishingUI.c" } } -#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_free0 (curr_service_id); -#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (service); -#line 1924 "PublishingUI.c" +#line 1959 "PublishingUI.c" } } } -#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp103_ = self->priv->service_selector_box; -#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_signal_connect_object (_tmp103_, "changed", (GCallback) _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed, self, 0); #line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp104_ = use_header; + _tmp105_ = self->priv->service_selector_box; #line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (!_tmp104_) { -#line 1936 "PublishingUI.c" + g_signal_connect_object (_tmp105_, "changed", (GCallback) _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed, self, 0); +#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp106_ = use_header; +#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + if (!_tmp106_) { +#line 1971 "PublishingUI.c" GtkLabel* service_selector_box_label = NULL; - const gchar* _tmp105_ = NULL; - GtkLabel* _tmp106_ = NULL; - GtkLabel* _tmp107_ = NULL; - GtkComboBox* _tmp108_ = NULL; + const gchar* _tmp107_ = NULL; + GtkLabel* _tmp108_ = NULL; GtkLabel* _tmp109_ = NULL; - GtkLabel* _tmp110_ = NULL; - GtkComboBox* _tmp111_ = NULL; - GtkComboBox* _tmp112_ = NULL; + GtkComboBox* _tmp110_ = NULL; + GtkLabel* _tmp111_ = NULL; + GtkLabel* _tmp112_ = NULL; GtkComboBox* _tmp113_ = NULL; GtkComboBox* _tmp114_ = NULL; + GtkComboBox* _tmp115_ = NULL; + GtkComboBox* _tmp116_ = NULL; GtkBox* service_selector_layouter = NULL; - GtkBox* _tmp115_ = NULL; - GtkBox* _tmp116_ = NULL; GtkBox* _tmp117_ = NULL; GtkBox* _tmp118_ = NULL; - GtkLabel* _tmp119_ = NULL; + GtkBox* _tmp119_ = NULL; GtkBox* _tmp120_ = NULL; - GtkComboBox* _tmp121_ = NULL; - GtkBox* service_area_layouter = NULL; + GtkLabel* _tmp121_ = NULL; GtkBox* _tmp122_ = NULL; - GtkBox* _tmp123_ = NULL; + GtkComboBox* _tmp123_ = NULL; + GtkBox* service_area_layouter = NULL; GtkBox* _tmp124_ = NULL; GtkBox* _tmp125_ = NULL; - GtkSeparator* _tmp126_ = NULL; - GtkSeparator* _tmp127_ = NULL; - GtkBox* _tmp128_ = NULL; - GtkBox* _tmp129_ = NULL; + GtkBox* _tmp126_ = NULL; + GtkBox* _tmp127_ = NULL; + GtkSeparator* _tmp128_ = NULL; + GtkSeparator* _tmp129_ = NULL; GtkBox* _tmp130_ = NULL; GtkBox* _tmp131_ = NULL; GtkBox* _tmp132_ = NULL; GtkBox* _tmp133_ = NULL; -#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp105_ = label; -#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp106_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp105_); -#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_object_ref_sink (_tmp106_); -#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - service_selector_box_label = _tmp106_; -#line 257 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp107_ = service_selector_box_label; -#line 257 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp108_ = self->priv->service_selector_box; -#line 257 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_label_set_mnemonic_widget (_tmp107_, G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_widget_get_type (), GtkWidget)); + GtkBox* _tmp134_ = NULL; + GtkBox* _tmp135_ = NULL; #line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp109_ = service_selector_box_label; + _tmp107_ = label; +#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp108_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp107_); +#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + g_object_ref_sink (_tmp108_); #line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); + service_selector_box_label = _tmp108_; +#line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp109_ = service_selector_box_label; #line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp110_ = service_selector_box_label; + _tmp110_ = self->priv->service_selector_box; #line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); -#line 265 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp111_ = self->priv->service_selector_box; -#line 265 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END); -#line 266 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp112_ = self->priv->service_selector_box; -#line 266 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_label_set_mnemonic_widget (_tmp109_, G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget)); +#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp111_ = service_selector_box_label; +#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); +#line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp112_ = service_selector_box_label; +#line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); #line 267 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp113_ = self->priv->service_selector_box; #line 267 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp113_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp113_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END); #line 268 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp114_ = self->priv->service_selector_box; #line 268 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); +#line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp115_ = self->priv->service_selector_box; +#line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, gtk_widget_get_type (), GtkWidget), FALSE); #line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp115_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); + _tmp116_ = self->priv->service_selector_box; #line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_object_ref_sink (_tmp115_); -#line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - service_selector_layouter = _tmp115_; -#line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp116_ = service_selector_layouter; -#line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, gtk_container_get_type (), GtkContainer), (guint) 12); + gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, gtk_widget_get_type (), GtkWidget), FALSE); +#line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp117_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); #line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp117_ = service_selector_layouter; + g_object_ref_sink (_tmp117_); #line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, gtk_widget_get_type (), GtkWidget), TRUE); + service_selector_layouter = _tmp117_; #line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp118_ = service_selector_layouter; #line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp119_ = service_selector_box_label; -#line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, gtk_widget_get_type (), GtkWidget)); -#line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp120_ = service_selector_layouter; + gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, gtk_container_get_type (), GtkContainer), (guint) 12); #line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp121_ = self->priv->service_selector_box; + _tmp119_ = service_selector_layouter; #line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_box_pack_start (_tmp120_, G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); -#line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp122_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); -#line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_object_ref_sink (_tmp122_); -#line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - service_area_layouter = _tmp122_; -#line 279 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp123_ = service_area_layouter; -#line 279 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp124_ = service_selector_layouter; -#line 279 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, gtk_widget_get_type (), GtkWidget)); -#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp125_ = service_area_layouter; -#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp126_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); -#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_object_ref_sink (_tmp126_); + gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, gtk_widget_get_type (), GtkWidget), TRUE); +#line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp120_ = service_selector_layouter; +#line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp121_ = service_selector_box_label; +#line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_widget_get_type (), GtkWidget)); +#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp122_ = service_selector_layouter; +#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp123_ = self->priv->service_selector_box; +#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_box_pack_start (_tmp122_, G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp127_ = _tmp126_; + _tmp124_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); #line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, gtk_widget_get_type (), GtkWidget)); + g_object_ref_sink (_tmp124_); #line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _g_object_unref0 (_tmp127_); + service_area_layouter = _tmp124_; +#line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp125_ = service_area_layouter; #line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp128_ = service_area_layouter; + _tmp126_ = service_selector_layouter; #line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp128_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, gtk_widget_get_type (), GtkWidget)); +#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp127_ = service_area_layouter; +#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp128_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); #line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp129_ = service_area_layouter; + g_object_ref_sink (_tmp128_); #line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); + _tmp129_ = _tmp128_; +#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, gtk_widget_get_type (), GtkWidget)); +#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _g_object_unref0 (_tmp129_); #line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp130_ = service_area_layouter; #line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL); #line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp131_ = service_area_layouter; #line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp131_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp132_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); + gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp131_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); +#line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp132_ = service_area_layouter; +#line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, gtk_widget_get_type (), GtkWidget), TRUE); #line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp133_ = service_area_layouter; #line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_box_pack_start (_tmp132_, G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, gtk_widget_get_type (), GtkWidget), FALSE); +#line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp134_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); +#line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp135_ = service_area_layouter; +#line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_box_pack_start (_tmp134_, G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); +#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (service_area_layouter); -#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (service_selector_layouter); -#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (service_selector_box_label); -#line 2085 "PublishingUI.c" +#line 2120 "PublishingUI.c" } -#line 289 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp134_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); -#line 289 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_object_ref_sink (_tmp134_); -#line 289 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _g_object_unref0 (self->priv->central_area_layouter); -#line 289 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - self->priv->central_area_layouter = _tmp134_; #line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp135_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); + _tmp136_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); +#line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + g_object_ref_sink (_tmp136_); #line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp136_ = self->priv->central_area_layouter; + _g_object_unref0 (self->priv->central_area_layouter); #line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_box_pack_start (_tmp135_, G_TYPE_CHECK_INSTANCE_CAST (_tmp136_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + self->priv->central_area_layouter = _tmp136_; #line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp137_ = use_header; + _tmp137_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); #line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp137_) { -#line 2105 "PublishingUI.c" - GtkButton* _tmp138_ = NULL; - GtkButton* _tmp139_ = NULL; - GtkWidget* _tmp140_ = NULL; + _tmp138_ = self->priv->central_area_layouter; +#line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_box_pack_start (_tmp137_, G_TYPE_CHECK_INSTANCE_CAST (_tmp138_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); +#line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp139_ = use_header; +#line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + if (_tmp139_) { +#line 2140 "PublishingUI.c" + GtkButton* _tmp140_ = NULL; GtkButton* _tmp141_ = NULL; GtkWidget* _tmp142_ = NULL; - GtkComboBox* _tmp143_ = NULL; -#line 294 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp138_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel"); -#line 294 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_object_ref_sink (_tmp138_); -#line 294 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + GtkButton* _tmp143_ = NULL; + GtkWidget* _tmp144_ = NULL; + GtkComboBox* _tmp145_ = NULL; +#line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp140_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel"); +#line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + g_object_ref_sink (_tmp140_); +#line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (self->priv->close_cancel_button); -#line 294 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - self->priv->close_cancel_button = _tmp138_; -#line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp139_ = self->priv->close_cancel_button; -#line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp139_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp140_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); +#line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + self->priv->close_cancel_button = _tmp140_; #line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp141_ = self->priv->close_cancel_button; #line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp140_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, gtk_widget_get_type (), GtkWidget)); -#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, gtk_widget_get_type (), GtkWidget), TRUE); +#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp142_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); -#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp143_ = self->priv->service_selector_box; -#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, gtk_widget_get_type (), GtkWidget)); -#line 2136 "PublishingUI.c" +#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp143_ = self->priv->close_cancel_button; +#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, gtk_widget_get_type (), GtkWidget)); +#line 300 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp144_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); +#line 300 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp145_ = self->priv->service_selector_box; +#line 300 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp144_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp145_, gtk_widget_get_type (), GtkWidget)); +#line 2171 "PublishingUI.c" } else { - const gchar* _tmp144_ = NULL; - GtkWidget* _tmp145_ = NULL; - GtkButton* _tmp146_ = NULL; -#line 301 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp144_ = _ ("_Cancel"); -#line 301 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _tmp144_, (gint) GTK_RESPONSE_CANCEL); -#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp145_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL); -#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp146_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp145_, gtk_button_get_type ()) ? ((GtkButton*) _tmp145_) : NULL); -#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _g_object_unref0 (self->priv->close_cancel_button); -#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - self->priv->close_cancel_button = _tmp146_; -#line 2153 "PublishingUI.c" - } + const gchar* _tmp146_ = NULL; + GtkWidget* _tmp147_ = NULL; + GtkButton* _tmp148_ = NULL; +#line 303 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp146_ = _ ("_Cancel"); +#line 303 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _tmp146_, (gint) GTK_RESPONSE_CANCEL); +#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _tmp147_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL); #line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp147_ = self->priv->close_cancel_button; + _tmp148_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp147_, gtk_button_get_type ()) ? ((GtkButton*) _tmp147_) : NULL); +#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _g_object_unref0 (self->priv->close_cancel_button); #line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_signal_connect_object (_tmp147_, "clicked", (GCallback) _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0); + self->priv->close_cancel_button = _tmp148_; +#line 2188 "PublishingUI.c" + } #line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - publishing_ui_publishing_dialog_set_standard_window_mode (self); + _tmp149_ = self->priv->close_cancel_button; +#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + g_signal_connect_object (_tmp149_, "clicked", (GCallback) _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0); #line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + publishing_ui_publishing_dialog_set_standard_window_mode (self); +#line 310 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" loaded_services = (_vala_array_free (loaded_services, loaded_services_length1, (GDestroyNotify) g_object_unref), NULL); @@ -2173,65 +2208,65 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o _g_free0 (title); #line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return self; -#line 2177 "PublishingUI.c" +#line 2212 "PublishingUI.c" } PublishingUIPublishingDialog* publishing_ui_publishing_dialog_new (GeeCollection* to_publish) { #line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return publishing_ui_publishing_dialog_construct (PUBLISHING_UI_TYPE_PUBLISHING_DIALOG, to_publish); -#line 2184 "PublishingUI.c" +#line 2219 "PublishingUI.c" } static void _vala_array_add56 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) { -#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if ((*length) == (*size)) { -#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *array = g_renew (SpitPublishingService*, *array, (*size) + 1); -#line 2195 "PublishingUI.c" +#line 2230 "PublishingUI.c" } -#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" (*array)[(*length)++] = value; -#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" (*array)[*length] = NULL; -#line 2201 "PublishingUI.c" +#line 2236 "PublishingUI.c" } -static gint __lambda14_ (void* a, void* b) { +static gint __lambda15_ (void* a, void* b) { gint result = 0; void* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; void* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; gint _tmp4_ = 0; -#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = a; -#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp1_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitPublishingService**) _tmp0_), SPIT_TYPE_PLUGGABLE, SpitPluggable)); -#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp2_ = b; -#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp3_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitPublishingService**) _tmp2_), SPIT_TYPE_PLUGGABLE, SpitPluggable)); -#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp4_ = utf8_cs_compare (_tmp1_, _tmp3_); -#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" result = _tmp4_; -#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return result; -#line 2226 "PublishingUI.c" +#line 2261 "PublishingUI.c" } -static gint ___lambda14____compar_fn_t (void* key1, void* key2) { +static gint ___lambda15____compar_fn_t (void* key1, void* key2) { gint result; - result = __lambda14_ (key1, key2); -#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + result = __lambda15_ (key1, key2); +#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return result; -#line 2235 "PublishingUI.c" +#line 2270 "PublishingUI.c" } @@ -2252,41 +2287,41 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services gint _tmp26__length1 = 0; SpitPublishingService** _tmp27_ = NULL; gint _tmp27__length1 = 0; -#line 312 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = g_new0 (SpitPublishingService*, 0 + 1); -#line 312 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" loaded_services = _tmp0_; -#line 312 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" loaded_services_length1 = 0; -#line 312 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _loaded_services_size_ = loaded_services_length1; -#line 315 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 317 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp1_ = plugins_get_pluggables_for_type (SPIT_PUBLISHING_TYPE_SERVICE, NULL, NULL, NULL, FALSE); -#line 315 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 317 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" pluggables = _tmp1_; -#line 318 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp2_ = pluggables; -#line 318 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp3_ = gee_collection_get_size (_tmp2_); -#line 318 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp4_ = _tmp3_; -#line 318 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_debug ("PublishingUI.vala:318: PublisingDialog: discovered %d pluggable publis" \ +#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + g_debug ("PublishingUI.vala:320: PublisingDialog: discovered %d pluggable publis" \ "hing services.", _tmp4_); -#line 2276 "PublishingUI.c" +#line 2311 "PublishingUI.c" { GeeIterator* _pluggable_it = NULL; GeeCollection* _tmp5_ = NULL; GeeIterator* _tmp6_ = NULL; -#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp5_ = pluggables; -#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _pluggable_it = _tmp6_; -#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" while (TRUE) { -#line 2289 "PublishingUI.c" +#line 2324 "PublishingUI.c" GeeIterator* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; SpitPluggable* pluggable = NULL; @@ -2305,167 +2340,167 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services gint _tmp22__length1 = 0; SpitPublishingService* _tmp23_ = NULL; SpitPublishingService* _tmp24_ = NULL; -#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp7_ = _pluggable_it; -#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp8_ = gee_iterator_next (_tmp7_); -#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (!_tmp8_) { -#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" break; -#line 2316 "PublishingUI.c" +#line 2351 "PublishingUI.c" } -#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp9_ = _pluggable_it; -#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp10_ = gee_iterator_get (_tmp9_); -#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" pluggable = (SpitPluggable*) _tmp10_; -#line 321 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp11_ = pluggable; -#line 321 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp12_ = spit_pluggable_get_pluggable_interface (_tmp11_, SPIT_PUBLISHING_CURRENT_INTERFACE, SPIT_PUBLISHING_CURRENT_INTERFACE); -#line 321 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - pluggable_interface = _tmp12_; #line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + pluggable_interface = _tmp12_; +#line 325 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp13_ = pluggable_interface; -#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 325 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (_tmp13_ != SPIT_PUBLISHING_CURRENT_INTERFACE) { -#line 2334 "PublishingUI.c" +#line 2369 "PublishingUI.c" SpitPluggable* _tmp14_ = NULL; gchar* _tmp15_ = NULL; gchar* _tmp16_ = NULL; gint _tmp17_ = 0; -#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp14_ = pluggable; -#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp15_ = plugins_get_pluggable_module_id (_tmp14_); -#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp16_ = _tmp15_; -#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp17_ = pluggable_interface; -#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_warning ("PublishingUI.vala:324: Unable to load publisher %s: reported interface" \ +#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + g_warning ("PublishingUI.vala:326: Unable to load publisher %s: reported interface" \ " %d.", _tmp16_, _tmp17_); -#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_free0 (_tmp16_); -#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 329 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (pluggable); -#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 329 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" continue; -#line 2355 "PublishingUI.c" +#line 2390 "PublishingUI.c" } -#line 330 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp18_ = pluggable; -#line 330 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService)); -#line 330 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" service = _tmp19_; -#line 333 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 335 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp20_ = service; -#line 333 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 335 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp21_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); -#line 333 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_debug ("PublishingUI.vala:333: PublishingDialog: discovered pluggable publishi" \ +#line 335 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + g_debug ("PublishingUI.vala:335: PublishingDialog: discovered pluggable publishi" \ "ng service '%s'.", _tmp21_); -#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp22_ = loaded_services; -#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp22__length1 = loaded_services_length1; -#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp23_ = service; -#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp24_ = _g_object_ref0 (_tmp23_); -#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _vala_array_add56 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp24_); -#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (service); -#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (pluggable); -#line 2383 "PublishingUI.c" +#line 2418 "PublishingUI.c" } -#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (_pluggable_it); -#line 2387 "PublishingUI.c" +#line 2422 "PublishingUI.c" } -#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp25_ = loaded_services; -#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp25__length1 = loaded_services_length1; -#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp26_ = loaded_services; -#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp26__length1 = loaded_services_length1; -#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - qsort (_tmp25_, (gsize) _tmp26__length1, (gsize) sizeof (SpitPublishingService*), ___lambda14____compar_fn_t); -#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + qsort (_tmp25_, (gsize) _tmp26__length1, (gsize) sizeof (SpitPublishingService*), ___lambda15____compar_fn_t); +#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp27_ = loaded_services; -#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp27__length1 = loaded_services_length1; -#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (result_length1) { -#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *result_length1 = _tmp27__length1; -#line 2407 "PublishingUI.c" +#line 2442 "PublishingUI.c" } -#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" result = _tmp27_; -#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (pluggables); -#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return result; -#line 2415 "PublishingUI.c" +#line 2450 "PublishingUI.c" } static void _vala_array_add57 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) { -#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if ((*length) == (*size)) { -#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *array = g_renew (SpitPublishingService*, *array, (*size) + 1); -#line 2426 "PublishingUI.c" +#line 2461 "PublishingUI.c" } -#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" (*array)[(*length)++] = value; -#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" (*array)[*length] = NULL; -#line 2432 "PublishingUI.c" +#line 2467 "PublishingUI.c" } static void _vala_array_add58 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) { -#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if ((*length) == (*size)) { -#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *array = g_renew (SpitPublishingService*, *array, (*size) + 1); -#line 2443 "PublishingUI.c" +#line 2478 "PublishingUI.c" } -#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" (*array)[(*length)++] = value; -#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" (*array)[*length] = NULL; -#line 2449 "PublishingUI.c" +#line 2484 "PublishingUI.c" } static void _vala_array_add59 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) { -#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if ((*length) == (*size)) { -#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *array = g_renew (SpitPublishingService*, *array, (*size) + 1); -#line 2460 "PublishingUI.c" +#line 2495 "PublishingUI.c" } -#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" (*array)[(*length)++] = value; -#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" (*array)[*length] = NULL; -#line 2466 "PublishingUI.c" +#line 2501 "PublishingUI.c" } @@ -2486,226 +2521,226 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gb gint _tmp6__length1 = 0; SpitPublishingService** _tmp32_ = NULL; gint _tmp32__length1 = 0; -#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp1_ = has_photos; -#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (_tmp1_) { -#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = TRUE; -#line 2493 "PublishingUI.c" +#line 2528 "PublishingUI.c" } else { gboolean _tmp2_ = FALSE; -#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp2_ = has_videos; -#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = _tmp2_; -#line 2500 "PublishingUI.c" +#line 2535 "PublishingUI.c" } -#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _vala_assert (_tmp0_, "has_photos || has_videos"); #line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _vala_assert (_tmp0_, "has_photos || has_videos"); +#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp3_ = g_new0 (SpitPublishingService*, 0 + 1); -#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" filtered_services = _tmp3_; -#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" filtered_services_length1 = 0; -#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _filtered_services_size_ = filtered_services_length1; -#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp5_ = publishing_ui_publishing_dialog_load_all_services (&_tmp4_); -#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" all_services = _tmp5_; -#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" all_services_length1 = _tmp4_; -#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _all_services_size_ = all_services_length1; #line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _all_services_size_ = all_services_length1; +#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp6_ = all_services; -#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp6__length1 = all_services_length1; -#line 2524 "PublishingUI.c" +#line 2559 "PublishingUI.c" { SpitPublishingService** service_collection = NULL; gint service_collection_length1 = 0; gint _service_collection_size_ = 0; gint service_it = 0; -#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" service_collection = _tmp6_; -#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" service_collection_length1 = _tmp6__length1; -#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" for (service_it = 0; service_it < _tmp6__length1; service_it = service_it + 1) { -#line 2536 "PublishingUI.c" +#line 2571 "PublishingUI.c" SpitPublishingService* _tmp7_ = NULL; SpitPublishingService* service = NULL; -#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp7_ = _g_object_ref0 (service_collection[service_it]); -#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" service = _tmp7_; -#line 2543 "PublishingUI.c" +#line 2578 "PublishingUI.c" { gboolean _tmp8_ = FALSE; gboolean _tmp9_ = FALSE; -#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp9_ = has_photos; -#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (_tmp9_) { -#line 2551 "PublishingUI.c" +#line 2586 "PublishingUI.c" gboolean _tmp10_ = FALSE; -#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp10_ = has_videos; -#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp8_ = !_tmp10_; -#line 2557 "PublishingUI.c" +#line 2592 "PublishingUI.c" } else { -#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp8_ = FALSE; -#line 2561 "PublishingUI.c" +#line 2596 "PublishingUI.c" } -#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (_tmp8_) { -#line 2565 "PublishingUI.c" +#line 2600 "PublishingUI.c" SpitPublishingService* _tmp11_ = NULL; SpitPublishingPublisherMediaType _tmp12_ = 0; -#line 357 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp11_ = service; -#line 357 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp12_ = spit_publishing_service_get_supported_media (_tmp11_); -#line 357 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if ((_tmp12_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) { -#line 2574 "PublishingUI.c" +#line 2609 "PublishingUI.c" SpitPublishingService** _tmp13_ = NULL; gint _tmp13__length1 = 0; SpitPublishingService* _tmp14_ = NULL; SpitPublishingService* _tmp15_ = NULL; -#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp13_ = filtered_services; -#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp13__length1 = filtered_services_length1; -#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp14_ = service; -#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp15_ = _g_object_ref0 (_tmp14_); -#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _vala_array_add57 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp15_); -#line 2589 "PublishingUI.c" +#line 2624 "PublishingUI.c" } } else { gboolean _tmp16_ = FALSE; gboolean _tmp17_ = FALSE; -#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp17_ = has_photos; -#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (!_tmp17_) { -#line 2598 "PublishingUI.c" +#line 2633 "PublishingUI.c" gboolean _tmp18_ = FALSE; -#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp18_ = has_videos; -#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp16_ = _tmp18_; -#line 2604 "PublishingUI.c" +#line 2639 "PublishingUI.c" } else { -#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp16_ = FALSE; -#line 2608 "PublishingUI.c" +#line 2643 "PublishingUI.c" } -#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (_tmp16_) { -#line 2612 "PublishingUI.c" +#line 2647 "PublishingUI.c" SpitPublishingService* _tmp19_ = NULL; SpitPublishingPublisherMediaType _tmp20_ = 0; -#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp19_ = service; -#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp20_ = spit_publishing_service_get_supported_media (_tmp19_); -#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if ((_tmp20_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0) { -#line 2621 "PublishingUI.c" +#line 2656 "PublishingUI.c" SpitPublishingService** _tmp21_ = NULL; gint _tmp21__length1 = 0; SpitPublishingService* _tmp22_ = NULL; SpitPublishingService* _tmp23_ = NULL; -#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp21_ = filtered_services; -#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp21__length1 = filtered_services_length1; -#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp22_ = service; -#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp23_ = _g_object_ref0 (_tmp22_); -#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _vala_array_add58 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp23_); -#line 2636 "PublishingUI.c" +#line 2671 "PublishingUI.c" } } else { gboolean _tmp24_ = FALSE; SpitPublishingService* _tmp25_ = NULL; SpitPublishingPublisherMediaType _tmp26_ = 0; -#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp25_ = service; -#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp26_ = spit_publishing_service_get_supported_media (_tmp25_); -#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if ((_tmp26_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) { -#line 2648 "PublishingUI.c" +#line 2683 "PublishingUI.c" SpitPublishingService* _tmp27_ = NULL; SpitPublishingPublisherMediaType _tmp28_ = 0; -#line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 366 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp27_ = service; -#line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 366 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp28_ = spit_publishing_service_get_supported_media (_tmp27_); -#line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 366 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp24_ = (_tmp28_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0; -#line 2657 "PublishingUI.c" +#line 2692 "PublishingUI.c" } else { -#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp24_ = FALSE; -#line 2661 "PublishingUI.c" +#line 2696 "PublishingUI.c" } -#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (_tmp24_) { -#line 2665 "PublishingUI.c" +#line 2700 "PublishingUI.c" SpitPublishingService** _tmp29_ = NULL; gint _tmp29__length1 = 0; SpitPublishingService* _tmp30_ = NULL; SpitPublishingService* _tmp31_ = NULL; -#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp29_ = filtered_services; -#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp29__length1 = filtered_services_length1; -#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp30_ = service; -#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp31_ = _g_object_ref0 (_tmp30_); -#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _vala_array_add59 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp31_); -#line 2680 "PublishingUI.c" +#line 2715 "PublishingUI.c" } } } -#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (service); -#line 2686 "PublishingUI.c" +#line 2721 "PublishingUI.c" } } } -#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp32_ = filtered_services; -#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp32__length1 = filtered_services_length1; -#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (result_length1) { -#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *result_length1 = _tmp32__length1; -#line 2698 "PublishingUI.c" +#line 2733 "PublishingUI.c" } -#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" result = _tmp32_; -#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" all_services = (_vala_array_free (all_services, all_services_length1, (GDestroyNotify) g_object_unref), NULL); -#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return result; -#line 2706 "PublishingUI.c" +#line 2741 "PublishingUI.c" } @@ -2736,208 +2771,208 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) { PublishingUIPublishingDialog* _tmp29_ = NULL; PublishingUIPublishingDialog* _tmp30_ = NULL; GTimer* _tmp31_ = NULL; -#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (GEE_IS_COLLECTION (to_publish)); -#line 384 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 386 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = publishing_ui_publishing_dialog_active_instance; -#line 384 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 386 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (_tmp0_ != NULL) { -#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return; -#line 2745 "PublishingUI.c" +#line 2780 "PublishingUI.c" } -#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp1_ = publishing_ui_publishing_dialog_since_last_start; -#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (_tmp1_ == NULL) { -#line 2751 "PublishingUI.c" +#line 2786 "PublishingUI.c" GTimer* _tmp2_ = NULL; GTimer* _tmp3_ = NULL; GTimer* _tmp4_ = NULL; -#line 390 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp2_ = g_timer_new (); -#line 390 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_timer_destroy0 (publishing_ui_publishing_dialog_since_last_start); -#line 390 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_since_last_start = _tmp2_; -#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 393 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp3_ = publishing_ui_publishing_dialog_since_last_start; -#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 393 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_timer_stop (_tmp3_); -#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp4_ = publishing_ui_publishing_dialog_since_last_start; -#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_timer_reset (_tmp4_); -#line 393 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_elapsed_is_valid = FALSE; -#line 2771 "PublishingUI.c" +#line 2806 "PublishingUI.c" } else { gdouble elapsed = 0.0; GTimer* _tmp5_ = NULL; gdouble _tmp6_ = 0.0; gboolean _tmp7_ = FALSE; gdouble _tmp8_ = 0.0; -#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp5_ = publishing_ui_publishing_dialog_since_last_start; -#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp6_ = g_timer_elapsed (_tmp5_, NULL); -#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" elapsed = _tmp6_; -#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp8_ = elapsed; -#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (_tmp8_ < 0.05) { -#line 2788 "PublishingUI.c" +#line 2823 "PublishingUI.c" gboolean _tmp9_ = FALSE; -#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp9_ = publishing_ui_publishing_dialog_elapsed_is_valid; -#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp7_ = _tmp9_; -#line 2794 "PublishingUI.c" +#line 2829 "PublishingUI.c" } else { -#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp7_ = FALSE; -#line 2798 "PublishingUI.c" +#line 2833 "PublishingUI.c" } -#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (_tmp7_) { -#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 399 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return; -#line 2804 "PublishingUI.c" +#line 2839 "PublishingUI.c" } } -#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp10_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); -#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" photos = _tmp10_; -#line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 403 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp11_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); -#line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 403 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" videos = _tmp11_; -#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp12_ = to_publish; -#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp13_ = photos; -#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp14_ = videos; -#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - media_source_collection_filter_media (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection)); #line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + media_source_collection_filter_media (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection)); +#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp15_ = photos; -#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp17_ = _tmp16_; -#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp18_ = videos; -#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp20_ = _tmp19_; -#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp22_ = publishing_ui_publishing_dialog_load_services (_tmp17_ > 0, _tmp20_ > 0, &_tmp21_); -#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" avail_services = _tmp22_; -#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" avail_services_length1 = _tmp21_; -#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _avail_services_size_ = avail_services_length1; -#line 407 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp23_ = avail_services; -#line 407 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp23__length1 = avail_services_length1; -#line 407 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (_tmp23__length1 == 0) { -#line 2849 "PublishingUI.c" +#line 2884 "PublishingUI.c" const gchar* _tmp24_ = NULL; const gchar* _tmp25_ = NULL; gchar* _tmp26_ = NULL; gchar* _tmp27_ = NULL; -#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp24_ = _ ("Unable to publish"); -#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp25_ = _ ("Shotwell cannot publish the selected items because you do not have a c" \ "ompatible publishing plugin enabled. To correct this, choose <b>Edit %" \ "s Preferences</b> and enable one or more of the publishing plugins on " \ "the <b>Plugins</b> tab."); -#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp26_ = g_strdup_printf (_tmp25_, "▸"); -#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp27_ = _tmp26_; -#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" app_window_error_message_with_title (_tmp24_, _tmp27_, NULL, FALSE); -#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_free0 (_tmp27_); -#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" avail_services = (_vala_array_free (avail_services, avail_services_length1, (GDestroyNotify) g_object_unref), NULL); -#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (videos); -#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (photos); -#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return; -#line 2874 "PublishingUI.c" +#line 2909 "PublishingUI.c" } -#line 420 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_debug ("PublishingUI.vala:420: PublishingDialog.go( )"); #line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + g_debug ("PublishingUI.vala:422: PublishingDialog.go( )"); +#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp28_ = to_publish; -#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp29_ = publishing_ui_publishing_dialog_new (_tmp28_); -#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_object_ref_sink (_tmp29_); -#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (publishing_ui_publishing_dialog_active_instance); -#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - publishing_ui_publishing_dialog_active_instance = _tmp29_; #line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + publishing_ui_publishing_dialog_active_instance = _tmp29_; +#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp30_ = publishing_ui_publishing_dialog_active_instance; -#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - publishing_ui_publishing_dialog_run (_tmp30_); #line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + publishing_ui_publishing_dialog_run (_tmp30_); +#line 428 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (publishing_ui_publishing_dialog_active_instance); -#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 428 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_active_instance = NULL; -#line 429 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 431 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp31_ = publishing_ui_publishing_dialog_since_last_start; -#line 429 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 431 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_timer_start (_tmp31_); -#line 430 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 432 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_elapsed_is_valid = TRUE; -#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" avail_services = (_vala_array_free (avail_services, avail_services_length1, (GDestroyNotify) g_object_unref), NULL); -#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (videos); -#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (photos); -#line 2908 "PublishingUI.c" +#line 2943 "PublishingUI.c" } static gboolean publishing_ui_publishing_dialog_on_window_close (PublishingUIPublishingDialog* self, GdkEventAny* evt) { gboolean result = FALSE; SpitPublishingConcretePublishingHost* _tmp0_ = NULL; -#line 433 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), FALSE); -#line 433 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_val_if_fail (evt != NULL, FALSE); -#line 434 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 436 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = self->priv->host; -#line 434 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 436 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" spit_publishing_plugin_host_stop_publishing (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost)); -#line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (self->priv->host); -#line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->priv->host = NULL; -#line 436 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 438 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 439 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); +#line 441 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" result = TRUE; -#line 439 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 441 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return result; -#line 2935 "PublishingUI.c" +#line 2970 "PublishingUI.c" } @@ -2973,253 +3008,253 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl gint _tmp27__length1 = 0; SpitPublishingConcretePublishingHost* _tmp28_ = NULL; SpitPublishingConcretePublishingHost* _tmp29_ = NULL; -#line 442 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); #line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); +#line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" have_active_iter = FALSE; -#line 445 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 447 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = self->priv->service_selector_box; -#line 445 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 447 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_); -#line 445 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 447 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" iter = _tmp1_; -#line 445 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 447 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" have_active_iter = _tmp2_; -#line 448 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp3_ = have_active_iter; -#line 448 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (!_tmp3_) { -#line 2987 "PublishingUI.c" +#line 3022 "PublishingUI.c" GtkComboBox* _tmp4_ = NULL; GtkComboBox* _tmp5_ = NULL; GtkTreeIter _tmp6_ = {0}; -#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp4_ = self->priv->service_selector_box; -#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_combo_box_set_active (_tmp4_, 0); -#line 453 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 455 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp5_ = self->priv->service_selector_box; -#line 453 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 455 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_combo_box_get_active_iter (_tmp5_, &_tmp6_); -#line 453 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 455 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" iter = _tmp6_; -#line 3001 "PublishingUI.c" +#line 3036 "PublishingUI.c" } -#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp7_ = self->priv->service_selector_box_model; -#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp8_ = iter; -#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_tree_model_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp8_, 1, &_tmp9_); -#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_IS_VALUE (&service_name_val) ? (g_value_unset (&service_name_val), NULL) : NULL; -#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - service_name_val = _tmp9_; #line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + service_name_val = _tmp9_; +#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp10_ = service_name_val; -#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp11_ = g_strdup (g_value_get_string (&_tmp10_)); -#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - service_name = _tmp11_; #line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + service_name = _tmp11_; +#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" selected_service = NULL; -#line 462 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp13_ = publishing_ui_publishing_dialog_load_all_services (&_tmp12_); -#line 462 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" services = _tmp13_; -#line 462 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" services_length1 = _tmp12_; -#line 462 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _services_size_ = services_length1; -#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp14_ = services; -#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp14__length1 = services_length1; -#line 3033 "PublishingUI.c" +#line 3068 "PublishingUI.c" { SpitPublishingService** service_collection = NULL; gint service_collection_length1 = 0; gint _service_collection_size_ = 0; gint service_it = 0; -#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" service_collection = _tmp14_; -#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" service_collection_length1 = _tmp14__length1; -#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" for (service_it = 0; service_it < _tmp14__length1; service_it = service_it + 1) { -#line 3045 "PublishingUI.c" +#line 3080 "PublishingUI.c" SpitPublishingService* _tmp15_ = NULL; SpitPublishingService* service = NULL; -#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp15_ = _g_object_ref0 (service_collection[service_it]); -#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" service = _tmp15_; -#line 3052 "PublishingUI.c" +#line 3087 "PublishingUI.c" { SpitPublishingService* _tmp16_ = NULL; const gchar* _tmp17_ = NULL; const gchar* _tmp18_ = NULL; -#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp16_ = service; -#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp17_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); -#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp18_ = service_name; -#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (g_strcmp0 (_tmp17_, _tmp18_) == 0) { -#line 3065 "PublishingUI.c" +#line 3100 "PublishingUI.c" SpitPublishingService* _tmp19_ = NULL; SpitPublishingService* _tmp20_ = NULL; -#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp19_ = service; -#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp20_ = _g_object_ref0 (_tmp19_); -#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (selected_service); -#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" selected_service = _tmp20_; -#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (service); -#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" break; -#line 3080 "PublishingUI.c" +#line 3115 "PublishingUI.c" } -#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (service); -#line 3084 "PublishingUI.c" +#line 3119 "PublishingUI.c" } } } -#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp21_ = selected_service; -#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _vala_assert (_tmp21_ != NULL, "selected_service != null"); #line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _vala_assert (_tmp21_ != NULL, "selected_service != null"); +#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp22_ = config_facade_get_instance (); -#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp23_ = _tmp22_; -#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp24_ = selected_service; -#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp25_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); -#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" configuration_facade_set_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp25_); -#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _g_object_unref0 (_tmp23_); #line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _g_object_unref0 (_tmp23_); +#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp26_ = selected_service; -#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp27_ = self->priv->publishables; -#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp27__length1 = self->priv->publishables_length1; -#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp28_ = spit_publishing_concrete_publishing_host_new (_tmp26_, self, _tmp27_, _tmp27__length1); -#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (self->priv->host); -#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->priv->host = _tmp28_; -#line 474 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 476 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp29_ = self->priv->host; -#line 474 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 476 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" spit_publishing_concrete_publishing_host_start_publishing (_tmp29_); -#line 442 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" services = (_vala_array_free (services, services_length1, (GDestroyNotify) g_object_unref), NULL); -#line 442 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (selected_service); -#line 442 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_free0 (service_name); -#line 442 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_IS_VALUE (&service_name_val) ? (g_value_unset (&service_name_val), NULL) : NULL; -#line 3128 "PublishingUI.c" +#line 3163 "PublishingUI.c" } static void publishing_ui_publishing_dialog_on_close_cancel_clicked (PublishingUIPublishingDialog* self) { SpitPublishingConcretePublishingHost* _tmp0_ = NULL; -#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 479 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); -#line 478 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_debug ("PublishingUI.vala:478: PublishingDialog: on_close_cancel_clicked( ): i" \ -"nvoked."); #line 480 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + g_debug ("PublishingUI.vala:480: PublishingDialog: on_close_cancel_clicked( ): i" \ +"nvoked."); +#line 482 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = self->priv->host; -#line 480 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 482 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" spit_publishing_plugin_host_stop_publishing (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost)); -#line 481 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 483 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (self->priv->host); -#line 481 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 483 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->priv->host = NULL; -#line 482 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 484 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 483 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 485 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 3150 "PublishingUI.c" +#line 3185 "PublishingUI.c" } static void publishing_ui_publishing_dialog_set_large_window_mode (PublishingUIPublishingDialog* self) { GtkBox* _tmp0_ = NULL; -#line 486 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 488 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); -#line 487 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 489 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT); -#line 488 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 490 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = self->priv->central_area_layouter; -#line 488 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT); #line 490 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT); +#line 492 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); -#line 3166 "PublishingUI.c" +#line 3201 "PublishingUI.c" } static void publishing_ui_publishing_dialog_set_colossal_window_mode (PublishingUIPublishingDialog* self) { GtkBox* _tmp0_ = NULL; -#line 493 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 495 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); -#line 494 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 496 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_HEIGHT); -#line 495 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 497 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = self->priv->central_area_layouter; -#line 495 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT); #line 497 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT); +#line 499 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); -#line 3182 "PublishingUI.c" +#line 3217 "PublishingUI.c" } static void publishing_ui_publishing_dialog_set_standard_window_mode (PublishingUIPublishingDialog* self) { GtkBox* _tmp0_ = NULL; -#line 500 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 502 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); -#line 501 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 503 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_HEIGHT); -#line 502 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 504 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = self->priv->central_area_layouter; -#line 502 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT); #line 504 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT); +#line 506 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); -#line 3198 "PublishingUI.c" +#line 3233 "PublishingUI.c" } static void publishing_ui_publishing_dialog_set_free_sizable_window_mode (PublishingUIPublishingDialog* self) { -#line 507 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 509 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); -#line 508 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 510 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE); -#line 3207 "PublishingUI.c" +#line 3242 "PublishingUI.c" } static void publishing_ui_publishing_dialog_clear_free_sizable_window_mode (PublishingUIPublishingDialog* self) { -#line 511 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 513 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); -#line 512 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 514 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); -#line 3216 "PublishingUI.c" +#line 3251 "PublishingUI.c" } @@ -3227,17 +3262,17 @@ SpitPublishingDialogPane* publishing_ui_publishing_dialog_get_active_pane (Publi SpitPublishingDialogPane* result = NULL; SpitPublishingDialogPane* _tmp0_ = NULL; SpitPublishingDialogPane* _tmp1_ = NULL; -#line 515 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 517 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), NULL); -#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = self->priv->active_pane; -#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" result = _tmp1_; -#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return result; -#line 3234 "PublishingUI.c" +#line 3269 "PublishingUI.c" } @@ -3245,58 +3280,58 @@ void publishing_ui_publishing_dialog_set_close_button_mode (PublishingUIPublishi GtkButton* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; GtkButton* _tmp2_ = NULL; -#line 519 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 521 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); -#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 522 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = self->priv->close_cancel_button; -#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 522 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp1_ = _ ("_Close"); -#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 522 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_button_set_label (_tmp0_, _tmp1_); -#line 521 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 523 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp2_ = self->priv->close_cancel_button; -#line 521 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 523 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); -#line 3254 "PublishingUI.c" +#line 3289 "PublishingUI.c" } void publishing_ui_publishing_dialog_set_cancel_button_mode (PublishingUIPublishingDialog* self) { GtkButton* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 524 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 526 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); -#line 525 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 527 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = self->priv->close_cancel_button; -#line 525 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 527 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp1_ = _ ("_Cancel"); -#line 525 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 527 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_button_set_label (_tmp0_, _tmp1_); -#line 3269 "PublishingUI.c" +#line 3304 "PublishingUI.c" } void publishing_ui_publishing_dialog_lock_service (PublishingUIPublishingDialog* self) { GtkComboBox* _tmp0_ = NULL; -#line 528 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 530 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); -#line 529 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 531 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = self->priv->service_selector_box; -#line 529 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 531 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 3281 "PublishingUI.c" +#line 3316 "PublishingUI.c" } void publishing_ui_publishing_dialog_unlock_service (PublishingUIPublishingDialog* self) { GtkComboBox* _tmp0_ = NULL; -#line 532 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 534 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); -#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 535 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = self->priv->service_selector_box; -#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 535 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 3293 "PublishingUI.c" +#line 3328 "PublishingUI.c" } @@ -3314,110 +3349,110 @@ void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog* SpitPublishingDialogPane* _tmp15_ = NULL; SpitPublishingDialogPane* _tmp16_ = NULL; SpitPublishingDialogPane* _tmp17_ = NULL; -#line 536 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 538 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); -#line 536 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 538 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (pane)); -#line 537 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_debug ("PublishingUI.vala:537: PublishingDialog: install_pane( ): invoked."); #line 539 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + g_debug ("PublishingUI.vala:539: PublishingDialog: install_pane( ): invoked."); +#line 541 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = self->priv->active_pane; -#line 539 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 541 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (_tmp0_ != NULL) { -#line 3321 "PublishingUI.c" +#line 3356 "PublishingUI.c" SpitPublishingDialogPane* _tmp1_ = NULL; GtkBox* _tmp2_ = NULL; SpitPublishingDialogPane* _tmp3_ = NULL; GtkWidget* _tmp4_ = NULL; GtkWidget* _tmp5_ = NULL; -#line 540 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_debug ("PublishingUI.vala:540: PublishingDialog: install_pane( ): a pane is al" \ -"ready installed; removing it."); #line 542 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + g_debug ("PublishingUI.vala:542: PublishingDialog: install_pane( ): a pane is al" \ +"ready installed; removing it."); +#line 544 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp1_ = self->priv->active_pane; -#line 542 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 544 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" spit_publishing_dialog_pane_on_pane_uninstalled (_tmp1_); -#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp2_ = self->priv->central_area_layouter; -#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp3_ = self->priv->active_pane; -#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp4_ = spit_publishing_dialog_pane_get_widget (_tmp3_); -#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp5_ = _tmp4_; -#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), _tmp5_); -#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (_tmp5_); -#line 3345 "PublishingUI.c" +#line 3380 "PublishingUI.c" } -#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp6_ = self->priv->central_area_layouter; -#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp7_ = pane; -#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp8_ = spit_publishing_dialog_pane_get_widget (_tmp7_); -#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp9_ = _tmp8_; -#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_box_pack_start (_tmp6_, _tmp9_, TRUE, TRUE, (guint) 0); -#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (_tmp9_); -#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 549 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); +#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp10_ = pane; -#line 549 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp11_ = spit_publishing_dialog_pane_get_preferred_geometry (_tmp10_); -#line 549 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - geometry_options = _tmp11_; #line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + geometry_options = _tmp11_; +#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp12_ = geometry_options; -#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if ((_tmp12_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) { -#line 552 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 554 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_set_large_window_mode (self); -#line 3373 "PublishingUI.c" +#line 3408 "PublishingUI.c" } else { SpitPublishingDialogPaneGeometryOptions _tmp13_ = 0; -#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp13_ = geometry_options; -#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if ((_tmp13_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE) != 0) { -#line 554 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 556 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_set_colossal_window_mode (self); -#line 3382 "PublishingUI.c" +#line 3417 "PublishingUI.c" } else { -#line 556 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 558 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_set_standard_window_mode (self); -#line 3386 "PublishingUI.c" +#line 3421 "PublishingUI.c" } } -#line 558 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 560 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp14_ = geometry_options; -#line 558 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 560 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if ((_tmp14_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) { -#line 559 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 561 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_set_free_sizable_window_mode (self); -#line 3395 "PublishingUI.c" +#line 3430 "PublishingUI.c" } else { -#line 561 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_clear_free_sizable_window_mode (self); -#line 3399 "PublishingUI.c" +#line 3434 "PublishingUI.c" } -#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp15_ = pane; -#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp16_ = _g_object_ref0 (_tmp15_); -#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (self->priv->active_pane); -#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->priv->active_pane = _tmp16_; -#line 564 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 566 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp17_ = pane; -#line 564 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 566 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" spit_publishing_dialog_pane_on_pane_installed (_tmp17_); -#line 3413 "PublishingUI.c" +#line 3448 "PublishingUI.c" } @@ -3425,23 +3460,23 @@ gint publishing_ui_publishing_dialog_run (PublishingUIPublishingDialog* self) { gint result = 0; gint _result_ = 0; gint _tmp0_ = 0; -#line 567 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 569 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), 0); -#line 568 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - publishing_ui_publishing_dialog_on_service_changed (self); #line 570 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + publishing_ui_publishing_dialog_on_service_changed (self); +#line 572 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); -#line 570 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _result_ = _tmp0_; #line 572 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + _result_ = _tmp0_; +#line 574 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (self->priv->host); -#line 572 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - self->priv->host = NULL; #line 574 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" + self->priv->host = NULL; +#line 576 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" result = _result_; -#line 574 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" +#line 576 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return result; -#line 3437 "PublishingUI.c" +#line 3472 "PublishingUI.c" } @@ -3452,14 +3487,14 @@ static void publishing_ui_publishing_dialog_class_init (PublishingUIPublishingDi g_type_class_add_private (klass, sizeof (PublishingUIPublishingDialogPrivate)); #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_OBJECT_CLASS (klass)->finalize = publishing_ui_publishing_dialog_finalize; -#line 3448 "PublishingUI.c" +#line 3483 "PublishingUI.c" } static void publishing_ui_publishing_dialog_instance_init (PublishingUIPublishingDialog * self) { #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->priv = PUBLISHING_UI_PUBLISHING_DIALOG_GET_PRIVATE (self); -#line 3455 "PublishingUI.c" +#line 3490 "PublishingUI.c" } @@ -3485,7 +3520,7 @@ static void publishing_ui_publishing_dialog_finalize (GObject* obj) { spit_pluggable_info_destroy (&self->priv->info); #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_OBJECT_CLASS (publishing_ui_publishing_dialog_parent_class)->finalize (obj); -#line 3481 "PublishingUI.c" +#line 3516 "PublishingUI.c" } diff --git a/src/publishing/PublishingUI.vala b/src/publishing/PublishingUI.vala index 91a2bf4..c975564 100644 --- a/src/publishing/PublishingUI.vala +++ b/src/publishing/PublishingUI.vala @@ -168,6 +168,8 @@ public class PublishingDialog : Gtk.Dialog { ((Gtk.HeaderBar) get_header_bar()).set_show_close_button(false); resizable = false; + modal = true; + set_transient_for(AppWindow.get_instance()); delete_event.connect(on_window_close); publishables = new Spit.Publishing.Publishable[0]; diff --git a/src/searches/SavedSearchDialog.c b/src/searches/SavedSearchDialog.c index 5050916..2489f21 100644 --- a/src/searches/SavedSearchDialog.c +++ b/src/searches/SavedSearchDialog.c @@ -278,7 +278,7 @@ typedef struct _SavedSearchDialogSearchRowDatePrivate SavedSearchDialogSearchRow typedef struct _SearchConditionDate SearchConditionDate; typedef struct _SearchConditionDateClass SearchConditionDateClass; -typedef struct _Block9Data Block9Data; +typedef struct _Block10Data Block10Data; typedef struct _ParamSpecSavedSearchDialog ParamSpecSavedSearchDialog; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } @@ -534,7 +534,7 @@ typedef enum { SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET } SearchConditionDateContext; -struct _Block9Data { +struct _Block10Data { int _ref_count_; SavedSearchDialogSearchRowDate* self; GtkDialog* d; @@ -808,14 +808,14 @@ GDateTime* search_condition_date_get_date_one (SearchConditionDate* self); GDateTime* search_condition_date_get_date_two (SearchConditionDate* self); static gboolean saved_search_dialog_search_row_date_real_is_complete (SavedSearchDialogSearchRow* base); static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialogSearchRowDate* self, GtkCalendar* cal); -static Block9Data* block9_data_ref (Block9Data* _data9_); -static void block9_data_unref (void * _userdata_); +static Block10Data* block10_data_ref (Block10Data* _data10_); +static void block10_data_unref (void * _userdata_); #define RESOURCES_CANCEL_LABEL _ ("_Cancel") #define RESOURCES_OK_LABEL _ ("_OK") -static void __lambda12_ (SavedSearchDialogSearchRowDate* self); -static void ___lambda12__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self); -static void __lambda13_ (Block9Data* _data9_); -static void ___lambda13__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self); +static void __lambda13_ (SavedSearchDialogSearchRowDate* self); +static void ___lambda13__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self); +static void __lambda14_ (Block10Data* _data10_); +static void ___lambda14__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self); static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearchRow* obj); static void saved_search_dialog_finalize (SavedSearchDialog* obj); @@ -5838,71 +5838,71 @@ static void saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSea } -static Block9Data* block9_data_ref (Block9Data* _data9_) { +static Block10Data* block10_data_ref (Block10Data* _data10_) { #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_atomic_int_inc (&_data9_->_ref_count_); + g_atomic_int_inc (&_data10_->_ref_count_); #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - return _data9_; + return _data10_; #line 5847 "SavedSearchDialog.c" } -static void block9_data_unref (void * _userdata_) { - Block9Data* _data9_; - _data9_ = (Block9Data*) _userdata_; +static void block10_data_unref (void * _userdata_) { + Block10Data* _data10_; + _data10_ = (Block10Data*) _userdata_; #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) { + if (g_atomic_int_dec_and_test (&_data10_->_ref_count_)) { #line 5856 "SavedSearchDialog.c" SavedSearchDialogSearchRowDate* self; #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self = _data9_->self; + self = _data10_->self; #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (_data9_->d); + _g_object_unref0 (_data10_->d); #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_unref0 (self); #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_slice_free (Block9Data, _data9_); + g_slice_free (Block10Data, _data10_); #line 5866 "SavedSearchDialog.c" } } -static void __lambda12_ (SavedSearchDialogSearchRowDate* self) { +static void __lambda13_ (SavedSearchDialogSearchRowDate* self) { #line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_update_date_labels (self); #line 5874 "SavedSearchDialog.c" } -static void ___lambda12__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) { +static void ___lambda13__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) { #line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - __lambda12_ ((SavedSearchDialogSearchRowDate*) self); + __lambda13_ ((SavedSearchDialogSearchRowDate*) self); #line 5881 "SavedSearchDialog.c" } -static void __lambda13_ (Block9Data* _data9_) { +static void __lambda14_ (Block10Data* _data10_) { SavedSearchDialogSearchRowDate* self; GtkDialog* _tmp0_ = NULL; #line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self = _data9_->self; + self = _data10_->self; #line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = _data9_->d; + _tmp0_ = _data10_->d; #line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_dialog_response (_tmp0_, (gint) GTK_RESPONSE_ACCEPT); #line 5894 "SavedSearchDialog.c" } -static void ___lambda13__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self) { +static void ___lambda14__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self) { #line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - __lambda13_ (self); + __lambda14_ (self); #line 5901 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialogSearchRowDate* self, GtkCalendar* cal) { - Block9Data* _data9_; + Block10Data* _data10_; gint orig_day = 0; GtkCalendar* _tmp0_ = NULL; gint _tmp1_ = 0; @@ -5943,11 +5943,11 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (GTK_IS_CALENDAR (cal)); #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _data9_ = g_slice_new0 (Block9Data); + _data10_ = g_slice_new0 (Block10Data); #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _data9_->_ref_count_ = 1; + _data10_->_ref_count_ = 1; #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _data9_->self = saved_search_dialog_search_row_ref (self); + _data10_->self = saved_search_dialog_search_row_ref (self); #line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = cal; #line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5977,21 +5977,21 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo #line 603 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp9_); #line 603 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _data9_->d = _tmp9_; + _data10_->d = _tmp9_; #line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = _data9_->d; + _tmp10_ = _data10_->d; #line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow), TRUE); #line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = _data9_->d; + _tmp11_ = _data10_->d; #line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow), FALSE); #line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = _data9_->d; + _tmp12_ = _data10_->d; #line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_window_set_decorated (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow), FALSE); #line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = _data9_->d; + _tmp13_ = _data10_->d; #line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp14_ = (GtkBox*) gtk_dialog_get_content_area (_tmp13_); #line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -6001,21 +6001,21 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo #line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp16_ = cal; #line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = g_signal_connect (_tmp16_, "day-selected", (GCallback) ___lambda12__gtk_calendar_day_selected, self); + _tmp17_ = g_signal_connect (_tmp16_, "day-selected", (GCallback) ___lambda13__gtk_calendar_day_selected, self); #line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" id_1 = _tmp17_; #line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp18_ = cal; #line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = g_signal_connect_data (_tmp18_, "day-selected-double-click", (GCallback) ___lambda13__gtk_calendar_day_selected_double_click, block9_data_ref (_data9_), (GClosureNotify) block9_data_unref, 0); + _tmp19_ = g_signal_connect_data (_tmp18_, "day-selected-double-click", (GCallback) ___lambda14__gtk_calendar_day_selected_double_click, block10_data_ref (_data10_), (GClosureNotify) block10_data_unref, 0); #line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" id_2 = _tmp19_; #line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = _data9_->d; + _tmp20_ = _data10_->d; #line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget)); #line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp21_ = _data9_->d; + _tmp21_ = _data10_->d; #line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp22_ = gtk_dialog_run (_tmp21_); #line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -6064,15 +6064,15 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo #line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, G_TYPE_OBJECT, GObject), _tmp33_); #line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp34_ = _data9_->d; + _tmp34_ = _data10_->d; #line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget)); #line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_update_date_labels (self); #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - block9_data_unref (_data9_); + block10_data_unref (_data10_); #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _data9_ = NULL; + _data10_ = NULL; #line 6077 "SavedSearchDialog.c" } diff --git a/src/searches/SearchBoolean.c b/src/searches/SearchBoolean.c index 2667236..86c96d0 100644 --- a/src/searches/SearchBoolean.c +++ b/src/searches/SearchBoolean.c @@ -742,10 +742,10 @@ enum { }; SearchConditionSearchType* search_condition_search_type_as_array (int* result_length1); void search_condition_search_type_sort_array (SearchConditionSearchType** array, int* array_length1); -static gint __lambda11_ (void* a, void* b); +static gint __lambda12_ (void* a, void* b); gint utf8_cs_compare (void* a, void* b); gchar* search_condition_search_type_display_text (SearchConditionSearchType self); -static gint ___lambda11____compar_fn_t (void* key1, void* key2); +static gint ___lambda12____compar_fn_t (void* key1, void* key2); gchar* search_condition_search_type_to_string (SearchConditionSearchType self); SearchConditionSearchType search_condition_search_type_from_string (const gchar* str); gboolean search_condition_predicate (SearchCondition* self, MediaSource* source); @@ -1156,7 +1156,7 @@ SearchConditionSearchType* search_condition_search_type_as_array (int* result_le } -static gint __lambda11_ (void* a, void* b) { +static gint __lambda12_ (void* a, void* b) { gint result = 0; void* _tmp0_ = NULL; gchar* _tmp1_ = NULL; @@ -1181,9 +1181,9 @@ static gint __lambda11_ (void* a, void* b) { } -static gint ___lambda11____compar_fn_t (void* key1, void* key2) { +static gint ___lambda12____compar_fn_t (void* key1, void* key2) { gint result; - result = __lambda11_ (key1, key2); + result = __lambda12_ (key1, key2); #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; #line 1190 "SearchBoolean.c" @@ -1204,7 +1204,7 @@ void search_condition_search_type_sort_array (SearchConditionSearchType** array, #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1__length1 = *array_length1; #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - qsort (_tmp0_, (gsize) _tmp1__length1, (gsize) sizeof (SearchConditionSearchType), ___lambda11____compar_fn_t); + qsort (_tmp0_, (gsize) _tmp1__length1, (gsize) sizeof (SearchConditionSearchType), ___lambda12____compar_fn_t); #line 1209 "SearchBoolean.c" } |