Commit 654bae35 authored by Sebastien Bacher's avatar Sebastien Bacher
Browse files

Update upstream source from tag 'upstream/3.34.3'

Update to upstream version '3.34.3'
with Debian dir 81bfee9873e6ae1ee7dee21584d4086cd6b07b5d
parents 8a4a4d48 00b681d1
ver 3.34.3:
- Fix problem with intermittent connection work-around when
using the switch in the device properties
- Updated translations
ver 3.34.2:
- Work-around intermittent connection problems by disabling
discovery when connecting to devices
- Hide pairing dialogue when pairing fails
- Allow $HOME to be the Downloads dir
- Better handling of the 8bitdo Zero gamepad
- Updated translations
ver 3.34.1:
- Prefer “Alias” adapter name to “Name”
- Fix some memory leaks
......
GNOME Bluetooth
===============
gnome-bluetooth is a fork of bluez-gnome focused on integration with
the GNOME desktop environment.
gnome-bluetooth is the historical name of the first GNOME focused
Bluetooth effort for Linux. As such, when the need came to name
this project, we selected something that was still in the people's
minds.
You can find historical versions of gnome-bluetooth in the GNOME SVN
repository at:
http://svn.gnome.org/viewvc/gnome-bluetooth/trunk/
gnome-bluetooth does not include the bluez-gnome analyzer, or the
proximity tool.
Requirements
------------
- GLib (with GIO), GTK+, GConf, dbus-glib, libhal
- libunique and libnotify
- BlueZ 4.36 is absolutely required
- kernel 2.6.31 (or pre-releases) with the new rfkill
sub-system are required for rfkill to work [1]
- obexd is required for bluetooth-sendto to work
[1]: Note that read/write access to the /dev/rfkill device is
required and should be provided by the distribution
Copyright
---------
The original bluez-gnome is:
Copyright (C) 2005-2008 Marcel Holtmann <marcel@holtmann.org>
# GNOME Bluetooth
gnome-bluetooth is collection of widgets for applications that want
to select Bluetooth devices. It is also used by GNOME session
components such as the Settings and gnome-shell.
Requirements
------------
- glib
- bluez 5.x
- rfkill sub-system enable in the kernel[1]
- gnome-settings-daemon
[1]: Note that read/write access to the /dev/rfkill device is
required and should be provided by the distribution
Copyright
---------
A long time ago, gnome-bluetooth was a fork of bluez-gnome,
which was:
`Copyright (C) 2005-2008 Marcel Holtmann <marcel@holtmann.org>`
\ No newline at end of file
#!/bin/sh
# Copyright (C) 2019 Red Hat, Inc.
# Author: Bastien Nocera <hadess@hadess.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Add to your top-level meson.build to check for an updated NEWS file
# when doing a "dist" release, similarly to automake's check-news:
# https://www.gnu.org/software/automake/manual/html_node/List-of-Automake-options.html
#
# Checks NEWS for the version number:
# meson.add_dist_script(
# find_program('check-news.sh').path(),
# '@0@'.format(meson.project_version())
# )
#
# Checks NEWS and data/foo.appdata.xml for the version number:
# meson.add_dist_script(
# find_program('check-news.sh').path(),
# '@0@'.format(meson.project_version()),
# 'NEWS',
# 'data/foo.appdata.xml'
# )
usage()
{
echo "$0 VERSION [FILES...]"
exit 1
}
check_version()
{
VERSION=$1
# Look in the first 15 lines for NEWS files, but look
# everywhere for other types of files
if [ "$2" = "NEWS" ]; then
DATA=`sed 15q $SRC_ROOT/"$2"`
else
DATA=`cat $SRC_ROOT/"$2"`
fi
case "$DATA" in
*"$VERSION"*)
:
;;
*)
echo "$2 not updated; not releasing" 1>&2;
exit 1
;;
esac
}
SRC_ROOT=${MESON_DIST_ROOT:-"./"}
if [ $# -lt 1 ] ; then usage ; fi
VERSION=$1
shift
if [ $# -eq 0 ] ; then
check_version $VERSION 'NEWS'
exit 0
fi
for i in $@ ; do
check_version $VERSION "$i"
done
exit 0
......@@ -297,7 +297,15 @@ device_resolve_type_and_icon (Device1 *device, BluetoothType *type, const char *
g_return_if_fail (type);
g_return_if_fail (icon);
*type = bluetooth_appearance_to_type (device1_get_appearance (device));
if (g_strcmp0 (device1_get_name (device), "ION iCade Game Controller") == 0 ||
g_strcmp0 (device1_get_name (device), "8Bitdo Zero GamePad") == 0) {
*type = BLUETOOTH_TYPE_JOYPAD;
*icon = "input-gaming";
return;
}
if (*type == 0 || *type == BLUETOOTH_TYPE_ANY)
*type = bluetooth_appearance_to_type (device1_get_appearance (device));
if (*type == 0 || *type == BLUETOOTH_TYPE_ANY)
*type = bluetooth_class_to_type (device1_get_class (device));
......@@ -389,7 +397,7 @@ device_added (GDBusObjectManager *manager,
char **uuids;
gboolean paired, trusted, connected;
int legacypairing;
BluetoothType type;
BluetoothType type = BLUETOOTH_TYPE_ANY;
GtkTreeIter iter, parent;
g_signal_connect_object (G_OBJECT (device), "notify",
......
......@@ -484,7 +484,7 @@ lookup_download_dir (void)
char *dir;
special_dir = g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD);
if (special_dir != NULL && strcmp (special_dir, g_get_home_dir ()) != 0) {
if (special_dir != NULL) {
g_mkdir_with_parents (special_dir, 0755);
return g_strdup (special_dir);
}
......
......@@ -162,6 +162,17 @@ is_connecting (BluetoothSettingsWidget *self,
bdaddr));
}
static gboolean
has_default_adapter (BluetoothSettingsWidget *self)
{
g_autofree char *default_adapter = NULL;
BluetoothSettingsWidgetPrivate *priv;
priv = BLUETOOTH_SETTINGS_WIDGET_GET_PRIVATE (self);
g_object_get (priv->client, "default-adapter", &default_adapter, NULL);
return (default_adapter != NULL);
}
typedef struct {
char *bdaddr;
BluetoothSettingsWidget *self;
......@@ -205,6 +216,9 @@ connect_done (GObject *source_object,
remove_connecting (self, data->bdaddr);
//FIXME show an error if it failed?
g_object_set (G_OBJECT (priv->client),
"default-adapter-discovering", has_default_adapter (self),
NULL);
out:
g_clear_error (&error);
......@@ -856,6 +870,7 @@ connect_callback (GObject *source_object,
gpointer user_data)
{
SetupConnectData *data = (SetupConnectData *) user_data;
BluetoothSettingsWidgetPrivate *priv;
GError *error = NULL;
gboolean success;
......@@ -876,6 +891,11 @@ connect_callback (GObject *source_object,
turn_off_pairing (data->self, data->device);
priv = BLUETOOTH_SETTINGS_WIDGET_GET_PRIVATE (data->self);
g_object_set (G_OBJECT (priv->client),
"default-adapter-discovering", has_default_adapter (data->self),
NULL);
bail:
if (data->timeout_id > 0)
g_source_remove (data->timeout_id);
......@@ -890,7 +910,8 @@ create_callback (GObject *source_object,
GAsyncResult *res,
gpointer user_data)
{
BluetoothSettingsWidgetPrivate *priv = BLUETOOTH_SETTINGS_WIDGET_GET_PRIVATE (user_data);
BluetoothSettingsWidget *self = user_data;
BluetoothSettingsWidgetPrivate *priv = BLUETOOTH_SETTINGS_WIDGET_GET_PRIVATE (self);
SetupConnectData *data;
GError *error = NULL;
gboolean ret;
......@@ -910,10 +931,18 @@ create_callback (GObject *source_object,
return;
}
priv = BLUETOOTH_SETTINGS_WIDGET_GET_PRIVATE (user_data);
g_clear_pointer (&priv->pairing_dialog, gtk_widget_destroy);
turn_off_pairing (user_data, path);
dbus_error = g_dbus_error_get_remote_error (error);
if (g_strcmp0 (dbus_error, "org.bluez.Error.AuthenticationCanceled") != 0) {
if (g_strcmp0 (dbus_error, "org.bluez.Error.AuthenticationFailed") == 0) {
//FIXME pairing failed because we entered the wrong code
} else if (g_strcmp0 (dbus_error, "org.bluez.Error.AuthenticationCanceled") == 0) {
//FIXME pairing was cancelled
} else {
//FIXME show an error?
/* translators:
* The “%s” is the device name, for example:
......@@ -930,6 +959,10 @@ create_callback (GObject *source_object,
g_free (dbus_error);
g_error_free (error);
g_free (path);
g_object_set (G_OBJECT (priv->client),
"default-adapter-discovering", has_default_adapter (self),
NULL);
return;
}
......@@ -1025,6 +1058,7 @@ start_pairing (BluetoothSettingsWidget *self,
g_strdup (g_dbus_proxy_get_object_path (proxy)),
GINT_TO_POINTER (1));
g_object_set (G_OBJECT (priv->client), "default-adapter-discovering", FALSE, NULL);
bluetooth_client_setup_device (priv->client,
g_dbus_proxy_get_object_path (proxy),
pair,
......@@ -1052,6 +1086,10 @@ switch_connected_state_set (GtkSwitch *button,
data->bdaddr = g_strdup (priv->selected_bdaddr);
data->self = self;
if (gtk_switch_get_active (button))
g_object_set (G_OBJECT (priv->client),
"default-adapter-discovering", FALSE,
NULL);
bluetooth_client_connect_service (priv->client,
priv->selected_object_path,
gtk_switch_get_active (button),
......
project(
'gnome-bluetooth', 'c',
version: '3.34.1',
version: '3.34.3',
license: 'GPL2+',
default_options: 'buildtype=debugoptimized',
meson_version: '>= 0.49.0',
......@@ -133,3 +133,9 @@ output += ' Prefix......................: ' + gnomebt_prefix + '\n'
output += ' Documentation...............: ' + enable_gtk_doc.to_string() + '\n'
output += ' GObject-Introspection.......: ' + enable_gir.to_string()
message(output)
meson.add_dist_script(
find_program('check-news.sh').path(),
'@0@'.format(meson.project_version()),
'NEWS',
)
......@@ -10,18 +10,17 @@
msgid ""
msgstr ""
"Project-Id-Version: bluez-gnome\n"
"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
"bluetooth&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2017-08-13 21:07+0000\n"
"PO-Revision-Date: 2017-09-09 14:00+0200\n"
"Last-Translator: Efstathios Iosifidis <iosifidis@opensuse.org>\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-bluetooth/issues\n"
"POT-Creation-Date: 2020-06-25 07:23+0000\n"
"PO-Revision-Date: 2020-09-09 18:41+0300\n"
"Last-Translator: Efstathios Iosifidis <eiosifidis@gnome.org>\n"
"Language-Team: www.gnome.gr\n"
"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.5.7\n"
"X-Generator: Poedit 2.3\n"
"X-Launchpad-Export-Date: 2008-10-05 13:37+0000\n"
"X-Project-Style: gnome\n"
......@@ -29,7 +28,7 @@ msgstr ""
msgid "Click to select device…"
msgstr "Πατήστε για να επιλέξετε συσκευή…"
#: lib/bluetooth-chooser-button.c:201 lib/bluetooth-settings-widget.c:1275
#: lib/bluetooth-chooser-button.c:201 lib/bluetooth-settings-widget.c:1281
#: sendto/main.c:447 sendto/main.c:738 sendto/main.c:794
msgid "_Cancel"
msgstr "_Ακύρωση"
......@@ -48,7 +47,7 @@ msgid "No adapters available"
msgstr "Δεν υπάρχουν διαθέσιμοι προσαρμογείς"
#: lib/bluetooth-chooser.c:180 lib/bluetooth-chooser.c:806
#: lib/bluetooth-settings-widget.c:1564
#: lib/bluetooth-settings-widget.c:1561
msgid "Searching for devices…"
msgstr "Αναζήτηση για συσκευές…"
......@@ -56,11 +55,11 @@ msgstr "Αναζήτηση για συσκευές…"
msgid "Device"
msgstr "Συσκευή"
#: lib/bluetooth-chooser.c:734 lib/settings.ui:179
#: lib/bluetooth-chooser.c:734 lib/settings.ui:182
msgid "Type"
msgstr "Τύπος"
#: lib/bluetooth-chooser.c:990 lib/bluetooth-settings-widget.c:1526
#: lib/bluetooth-chooser.c:990 lib/bluetooth-settings-widget.c:1518
msgid "Devices"
msgstr "Συσκευές"
......@@ -68,7 +67,7 @@ msgstr "Συσκευές"
msgid "All categories"
msgstr "Όλες οι κατηγορίες"
#: lib/bluetooth-filter-widget.c:74 lib/settings.ui:134
#: lib/bluetooth-filter-widget.c:74 lib/settings.ui:135
msgid "Paired"
msgstr "Συζευγμένα"
......@@ -123,7 +122,6 @@ msgstr "Επιβεβαιώστε το PIN για μπλουτούθ"
#: lib/bluetooth-pairing-dialog.c:84
#, c-format
#| msgid "Please confirm the PIN that was entered on '%s'."
msgid "Please confirm the PIN that was entered on “%s”."
msgstr "Παρακαλούμε επιβεβαιώστε το PIN που εισήχθη στο «%s»."
......@@ -134,9 +132,6 @@ msgstr "Επιβεβαίωση"
#: lib/bluetooth-pairing-dialog.c:91
#, c-format
#| msgid ""
#| "Confirm the Bluetooth PIN for '%s'. This can usually be found in the "
#| "device's manual."
msgid ""
"Confirm the Bluetooth PIN for “%s”. This can usually be found in the "
"device’s manual."
......@@ -146,14 +141,11 @@ msgstr ""
#: lib/bluetooth-pairing-dialog.c:97
#, c-format
#| msgid "Pairing '%s'"
msgid "Pairing “%s”"
msgstr "Γίνεται σύζευξη «%s»"
#: lib/bluetooth-pairing-dialog.c:105
#, c-format
#| msgid ""
#| "Please confirm that the following PIN matches the one displayed on '%s'."
msgid ""
"Please confirm that the following PIN matches the one displayed on “%s”."
msgstr ""
......@@ -166,7 +158,6 @@ msgstr "Αίτημα σύζευξης μπλουτούθ"
#: lib/bluetooth-pairing-dialog.c:111
#, c-format
#| msgid "'%s' wants to pair with this device. Do you want to allow pairing?"
msgid "“%s” wants to pair with this device. Do you want to allow pairing?"
msgstr ""
"Το «%s» θέλει να συνδεθεί με αυτήν την συσκευή. Θέλετε να επιτρέψετε τη "
......@@ -178,22 +169,17 @@ msgstr "Επιβεβαιώστε τη σύνδεση μπλουτούθ"
#: lib/bluetooth-pairing-dialog.c:117
#, c-format
#| msgid "'%s' wants to connect with this device. Do you want to allow it?"
msgid "“%s” wants to connect with this device. Do you want to allow it?"
msgstr ""
"Το «%s» θέλει να συνδεθεί με αυτήν την συσκευή. Θέλετε να το επιτρέψετε;"
#: lib/bluetooth-pairing-dialog.c:125
#, c-format
#| msgid "Please enter the following PIN on '%s'."
msgid "Please enter the following PIN on “%s”."
msgstr "Παρακαλούμε εισάγετε το ακόλουθο PIN στο «%s»."
#: lib/bluetooth-pairing-dialog.c:128
#, c-format
#| msgid ""
#| "Please enter the following PIN on '%s'. Then press “Return” on the "
#| "keyboard."
msgid ""
"Please enter the following PIN on “%s”. Then press “Return” on the keyboard."
msgstr ""
......@@ -217,16 +203,16 @@ msgid "Dismiss"
msgstr "Απόρριψη"
#. Cancel button
#: lib/bluetooth-pairing-dialog.c:153 lib/bluetooth-pairing-dialog.c:308
#: lib/bluetooth-pairing-dialog.c:153 lib/bluetooth-pairing-dialog.c:306
msgid "Cancel"
msgstr "Ακύρωση"
#. OK button
#: lib/bluetooth-pairing-dialog.c:289 lib/bluetooth-settings-obexpush.c:246
#: lib/bluetooth-pairing-dialog.c:287 lib/bluetooth-settings-obexpush.c:247
msgid "Accept"
msgstr "Αποδοχή"
#: lib/bluetooth-settings-row.c:79 lib/bluetooth-settings-row.ui:37
#: lib/bluetooth-settings-row.c:79 lib/bluetooth-settings-row.ui:40
msgid "Not Set Up"
msgstr "Χωρίς ρύθμιση"
......@@ -238,18 +224,18 @@ msgstr "Συνδέθηκε"
msgid "Disconnected"
msgstr "Αποσυνδέθηκε"
#: lib/bluetooth-settings-widget.c:1143
#: lib/bluetooth-settings-widget.c:1149
msgid "Yes"
msgstr "Ναι"
#: lib/bluetooth-settings-widget.c:1143
#: lib/bluetooth-settings-widget.c:1149
msgid "No"
msgstr "Όχι"
#. translators: first %s is the name of the computer, for example:
#. * Visible as “Bastien Nocera’s Computer” followed by the
#. * location of the Downloads folder.
#: lib/bluetooth-settings-widget.c:1243
#: lib/bluetooth-settings-widget.c:1249
#, c-format
msgid ""
"Visible as “%s” and available for Bluetooth file transfers. Transferred "
......@@ -258,52 +244,50 @@ msgstr ""
"Ορατό ως “%s” και διαθέσιμο για μεταφορές αρχείου μπλουτούθ. Τα μεταφερόμενα "
"αρχεία τοποθετούνται στον φάκελο <a href=\"%s\">λήψεις</a>."
#: lib/bluetooth-settings-widget.c:1270
#: lib/bluetooth-settings-widget.c:1276
#, c-format
#| msgid "Remove '%s' from the list of devices?"
msgid "Remove “%s” from the list of devices?"
msgstr "Αφαίρεση του «%s» από τη λίστα των συσκευών;"
#: lib/bluetooth-settings-widget.c:1272
#: lib/bluetooth-settings-widget.c:1278
msgid ""
"If you remove the device, you will have to set it up again before next use."
msgstr ""
"Εάν αφαιρέσετε τη συσκευή, θα πρέπει να τη ρυθμίσετε ξανά την επόμενη φορά "
"που θα την χρησιμοποιήσετε."
#: lib/bluetooth-settings-widget.c:1276
#: lib/bluetooth-settings-widget.c:1282
msgid "_Remove"
msgstr "_Αφαίρεση"
#. Translators: %s is the name of the filename received
#: lib/bluetooth-settings-obexpush.c:145
#: lib/bluetooth-settings-obexpush.c:146
#, c-format
#| msgid "You received \"%s\" via Bluetooth"
msgid "You received “%s” via Bluetooth"
msgstr "Λάβατε το «%s» μέσω Bluetooth"
#: lib/bluetooth-settings-obexpush.c:147
#: lib/bluetooth-settings-obexpush.c:148
msgid "You received a file"
msgstr "Λάβατε ένα αρχείο"
#: lib/bluetooth-settings-obexpush.c:158
#: lib/bluetooth-settings-obexpush.c:159
msgid "Open File"
msgstr "Άνοιγμα αρχείου"
#: lib/bluetooth-settings-obexpush.c:162
msgid "Reveal File"
msgstr "Εμφάνιση αρχείου"
#: lib/bluetooth-settings-obexpush.c:163
msgid "Open Containing Folder"
msgstr "Άνοιγμα φακέλου που το περιέχει"
#: lib/bluetooth-settings-obexpush.c:179
#: lib/bluetooth-settings-obexpush.c:180
msgid "File reception complete"
msgstr "Ολοκληρώθηκε η λήψη του αρχείου"
#: lib/bluetooth-settings-obexpush.c:233
#: lib/bluetooth-settings-obexpush.c:234
#, c-format
msgid "Bluetooth file transfer from %s"
msgstr "Μεταφορά αρχείου μπλουτούθ από %s"
#: lib/bluetooth-settings-obexpush.c:243
#: lib/bluetooth-settings-obexpush.c:244
msgid "Decline"
msgstr "Άρνηση"
......@@ -392,27 +376,27 @@ msgstr "Όλοι οι τύποι"
msgid "Connection"
msgstr "Σύνδεση"
#: lib/settings.ui:224
#: lib/settings.ui:229
msgid "Address"
msgstr "Διεύθυνση"
#: lib/settings.ui:279
#: lib/settings.ui:285
msgid "_Mouse & Touchpad Settings"
msgstr "Ρυθμίσεις _ποντικιού και πινακίδας αφής"
#: lib/settings.ui:293
#: lib/settings.ui:299
msgid "_Sound Settings"
msgstr "Ρυθμίσεις ή_χου"
#: lib/settings.ui:307
#: lib/settings.ui:313
msgid "_Keyboard Settings"
msgstr "Ρυθμίσεις π_ληκτρολογίου"
#: lib/settings.ui:321
#: lib/settings.ui:327
msgid "Send _Files…"
msgstr "Αποστολή _αρχείων…"
#: lib/settings.ui:335
#: lib/settings.ui:341
msgid "_Remove Device"
msgstr "Α_φαίρεση συσκευής"
......@@ -424,11 +408,6 @@ msgstr "Μεταφορά Bluetooth"
msgid "Send files via Bluetooth"
msgstr "Αποστολή αρχείων μέσω Bluetooth"
#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
#: sendto/bluetooth-sendto.desktop.in.in:6
msgid "bluetooth"
msgstr "bluetooth"
#: sendto/main.c:117
msgid "An unknown error occurred"
msgstr "Προέκυψε ένα άγνωστο σφάλμα"
......@@ -549,7 +528,6 @@ msgid "ADDRESS"
msgstr "ΔΙΕΥΘΥΝΣΗ"
#: sendto/main.c:827
#| msgid "Remote device's name"
msgid "Remote device’s name"
msgstr "Το όνομα της απομακρυσμένης συσκευής"
......@@ -558,10 +536,15 @@ msgid "NAME"
msgstr "ΟΝΟΜΑ"
#: sendto/main.c:846
#| msgid "[FILE...]"
msgid "[FILE…]"
msgstr "[ΑΡΧΕΙΟ...]"
#~ msgid "Reveal File"
#~ msgstr "Εμφάνιση αρχείου"
#~ msgid "bluetooth"
#~ msgstr "bluetooth"
#~| msgid "Searching for devices…"
#~ msgid "Searching for devices..."
#~ msgstr "Αναζήτηση για συσκευές..."
......
......@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: bluez-gnome.master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-bluetooth/issues\n"
"POT-Creation-Date: 2019-07-18 13:00+0000\n"
"POT-Creation-Date: 2020-06-25 07:23+0000\n"
"PO-Revision-Date: 2019-07-24 10:31+0200\n"
"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
"Language-Team: Spanish - Spain <gnome-es-list@gnome.org>\n"
......@@ -196,12 +196,12 @@ msgid "Dismiss"
msgstr "Descartar"
#. Cancel button
#: lib/bluetooth-pairing-dialog.c:153 lib/bluetooth-pairing-dialog.c:308
#: lib/bluetooth-pairing-dialog.c:153 lib/bluetooth-pairing-dialog.c:306
msgid "Cancel"
msgstr "Cancelar"
#. OK button
#: lib/bluetooth-pairing-dialog.c:289 lib/bluetooth-settings-obexpush.c:247
#: lib/bluetooth-pairing-dialog.c:287 lib/bluetooth-settings-obexpush.c:247
msgid "Accept"
msgstr "Aceptar"
......@@ -858,7 +858,7 @@ msgstr "[ARCHIVO…]"
#~ "tiene dudas, consulte el manual del dispositivo."
#~ msgid "Welcome to the Bluetooth new device setup"
#~ msgstr "Bienvenido a la configuración de dispositivos Bluetooth nuevos"
#~ msgstr "Bienvenido/a a la configuración de dispositivos Bluetooth nuevos"
#~ msgid "Run in standalone mode"
#~ msgstr "Ejecutar en modo independiente"
......
This diff is collapsed.