[nautilus] nautilus-view: Fix typos in previous commit
- From: Carlos Soriano Sánchez <csoriano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] nautilus-view: Fix typos in previous commit
- Date: Mon, 16 Feb 2015 18:56:21 +0000 (UTC)
commit fc205dd5ef7cda45a9eb10de45eb6387066f9067
Author: Carlos Soriano <csoriano gnome org>
Date: Mon Feb 16 19:55:52 2015 +0100
nautilus-view: Fix typos in previous commit
libnautilus-private/nautilus-global-preferences.h | 2 +-
.../org.gnome.nautilus.gschema.xml.in | 6 +++---
src/nautilus-move-to-trash-shorcut-changed.ui | 4 ++--
src/nautilus-view.c | 18 +++++++++---------
src/nautilus.gresource.xml | 2 +-
5 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/libnautilus-private/nautilus-global-preferences.h
b/libnautilus-private/nautilus-global-preferences.h
index 6474f7a..d4272b7 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -161,7 +161,7 @@ typedef enum
/* Move to trash shorcut changed dialog */
-#define NAUTILUS_PREFERENCES_SHOW_MOVE_TO_TRASH_SHORCUT_CHANGED_DIALOG
"show-move-to-trash-shorcut-changed-dialog"
+#define NAUTILUS_PREFERENCES_SHOW_MOVE_TO_TRASH_SHORTCUT_CHANGED_DIALOG
"show-move-to-trash-shortcut-changed-dialog"
void nautilus_global_preferences_init (void);
char *nautilus_global_preferences_get_default_folder_viewer_preference_as_iid (void);
diff --git a/libnautilus-private/org.gnome.nautilus.gschema.xml.in
b/libnautilus-private/org.gnome.nautilus.gschema.xml.in
index 7f8dcf9..be81a10 100644
--- a/libnautilus-private/org.gnome.nautilus.gschema.xml.in
+++ b/libnautilus-private/org.gnome.nautilus.gschema.xml.in
@@ -101,10 +101,10 @@
<_summary>Show the package installer for unknown mime types</_summary>
<_description>Whether to show the user a package installer dialog in case an unknown mime type is
opened, in order to search for an application to handle it.</_description>
</key>
- <key name="show-move-to-trash-shorcut-changed-dialog" type="b">
+ <key name="show-move-to-trash-shortcut-changed-dialog" type="b">
<default>true</default>
- <_summary>Show a warning dialog for the change of the shorcut for move to trash</_summary>
- <_description>Show a warning dialog for the change of the shorcut for move to trash from control +
delete to just delete.</_description>
+ <_summary>Show a warning dialog for the change of the shortcut for move to trash</_summary>
+ <_description>Show a warning dialog for the change of the shortcut for move to trash from control +
delete to just delete.</_description>
</key>
<key name="mouse-use-extra-buttons" type="b">
<default>true</default>
diff --git a/src/nautilus-move-to-trash-shorcut-changed.ui b/src/nautilus-move-to-trash-shorcut-changed.ui
index 6541892..3012780 100644
--- a/src/nautilus-move-to-trash-shorcut-changed.ui
+++ b/src/nautilus-move-to-trash-shorcut-changed.ui
@@ -2,14 +2,14 @@
<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.12"/>
- <object class="GtkMessageDialog" id="move_to_trash_shorcut_changed_dialog">
+ <object class="GtkMessageDialog" id="move_to_trash_shortcut_changed_dialog">
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<property name="text" translatable="yes">Delete Shortcuts Have Changed</property>
- <property name="secondary_text" translatable="yes">With the latest version of files, you no longer need
to hold Ctrl to delete - the Delete key will work when pressed on its own.</property>
+ <property name="secondary_text" translatable="yes">With the latest version of Files, you no longer need
to hold Ctrl to delete - the Delete key will work when pressed on its own.</property>
<child type="action">
<object class="GtkButton" id="button_got_it">
<property name="label" translatable="yes">Got it</property>
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index 6a701d0..47d5d57 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -928,14 +928,14 @@ got_it_clicked (GtkDialog *dialog,
gpointer user_data)
{
g_settings_set_boolean (nautilus_preferences,
- NAUTILUS_PREFERENCES_SHOW_MOVE_TO_TRASH_SHORCUT_CHANGED_DIALOG,
+ NAUTILUS_PREFERENCES_SHOW_MOVE_TO_TRASH_SHORTCUT_CHANGED_DIALOG,
FALSE);
}
static void
-action_show_move_to_trash_shorcut_changed_dialog (GSimpleAction *action,
- GVariant *state,
- gpointer user_data)
+action_show_move_to_trash_shortcut_changed_dialog (GSimpleAction *action,
+ GVariant *state,
+ gpointer user_data)
{
NautilusView *view;
GtkWindow *dialog;
@@ -944,10 +944,10 @@ action_show_move_to_trash_shorcut_changed_dialog (GSimpleAction *action,
view = (NautilusView *) user_data;
show_dialog_preference = g_settings_get_boolean (nautilus_preferences,
-
NAUTILUS_PREFERENCES_SHOW_MOVE_TO_TRASH_SHORCUT_CHANGED_DIALOG);
+
NAUTILUS_PREFERENCES_SHOW_MOVE_TO_TRASH_SHORTCUT_CHANGED_DIALOG);
if (show_dialog_preference) {
- builder = gtk_builder_new_from_resource
("/org/gnome/nautilus/nautilus-move-to-trash-shorcut-changed.ui");
- dialog = (GtkWindow *) gtk_builder_get_object (builder,
"move_to_trash_shorcut_changed_dialog");
+ builder = gtk_builder_new_from_resource
("/org/gnome/nautilus/nautilus-move-to-trash-shortcut-changed.ui");
+ dialog = (GtkWindow *) gtk_builder_get_object (builder,
"move_to_trash_shortcut_changed_dialog");
gtk_window_set_transient_for (dialog, (GtkWindow *) nautilus_view_get_window (view));
g_signal_connect (dialog, "response",
@@ -5623,7 +5623,7 @@ const GActionEntry view_entries[] = {
{ "invert-selection", action_invert_selection },
{ "open-file-and-close-window", action_open_file_and_close_window },
/* Warning dialog for the change of the shorcut to move to trash */
- { "show-move-to-trash-shorcut-changed-dialog", action_show_move_to_trash_shorcut_changed_dialog }
+ { "show-move-to-trash-shortcut-changed-dialog", action_show_move_to_trash_shortcut_changed_dialog }
};
static gboolean
@@ -7567,7 +7567,7 @@ nautilus_view_init (NautilusView *view)
/* Show a warning dialog to inform the user that the shorcut for move to trash
* changed */
- nautilus_application_add_accelerator (app, "view.show-move-to-trash-shorcut-changed-dialog",
"<control>Delete");
+ nautilus_application_add_accelerator (app, "view.show-move-to-trash-shortcut-changed-dialog",
"<control>Delete");
nautilus_profile_end (NULL);
}
diff --git a/src/nautilus.gresource.xml b/src/nautilus.gresource.xml
index fd792e3..9f16f58 100644
--- a/src/nautilus.gresource.xml
+++ b/src/nautilus.gresource.xml
@@ -9,7 +9,7 @@
<file>nautilus-toolbar-action-menu.xml</file>
<file>nautilus-view-context-menus.xml</file>
<file>nautilus-progress-info-widget.xml</file>
- <file>nautilus-move-to-trash-shorcut-changed.ui</file>
+ <file>nautilus-move-to-trash-shortcut-changed.ui</file>
<file alias="icons/thumbnail_frame.png">../icons/thumbnail_frame.png</file>
<file alias="icons/filmholes.png">../icons/filmholes.png</file>
<file alias="icons/knob.png">../icons/knob.png</file>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]