diff options
| author | Antenore Gatta <antenore@simbiosi.org> | 2016-06-03 00:32:38 +0300 |
|---|---|---|
| committer | Antenore Gatta <antenore@simbiosi.org> | 2016-06-03 00:32:38 +0300 |
| commit | e105d15199314fe3efb1e468ffd28811a991dd23 (patch) | |
| tree | 7966d10fed738e1363601fd33b2ec0624210d1da | |
| parent | 1d67a6bce081f662110e21e586b54ab900d44b3b (diff) | |
| parent | 94427509f2ccf976e289910d4d0a0875822071c6 (diff) | |
Merge pull request #891 from FreeRDP/remmina_main_fixes1.2.0.rcgit.13
Remmina main fixes
| -rw-r--r-- | remmina/po/es.po | 3 | ||||
| -rw-r--r-- | remmina/src/remmina_main.c | 2 | ||||
| -rw-r--r-- | remmina/ui/remmina_about.glade | 13 | ||||
| -rw-r--r-- | remmina/ui/remmina_main.glade | 6 |
4 files changed, 20 insertions, 4 deletions
diff --git a/remmina/po/es.po b/remmina/po/es.po index d2490ef3c..bcc6073ef 100644 --- a/remmina/po/es.po +++ b/remmina/po/es.po @@ -445,6 +445,7 @@ msgstr "" " Martín V. https://launchpad.net/~martinvukovic\n" " Moritatux https://launchpad.net/~moritatux\n" " Paco Molinero https://launchpad.net/~franciscomol" +" Jose G Jimenez S https://launchpad.net/~josegjimenez" #: remmina/src/remmina_icon.c:136 msgid "Open Main Window" @@ -1605,7 +1606,7 @@ msgstr "Acciones" #: remmina/ui/remmina_main.glade:684 msgid "Last time used" -msgstr "La última vez que utilizó" +msgstr "Ultimo Acceso" #: remmina/ui/remmina_preferences.glade:41 msgid "Remmina Preferences" diff --git a/remmina/src/remmina_main.c b/remmina/src/remmina_main.c index 3afd8c874..19a854a96 100644 --- a/remmina/src/remmina_main.c +++ b/remmina/src/remmina_main.c @@ -1039,7 +1039,7 @@ void remmina_main_on_drag_data_received(GtkWidget *widget, GdkDragContext *drag_ GSList *files = NULL; gint i; - uris = g_uri_list_extract_uris((const gchar *) gtk_selection_data_get_data(user_data)); + uris = g_uri_list_extract_uris((const gchar *) gtk_selection_data_get_data(data)); for (i = 0; uris[i]; i++) { if (strncmp(uris[i], "file://", 7) != 0) diff --git a/remmina/ui/remmina_about.glade b/remmina/ui/remmina_about.glade index 03c293979..c22b84abf 100644 --- a/remmina/ui/remmina_about.glade +++ b/remmina/ui/remmina_about.glade @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 +<!-- Generated with glade 3.18.3 Remmina - The GTK+ Remmina Remote Desktop Client Copyright (C) Antenore Gatta & Giovanni Panozzo 2014-2016 @@ -95,6 +95,17 @@ dupondje <jean-louis@dupondje.be> repzilon <repzilon@users.noreply.github.com> </property> <property name="documenters">Dario Cavedon <dcavedon@gmail.com></property> + <property name="translator_credits" translatable="yes">Adolfo Jayme Barrientos <fitojb@ubuntu.com> +Antenore Gatta <antenore@simbiosi.org> +Emmanuel Grognet <emmanuel@grognet.fr> +Giovanni Panozzo <giovanni@panozzo.it> +Jean-Louis Dupond <jean-louis@dupond.be> +Jose Gregorio Jimenez Sanchez <josegjimenez@gmail.com> +Fabio Castelli (muflone) <muflone@vbsimple.net> +Shuhrat Dehkanov <k@efir.uz> +llyzs <llyzs.vic@gmail.com> +Johannes Weberhofer <jweberhofer@weberhofer.at> +</property> <property name="artists">Martin Lettner <m.lettner@gmail.com></property> <property name="logo_icon_name">remmina</property> <property name="license_type">gpl-2-0</property> diff --git a/remmina/ui/remmina_main.glade b/remmina/ui/remmina_main.glade index d156be22b..f400be14b 100644 --- a/remmina/ui/remmina_main.glade +++ b/remmina/ui/remmina_main.glade @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.0 +<!-- Generated with glade 3.19.0 Remmina - The GTK+ Remmina Remote Desktop Client Copyright (C) Antenore Gatta & Giovanni Panozzo 2014-2016 @@ -283,8 +283,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <object class="GtkEntry" id="entry_quick_connect_server"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="is_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> + <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes">search string or server name/ip address for quick connect</property> <property name="hexpand">True</property> <property name="width_chars">25</property> @@ -296,6 +299,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <signal name="changed" handler="remmina_main_quick_search_on_changed" swapped="no"/> <signal name="icon-press" handler="remmina_main_quick_search_on_icon_press" swapped="no"/> <signal name="insert-at-cursor" handler="remmina_main_load_files_cb" swapped="no"/> + <accelerator key="f" signal="grab-focus" modifiers="GDK_CONTROL_MASK"/> </object> <packing> <property name="expand">True</property> |