From a4d7eb518066a2587fc7a253316f8fa60f979b31 Mon Sep 17 00:00:00 2001 From: Monster Date: Sat, 13 Jan 2024 15:29:00 +0100 Subject: [PATCH 1/2] Change strings to title case and remove periods --- data/resources/ui/shortcuts.ui | 16 ++-- src/App.vala | 2 +- src/Dialogs/DatePicker.vala | 2 +- src/Dialogs/GoogleOAuth.vala | 2 +- src/Dialogs/Label.vala | 3 +- src/Dialogs/Preferences/Pages/Backup.vala | 6 +- src/Dialogs/Preferences/Pages/Sidebar.vala | 4 +- .../Preferences/PreferencesWindow.vala | 80 +++++++++---------- src/Dialogs/Project.vala | 2 +- src/Dialogs/QuickFind/QuickFind.vala | 2 +- src/Dialogs/Section.vala | 4 +- src/Layouts/ItemBoard.vala | 8 +- src/Layouts/ItemRow.vala | 14 ++-- src/Layouts/ItemView.vala | 2 +- src/Layouts/ProjectRow.vala | 10 +-- src/Layouts/SectionBoard.vala | 2 +- src/Layouts/SectionRow.vala | 4 +- src/MainWindow.vala | 4 +- src/Services/Backups.vala | 6 +- src/Views/Label/Label.vala | 2 +- src/Views/Project/Project.vala | 6 +- .../ReminderPicker/ReminderPicker.vala | 2 +- src/Widgets/ReminderPicker/ReminderRow.vala | 2 +- src/Widgets/SyncButton.vala | 2 +- 24 files changed, 94 insertions(+), 93 deletions(-) diff --git a/data/resources/ui/shortcuts.ui b/data/resources/ui/shortcuts.ui index 3c0e5158e..bf2978a08 100644 --- a/data/resources/ui/shortcuts.ui +++ b/data/resources/ui/shortcuts.ui @@ -9,32 +9,32 @@ 12 - Used anywhere + Used Anywhere a - Create a new task + Create a New Task <ctrl>v - Paste plain text to create new task + Paste Plain Text to Create New Task p - Create a new project + Create a New Project s - Create a new section in a project + Create a New Section in a Project @@ -54,7 +54,7 @@ - Control windows + Control Windows <ctrl>q @@ -65,14 +65,14 @@ <ctrl>comma - Open preferences + Open Preferences m - Show/hide Sidebar + Toggle Sidebar diff --git a/src/App.vala b/src/App.vala index 4454c794f..f163f5de9 100644 --- a/src/App.vala +++ b/src/App.vala @@ -103,7 +103,7 @@ public class Planify : Adw.Application { if (clear_database) { Util.get_default ().clear_database (_("Are you sure you want to reset all?"), - _("The process removes all stored information without the possibility of undoing it."), + _("The process removes all stored information without the possibility of undoing it"), main_window); } diff --git a/src/Dialogs/DatePicker.vala b/src/Dialogs/DatePicker.vala index 62ab33691..2451abcff 100644 --- a/src/Dialogs/DatePicker.vala +++ b/src/Dialogs/DatePicker.vala @@ -68,7 +68,7 @@ public class Dialogs.DatePicker : Adw.Window { var tomorrow_item = new Widgets.ContextMenu.MenuItem (_("Tomorrow"), "planner-scheduled"); tomorrow_item.secondary_text = new GLib.DateTime.now_local ().add_days (1).format ("%a"); - var next_week_item = new Widgets.ContextMenu.MenuItem (_("Next week"), "planner-scheduled"); + var next_week_item = new Widgets.ContextMenu.MenuItem (_("Next Week"), "planner-scheduled"); next_week_item.secondary_text = Util.get_default ().get_relative_date_from_date ( Util.get_default ().get_format_date (new GLib.DateTime.now_local ().add_days (7)) ); diff --git a/src/Dialogs/GoogleOAuth.vala b/src/Dialogs/GoogleOAuth.vala index a387d6f62..ee7a27c13 100644 --- a/src/Dialogs/GoogleOAuth.vala +++ b/src/Dialogs/GoogleOAuth.vala @@ -82,7 +82,7 @@ public class Dialogs.GoogleOAuth : Adw.Window { margin_top = 6 }; - var sync_label = new Gtk.Label (_("Planner is sync your tasks, this may take a few minutes.")); + var sync_label = new Gtk.Label (_("Planner is sync your tasks, this may take a few minutes")); sync_label.wrap = true; sync_label.justify = Gtk.Justification.CENTER; sync_label.margin_top = 12; diff --git a/src/Dialogs/Label.vala b/src/Dialogs/Label.vala index 9526e62b1..0c55ec31d 100644 --- a/src/Dialogs/Label.vala +++ b/src/Dialogs/Label.vala @@ -92,7 +92,7 @@ public class Dialogs.Label : Adw.Window { color_group.add_css_class (Granite.STYLE_CLASS_CARD); color_group.attach (color_picker_row, 0, 0); - submit_button = new Widgets.LoadingButton.with_label (is_creating ? _("Add label") : _("Update label")) { + submit_button = new Widgets.LoadingButton.with_label (is_creating ? _("Add Label") : _("Update Label")) { vexpand = true, hexpand = true, margin_bottom = 12, @@ -218,3 +218,4 @@ public class Dialogs.Label : Adw.Window { }); } } + diff --git a/src/Dialogs/Preferences/Pages/Backup.vala b/src/Dialogs/Preferences/Pages/Backup.vala index 42010cfce..59972005b 100644 --- a/src/Dialogs/Preferences/Pages/Backup.vala +++ b/src/Dialogs/Preferences/Pages/Backup.vala @@ -58,13 +58,13 @@ public class Dialogs.Preferences.Pages.Backup : Adw.Bin { margin_start = 6 }; - var add_button = new Gtk.Button.with_label (_("Create backup")) { + var add_button = new Gtk.Button.with_label (_("Create Backup")) { margin_top = 12 }; - var import_button = new Gtk.Button.with_label (_("Import backup")); + var import_button = new Gtk.Button.with_label (_("Import Backup")); - var backups_group = new Layouts.HeaderItem (_("Backups files")) { + var backups_group = new Layouts.HeaderItem (_("Backup Files")) { margin_top = 12, reveal = true }; diff --git a/src/Dialogs/Preferences/Pages/Sidebar.vala b/src/Dialogs/Preferences/Pages/Sidebar.vala index 88f254e56..d341368bd 100644 --- a/src/Dialogs/Preferences/Pages/Sidebar.vala +++ b/src/Dialogs/Preferences/Pages/Sidebar.vala @@ -27,7 +27,7 @@ public class Dialogs.Preferences.Pages.Sidebar : Adw.Bin { construct { var settings_header = new Dialogs.Preferences.SettingsHeader (_("Sidebar")); - var views_group = new Layouts.HeaderItem (_("Show in sidebar")) { + var views_group = new Layouts.HeaderItem (_("Show in Sidebar")) { separator_lines = true, listbox_no_margin = true, box_shadow = true, @@ -52,7 +52,7 @@ public class Dialogs.Preferences.Pages.Sidebar : Adw.Bin { }; var show_count_row = new Adw.ActionRow (); - show_count_row.title = _("Show task count"); + show_count_row.title = _("Show Task Count"); show_count_row.set_activatable_widget (show_count_switch); show_count_row.add_suffix (show_count_switch); diff --git a/src/Dialogs/Preferences/PreferencesWindow.vala b/src/Dialogs/Preferences/PreferencesWindow.vala index ab9afaa4f..37cb64a8f 100644 --- a/src/Dialogs/Preferences/PreferencesWindow.vala +++ b/src/Dialogs/Preferences/PreferencesWindow.vala @@ -59,7 +59,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { css_classes = { "small-label", "banner-text" } }; - var banner_button = new Gtk.Button.with_label (_("Supporting us")) { + var banner_button = new Gtk.Button.with_label (_("Supporting Us")) { halign = START, margin_top = 6, css_classes = { "banner-text" } @@ -113,7 +113,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { accounts_row.add_prefix (generate_icon ("planner-cloud")); accounts_row.add_suffix (generate_icon ("pan-end-symbolic", 16)); accounts_row.title = _("Integrations"); - accounts_row.subtitle = _("Sync your favorite to-do providers."); + accounts_row.subtitle = _("Sync your favorite to-do providers"); accounts_row.activated.connect (() => { push_subpage (get_accounts_page ()); @@ -130,7 +130,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { general_row.add_prefix (generate_icon ("planner-general")); general_row.add_suffix (generate_icon ("pan-end-symbolic", 16)); general_row.title = _("General"); - general_row.subtitle = _("Customize to your liking."); + general_row.subtitle = _("Customize to your liking"); general_row.activated.connect (() => { push_subpage (get_general_page ()); @@ -141,7 +141,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { sidebar_row.add_prefix (generate_icon ("sidebar")); sidebar_row.add_suffix (generate_icon ("pan-end-symbolic", 16)); sidebar_row.title = _("Sidebar"); - sidebar_row.subtitle = _("Customize your sidebar."); + sidebar_row.subtitle = _("Customize your sidebar"); sidebar_row.activated.connect (() => { push_subpage (get_sidebar_page ()); @@ -163,7 +163,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { quick_add_row.add_prefix (generate_icon ("archive-plus")); quick_add_row.add_suffix (generate_icon ("pan-end-symbolic", 16)); quick_add_row.title = _("Quick Add"); - quick_add_row.subtitle = _("Adding To-Dos From Anywhere."); + quick_add_row.subtitle = _("Adding to-do's from anywhere"); quick_add_row.activated.connect (() => { push_subpage (get_quick_add_page ()); @@ -180,7 +180,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { tutorial_row.add_prefix (generate_icon ("light-bulb")); tutorial_row.add_suffix (generate_icon ("pan-end-symbolic", 16)); tutorial_row.title = _("Create Tutorial Project"); - tutorial_row.subtitle = _("Learn the app step by step with a short tutorial project."); + tutorial_row.subtitle = _("Learn the app step by step with a short tutorial project"); var personalization_group = new Adw.PreferencesGroup (); personalization_group.add (general_row); @@ -201,8 +201,8 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { contact_us_row.activatable = true; contact_us_row.add_prefix (generate_icon ("planner-mail")); contact_us_row.add_suffix (generate_icon ("pan-end-symbolic", 16)); - contact_us_row.title = _("Contact us"); - contact_us_row.subtitle = _("Request a feature or ask us anything."); + contact_us_row.title = _("Contact Us"); + contact_us_row.subtitle = _("Request a feature or ask us anything"); contact_us_row.activated.connect (() => { string uri = "mailto:%s".printf (Constants.CONTACT_US); @@ -218,8 +218,8 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { tweet_us_row.activatable = true; tweet_us_row.add_prefix (generate_icon ("planner-annotation-dots")); tweet_us_row.add_suffix (generate_icon ("pan-end-symbolic", 16)); - tweet_us_row.title = _("Tweet us"); - tweet_us_row.subtitle = _("Share some love."); + tweet_us_row.title = _("Tweet Us"); + tweet_us_row.subtitle = _("Share some love"); tweet_us_row.activated.connect (() => { try { @@ -234,7 +234,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { telegram_row.add_prefix (generate_icon ("telegram")); telegram_row.add_suffix (generate_icon ("pan-end-symbolic", 16)); telegram_row.title = _("Telegram"); - telegram_row.subtitle = _("Discuss and share your feedback."); + telegram_row.subtitle = _("Discuss and share your feedback"); telegram_row.activated.connect (() => { try { @@ -269,8 +269,8 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { privacy_policy_row.activatable = true; privacy_policy_row.add_prefix (generate_icon ("planner-shield-tick")); privacy_policy_row.add_suffix (generate_icon ("pan-end-symbolic", 16)); - privacy_policy_row.title = _("Privacy policy"); - privacy_policy_row.subtitle = _("We have nothing on you."); + privacy_policy_row.title = _("Privacy Policy"); + privacy_policy_row.subtitle = _("We have nothing on you"); var delete_row = new Adw.ActionRow (); delete_row.activatable = true; @@ -285,7 +285,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { tutorial_row.activated.connect (() => { Util.get_default ().create_tutorial_project (); - add_toast (Util.get_default ().create_toast (_("A tutorial project has been created."))); + add_toast (Util.get_default ().create_toast (_("A tutorial project has been created"))); }); backups_row.activated.connect (() => { @@ -299,7 +299,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { delete_row.activated.connect (() => { destroy (); Util.get_default ().clear_database (_("Are you sure you want to reset all?"), - _("The process removes all stored information without the possibility of undoing it."), + _("The process removes all stored information without the possibility of undoing it"), Planify.instance.main_window); }); @@ -325,7 +325,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { general_group.add (home_page_row); var sort_projects_model = new Gtk.StringList (null); - sort_projects_model.append (_("Custom sort order")); + sort_projects_model.append (_("Custom Sort Order")); sort_projects_model.append (_("Alphabetically")); var sort_projects_row = new Adw.ComboRow (); @@ -357,8 +357,8 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { }; var run_background_row = new Adw.ActionRow (); - run_background_row.title = _("Run in background"); - run_background_row.subtitle = _("Let Planify run in background and send notifications."); + run_background_row.title = _("Run in Background"); + run_background_row.subtitle = _("Let Planify run in background and send notifications"); run_background_row.set_activatable_widget (run_background_switch); run_background_row.add_suffix (run_background_switch); @@ -370,8 +370,8 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { }; var run_on_startup_row = new Adw.ActionRow (); - run_on_startup_row.title = _("Run on startup"); - run_on_startup_row.subtitle = _("Whether Planify should run on startup."); + run_on_startup_row.title = _("Run on Startup"); + run_on_startup_row.subtitle = _("Whether Planify should run on startup"); run_on_startup_row.set_activatable_widget (run_on_startup_switch); run_on_startup_row.add_suffix (run_on_startup_switch); @@ -413,22 +413,22 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { start_week_model.append (_("Saturday")); var start_week_row = new Adw.ComboRow (); - start_week_row.title = _("Start of the week"); + start_week_row.title = _("Start of the Week"); start_week_row.model = start_week_model; start_week_row.selected = Services.Settings.get_default ().settings.get_enum ("start-week"); datetime_group.add (start_week_row); var tasks_group = new Adw.PreferencesGroup (); - tasks_group.title = _("Task settings"); + tasks_group.title = _("Task Settings"); var complete_tasks_model = new Gtk.StringList (null); complete_tasks_model.append (_("Instantly")); - complete_tasks_model.append (_("Wait 2500 milliseconds")); + complete_tasks_model.append (_("Wait 2500 Milliseconds")); var complete_tasks_row = new Adw.ComboRow (); - complete_tasks_row.title = _("Complete task"); - complete_tasks_row.subtitle = _("Complete your to-do instantly or wait 2500 milliseconds with the undo option."); + complete_tasks_row.title = _("Complete Task"); + complete_tasks_row.subtitle = _("Complete your to-do instantly or wait 2500 milliseconds with the undo option"); complete_tasks_row.model = complete_tasks_model; complete_tasks_row.selected = Services.Settings.get_default ().settings.get_enum ("complete-task"); @@ -441,7 +441,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { default_priority_model.append (_("None")); var default_priority_row = new Adw.ComboRow (); - default_priority_row.title = _("Default priority"); + default_priority_row.title = _("Default Priority"); default_priority_row.model = default_priority_model; default_priority_row.selected = Services.Settings.get_default ().settings.get_enum ("default-priority"); @@ -453,7 +453,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { }; var underline_completed_row = new Adw.ActionRow (); - underline_completed_row.title = _("Underline completed tasks"); + underline_completed_row.title = _("Underline Completed Tasks"); underline_completed_row.set_activatable_widget (underline_completed_switch); underline_completed_row.add_suffix (underline_completed_switch); @@ -464,7 +464,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { tasks_position_model.append (_("Bottom")); var tasks_position_row = new Adw.ComboRow (); - tasks_position_row.title = _("New task position"); + tasks_position_row.title = _("New Task Position"); tasks_position_row.model = tasks_position_model; tasks_position_row.selected = Services.Settings.get_default ().settings.get_enum ("new-tasks-position"); @@ -578,7 +578,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { }; var system_appearance_row = new Adw.ActionRow (); - system_appearance_row.title = _("Use system settings"); + system_appearance_row.title = _("Use System Settings"); system_appearance_row.set_activatable_widget (system_appearance_switch); system_appearance_row.add_suffix (system_appearance_switch); @@ -938,7 +938,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { var sync_server_row = new Adw.ActionRow (); sync_server_row.title = _("Sync Server"); - sync_server_row.subtitle = _("Activate this setting so that Planner automatically synchronizes with your Todoist account every 15 minutes."); + sync_server_row.subtitle = _("Activate this setting so that Planner automatically synchronizes with your Todoist account every 15 minutes"); sync_server_row.set_activatable_widget (sync_server_switch); sync_server_row.add_suffix (sync_server_switch); @@ -1047,7 +1047,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { var save_last_row = new Adw.ActionRow (); save_last_row.title = _("Save Last Selected Project"); - save_last_row.subtitle = _("If unchecked, the default project selected is Inbox."); + save_last_row.subtitle = _("If unchecked, the default project selected is Inbox"); save_last_row.set_activatable_widget (save_last_switch); save_last_row.add_suffix (save_last_switch); @@ -1081,7 +1081,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { copy_button.clicked.connect (() => { Gdk.Clipboard clipboard = Gdk.Display.get_default ().get_clipboard (); clipboard.set_text (quick_add_command); - add_toast (Util.get_default ().create_toast (_("The command was copied to the clipboard."))); + add_toast (Util.get_default ().create_toast (_("The command was copied to the clipboard"))); }); settings_header.back_activated.connect (() => { @@ -1124,7 +1124,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { margin_top = 6 }; - var sync_label = new Gtk.Label (_("Planner is sync your tasks, this may take a few minutes.")); + var sync_label = new Gtk.Label (_("Planner is sync your tasks, this may take a few minutes")); sync_label.wrap = true; sync_label.justify = Gtk.Justification.CENTER; sync_label.margin_top = 12; @@ -1172,7 +1172,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { if (("https://github.com/alainm23/planner?code=" in redirect_uri) && ("&state=%s".printf (state) in redirect_uri)) { - settings_header.title = _("Synchronizing. Wait a moment please."); + settings_header.title = _("Synchronizing..."); get_todoist_token.begin (redirect_uri); } @@ -1183,7 +1183,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { } if (load_event == WebKit.LoadEvent.FINISHED) { - settings_header.title = _("Please enter your credentials"); + settings_header.title = _("Please Enter Your Credentials"); return; } @@ -1250,14 +1250,14 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { } private Adw.NavigationPage get_privacy_policy_page () { - var settings_header = new Dialogs.Preferences.SettingsHeader (_("Privacy policy")); + var settings_header = new Dialogs.Preferences.SettingsHeader (_("Privacy Policy")); var content_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 12) { vexpand = true, hexpand = true }; - content_box.append (new Gtk.Label (_("Personal data")) { + content_box.append (new Gtk.Label (_("Personal Data")) { css_classes = { "font-bold" }, halign = START }); @@ -1282,7 +1282,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { xalign = 0 }); - var contact_us_button = new Gtk.Button.with_label (_("Contact us")) { + var contact_us_button = new Gtk.Button.with_label (_("Contact Us")) { vexpand = true, margin_bottom = 24, valign = END, @@ -1332,7 +1332,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { } private Adw.NavigationPage get_support_page () { - var settings_header = new Dialogs.Preferences.SettingsHeader (_("Supporting us")); + var settings_header = new Dialogs.Preferences.SettingsHeader (_("Supporting Us")); var content_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 12) { vexpand = true, @@ -1480,7 +1480,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesWindow { } var dialog = new Adw.MessageDialog ((Gtk.Window) Planify.instance.main_window, - _("Sign off"), message); + _("Sign Off"), message); dialog.body_use_markup = true; dialog.add_response ("cancel", _("Cancel")); diff --git a/src/Dialogs/Project.vala b/src/Dialogs/Project.vala index fbca6c871..ca31ae9e6 100644 --- a/src/Dialogs/Project.vala +++ b/src/Dialogs/Project.vala @@ -179,7 +179,7 @@ public class Dialogs.Project : Adw.Window { color_box_revealer.child = color_group; - submit_button = new Widgets.LoadingButton.with_label (is_creating ? _("Add project") : _("Update project")) { + submit_button = new Widgets.LoadingButton.with_label (is_creating ? _("Add Project") : _("Update Project")) { vexpand = true, hexpand = true, margin_bottom = 12, diff --git a/src/Dialogs/QuickFind/QuickFind.vala b/src/Dialogs/QuickFind/QuickFind.vala index 08c75dc69..3a9a3d270 100644 --- a/src/Dialogs/QuickFind/QuickFind.vala +++ b/src/Dialogs/QuickFind/QuickFind.vala @@ -168,7 +168,7 @@ public class Dialogs.QuickFind.QuickFind : Adw.Window { } private Gtk.Widget get_placeholder () { - var message_label = new Gtk.Label (_("Quickly switch projects and views, find tasks, search by labels.")) { + var message_label = new Gtk.Label (_("Quickly switch projects and views, find tasks, search by labels")) { wrap = true, justify = Gtk.Justification.CENTER, hexpand = true, diff --git a/src/Dialogs/Section.vala b/src/Dialogs/Section.vala index ffaa1c38e..6fc5c5278 100644 --- a/src/Dialogs/Section.vala +++ b/src/Dialogs/Section.vala @@ -70,7 +70,7 @@ public class Dialogs.Section : Adw.Window { }; name_entry = new Adw.EntryRow (); - name_entry.title = _("Section name"); + name_entry.title = _("Section Name"); name_entry.text = section.name; var name_group = new Adw.PreferencesGroup () { @@ -105,7 +105,7 @@ public class Dialogs.Section : Adw.Window { description_group.add (description_entry); - submit_button = new Widgets.LoadingButton.with_label (is_creating ? _("Add section") : _("Update section")) { + submit_button = new Widgets.LoadingButton.with_label (is_creating ? _("Add Section") : _("Update Section")) { vexpand = true, hexpand = true, margin_bottom = 12, diff --git a/src/Layouts/ItemBoard.vala b/src/Layouts/ItemBoard.vala index e097e0c58..e7e901e11 100644 --- a/src/Layouts/ItemBoard.vala +++ b/src/Layouts/ItemBoard.vala @@ -113,7 +113,7 @@ public class Layouts.ItemBoard : Layouts.ItemBase { halign = Gtk.Align.CENTER, margin_top = 7, margin_end = 7, - tooltip_text = _("View details"), + tooltip_text = _("View Details"), css_classes = { "min-height-0", "view-button" } }; @@ -555,11 +555,11 @@ public class Layouts.ItemBoard : Layouts.ItemBase { no_date_item.visible = item.has_due; var move_item = new Widgets.ContextMenu.MenuItem (_("Move"), "chevron-right"); - var add_item = new Widgets.ContextMenu.MenuItem (_("Add subtask"), "plus"); + var add_item = new Widgets.ContextMenu.MenuItem (_("Add Subtask"), "plus"); var complete_item = new Widgets.ContextMenu.MenuItem (_("Complete"), "planner-check-circle"); var edit_item = new Widgets.ContextMenu.MenuItem (_("Edit"), "planner-edit"); - var delete_item = new Widgets.ContextMenu.MenuItem (_("Delete task"), "planner-trash"); + var delete_item = new Widgets.ContextMenu.MenuItem (_("Delete Task"), "planner-trash"); delete_item.add_css_class ("menu-item-danger"); var menu_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0); @@ -801,7 +801,7 @@ public class Layouts.ItemBoard : Layouts.ItemBase { if (item.project.sort_order != 0) { item.project.sort_order = 0; Services.EventBus.get_default ().send_notification ( - Util.get_default ().create_toast (_("Order changed to 'Custom sort order'.")) + Util.get_default ().create_toast (_("Order changed to 'Custom sort order'")) ); item.project.update (false); } diff --git a/src/Layouts/ItemRow.vala b/src/Layouts/ItemRow.vala index 401a01bcd..b7f0da846 100644 --- a/src/Layouts/ItemRow.vala +++ b/src/Layouts/ItemRow.vala @@ -348,7 +348,7 @@ public class Layouts.ItemRow : Layouts.ItemBase { margin_start = 24 }; - description_textview = new Widgets.HyperTextView (_("Add a description")) { + description_textview = new Widgets.HyperTextView (_("Add a description…")) { height_request = 64, left_margin = 24, right_margin = 6, @@ -824,11 +824,11 @@ public class Layouts.ItemRow : Layouts.ItemBase { // var reminders_item = new Widgets.ContextMenu.MenuItem (_("Reminders"), "planner-bell"); var move_item = new Widgets.ContextMenu.MenuItem (_("Move"), "chevron-right"); - var add_item = new Widgets.ContextMenu.MenuItem (_("Add subtask"), "plus"); + var add_item = new Widgets.ContextMenu.MenuItem (_("Add Subtask"), "plus"); var complete_item = new Widgets.ContextMenu.MenuItem (_("Complete"), "planner-check-circle"); var edit_item = new Widgets.ContextMenu.MenuItem (_("Edit"), "planner-edit"); - var delete_item = new Widgets.ContextMenu.MenuItem (_("Delete task"), "planner-trash"); + var delete_item = new Widgets.ContextMenu.MenuItem (_("Delete Task"), "planner-trash"); delete_item.add_css_class ("menu-item-danger"); var menu_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0); @@ -934,7 +934,7 @@ public class Layouts.ItemRow : Layouts.ItemBase { return; } - var copy_clipboard_item = new Widgets.ContextMenu.MenuItem (_("Copy to clipboard"), "planner-clipboard"); + var copy_clipboard_item = new Widgets.ContextMenu.MenuItem (_("Copy to Clipboard"), "planner-clipboard"); var duplicate_item = new Widgets.ContextMenu.MenuItem (_("Duplicate"), "planner-copy"); var move_item = new Widgets.ContextMenu.MenuItem (_("Move"), "chevron-right"); var repeat_item = new Widgets.ContextMenu.MenuItem (_("Repeat"), "planner-rotate"); @@ -942,7 +942,7 @@ public class Layouts.ItemRow : Layouts.ItemBase { more_information_item = new Widgets.ContextMenu.MenuItem (added_updated_format, null); more_information_item.add_css_class ("small-label"); - var delete_item = new Widgets.ContextMenu.MenuItem (_("Delete task"), "planner-trash"); + var delete_item = new Widgets.ContextMenu.MenuItem (_("Delete Task"), "planner-trash"); delete_item.add_css_class ("menu-item-danger"); var menu_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0); @@ -1389,7 +1389,7 @@ public class Layouts.ItemRow : Layouts.ItemBase { private void confirm_move (Objects.Project project, string section_id) { var dialog = new Adw.MessageDialog ((Gtk.Window) Planify.instance.main_window, - _("Move tasks"), _("Are you sure you want to move your task to %s?".printf (project.short_name)) + _("Move Tasks"), _("Are you sure you want to move your task to %s?".printf (project.short_name)) ); dialog.add_response ("cancel", _("Cancel")); dialog.add_response ("ok", _("Move")); @@ -1588,7 +1588,7 @@ public class Layouts.ItemRow : Layouts.ItemBase { if (item.project.sort_order != 0) { item.project.sort_order = 0; Services.EventBus.get_default ().send_notification ( - Util.get_default ().create_toast (_("Order changed to 'Custom sort order'.")) + Util.get_default ().create_toast (_("Order changed to 'Custom sort order'")) ); item.project.update (false); } diff --git a/src/Layouts/ItemView.vala b/src/Layouts/ItemView.vala index f40f7e8d7..d4779773c 100644 --- a/src/Layouts/ItemView.vala +++ b/src/Layouts/ItemView.vala @@ -77,7 +77,7 @@ public class Layouts.ItemViewContent : Adw.Bin { content_box.append (checked_button); content_box.append (content_textview); - description_textview = new Widgets.HyperTextView (_("Add a description")) { + description_textview = new Widgets.HyperTextView (_("Add a description…")) { left_margin = 36, right_margin = 6, top_margin = 6, diff --git a/src/Layouts/ProjectRow.vala b/src/Layouts/ProjectRow.vala index fc1343a89..2e8cf6cf8 100644 --- a/src/Layouts/ProjectRow.vala +++ b/src/Layouts/ProjectRow.vala @@ -421,7 +421,7 @@ public class Layouts.ProjectRow : Gtk.ListBoxRow { if (projects_sort != 0) { Services.Settings.get_default ().settings.set_enum ("projects-sort-by", 0); Services.EventBus.get_default ().send_notification ( - Util.get_default ().create_toast (_("Projects sort changed to 'Custom sort order'.")) + Util.get_default ().create_toast (_("Projects sort changed to 'Custom sort order'")) ); } @@ -482,20 +482,20 @@ public class Layouts.ProjectRow : Gtk.ListBoxRow { private void build_context_menu (double x, double y) { if (menu_popover != null) { - favorite_item.title = project.is_favorite ? _("Remove from favorites") : _("Add to favorites"); + favorite_item.title = project.is_favorite ? _("Remove From Favorites") : _("Add to Favorites"); menu_popover.pointing_to = { (int) x, (int) y, 1, 1 }; menu_popover.popup (); return; } - favorite_item = new Widgets.ContextMenu.MenuItem (project.is_favorite ? _("Remove from favorites") : _("Add to favorites"), "planner-star"); + favorite_item = new Widgets.ContextMenu.MenuItem (project.is_favorite ? _("Remove From Favorites") : _("Add to Favorites"), "planner-star"); var edit_item = new Widgets.ContextMenu.MenuItem (_("Edit Project"), "planner-edit"); - var delete_item = new Widgets.ContextMenu.MenuItem (_("Delete project"), "planner-trash"); + var delete_item = new Widgets.ContextMenu.MenuItem (_("Delete Project"), "planner-trash"); delete_item.add_css_class ("menu-item-danger"); var share_markdown_item = new Widgets.ContextMenu.MenuItem (_("Share"), "share"); - var share_email_item = new Widgets.ContextMenu.MenuItem (_("Send by e-mail"), "mail"); + var share_email_item = new Widgets.ContextMenu.MenuItem (_("Send by E-Mail"), "mail"); var menu_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0); menu_box.margin_top = menu_box.margin_bottom = 3; diff --git a/src/Layouts/SectionBoard.vala b/src/Layouts/SectionBoard.vala index 8836ac63a..aa884b580 100644 --- a/src/Layouts/SectionBoard.vala +++ b/src/Layouts/SectionBoard.vala @@ -504,7 +504,7 @@ public class Layouts.SectionBoard : Gtk.FlowBoxChild { menu_popover.popdown (); var dialog = new Adw.MessageDialog ((Gtk.Window) Planify.instance.main_window, - _("Delete section"), _("Are you sure you want to delete %s?".printf (section.short_name))); + _("Delete Section"), _("Are you sure you want to delete %s?".printf (section.short_name))); dialog.add_response ("cancel", _("Cancel")); dialog.add_response ("delete", _("Delete")); diff --git a/src/Layouts/SectionRow.vala b/src/Layouts/SectionRow.vala index 113e6364f..ce3e1c5de 100644 --- a/src/Layouts/SectionRow.vala +++ b/src/Layouts/SectionRow.vala @@ -89,7 +89,7 @@ public class Layouts.SectionRow : Gtk.ListBoxRow { items = new Gee.HashMap (); items_checked = new Gee.HashMap (); - name_editable = new Widgets.EditableLabel (("New section"), false) { + name_editable = new Widgets.EditableLabel (("New Section"), false) { valign = Gtk.Align.CENTER, hexpand = true, margin_start = 6, @@ -622,7 +622,7 @@ public class Layouts.SectionRow : Gtk.ListBoxRow { var dialog = new Adw.MessageDialog ( (Gtk.Window) Planify.instance.main_window, - _("Delete section"), _("Are you sure you want to delete %s?".printf (section.short_name)) + _("Delete Section"), _("Are you sure you want to delete %s?".printf (section.short_name)) ); dialog.add_response ("cancel", _("Cancel")); diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 28855758d..f5af2d0a7 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -232,7 +232,7 @@ public class MainWindow : Adw.ApplicationWindow { Services.Todoist.get_default ().first_sync_finished.connect ((inbox_project_id) => { var dialog = new Adw.MessageDialog ((Gtk.Window) Planify.instance.main_window, - _("Tasks synced successfully"), _("Do you want to use Todoist as your default Inbox Project?")); + _("Tasks Synced Successfully"), _("Do you want to use Todoist as your default Inbox Project?")); dialog.body_use_markup = true; dialog.add_response ("cancel", _("Cancel")); @@ -432,7 +432,7 @@ public class MainWindow : Adw.ApplicationWindow { var preferences_item = new Widgets.ContextMenu.MenuItem (_("Preferences")); preferences_item.add_css_class ("no-font-bold"); - var keyboard_shortcuts_item = new Widgets.ContextMenu.MenuItem (_("Keyboard shortcuts")); + var keyboard_shortcuts_item = new Widgets.ContextMenu.MenuItem (_("Keyboard Shortcuts")); keyboard_shortcuts_item.add_css_class ("no-font-bold"); var whatsnew_item = new Widgets.ContextMenu.MenuItem (_("What's New")); diff --git a/src/Services/Backups.vala b/src/Services/Backups.vala index f4911b6ee..0dec9221c 100644 --- a/src/Services/Backups.vala +++ b/src/Services/Backups.vala @@ -507,8 +507,8 @@ public class Services.Backups : Object { private void show_message () { var dialog = new Adw.MessageDialog (Planify._instance.main_window, - _("Backup successfully imported"), - _("Process completed, you need to start Planify again.") + _("Backup Successfully Imported"), + _("Process completed, you need to start Planify again") ); dialog.modal = true; @@ -523,7 +523,7 @@ public class Services.Backups : Object { private void add_filters (Gtk.FileDialog file_dialog) { Gtk.FileFilter filter = new Gtk.FileFilter (); filter.add_pattern ("*.json"); - filter.set_filter_name (_("Planify backup files")); + filter.set_filter_name (_("Planify Backup Files")); file_dialog.default_filter = filter; } } diff --git a/src/Views/Label/Label.vala b/src/Views/Label/Label.vala index 9fb155346..1ba7f54d0 100644 --- a/src/Views/Label/Label.vala +++ b/src/Views/Label/Label.vala @@ -67,7 +67,7 @@ public class Views.Label : Adw.Bin { listbox_grid.attach (listbox, 0, 0); var listbox_placeholder = new Widgets.Placeholder ( - _("No to-dos for this filter yet."), "planner-check-circle" + _("No to-dos for this filter yet"), "planner-check-circle" ); listbox_stack = new Gtk.Stack () { diff --git a/src/Views/Project/Project.vala b/src/Views/Project/Project.vala index c985d8d35..6b0c8eae3 100644 --- a/src/Views/Project/Project.vala +++ b/src/Views/Project/Project.vala @@ -307,7 +307,7 @@ public class Views.Project : Gtk.Grid { var dialog = new Adw.MessageDialog ( (Gtk.Window) Planify.instance.main_window, - _("Delete project"), _("Are you sure you want to delete %s?".printf (project.short_name)) + _("Delete Project"), _("Are you sure you want to delete %s?".printf (project.short_name)) ); dialog.body_use_markup = true; @@ -391,7 +391,7 @@ public class Views.Project : Gtk.Grid { order_by_item.selected = project.sort_order; show_completed_item = new Widgets.ContextMenu.MenuItem ( - project.show_completed ? _("Hide completed tasks") : _("Show Completed Tasks"), + project.show_completed ? _("Hide Completed Tasks") : _("Show Completed Tasks"), "planner-check-circle" ); @@ -421,7 +421,7 @@ public class Views.Project : Gtk.Grid { project.show_completed = !project.show_completed; project.update (); - show_completed_item.title = project.show_completed ? _("Hide Completed Tasks") : _("Show completed tasks"); + show_completed_item.title = project.show_completed ? _("Hide Completed Tasks") : _("Show Completed Tasks"); check_default_view (); }); diff --git a/src/Widgets/ReminderPicker/ReminderPicker.vala b/src/Widgets/ReminderPicker/ReminderPicker.vala index f004f87ba..b31f19c06 100644 --- a/src/Widgets/ReminderPicker/ReminderPicker.vala +++ b/src/Widgets/ReminderPicker/ReminderPicker.vala @@ -190,7 +190,7 @@ public class Widgets.ReminderPicker.ReminderPicker : Gtk.Popover { time_box.append (time_label); time_box.append (time_picker); - submit_button = new Widgets.LoadingButton (LoadingButtonType.LABEL, _("Add reminder")) { + submit_button = new Widgets.LoadingButton (LoadingButtonType.LABEL, _("Add Reminder")) { margin_top = 12, margin_start = 3, margin_end = 3, diff --git a/src/Widgets/ReminderPicker/ReminderRow.vala b/src/Widgets/ReminderPicker/ReminderRow.vala index 915ce343e..003af4e14 100644 --- a/src/Widgets/ReminderPicker/ReminderRow.vala +++ b/src/Widgets/ReminderPicker/ReminderRow.vala @@ -53,7 +53,7 @@ public class Dialogs.ReminderPicker.ReminderRow : Gtk.ListBoxRow { reminder_image.size = 16; reminder_image.update_icon_name (is_creating ? "plus" : "planner-bell"); - var reminder_label = new Gtk.Label (is_creating ? _("Add reminder") : Util.get_default ().get_relative_date_from_date (reminder.due.datetime)); + var reminder_label = new Gtk.Label (is_creating ? _("Add Reminder") : Util.get_default ().get_relative_date_from_date (reminder.due.datetime)); var remove_button = new Widgets.LoadingButton.with_icon ("planner-close-circle") { hexpand = true, diff --git a/src/Widgets/SyncButton.vala b/src/Widgets/SyncButton.vala index 5193d0b97..4a4ecc789 100644 --- a/src/Widgets/SyncButton.vala +++ b/src/Widgets/SyncButton.vala @@ -80,7 +80,7 @@ public class Widgets.SyncButton : Adw.Bin { stack.visible_child_name = "sync"; } else { stack.visible_child_name = "error"; - tooltip_markup = "%s\n%s".printf (_("Offline mode is on"), _("Looks like you'are not connected to the\ninternet. Changes you make in offline\nmode will be synced when you reconnect")); // vala-lint=line-length + tooltip_markup = "%s\n%s".printf (_("Offline Mode Is On"), _("Looks like you'are not connected to the\ninternet. Changes you make in offline\nmode will be synced when you reconnect")); // vala-lint=line-length } } From 30e73a5aefd38d6a307ea86616623aeb1e4d9215 Mon Sep 17 00:00:00 2001 From: Bart Gravendeel Date: Sat, 13 Jan 2024 16:24:13 +0100 Subject: [PATCH 2/2] Remove accidental newline Co-authored-by: Hari Rana --- src/Dialogs/Label.vala | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Dialogs/Label.vala b/src/Dialogs/Label.vala index 0c55ec31d..47e071726 100644 --- a/src/Dialogs/Label.vala +++ b/src/Dialogs/Label.vala @@ -218,4 +218,3 @@ public class Dialogs.Label : Adw.Window { }); } } -