Merge tag 'upstream/0.25.0'

Upstream version 0.25.0

3 files changed, 26 insertions, 26 deletions

diff --git a/src/direct/DirectPhoto.c b/src/direct/DirectPhoto.c
index 5fe58c0..b80ec06 100644
--- a/src/direct/DirectPhoto.c
+++ b/src/direct/DirectPhoto.c
@@ -1258,7 +1258,7 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1261 "DirectPhoto.c"
-			goto __catch42_g_error;
+			goto __catch43_g_error;
 		}
 #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->backing_photo_row;
@@ -1270,8 +1270,8 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 		_g_object_unref0 (_tmp0_);
 #line 1272 "DirectPhoto.c"
 	}
-	goto __finally42;
-	__catch42_g_error:
+	goto __finally43;
+	__catch43_g_error:
 	{
 		GError* e = NULL;
 		gchar* _tmp5_ = NULL;
@@ -1292,7 +1292,7 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 		_g_error_free0 (e);
 #line 1294 "DirectPhoto.c"
 	}
-	__finally42:
+	__finally43:
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1337,7 +1337,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 #line 75 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1340 "DirectPhoto.c"
-			goto __catch43_g_error;
+			goto __catch44_g_error;
 		}
 #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp2_ = reimport_state;
@@ -1346,11 +1346,11 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1349 "DirectPhoto.c"
-			goto __catch43_g_error;
+			goto __catch44_g_error;
 		}
 	}
-	goto __finally43;
-	__catch43_g_error:
+	goto __finally44;
+	__catch44_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -1375,7 +1375,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 		return result;
 #line 1377 "DirectPhoto.c"
 	}
-	__finally43:
+	__finally44:
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2563,7 +2563,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_photo_reimport_master_state_unref0 (reimport_state);
 #line 2566 "DirectPhoto.c"
-					goto __catch44_g_error;
+					goto __catch45_g_error;
 				}
 #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				if (_tmp12_) {
@@ -2582,7 +2582,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 						_photo_reimport_master_state_unref0 (reimport_state);
 #line 2585 "DirectPhoto.c"
-						goto __catch44_g_error;
+						goto __catch45_g_error;
 					}
 #line 291 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp18_ = should_restore_ori;
@@ -2613,8 +2613,8 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 				_photo_reimport_master_state_unref0 (reimport_state);
 #line 2615 "DirectPhoto.c"
 			}
-			goto __finally44;
-			__catch44_g_error:
+			goto __finally45;
+			__catch45_g_error:
 			{
 				GError* err = NULL;
 				GError* _tmp22_ = NULL;
@@ -2638,7 +2638,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 				_g_error_free0 (err);
 #line 2640 "DirectPhoto.c"
 			}
