summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
Diffstat (limited to 'src/library')
-rw-r--r--src/library/ImportQueuePage.c4
-rw-r--r--src/library/ImportQueuePage.vala4
-rw-r--r--src/library/ImportQueueSidebarEntry.c2
-rw-r--r--src/library/LibraryWindow.c52
-rw-r--r--src/library/LibraryWindow.vala18
-rw-r--r--src/library/OfflinePage.c2
-rw-r--r--src/library/OfflinePage.vala2
7 files changed, 42 insertions, 42 deletions
diff --git a/src/library/ImportQueuePage.c b/src/library/ImportQueuePage.c
index 2fba690..112dd16 100644
--- a/src/library/ImportQueuePage.c
+++ b/src/library/ImportQueuePage.c
@@ -462,7 +462,7 @@ GType batch_import_get_type (void) G_GNUC_CONST;
enum {
IMPORT_QUEUE_PAGE_DUMMY_PROPERTY
};
-#define IMPORT_QUEUE_PAGE_NAME _ ("Importing...")
+#define IMPORT_QUEUE_PAGE_NAME _ ("Importing…")
ImportQueuePage* import_queue_page_new (void);
ImportQueuePage* import_queue_page_construct (GType object_type);
SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* page_name, gboolean scale_up_to_viewport);
@@ -1101,7 +1101,7 @@ static void import_queue_page_on_preparing (ImportQueuePage* self) {
#line 124 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
_tmp0_ = self->priv->progress_bar;
#line 124 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
- _tmp1_ = _ ("Preparing to import...");
+ _tmp1_ = _ ("Preparing to import…");
#line 124 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
gtk_progress_bar_set_text (_tmp0_, _tmp1_);
#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
diff --git a/src/library/ImportQueuePage.vala b/src/library/ImportQueuePage.vala
index f19f947..b5a5eb6 100644
--- a/src/library/ImportQueuePage.vala
+++ b/src/library/ImportQueuePage.vala
@@ -5,7 +5,7 @@
*/
public class ImportQueuePage : SinglePhotoPage {
- public const string NAME = _("Importing...");
+ public const string NAME = _("Importing…");
private Gee.ArrayList<BatchImport> queue = new Gee.ArrayList<BatchImport>();
private Gee.HashSet<BatchImport> cancel_unallowed = new Gee.HashSet<BatchImport>();
@@ -121,7 +121,7 @@ public class ImportQueuePage : SinglePhotoPage {
}
private void on_preparing() {
- progress_bar.set_text(_("Preparing to import..."));
+ progress_bar.set_text(_("Preparing to import…"));
progress_bar.pulse();
}
diff --git a/src/library/ImportQueueSidebarEntry.c b/src/library/ImportQueueSidebarEntry.c
index 5ce68ec..c218235 100644
--- a/src/library/ImportQueueSidebarEntry.c
+++ b/src/library/ImportQueueSidebarEntry.c
@@ -213,7 +213,7 @@ static void library_import_queue_sidebar_entry_on_destroying_page (LibraryImport
static void _library_import_queue_sidebar_entry_on_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, Page* page, gpointer self);
void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value);
static gchar* library_import_queue_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
-#define IMPORT_QUEUE_PAGE_NAME _ ("Importing...")
+#define IMPORT_QUEUE_PAGE_NAME _ ("Importing…")
static gchar* library_import_queue_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base);
#define RESOURCES_ICON_IMPORTING "go-down"
static Page* library_import_queue_sidebar_entry_real_create_page (SidebarSimplePageEntry* base);
diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c
index 2ef18d9..5a491c5 100644
--- a/src/library/LibraryWindow.c
+++ b/src/library/LibraryWindow.c
@@ -2078,14 +2078,14 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (ui_file);
#line 2081 "LibraryWindow.c"
- goto __catch38_g_error;
+ goto __catch39_g_error;
}
#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (ui_file);
#line 2086 "LibraryWindow.c"
}
- goto __finally38;
- __catch38_g_error:
+ goto __finally39;
+ __catch39_g_error:
{
GError* e = NULL;
const gchar* _tmp27_ = NULL;
@@ -2101,7 +2101,7 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
_g_error_free0 (e);
#line 2103 "LibraryWindow.c"
}
- __finally38:
+ __finally39:
#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2936,7 +2936,7 @@ static GtkActionEntry* library_window_create_common_actions (LibraryWindow* self
#line 283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
import = _tmp1_;
#line 285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = _ ("_Import From Folder...");
+ _tmp2_ = _ ("_Import From Folder…");
#line 285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
import.label = _tmp2_;
#line 286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2966,7 +2966,7 @@ static GtkActionEntry* library_window_create_common_actions (LibraryWindow* self
#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
import_from_external = _tmp6_;
#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = _ ("Import From _Application...");
+ _tmp7_ = _ ("Import From _Application…");
#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
import_from_external.label = _tmp7_;
#line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3152,7 +3152,7 @@ static GtkActionEntry* library_window_create_common_actions (LibraryWindow* self
#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
new_search = _tmp34_;
#line 329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp35_ = _ ("Ne_w Saved Search...");
+ _tmp35_ = _ ("Ne_w Saved Search…");
#line 329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
new_search.label = _tmp35_;
#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5932,7 +5932,7 @@ static void library_window_on_empty_trash (LibraryWindow* self) {
#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp7_ = _ ("Empty Trash");
#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = _ ("Emptying Trash...");
+ _tmp8_ = _ ("Emptying Trash…");
#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (to_remove, GEE_TYPE_COLLECTION, GeeCollection), _tmp7_, _tmp8_);
#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7949,7 +7949,7 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 7951 "LibraryWindow.c"
- goto __catch39_g_error;
+ goto __catch40_g_error;
}
#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp12_ = _tmp9_;
@@ -7963,8 +7963,8 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
_g_object_unref0 (_tmp9_);
#line 7964 "LibraryWindow.c"
}
- goto __finally39;
- __catch39_g_error:
+ goto __finally40;
+ __catch40_g_error:
{
GError* err = NULL;
#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7975,7 +7975,7 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
_g_error_free0 (err);
#line 7976 "LibraryWindow.c"
}
- __finally39:
+ __finally40:
#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8624,7 +8624,7 @@ static void library_window_on_library_monitor_discovery_started (LibraryWindow*
#line 1246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = _ ("Updating library...");
+ _tmp0_ = _ ("Updating library…");
#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_start_pulse_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY);
#line 8630 "LibraryWindow.c"
@@ -8656,7 +8656,7 @@ static void library_window_on_library_monitor_auto_update_progress (LibraryWindo
gint _tmp2_ = 0;
gint _tmp3_ = 0;
#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = _ ("Updating library...");
+ _tmp1_ = _ ("Updating library…");
#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp2_ = completed_files;
#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8673,7 +8673,7 @@ static void library_window_on_library_monitor_auto_import_preparing (LibraryWind
#line 1263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = _ ("Preparing to auto-import photos...");
+ _tmp0_ = _ ("Preparing to auto-import photos…");
#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_start_pulse_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY);
#line 8679 "LibraryWindow.c"
@@ -8687,7 +8687,7 @@ static void library_window_on_library_monitor_auto_import_progress (LibraryWindo
#line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = _ ("Auto-importing photos...");
+ _tmp0_ = _ ("Auto-importing photos…");
#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp1_ = completed_bytes;
#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8714,7 +8714,7 @@ static void library_window_on_metadata_writer_progress (LibraryWindow* self, gui
guint _tmp2_ = 0U;
guint _tmp3_ = 0U;
#line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = _ ("Writing metadata to files...");
+ _tmp1_ = _ ("Writing metadata to files…");
#line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp2_ = completed;
#line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9989,7 +9989,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 9991 "LibraryWindow.c"
- goto __catch41_g_regex_error;
+ goto __catch42_g_regex_error;
}
#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
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);
@@ -10014,7 +10014,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 10016 "LibraryWindow.c"
- goto __catch41_g_regex_error;
+ goto __catch42_g_regex_error;
}
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
@@ -10040,8 +10040,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
return result;
#line 10041 "LibraryWindow.c"
}
- goto __finally41;
- __catch41_g_regex_error:
+ goto __finally42;
+ __catch42_g_regex_error:
{
GError* e = NULL;
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -10054,7 +10054,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_g_error_free0 (e);
#line 10055 "LibraryWindow.c"
}
- __finally41:
+ __finally42:
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -10128,7 +10128,7 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
#line 1535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 10130 "LibraryWindow.c"
- goto __catch40_g_error;
+ goto __catch41_g_error;
}
#line 1535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp9_ = _tmp6_;
@@ -10142,8 +10142,8 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
_g_object_unref0 (_tmp6_);
#line 10143 "LibraryWindow.c"
}
- goto __finally40;
- __catch40_g_error:
+ goto __finally41;
+ __catch41_g_error:
{
GError* err = NULL;
GError* _tmp10_ = NULL;
@@ -10168,7 +10168,7 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
return;
#line 10169 "LibraryWindow.c"
}
- __finally40:
+ __finally41:
#line 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
diff --git a/src/library/LibraryWindow.vala b/src/library/LibraryWindow.vala
index 19f819b..b464f11 100644
--- a/src/library/LibraryWindow.vala
+++ b/src/library/LibraryWindow.vala
@@ -282,7 +282,7 @@ public class LibraryWindow : AppWindow {
Gtk.ActionEntry import = { "CommonFileImport", Resources.IMPORT,
TRANSLATABLE, "<Ctrl>I", TRANSLATABLE, on_file_import };
- import.label = _("_Import From Folder...");
+ import.label = _("_Import From Folder…");
import.tooltip = _("Import photos from disk to library");
actions += import;
@@ -290,7 +290,7 @@ public class LibraryWindow : AppWindow {
"ExternalLibraryImport", Resources.IMPORT, TRANSLATABLE,
null, TRANSLATABLE, on_external_library_import
};
- import_from_external.label = _("Import From _Application...");
+ import_from_external.label = _("Import From _Application…");
actions += import_from_external;
Gtk.ActionEntry sort = { "CommonSortEvents", null, TRANSLATABLE, null, null, null };
@@ -326,7 +326,7 @@ public class LibraryWindow : AppWindow {
Gtk.ActionEntry new_search = { "CommonNewSearch", null, TRANSLATABLE, "<Ctrl>S", null,
on_new_search };
- new_search.label = _("Ne_w Saved Search...");
+ new_search.label = _("Ne_w Saved Search…");
actions += new_search;
// top-level menus
@@ -723,7 +723,7 @@ public class LibraryWindow : AppWindow {
to_remove.add_all(LibraryPhoto.global.get_trashcan_contents());
to_remove.add_all(Video.global.get_trashcan_contents());
- remove_from_app(to_remove, _("Empty Trash"), _("Emptying Trash..."));
+ remove_from_app(to_remove, _("Empty Trash"), _("Emptying Trash…"));
AppWindow.get_command_manager().reset();
}
@@ -1244,7 +1244,7 @@ public class LibraryWindow : AppWindow {
}
private void on_library_monitor_discovery_started() {
- start_pulse_background_progress_bar(_("Updating library..."), STARTUP_SCAN_PROGRESS_PRIORITY);
+ start_pulse_background_progress_bar(_("Updating library…"), STARTUP_SCAN_PROGRESS_PRIORITY);
}
private void on_library_monitor_discovery_completed() {
@@ -1255,18 +1255,18 @@ public class LibraryWindow : AppWindow {
if (total_files < MIN_PROGRESS_BAR_FILES)
clear_background_progress_bar(REALTIME_UPDATE_PROGRESS_PRIORITY);
else {
- update_background_progress_bar(_("Updating library..."), REALTIME_UPDATE_PROGRESS_PRIORITY,
+ update_background_progress_bar(_("Updating library…"), REALTIME_UPDATE_PROGRESS_PRIORITY,
completed_files, total_files);
}
}
private void on_library_monitor_auto_import_preparing() {
- start_pulse_background_progress_bar(_("Preparing to auto-import photos..."),
+ start_pulse_background_progress_bar(_("Preparing to auto-import photos…"),
REALTIME_IMPORT_PROGRESS_PRIORITY);
}
private void on_library_monitor_auto_import_progress(uint64 completed_bytes, uint64 total_bytes) {
- update_background_progress_bar(_("Auto-importing photos..."),
+ update_background_progress_bar(_("Auto-importing photos…"),
REALTIME_IMPORT_PROGRESS_PRIORITY, completed_bytes, total_bytes);
}
@@ -1274,7 +1274,7 @@ public class LibraryWindow : AppWindow {
if (total < MIN_PROGRESS_BAR_FILES)
clear_background_progress_bar(METADATA_WRITER_PROGRESS_PRIORITY);
else {
- update_background_progress_bar(_("Writing metadata to files..."),
+ update_background_progress_bar(_("Writing metadata to files…"),
METADATA_WRITER_PROGRESS_PRIORITY, completed, total);
}
}
diff --git a/src/library/OfflinePage.c b/src/library/OfflinePage.c
index dacbda6..ec05a96 100644
--- a/src/library/OfflinePage.c
+++ b/src/library/OfflinePage.c
@@ -1415,7 +1415,7 @@ static void offline_page_on_remove_from_library (OfflinePage* self) {
#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
_tmp20_ = _tmp19_;
#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
- _tmp21_ = _ ("Deleting...");
+ _tmp21_ = _ ("Deleting…");
#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
_tmp22_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_window_get_type (), GtkWindow), _tmp21_, NULL);
#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
diff --git a/src/library/OfflinePage.vala b/src/library/OfflinePage.vala
index 771a1fd..899dc53 100644
--- a/src/library/OfflinePage.vala
+++ b/src/library/OfflinePage.vala
@@ -103,7 +103,7 @@ public class OfflinePage : CheckerboardPage {
ProgressDialog progress = null;
if (sources.size >= 20)
- progress = new ProgressDialog(AppWindow.get_instance(), _("Deleting..."));
+ progress = new ProgressDialog(AppWindow.get_instance(), _("Deleting…"));
Gee.ArrayList<LibraryPhoto> photos = new Gee.ArrayList<LibraryPhoto>();
Gee.ArrayList<Video> videos = new Gee.ArrayList<Video>();
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 13:45:17 +0000