Merge tag 'upstream/0.25.0'

Upstream version 0.25.0

4 files changed, 28 insertions, 28 deletions

diff --git a/src/searches/Branch.c b/src/searches/Branch.c
index 2e6e87f..7a2a970 100644
--- a/src/searches/Branch.c
+++ b/src/searches/Branch.c
@@ -1087,7 +1087,7 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 #line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	new_search = _tmp2_;
 #line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp3_ = _ ("Ne_w Saved Search...");
+	_tmp3_ = _ ("Ne_w Saved Search…");
 #line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	new_search.label = _tmp3_;
 #line 78 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1130,11 +1130,11 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 #line 85 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1133 "Branch.c"
-			goto __catch73_g_error;
+			goto __catch74_g_error;
 		}
 	}
-	goto __finally73;
-	__catch73_g_error:
+	goto __finally74;
+	__catch74_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp12_ = NULL;
@@ -1179,7 +1179,7 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 		_g_error_free0 (err);
 #line 1181 "Branch.c"
 	}
-	__finally73:
+	__finally74:
 #line 84 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 84 "/home/jens/Source/shotwell/src/searches/Branch.vala"
diff --git a/src/searches/Branch.vala b/src/searches/Branch.vala
index b8ed334..0c86733 100644
--- a/src/searches/Branch.vala
+++ b/src/searches/Branch.vala
@@ -74,7 +74,7 @@ public class Searches.Header : Sidebar.Header, Sidebar.Contextable {
         Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
         
         Gtk.ActionEntry new_search = { "CommonNewSearch", null, TRANSLATABLE, null, null, on_new_search };
-        new_search.label = _("Ne_w Saved Search...");
+        new_search.label = _("Ne_w Saved Search…");
         actions += new_search;
         
         group.add_actions(actions, this);
diff --git a/src/searches/SavedSearchPage.c b/src/searches/SavedSearchPage.c
index b55e498..2b40a55 100644
--- a/src/searches/SavedSearchPage.c
+++ b/src/searches/SavedSearchPage.c
@@ -825,8 +825,8 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ
 void saved_search_dialog_show (SavedSearchDialog* self);
 static void saved_search_page_real_update_actions (Page* base, gint selected_count, gint count);
 void page_set_action_details (Page* self, const gchar* name, const gchar* label, const gchar* tooltip, gboolean sensitive);
-#define RESOURCES_RENAME_SEARCH_MENU _ ("Re_name...")
-#define RESOURCES_EDIT_SEARCH_MENU _ ("_Edit...")
+#define RESOURCES_RENAME_SEARCH_MENU _ ("Re_name…")
+#define RESOURCES_EDIT_SEARCH_MENU _ ("_Edit…")
 #define RESOURCES_DELETE_SEARCH_MENU _ ("_Delete")
 void page_update_actions (Page* self, gint selected_count, gint count);
 static void saved_search_page_finalize (GObject* obj);
diff --git a/src/searches/SearchBoolean.c b/src/searches/SearchBoolean.c
index 0490d60..4918ae1 100644
--- a/src/searches/SearchBoolean.c
+++ b/src/searches/SearchBoolean.c
@@ -5691,7 +5691,7 @@ void saved_search_reconstitute (SavedSearch* self) {
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5684 "SearchBoolean.c"
-				goto __catch74_database_error;
+				goto __catch75_database_error;
 			}
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5707,8 +5707,8 @@ void saved_search_reconstitute (SavedSearch* self) {
 		_tmp6_->search_id = _tmp0_;
 #line 5699 "SearchBoolean.c"
 	}
-	goto __finally74;
-	__catch74_database_error:
+	goto __finally75;
+	__catch75_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -5724,7 +5724,7 @@ void saved_search_reconstitute (SavedSearch* self) {
 		_g_error_free0 (err);
 #line 5716 "SearchBoolean.c"
 	}
-	__finally74:
+	__finally75:
 #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5835,7 +5835,7 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5828 "SearchBoolean.c"
-				goto __catch75_database_error;
+				goto __catch76_database_error;
 			}
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5846,8 +5846,8 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 #line 5837 "SearchBoolean.c"
 		}
 	}
-	goto __finally75;
-	__catch75_database_error:
+	goto __finally76;
+	__catch76_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp12_ = NULL;
@@ -5867,7 +5867,7 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 		return result;
 #line 5859 "SearchBoolean.c"
 	}
-	__finally75:
+	__finally76:
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6041,7 +6041,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6034 "SearchBoolean.c"
-				goto __catch76_database_error;
+				goto __catch77_database_error;
 			}
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6132,8 +6132,8 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 		_g_object_unref0 (_tmp0_);
 #line 6124 "SearchBoolean.c"
 	}
-	goto __finally76;
-	__catch76_database_error:
+	goto __finally77;
+	__catch77_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp18_ = NULL;
@@ -6149,7 +6149,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 		_g_error_free0 (err);
 #line 6141 "SearchBoolean.c"
 	}
-	__finally76:
+	__finally77:
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6282,7 +6282,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6275 "SearchBoolean.c"
-				goto __catch77_database_error;
+				goto __catch78_database_error;
 			}
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_object_unref0 (search);
@@ -6304,8 +6304,8 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 		_saved_search_row_unref0 (_tmp0_);
 #line 6296 "SearchBoolean.c"
 	}
-	goto __finally77;
-	__catch77_database_error:
+	goto __finally78;
+	__catch78_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -6321,7 +6321,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 		_g_error_free0 (err);
 #line 6313 "SearchBoolean.c"
 	}
-	__finally77:
+	__finally78:
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6386,7 +6386,7 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6379 "SearchBoolean.c"
-				goto __catch78_database_error;
+				goto __catch79_database_error;
 			}
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6397,8 +6397,8 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 #line 6388 "SearchBoolean.c"
 		}
 	}
-	goto __finally78;
-	__catch78_database_error:
+	goto __finally79;
+	__catch79_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -6414,7 +6414,7 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 		_g_error_free0 (err);
 #line 6406 "SearchBoolean.c"
 	}
-	__finally78:
+	__finally79:
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"