-			__finally44:
+			__finally45:
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
diff --git a/src/direct/DirectPhotoPage.c b/src/direct/DirectPhotoPage.c
index d837f7d..1eea167 100644
--- a/src/direct/DirectPhotoPage.c
+++ b/src/direct/DirectPhotoPage.c
@@ -683,12 +683,12 @@ static void _direct_photo_page_on_save_as_gtk_action_callback (GtkAction* action
 static void _vala_array_add93 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void direct_photo_page_on_send_to (DirectPhotoPage* self);
 static void _direct_photo_page_on_send_to_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_SEND_TO_MENU _ ("Send _To...")
+#define RESOURCES_SEND_TO_MENU _ ("Send _To…")
 static void _vala_array_add94 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 #define RESOURCES_PRINT_LABEL _ ("_Print")
 static void direct_photo_page_on_print (DirectPhotoPage* self);
 static void _direct_photo_page_on_print_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_PRINT_MENU _ ("_Print...")
+#define RESOURCES_PRINT_MENU _ ("_Print…")
 static void _vala_array_add95 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void _vala_array_add96 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void _vala_array_add97 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
@@ -726,13 +726,13 @@ static void _vala_array_add104 (GtkActionEntry** array, int* length, int* size,
 void editing_host_page_on_enhance (EditingHostPage* self);
 static void _editing_host_page_on_enhance_gtk_action_callback (GtkAction* action, gpointer self);
 #define RESOURCES_ENHANCE_MENU _ ("_Enhance")
-#define RESOURCES_ENHANCE_TOOLTIP _ ("Automatically improve the photo's appearance")
+#define RESOURCES_ENHANCE_TOOLTIP _ ("Automatically improve the photo’s appearance")
 static void _vala_array_add105 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 #define RESOURCES_CROP "shotwell-crop"
 void editing_host_page_toggle_crop (EditingHostPage* self);
 static void _editing_host_page_toggle_crop_gtk_action_callback (GtkAction* action, gpointer self);
 #define RESOURCES_CROP_MENU _ ("_Crop")
-#define RESOURCES_CROP_TOOLTIP _ ("Crop the photo's size")
+#define RESOURCES_CROP_TOOLTIP _ ("Crop the photo’s size")
 static void _vala_array_add106 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 #define RESOURCES_REFRESH_LABEL _ ("_Refresh")
 void editing_host_page_toggle_straighten (EditingHostPage* self);
@@ -750,7 +750,7 @@ static void _vala_array_add108 (GtkActionEntry** array, int* length, int* size,
 void editing_host_page_toggle_adjust (EditingHostPage* self);
 static void _editing_host_page_toggle_adjust_gtk_action_callback (GtkAction* action, gpointer self);
 #define RESOURCES_ADJUST_MENU _ ("_Adjust")
-#define RESOURCES_ADJUST_TOOLTIP _ ("Adjust the photo's color and tone")
+#define RESOURCES_ADJUST_TOOLTIP _ ("Adjust the photo’s color and tone")
 static void _vala_array_add109 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 #define RESOURCES_REVERT_LABEL _ ("Revert to Original")
 void editing_host_page_on_revert (EditingHostPage* self);
@@ -759,7 +759,7 @@ static void _editing_host_page_on_revert_gtk_action_callback (GtkAction* action,
 static void _vala_array_add110 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 void editing_host_page_on_adjust_date_time (EditingHostPage* self);
 static void _editing_host_page_on_adjust_date_time_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ADJUST_DATE_TIME_MENU _ ("_Adjust Date and Time...")
+#define RESOURCES_ADJUST_DATE_TIME_MENU _ ("_Adjust Date and Time…")
 static void _vala_array_add111 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 void editing_host_page_on_set_background (EditingHostPage* self);
 static void _editing_host_page_on_set_background_gtk_action_callback (GtkAction* action, gpointer self);
@@ -1931,7 +1931,7 @@ static GtkActionEntry* direct_photo_page_real_init_collect_action_entries (Page*
 #line 55 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	save_as = _tmp11_;
 #line 57 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp12_ = _ ("Save _As...");
+	_tmp12_ = _ ("Save _As…");
 #line 57 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	save_as.label = _tmp12_;
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -4270,11 +4270,11 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 #line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4273 "DirectPhotoPage.c"
-			goto __catch45_g_error;
+			goto __catch46_g_error;
 		}
 	}
-	goto __finally45;
-	__catch45_g_error:
+	goto __finally46;
+	__catch46_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp11_ = NULL;
@@ -4317,7 +4317,7 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 		return;
 #line 4319 "DirectPhotoPage.c"
 	}
-	__finally45:
+	__finally46:
 #line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
diff --git a/src/direct/DirectPhotoPage.vala b/src/direct/DirectPhotoPage.vala
index 3d23528..2a56887 100644
--- a/src/direct/DirectPhotoPage.vala
+++ b/src/direct/DirectPhotoPage.vala
@@ -54,7 +54,7 @@ public class DirectPhotoPage : EditingHostPage {
 
         Gtk.ActionEntry save_as = { "SaveAs", Resources.SAVE_AS_LABEL, TRANSLATABLE,
             "<Ctrl><Shift>S", TRANSLATABLE, on_save_as };
-        save_as.label = _("Save _As...");
+        save_as.label = _("Save _As…");
         save_as.tooltip = _("Save photo with a different name");
         actions += save_as;