[meego-commits] 8286: Changes to Trunk:Netbook/meego-panel-networks
Jussi Kukkonen
no_reply at build.meego.com
Mon Oct 11 12:14:00 UTC 2010
Hi,
I have made the following changes to meego-panel-networks in project Trunk:Netbook. Please review and accept ASAP.
Thank You,
Jussi Kukkonen
[This message was auto-generated]
---
Request #8286:
submit: devel:ux:netbook/meego-panel-networks(r9) -> Trunk:Netbook/meego-panel-networks
Message:
* Mon Oct 11 2010 Jussi Kukkonen <jku at linux.intel.com> - 1.2.16
- keep "active" service item visible (BMC#169)
- make service drag-n-drop smarter (BMC#3770)
- scroll list to show expanded item (MBC#2449)
- Only show error messages once (MBC#655)
- Initial support for captive portals (BMC#3198)
* Mon Oct 04 2010 Jussi Kukkonen <jku at linux.intel.com> - 1.2.15
- OpenConnect VPN integration (BMC#3201)
- Set immutable service config insensitive (BMC#7816)
- Make sure passphrases in model are up-to-date (BMC#3200)
- never ask passphrase for immutable service (BMC#3199)
- Support Fixed ipv4 method (BMC#2784)
- show rfkilled tech-switches as insensitive (BMC#5003)
- Translations
State: new 2010-10-11T05:13:59 jku
Comment: None
changes files:
--------------
--- meego-panel-networks.changes
+++ meego-panel-networks.changes
@@ -0,0 +1,16 @@
+* Mon Oct 11 2010 Jussi Kukkonen <jku at linux.intel.com> - 1.2.16
+- keep "active" service item visible (BMC#169)
+- make service drag-n-drop smarter (BMC#3770)
+- scroll list to show expanded item (MBC#2449)
+- Only show error messages once (MBC#655)
+- Initial support for captive portals (BMC#3198)
+
+* Mon Oct 04 2010 Jussi Kukkonen <jku at linux.intel.com> - 1.2.15
+- OpenConnect VPN integration (BMC#3201)
+- Set immutable service config insensitive (BMC#7816)
+- Make sure passphrases in model are up-to-date (BMC#3200)
+- never ask passphrase for immutable service (BMC#3199)
+- Support Fixed ipv4 method (BMC#2784)
+- show rfkilled tech-switches as insensitive (BMC#5003)
+- Translations
+
old:
----
meego-panel-networks-1.2.14.tar.gz
new:
----
meego-panel-networks-1.2.16.tar.gz
spec files:
-----------
--- meego-panel-networks.spec
+++ meego-panel-networks.spec
@@ -1,13 +1,13 @@
#
-# Do not Edit! Generated by:
-# spectacle version 0.18
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.20
#
# >> macros
# << macros
Name: meego-panel-networks
Summary: Connection management panel
-Version: 1.2.14
+Version: 1.2.16
Release: 1
Group: Applications/Internet
License: GPL 2
@@ -16,9 +16,11 @@
Source100: meego-panel-networks.yaml
Requires: mobile-broadband-provider-info
Requires: iso-codes
+Requires(post): /bin/touch
Requires(post): gtk2
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(dbus-glib-1)
+BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(mx-gtk-1.0)
BuildRequires: pkgconfig(meego-panel) >= 0.49.0
@@ -62,6 +64,18 @@
%find_lang meego-panel-networks
+
+%post
+/bin/touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache \
+ --quiet %{_datadir}/icons/hicolor 2> /dev/null|| :
+
+%postun
+/bin/touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache \
+ --quiet %{_datadir}/icons/hicolor 2> /dev/null|| :
+
+
%files -f meego-panel-networks.lang
%defattr(-,root,root,-)
# >> files
other changes:
--------------
++++++ meego-panel-networks-1.2.14.tar.gz -> meego-panel-networks-1.2.16.tar.gz
--- Makefile.in
+++ Makefile.in
@@ -139,6 +139,8 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GCONF_CFLAGS = @GCONF_CFLAGS@
+GCONF_LIBS = @GCONF_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
--- aclocal.m4
+++ aclocal.m4
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-[m4_warning([this file was generated for autoconf 2.65.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
+[m4_warning([this file was generated for autoconf 2.67.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
--- callouts/3g/Makefile.in
+++ callouts/3g/Makefile.in
@@ -129,6 +129,8 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GCONF_CFLAGS = @GCONF_CFLAGS@
+GCONF_LIBS = @GCONF_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
--- callouts/Makefile.in
+++ callouts/Makefile.in
@@ -123,6 +123,8 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GCONF_CFLAGS = @GCONF_CFLAGS@
+GCONF_LIBS = @GCONF_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
--- carrick/Makefile.am
+++ carrick/Makefile.am
@@ -10,7 +10,9 @@
$(AM_V_GEN)dbus-binding-tool --mode=glib-client --output=$@ --prefix=$(subst -,_,$*) $^
BUILT_SOURCES = connman-marshal.c connman-marshal.h \
- connman-manager-bindings.h connman-service-bindings.h
+ connman-manager-bindings.h \
+ connman-service-bindings.h \
+ connman-technology-bindings.h
noinst_LTLIBRARIES = \
libcarrick.la
@@ -41,20 +43,25 @@
libcarrick_la_CFLAGS = -Wall \
$(GTK_CFLAGS) \
- $(MPL_CFLAGS) \
+ $(GCONF_CFLAGS) \
+ $(MPL_CFLAGS) \
$(MX_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
-DPKG_DATA_DIR=\"$(pkgdatadir)\" \
-DLIBEXECDIR=\"$(libexecdir)\"
libcarrick_la_LIBADD = $(GTK_LIBS) \
- $(MPL_LIBS) \
+ $(GCONF_LIBS) \
+ $(MPL_LIBS) \
$(MX_LIBS) \
$(LIBNOTIFY_LIBS)
DISTCLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = connman-marshal.list connman-manager.xml connman-service.xml
+EXTRA_DIST = connman-marshal.list \
+ connman-manager.xml \
+ connman-service.xml \
+ connman-technology.xml
-include $(top_srcdir)/git.mk
--- carrick/Makefile.in
+++ carrick/Makefile.in
@@ -49,7 +49,7 @@
am__DEPENDENCIES_1 =
libcarrick_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am__objects_1 = libcarrick_la-connman-marshal.lo
am_libcarrick_la_OBJECTS = libcarrick_la-carrick-applet.lo \
libcarrick_la-carrick-pane.lo \
@@ -128,6 +128,8 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GCONF_CFLAGS = @GCONF_CFLAGS@
+GCONF_LIBS = @GCONF_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
@@ -252,7 +254,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
BUILT_SOURCES = connman-marshal.c connman-marshal.h \
- connman-manager-bindings.h connman-service-bindings.h
+ connman-manager-bindings.h \
+ connman-service-bindings.h \
+ connman-technology-bindings.h
noinst_LTLIBRARIES = \
libcarrick.la
@@ -283,19 +287,25 @@
libcarrick_la_CFLAGS = -Wall \
$(GTK_CFLAGS) \
- $(MPL_CFLAGS) \
+ $(GCONF_CFLAGS) \
+ $(MPL_CFLAGS) \
$(MX_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
-DPKG_DATA_DIR=\"$(pkgdatadir)\" \
-DLIBEXECDIR=\"$(libexecdir)\"
libcarrick_la_LIBADD = $(GTK_LIBS) \
- $(MPL_LIBS) \
+ $(GCONF_LIBS) \
+ $(MPL_LIBS) \
$(MX_LIBS) \
$(LIBNOTIFY_LIBS)
DISTCLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = connman-marshal.list connman-manager.xml connman-service.xml
+EXTRA_DIST = connman-marshal.list \
+ connman-manager.xml \
+ connman-service.xml \
+ connman-technology.xml
+
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
--- carrick/carrick-icon-factory.c
+++ carrick/carrick-icon-factory.c
@@ -56,7 +56,9 @@
PKG_ICON_DIR "/" "network-bluetooth-strong.png",
PKG_ICON_DIR "/" "network-bluetooth-strong-hover.png",
PKG_ICON_DIR "/" "network-bluetooth-weak.png",
- PKG_ICON_DIR "/" "network-bluetooth-weak-hover.png"
+ PKG_ICON_DIR "/" "network-bluetooth-weak-hover.png",
+ PKG_ICON_DIR "/" "network-vpn.png",
+ PKG_ICON_DIR "/" "network-vpn-hover.png"
};
/* Keep in sync with CarrickIconState. */
@@ -87,6 +89,10 @@
"bluetooth-strong", /* ICON_BLUETOOTH_STRONG_HOVER */
"bluetooth-weak", /* ICON_BLUETOOTH_WEAK */
"bluetooth-weak", /* ICON_BLUETOOTH_WEAK_HOVER */
+
+ /* FIXME: hack because could not get vpn icon in time */
+ "active", /* ICON_VPN */
+ "active", /* ICON_VPN_HOVER */
NULL
};
@@ -118,6 +124,8 @@
GdkPixbuf *bluetooth_strong_hov_img;
GdkPixbuf *bluetooth_weak_img;
GdkPixbuf *bluetooth_weak_hov_img;
+ GdkPixbuf *vpn_img;
+ GdkPixbuf *vpn_hov_img;
};
static void
@@ -249,6 +257,10 @@
return ICON_3G_STRONG_HOVER;
}
}
+ else if (g_str_equal (connection_type, "vpn"))
+ {
+ return ICON_VPN_HOVER;
+ }
return ICON_ERROR;
}
@@ -523,6 +535,42 @@
icon = priv->bluetooth_weak_hov_img;
break;
+ case ICON_VPN:
+ if (!priv->vpn_img)
+ {
+ priv->vpn_img =
+ gdk_pixbuf_new_from_file (icon_names[state],
+ &error);
+ /* FIXME: Workaround for missing icon */
+ if (error)
+ {
+ g_clear_error (&error);
+ priv->vpn_img =
+ gdk_pixbuf_new_from_file (icon_names[ICON_ACTIVE],
+ &error);
+ }
+ }
+ icon = priv->vpn_img;
+ break;
+
+ case ICON_VPN_HOVER:
+ if (!priv->vpn_hov_img)
+ {
+ priv->vpn_hov_img =
+ gdk_pixbuf_new_from_file (icon_names[state],
+ &error);
+ /* FIXME: Workaround for missing icon */
+ if (error)
+ {
+ g_clear_error (&error);
+ priv->vpn_hov_img =
+ gdk_pixbuf_new_from_file (icon_names[ICON_ACTIVE_HOVER],
+ &error);
+ }
+ }
+ icon = priv->vpn_hov_img;
+ break;
+
default:
if (!priv->error_img)
{
@@ -534,7 +582,7 @@
break;
}
- if (icon == NULL || error)
+ if (error)
{
g_warning (G_STRLOC ":error opening pixbuf: %s",
error->message);
--- carrick/carrick-icon-factory.h
+++ carrick/carrick-icon-factory.h
@@ -75,7 +75,9 @@
ICON_BLUETOOTH_STRONG,
ICON_BLUETOOTH_STRONG_HOVER,
ICON_BLUETOOTH_WEAK,
- ICON_BLUETOOTH_WEAK_HOVER
+ ICON_BLUETOOTH_WEAK_HOVER,
+ ICON_VPN,
+ ICON_VPN_HOVER
} CarrickIconState;
typedef struct _CarrickIconFactory CarrickIconFactory;
--- carrick/carrick-list.c
+++ carrick/carrick-list.c
@@ -31,12 +31,6 @@
#include "carrick-service-item.h"
-#define CARRICK_DRAG_TARGET "CARRICK_DRAG_TARGET"
-
-static const GtkTargetEntry carrick_targets[] = {
- { CARRICK_DRAG_TARGET, GTK_TARGET_SAME_APP, 0 },
-};
-
G_DEFINE_TYPE (CarrickList, carrick_list, GTK_TYPE_SCROLLED_WINDOW)
#define LIST_PRIVATE(o) \
@@ -49,6 +43,10 @@
GtkWidget *drag_window;
GtkWidget *fallback;
+ GtkWidget *active_item;
+ double active_item_rel_pos;
+ int active_item_height;
+
guint drag_position;
guint drop_position;
@@ -71,9 +69,6 @@
gboolean have_threeg;
gboolean have_wimax;
gboolean have_bluetooth;
-
- guint enabled_count;
- guint available_count;
};
enum {
@@ -85,6 +80,7 @@
static void carrick_list_set_model (CarrickList *list, CarrickNetworkModel *model);
static void carrick_list_add (CarrickList *list, GtkTreePath *path);
+static void carrick_list_update_fallback (CarrickList *self);
static void
carrick_list_get_property (GObject *object, guint property_id,
@@ -160,6 +156,8 @@
CarrickListPrivate *priv = list->priv;
gint x, y;
+ carrick_service_item_set_active (CARRICK_SERVICE_ITEM (widget), FALSE);
+
/* save old place in list for drag-failures */
gtk_container_child_get (GTK_CONTAINER (priv->box),
widget,
@@ -189,20 +187,10 @@
{
CarrickListPrivate *priv = list->priv;
- /* find drop position in list */
- if (widget == GTK_WIDGET (priv->box))
- {
- /* dropped on "empty" space on list */
- priv->drop_position = -1;
- }
- else
- {
- /* dropped on a list item */
- gtk_container_child_get (GTK_CONTAINER (priv->box),
- widget,
- "position", &priv->drop_position,
- NULL);
- }
+ gtk_container_child_get (GTK_CONTAINER (priv->box),
+ widget,
+ "position", &priv->drop_position,
+ NULL);
gtk_drag_finish (context, TRUE, TRUE, time);
return TRUE;
@@ -242,7 +230,6 @@
{
CarrickListPrivate *priv = list->priv;
GList *children;
- gboolean pos_changed;
children = gtk_container_get_children (GTK_CONTAINER (priv->box));
@@ -260,16 +247,7 @@
priv->drop_position);
g_object_unref (widget);
- if (priv->drop_position == -1)
- {
- pos_changed = priv->drag_position != g_list_length (children);
- }
- else
- {
- pos_changed = priv->drop_position != priv->drag_position;
- }
-
- if (pos_changed)
+ if (priv->drop_position != priv->drag_position)
{
GtkWidget *other_widget;
DBusGProxy *service, * other_service;
@@ -282,8 +260,6 @@
data->item = widget;
data->pos = priv->drag_position;
- /* TODO: should ensure favorite status for one or both services ? */
- /* TODO: should do both move_before() and move_after() if possible ? */
if (priv->drop_position == 0)
{
other_widget = g_list_nth_data (children, 0);
@@ -298,16 +274,8 @@
}
else
{
- if (priv->drop_position == -1)
- {
- /* dropped below last child */
- other_widget = g_list_last (children)->data;
- }
- else
- {
- other_widget = g_list_nth_data (children,
- priv->drop_position - 1);
- }
+ other_widget = g_list_nth_data (children,
+ priv->drop_position - 1);
other_service = carrick_service_item_get_proxy
(CARRICK_SERVICE_ITEM (other_widget));
@@ -333,15 +301,106 @@
}
}
+static gboolean
+_active_item_was_visible (CarrickList *list)
+{
+ CarrickListPrivate *priv = list->priv;
+
+ if (priv->active_item_rel_pos + priv->active_item->allocation.height < 0)
+ return FALSE;
+
+ if (priv->active_item_rel_pos > GTK_WIDGET (list)->allocation.height)
+ return FALSE;
+
+ return TRUE;
+}
+
+/* TODO: its possible that it would make sense to set the adjustment
+ * after the whole list allocation-cycle is done... there is a
+ * potential for a race here */
+static void
+active_item_alloc_cb (GtkWidget *item,
+ GtkAllocation *allocation,
+ CarrickList *list)
+{
+ CarrickListPrivate *priv = list->priv;
+
+ /* Active item moved or expanded: We can autoscroll to keep
+ * it in the same spot on the screen, but we only want that if
+ * the active item is/was visible */
+ if (_active_item_was_visible (list) &&
+ allocation->height >= priv->active_item_height)
+ {
+ int space_below, expand, move = 0;
+
+ /* make sure expanding items are visible */
+ if (allocation->height > priv->active_item_height)
+ {
+ expand = allocation->height - priv->active_item_height;
+ space_below = GTK_WIDGET (list)->allocation.height -
+ (priv->active_item_rel_pos + priv->active_item_height);
+ move = MAX (0, expand - space_below);
+ }
+
+ /* scroll so that A) expanded item is visible and B)
+ * the items position relative to screen stays the same */
+ gtk_adjustment_set_value (priv->adjustment,
+ allocation->y - priv->active_item_rel_pos + move);
+ }
+
+ priv->active_item_height = allocation->height;
+}
+
+static void
+_adjustment_value_changed_cb (GtkAdjustment *adj, CarrickList *list)
+{
+ CarrickListPrivate *priv = list->priv;
+
+ /* save the position of the active item relative to the adjustment.
+ * This allows us to preserve that position in active_item_alloc_cb() */
+ if (priv->active_item)
+ priv->active_item_rel_pos = priv->active_item->allocation.y -
+ gtk_adjustment_get_value (adj);
+}
+
+/* called when a ServiceItem signals it is active or when
+ * the active ServiceItem is removed from list*/
+static void
+_set_active_item (CarrickList *list, GtkWidget *item)
+{
+ CarrickListPrivate *priv = list->priv;
+
+ if (priv->active_item)
+ g_signal_handlers_disconnect_by_func (priv->active_item,
+ active_item_alloc_cb,
+ list);
+
+ priv->active_item = item;
+ if (priv->active_item)
+ {
+ priv->active_item_rel_pos = priv->active_item->allocation.y -
+ gtk_adjustment_get_value (priv->adjustment);
+ priv->active_item_height = priv->active_item->allocation.height;
+ g_signal_connect (priv->active_item, "size-allocate",
+ G_CALLBACK (active_item_alloc_cb), list);
+ }
+}
+
+
static void
-_list_active_changed (GtkWidget *item,
- GtkWidget *list)
+_item_active_changed (GtkWidget *item,
+ GParamSpec *pspec,
+ GtkWidget *list)
{
CarrickListPrivate *priv = LIST_PRIVATE (list);
- gtk_container_foreach (GTK_CONTAINER (priv->box),
- (GtkCallback) _list_collapse_inactive_items,
- item);
+ if (carrick_service_item_get_active (CARRICK_SERVICE_ITEM (item)))
+ {
+ gtk_container_foreach (GTK_CONTAINER (priv->box),
+ (GtkCallback) _list_collapse_inactive_items,
+ item);
+ _set_active_item (CARRICK_LIST (list), item);
+ }
}
typedef struct find_data
@@ -400,13 +459,15 @@
void
-carrick_list_set_all_inactive (CarrickList *list)
+carrick_list_clear_state (CarrickList *list)
{
CarrickListPrivate *priv = list->priv;
gtk_container_foreach (GTK_CONTAINER (priv->box),
(GtkCallback) _set_item_inactive,
NULL);
+ gtk_adjustment_set_value (priv->adjustment,
+ gtk_adjustment_get_lower (priv->adjustment));
}
void
@@ -479,11 +540,14 @@
g_return_if_fail (item != NULL);
g_return_if_fail (user_data != NULL);
+ CarrickList *list = CARRICK_LIST (user_data);
CarrickServiceItem *service_item = CARRICK_SERVICE_ITEM (item);
GtkTreeRowReference *row = carrick_service_item_get_row_reference (service_item);
if (gtk_tree_row_reference_valid (row) == FALSE)
{
+ if (list->priv->active_item == item)
+ _set_active_item (list, NULL);
gtk_widget_destroy (item);
}
}
@@ -493,7 +557,8 @@
GtkTreePath *path,
gpointer user_data)
{
- CarrickListPrivate *priv = CARRICK_LIST (user_data)->priv;
+ CarrickList *self = user_data;
+ CarrickListPrivate *priv = self->priv;
GtkTreeIter iter;
/* If the model is empty, delete all widgets and show some fallback content */
@@ -502,7 +567,9 @@
gtk_container_foreach (GTK_CONTAINER (priv->box),
(GtkCallback)gtk_widget_destroy,
NULL);
- carrick_list_set_fallback (CARRICK_LIST (user_data));
+ carrick_list_update_fallback (self);
+ gtk_widget_show (priv->fallback);
+ _set_active_item (self, NULL);
}
else
{
@@ -510,7 +577,7 @@
* and destroy */
gtk_container_foreach (GTK_CONTAINER (priv->box),
_find_and_remove,
- path);
+ user_data);
}
}
@@ -603,6 +670,111 @@
}
static void
+list_update_property (const gchar *property,
+ GValue *value,
+ gpointer user_data)
+{
+ CarrickList *list = user_data;
+ CarrickListPrivate *priv = list->priv;
+
+ if (g_str_equal (property, "OfflineMode"))
+ {
+ priv->offline_mode = g_value_get_boolean (value);
+ }
+ else if (g_str_equal (property, "AvailableTechnologies"))
+ {
+ gchar **tech = g_value_get_boxed (value);
+ gint i;
+
+ priv->have_wifi = FALSE;
+ priv->have_ethernet = FALSE;
+ priv->have_threeg = FALSE;
+ priv->have_wimax = FALSE;
+ priv->have_bluetooth = FALSE;
+
+ for (i = 0; i < g_strv_length (tech); i++)
+ {
+ if (g_str_equal ("wifi", *(tech + i)))
+ priv->have_wifi = TRUE;
+ else if (g_str_equal ("wimax", *(tech + i)))
+ priv->have_wimax = TRUE;
+ else if (g_str_equal ("bluetooth", *(tech + i)))
+ priv->have_bluetooth = TRUE;
+ else if (g_str_equal ("cellular", *(tech + i)))
+ priv->have_threeg = TRUE;
+ else if (g_str_equal ("ethernet", *(tech + i)))
+ priv->have_ethernet = TRUE;
+ }
+ }
+ else if (g_str_equal (property, "EnabledTechnologies"))
+ {
+ gchar **tech = g_value_get_boxed (value);
+ gint i;
+
+ priv->wifi_enabled = FALSE;
+ priv->ethernet_enabled = FALSE;
+ priv->threeg_enabled = FALSE;
+ priv->wimax_enabled = FALSE;
+ priv->bluetooth_enabled = FALSE;
+
+ for (i = 0; i < g_strv_length (tech); i++)
+ {
+ if (g_str_equal ("wifi", *(tech + i)))
+ priv->wifi_enabled = TRUE;
+ else if (g_str_equal ("wimax", *(tech + i)))
+ priv->wimax_enabled = TRUE;
+ else if (g_str_equal ("bluetooth", *(tech + i)))
+ priv->bluetooth_enabled = TRUE;
+ else if (g_str_equal ("cellular", *(tech + i)))
+ priv->threeg_enabled = TRUE;
+ else if (g_str_equal ("ethernet", *(tech + i)))
+ priv->ethernet_enabled = TRUE;
+ }
+ }
+}
+
+static void
+_mngr_property_changed_cb (DBusGProxy *manager,
+ const gchar *property,
+ GValue *value,
+ CarrickList *list)
+{
+ list_update_property (property, value, list);
+
+ if (GTK_WIDGET_VISIBLE (list->priv->fallback))
+ carrick_list_update_fallback (list);
+}
+
+static void
+_mngr_get_properties_cb (DBusGProxy *manager,
+ GHashTable *properties,
+ GError *error,
+ gpointer user_data)
+{
+ CarrickList *list = user_data;
+ CarrickListPrivate *priv = list->priv;
+
+ if (error)
+ {
+ g_debug ("Error when ending GetProperties call: %s",
+ error->message);
+ g_error_free (error);
+
+ priv->have_daemon = FALSE;
+ }
+ else
+ {
+ priv->have_daemon = TRUE;
+ g_hash_table_foreach (properties,
+ (GHFunc) list_update_property,
+ list);
+ g_hash_table_unref (properties);
+ }
+
+ carrick_list_update_fallback (list);
+}
+
+static void
carrick_list_set_model (CarrickList *list,
CarrickNetworkModel *model)
{
@@ -629,8 +801,21 @@
if (model)
{
+ DBusGProxy *manager;
+
priv->model = g_object_ref (model);
+ /* Keep track of OfflineMode, AvailableTechnologies and
+ * EnabledTechnologies using connman.Manager */
+ manager = carrick_network_model_get_proxy (priv->model);
+ dbus_g_proxy_connect_signal (manager,
+ "PropertyChanged",
+ G_CALLBACK (_mngr_property_changed_cb),
+ list, NULL);
+ org_moblin_connman_Manager_get_properties_async (manager,
+ _mngr_get_properties_cb,
+ list);
+
gtk_tree_model_foreach (GTK_TREE_MODEL (model),
_create_service_item,
NULL);
@@ -775,37 +960,19 @@
gtk_widget_show (widget);
- /* Define the service item as a drag source.
- * Note: DnD will not work in mutter-moblin until MB #5499 is fixed
- * http://bugzilla.moblin.org/show_bug.cgi?id=5499
- */
-
- carrick_service_item_set_draggable (CARRICK_SERVICE_ITEM (widget), TRUE);
- gtk_drag_source_set (widget,
- GDK_BUTTON1_MASK,
- carrick_targets,
- G_N_ELEMENTS (carrick_targets),
- GDK_ACTION_MOVE);
-
- g_signal_connect (widget,
- "drag-begin",
- G_CALLBACK (carrick_list_drag_begin),
- list);
- g_signal_connect (widget,
- "drag-motion",
- G_CALLBACK (carrick_list_drag_motion),
- list);
- g_signal_connect (widget,
- "drag-end",
- G_CALLBACK (carrick_list_drag_end),
- list);
- /* Define the service as a drag destination */
-
- gtk_drag_dest_set (widget,
- GTK_DEST_DEFAULT_ALL,
- carrick_targets,
- G_N_ELEMENTS (carrick_targets),
- GDK_ACTION_MOVE);
+
+ g_signal_connect (widget,
+ "drag-begin",
+ G_CALLBACK (carrick_list_drag_begin),
+ list);
+ g_signal_connect (widget,
+ "drag-motion",
+ G_CALLBACK (carrick_list_drag_motion),
+ list);
+ g_signal_connect (widget,
+ "drag-end",
+ G_CALLBACK (carrick_list_drag_end),
+ list);
g_signal_connect (widget,
"drag-drop",
@@ -814,8 +981,8 @@
/* listen to activate so we can deactivate other items in list */
g_signal_connect (widget,
- "activate",
- G_CALLBACK (_list_active_changed),
+ "notify::active",
+ G_CALLBACK (_item_active_changed),
list);
gtk_box_pack_start (GTK_BOX (priv->box),
@@ -830,30 +997,49 @@
static void
-_set_and_show_fallback (CarrickList *self)
+_append_tech_string (GString *technologies, char *tech, gboolean last)
{
- CarrickListPrivate *priv = self->priv;
- gchar *fallback = NULL;
- /*
- * Translator note: The disabled technologies available to be turned on is put together at
+ /* Translator note: The disabled technologies available to be turned on is put together at
* runtime.
- * The conjunction 'or' will be at the end of a choice of disabled technologies,
- * for example 'WiFi, WiMAX or 3G.
- */
+ * The conjunction ' or ' will be at the end of a choice of disabled technologies,
+ * for example 'You could try enabling WiFi, WiMAX or 3G'.
+ * Note that you need to include spaces on both sides of the word/phrase
+ * here -- unless you want it joined with previous or next word. */
gchar *conjunction = _(" or ");
- /*
- * Translator note: the comma ',' will be used to join the different disabled technologies
- * as in the above example; 'WiFi, WiMAX or 3G'
- */
+
+ /* Translator note: the comma ', ' will be used to join the different
+ * disabled technologies as in the example:
+ * 'You could try enabling WiFi, WiMAX or 3G'
+ * Note that you need to include spaces in the string, unless you
+ * want the words to appear right next to the comma. */
gchar *comma = _(", ");
+
+ if (technologies->len == 0)
+ g_string_append (technologies, tech);
+ else if (!last)
+ g_string_append_printf (technologies, "%s%s",
+ comma, tech);
+ else
+ g_string_append_printf (technologies, "%s%s",
+ conjunction, tech);
+}
+
+static void
+carrick_list_update_fallback (CarrickList *self)
+{
+ CarrickListPrivate *priv = self->priv;
+ gchar *fallback = NULL;
+ GString *technologies = NULL;
+ guint count = 0;
+
+ /* Translator note: these technology names will be used in forming
+ * sentences like : 'You could try enabling WiFi, WiMAX or 3G'
+ */
gchar *ethernet = _("wired");
gchar *wifi = _("WiFi");
gchar *wimax = _("WiMAX");
gchar *cellular = _("3G");
gchar *bluetooth = _("Bluetooth");
- GString *technologies = NULL;
- guint count = 0;
- gboolean processed_first = FALSE;
/* Need to add some fall-back content */
if (!priv->have_daemon)
@@ -883,130 +1069,45 @@
(priv->have_wimax && !priv->wimax_enabled) ||
(priv->have_bluetooth && !priv->bluetooth_enabled))
{
+ guint available, enabled;
+
/* How many strings we're joining */
- count = priv->available_count - priv->enabled_count;
- technologies = g_string_new (" ");
- processed_first = FALSE;
+ available = priv->have_wifi + priv->have_ethernet +
+ priv->have_threeg + priv->have_wimax +
+ priv->have_bluetooth;
+ enabled = priv->wifi_enabled + priv->ethernet_enabled +
+ priv->threeg_enabled + priv->wimax_enabled +
+ priv->bluetooth_enabled;
+ count = available - enabled;
+ technologies = g_string_new (NULL);
if (priv->have_wifi && !priv->wifi_enabled)
{
- if (count > 1)
- {
- g_string_append_printf (technologies,
- "%s%s",
- wifi,
- comma);
- }
- else
- {
- g_string_append (technologies,
- wifi);
- }
- processed_first = TRUE;
+ _append_tech_string (technologies, wifi, count == 1);
count--;
}
if (priv->have_wimax && !priv->wimax_enabled)
{
- if (!processed_first)
- {
- g_string_append (technologies,
- wimax);
- processed_first = TRUE;
- }
- else if (count > 1)
- {
- g_string_append_printf (technologies,
- "%s%s",
- wimax,
- comma);
- }
- else
- {
- g_string_append_printf (technologies,
- "%s%s",
- conjunction,
- wimax);
- }
-
+ _append_tech_string (technologies, wimax, count == 1);
count--;
}
if (priv->have_threeg && !priv->threeg_enabled)
{
- if (!processed_first)
- {
- g_string_append (technologies,
- cellular);
- processed_first = TRUE;
- }
- else if (count > 1)
- {
- g_string_append_printf (technologies,
- "%s%s",
- cellular,
- comma);
- }
- else
- {
- g_string_append_printf (technologies,
- "%s%s",
- conjunction,
- cellular);
- }
-
+ _append_tech_string (technologies, cellular, count == 1);
count--;
}
if (priv->have_bluetooth && !priv->bluetooth_enabled)
{
- if (!processed_first)
- {
- g_string_append (technologies,
- bluetooth);
- processed_first = TRUE;
- }
- else if (count > 1)
- {
- g_string_append_printf (technologies,
- "%s%s",
- bluetooth,
- comma);
- }
- else
- {
- g_string_append_printf (technologies,
- "%s%s",
- conjunction,
- bluetooth);
- }
-
+ _append_tech_string (technologies, bluetooth, count == 1);
count--;
}
if (priv->have_ethernet && !priv->ethernet_enabled)
{
- if (!processed_first)
- {
- g_string_append (technologies,
- ethernet);
- processed_first = TRUE;
- }
- else if (count > 1)
- {
- g_string_append_printf (technologies,
- "%s%s",
- ethernet,
- comma);
- }
- else
- {
- g_string_append_printf (technologies,
- "%s%s",
- conjunction,
- ethernet);
- }
-
+ _append_tech_string (technologies, ethernet, count == 1);
count--;
}
@@ -1028,162 +1129,9 @@
}
gtk_label_set_text (GTK_LABEL (priv->fallback), fallback);
-
- if (fallback)
- gtk_widget_show (priv->fallback);
-
g_free (fallback);
}
-static void
-list_update_property (const gchar *property,
- GValue *value,
- gpointer user_data)
-{
- CarrickList *list = user_data;
- CarrickListPrivate *priv = list->priv;
- gboolean state_changed = FALSE;
-
- if (g_str_equal (property, "OfflineMode"))
- {
- priv->offline_mode = g_value_get_boolean (value);
- state_changed = TRUE;
- }
- else if (g_str_equal (property, "AvailableTechnologies"))
- {
- gchar **tech = g_value_get_boxed (value);
- gint i;
-
- priv->have_wifi = FALSE;
- priv->have_ethernet = FALSE;
- priv->have_threeg = FALSE;
- priv->have_wimax = FALSE;
- priv->have_bluetooth = FALSE;
- priv->available_count = 0;
-
- for (i = 0; i < g_strv_length (tech); i++)
- {
- if (g_str_equal ("wifi", *(tech + i)))
- {
- priv->have_wifi = TRUE;
- priv->available_count ++;
- }
- else if (g_str_equal ("wimax", *(tech + i)))
- {
- priv->have_wimax = TRUE;
- priv->available_count ++;
- }
- else if (g_str_equal ("bluetooth", *(tech + i)))
- {
- priv->have_bluetooth = TRUE;
- priv->available_count ++;
- }
- else if (g_str_equal ("cellular", *(tech + i)))
- {
- priv->have_threeg = TRUE;
- priv->available_count ++;
- }
- else if (g_str_equal ("ethernet", *(tech + i)))
- {
- priv->have_ethernet = TRUE;
- priv->available_count ++;
- }
- }
- state_changed = TRUE;
- }
- else if (g_str_equal (property, "EnabledTechnologies"))
- {
- gchar **tech = g_value_get_boxed (value);
- gint i;
-
- priv->wifi_enabled = FALSE;
- priv->ethernet_enabled = FALSE;
- priv->threeg_enabled = FALSE;
- priv->wimax_enabled = FALSE;
- priv->bluetooth_enabled = FALSE;
- priv->enabled_count = 0;
-
- for (i = 0; i < g_strv_length (tech); i++)
- {
- if (g_str_equal ("wifi", *(tech + i)))
- {
- priv->wifi_enabled = TRUE;
- priv->enabled_count ++;
- }
- else if (g_str_equal ("wimax", *(tech + i)))
- {
- priv->wimax_enabled = TRUE;
- priv->enabled_count ++;
- }
- else if (g_str_equal ("bluetooth", *(tech + i)))
- {
- priv->bluetooth_enabled = TRUE;
- priv->enabled_count ++;
- }
- else if (g_str_equal ("cellular", *(tech + i)))
- {
- priv->threeg_enabled = TRUE;
- priv->enabled_count ++;
- }
- else if (g_str_equal ("ethernet", *(tech + i)))
- {
- priv->ethernet_enabled = TRUE;
- priv->enabled_count ++;
- }
- }
- state_changed = TRUE;
- }
-
- if (state_changed)
- {
- _set_and_show_fallback (list);
- }
-}
-
-static void
-list_get_properties_cb (DBusGProxy *manager,
- GHashTable *properties,
- GError *error,
- gpointer user_data)
-{
- CarrickList *list = user_data;
- CarrickListPrivate *priv = list->priv;
-
- if (error)
- {
- g_debug ("Error when ending GetProperties call: %s",
- error->message);
- g_error_free (error);
-
- priv->have_daemon = FALSE;
- _set_and_show_fallback (list);
- }
- else
- {
- priv->have_daemon = TRUE;
- g_hash_table_foreach (properties,
- (GHFunc) list_update_property,
- list);
- g_hash_table_unref (properties);
- }
-}
-
-void
-carrick_list_set_fallback (CarrickList *list)
-{
- CarrickListPrivate *priv = list->priv;
- DBusGProxy *manager = carrick_network_model_get_proxy (priv->model);
-
- /*
- * Make D-Bus calls to determine whether there's a reason that we have no
- * content. If so, set the fallback label.
- */
- org_moblin_connman_Manager_get_properties_async
- (manager,
- list_get_properties_cb,
- list);
-}
-
static GObject *
carrick_list_constructor (GType gtype,
guint n_properties,
@@ -1201,6 +1149,8 @@
priv->adjustment = gtk_scrolled_window_get_vadjustment
(GTK_SCROLLED_WINDOW (obj));
+ g_signal_connect (priv->adjustment, "value-changed",
+ G_CALLBACK (_adjustment_value_changed_cb), obj);
viewport = gtk_viewport_new (gtk_scrolled_window_get_hadjustment
(GTK_SCROLLED_WINDOW (obj)),
gtk_scrolled_window_get_vadjustment
@@ -1216,14 +1166,13 @@
gtk_container_add (GTK_CONTAINER (viewport),
box);
- priv->fallback = gtk_label_new ("");
gtk_label_set_line_wrap (GTK_LABEL (priv->fallback),
TRUE);
gtk_widget_set_size_request (priv->fallback,
550,
-1);
- gtk_misc_set_padding (GTK_MISC (priv->fallback), 0, 12);
gtk_widget_show (priv->fallback);
+ gtk_misc_set_padding (GTK_MISC (priv->fallback), 0, 12);
gtk_box_pack_start (GTK_BOX (box), priv->fallback,
FALSE, FALSE, 2);
@@ -1231,18 +1180,6 @@
gtk_container_add (GTK_CONTAINER (box),
priv->box);
- /* add a drag target for dropping below any real
- items in the list*/
- gtk_drag_dest_set (GTK_WIDGET (priv->box),
- GTK_DEST_DEFAULT_ALL,
- carrick_targets,
- G_N_ELEMENTS (carrick_targets),
- GDK_ACTION_MOVE);
- g_signal_connect (priv->box,
- "drag-drop",
- G_CALLBACK (carrick_list_drag_drop),
- obj);
-
return obj;
}
@@ -1295,7 +1232,7 @@
priv = self->priv = LIST_PRIVATE (self);
- priv->fallback = NULL;
+ priv->fallback = gtk_label_new ("");
priv->have_daemon = FALSE;
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (self),
--- carrick/carrick-list.h
+++ carrick/carrick-list.h
@@ -74,7 +74,7 @@
CarrickNotificationManager *notifications,
CarrickNetworkModel *model);
-void carrick_list_set_all_inactive (CarrickList *list);
+void carrick_list_clear_state (CarrickList *list);
void carrick_list_set_icon_factory (CarrickList *list,
CarrickIconFactory *icon_factory);
@@ -84,8 +84,6 @@
CarrickNotificationManager *notification_manager);
CarrickNotificationManager *carrick_list_get_notification_manager (CarrickList *list);
-void carrick_list_set_fallback (CarrickList *list);
-
G_END_DECLS
#endif /* _CARRICK_LIST_H */
--- carrick/carrick-network-model.c
+++ carrick/carrick-network-model.c
@@ -120,6 +120,8 @@
G_TYPE_STRING, /* manually configured gateway */
G_TYPE_STRV, /* name servers */
G_TYPE_STRV, /* manually configured name servers */
+ G_TYPE_BOOLEAN, /* immutable */
+ G_TYPE_BOOLEAN, /* login_required */
};
gtk_list_store_set_column_types (GTK_LIST_STORE (self),
@@ -274,6 +276,8 @@
const gchar **nameservers = NULL;
const gchar **config_nameservers = NULL;
const gchar *passphrase = NULL;
+ gboolean immutable = FALSE;
+ gboolean login_required = FALSE;
GValue *value;
GtkTreeIter iter;
@@ -312,12 +316,9 @@
if (value)
passphrase_required = g_value_get_boolean (value);
- if (passphrase_required)
- {
- value = g_hash_table_lookup (properties, "Passphrase");
- if (value)
- passphrase = g_value_get_string (value);
- }
+ value = g_hash_table_lookup (properties, "Passphrase");
+ if (value)
+ passphrase = g_value_get_string (value);
value = g_hash_table_lookup (properties, "SetupRequired");
if (value)
@@ -377,6 +378,14 @@
if (value)
config_nameservers = g_value_get_boxed (value);
+ value = g_hash_table_lookup (properties, "Immutable");
+ if (value)
+ immutable = g_value_get_boolean (value);
+
+ value = g_hash_table_lookup (properties, "LoginRequired");
+ if (value)
+ login_required = g_value_get_boolean (value);
+
if (network_model_have_service_by_proxy (store,
&iter,
service))
@@ -401,6 +410,8 @@
CARRICK_COLUMN_CONFIGURED_GATEWAY, config_gateway,
CARRICK_COLUMN_NAMESERVERS, nameservers,
CARRICK_COLUMN_CONFIGURED_NAMESERVERS, config_nameservers,
+ CARRICK_COLUMN_IMMUTABLE, immutable,
+ CARRICK_COLUMN_LOGIN_REQUIRED, login_required,
-1);
}
else
@@ -427,12 +438,27 @@
CARRICK_COLUMN_CONFIGURED_GATEWAY, config_gateway,
CARRICK_COLUMN_NAMESERVERS, nameservers,
CARRICK_COLUMN_CONFIGURED_NAMESERVERS, config_nameservers,
+ CARRICK_COLUMN_IMMUTABLE, immutable,
+ CARRICK_COLUMN_LOGIN_REQUIRED, login_required,
-1);
}
}
}
static void
+remove_provider_cb (DBusGProxy *proxy,
+ GError *error,
+ gpointer data)
+{
+ if (error)
+ {
+ g_debug ("Error on RemoveProvider: %s", error->message);
+ g_error_free (error);
+ return;
+ }
+}
+
+static void
network_model_service_changed_cb (DBusGProxy *service,
const gchar *property,
GValue *value,
@@ -450,9 +476,29 @@
if (g_str_equal (property, "State"))
{
+ const char *type, *state;
+ DBusGProxy *service_proxy;
+
+ /* HACK: connman (0.61) vpn handling is not consistent, so we
+ * remove the provider on idle (otherwise it'll just hang there).
+ * But: set the state first, so notifications etc happen. */
+
+ state = g_value_get_string (value);
gtk_list_store_set (store, &iter,
- CARRICK_COLUMN_STATE, g_value_get_string (value),
+ CARRICK_COLUMN_STATE, state,
-1);
+
+ gtk_tree_model_get (GTK_TREE_MODEL (store), &iter,
+ CARRICK_COLUMN_TYPE, &type,
+ CARRICK_COLUMN_PROXY, &service_proxy,
+ -1);
+ if (g_strcmp0 (type, "vpn") == 0 &&
+ (g_strcmp0 (state, "idle") == 0 ||
+ g_strcmp0 (state, "failure") == 0))
+ org_moblin_connman_Manager_remove_provider_async (self->priv->manager,
+ dbus_g_proxy_get_path (service),
+ remove_provider_cb,
+ self);
}
else if (g_str_equal (property, "Favorite"))
{
@@ -603,6 +649,18 @@
g_value_get_boxed (value),
-1);
}
+ else if (g_str_equal (property, "Immutable"))
+ {
+ gtk_list_store_set (store, &iter,
+ CARRICK_COLUMN_IMMUTABLE, g_value_get_boolean (value),
+ -1);
+ }
+ else if (g_str_equal (property, "LoginRequired"))
+ {
+ gtk_list_store_set (store, &iter,
+ CARRICK_COLUMN_LOGIN_REQUIRED, g_value_get_boolean (value),
+ -1);
+ }
}
static void
--- carrick/carrick-network-model.h
+++ carrick/carrick-network-model.h
@@ -81,6 +81,8 @@
CARRICK_COLUMN_CONFIGURED_GATEWAY,
CARRICK_COLUMN_NAMESERVERS,
CARRICK_COLUMN_CONFIGURED_NAMESERVERS,
+ CARRICK_COLUMN_IMMUTABLE,
+ CARRICK_COLUMN_LOGIN_REQUIRED,
};
struct _CarrickNetworkModel
--- carrick/carrick-notification-manager.c
+++ carrick/carrick-notification-manager.c
@@ -43,11 +43,19 @@
gchar *last_name;
gchar *last_state;
+ /* if we get a notification that matches the queued one, don't show it */
gchar *queued_type;
gchar *queued_name;
- gchar *queued_state;
+ gboolean queued_ready_or_online;
};
+static gboolean
+is_ready_or_online (const char *state)
+{
+ return (g_strcmp0 (state, "ready") == 0 ||
+ g_strcmp0 (state, "online") == 0);
+}
+
void
carrick_notification_manager_queue_event (CarrickNotificationManager *self,
const gchar *type,
@@ -59,8 +67,7 @@
g_free (priv->queued_type);
priv->queued_type = NULL;
- g_free (priv->queued_state);
- priv->queued_state = NULL;
+ priv->queued_ready_or_online = FALSE;
g_free (priv->queued_name);
priv->queued_name = NULL;
@@ -69,7 +76,7 @@
priv->queued_type = g_strdup (type);
if (state)
- priv->queued_state = g_strdup (state);
+ priv->queued_ready_or_online = is_ready_or_online (state);
if (name)
priv->queued_name = g_strdup (name);
@@ -263,7 +270,7 @@
{
message = g_strdup_printf (_ ("Sorry, your %s connection was lost. "
"So we've connected you to a wired network"),
- priv->last_type);
+ util_get_service_type_for_display (priv->last_type));
icon = carrick_icon_factory_get_path_for_state (ICON_ACTIVE);
}
else if (name)
@@ -344,7 +351,6 @@
g_free (priv->last_state);
g_free (priv->queued_type);
g_free (priv->queued_name);
- g_free (priv->queued_state);
G_OBJECT_CLASS (carrick_notification_manager_parent_class)->finalize (object);
}
@@ -370,11 +376,30 @@
self->priv->last_state = NULL;
self->priv->queued_type = NULL;
self->priv->queued_name = NULL;
- self->priv->queued_state = NULL;
notify_init ("Carrick");
}
+static gboolean
+matches_queued (CarrickNotificationManager *self,
+ const char *type, const char *state, const char *name)
+{
+ CarrickNotificationManagerPrivate *priv = self->priv;
+
+ if (g_strcmp0 (type, priv->queued_type) != 0 &&
+ g_strcmp0 ("all", priv->queued_type) != 0)
+ return FALSE;
+
+ if (g_strcmp0 (name, priv->queued_name) != 0 &&
+ g_strcmp0 ("all", priv->queued_name) != 0)
+ return FALSE;
+
+ if (priv->queued_ready_or_online != is_ready_or_online (state))
+ return FALSE;
+
+ return TRUE;
+}
+
void
carrick_notification_manager_notify_event (CarrickNotificationManager *self,
const gchar *type,
@@ -394,27 +419,12 @@
/* Need to handle last events and queued events separately to better maintain
* the systems state */
- if (priv->queued_state)
+ if (priv->queued_type)
{
/* We have a queued event, test to see if that's what happened */
- if (g_strcmp0 (priv->queued_type, "all") == 0 ||
- (g_strcmp0 (priv->queued_type, type) == 0 &&
- g_strcmp0 (priv->queued_state, state) == 0 &&
- g_strcmp0 (priv->queued_name, name) == 0))
- {
- /* Remember the event info */
- g_free (priv->last_state);
- priv->last_state = g_strdup (priv->queued_state);
- g_free (priv->last_type);
- priv->last_type = g_strdup (priv->queued_type);
- g_free (priv->last_name);
- priv->last_name = NULL;
- if (priv->queued_name && g_strcmp0 (priv->queued_name, "all") != 0)
- priv->last_name = g_strdup (priv->queued_name);
-
- /* We've handled this queued event, clear the stored data */
- g_free (priv->queued_state);
- priv->queued_state = NULL;
+ if (matches_queued (self, type, state, name))
+ {
+ priv->queued_ready_or_online = is_ready_or_online (state);
g_free (priv->queued_type);
priv->queued_type = NULL;
g_free (priv->queued_name);
@@ -427,61 +437,55 @@
if (!queue_handled)
{
if (g_strcmp0 (priv->last_type, type) != 0 ||
- (priv->last_name != NULL && g_strcmp0 (priv->last_name, name) != 0))
+ g_strcmp0 (priv->last_name, name) != 0)
{
- /* top service has changed */
- if (g_strcmp0 (state, "ready") == 0 &&
- g_strcmp0 (priv->last_state, "idle") == 0)
- {
- _tell_online (self, name, type, str);
- }
- else if (g_strcmp0 (state, "ready") == 0 &&
- g_strcmp0 (priv->last_state, "ready") == 0
- && g_strcmp0 (name, priv->last_name) != 0)
+ /* new primary service */
+
+ if (!is_ready_or_online(priv->last_state) &&
+ is_ready_or_online (state))
{
if (g_strcmp0 (priv->last_type, "wired") == 0)
- {
- /* Special case ethernet connections.
- * When cable unplugged just tell the user what the
- * new connection is.
- */
- _tell_online (self, name, type, str);
- }
+ /* When cable unplugged just tell the user what the
+ * new connection is. */
+ _tell_online (self, name, type, str);
+ else if (g_strcmp0 (priv->last_type, "vpn") == 0)
+ /* notification system doesn't handle multiple
+ * services too well, this hack prevents weird
+ * notification with vpn */
+ ;
+ else if (priv->note)
+ /* There is a notification already, it should be
+ * a _tell_offline()... */
+ _tell_changed (self, name, type, str);
else
- {
- _tell_changed (self, name, type, str);
- }
+ _tell_online (self, name, type, str);
}
- else if (g_strcmp0 (state, "idle") == 0
- && g_strcmp0 (priv->last_state, "ready") == 0)
+ else if (is_ready_or_online (state))
{
- _tell_offline (self, name, type);
+ _tell_online (self, name, type, str);
}
}
- else if (g_strcmp0 (priv->last_name, name) == 0 &&
- g_strcmp0 (priv->last_state, state) != 0)
+ else if (is_ready_or_online (priv->last_state) !=
+ is_ready_or_online (state))
{
/* service same but state changed */
- if (g_strcmp0 (state, "ready") == 0)
+ if (is_ready_or_online (state))
_tell_online (self, name, type, str);
- else if (g_strcmp0 (state, "idle") == 0)
+ else
_tell_offline (self, name, type);
}
}
/*
- * Stash state in last_*
+ * update saved "last values"
*/
+
g_free (priv->last_state);
priv->last_state = g_strdup (state);
-
- if (g_strcmp0 (state, "ready") == 0)
- {
- g_free (priv->last_type);
- priv->last_type = g_strdup (type);
- g_free (priv->last_name);
- priv->last_name = g_strdup (name);
- }
+ g_free (priv->last_type);
+ priv->last_type = g_strdup (type);
+ g_free (priv->last_name);
+ priv->last_name = g_strdup (name);
}
CarrickNotificationManager *
--- carrick/carrick-pane.c
+++ carrick/carrick-pane.c
@@ -17,7 +17,7 @@
* 02110-1301, USA.
*
* Written by - Joshua Lock <josh at linux.intel.com>
- *
+ * Jussi Kukkonen <jku at linux.intel.com>
*/
#include "carrick-pane.h"
@@ -25,10 +25,12 @@
#include <config.h>
#include <mx-gtk/mx-gtk.h>
#include <glib/gi18n.h>
+#include <gconf/gconf-client.h>
#include <dbus/dbus-glib.h>
#include "connman-marshal.h"
#include "connman-manager-bindings.h"
+#include "connman-technology-bindings.h"
#include "carrick-list.h"
#include "carrick-service-item.h"
@@ -64,6 +66,9 @@
GtkWidget *offline_mode_box;
GtkWidget *service_list;
GtkWidget *new_conn_button;
+ GtkWidget *vpn_box;
+ GtkWidget *vpn_combo;
+
CarrickIconFactory *icon_factory;
time_t last_scan;
gboolean offline_mode;
@@ -78,7 +83,18 @@
gboolean threeg_enabled;
gboolean wimax_enabled;
gboolean bluetooth_enabled;
+
+ GConfClient *gconf;
DBusGProxy *manager;
+
+ /* Technology proxies are needed to get State:Blocked
+ * -- this means a hw or sw rfkill switch */
+ DBusGProxy *wifi_tech;
+ DBusGProxy *wimax_tech;
+ DBusGProxy *bluetooth_tech;
+ DBusGProxy *threeg_tech;
+ DBusGProxy *ethernet_tech;
+
CarrickNotificationManager *notes;
};
@@ -96,6 +112,15 @@
static guint _signals[LAST_SIGNAL] = { 0, };
+#define AUTH_DIALOG LIBEXECDIR"/nm-openconnect-auth-dialog"
+
+enum {
+ COLUMN_VPN_NAME,
+ COLUMN_VPN_UUID,
+ N_VPN_COLUMNS
+};
+
+
static gboolean _wifi_switch_callback (MxGtkLightSwitch *wifi_switch, gboolean new_state, CarrickPane *pane);
static gboolean _ethernet_switch_callback (MxGtkLightSwitch *wifi_switch, gboolean new_state, CarrickPane *pane);
static gboolean _wimax_switch_callback (MxGtkLightSwitch *wifi_switch, gboolean new_state, CarrickPane *pane);
@@ -218,6 +243,11 @@
priv->manager = NULL;
}
+ if (priv->gconf) {
+ g_object_unref (priv->gconf);
+ priv->gconf = NULL;
+ }
+
G_OBJECT_CLASS (carrick_pane_parent_class)->dispose (object);
}
@@ -893,6 +923,103 @@
}
static void
+tech_property_changed_cb (DBusGProxy *proxy,
+ const gchar *property,
+ GValue *value,
+ gpointer data)
+{
+ GtkWidget *tech_switch = GTK_WIDGET (data);
+
+ if (g_strcmp0 (property, "State") == 0)
+ {
+ gboolean blocked;
+
+ blocked = (g_strcmp0 (g_value_get_string (value), "blocked") == 0);
+ gtk_widget_set_sensitive (tech_switch, !blocked);
+ }
+}
+
+static void
+tech_get_properties_cb (DBusGProxy *tech_proxy,
+ GHashTable *properties,
+ GError *error,
+ gpointer data)
+{
+ GtkWidget *tech_switch = GTK_WIDGET (data);
+ GValue *value;
+
+ if (error)
+ {
+ g_debug ("Error when ending Technology.GetProperties call: %s",
+ error->message);
+ g_error_free (error);
+ return;
+ }
+
+ value = g_hash_table_lookup (properties, "State");
+ if (value)
+ {
+ gboolean blocked;
+
+ blocked = (g_strcmp0 (g_value_get_string (value), "blocked") == 0);
+ gtk_widget_set_sensitive (tech_switch, !blocked);
+ }
+}
+
+static DBusGProxy*
+new_tech_proxy (const char *tech, GtkWidget *tech_switch)
+{
+ DBusGProxy *proxy;
+ DBusGConnection *connection;
+ char *path;
+
+ /* default in case something fails when checking tech State */
+ gtk_widget_set_sensitive (tech_switch, TRUE);
+
+ connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
+ if (!connection)
+ return NULL;
+
+ path = g_strdup_printf ("/org/moblin/connman/technology/%s", tech);
+ proxy = dbus_g_proxy_new_for_name (connection,
+ CONNMAN_SERVICE,
+ path,
+ "org.moblin.connman.Technology");
+ g_free (path);
+
+ /* Listen for the D-Bus PropertyChanged signal */
+ dbus_g_proxy_add_signal (proxy,
+ "PropertyChanged",
+ G_TYPE_STRING,
+ G_TYPE_VALUE,
+ G_TYPE_INVALID);
+ dbus_g_proxy_connect_signal (proxy,
+ "PropertyChanged",
+ G_CALLBACK (tech_property_changed_cb),
+ tech_switch,
+ NULL);
+
+ org_moblin_connman_Technology_get_properties_async (proxy,
+ tech_get_properties_cb,
+ tech_switch);
+
+ return proxy;
+}
+
+static void
+unref_tech_proxy (DBusGProxy *proxy, gpointer data)
+{
+ if (proxy)
+ {
+ dbus_g_proxy_disconnect_signal (proxy,
+ "PropertyChanged",
+ G_CALLBACK (tech_property_changed_cb),
+ data);
+ g_object_unref (proxy);
+ }
+}
+
+static void
pane_update_property (const gchar *property,
GValue *value,
gpointer user_data)
@@ -932,27 +1059,50 @@
priv->have_wimax = FALSE;
priv->have_bluetooth = FALSE;
+ unref_tech_proxy (priv->wifi_tech, priv->wifi_switch);
+ priv->wifi_tech = NULL;
+ unref_tech_proxy (priv->wimax_tech, priv->wimax_switch);
+ priv->wimax_tech = NULL;
+ unref_tech_proxy (priv->bluetooth_tech, priv->bluetooth_switch);
+ priv->bluetooth_tech = NULL;
+ unref_tech_proxy (priv->threeg_tech, priv->threeg_switch);
+ priv->threeg_tech = NULL;
+ unref_tech_proxy (priv->ethernet_tech, priv->ethernet_switch);
+ priv->ethernet_tech = NULL;
+
for (i = 0; i < g_strv_length (tech); i++)
{
- if (g_str_equal ("wifi", *(tech + i)))
+ const char *tech_name = (*(tech + i));
+
+ if (g_str_equal ("wifi", tech_name))
{
priv->have_wifi = TRUE;
+ priv->wifi_tech = new_tech_proxy (tech_name,
+ priv->wifi_switch);
}
- else if (g_str_equal ("wimax", *(tech + i)))
+ else if (g_str_equal ("wimax", tech_name))
{
priv->have_wimax = TRUE;
+ priv->wimax_tech = new_tech_proxy (tech_name,
+ priv->wimax_switch);
}
- else if (g_str_equal ("bluetooth", *(tech + i)))
+ else if (g_str_equal ("bluetooth", tech_name))
{
priv->have_bluetooth = TRUE;
+ priv->bluetooth_tech = new_tech_proxy (tech_name,
+ priv->bluetooth_switch);
}
- else if (g_str_equal ("cellular", *(tech + i)))
+ else if (g_str_equal ("cellular", tech_name))
{
priv->have_threeg = TRUE;
+ priv->threeg_tech = new_tech_proxy (tech_name,
+ priv->threeg_switch);
}
- else if (g_str_equal ("ethernet", *(tech + i)))
+ else if (g_str_equal ("ethernet", tech_name))
{
priv->have_ethernet = TRUE;
+ priv->ethernet_tech = new_tech_proxy (tech_name,
+ priv->ethernet_switch);
}
}
@@ -1097,8 +1247,6 @@
gtk_widget_set_visible (priv->wimax_box, FALSE);
gtk_widget_set_visible (priv->wimax_sep, FALSE);
gtk_widget_set_visible (priv->bluetooth_box, FALSE);
-
- carrick_list_set_fallback (CARRICK_LIST (priv->service_list));
}
}
@@ -1139,6 +1287,33 @@
}
static void
+pane_update_vpn_ui (CarrickPane *self,
+ const char *connection_type,
+ const char *connection_state)
+{
+ if (g_strcmp0 (connection_type, "vpn") == 0 &&
+ (g_strcmp0 (connection_state, "online") == 0 ||
+ g_strcmp0 (connection_state, "ready") == 0 ||
+ g_strcmp0 (connection_state, "configuration") == 0 ||
+ g_strcmp0 (connection_state, "association") == 0))
+ {
+ /* there is a VPN connection already */
+ gtk_widget_set_sensitive (self->priv->vpn_box, FALSE);
+ }
+ else if (g_strcmp0 (connection_type, "vpn") != 0 &&
+ (g_strcmp0 (connection_state, "online") == 0 ||
+ g_strcmp0 (connection_state, "ready") == 0))
+ {
+ /* there is a network connection */
+ gtk_widget_set_sensitive (self->priv->vpn_box, TRUE);
+ }
+ else
+ {
+ gtk_widget_set_sensitive (self->priv->vpn_box, FALSE);
+ }
+}
+
+static void
model_emit_change (GtkTreeModel *tree_model,
GtkTreeIter *iter,
CarrickPane *self)
@@ -1175,6 +1350,8 @@
connection_state,
connection_name,
strength);
+
+ pane_update_vpn_ui (self, connection_type, connection_state);
}
static void
@@ -1213,17 +1390,16 @@
GtkTreeIter *iter,
CarrickPane *self)
{
- GtkTreePath *first;
+ guint index;
- /* Emit signal if connection is first in the model -- means the active one.
- * This could probably be done nicer, maybe by using the INDEX column? */
- first = gtk_tree_path_new_first ();
- if (0 == gtk_tree_path_compare (first, path)) {
+ gtk_tree_model_get (tree_model, iter,
+ CARRICK_COLUMN_INDEX, &index,
+ -1);
+ if (index == 0) {
model_emit_change (tree_model,
iter,
self);
}
- gtk_tree_path_free (first);
}
static void
@@ -1289,6 +1465,292 @@
}
static void
+connect_provider_cb (DBusGProxy *proxy,
+ gchar *service,
+ GError *error,
+ gpointer data)
+{
+ if (error)
+ {
+ g_debug ("Error when ending call: %s", error->message);
+ g_error_free (error);
+ return;
+ }
+
+ carrick_shell_show ();
+}
+
+static void
+carrick_pane_connect_vpn (CarrickPane *self,
+ const char *name,
+ const char *gw,
+ const char *cookie)
+{
+ GHashTable *props;
+ GValue *val;
+
+ props = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ g_free,
+ (GDestroyNotify) pane_free_g_value);
+
+ val = g_slice_new0 (GValue);
+ g_value_init (val, G_TYPE_STRING);
+ g_value_set_string (val, g_strdup ("openconnect"));
+ g_hash_table_insert (props, g_strdup ("Type"), val);
+
+ val = g_slice_new0 (GValue);
+ g_value_init (val, G_TYPE_STRING);
+ g_value_set_string (val, g_strdup (name));
+ g_hash_table_insert (props, g_strdup ("Name"), val);
+
+ val = g_slice_new0 (GValue);
+ g_value_init (val, G_TYPE_STRING);
+ g_value_set_string (val, g_strdup (gw));
+ g_hash_table_insert (props, g_strdup ("Host"), val);
+
+ val = g_slice_new0 (GValue);
+ g_value_init (val, G_TYPE_STRING);
+ g_value_set_string (val, g_strdup (cookie));
+ g_hash_table_insert (props, g_strdup ("OpenConnect.Cookie"), val);
+
+ val = g_slice_new0 (GValue);
+ g_value_init (val, G_TYPE_STRING);
+ /* FIXME: VPN.Domain should be the domain to use for route splitting
+ * but currently connman (0.61) does not do that, so we're being lazy
+ * as well. */
+ g_value_set_string (val, g_strdup (""));
+ g_hash_table_insert (props, g_strdup ("VPN.Domain"), val);
+
+ carrick_notification_manager_queue_event (self->priv->notes,
+ "vpn",
+ "ready",
+ name);
+
+ carrick_notification_manager_queue_event (self->priv->notes,
+ "vpn",
+ "ready",
+ name);
+
+ /* Connection methods do not return until there has been success or an error,
+ * set the timeout nice and long before we make the call */
+ dbus_g_proxy_set_default_timeout (self->priv->manager, 120000);
+ org_moblin_connman_Manager_connect_provider_async (self->priv->manager,
+ props,
+ connect_provider_cb,
+ self);
+ dbus_g_proxy_set_default_timeout (self->priv->manager, -1);
+}
+
+typedef struct {
+ CarrickPane *self;
+ GIOChannel *io_out;
+ char *name;
+} auth_dialog_data;
+
+static void
+auth_dialog_exit_cb (GPid pid, int status, auth_dialog_data *data)
+{
+ char *line;
+ char *gw = NULL, *cookie = NULL;
+ char *gw_term, *cookie_term;
+
+ g_spawn_close_pid (pid);
+
+ if (status != 0)
+ {
+ g_io_channel_unref (data->io_out);
+ g_free (data->name);
+ g_free (data);
+ g_warning ("OpenConnect authentication failed\n");
+ return;
+ }
+
+ g_io_channel_read_line (data->io_out, &line, NULL, NULL, NULL);
+ while (line)
+ {
+ if (g_strcmp0 (line, "gateway\n") == 0)
+ g_io_channel_read_line (data->io_out, &gw, NULL, NULL, NULL);
+ else if (g_strcmp0 (line, "cookie\n") == 0)
+ g_io_channel_read_line (data->io_out, &cookie, NULL, NULL, NULL);
+
+ g_free (line);
+ g_io_channel_read_line (data->io_out, &line, NULL, NULL, NULL);
+ }
+ g_io_channel_unref (data->io_out);
+
+ if (!gw || !cookie)
+ {
+ g_free (data->name);
+ g_free (data);
+ g_warning ("OpenConnect authentication did not return gateway and cookie\n");
+ return;
+ }
+
+ /* remove linefeeds */
+ gw_term = g_strndup (gw, strlen (gw) - 1);
+ cookie_term = g_strndup (cookie, strlen (cookie) - 1);
+ g_free (gw);
+ g_free (cookie);
+
+ carrick_pane_connect_vpn (data->self, data->name, gw_term, cookie_term);
+ g_free (data->name);
+ g_free (data);
+ g_free (gw_term);
+ g_free (cookie_term);
+}
+
+static void
+vpn_connect_clicked (GtkButton *btn, CarrickPane *self)
+{
+ CarrickPanePrivate *priv;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ char *uuid, *name;
+ GPid pid;
+ int out;
+ auth_dialog_data *data;
+ GError *error = NULL;
+
+ priv = self->priv;
+
+ if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (priv->vpn_combo),
+ &iter))
+ {
+ return;
+ }
+
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (priv->vpn_combo));
+ gtk_tree_model_get (model, &iter,
+ COLUMN_VPN_NAME, &name,
+ COLUMN_VPN_UUID, &uuid,
+ -1);
+
+ char *argv[] = {
+ AUTH_DIALOG,
+ "-u", uuid,
+ "-n", name,
+ "-s", "org.freedesktop.NetworkManager.openconnect",
+ NULL
+ };
+
+ if (!g_spawn_async_with_pipes (NULL, argv, NULL,
+ G_SPAWN_DO_NOT_REAP_CHILD,
+ NULL, NULL,
+ &pid, NULL, &out, NULL, &error))
+ {
+ g_warning ("Unable to spawn OpenConnect authentication dialog: %s",
+ error->message);
+ g_error_free(error);
+ return;
+ }
+
+ data = g_new0 (auth_dialog_data, 1);
+ data->io_out = g_io_channel_unix_new (out);
+ data->name = g_strdup (name);
+ data->self = self;
+ g_child_watch_add (pid, (GChildWatchFunc)auth_dialog_exit_cb, data);
+}
+
+static void
+carrick_pane_load_vpn_config (CarrickPane *self)
+{
+ CarrickPanePrivate *priv;
+ GSList *connections, *this;
+ GtkListStore *store;
+ GtkTreeIter iter;
+ gboolean have_vpn = FALSE;
+
+ priv = self->priv;
+
+ store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (priv->vpn_combo)));
+ gtk_list_store_clear (store);
+
+ connections = gconf_client_all_dirs (priv->gconf,
+ "/system/networking/connections",
+ NULL);
+ for (this = connections; this; this = this->next)
+ {
+ char *key, *val, *uuid, *id;
+
+ /* make sure this is a vpn and uses openconnect */
+ key = g_strdup_printf ("%s/connection/type", (char*)this->data);
+ val = gconf_client_get_string (priv->gconf, key, NULL);
+ g_free (key);
+
+ if (g_strcmp0 (val, "vpn") != 0)
+ {
+ g_free (val);
+ continue;
+ }
+ g_free (val);
+
+ key = g_strdup_printf ("%s/vpn/service-type", (char*)this->data);
+ val = gconf_client_get_string (priv->gconf, key, NULL);
+ g_free (key);
+
+ if (g_strcmp0 (val, "org.freedesktop.NetworkManager.openconnect") != 0)
+ {
+ g_free (val);
+ continue;
+ }
+ g_free (val);
+
+ key = g_strdup_printf("%s/connection/uuid", (char*)this->data);
+ uuid = gconf_client_get_string (priv->gconf, key, NULL);
+ g_free (key);
+
+ key = g_strdup_printf("%s/connection/id", (char*)this->data);
+ id = gconf_client_get_string (priv->gconf, key, NULL);
+ g_free (key);
+
+ /* TODO add vpn to to combo-model */
+ gtk_list_store_append (store, &iter);
+ gtk_list_store_set (store, &iter,
+ COLUMN_VPN_NAME, id,
+ COLUMN_VPN_UUID, uuid,
+ -1);
+ g_free (uuid);
+ g_free (id);
+
+ if (!have_vpn)
+ {
+ gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->vpn_combo),
+ &iter);
+ have_vpn = TRUE;
+ }
+ }
+
+ gtk_widget_set_visible (priv->vpn_box, have_vpn);
+
+ g_slist_foreach (connections, (GFunc)g_free, NULL);
+ g_slist_free (connections);
+}
+
+static void
+vpn_config_changed_cb (GConfClient *gconf,
+ guint cnxn_id,
+ GConfEntry *entry,
+ gpointer user_data)
+{
+ carrick_pane_load_vpn_config (CARRICK_PANE (user_data));
+}
+
+static void
+init_gconf (CarrickPane *self)
+{
+ self->priv->gconf = gconf_client_get_default ();
+ gconf_client_add_dir (self->priv->gconf,
+ "/system/networking/connections",
+ GCONF_CLIENT_PRELOAD_NONE, NULL);
+ gconf_client_notify_add (self->priv->gconf,
+ "/system/networking/connections",
+ vpn_config_changed_cb, self,
+ NULL, NULL);
+ carrick_pane_load_vpn_config (self);
+}
+
+static void
carrick_pane_init (CarrickPane *self)
{
CarrickPanePrivate *priv;
@@ -1304,7 +1766,10 @@
GError *error = NULL;
DBusGConnection *connection;
DBusGProxy *bus_proxy;
+ GtkWidget *vpn_connect_button;
GtkTreeModel *model;
+ GtkListStore *vpn_store;
+ GtkCellRenderer *renderer;
priv = self->priv = PANE_PRIVATE (self);
@@ -1582,6 +2047,47 @@
gtk_widget_show (priv->service_list);
gtk_box_pack_start (GTK_BOX (column), priv->service_list, TRUE, TRUE, 0);
+ /* vpn widgets in the bottom */
+ priv->vpn_box = gtk_vbox_new (FALSE, 0);
+ gtk_widget_set_sensitive (priv->vpn_box, FALSE);
+ gtk_widget_set_no_show_all (priv->vpn_box, TRUE);
+ gtk_box_pack_start (GTK_BOX (column), priv->vpn_box, FALSE, FALSE, 4);
+
+ sep = gtk_hseparator_new ();
+ gtk_widget_show (sep);
+ gtk_box_pack_start (GTK_BOX (priv->vpn_box), sep, FALSE, FALSE, 0);
+
+ box = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (box);
+ gtk_box_pack_start (GTK_BOX (priv->vpn_box), box, FALSE, FALSE, 4);
+
+ /* TRANSLATORS: Button
+ * There will be a combobox of VPN networks to the left of the
+ * button */
+ vpn_connect_button = gtk_button_new_with_label (_("Connect to VPN"));
+ gtk_widget_show (vpn_connect_button);
+ gtk_box_pack_end (GTK_BOX (box), vpn_connect_button, FALSE, FALSE, 8);
+ g_signal_connect (GTK_BUTTON (vpn_connect_button), "clicked",
+ G_CALLBACK (vpn_connect_clicked), self);
+
+ vpn_store = gtk_list_store_new (N_VPN_COLUMNS,
+ G_TYPE_STRING, G_TYPE_STRING);
+ priv->vpn_combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (vpn_store));
+ g_object_unref (vpn_store);
+ gtk_widget_show (priv->vpn_combo);
+ gtk_box_pack_end (GTK_BOX (box), priv->vpn_combo, FALSE, FALSE, 0);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (priv->vpn_combo),
+ renderer, TRUE);
+ gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (priv->vpn_combo),
+ renderer,
+ "text", COLUMN_VPN_NAME,
+ NULL);
+
+ if (g_file_test (AUTH_DIALOG, G_FILE_TEST_IS_EXECUTABLE))
+ init_gconf (self);
+
gtk_container_add (GTK_CONTAINER (net_list_frame), column);
gtk_box_pack_start (GTK_BOX (self),
net_list_frame,
@@ -1621,7 +2127,7 @@
pane);
}
- carrick_list_set_all_inactive (CARRICK_LIST (priv->service_list));
+ carrick_list_clear_state (CARRICK_LIST (priv->service_list));
}
GtkWidget*
--- carrick/carrick-service-item.c
+++ carrick/carrick-service-item.c
@@ -24,6 +24,13 @@
*
*/
+/* TODO
+ *
+ * The _populate_variables() / _set_state() cycle is
+ * inefficient and complex. _set_state() updates everything,
+ * even if nothing changed since the last update.
+ */
+
#include "carrick-service-item.h"
#include <config.h>
@@ -39,6 +46,12 @@
#include "carrick-util.h"
#include "carrick-shell.h"
+#define CARRICK_DRAG_TARGET "CARRICK_DRAG_TARGET"
+
+static const GtkTargetEntry carrick_targets[] = {
+ { CARRICK_DRAG_TARGET, GTK_TARGET_SAME_APP, 0 },
+};
+
G_DEFINE_TYPE (CarrickServiceItem, carrick_service_item, GTK_TYPE_EVENT_BOX)
#define SERVICE_ITEM_PRIVATE(o) \
@@ -56,11 +69,12 @@
enum {
PROP_0,
- PROP_DRAGGABLE,
+ PROP_FAVORITE,
PROP_ICON_FACTORY,
PROP_NOTIFICATIONS,
PROP_MODEL,
- PROP_ROW
+ PROP_ROW,
+ PROP_ACTIVE,
};
struct _CarrickServiceItemPrivate
@@ -69,6 +83,7 @@
GtkWidget *name_label;
GtkWidget *connect_box;
GtkWidget *security_label;
+ GtkWidget *portal_button;
GtkWidget *connect_button;
GtkWidget *advanced_expander;
GtkWidget *passphrase_box;
@@ -77,6 +92,7 @@
GtkWidget *delete_button;
GtkWidget *expando;
+ GtkWidget *advanced_box;
GtkWidget *method_combo;
GtkWidget *address_entry;
GtkWidget *gateway_entry;
@@ -90,7 +106,6 @@
CarrickNotificationManager *note;
- gboolean draggable;
GdkCursor *hand_cursor;
CarrickNetworkModel *model;
@@ -112,18 +127,25 @@
gchar *gateway;
gchar **nameservers;
gboolean favorite;
+ gboolean immutable;
+ gboolean login_required;
GtkWidget *info_bar;
GtkWidget *info_label;
+
+ /* active means the last ServiceItem that has been interacted with
+ * since panel was last shown */
+ gboolean active;
+ /* have we shown and hidden the connect-related error yet? */
+ gboolean error_hidden;
};
enum {
- SIGNAL_ITEM_ACTIVATE,
- SIGNAL_LAST
+ METHOD_DHCP = 0,
+ METHOD_MANUAL = 1,
+ METHOD_FIXED = 2,
};
-static gint service_item_signals[SIGNAL_LAST];
-
static void
carrick_service_item_get_property (GObject *object, guint property_id,
@@ -138,8 +160,8 @@
switch (property_id)
{
- case PROP_DRAGGABLE:
- g_value_set_boolean (value, priv->draggable);
+ case PROP_FAVORITE:
+ g_value_set_boolean (value, priv->favorite);
break;
case PROP_ICON_FACTORY:
@@ -157,12 +179,40 @@
g_value_set_boxed (value, priv->row);
break;
+ case PROP_ACTIVE:
+ g_value_set_boolean (value, priv->active);
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
}
static void
+_service_item_set_drag_state (CarrickServiceItem *self)
+{
+ if (self->priv->favorite)
+ {
+ /* Define the service as a drag source/destination */
+ gtk_drag_source_set (GTK_WIDGET (self),
+ GDK_BUTTON1_MASK,
+ carrick_targets,
+ G_N_ELEMENTS (carrick_targets),
+ GDK_ACTION_MOVE);
+ gtk_drag_dest_set (GTK_WIDGET (self),
+ GTK_DEST_DEFAULT_ALL,
+ carrick_targets,
+ G_N_ELEMENTS (carrick_targets),
+ GDK_ACTION_MOVE);
+ }
+ else
+ {
+ gtk_drag_source_unset (GTK_WIDGET (self));
+ gtk_drag_dest_unset (GTK_WIDGET (self));
+ }
+}
+
+static void
_service_item_set_security (CarrickServiceItem *item)
{
CarrickServiceItemPrivate *priv = item->priv;
@@ -225,13 +275,26 @@
{
char *method, *address, *netmask, *gateway;
char **nameservers;
+ char *state;
+
+ if (priv->proxy)
+ g_object_unref (priv->proxy);
+ g_free (priv->name);
+ g_free (priv->type);
+ g_free (priv->security);
+ g_free (priv->passphrase);
+ g_free (priv->method);
+ g_free (priv->address);
+ g_free (priv->netmask);
+ g_free (priv->gateway);
+ g_strfreev (priv->nameservers);
gtk_tree_model_get (GTK_TREE_MODEL (priv->model), &iter,
CARRICK_COLUMN_PROXY, &priv->proxy,
CARRICK_COLUMN_INDEX, &priv->index,
CARRICK_COLUMN_NAME, &priv->name,
CARRICK_COLUMN_TYPE, &priv->type,
- CARRICK_COLUMN_STATE, &priv->state,
+ CARRICK_COLUMN_STATE, &state,
CARRICK_COLUMN_STRENGTH, &priv->strength,
CARRICK_COLUMN_SECURITY, &priv->security,
CARRICK_COLUMN_PASSPHRASE_REQUIRED, &priv->need_pass,
@@ -248,6 +311,8 @@
CARRICK_COLUMN_NAMESERVERS, &nameservers,
CARRICK_COLUMN_CONFIGURED_NAMESERVERS, &priv->nameservers,
CARRICK_COLUMN_FAVORITE, &priv->favorite,
+ CARRICK_COLUMN_IMMUTABLE, &priv->immutable,
+ CARRICK_COLUMN_LOGIN_REQUIRED, &priv->login_required,
-1);
/* use normal values only if manually configured values are not available:
@@ -255,16 +320,36 @@
* 1. sometimes normal values are not available (e.g. when not connected).
* 2. don't show "old" values while connman is still applying manually set ones
*/
- if (!priv->method)
+ if (priv->method)
+ g_free (method);
+ else
priv->method = method;
- if (!priv->address)
+ if (priv->address)
+ g_free (address);
+ else
priv->address = address;
- if (!priv->netmask)
+ if (priv->netmask)
+ g_free (netmask);
+ else
priv->netmask = netmask;
- if (!priv->gateway)
+ if (priv->gateway)
+ g_free (gateway);
+ else
priv->gateway = gateway;
- if (!priv->nameservers)
+ if (priv->nameservers)
+ g_free (nameservers);
+ else
priv->nameservers = nameservers;
+
+ /* TODO: it would make sense to expand this to cover lot of other
+ * state transitions so populate_variables() did not have to do so
+ * much unnecessary work */
+ if (priv->state &&
+ g_strcmp0 (priv->state, "failure") != 0 &&
+ g_strcmp0 (state, "failure") == 0)
+ priv->error_hidden = FALSE;
+ g_free (priv->state);
+ priv->state = state;
}
}
@@ -275,14 +360,44 @@
CarrickServiceItemPrivate *priv = self->priv;
gchar *nameservers = NULL;
GtkTextBuffer *buf;
+ GtkComboBox *combo;
+
+ combo = GTK_COMBO_BOX (priv->method_combo);
+ /* This is a bit of a hack: we don't want to show "Fixed" as
+ * option if it's not sent by connman */
if (g_strcmp0 (priv->method, "manual") == 0)
{
- gtk_combo_box_set_active (GTK_COMBO_BOX (priv->method_combo), 1);
+ if (gtk_combo_box_get_active (combo) == METHOD_FIXED)
+ gtk_combo_box_remove_text (combo, METHOD_FIXED);
+
+ gtk_combo_box_set_active (combo, METHOD_MANUAL);
+ gtk_widget_set_sensitive (GTK_WIDGET (combo), TRUE);
}
- else
+ else if (g_strcmp0 (priv->method, "dhcp") == 0)
{
- gtk_combo_box_set_active (GTK_COMBO_BOX (priv->method_combo), 0);
+ if (gtk_combo_box_get_active (combo) == METHOD_FIXED)
+ gtk_combo_box_remove_text (combo, METHOD_FIXED);
+
+ gtk_combo_box_set_active (combo, METHOD_DHCP);
+ gtk_widget_set_sensitive (GTK_WIDGET (combo), TRUE);
+ }
+ else if (g_strcmp0 (priv->method, "fixed") == 0)
+ {
+ if (gtk_combo_box_get_active (combo) != METHOD_FIXED)
+ {
+ /* TRANSLATORS: This string will be in the "Connect by:"-
+ * combobox just like "DHCP" and "Static IP". Fixed means
+ * that the IP configuration cannot be changed at all,
+ * like in a 3G network */
+ gtk_combo_box_insert_text (combo, METHOD_FIXED, _("Fixed IP"));
+ }
+ gtk_combo_box_set_active (combo, METHOD_FIXED);
+ gtk_widget_set_sensitive (GTK_WIDGET (combo), FALSE);
+ }
+ else if (priv->method)
+ {
+ g_warning ("Unknown service ipv4 method '%s'", priv->method);
}
gtk_entry_set_text (GTK_ENTRY (priv->address_entry),
@@ -321,6 +436,10 @@
gchar *name = g_strdup (priv->name);
_service_item_set_security (self);
+ _service_item_set_drag_state (self);
+
+ gtk_widget_set_sensitive (priv->advanced_box, !priv->immutable);
+ gtk_widget_show (priv->portal_button);
if (g_strcmp0 ("ethernet", priv->type) == 0)
{
@@ -330,9 +449,10 @@
if (g_strcmp0 (priv->state, "ready") == 0)
{
- if (g_strcmp0 (priv->type, "ethernet") != 0)
+ if (g_strcmp0 (priv->type, "ethernet") != 0 &&
+ g_strcmp0 (priv->type, "vpn") != 0)
{
- /* Only expose delete button for non-ethernet devices */
+ /* Only expose delete button for non-ethernet, non-vpn devices */
gtk_widget_show (GTK_WIDGET (priv->delete_button));
gtk_widget_set_sensitive (GTK_WIDGET (priv->delete_button),
TRUE);
@@ -341,15 +461,16 @@
label = g_strdup_printf ("%s - %s",
name,
_ ("Connected"));
- priv->failed = FALSE;
gtk_label_set_text (GTK_LABEL (priv->info_label),
"");
+ gtk_widget_set_visible (priv->portal_button, priv->login_required);
}
else if (g_strcmp0 (priv->state, "online") == 0)
{
- if (g_strcmp0 (priv->type, "ethernet") != 0)
+ if (g_strcmp0 (priv->type, "ethernet") != 0 &&
+ g_strcmp0 (priv->type, "vpn") != 0)
{
- /* Only expose delete button for non-ethernet devices */
+ /* Only expose delete button for non-ethernet, non-vpn devices */
gtk_widget_show (GTK_WIDGET (priv->delete_button));
gtk_widget_set_sensitive (GTK_WIDGET (priv->delete_button),
TRUE);
@@ -358,7 +479,6 @@
label = g_strdup_printf ("%s - %s",
name,
_ ("Online"));
- priv->failed = FALSE;
gtk_label_set_text (GTK_LABEL (priv->info_label),
"");
}
@@ -395,9 +515,10 @@
/*
* If the connection failed we should allow the user
* to remove the connection (and forget the password.
- * Except, of course, when the connection is Ethernet ...
+ * Except, of course, when the connection is Ethernet or VPN.
*/
- if (g_strcmp0 (priv->type, "ethernet") == 0)
+ if (g_strcmp0 (priv->type, "ethernet") != 0 &&
+ g_strcmp0 (priv->type, "vpn") != 0)
{
gtk_widget_hide (GTK_WIDGET (priv->delete_button));
gtk_widget_set_sensitive (GTK_WIDGET (priv->delete_button),
@@ -414,11 +535,13 @@
label = g_strdup_printf ("%s - %s",
name,
_ ("Connection failed"));
- priv->failed = TRUE;
- gtk_label_set_text (GTK_LABEL (priv->info_label),
- _("Sorry, the connection failed. You could try again."));
- gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->info_bar),
- GTK_MESSAGE_ERROR);
+ if (!priv->error_hidden)
+ {
+ gtk_label_set_text (GTK_LABEL (priv->info_label),
+ _("Sorry, the connection failed. You could try again."));
+ gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->info_bar),
+ GTK_MESSAGE_ERROR);
+ }
}
else if (g_strcmp0 (priv->state, "disconnect") == 0)
{
@@ -473,14 +596,14 @@
{
CarrickServiceItemPrivate *priv = item->priv;
- g_signal_emit (item, service_item_signals[SIGNAL_ITEM_ACTIVATE], 0);
-
if (!priv->passphrase_hint_visible)
{
gboolean vis = gtk_toggle_button_get_active (button);
gtk_entry_set_visibility (GTK_ENTRY (priv->passphrase_entry),
vis);
}
+
+ carrick_service_item_set_active (item, TRUE);
}
static void
@@ -488,12 +611,21 @@
{
CarrickServiceItemPrivate *priv = item->priv;
- /* TRANSLATORS: text should be 20 characters or less to be entirely
- * visible in the passphrase entry */
- gtk_entry_set_text (GTK_ENTRY (priv->passphrase_entry),
- _ ("Type password here"));
+ if (!priv->passphrase || (strlen (priv->passphrase) == 0))
+ {
+ /* TRANSLATORS: text should be 20 characters or less to be entirely
+ * visible in the passphrase entry */
+ gtk_entry_set_text (GTK_ENTRY (priv->passphrase_entry),
+ _ ("Type password here"));
+ priv->passphrase_hint_visible = TRUE;
+ }
+ else
+ {
+ gtk_entry_set_text (GTK_ENTRY (priv->passphrase_entry),
+ priv->passphrase);
+ }
+
gtk_entry_set_visibility (GTK_ENTRY (priv->passphrase_entry), TRUE);
- priv->passphrase_hint_visible = TRUE;
gtk_editable_select_region (GTK_EDITABLE (priv->passphrase_entry),
0, -1);
gtk_widget_grab_focus (priv->passphrase_entry);
@@ -600,6 +732,7 @@
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
{
+ carrick_service_item_set_active (item, FALSE);
if (g_strcmp0 (priv->state, "failure") == 0)
{
/* The service is marked failure, use Service.Remove to set
@@ -649,8 +782,11 @@
if (priv->security && g_str_equal (priv->security, "none") == FALSE)
{
- if (priv->failed ||
- (priv->need_pass && priv->passphrase == NULL))
+ /* ask for a passphrase for non-immutable services that
+ * require a password or failed to connect last time */
+ if (!priv->immutable &&
+ ((g_strcmp0 (priv->state, "failure") == 0) ||
+ (priv->need_pass && priv->passphrase == NULL)))
{
_request_passphrase (item);
}
@@ -703,8 +839,6 @@
{
CarrickServiceItemPrivate *priv = item->priv;
- g_signal_emit (item, service_item_signals[SIGNAL_ITEM_ACTIVATE], 0);
-
if (g_str_equal (priv->state, "online") ||
g_str_equal (priv->state, "ready") ||
g_str_equal (priv->state, "configuration") ||
@@ -714,17 +848,27 @@
priv->type,
"idle",
priv->name);
+ carrick_service_item_set_active (item, FALSE);
org_moblin_connman_Service_disconnect_async (priv->proxy,
dbus_proxy_notify_cb,
item);
}
else
{
+ carrick_service_item_set_active (item, TRUE);
_start_connecting (item);
}
}
static void
+_portal_button_cb (GtkButton *button,
+ CarrickServiceItem *item)
+{
+ if (g_app_info_launch_default_for_uri ("http://connman.net", NULL, NULL))
+ carrick_shell_hide ();
+}
+
+static void
_advanced_expander_notify_expanded_cb (GObject *object,
GParamSpec *param_spec,
gpointer data)
@@ -735,10 +879,10 @@
g_return_if_fail (CARRICK_IS_SERVICE_ITEM (data));
priv = CARRICK_SERVICE_ITEM (data)->priv;
- g_signal_emit (data, service_item_signals[SIGNAL_ITEM_ACTIVATE], 0);
+ carrick_service_item_set_active (CARRICK_SERVICE_ITEM (data), TRUE);
expanded = gtk_expander_get_expanded (GTK_EXPANDER (priv->advanced_expander));
- if (!expanded)
+ if (expanded)
{
/* update user changed values with connman data */
priv->form_modified = FALSE;
@@ -818,6 +962,8 @@
if (!label)
{
+ GtkTreeIter iter;
+
passphrase = gtk_entry_get_text (GTK_ENTRY (priv->passphrase_entry));
value = g_slice_new0 (GValue);
g_value_init (value, G_TYPE_STRING);
@@ -834,6 +980,15 @@
gtk_widget_hide (priv->passphrase_box);
gtk_widget_show (priv->connect_box);
+
+ /* hack: modify passphrase here since connman won't
+ * send property change notify */
+ gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->model),
+ &iter, gtk_tree_row_reference_get_path (priv->row));
+ gtk_list_store_set (GTK_LIST_STORE (priv->model), &iter,
+ CARRICK_COLUMN_PASSPHRASE,
+ passphrase,
+ -1);
}
else
{
@@ -850,12 +1005,14 @@
static void
_connect_with_pw_clicked_cb (GtkButton *btn, CarrickServiceItem *item)
{
+ carrick_service_item_set_active (item, TRUE);
_connect_with_password (item);
}
static void
_passphrase_entry_activated_cb (GtkEntry *entry, CarrickServiceItem *item)
{
+ carrick_service_item_set_active (item, TRUE);
_connect_with_password (item);
}
@@ -881,6 +1038,7 @@
gpointer user_data)
{
CarrickServiceItem *self = CARRICK_SERVICE_ITEM (user_data);
+ CarrickServiceItemPrivate *priv = self->priv;
if (gtk_entry_get_text_length (entry) > 0)
{
@@ -890,32 +1048,18 @@
/* On the second click of the clear button hide the passphrase widget */
else
{
- carrick_service_item_set_active (self,
- FALSE);
+ gtk_widget_hide (priv->passphrase_box);
+ gtk_widget_hide (priv->info_bar);
+ gtk_label_set_text (GTK_LABEL (priv->info_label), "");
}
}
gboolean
-carrick_service_item_get_draggable (CarrickServiceItem *item)
+carrick_service_item_get_favorite (CarrickServiceItem *item)
{
- CarrickServiceItemPrivate *priv;
-
g_return_val_if_fail (CARRICK_IS_SERVICE_ITEM (item), FALSE);
- priv = item->priv;
- return priv->draggable;
-}
-
-void
-carrick_service_item_set_draggable (CarrickServiceItem *item,
- gboolean draggable)
-{
- CarrickServiceItemPrivate *priv;
-
- g_return_if_fail (CARRICK_IS_SERVICE_ITEM (item));
-
- priv = item->priv;
- priv->draggable = draggable;
+ return item->priv->favorite;
}
static void
@@ -936,22 +1080,36 @@
FALSE);
}
+gboolean
+carrick_service_item_get_active (CarrickServiceItem *item)
+{
+ g_return_val_if_fail (CARRICK_IS_SERVICE_ITEM (item), FALSE);
+
+ return item->priv->active;
+}
+
void
carrick_service_item_set_active (CarrickServiceItem *item,
gboolean active)
{
g_return_if_fail (CARRICK_IS_SERVICE_ITEM (item));
+ CarrickServiceItemPrivate *priv = item->priv;
+
+ if (priv->active == active)
+ return;
+
+ priv->active = active;
if (!active)
{
- CarrickServiceItemPrivate *priv = item->priv;
-
+ priv->error_hidden = TRUE;
gtk_widget_hide (priv->passphrase_box);
gtk_widget_show (priv->connect_box);
gtk_widget_hide (priv->info_bar);
-
+ gtk_label_set_text (GTK_LABEL (priv->info_label), "");
_unexpand_advanced_settings (item);
}
+ g_object_notify (G_OBJECT (item), "active");
}
DBusGProxy*
@@ -1038,10 +1196,6 @@
switch (property_id)
{
- case PROP_DRAGGABLE:
- priv->draggable = g_value_get_boolean (value);
- break;
-
case PROP_ICON_FACTORY:
priv->icon_factory = CARRICK_ICON_FACTORY (g_value_get_object (value));
break;
@@ -1060,6 +1214,10 @@
(GtkTreePath *) g_value_get_boxed (value));
break;
+ case PROP_ACTIVE:
+ carrick_service_item_set_active (self, g_value_get_boolean (value));
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
@@ -1089,6 +1247,25 @@
priv->proxy = NULL;
}
+ g_free (priv->name);
+ priv->name = NULL;
+ g_free (priv->type);
+ priv->type = NULL;
+ g_free (priv->security);
+ priv->security = NULL;
+ g_free (priv->passphrase);
+ priv->passphrase = NULL;
+ g_free (priv->method);
+ priv->method = NULL;
+ g_free (priv->address);
+ priv->address = NULL;
+ g_free (priv->netmask);
+ priv->netmask = NULL;
+ g_free (priv->gateway);
+ priv->gateway = NULL;
+ g_strfreev (priv->nameservers);
+ priv->nameservers = NULL;
+
G_OBJECT_CLASS (carrick_service_item_parent_class)->dispose (object);
}
@@ -1114,9 +1291,11 @@
CarrickServiceItem *item = CARRICK_SERVICE_ITEM (widget);
CarrickServiceItemPrivate *priv = item->priv;
- if (priv->draggable)
+ if (priv->favorite)
gdk_window_set_cursor (widget->window, priv->hand_cursor);
-
+ else
+ gdk_window_set_cursor (widget->window, NULL);
+
return TRUE;
}
@@ -1140,18 +1319,18 @@
gpointer user_data)
{
CarrickServiceItemPrivate *priv;
- gboolean use_dhcp;
+ gboolean manual;
g_return_if_fail (CARRICK_IS_SERVICE_ITEM (user_data));
priv = CARRICK_SERVICE_ITEM (user_data)->priv;
- use_dhcp = (gtk_combo_box_get_active (combobox) == 0);
+ manual = (gtk_combo_box_get_active (combobox) == METHOD_MANUAL);
- gtk_widget_set_sensitive (priv->address_entry, !use_dhcp);
- gtk_widget_set_sensitive (priv->netmask_entry, !use_dhcp);
- gtk_widget_set_sensitive (priv->gateway_entry, !use_dhcp);
+ gtk_widget_set_sensitive (priv->address_entry, manual);
+ gtk_widget_set_sensitive (priv->netmask_entry, manual);
+ gtk_widget_set_sensitive (priv->gateway_entry, manual);
- if (use_dhcp)
+ if (!manual)
{
GtkTextBuffer *buf;
@@ -1387,58 +1566,68 @@
CarrickServiceItem *item;
CarrickServiceItemPrivate *priv;
GValue *value;
- GHashTable *ipv4;
char **dnsv;
+ int method;
g_return_if_fail (CARRICK_IS_SERVICE_ITEM (user_data));
item = CARRICK_SERVICE_ITEM (user_data);
priv = item->priv;
+ carrick_service_item_set_active (item, TRUE);
+
if (!validate_dns_text_view (item))
return;
- ipv4 = g_hash_table_new (g_str_hash, g_str_equal);
- if (gtk_combo_box_get_active (GTK_COMBO_BOX (priv->method_combo)) == 1)
+ method = gtk_combo_box_get_active (GTK_COMBO_BOX (priv->method_combo));
+ if (method != METHOD_FIXED)
{
- char *address, *netmask, *gateway;
+ GHashTable *ipv4;
+
+ /* save ipv4 settings */
+
+ ipv4 = g_hash_table_new (g_str_hash, g_str_equal);
+ if (method == METHOD_MANUAL)
+ {
+ char *address, *netmask, *gateway;
+
+ if (!validate_static_ip_entries (item))
+ {
+ g_hash_table_destroy (ipv4);
+ return;
+ }
- if (!validate_static_ip_entries (item))
+ address = (char*)gtk_entry_get_text (GTK_ENTRY (priv->address_entry));
+ netmask = (char*)gtk_entry_get_text (GTK_ENTRY (priv->netmask_entry));
+ gateway = (char*)gtk_entry_get_text (GTK_ENTRY (priv->gateway_entry));
+
+ g_hash_table_insert (ipv4, "Method", "manual");
+ g_hash_table_insert (ipv4, "Address", address);
+ g_hash_table_insert (ipv4, "Netmask", netmask);
+ g_hash_table_insert (ipv4, "Gateway", gateway);
+ }
+ else
{
- g_hash_table_destroy (ipv4);
- return;
+ g_hash_table_insert (ipv4, "Method", "dhcp");
}
- address = (char*)gtk_entry_get_text (GTK_ENTRY (priv->address_entry));
- netmask = (char*)gtk_entry_get_text (GTK_ENTRY (priv->netmask_entry));
- gateway = (char*)gtk_entry_get_text (GTK_ENTRY (priv->gateway_entry));
+ value = g_new0 (GValue, 1);
+ g_value_init (value, DBUS_TYPE_G_STRING_STRING_HASHTABLE);
+ g_value_set_boxed (value, ipv4);
- g_hash_table_insert (ipv4, "Method", "manual");
- g_hash_table_insert (ipv4, "Address", address);
- g_hash_table_insert (ipv4, "Netmask", netmask);
- g_hash_table_insert (ipv4, "Gateway", gateway);
- }
- else
- {
- g_hash_table_insert (ipv4, "Method", "dhcp");
+ org_moblin_connman_Service_set_property_async (priv->proxy,
+ "IPv4.Configuration",
+ value,
+ set_ipv4_configuration_cb,
+ user_data);
+
+ g_free (value);
+ g_hash_table_destroy (ipv4);
}
/* start updating form again based on connman updates */
priv->form_modified = FALSE;
- value = g_new0 (GValue, 1);
- g_value_init (value, DBUS_TYPE_G_STRING_STRING_HASHTABLE);
- g_value_set_boxed (value, ipv4);
-
- org_moblin_connman_Service_set_property_async (priv->proxy,
- "IPv4.Configuration",
- value,
- set_ipv4_configuration_cb,
- user_data);
-
- g_free (value);
- g_hash_table_destroy (ipv4);
-
-
+ /* save dns settings */
value = g_new0 (GValue, 1);
g_value_init (value, G_TYPE_STRV);
dnsv = get_nameserver_strv (GTK_TEXT_VIEW (priv->dns_text_view));
@@ -1482,13 +1671,13 @@
widget_class->enter_notify_event = carrick_service_item_enter_notify_event;
widget_class->leave_notify_event = carrick_service_item_leave_notify_event;
- pspec = g_param_spec_boolean ("draggable",
- "draggable",
- "Should the service item show a draggable cursor on hover",
+ pspec = g_param_spec_boolean ("favorite",
+ "Favorite",
+ "Is the service a favorite (i.e. used previously)",
FALSE,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
+ G_PARAM_READABLE);
g_object_class_install_property (object_class,
- PROP_DRAGGABLE,
+ PROP_FAVORITE,
pspec);
pspec = g_param_spec_object ("notification-manager",
@@ -1527,15 +1716,14 @@
PROP_ROW,
pspec);
- /* activated == some ui activity in the label part of the item */
- service_item_signals[SIGNAL_ITEM_ACTIVATE] = g_signal_new (
- "activate",
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ pspec = g_param_spec_boolean ("active",
+ "active",
+ "Whether ServiceItem is considered the active UI element",
+ FALSE,
+ G_PARAM_READWRITE);
+ g_object_class_install_property (object_class,
+ PROP_ACTIVE,
+ pspec);
}
static GtkWidget*
@@ -1589,7 +1777,6 @@
priv->model = NULL;
priv->row = NULL;
- priv->failed = FALSE;
priv->proxy = NULL;
priv->index = 0;
@@ -1604,6 +1791,7 @@
priv->note = NULL;
priv->setup_required = FALSE;
priv->favorite = FALSE;
+ priv->error_hidden = TRUE;
priv->hand_cursor = gdk_cursor_new (GDK_HAND1);
@@ -1705,6 +1893,15 @@
self);
gtk_container_add (GTK_CONTAINER (align), priv->advanced_expander);
+ /* TRANSLATORS: button for services that require an additional
+ * web login (clicking will open browser) */
+ priv->portal_button = gtk_button_new_with_label (_("Log in"));
+ g_signal_connect (priv->portal_button, "clicked",
+ G_CALLBACK (_portal_button_cb), self);
+ gtk_box_pack_start (GTK_BOX (priv->connect_box),
+ priv->portal_button,
+ FALSE, FALSE, 6);
+
priv->connect_button = gtk_button_new_with_label (_("Scanning"));
gtk_widget_show (priv->connect_button);
g_signal_connect_after (priv->connect_button, "size-request",
@@ -1815,14 +2012,14 @@
/* static IP UI */
- vbox = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox);
- gtk_container_add (GTK_CONTAINER (priv->expando), vbox);
+ priv->advanced_box = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (priv->advanced_box);
+ gtk_container_add (GTK_CONTAINER (priv->expando), priv->advanced_box);
align = gtk_alignment_new (0.0, 0.0, 0.0, 0.0);
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 6, 20, 20);
gtk_widget_show (align);
- gtk_box_pack_start (GTK_BOX (vbox), align,
+ gtk_box_pack_start (GTK_BOX (priv->advanced_box), align,
FALSE, FALSE, 0);
table = gtk_table_new (7, 2, FALSE);
@@ -1845,11 +2042,13 @@
priv->method_combo = gtk_combo_box_new_text ();
/* NOTE: order/index of items in combobox is significant */
- /* TRANSLATORS: choices in the connection method combobox */
- gtk_combo_box_append_text (GTK_COMBO_BOX (priv->method_combo),
- _("DHCP"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (priv->method_combo),
- _("Static IP"));
+ /* TRANSLATORS: choices in the connection method combobox:
+ * Will include "DHCP", "Static IP" and sometimes "Fixed IP" */
+ gtk_combo_box_insert_text (GTK_COMBO_BOX (priv->method_combo),
+ METHOD_DHCP, _("DHCP"));
+ gtk_combo_box_insert_text (GTK_COMBO_BOX (priv->method_combo),
+ METHOD_MANUAL, _("Static IP"));
+
gtk_widget_show (priv->method_combo);
gtk_table_attach (GTK_TABLE (table), priv->method_combo,
1, 2, 0, 1,
--- carrick/carrick-service-item.h
+++ carrick/carrick-service-item.h
@@ -71,12 +71,11 @@
GType carrick_service_item_get_type (void);
gint carrick_service_item_get_order (CarrickServiceItem *item);
+gboolean carrick_service_item_get_active (CarrickServiceItem *item);
void carrick_service_item_set_active (CarrickServiceItem *item,
gboolean active);
-void carrick_service_item_set_draggable (CarrickServiceItem *item,
- gboolean draggable);
-gboolean carrick_service_item_get_draggable (CarrickServiceItem *item);
+gboolean carrick_service_item_get_favorite (CarrickServiceItem *item);
DBusGProxy* carrick_service_item_get_proxy (CarrickServiceItem *item);
GtkTreeRowReference* carrick_service_item_get_row_reference (CarrickServiceItem *item);
--- carrick/carrick-shell.h
+++ carrick/carrick-shell.h
@@ -28,6 +28,8 @@
*/
void carrick_shell_hide (void);
+void carrick_shell_show (void);
+
/*
* If the shell is focused.
*/
--- carrick/carrick-util.c
+++ carrick/carrick-util.c
@@ -28,6 +28,12 @@
const char *
util_get_service_type_for_display (const char *type)
{
+ /* TRANSLATORS: Service type names
+ * These names will be used in notification-manager to form phrases
+ * such as
+ * "Sorry, your %s connection was lost. So we've connected
+ * you to a %s network"
+ * where both placeholders are service type names. */
if (g_strcmp0 (type, "wifi") == 0)
return _("WiFi");
else if (g_strcmp0 (type, "ethernet") == 0)
@@ -38,6 +44,8 @@
return _("WiMAX");
else if (g_strcmp0 (type, "bluetooth") == 0)
return _("Bluetooth");
+ else if (g_strcmp0 (type, "vpn") == 0)
+ return _("VPN");
else
/* Run it through gettext and hope for the best */
return _(type);
--- carrick/connman-manager-bindings.h
+++ carrick/connman-manager-bindings.h
@@ -245,6 +245,81 @@
stuff->userdata = userdata;
return dbus_g_proxy_begin_call (proxy, "ConnectService", org_moblin_connman_Manager_connect_service_async_callback, stuff, _dbus_glib_async_data_free, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), IN_network, G_TYPE_INVALID);
}
+static
+#ifdef G_HAVE_INLINE
+inline
+#endif
+gboolean
+org_moblin_connman_Manager_connect_provider (DBusGProxy *proxy, const GHashTable* IN_provider, char** OUT_service, GError **error)
+
+{
+ return dbus_g_proxy_call (proxy, "ConnectProvider", error, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), IN_provider, G_TYPE_INVALID, DBUS_TYPE_G_OBJECT_PATH, OUT_service, G_TYPE_INVALID);
+}
+
+typedef void (*org_moblin_connman_Manager_connect_provider_reply) (DBusGProxy *proxy, char *OUT_service, GError *error, gpointer userdata);
+
+static void
+org_moblin_connman_Manager_connect_provider_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+{
+ DBusGAsyncData *data = (DBusGAsyncData*) user_data;
+ GError *error = NULL;
+ char* OUT_service;
+ dbus_g_proxy_end_call (proxy, call, &error, DBUS_TYPE_G_OBJECT_PATH, &OUT_service, G_TYPE_INVALID);
+ (*(org_moblin_connman_Manager_connect_provider_reply)data->cb) (proxy, OUT_service, error, data->userdata);
+ return;
+}
+
+static
+#ifdef G_HAVE_INLINE
+inline
+#endif
+DBusGProxyCall*
+org_moblin_connman_Manager_connect_provider_async (DBusGProxy *proxy, const GHashTable* IN_provider, org_moblin_connman_Manager_connect_provider_reply callback, gpointer userdata)
+
+{
+ DBusGAsyncData *stuff;
+ stuff = g_slice_new (DBusGAsyncData);
+ stuff->cb = G_CALLBACK (callback);
+ stuff->userdata = userdata;
+ return dbus_g_proxy_begin_call (proxy, "ConnectProvider", org_moblin_connman_Manager_connect_provider_async_callback, stuff, _dbus_glib_async_data_free, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), IN_provider, G_TYPE_INVALID);
+}
+static
+#ifdef G_HAVE_INLINE
+inline
+#endif
+gboolean
+org_moblin_connman_Manager_remove_provider (DBusGProxy *proxy, const char* IN_service, GError **error)
+
+{
+ return dbus_g_proxy_call (proxy, "RemoveProvider", error, DBUS_TYPE_G_OBJECT_PATH, IN_service, G_TYPE_INVALID, G_TYPE_INVALID);
+}
+
+typedef void (*org_moblin_connman_Manager_remove_provider_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
+
+static void
+org_moblin_connman_Manager_remove_provider_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+{
+ DBusGAsyncData *data = (DBusGAsyncData*) user_data;
+ GError *error = NULL;
+ dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
+ (*(org_moblin_connman_Manager_remove_provider_reply)data->cb) (proxy, error, data->userdata);
+ return;
+}
+
+static
+#ifdef G_HAVE_INLINE
+inline
+#endif
+DBusGProxyCall*
+org_moblin_connman_Manager_remove_provider_async (DBusGProxy *proxy, const char* IN_service, org_moblin_connman_Manager_remove_provider_reply callback, gpointer userdata)
+
+{
+ DBusGAsyncData *stuff;
+ stuff = g_slice_new (DBusGAsyncData);
+ stuff->cb = G_CALLBACK (callback);
+ stuff->userdata = userdata;
+ return dbus_g_proxy_begin_call (proxy, "RemoveProvider", org_moblin_connman_Manager_remove_provider_async_callback, stuff, _dbus_glib_async_data_free, DBUS_TYPE_G_OBJECT_PATH, IN_service, G_TYPE_INVALID);
+}
#endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_org_moblin_connman_Manager */
G_END_DECLS
--- carrick/connman-manager.xml
+++ carrick/connman-manager.xml
@@ -28,6 +28,15 @@
<arg name="service" type="o" direction="out" />
</method>
+ <method name="ConnectProvider" tp:name-for-bindings="Connect_Provider">
+ <arg name="provider" type="a{sv}"/>
+ <arg name="service" type="o" direction="out" />
+ </method>
+
+ <method name="RemoveProvider" tp:name-for-bindings="Remove_Provider">
+ <arg name="service" type="o"/>
+ </method>
+
<signal name="PropertyChanged" tp:name-for-bindings="Property_Changed">
<arg name="name" type="s"/>
<arg name="value" type="v"/>
--- carrick/connman-marshal.c
+++ carrick/connman-marshal.c
@@ -21,7 +21,6 @@
#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)
#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v)
#define g_marshal_value_peek_object(v) g_value_get_object (v)
-#define g_marshal_value_peek_variant(v) g_value_get_variant (v)
#else /* !G_ENABLE_DEBUG */
/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
* Do not access GValues directly in your code. Instead, use the
@@ -45,7 +44,6 @@
#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer
#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer
#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer
#endif /* !G_ENABLE_DEBUG */
--- carrick/connman-technology-bindings.h
+++ carrick/connman-technology-bindings.h
+/* Generated by dbus-binding-tool; do not edit! */
+
+#include <glib.h>
+#include <dbus/dbus-glib.h>
+
+G_BEGIN_DECLS
+
+#ifndef _DBUS_GLIB_ASYNC_DATA_FREE
+#define _DBUS_GLIB_ASYNC_DATA_FREE
+static
+#ifdef G_HAVE_INLINE
+inline
+#endif
+void
+_dbus_glib_async_data_free (gpointer stuff)
+{
+ g_slice_free (DBusGAsyncData, stuff);
+}
+#endif
+
+#ifndef DBUS_GLIB_CLIENT_WRAPPERS_org_moblin_connman_Technology
+#define DBUS_GLIB_CLIENT_WRAPPERS_org_moblin_connman_Technology
+
+static
+#ifdef G_HAVE_INLINE
+inline
+#endif
+gboolean
+org_moblin_connman_Technology_get_properties (DBusGProxy *proxy, GHashTable** OUT_properties, GError **error)
+
+{
+ return dbus_g_proxy_call (proxy, "GetProperties", error, G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), OUT_properties, G_TYPE_INVALID);
+}
+
+typedef void (*org_moblin_connman_Technology_get_properties_reply) (DBusGProxy *proxy, GHashTable *OUT_properties, GError *error, gpointer userdata);
+
+static void
+org_moblin_connman_Technology_get_properties_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+{
+ DBusGAsyncData *data = (DBusGAsyncData*) user_data;
+ GError *error = NULL;
+ GHashTable* OUT_properties;
+ dbus_g_proxy_end_call (proxy, call, &error, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &OUT_properties, G_TYPE_INVALID);
+ (*(org_moblin_connman_Technology_get_properties_reply)data->cb) (proxy, OUT_properties, error, data->userdata);
+ return;
+}
+
+static
+#ifdef G_HAVE_INLINE
+inline
+#endif
+DBusGProxyCall*
+org_moblin_connman_Technology_get_properties_async (DBusGProxy *proxy, org_moblin_connman_Technology_get_properties_reply callback, gpointer userdata)
+
+{
+ DBusGAsyncData *stuff;
+ stuff = g_slice_new (DBusGAsyncData);
+ stuff->cb = G_CALLBACK (callback);
+ stuff->userdata = userdata;
+ return dbus_g_proxy_begin_call (proxy, "GetProperties", org_moblin_connman_Technology_get_properties_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_INVALID);
+}
+#endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_org_moblin_connman_Technology */
+
+G_END_DECLS
--- carrick/connman-technology.xml
+++ carrick/connman-technology.xml
+<?xml version="1.0" encoding="utf-8"?>
+<node name="/Technology" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+ <interface name="org.moblin.connman.Technology">
+
+ <method name="GetProperties" tp:name-for-bindings="Get_Properties">
+ <arg name="properties" type="a{sv}" direction="out"/>
+ </method>
+
+ <signal name="PropertyChanged" tp:name-for-bindings="Property_Changed">
+ <arg name="name" type="s"/>
+ <arg name="value" type="v"/>
+ </signal>
+
+ </interface>
+</node>
--- configure
+++ configure
@@ -1,11 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for meego-panel-networks 1.2.14.
+# Generated by GNU Autoconf 2.67 for meego-panel-networks 1.2.16.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -316,7 +316,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -356,19 +356,19 @@
fi # as_fn_arith
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
as_fn_error ()
{
- as_status=$?; test $as_status -eq 0 && as_status=1
- if test "$3"; then
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi
- $as_echo "$as_me: error: $1" >&2
+ $as_echo "$as_me: error: $2" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -679,7 +679,7 @@
exec 6>&1
# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -698,8 +698,8 @@
# Identity of this package.
PACKAGE_NAME='meego-panel-networks'
PACKAGE_TARNAME='meego-panel-networks'
-PACKAGE_VERSION='1.2.14'
-PACKAGE_STRING='meego-panel-networks 1.2.14'
+PACKAGE_VERSION='1.2.16'
+PACKAGE_STRING='meego-panel-networks 1.2.16'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -748,6 +748,8 @@
PANEL_DIR
MPL_LIBS
MPL_CFLAGS
+GCONF_LIBS
+GCONF_CFLAGS
REST_LIBS
REST_CFLAGS
LIBNOTIFY_LIBS
@@ -948,6 +950,8 @@
LIBNOTIFY_LIBS
REST_CFLAGS
REST_LIBS
+GCONF_CFLAGS
+GCONF_LIBS
MPL_CFLAGS
MPL_LIBS'
@@ -1012,8 +1016,9 @@
fi
case $ac_option in
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *) ac_optarg=yes ;;
+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *=) ac_optarg= ;;
+ *) ac_optarg=yes ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1058,7 +1063,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid feature name: $ac_useropt"
+ as_fn_error $? "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1084,7 +1089,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid feature name: $ac_useropt"
+ as_fn_error $? "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1288,7 +1293,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid package name: $ac_useropt"
+ as_fn_error $? "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1304,7 +1309,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid package name: $ac_useropt"
+ as_fn_error $? "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1334,8 +1339,8 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
;;
*=*)
@@ -1343,7 +1348,7 @@
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
- as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1361,13 +1366,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error "missing argument to $ac_option"
+ as_fn_error $? "missing argument to $ac_option"
fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1390,7 +1395,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1404,8 +1409,8 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used." >&2
+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1420,9 +1425,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- as_fn_error "working directory cannot be determined"
+ as_fn_error $? "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error "pwd does not report name of working directory"
+ as_fn_error $? "pwd does not report name of working directory"
# Find the source files, if location was not specified.
@@ -1461,11 +1466,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1491,7 +1496,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures meego-panel-networks 1.2.14 to adapt to many kinds of systems.
+\`configure' configures meego-panel-networks 1.2.16 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1505,7 +1510,7 @@
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking...' messages
+ -q, --quiet, --silent do not print \`checking ...' messages
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
@@ -1562,7 +1567,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of meego-panel-networks 1.2.14:";;
+ short | recursive ) echo "Configuration of meego-panel-networks 1.2.16:";;
esac
cat <<\_ACEOF
@@ -1615,6 +1620,9 @@
linker flags for LIBNOTIFY, overriding pkg-config
REST_CFLAGS C compiler flags for REST, overriding pkg-config
REST_LIBS linker flags for REST, overriding pkg-config
+ GCONF_CFLAGS
+ C compiler flags for GCONF, overriding pkg-config
+ GCONF_LIBS linker flags for GCONF, overriding pkg-config
MPL_CFLAGS C compiler flags for MPL, overriding pkg-config
MPL_LIBS linker flags for MPL, overriding pkg-config
@@ -1684,10 +1692,10 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-meego-panel-networks configure 1.2.14
-generated by GNU Autoconf 2.65
+meego-panel-networks configure 1.2.16
+generated by GNU Autoconf 2.67
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1790,7 +1798,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1870,7 +1878,7 @@
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } >/dev/null && {
+ test $ac_status = 0; } > conftest.i && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then :
@@ -1936,10 +1944,10 @@
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ if eval "test \"\${$3+set}\"" = set; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@ -1975,7 +1983,7 @@
else
ac_header_preproc=no
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
@@ -2002,7 +2010,7 @@
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@ -2024,7 +2032,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2049,8 +2057,8 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by meego-panel-networks $as_me 1.2.14, which was
-generated by GNU Autoconf 2.65. Invocation command line was
+It was created by meego-panel-networks $as_me 1.2.16, which was
+generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2160,11 +2168,9 @@
{
echo
- cat <<\_ASBOX
-## ---------------- ##
+ $as_echo "## ---------------- ##
## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
echo
# The following way of writing the cache mishandles newlines in values,
(
@@ -2198,11 +2204,9 @@
)
echo
- cat <<\_ASBOX
-## ----------------- ##
+ $as_echo "## ----------------- ##
## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
echo
for ac_var in $ac_subst_vars
do
@@ -2215,11 +2219,9 @@
echo
if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
-## ------------------- ##
+ $as_echo "## ------------------- ##
## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
echo
for ac_var in $ac_subst_files
do
@@ -2233,11 +2235,9 @@
fi
if test -s confdefs.h; then
- cat <<\_ASBOX
-## ----------- ##
+ $as_echo "## ----------- ##
## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
echo
cat confdefs.h
echo
@@ -2292,7 +2292,12 @@
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- ac_site_file1=$CONFIG_SITE
+ # We do not want a PATH search for config.site.
+ case $CONFIG_SITE in #((
+ -*) ac_site_file1=./$CONFIG_SITE;;
+ */*) ac_site_file1=$CONFIG_SITE;;
+ *) ac_site_file1=./$CONFIG_SITE;;
+ esac
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
@@ -2307,7 +2312,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file"
+ . "$ac_site_file" \
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
done
@@ -2383,7 +2392,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
## -------------------- ##
## Main body of script. ##
@@ -2400,16 +2409,22 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- for ac_t in install-sh install.sh shtool; do
- if test -f "$ac_dir/$ac_t"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/$ac_t -c"
- break 2
- fi
- done
+ if test -f "$ac_dir/install-sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f "$ac_dir/install.sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ elif test -f "$ac_dir/shtool"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
done
if test -z "$ac_aux_dir"; then
- as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -2525,11 +2540,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
@@ -2551,7 +2566,7 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- as_fn_error "ls -t appears to fail. Make sure there is not a broken
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
alias in your environment" "$LINENO" 5
fi
@@ -2561,7 +2576,7 @@
# Ok.
:
else
- as_fn_error "newly created file is older than distributed files!
+ as_fn_error $? "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -2799,7 +2814,7 @@
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -2807,7 +2822,7 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2841,7 +2856,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
fi
fi
@@ -2857,7 +2872,7 @@
# Define the identity of the package.
PACKAGE=meego-panel-networks
- VERSION=1.2.14
+ VERSION=1.2.16
cat >>confdefs.h <<_ACEOF
@@ -2902,7 +2917,7 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
@@ -2913,16 +2928,16 @@
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -2947,7 +2962,7 @@
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
@@ -2955,7 +2970,7 @@
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@ -3348,8 +3363,8 @@
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5 ; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3463,9 +3478,8 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5 ; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -3507,8 +3521,8 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3565,9 +3579,9 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
+as_fn_error $? "cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
fi
fi
@@ -3618,8 +3632,8 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -3971,7 +3985,7 @@
case "$am__api_version" in
1.01234)
- as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+ as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
;;
*)
;;
@@ -3988,7 +4002,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
- as_fn_error "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5
+ as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5
fi
# Extract the first word of "intltool-update", so it can be a program name with args.
@@ -4112,7 +4126,7 @@
if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
- as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
+ as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
fi
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -4394,13 +4408,13 @@
if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
- as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
fi
xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
- as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
fi
# Extract the first word of "perl", so it can be a program name with args.
@@ -4444,13 +4458,13 @@
if test -z "$INTLTOOL_PERL"; then
- as_fn_error "perl not found" "$LINENO" 5
+ as_fn_error $? "perl not found" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
$as_echo_n "checking for perl >= 5.8.1... " >&6; }
$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
if test $? -ne 0; then
- as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
+ as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
else
IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
@@ -4463,7 +4477,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
$as_echo "ok" >&6; }
else
- as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
+ as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
fi
fi
@@ -4570,7 +4584,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -4586,11 +4600,11 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
break
fi
@@ -4629,7 +4643,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -4645,18 +4659,18 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
ac_ext=c
@@ -4717,7 +4731,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_GREP=$GREP
@@ -4783,7 +4797,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_EGREP=$EGREP
@@ -4915,8 +4929,7 @@
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -5947,8 +5960,8 @@
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5 ; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -6690,7 +6703,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_SED"; then
- as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
fi
else
ac_cv_path_SED=$SED
@@ -6769,7 +6782,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_FGREP"; then
- as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_FGREP=$FGREP
@@ -6885,7 +6898,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -7087,13 +7100,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:7090: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:7103: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:7093: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:7106: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:7096: output\"" >&5)
+ (eval echo "\"\$as_me:7109: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -8298,7 +8311,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8301 "configure"' > conftest.$ac_ext
+ echo '#line 8314 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9556,11 +9569,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9559: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9572: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9563: \$? = $ac_status" >&5
+ echo "$as_me:9576: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9895,11 +9908,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9898: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9911: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9902: \$? = $ac_status" >&5
+ echo "$as_me:9915: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -10000,11 +10013,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10003: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10016: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10007: \$? = $ac_status" >&5
+ echo "$as_me:10020: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10055,11 +10068,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10058: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10071: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10062: \$? = $ac_status" >&5
+ echo "$as_me:10075: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12439,7 +12452,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12442 "configure"
+#line 12455 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12535,7 +12548,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12538 "configure"
+#line 12551 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12939,7 +12952,7 @@
fi
set dummy $CC; ac_cc=`$as_echo "$2" |
sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13297,7 +13310,7 @@
# Put the nasty error message in config.log where it belongs
echo "$GTK_PKG_ERRORS" >&5
- as_fn_error "Package requirements (gtk+-2.0 >= 2.12) were not met:
+ as_fn_error $? "Package requirements (gtk+-2.0 >= 2.12) were not met:
$GTK_PKG_ERRORS
@@ -13312,7 +13325,7 @@
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -13321,7 +13334,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
else
GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
GTK_LIBS=$pkg_cv_GTK_LIBS
@@ -13386,7 +13399,7 @@
# Put the nasty error message in config.log where it belongs
echo "$DBUS_PKG_ERRORS" >&5
- as_fn_error "Package requirements (gthread-2.0 dbus-glib-1 >= 0.73) were not met:
+ as_fn_error $? "Package requirements (gthread-2.0 dbus-glib-1 >= 0.73) were not met:
$DBUS_PKG_ERRORS
@@ -13401,7 +13414,7 @@
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -13410,7 +13423,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
else
DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
DBUS_LIBS=$pkg_cv_DBUS_LIBS
@@ -13475,7 +13488,7 @@
# Put the nasty error message in config.log where it belongs
echo "$MX_PKG_ERRORS" >&5
- as_fn_error "Package requirements (mx-gtk-1.0) were not met:
+ as_fn_error $? "Package requirements (mx-gtk-1.0) were not met:
$MX_PKG_ERRORS
@@ -13490,7 +13503,7 @@
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -13499,7 +13512,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
else
MX_CFLAGS=$pkg_cv_MX_CFLAGS
MX_LIBS=$pkg_cv_MX_LIBS
@@ -13564,7 +13577,7 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBNOTIFY_PKG_ERRORS" >&5
- as_fn_error "Package requirements (libnotify) were not met:
+ as_fn_error $? "Package requirements (libnotify) were not met:
$LIBNOTIFY_PKG_ERRORS
@@ -13579,7 +13592,7 @@
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -13588,7 +13601,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
else
LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS
LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS
@@ -13653,7 +13666,7 @@
# Put the nasty error message in config.log where it belongs
echo "$REST_PKG_ERRORS" >&5
- as_fn_error "Package requirements (rest-0.7) were not met:
+ as_fn_error $? "Package requirements (rest-0.7) were not met:
$REST_PKG_ERRORS
@@ -13668,7 +13681,7 @@
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -13677,7 +13690,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
else
REST_CFLAGS=$pkg_cv_REST_CFLAGS
REST_LIBS=$pkg_cv_REST_LIBS
@@ -13686,6 +13699,95 @@
fi
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCONF" >&5
+$as_echo_n "checking for GCONF... " >&6; }
+
+if test -n "$GCONF_CFLAGS"; then
+ pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GCONF_LIBS"; then
+ pkg_cv_GCONF_LIBS="$GCONF_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0" 2>&1`
+ else
+ GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-2.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GCONF_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (gconf-2.0) were not met:
+
+$GCONF_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GCONF_CFLAGS
+and GCONF_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GCONF_CFLAGS
+and GCONF_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5 ; }
+else
+ GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS
+ GCONF_LIBS=$pkg_cv_GCONF_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use the MeeGo environment" >&5
$as_echo_n "checking whether to use the MeeGo environment... " >&6; }
@@ -13761,7 +13863,7 @@
# Put the nasty error message in config.log where it belongs
echo "$MPL_PKG_ERRORS" >&5
- as_fn_error "Package requirements (meego-panel >= 0.49.0) were not met:
+ as_fn_error $? "Package requirements (meego-panel >= 0.49.0) were not met:
$MPL_PKG_ERRORS
@@ -13776,7 +13878,7 @@
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -13785,7 +13887,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
else
MPL_CFLAGS=$pkg_cv_MPL_CFLAGS
MPL_LIBS=$pkg_cv_MPL_LIBS
@@ -13844,7 +13946,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
- as_fn_error "Cannot find mobile-broadband-provider-info" "$LINENO" 5
+ as_fn_error $? "Cannot find mobile-broadband-provider-info" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iso-codes" >&5
@@ -13879,7 +13981,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
- as_fn_error "Cannot find iso-codes" "$LINENO" 5
+ as_fn_error $? "Cannot find iso-codes" "$LINENO" 5
fi
ac_config_files="$ac_config_files Makefile carrick/Makefile src/Makefile tests/Makefile data/Makefile data/carrick.desktop.in data/icons/Makefile data/theme/Makefile callouts/Makefile callouts/3g/Makefile po/Makefile.in"
@@ -13967,6 +14069,7 @@
ac_libobjs=
ac_ltlibobjs=
+U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -13990,11 +14093,11 @@
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- as_fn_error "conditional \"AMDEP\" was never defined.
+ as_fn_error $? "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error "conditional \"am__fastdepCC\" was never defined.
+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -14002,11 +14105,11 @@
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error "conditional \"am__fastdepCC\" was never defined.
+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${WITH_MEEGO_TRUE}" && test -z "${WITH_MEEGO_FALSE}"; then
- as_fn_error "conditional \"WITH_MEEGO\" was never defined.
+ as_fn_error $? "conditional \"WITH_MEEGO\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -14156,19 +14259,19 @@
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
as_fn_error ()
{
- as_status=$?; test $as_status -eq 0 && as_status=1
- if test "$3"; then
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi
- $as_echo "$as_me: error: $1" >&2
+ $as_echo "$as_me: error: $2" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -14364,7 +14467,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -14417,8 +14520,8 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by meego-panel-networks $as_me 1.2.14, which was
-generated by GNU Autoconf 2.65. Invocation command line was
+This file was extended by meego-panel-networks $as_me 1.2.16, which was
+generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -14483,11 +14586,11 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-meego-panel-networks config.status 1.2.14
-configured by $0, generated by GNU Autoconf 2.65,
+meego-panel-networks config.status 1.2.16
+configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -14505,11 +14608,16 @@
while test $# != 0
do
case $1 in
- --*=*)
+ --*=?*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
+ --*=)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=
+ ac_shift=:
+ ;;
*)
ac_option=$1
ac_optarg=$2
@@ -14531,6 +14639,7 @@
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ '') as_fn_error $? "missing file argument" ;;
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
@@ -14543,7 +14652,7 @@
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- as_fn_error "ambiguous option: \`$1'
+ as_fn_error $? "ambiguous option: \`$1'
Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
@@ -14552,7 +14661,7 @@
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error "unrecognized option: \`$1'
+ -*) as_fn_error $? "unrecognized option: \`$1'
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
@@ -14879,7 +14988,7 @@
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
esac
done
@@ -14917,7 +15026,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -14934,7 +15043,7 @@
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\r'
+ ac_cs_awk_cr='\\r'
else
ac_cs_awk_cr=$ac_cr
fi
@@ -14948,18 +15057,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -15048,20 +15157,28 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || as_fn_error "could not setup config files machinery" "$LINENO" 5
+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[ ]*\):*/\1/
+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
+h
+s///
+s/^/:/
+s/[ ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
s/:*$//
+x
+s/\(=[ ]*\).*/\1/
+G
+s/\n//
s/^[^=]*=[ ]*$//
}'
fi
@@ -15089,7 +15206,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -15174,7 +15291,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error "could not setup config headers machinery" "$LINENO" 5
+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
fi # test -n "$CONFIG_HEADERS"
@@ -15187,7 +15304,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -15215,7 +15332,7 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -15242,7 +15359,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -15379,22 +15496,22 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined." >&5
+which seems to be undefined. Please make sure it is defined" >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined." >&2;}
+which seems to be undefined. Please make sure it is defined" >&2;}
rm -f "$tmp/stdin"
case $ac_file in
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
:H)
#
@@ -15405,19 +15522,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
mv "$tmp/config.h" "$ac_file" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error "could not create -" "$LINENO" 5
+ || as_fn_error $? "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
@@ -16197,7 +16314,7 @@
;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
- as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
+ as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
@@ -16225,7 +16342,7 @@
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
@@ -16246,7 +16363,7 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit $?
+ $ac_cs_success || as_fn_exit 1
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
--- configure.ac
+++ configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.53)
-AC_INIT(meego-panel-networks, 1.2.14)
+AC_INIT(meego-panel-networks, 1.2.16)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_CONFIG_HEADER(config.h)
@@ -37,6 +37,7 @@
PKG_CHECK_MODULES(MX, mx-gtk-1.0)
PKG_CHECK_MODULES(LIBNOTIFY, libnotify)
PKG_CHECK_MODULES(REST, rest-0.7)
+PKG_CHECK_MODULES(GCONF, gconf-2.0)
AC_MSG_CHECKING([whether to use the MeeGo environment])
AC_ARG_WITH([meego],[AS_HELP_STRING([--without-meego], [disable support for MeeGo environment])],
--- data/Makefile.in
+++ data/Makefile.in
@@ -148,6 +148,8 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GCONF_CFLAGS = @GCONF_CFLAGS@
+GCONF_LIBS = @GCONF_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
--- data/icons/Makefile.in
+++ data/icons/Makefile.in
@@ -107,6 +107,8 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GCONF_CFLAGS = @GCONF_CFLAGS@
+GCONF_LIBS = @GCONF_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
--- data/theme/Makefile.in
+++ data/theme/Makefile.in
@@ -107,6 +107,8 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GCONF_CFLAGS = @GCONF_CFLAGS@
+GCONF_LIBS = @GCONF_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
--- po/ca.po
+++ po/ca.po
@@ -64,9 +64,8 @@
#. * connectivity daemon, is not running.
#.
#: ../carrick/carrick-list.c:866
-#, fuzzy
msgid "Sorry, we can't find any networks. It appears that the connection manager is not running. You could try restarting your computer."
-msgstr "No s'ha trobat cap xarxa. Sembla que el gestor de connexions no estigui funcionant. Podeu provar de reiniciar el dispositiu."
+msgstr "No s'ha trobat cap xarxa. Sembla que el gestor de connexions no està funcionant. Podeu provar de reiniciar el dispositiu."
#. * Hint display if we detect that the system is in
#. * offline mode and there are no available networks
@@ -76,9 +75,9 @@
msgstr "No s'ha trobat cap xarxa. Podeu provar de inhabilitar el mode fora de línia. "
#: ../carrick/carrick-list.c:1013
-#, fuzzy, c-format
+#, c-format
msgid "Sorry, we can't find any networks. You could try enabling %s."
-msgstr "No s'ha trobat cap xarxa. Podeu provar d'engegar el 3G."
+msgstr "No s'ha trobat cap xarxa. Podeu provar d'habilitar el %s."
#. * Generic message to display if all available networking
#. * technologies are turned on, but for whatever reason we
@@ -344,11 +343,11 @@
#: ../carrick/carrick-service-item.c:1279
msgid "Sorry, it looks like the gateway address is not valid"
-msgstr ""
+msgstr "Sembla que l'adreça de la passarel·la no és vàlida"
#: ../carrick/carrick-service-item.c:1291
msgid "Sorry, it looks like the subnet mask is not valid"
-msgstr ""
+msgstr "Sembla que la màscara de subxarxa no és vàlida"
#: ../carrick/carrick-service-item.c:1336
#, c-format
@@ -358,11 +357,11 @@
#. TRANSLATORS: label for the Advanced expander in a service item
#: ../carrick/carrick-service-item.c:1698
msgid "Advanced"
-msgstr ""
+msgstr "Avançat"
#: ../carrick/carrick-service-item.c:1708
msgid "Scanning"
-msgstr ""
+msgstr "S'està escanejant"
#. Note: security_sample should contain the longest possible security method
#. TRANSLATORS: This is an example of a wireless security method
@@ -375,93 +374,89 @@
#. TRANSLATORS: label in advanced settings (next to combobox
#. * for DHCP/Static IP)
#: ../carrick/carrick-service-item.c:1836
-#, fuzzy
msgid "Connect by:"
-msgstr "Connectat"
+msgstr "Connectat per:"
#. TRANSLATORS: label in advanced settings
#: ../carrick/carrick-service-item.c:1838
msgid "IP address:"
-msgstr ""
+msgstr "Adreça IP:"
#. TRANSLATORS: label in advanced settings
#: ../carrick/carrick-service-item.c:1840
msgid "Subnet mask:"
-msgstr ""
+msgstr "Màscara de subxarxa:"
#. TRANSLATORS: label in advanced settings
#: ../carrick/carrick-service-item.c:1842
msgid "Router:"
-msgstr ""
+msgstr "Encaminador (router):"
#. TRANSLATORS: label in advanced settings
#: ../carrick/carrick-service-item.c:1844
msgid "DNS:"
-msgstr ""
+msgstr "DNS:"
#: ../carrick/carrick-service-item.c:1850
msgid "DHCP"
-msgstr ""
+msgstr "DHCP"
#: ../carrick/carrick-service-item.c:1852
msgid "Static IP"
-msgstr ""
+msgstr "IP estàtica"
#. TRANSLATORS: label for apply button in static ip settings
#: ../carrick/carrick-service-item.c:1902
msgid "Apply"
-msgstr ""
+msgstr "Applica"
#: ../src/carrick.c:49
-#, fuzzy
msgid "networks - not connected"
-msgstr "Connectat a la xarxa"
+msgstr "xarxes - no connectades"
#: ../src/carrick.c:55
-#, fuzzy
msgid "networks - connecting"
-msgstr "Connectat a la xarxa"
+msgstr "xarxes - connectant-s'hi"
#: ../src/carrick.c:61
msgid "networks - wired"
-msgstr ""
+msgstr "xarxes - amb fil"
#: ../src/carrick.c:63
#, c-format
msgid "networks - %s - wifi"
-msgstr ""
+msgstr "xarxes - %s - sense fil"
#: ../src/carrick.c:66
#, c-format
msgid "networks - %s - wimax"
-msgstr ""
+msgstr "xarxes - %s - wimax"
#: ../src/carrick.c:69
#, c-format
msgid "networks - %s - 3G"
-msgstr ""
+msgstr "xarxes - %s - 3G"
#: ../src/carrick.c:72
#, c-format
msgid "networks - %s - bluetooth"
-msgstr ""
+msgstr "xarxes - %s - bluetooth"
#: ../src/carrick.c:75 ../src/carrick.c:87
-#, fuzzy
msgid "networks"
-msgstr "Xarxes"
+msgstr "xarxes"
#: ../src/carrick.c:82
msgid "networks - error"
-msgstr ""
+msgstr "xarxes - error"
#: ../src/carrick.c:297
msgid "Run in standalone mode"
-msgstr ""
+msgstr "Executa en mode autònom"
#: ../src/carrick.c:299
msgid "Embed in another window (overrides --standalone)"
-msgstr ""
+msgstr "Incrusta en una altra finestra (ignora --autònom)"
#: ../src/carrick.c:310
msgid "Carrick connectivity applet"
@@ -472,9 +467,8 @@
msgstr ""
#: ../src/carrick.c:352 ../data/carrick.desktop.in.in.h:2
-#, fuzzy
msgid "network"
-msgstr "Xarxes"
+msgstr "xarxa"
#: ../callouts/3g/ggg-country-dialog.c:73
#: ../callouts/3g/ggg-manual-dialog.c:70 ../callouts/3g/ggg-plan-dialog.c:111
@@ -485,63 +479,60 @@
#: ../callouts/3g/ggg-country-dialog.c:93
msgid "Select Country"
-msgstr ""
+msgstr "Seleccioneu un país"
#: ../callouts/3g/ggg-manual-dialog.c:89
-#, fuzzy
msgid "Manual Configuration"
-msgstr "S'està configurant"
+msgstr "Configuració manual"
#: ../callouts/3g/ggg-manual-dialog.c:93
msgid "Plan Name (required):"
-msgstr ""
+msgstr "Nom del pla (obligatori):"
#: ../callouts/3g/ggg-manual-dialog.c:96
msgid "Username:"
-msgstr ""
+msgstr "Nom d'usuari:"
#: ../callouts/3g/ggg-manual-dialog.c:99
-#, fuzzy
msgid "Password:"
-msgstr "Contrasenya"
+msgstr "Contrasenya:"
#: ../callouts/3g/ggg-manual-dialog.c:103
msgid "Gateway:"
-msgstr ""
+msgstr "Passarel·la (gateway):"
#: ../callouts/3g/ggg-manual-dialog.c:106
msgid "Primary DNS:"
-msgstr ""
+msgstr "DNS primari:"
#: ../callouts/3g/ggg-manual-dialog.c:109
msgid "Secondary DNS:"
-msgstr ""
+msgstr "DNS secundari:"
#: ../callouts/3g/ggg-manual-dialog.c:112
msgid "Tertiary DNS:"
-msgstr ""
+msgstr "DNS terciari:"
#: ../callouts/3g/ggg-plan-dialog.c:131
msgid "Select your 3G Plan"
-msgstr ""
+msgstr "Seleccioneu el vostre pla 3G"
#: ../callouts/3g/ggg-provider-dialog.c:126
msgid "Select Provider"
-msgstr ""
+msgstr "Seleccioneu un proveïdor"
#: ../callouts/3g/ggg-service-dialog.c:59
#, c-format
msgid "%s (Roaming)"
-msgstr ""
+msgstr "%s (Itinerant)"
#: ../callouts/3g/ggg-service-dialog.c:125
msgid "Select 3G Service"
-msgstr ""
+msgstr "Seleccioneu un servei 3G"
#: ../data/carrick.desktop.in.in.h:1
-#, fuzzy
msgid "Network settings"
-msgstr "S'ha perdut la connexió"
+msgstr "Paràmetres de la connexió"
#~ msgid "Sorry, we can't find any networks. You could try turning on WiFi."
#~ msgstr "No s'ha trobat cap xarxa. Podeu provar d'engegar el wi-fi."
--- po/de.po
+++ po/de.po
@@ -3,9 +3,9 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-12 09:29+0000\n"
+"POT-Creation-Date: 2010-07-03 11:59+0000\n"
"PO-Revision-Date: \n"
-"Last-Translator: Clara Steiner-Jay <csteiner at aracnet.com>\n"
+"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@
#. * The conjunction 'or' will be at the end of a choice of disabled technologies,
#. * for example 'WiFi, WiMAX or 3G.
#.
-#: ../carrick/carrick-list.c:847
+#: ../carrick/carrick-list.c:843
msgid " or "
msgstr "oder "
@@ -28,37 +28,37 @@
#. * Translator note: the comma ',' will be used to join the different disabled technologies
#. * as in the above example; 'WiFi, WiMAX or 3G'
#.
-#: ../carrick/carrick-list.c:852
+#: ../carrick/carrick-list.c:848
msgid ", "
msgstr ", "
# Why are we distinguishing between "Ethernet" (further up in this list) and
# "wired"?
-#: ../carrick/carrick-list.c:853
+#: ../carrick/carrick-list.c:849
#: ../carrick/carrick-util.c:34
msgid "wired"
msgstr "verkabelt"
#. Switches
-#: ../carrick/carrick-list.c:854
+#: ../carrick/carrick-list.c:850
#: ../carrick/carrick-pane.c:1429
#: ../carrick/carrick-util.c:32
msgid "WiFi"
msgstr "WiFi"
-#: ../carrick/carrick-list.c:855
+#: ../carrick/carrick-list.c:851
#: ../carrick/carrick-pane.c:1471
#: ../carrick/carrick-util.c:38
msgid "WiMAX"
msgstr "WiMAX"
-#: ../carrick/carrick-list.c:856
+#: ../carrick/carrick-list.c:852
#: ../carrick/carrick-pane.c:1457
#: ../carrick/carrick-util.c:36
msgid "3G"
msgstr "3G"
-#: ../carrick/carrick-list.c:857
+#: ../carrick/carrick-list.c:853
#: ../carrick/carrick-pane.c:1485
#: ../carrick/carrick-util.c:40
msgid "Bluetooth"
@@ -69,7 +69,7 @@
#. * are no available networks because ConnMan, the
#. * connectivity daemon, is not running.
#.
-#: ../carrick/carrick-list.c:870
+#: ../carrick/carrick-list.c:866
msgid "Sorry, we can't find any networks. It appears that the connection manager is not running. You could try restarting your computer."
msgstr "Leider können wir keine Netzwerke finden. Der Verbindungsmanager scheint nicht zu laufen. Du solltest eventuell versuchen, dein Gerät neu zu starten."
@@ -77,11 +77,11 @@
#. * Hint display if we detect that the system is in
#. * offline mode and there are no available networks
#.
-#: ../carrick/carrick-list.c:880
+#: ../carrick/carrick-list.c:876
msgid "Sorry, we can't find any networks. You could try disabling Offline mode. "
msgstr "Leider können wir keine Netzwerke finden. Du könntest versuchen, den Offline-Modus zu deaktivieren."
-#: ../carrick/carrick-list.c:1017
+#: ../carrick/carrick-list.c:1013
#, c-format
msgid "Sorry, we can't find any networks. You could try enabling %s."
msgstr "Leider können wir keine Netzwerke finden. Du könntest versuchen, %s zu aktivieren."
@@ -91,78 +91,78 @@
#. * technologies are turned on, but for whatever reason we
#. * can not find any networks
#.
-#: ../carrick/carrick-list.c:1031
+#: ../carrick/carrick-list.c:1027
msgid "Sorry, we can't find any networks"
msgstr "Leider können wir keine Netzwerke finden."
-#: ../carrick/carrick-notification-manager.c:104
+#: ../carrick/carrick-notification-manager.c:124
msgid "Network connected"
msgstr "Netzwerk verbunden"
-#: ../carrick/carrick-notification-manager.c:112
+#: ../carrick/carrick-notification-manager.c:132
#, c-format
msgid "You're now connected to a wired network"
msgstr "Du bist zu einem drahtgebundenen Netzwerk verbunden"
-#: ../carrick/carrick-notification-manager.c:142
+#: ../carrick/carrick-notification-manager.c:162
#, c-format
msgid "You're now connected to %s, a %s network"
msgstr "Du bist mit %s, einem %s-Netzwerk, verbunden"
-#: ../carrick/carrick-notification-manager.c:148
+#: ../carrick/carrick-notification-manager.c:168
#, c-format
msgid "You're now connected to a %s network"
msgstr "Du bist mit einem %s-Netzwerk verbunden"
-#: ../carrick/carrick-notification-manager.c:165
+#: ../carrick/carrick-notification-manager.c:185
msgid "Network lost"
msgstr "Netzwerk verloren"
-#: ../carrick/carrick-notification-manager.c:173
+#: ../carrick/carrick-notification-manager.c:193
#, c-format
msgid "Sorry, we've lost your wired connection"
msgstr "Leider ging deine drahtgebundene Verbindung verloren"
-#: ../carrick/carrick-notification-manager.c:177
+#: ../carrick/carrick-notification-manager.c:197
#, c-format
msgid "Sorry we've lost your %s connection to %s"
msgstr "Leider ging deine %s-Verbindung zu %s verloren"
-#: ../carrick/carrick-notification-manager.c:183
+#: ../carrick/carrick-notification-manager.c:203
#, c-format
msgid "Sorry, we've lost your %s connection"
msgstr "Leider ging deine %s-Verbindung verloren"
-#: ../carrick/carrick-notification-manager.c:200
+#: ../carrick/carrick-notification-manager.c:220
msgid "Network changed"
msgstr "Netzwerk gewechselt"
-#: ../carrick/carrick-notification-manager.c:219
+#: ../carrick/carrick-notification-manager.c:239
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to a wired network"
msgstr "Leider ging deine Verbindung zu %s verloren. Daher haben wir dich mit einem drahtgebundenen Netzwerk verbunden."
-#: ../carrick/carrick-notification-manager.c:226
+#: ../carrick/carrick-notification-manager.c:246
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to %s, a %s network"
msgstr "Leider ging deine Verbindung zu %s verloren. Daher haben wir dich mit %s, einem %s-Netzwerk verbunden."
-#: ../carrick/carrick-notification-manager.c:234
+#: ../carrick/carrick-notification-manager.c:254
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to a %s network"
msgstr "Leider ging deine Verbindung zu %s verloren. Daher haben wir dich mit einem %s-Netzwerk verbunden."
-#: ../carrick/carrick-notification-manager.c:244
+#: ../carrick/carrick-notification-manager.c:264
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to a wired network"
msgstr "Leider ging deine %s Verbindung verloren. Daher haben wir dich mit einem drahtgebundenen Netzwerk verbunden."
-#: ../carrick/carrick-notification-manager.c:251
+#: ../carrick/carrick-notification-manager.c:271
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to %s, a %s network"
msgstr "Leider ging deine %s-Verbindung verloren. Daher haben wir dich mit %s, einem %s-Netzwerk verbunden."
-#: ../carrick/carrick-notification-manager.c:260
+#: ../carrick/carrick-notification-manager.c:280
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to a %s network"
msgstr "Leider ging deine %s-Verbindung verloren. Daher haben wir dich mit einem %s-Netzwerk verbunden."
@@ -201,7 +201,7 @@
msgstr "Kennwort"
#: ../carrick/carrick-pane.c:731
-#: ../carrick/carrick-service-item.c:1683
+#: ../carrick/carrick-service-item.c:1787
msgid "Show password"
msgstr "Kennwort anzeigen"
@@ -212,7 +212,7 @@
# Why are we distinguishing between "Ethernet" (further up in this list) and
# "wired"?
#: ../carrick/carrick-pane.c:1443
-#: ../carrick/carrick-service-item.c:278
+#: ../carrick/carrick-service-item.c:328
msgid "Wired"
msgstr "Kabel"
@@ -226,7 +226,7 @@
msgstr "Dies deaktiviert alle Verbindungen"
#: ../carrick/carrick-pane.c:1556
-#: ../src/carrick.c:351
+#: ../src/carrick.c:369
msgid "Networks"
msgstr "Netzwerke"
@@ -263,67 +263,67 @@
#. TRANSLATORS: this is a wireless security method, at least WEP,
#. * WPA and IEEE8021X are possible token values. Example: "WEP encrypted".
#.
-#: ../carrick/carrick-service-item.c:191
+#: ../carrick/carrick-service-item.c:192
#, c-format
msgid "%s encrypted"
msgstr "%s verschlüsselt"
-#: ../carrick/carrick-service-item.c:290
-#: ../carrick/carrick-service-item.c:307
+#: ../carrick/carrick-service-item.c:340
+#: ../carrick/carrick-service-item.c:357
msgid "Disconnect"
msgstr "Verbindung trennen"
-#: ../carrick/carrick-service-item.c:293
+#: ../carrick/carrick-service-item.c:343
msgid "Connected"
msgstr "Verbunden"
-#: ../carrick/carrick-service-item.c:310
+#: ../carrick/carrick-service-item.c:360
msgid "Online"
msgstr "Online"
-#: ../carrick/carrick-service-item.c:317
-#: ../carrick/carrick-service-item.c:326
+#: ../carrick/carrick-service-item.c:367
+#: ../carrick/carrick-service-item.c:376
#, c-format
msgid "Cancel"
msgstr "Abbrechen"
-#: ../carrick/carrick-service-item.c:320
+#: ../carrick/carrick-service-item.c:370
msgid "Configuring"
msgstr "Konfigurieren"
-#: ../carrick/carrick-service-item.c:329
+#: ../carrick/carrick-service-item.c:379
msgid "Associating"
msgstr "Assoziieren"
-#: ../carrick/carrick-service-item.c:338
-#: ../carrick/carrick-service-item.c:363
-#: ../carrick/carrick-service-item.c:1670
+#: ../carrick/carrick-service-item.c:388
+#: ../carrick/carrick-service-item.c:413
+#: ../carrick/carrick-service-item.c:1774
msgid "Connect"
msgstr "Verbinden"
-#: ../carrick/carrick-service-item.c:366
+#: ../carrick/carrick-service-item.c:416
msgid "Connection failed"
msgstr "Verbindung fehlgeschlagen"
-#: ../carrick/carrick-service-item.c:369
+#: ../carrick/carrick-service-item.c:419
msgid "Sorry, the connection failed. You could try again."
msgstr "Leider ist die Verbindung fehlgeschlagen. Du könntest es erneut versuchen."
-#: ../carrick/carrick-service-item.c:375
-#: ../carrick/carrick-service-item.c:378
+#: ../carrick/carrick-service-item.c:425
+#: ../carrick/carrick-service-item.c:428
#, c-format
msgid "Disconnecting"
msgstr "Verbindung wird getrennt"
-#: ../carrick/carrick-service-item.c:468
+#: ../carrick/carrick-service-item.c:494
msgid "Type password here"
msgstr "Kennwort hier eingeben"
-#: ../carrick/carrick-service-item.c:537
+#: ../carrick/carrick-service-item.c:563
msgid "Really remove?"
msgstr "Wirklich entfernen?"
-#: ../carrick/carrick-service-item.c:557
+#: ../carrick/carrick-service-item.c:583
#, c-format
msgid ""
"Do you want to remove the %s %s network? This\n"
@@ -334,54 +334,54 @@
"Kennwort geht damit verloren und es findet keine\n"
"automatische Verbindung zu %s mehr statt."
-#: ../carrick/carrick-service-item.c:753
+#: ../carrick/carrick-service-item.c:786
#, c-format
msgid "Your password isn't the right length. For a WEP connection it needs to be either 10 or 26 characters, you have %i."
msgstr "Dein Kennwort hat nicht die erforderliche Länge. Für eine WEP-Verbindung muss es entweder 10 oder 26 Zeichen haben, du hast %i."
-#: ../carrick/carrick-service-item.c:764
+#: ../carrick/carrick-service-item.c:797
#, c-format
msgid "Your password is too short. For a WPA connection it needs to be at least 8 characters long, you have %i"
msgstr "Dein Kennwort ist zu kurz. Für eine WPA-Verbindung muss es mindestens 8 Zeichen lang sein, du hast %i"
-#: ../carrick/carrick-service-item.c:768
+#: ../carrick/carrick-service-item.c:801
#, c-format
msgid "Your password is too long. For a WPA connection it needs to have fewer than 63 characters, you have %i"
msgstr "Dein Kennwort ist zu lang. Für eine WPA-Verbindung muss es weniger als 63 Zeichen haben, du hast %i"
-#: ../carrick/carrick-service-item.c:777
+#: ../carrick/carrick-service-item.c:810
#, c-format
msgid "Your password is too short. For a WPA2 connection it needs to be at least 8 characters long, you have %i"
msgstr "Dein Kennwort ist zu kurz. Für eine WPA-Verbindung muss es mindestens 8 Zeichen lang sein, du hast %i"
-#: ../carrick/carrick-service-item.c:781
+#: ../carrick/carrick-service-item.c:814
#, c-format
msgid "Your password is too long. For a WPA2 connection it needs to have fewer than 63 characters, you have %i"
msgstr "Dein Kennwort ist zu lang. Für eine WPA2-Verbindung muss es weniger als 63 Zeichen haben, du hast %i"
-#: ../carrick/carrick-service-item.c:1227
+#: ../carrick/carrick-service-item.c:1267
msgid "Sorry, it looks like the IP address is not valid"
msgstr "Leider ist die IP-Adresse ungültig."
-#: ../carrick/carrick-service-item.c:1239
+#: ../carrick/carrick-service-item.c:1279
msgid "Sorry, it looks like the gateway address is not valid"
msgstr "Leider ist die Gateway-Adresse ungültig."
-#: ../carrick/carrick-service-item.c:1251
+#: ../carrick/carrick-service-item.c:1291
msgid "Sorry, it looks like the subnet mask is not valid"
msgstr "Leider ist die Subnet Mask ungültig."
-#: ../carrick/carrick-service-item.c:1271
+#: ../carrick/carrick-service-item.c:1336
#, c-format
msgid "Sorry, it looks like the nameserver address '%s' is not valid"
msgstr "Leider ist die Nameserver-Adresse '%s ungültig."
#. TRANSLATORS: label for the Advanced expander in a service item
-#: ../carrick/carrick-service-item.c:1594
+#: ../carrick/carrick-service-item.c:1698
msgid "Advanced"
msgstr "Erweitert"
-#: ../carrick/carrick-service-item.c:1604
+#: ../carrick/carrick-service-item.c:1708
msgid "Scanning"
msgstr "Suchen"
@@ -389,107 +389,107 @@
#. TRANSLATORS: This is an example of a wireless security method
#. (see another translator comment), used to estimate the string length.
#. It should look like the ones below network name in the UI
-#: ../carrick/carrick-service-item.c:1625
+#: ../carrick/carrick-service-item.c:1729
msgid "WPA2 encrypted"
msgstr "WPA2 verschlüsselt"
#. TRANSLATORS: label in advanced settings (next to combobox
#. * for DHCP/Static IP)
-#: ../carrick/carrick-service-item.c:1732
+#: ../carrick/carrick-service-item.c:1836
msgid "Connect by:"
msgstr "Verbinden über:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1734
+#: ../carrick/carrick-service-item.c:1838
msgid "IP address:"
msgstr "IP-Adresse:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1736
+#: ../carrick/carrick-service-item.c:1840
msgid "Subnet mask:"
msgstr "Subnet Mask:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1738
+#: ../carrick/carrick-service-item.c:1842
msgid "Router:"
msgstr "Router:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1740
+#: ../carrick/carrick-service-item.c:1844
msgid "DNS:"
msgstr "DNS:"
-#: ../carrick/carrick-service-item.c:1747
+#: ../carrick/carrick-service-item.c:1850
msgid "DHCP"
msgstr "DHCP"
-#: ../carrick/carrick-service-item.c:1749
+#: ../carrick/carrick-service-item.c:1852
msgid "Static IP"
msgstr "Statische IP"
#. TRANSLATORS: label for apply button in static ip settings
-#: ../carrick/carrick-service-item.c:1776
+#: ../carrick/carrick-service-item.c:1902
msgid "Apply"
msgstr "Anwenden"
-#: ../src/carrick.c:43
+#: ../src/carrick.c:49
msgid "networks - not connected"
msgstr "Netzwerke - nicht verbunden"
-#: ../src/carrick.c:49
+#: ../src/carrick.c:55
msgid "networks - connecting"
msgstr "Netzwerke - verbinden"
-#: ../src/carrick.c:55
+#: ../src/carrick.c:61
msgid "networks - wired"
msgstr "Netzwerke - verdrahtet"
-#: ../src/carrick.c:57
+#: ../src/carrick.c:63
#, c-format
msgid "networks - %s - wifi"
msgstr "Netzwerke - %s - WiFi"
-#: ../src/carrick.c:60
+#: ../src/carrick.c:66
#, c-format
msgid "networks - %s - wimax"
msgstr "Netzwerke - %s - WiMAX"
-#: ../src/carrick.c:63
+#: ../src/carrick.c:69
#, c-format
msgid "networks - %s - 3G"
msgstr "Netzwerke - %s - 3G"
-#: ../src/carrick.c:66
+#: ../src/carrick.c:72
#, c-format
msgid "networks - %s - bluetooth"
msgstr "Netzwerke - %s - Bluetooth"
-#: ../src/carrick.c:69
-#: ../src/carrick.c:81
+#: ../src/carrick.c:75
+#: ../src/carrick.c:87
msgid "networks"
msgstr "Netzwerke"
-#: ../src/carrick.c:76
+#: ../src/carrick.c:82
msgid "networks - error"
msgstr "Netzwerke - Fehler"
-#: ../src/carrick.c:279
+#: ../src/carrick.c:297
msgid "Run in standalone mode"
msgstr "Im eigenständigen Modus ausführen"
-#: ../src/carrick.c:281
+#: ../src/carrick.c:299
msgid "Embed in another window (overrides --standalone)"
msgstr "In einem anderen Fenster einschließen (überschreibt -- Standalone)"
-#: ../src/carrick.c:292
+#: ../src/carrick.c:310
msgid "Carrick connectivity applet"
msgstr "Carrick Verbindungs-Applet"
-#: ../src/carrick.c:293
-msgid "- Moblin connectivity applet"
-msgstr "- Moblin Verbindungs-Applet"
+#: ../src/carrick.c:311
+msgid "- MeeGo connectivity applet"
+msgstr "- MeeGo Verbindungs-Applet"
-#: ../src/carrick.c:334
+#: ../src/carrick.c:352
#: ../data/carrick.desktop.in.in.h:2
msgid "network"
msgstr "Netzwerk"
@@ -561,68 +561,92 @@
#~ msgid "Manual Config"
#~ msgstr "Manuelle Konfig."
+
#~ msgid "Sorry, we can't find any networks. You could try turning on 3G."
#~ msgstr ""
#~ "Leider können wir keine Netzwerke finden. Du könntest versuchen, 3G zu "
#~ "aktivieren."
+
#~ msgid "Sorry, we can't find any networks. You could try turning on WiFi."
#~ msgstr ""
#~ "Leider können wir keine Netzwerke finden. Du könntest versuchen, WiFi zu "
#~ "aktivieren."
+
#~ msgid "Sorry, we can't find any networks. You could try turning on WiMAX."
#~ msgstr ""
#~ "Leider können wir keine Netzwerke finden. Du könntest versuchen, WiMAX zu "
#~ "aktivieren."
+
#~ msgid ""
#~ "Sorry, we can't find any networks. You could try turning on Bluetooth."
#~ msgstr ""
#~ "Leider können wir keine Netzwerke finden. Du könntest versuchen, "
#~ "Bluetooth zu aktivieren."
+
#~ msgid "Sorry, we can't find any networks. You could try turning on Wired."
#~ msgstr ""
#~ "Leider können wir keine Netzwerke finden. Du könntest versuchen, ein "
#~ "drahtgebundenes Netzwerk zu aktivieren."
+
#~ msgid "Sorry, we can't find any networks. "
#~ msgstr "Leider können wir keine Netzwerke finden. "
+
#~ msgid ""
#~ "The ConnMan daemon doesn't seem to be running. You may want to try re-"
#~ "starting your device"
#~ msgstr ""
#~ "Der ConnMan Daemon scheint nicht zu laufen. Du solltest eventuell "
#~ "versuchen, dein Gerät neu zu starten."
+
#~ msgid "You could try disabling Offline mode"
#~ msgstr "Du könntest versuchen, den Offline-Modus zu deaktivieren."
+
#~ msgid "You could try turning on "
#~ msgstr "Versuche folgendes einzuschalten: "
+
#~ msgid " and "
#~ msgstr " und "
+
#~ msgid "Ethernet"
#~ msgstr "Ethernet"
+
#~ msgid "Sorry, your connection to %s was lost. So we've "
#~ msgstr "Leider ging deine Verbindung zu %s verloren. Daher haben wir"
+
#~ msgid "Sorry, your %s connection was lost. So we've "
#~ msgstr "Leider ging deine %s-Verbindung verloren. Daher haben wir"
+
#~ msgid "connected you to a wired network"
#~ msgstr "dich mit einem drahtgebundenen Netzwerk verbunden"
+
#~ msgid "connected you to %s, a %s network"
#~ msgstr "dich mit %s, einem %s-Netzwerk verbunden"
+
#~ msgid "connected you to a %s network"
#~ msgstr "dich mit einem %s-Netzwerk verbunden"
+
#~ msgid "Sorry, your wired connection was lost. So we've "
#~ msgstr ""
#~ "Leider ging deine drahtgebundene Verbindung verloren. Daher haben wir"
+
#~ msgid "Offline"
#~ msgstr "Offline"
+
#~ msgid "No active connection."
#~ msgstr "Keine Netzwerkverbindung verfügbar."
+
#~ msgid "Now online and connected to %s."
#~ msgstr "Du bist online und als %s angemeldet."
+
#~ msgid "Connecting"
#~ msgstr "Verbindung wird hergestellt"
+
#~ msgid "<b><big>Network Requires a Password</big></b>"
#~ msgstr "<b><big>Netzwerk verlangt ein Kennwort</big></b>"
+
#~ msgid "Please enter the password for this network:"
#~ msgstr "Bitte das Kennwort für das Netzwerk eingeben:"
+
#~ msgid ""
#~ "Sorry, we can't find any networks. The Connection Manager doesn't seem to "
#~ "be running. You may want to try re-starting your device."
@@ -630,12 +654,15 @@
#~ "Leider können wir keine Netzwerke finden. Der Verbindungsmanager scheint "
#~ "nicht zu laufen. Du solltest eventuell versuchen, dein Gerät neu zu "
#~ "starten."
+
#~ msgid "Passphrase required"
#~ msgstr "Kennwort erforderlich"
+
#~ msgid "Select your 3G Data Plan"
#~ msgstr "Ihren 3G Datenplan wählen"
+
#~ msgid "Plan Name: (required)"
#~ msgstr "Planname: (erforderlich)"
+
#~ msgid "Tertairy DNS:"
#~ msgstr "Tertiäre DNS:"
-
--- po/es.po
+++ po/es.po
@@ -1,9 +1,9 @@
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-12 09:29+0000\n"
+"POT-Creation-Date: 2010-07-03 11:59+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: Tomás Galicia <tomas.galicia at intel.com>\n"
"Language-Team: \n"
@@ -14,153 +14,146 @@
"X-Poedit-Language: Spanish\n"
"X-Poedit-SourceCharset: utf-8\n"
-#.
-#. * Translator note: The disabled technologies available to be turned on is put together at
+#. * Translator note: The disabled technologies available to be turned on is
+#. put together at
#. * runtime.
-#. * The conjunction 'or' will be at the end of a choice of disabled technologies,
+#. * The conjunction 'or' will be at the end of a choice of disabled
+#. technologies,
#. * for example 'WiFi, WiMAX or 3G.
-#.
-#: ../carrick/carrick-list.c:847
+#.
+#: ../carrick/carrick-list.c:843
msgid " or "
msgstr " o "
-#.
-#. * Translator note: the comma ',' will be used to join the different disabled technologies
+#. * Translator note: the comma ',' will be used to join the different
+#. disabled technologies
#. * as in the above example; 'WiFi, WiMAX or 3G'
-#.
-#: ../carrick/carrick-list.c:852
+#.
+#: ../carrick/carrick-list.c:848
msgid ", "
msgstr ", "
-#: ../carrick/carrick-list.c:853
-#: ../carrick/carrick-util.c:34
+#: ../carrick/carrick-list.c:849 ../carrick/carrick-util.c:34
msgid "wired"
msgstr "Por cable"
#. Switches
-#: ../carrick/carrick-list.c:854
-#: ../carrick/carrick-pane.c:1429
+#: ../carrick/carrick-list.c:850 ../carrick/carrick-pane.c:1429
#: ../carrick/carrick-util.c:32
msgid "WiFi"
msgstr "Wi-Fi"
-#: ../carrick/carrick-list.c:855
-#: ../carrick/carrick-pane.c:1471
+#: ../carrick/carrick-list.c:851 ../carrick/carrick-pane.c:1471
#: ../carrick/carrick-util.c:38
msgid "WiMAX"
msgstr "WiMAX"
-#: ../carrick/carrick-list.c:856
-#: ../carrick/carrick-pane.c:1457
+#: ../carrick/carrick-list.c:852 ../carrick/carrick-pane.c:1457
#: ../carrick/carrick-util.c:36
msgid "3G"
msgstr "3G"
-#: ../carrick/carrick-list.c:857
-#: ../carrick/carrick-pane.c:1485
+#: ../carrick/carrick-list.c:853 ../carrick/carrick-pane.c:1485
#: ../carrick/carrick-util.c:40
msgid "Bluetooth"
msgstr "Bluetooth"
-#.
#. * Translators: this string is displayed if there
#. * are no available networks because ConnMan, the
#. * connectivity daemon, is not running.
-#.
-#: ../carrick/carrick-list.c:870
+#.
+#: ../carrick/carrick-list.c:866
msgid "Sorry, we can't find any networks. It appears that the connection manager is not running. You could try restarting your computer."
msgstr "No se encuentra ninguna red. Parece que el gestor de conexiones no está ejecutándose. Se recomienda reinicar el miniportátil."
-#.
#. * Hint display if we detect that the system is in
#. * offline mode and there are no available networks
-#.
-#: ../carrick/carrick-list.c:880
+#.
+#: ../carrick/carrick-list.c:876
msgid "Sorry, we can't find any networks. You could try disabling Offline mode. "
msgstr "No se encuentra ninguna red. Puede que haya que desactivar el modo fuera de línea."
-#: ../carrick/carrick-list.c:1017
+#: ../carrick/carrick-list.c:1013
#, c-format
msgid "Sorry, we can't find any networks. You could try enabling %s."
msgstr "No se encuentra ninguna red. Puede que haya que activar el modo %s."
-#.
#. * Generic message to display if all available networking
#. * technologies are turned on, but for whatever reason we
#. * can not find any networks
-#.
-#: ../carrick/carrick-list.c:1031
+#.
+#: ../carrick/carrick-list.c:1027
msgid "Sorry, we can't find any networks"
msgstr "No se encuentra ninguna red. "
-#: ../carrick/carrick-notification-manager.c:104
+#: ../carrick/carrick-notification-manager.c:124
msgid "Network connected"
msgstr "Red conectada"
-#: ../carrick/carrick-notification-manager.c:112
+#: ../carrick/carrick-notification-manager.c:132
#, c-format
msgid "You're now connected to a wired network"
msgstr "Estás conectado a una red con cable"
-#: ../carrick/carrick-notification-manager.c:142
+#: ../carrick/carrick-notification-manager.c:162
#, c-format
msgid "You're now connected to %s, a %s network"
msgstr "Estás conectado a %s, una red %s"
-#: ../carrick/carrick-notification-manager.c:148
+#: ../carrick/carrick-notification-manager.c:168
#, c-format
msgid "You're now connected to a %s network"
msgstr "Estás conectado a una red %s"
-#: ../carrick/carrick-notification-manager.c:165
+#: ../carrick/carrick-notification-manager.c:185
msgid "Network lost"
msgstr "Se ha perdido la red"
-#: ../carrick/carrick-notification-manager.c:173
+#: ../carrick/carrick-notification-manager.c:193
#, c-format
msgid "Sorry, we've lost your wired connection"
msgstr "Hemos perdido la conexión con cable"
-#: ../carrick/carrick-notification-manager.c:177
+#: ../carrick/carrick-notification-manager.c:197
#, c-format
msgid "Sorry we've lost your %s connection to %s"
msgstr "Hemos perdido la conexión %s a %s"
-#: ../carrick/carrick-notification-manager.c:183
+#: ../carrick/carrick-notification-manager.c:203
#, c-format
msgid "Sorry, we've lost your %s connection"
msgstr "Hemos perdido la conexión %s"
-#: ../carrick/carrick-notification-manager.c:200
+#: ../carrick/carrick-notification-manager.c:220
msgid "Network changed"
msgstr "Ha cambiado la red"
-#: ../carrick/carrick-notification-manager.c:219
+#: ../carrick/carrick-notification-manager.c:239
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to a wired network"
msgstr "Hemos perdido la conexión a %s, así que te hemos conectado a una red cableada."
-#: ../carrick/carrick-notification-manager.c:226
+#: ../carrick/carrick-notification-manager.c:246
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to %s, a %s network"
msgstr "Hemos perdido la conexión a %s, así que te hemos conectado a %s, una red %s."
-#: ../carrick/carrick-notification-manager.c:234
+#: ../carrick/carrick-notification-manager.c:254
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to a %s network"
msgstr "Hemos perdido la conexión a %s, así que te hemos conectado a una red %s."
-#: ../carrick/carrick-notification-manager.c:244
+#: ../carrick/carrick-notification-manager.c:264
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to a wired network"
msgstr "Hemos perdido la conexión %s, así que te hemos a una red cableada."
-#: ../carrick/carrick-notification-manager.c:251
+#: ../carrick/carrick-notification-manager.c:271
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to %s, a %s network"
msgstr "Hemos perdido la conexión %s, así que te hemos conectado a %s, una red %s."
-#: ../carrick/carrick-notification-manager.c:260
+#: ../carrick/carrick-notification-manager.c:280
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to a %s network"
msgstr "Hemos perdido la conexión %s, así que te hemos conectado a una red %s."
@@ -195,8 +188,7 @@
msgid "Password"
msgstr "Contraseña"
-#: ../carrick/carrick-pane.c:731
-#: ../carrick/carrick-service-item.c:1683
+#: ../carrick/carrick-pane.c:731 ../carrick/carrick-service-item.c:1787
msgid "Show password"
msgstr "Mostrar la contraseña"
@@ -204,8 +196,7 @@
msgid "Settings"
msgstr "Ajustes"
-#: ../carrick/carrick-pane.c:1443
-#: ../carrick/carrick-service-item.c:278
+#: ../carrick/carrick-pane.c:1443 ../carrick/carrick-service-item.c:328
msgid "Wired"
msgstr "Con cable"
@@ -217,8 +208,7 @@
msgid "This will disable all your connections"
msgstr "Esto deshabilitará todas las conexiones"
-#: ../carrick/carrick-pane.c:1556
-#: ../src/carrick.c:351
+#: ../carrick/carrick-pane.c:1556 ../src/carrick.c:369
msgid "Networks"
msgstr "Redes"
@@ -230,7 +220,7 @@
#. Translators:
#. The following are potential errors that a user might see while
#. attempting to configure a 3G data service.
-#.
+#.
#: ../carrick/carrick-service-item.c:51
msgid "Critical Error: Invalid country code"
msgstr "Error crítico: el código de país no es válido"
@@ -253,68 +243,64 @@
#. TRANSLATORS: this is a wireless security method, at least WEP,
#. * WPA and IEEE8021X are possible token values. Example: "WEP encrypted".
-#.
-#: ../carrick/carrick-service-item.c:191
+#.
+#: ../carrick/carrick-service-item.c:192
#, c-format
msgid "%s encrypted"
msgstr "%s cifrado"
-#: ../carrick/carrick-service-item.c:290
-#: ../carrick/carrick-service-item.c:307
+#: ../carrick/carrick-service-item.c:340 ../carrick/carrick-service-item.c:357
msgid "Disconnect"
msgstr "Desconectarse"
-#: ../carrick/carrick-service-item.c:293
+#: ../carrick/carrick-service-item.c:343
msgid "Connected"
msgstr "Conectado"
-#: ../carrick/carrick-service-item.c:310
+#: ../carrick/carrick-service-item.c:360
msgid "Online"
msgstr "En línea"
-#: ../carrick/carrick-service-item.c:317
-#: ../carrick/carrick-service-item.c:326
+#: ../carrick/carrick-service-item.c:367 ../carrick/carrick-service-item.c:376
#, c-format
msgid "Cancel"
msgstr "Cancelar"
-#: ../carrick/carrick-service-item.c:320
+#: ../carrick/carrick-service-item.c:370
msgid "Configuring"
msgstr "Configurando"
-#: ../carrick/carrick-service-item.c:329
+#: ../carrick/carrick-service-item.c:379
msgid "Associating"
msgstr "Asociándose"
-#: ../carrick/carrick-service-item.c:338
-#: ../carrick/carrick-service-item.c:363
-#: ../carrick/carrick-service-item.c:1670
+#: ../carrick/carrick-service-item.c:388 ../carrick/carrick-service-item.c:413
+#: ../carrick/carrick-service-item.c:1774
msgid "Connect"
msgstr "Conectarse"
-#: ../carrick/carrick-service-item.c:366
+#: ../carrick/carrick-service-item.c:416
msgid "Connection failed"
msgstr "Falló la conexión"
-#: ../carrick/carrick-service-item.c:369
+#: ../carrick/carrick-service-item.c:419
msgid "Sorry, the connection failed. You could try again."
msgstr "Error en la conexión. Inténtalo otra vez."
-#: ../carrick/carrick-service-item.c:375
-#: ../carrick/carrick-service-item.c:378
+#: ../carrick/carrick-service-item.c:425 ../carrick/carrick-service-item.c:428
#, c-format
msgid "Disconnecting"
msgstr "Desconectándose"
-#: ../carrick/carrick-service-item.c:468
+#: ../carrick/carrick-service-item.c:494
msgid "Type password here"
msgstr "Escribe la contraseña"
-#: ../carrick/carrick-service-item.c:537
+#: ../carrick/carrick-service-item.c:563
msgid "Really remove?"
msgstr "¿Eliminar? ¿seguro?"
-#: ../carrick/carrick-service-item.c:557
+#: ../carrick/carrick-service-item.c:583
#, c-format
msgid ""
"Do you want to remove the %s %s network? This\n"
@@ -325,54 +311,54 @@
"Se olvidará la contraseña y no te\n"
"conectarás automáticamente a %s."
-#: ../carrick/carrick-service-item.c:753
+#: ../carrick/carrick-service-item.c:786
#, c-format
msgid "Your password isn't the right length. For a WEP connection it needs to be either 10 or 26 characters, you have %i."
msgstr "La contraseña no tiene la longitud adecuada. Una conexión WEP requiere 10 o 26 caracteres. Tu contraseña tiene %i."
-#: ../carrick/carrick-service-item.c:764
+#: ../carrick/carrick-service-item.c:797
#, c-format
msgid "Your password is too short. For a WPA connection it needs to be at least 8 characters long, you have %i"
msgstr "La contraseña es demasiado corta. Una conexión WPA requiere al menos 8 caracteres. Tu contraseña tiene %i."
-#: ../carrick/carrick-service-item.c:768
+#: ../carrick/carrick-service-item.c:801
#, c-format
msgid "Your password is too long. For a WPA connection it needs to have fewer than 63 characters, you have %i"
msgstr "La contraseña es demasiado larga. Una conexión WPA requiere menos de 63 caracteres. Tu contraseña tiene %i."
-#: ../carrick/carrick-service-item.c:777
+#: ../carrick/carrick-service-item.c:810
#, c-format
msgid "Your password is too short. For a WPA2 connection it needs to be at least 8 characters long, you have %i"
msgstr "La contraseña es demasiado corta. Una conexión WPA2 requiere al menos 8 caracteres. Tu contraseña tiene %i."
-#: ../carrick/carrick-service-item.c:781
+#: ../carrick/carrick-service-item.c:814
#, c-format
msgid "Your password is too long. For a WPA2 connection it needs to have fewer than 63 characters, you have %i"
msgstr "La contraseña es demasiado larga. Una conexión WPA2 requiere menos de 63 caracteres. Tu contraseña tiene %i."
-#: ../carrick/carrick-service-item.c:1227
+#: ../carrick/carrick-service-item.c:1267
msgid "Sorry, it looks like the IP address is not valid"
msgstr "Parece que la dirección IP no es válida"
-#: ../carrick/carrick-service-item.c:1239
+#: ../carrick/carrick-service-item.c:1279
msgid "Sorry, it looks like the gateway address is not valid"
msgstr "Parece que la dirección de la puerta de salida no es válida"
-#: ../carrick/carrick-service-item.c:1251
+#: ../carrick/carrick-service-item.c:1291
msgid "Sorry, it looks like the subnet mask is not valid"
msgstr "Parece que la máscara de subnet no es válida"
-#: ../carrick/carrick-service-item.c:1271
+#: ../carrick/carrick-service-item.c:1336
#, c-format
msgid "Sorry, it looks like the nameserver address '%s' is not valid"
msgstr "Parece que la dirección del servidor de nombres '%s' no es válida"
#. TRANSLATORS: label for the Advanced expander in a service item
-#: ../carrick/carrick-service-item.c:1594
+#: ../carrick/carrick-service-item.c:1698
msgid "Advanced"
msgstr "Avanzado"
-#: ../carrick/carrick-service-item.c:1604
+#: ../carrick/carrick-service-item.c:1708
msgid "Scanning"
msgstr "Buscando"
@@ -380,114 +366,111 @@
#. TRANSLATORS: This is an example of a wireless security method
#. (see another translator comment), used to estimate the string length.
#. It should look like the ones below network name in the UI
-#: ../carrick/carrick-service-item.c:1625
+#: ../carrick/carrick-service-item.c:1729
msgid "WPA2 encrypted"
msgstr "Cifrado WPA2"
#. TRANSLATORS: label in advanced settings (next to combobox
#. * for DHCP/Static IP)
-#: ../carrick/carrick-service-item.c:1732
+#: ../carrick/carrick-service-item.c:1836
msgid "Connect by:"
msgstr "Conectarse con:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1734
+#: ../carrick/carrick-service-item.c:1838
msgid "IP address:"
msgstr "Dirección IP:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1736
+#: ../carrick/carrick-service-item.c:1840
msgid "Subnet mask:"
msgstr "Máscara de subnet:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1738
+#: ../carrick/carrick-service-item.c:1842
msgid "Router:"
msgstr "Enrutador:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1740
+#: ../carrick/carrick-service-item.c:1844
msgid "DNS:"
msgstr "DNS:"
-#: ../carrick/carrick-service-item.c:1747
+#: ../carrick/carrick-service-item.c:1850
msgid "DHCP"
msgstr "DHCP"
-#: ../carrick/carrick-service-item.c:1749
+#: ../carrick/carrick-service-item.c:1852
msgid "Static IP"
msgstr "IP estática"
#. TRANSLATORS: label for apply button in static ip settings
-#: ../carrick/carrick-service-item.c:1776
+#: ../carrick/carrick-service-item.c:1902
msgid "Apply"
msgstr "Aplicar"
-#: ../src/carrick.c:43
+#: ../src/carrick.c:49
msgid "networks - not connected"
msgstr "No hay redes conectadas"
-#: ../src/carrick.c:49
+#: ../src/carrick.c:55
msgid "networks - connecting"
msgstr "Conectándose a redes"
-#: ../src/carrick.c:55
+#: ../src/carrick.c:61
msgid "networks - wired"
msgstr "Red cableada"
-#: ../src/carrick.c:57
+#: ../src/carrick.c:63
#, c-format
msgid "networks - %s - wifi"
msgstr "Red WiFi - %s -"
-#: ../src/carrick.c:60
+#: ../src/carrick.c:66
#, c-format
msgid "networks - %s - wimax"
msgstr "Red WiMAX - %s -"
-#: ../src/carrick.c:63
+#: ../src/carrick.c:69
#, c-format
msgid "networks - %s - 3G"
msgstr "Red 3G - %s -"
-#: ../src/carrick.c:66
+#: ../src/carrick.c:72
#, c-format
msgid "networks - %s - bluetooth"
msgstr "Red bluetooth - %s -"
-#: ../src/carrick.c:69
-#: ../src/carrick.c:81
+#: ../src/carrick.c:75 ../src/carrick.c:87
msgid "networks"
msgstr "Redes"
-#: ../src/carrick.c:76
+#: ../src/carrick.c:82
msgid "networks - error"
msgstr "Redes - error"
-#: ../src/carrick.c:279
+#: ../src/carrick.c:297
msgid "Run in standalone mode"
msgstr "Ejecutar en modo desatendido"
-#: ../src/carrick.c:281
+#: ../src/carrick.c:299
msgid "Embed in another window (overrides --standalone)"
msgstr "Encajar en otra ventana (eliminar --independientes)"
-#: ../src/carrick.c:292
+#: ../src/carrick.c:310
msgid "Carrick connectivity applet"
msgstr "Applet de conectividad Carrick"
-#: ../src/carrick.c:293
-msgid "- Moblin connectivity applet"
-msgstr "- Applet de conectividad Moblin"
+#: ../src/carrick.c:311
+msgid "- MeeGo connectivity applet"
+msgstr "- Applet de conectividad de MeeGo"
-#: ../src/carrick.c:334
-#: ../data/carrick.desktop.in.in.h:2
+#: ../src/carrick.c:352 ../data/carrick.desktop.in.in.h:2
msgid "network"
msgstr "Red"
#: ../callouts/3g/ggg-country-dialog.c:73
-#: ../callouts/3g/ggg-manual-dialog.c:70
-#: ../callouts/3g/ggg-plan-dialog.c:111
+#: ../callouts/3g/ggg-manual-dialog.c:70 ../callouts/3g/ggg-plan-dialog.c:111
#: ../callouts/3g/ggg-provider-dialog.c:106
#: ../callouts/3g/ggg-service-dialog.c:106
msgid "Cellular Data Connection Wizard"
@@ -552,69 +535,81 @@
#~ msgid "Manual Config"
#~ msgstr "Configuración manual"
-#~ msgid ""
-#~ "Sorry, we can't find any networks. It appears that the ConnMan daemon is "
-#~ "not running. You could try re-starting your netbook."
-#~ msgstr ""
-#~ "No se encuentra ninguna red. Parece que el ConnMan no está ejecutándose. "
-#~ "Se recomienda reinicar el miniportátil."
+
+#~ msgid "Sorry, we can't find any networks. It appears that the ConnMan daemon is not running. You could try re-starting your netbook."
+#~ msgstr "No se encuentra ninguna red. Parece que el ConnMan no está ejecutándose. Se recomienda reinicar el miniportátil."
+
#~ msgid "Sorry, we can't find any networks. You could try turning on 3G."
#~ msgstr "No se encuentra ninguna red. Puede que haya que activar el modo 3G."
+
#~ msgid "Sorry, we can't find any networks. You could try turning on WiFi."
-#~ msgstr ""
-#~ "No se encuentra ninguna red. Puede que haya que activar el modo WiFI."
+#~ msgstr "No se encuentra ninguna red. Puede que haya que activar el modo WiFI."
+
#~ msgid "Sorry, we can't find any networks. You could try turning on WiMAX."
-#~ msgstr ""
-#~ "No se encuentra ninguna red. Puede que haya que activar el modo WiMAX."
-#~ msgid ""
-#~ "Sorry, we can't find any networks. You could try turning on Bluetooth."
-#~ msgstr ""
-#~ "No se encuentra ninguna red. Puede que haya que activar el modo Bluetooth."
+#~ msgstr "No se encuentra ninguna red. Puede que haya que activar el modo WiMAX."
+
+#~ msgid "Sorry, we can't find any networks. You could try turning on Bluetooth."
+#~ msgstr "No se encuentra ninguna red. Puede que haya que activar el modo Bluetooth."
+
#~ msgid "Sorry, we can't find any networks. You could try turning on Wired."
-#~ msgstr ""
-#~ "No se encuentra ninguna red. Puede que haya que activar la red alámbrica."
+#~ msgstr "No se encuentra ninguna red. Puede que haya que activar la red alámbrica."
+
#~ msgid "Sorry, we can't find any networks. "
#~ msgstr "No se encuentra ninguna red."
-#~ msgid ""
-#~ "The ConnMan daemon doesn't seem to be running. You may want to try re-"
-#~ "starting your device"
-#~ msgstr ""
-#~ "No se está ejecutando el proceso en segundo plano ConnMan. Reinicia el "
-#~ "dispositivo."
+
+#~ msgid "The ConnMan daemon doesn't seem to be running. You may want to try re-starting your device"
+#~ msgstr "No se está ejecutando el proceso en segundo plano ConnMan. Reinicia el dispositivo."
+
#~ msgid "You could try disabling Offline mode"
#~ msgstr "Inténtalo desactivando el modo fuera de línea"
+
#~ msgid "You could try turning on "
#~ msgstr "Inténtalo encendiendo "
+
#~ msgid " and "
#~ msgstr " y "
+
#~ msgid "Ethernet"
#~ msgstr "Ethernet"
+
#~ msgid "Sorry, your connection to %s was lost. So we've "
#~ msgstr "Hemos perdido la conexión a %s, así que te hemos"
+
#~ msgid "Sorry, your %s connection was lost. So we've "
#~ msgstr "Hemos perdido la conexión %s, así que te hemos"
+
#~ msgid "connected you to a wired network"
#~ msgstr "conectado a una red alámbrica"
+
#~ msgid "connected you to %s, a %s network"
#~ msgstr "conectado a %s, una red %s"
+
#~ msgid "connected you to a %s network"
#~ msgstr "conectado a una red %s"
+
#~ msgid "Sorry, your wired connection was lost. So we've "
#~ msgstr "Hemos perdido la conexión alámbrica, así que te hemos"
+
#~ msgid "Abort"
#~ msgstr "Cancelar"
+
#~ msgid "Offline"
#~ msgstr "Fuera de línea"
+
#~ msgid "No active connection."
#~ msgstr "No hay conexión activa."
+
#~ msgid "Now online and connected to %s."
#~ msgstr "Está ahora en línea y conectado a %s."
+
#~ msgid "Connecting"
#~ msgstr "Conectándose"
+
#~ msgid "<b><big>Network Requires a Password</big></b>"
#~ msgstr "<b><big>La red requiere de una contraseña</big></b>"
+
#~ msgid "Please enter the password for this network:"
#~ msgstr "Por favor ingrese la contraseña para esta red:"
+
#~ msgid "Passphrase required"
#~ msgstr "Frase clave requerida"
-
--- po/fa.po
+++ po/fa.po
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-07-03 11:59+0000\n"
+"PO-Revision-Date: 2010-08-12 15:36+0330\n"
+"Last-Translator: Mostafa <info at mostafadaneshvar.com>\n"
+"Language-Team: Persian <trans-fa at lists.fedoraproject.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Persian\n"
+"X-Poedit-Country: Iran\n"
+
+#.
+#. * Translator note: The disabled technologies available to be turned on is put together at
+#. * runtime.
+#. * The conjunction 'or' will be at the end of a choice of disabled technologies,
+#. * for example 'WiFi, WiMAX or 3G.
+#.
+#: ../carrick/carrick-list.c:843
+msgid " or "
+msgstr "یا"
+
+#.
+#. * Translator note: the comma ',' will be used to join the different disabled technologies
+#. * as in the above example; 'WiFi, WiMAX or 3G'
+#.
+#: ../carrick/carrick-list.c:848
+msgid ", "
+msgstr "،"
+
+#: ../carrick/carrick-list.c:849
+#: ../carrick/carrick-util.c:34
+msgid "wired"
+msgstr "سیمی"
+
+#. Switches
+#: ../carrick/carrick-list.c:850
+#: ../carrick/carrick-pane.c:1429
+#: ../carrick/carrick-util.c:32
+msgid "WiFi"
+msgstr "وایفای"
+
+#: ../carrick/carrick-list.c:851
+#: ../carrick/carrick-pane.c:1471
+#: ../carrick/carrick-util.c:38
+msgid "WiMAX"
+msgstr "وایمکس"
+
+#: ../carrick/carrick-list.c:852
+#: ../carrick/carrick-pane.c:1457
+#: ../carrick/carrick-util.c:36
+msgid "3G"
+msgstr "۳جی"
+
+#: ../carrick/carrick-list.c:853
+#: ../carrick/carrick-pane.c:1485
+#: ../carrick/carrick-util.c:40
+msgid "Bluetooth"
+msgstr "بلوتوث"
+
+#.
+#. * Translators: this string is displayed if there
+#. * are no available networks because ConnMan, the
+#. * connectivity daemon, is not running.
+#.
+#: ../carrick/carrick-list.c:866
+msgid "Sorry, we can't find any networks. It appears that the connection manager is not running. You could try restarting your computer."
+msgstr "متاسفیم، ما نتوانستیم هیچ شبکه ای پیدا کنیم. به نظر می رسد مدیریت اتصال اجرا نشده است. شما می توانید رایانه خود را بازنشانی کنید"
+
+#.
+#. * Hint display if we detect that the system is in
+#. * offline mode and there are no available networks
+#.
+#: ../carrick/carrick-list.c:876
+msgid "Sorry, we can't find any networks. You could try disabling Offline mode. "
+msgstr "متاسفیم، ما هیچ شبکه ای پیدا نکردیم. شما می توانید حالت آفلاین را غیر فعال کنید."
+
+#: ../carrick/carrick-list.c:1013
+#, c-format
+msgid "Sorry, we can't find any networks. You could try enabling %s."
+msgstr "متاسفیم، هیچ شبکه ای یافت نشد. شما می توانید فعال سازی %s را آزمایش کنید."
+
+#.
+#. * Generic message to display if all available networking
+#. * technologies are turned on, but for whatever reason we
+#. * can not find any networks
+#.
+#: ../carrick/carrick-list.c:1027
+msgid "Sorry, we can't find any networks"
+msgstr "متاسفیم، هیچ شبکه ای یافت نشد"
+
+#: ../carrick/carrick-notification-manager.c:124
+msgid "Network connected"
+msgstr "شبکه متصل شد"
+
+#: ../carrick/carrick-notification-manager.c:132
+#, c-format
+msgid "You're now connected to a wired network"
+msgstr "شما به یک شبکه سیمی وصل شده اید"
+
+#: ../carrick/carrick-notification-manager.c:162
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr "شما به شبکه ی %s متصل شده اید، یک شبکه ی %s"
+
+#: ../carrick/carrick-notification-manager.c:168
+#, c-format
+msgid "You're now connected to a %s network"
+msgstr "شما به یک شبکه ی %s متصل شده اید"
+
+#: ../carrick/carrick-notification-manager.c:185
+msgid "Network lost"
+msgstr "از دست دادن شبکه"
+
+#: ../carrick/carrick-notification-manager.c:193
+#, c-format
+msgid "Sorry, we've lost your wired connection"
+msgstr "متاسفیم، اتصال سیمی شما از بین رفت"
+
+#: ../carrick/carrick-notification-manager.c:197
+#, c-format
+msgid "Sorry we've lost your %s connection to %s"
+msgstr "متاسفیم ما اتصال %s شما به %s از دست دادیم"
+
+#: ../carrick/carrick-notification-manager.c:203
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr "متاسفیم ما اتصال %s شما را از دست دادیم"
+
+#: ../carrick/carrick-notification-manager.c:220
+msgid "Network changed"
+msgstr "شبکه عوض شد"
+
+#: ../carrick/carrick-notification-manager.c:239
+#, c-format
+msgid "Sorry, your connection to %s was lost. So we've connected you to a wired network"
+msgstr "متاسفیم، اتصال شما به %s از دست رفت. پس ما شما را به یک شبکه سیمی متصل کرده ایم."
+
+#: ../carrick/carrick-notification-manager.c:246
+#, c-format
+msgid "Sorry, your connection to %s was lost. So we've connected you to %s, a %s network"
+msgstr "متاسفیم، اتصال %s شما از دست رفت. پس ما شما را به %s شبکه وصل کرده ایم، یک شبکه ی %s"
+
+#: ../carrick/carrick-notification-manager.c:254
+#, c-format
+msgid "Sorry, your connection to %s was lost. So we've connected you to a %s network"
+msgstr "متاسفیم، اتصال %s شما از دست رفت. پس ما شما را به شبکه ی %s متصل کرده ایم"
+
+#: ../carrick/carrick-notification-manager.c:264
+#, c-format
+msgid "Sorry, your %s connection was lost. So we've connected you to a wired network"
+msgstr "متاسفیم، اتصال %s شما از دست رفت. پس ما شما را به شبکه ی سیمی متصل کرده ایم"
+
+#: ../carrick/carrick-notification-manager.c:271
+#, c-format
+msgid "Sorry, your %s connection was lost. So we've connected you to %s, a %s network"
+msgstr "متاسفیم، اتصال شما %s از دست رفت. پس ما شما را به %s متصل کرده ایم، یک شبکه ی %s"
+
+#: ../carrick/carrick-notification-manager.c:280
+#, c-format
+msgid "Sorry, your %s connection was lost. So we've connected you to a %s network"
+msgstr "متاسفیم، اتصال %s شما از دست رفت. پس ما شما را به شبکه ی %s متصل کرده ایم"
+
+#: ../carrick/carrick-pane.c:634
+msgid "New connection settings"
+msgstr "تنظیمات اتصال جدید"
+
+#: ../carrick/carrick-pane.c:672
+msgid ""
+"Enter the name of the network you want\n"
+"to connect to and, where necessary, the\n"
+"password and security type."
+msgstr ""
+"نام شبکه ای که می خواهید را وارد کنید\n"
+"تا به آن متصل شویدو هرجایی که ضروری است\n"
+"کلمه عبور و نوع امنیت را وارد کنید."
+
+#: ../carrick/carrick-pane.c:682
+msgid "Network name"
+msgstr "نام شبکه"
+
+#: ../carrick/carrick-pane.c:694
+msgid "Network security"
+msgstr "امنیت شبکه"
+
+#: ../carrick/carrick-pane.c:704
+msgid "None"
+msgstr "هیچ یک"
+
+#: ../carrick/carrick-pane.c:716
+msgid "Password"
+msgstr "کلمه عبور"
+
+#: ../carrick/carrick-pane.c:731
+#: ../carrick/carrick-service-item.c:1787
+msgid "Show password"
+msgstr "نمایش کلمه عبور"
+
+#: ../carrick/carrick-pane.c:1412
+msgid "Settings"
+msgstr "تنظیمات"
+
+#: ../carrick/carrick-pane.c:1443
+#: ../carrick/carrick-service-item.c:328
+msgid "Wired"
+msgstr "سیمی"
+
+#: ../carrick/carrick-pane.c:1510
+msgid "Offline mode"
+msgstr "حالت آفلاین"
+
+#: ../carrick/carrick-pane.c:1520
+msgid "This will disable all your connections"
+msgstr "این همه اتصال های شما را غیر فعال می کند"
+
+#: ../carrick/carrick-pane.c:1556
+#: ../src/carrick.c:369
+msgid "Networks"
+msgstr "شبکه ها"
+
+#. New connection button
+#: ../carrick/carrick-pane.c:1562
+msgid "Add new connection"
+msgstr "افزودن اتصال جدید"
+
+#. Translators:
+#. The following are potential errors that a user might see while
+#. attempting to configure a 3G data service.
+#.
+#: ../carrick/carrick-service-item.c:51
+msgid "Critical Error: Invalid country code"
+msgstr "خطای جدی: کد ناشناس کشور"
+
+#: ../carrick/carrick-service-item.c:52
+msgid "Missing required APN (service plan name)"
+msgstr "گم کردن APN لازم ( نام طرح شبکه)"
+
+#: ../carrick/carrick-service-item.c:53
+msgid "Internal Error: Invalid network service"
+msgstr "خطای داخلی: خدمت ناشناس شبکه"
+
+#: ../carrick/carrick-service-item.c:54
+msgid "Critical Error: Unable to access Connection Manager"
+msgstr "خطا جدی: قادر به دسترسی به مدیریت اتصال نیست"
+
+#: ../carrick/carrick-service-item.c:55
+msgid "ERROR: No 3G Hardware detected"
+msgstr "خطا: هیچ سخت افزار ۳جی یافت نشد"
+
+#. TRANSLATORS: this is a wireless security method, at least WEP,
+#. * WPA and IEEE8021X are possible token values. Example: "WEP encrypted".
+#.
+#: ../carrick/carrick-service-item.c:192
+#, c-format
+msgid "%s encrypted"
+msgstr "%s کدگذاری شده است"
+
+#: ../carrick/carrick-service-item.c:340
+#: ../carrick/carrick-service-item.c:357
+msgid "Disconnect"
+msgstr "قطع"
+
+#: ../carrick/carrick-service-item.c:343
+msgid "Connected"
+msgstr "متصل"
+
+#: ../carrick/carrick-service-item.c:360
+msgid "Online"
+msgstr "انلاین"
+
+#: ../carrick/carrick-service-item.c:367
+#: ../carrick/carrick-service-item.c:376
+#, c-format
+msgid "Cancel"
+msgstr "لغو"
+
+#: ../carrick/carrick-service-item.c:370
+msgid "Configuring"
+msgstr "در حال پیکره بندی"
+
+#: ../carrick/carrick-service-item.c:379
+msgid "Associating"
+msgstr "در حال اتصال به"
+
+#: ../carrick/carrick-service-item.c:388
+#: ../carrick/carrick-service-item.c:413
+#: ../carrick/carrick-service-item.c:1774
+msgid "Connect"
+msgstr "اتصال"
+
+#: ../carrick/carrick-service-item.c:416
+msgid "Connection failed"
+msgstr "خطا اتصال"
+
+#: ../carrick/carrick-service-item.c:419
+msgid "Sorry, the connection failed. You could try again."
+msgstr "متاسفیم، اتصال دچار مشکل شد. می توانید دوباره سعی کنید."
+
+#: ../carrick/carrick-service-item.c:425
+#: ../carrick/carrick-service-item.c:428
+#, c-format
+msgid "Disconnecting"
+msgstr "در حال قطع اتصال"
+
+#: ../carrick/carrick-service-item.c:494
+msgid "Type password here"
+msgstr "کلمه عبور را اینجا وارد کنید"
+
+#: ../carrick/carrick-service-item.c:563
+msgid "Really remove?"
+msgstr "واقعا حذف شود؟"
+
+#: ../carrick/carrick-service-item.c:583
+#, c-format
+msgid ""
+"Do you want to remove the %s %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to %s."
+msgstr ""
+"آیا می خواهید شبکه ی %s %s را حذف کنید؟ این \n"
+"کلمه عبور را فراموش خواهد کرد و شما\n"
+"نخواهید توانست به طور اتوماتیک به %s وصل شوید."
+
+#: ../carrick/carrick-service-item.c:786
+#, c-format
+msgid "Your password isn't the right length. For a WEP connection it needs to be either 10 or 26 characters, you have %i."
+msgstr "کلمه عبور شما به اندازه ی درستی نیست. برای اتصال WEP نیاز است آن یا ۱۰ یا ۲۶ کاراکتر باشد، شما %i داشتید."
+
+#: ../carrick/carrick-service-item.c:797
+#, c-format
+msgid "Your password is too short. For a WPA connection it needs to be at least 8 characters long, you have %i"
+msgstr "کلمه عبور شما بسیار کوتاه است. برای اتصال WPA باید حداقل ۸ کاراکتر طول داشته باشد، شما %i دارید"
+
+#: ../carrick/carrick-service-item.c:801
+#, c-format
+msgid "Your password is too long. For a WPA connection it needs to have fewer than 63 characters, you have %i"
+msgstr "کلمه عبور بسیار طولانی است. برای اتصال WPA شما باید کمتر از ۶۳ کاراکتر داشته باشید، شما %i دارید"
+
+#: ../carrick/carrick-service-item.c:810
+#, c-format
+msgid "Your password is too short. For a WPA2 connection it needs to be at least 8 characters long, you have %i"
+msgstr "کلمه عبور شما بسیار کوتاه است. برای اتصال WPA2 شما باید حداقل ۸ کاراکتر وارد کنید، شما %i داشتید"
+
+#: ../carrick/carrick-service-item.c:814
+#, c-format
+msgid "Your password is too long. For a WPA2 connection it needs to have fewer than 63 characters, you have %i"
+msgstr "کلمه شما بسیار طولانی است. برای اتصال WPA2 شما باید کمتر از ۶۳ کاراکتر استفاده کنید، شما %i دارید"
+
+#: ../carrick/carrick-service-item.c:1267
+msgid "Sorry, it looks like the IP address is not valid"
+msgstr "متاسفیم، به نظر می رسد آدرس آیپی معتبر نیست"
+
+#: ../carrick/carrick-service-item.c:1279
+msgid "Sorry, it looks like the gateway address is not valid"
+msgstr "متاسفیم، به نظر می رسد آدرس دروازه معتبر نیست"
+
+#: ../carrick/carrick-service-item.c:1291
+msgid "Sorry, it looks like the subnet mask is not valid"
+msgstr "متاسفیم، به نظر می رسد ماسک زیر سبکه معتبر نیست"
+
+#: ../carrick/carrick-service-item.c:1336
+#, c-format
+msgid "Sorry, it looks like the nameserver address '%s' is not valid"
+msgstr "متاسفیم، به نظر می رسد آدرس نام کارگذار '%s' معتبر نیست"
+
+#. TRANSLATORS: label for the Advanced expander in a service item
+#: ../carrick/carrick-service-item.c:1698
+msgid "Advanced"
+msgstr "پیشرفته"
+
+#: ../carrick/carrick-service-item.c:1708
+msgid "Scanning"
+msgstr "درحال اسکن"
+
+#. Note: security_sample should contain the longest possible security method
+#. TRANSLATORS: This is an example of a wireless security method
+#. (see another translator comment), used to estimate the string length.
+#. It should look like the ones below network name in the UI
+#: ../carrick/carrick-service-item.c:1729
+msgid "WPA2 encrypted"
+msgstr "کدگذاری WPA2"
+
+#. TRANSLATORS: label in advanced settings (next to combobox
+#. * for DHCP/Static IP)
+#: ../carrick/carrick-service-item.c:1836
+msgid "Connect by:"
+msgstr "اتصال به وسیله:"
+
+#. TRANSLATORS: label in advanced settings
+#: ../carrick/carrick-service-item.c:1838
+msgid "IP address:"
+msgstr "آدرس آیپی:"
+
+#. TRANSLATORS: label in advanced settings
+#: ../carrick/carrick-service-item.c:1840
+msgid "Subnet mask:"
+msgstr "ماسک زیرشبکه:"
+
+#. TRANSLATORS: label in advanced settings
+#: ../carrick/carrick-service-item.c:1842
+msgid "Router:"
+msgstr "مسیر یاب:"
+
+#. TRANSLATORS: label in advanced settings
+#: ../carrick/carrick-service-item.c:1844
+msgid "DNS:"
+msgstr "دیاناس:"
+
+#: ../carrick/carrick-service-item.c:1850
+msgid "DHCP"
+msgstr "DHCP دیاچسیپی"
+
+#: ../carrick/carrick-service-item.c:1852
+msgid "Static IP"
+msgstr "ایپی ایستا"
+
+#. TRANSLATORS: label for apply button in static ip settings
+#: ../carrick/carrick-service-item.c:1902
+msgid "Apply"
+msgstr "اعمال کردن"
+
+#: ../src/carrick.c:49
+msgid "networks - not connected"
+msgstr "شبکه ها- وصل نشده"
+
+#: ../src/carrick.c:55
+msgid "networks - connecting"
+msgstr "شبکه ها- درحال اتصال"
+
+#: ../src/carrick.c:61
+msgid "networks - wired"
+msgstr "شبکه ها- سیمی"
+
+#: ../src/carrick.c:63
+#, c-format
+msgid "networks - %s - wifi"
+msgstr "شبکه ها - %s - وایفای"
+
+#: ../src/carrick.c:66
+#, c-format
+msgid "networks - %s - wimax"
+msgstr "شبکه ها- %s - وایمکس"
+
+#: ../src/carrick.c:69
+#, c-format
+msgid "networks - %s - 3G"
+msgstr "شبکه ها - %s - ۳جی"
+
+#: ../src/carrick.c:72
+#, c-format
+msgid "networks - %s - bluetooth"
+msgstr "شبکه ها - %s - بلوتوث"
+
+#: ../src/carrick.c:75
+#: ../src/carrick.c:87
+msgid "networks"
+msgstr "شبکه ها"
+
+#: ../src/carrick.c:82
+msgid "networks - error"
+msgstr "شبک ها- خطا"
+
+#: ../src/carrick.c:297
+msgid "Run in standalone mode"
+msgstr "اجرا در حالت مستقل"
+
+#: ../src/carrick.c:299
+msgid "Embed in another window (overrides --standalone)"
+msgstr "پوشیده در پنجره ای دیگر ( تحت شعاع قرار دادن مستقل)"
+
+#: ../src/carrick.c:310
+msgid "Carrick connectivity applet"
+msgstr "اپلت اتصال Carrick"
+
+#: ../src/carrick.c:311
+msgid "- MeeGo connectivity applet"
+msgstr "- برنامه اتصال میگو"
+
+#: ../src/carrick.c:352
+#: ../data/carrick.desktop.in.in.h:2
+msgid "network"
+msgstr "شبکه"
+
+#: ../callouts/3g/ggg-country-dialog.c:73
+#: ../callouts/3g/ggg-manual-dialog.c:70
+#: ../callouts/3g/ggg-plan-dialog.c:111
+#: ../callouts/3g/ggg-provider-dialog.c:106
+#: ../callouts/3g/ggg-service-dialog.c:106
+msgid "Cellular Data Connection Wizard"
+msgstr "جادوگر اتصال داده سلولی"
+
+#: ../callouts/3g/ggg-country-dialog.c:93
+msgid "Select Country"
+msgstr "انتخاب کشور"
+
+#: ../callouts/3g/ggg-manual-dialog.c:89
+msgid "Manual Configuration"
+msgstr "پیکره بندی دستی"
+
+#: ../callouts/3g/ggg-manual-dialog.c:93
+msgid "Plan Name (required):"
+msgstr "نام طرح (مورد نیاز):"
+
+#: ../callouts/3g/ggg-manual-dialog.c:96
+msgid "Username:"
+msgstr "نام کاربری:"
+
+#: ../callouts/3g/ggg-manual-dialog.c:99
+msgid "Password:"
+msgstr "کلمه عبور:"
+
+#: ../callouts/3g/ggg-manual-dialog.c:103
+msgid "Gateway:"
+msgstr "دروازه:"
+
+#: ../callouts/3g/ggg-manual-dialog.c:106
+msgid "Primary DNS:"
+msgstr "دیاناسی اصلی:"
+
+#: ../callouts/3g/ggg-manual-dialog.c:109
+msgid "Secondary DNS:"
+msgstr "دیاناسی ثانوی:"
+
+#: ../callouts/3g/ggg-manual-dialog.c:112
+msgid "Tertiary DNS:"
+msgstr "دیاناس ثالث:"
+
+#: ../callouts/3g/ggg-plan-dialog.c:131
+msgid "Select your 3G Plan"
+msgstr "انتخاب طرح ۳جی خود"
+
+#: ../callouts/3g/ggg-provider-dialog.c:126
+msgid "Select Provider"
+msgstr "انتخاب فراهم آورنده"
+
+#: ../callouts/3g/ggg-service-dialog.c:59
+#, c-format
+msgid "%s (Roaming)"
+msgstr "%s (رومینگ)"
+
+#: ../callouts/3g/ggg-service-dialog.c:125
+msgid "Select 3G Service"
+msgstr "انتخاب سرویس ۳جی"
+
+#: ../data/carrick.desktop.in.in.h:1
+msgid "Network settings"
+msgstr "تنظیمات شبکه"
+
--- po/fi.po
+++ po/fi.po
@@ -1,14 +1,14 @@
# Carrick-ng Finnish (fi) translation
-#
+#
# Paula <pkwanzek at hotmail.com>, 2009.
# Timo Jyrinki <timo.jyrinki at iki.fi>, 2009.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-07-03 11:59+0000\n"
-"PO-Revision-Date: 2010-05-12 09:26-0800\n"
+"PO-Revision-Date: 2010-09-14 20:05-0800\n"
"Last-Translator: Anna Bergman <anna.b.bergman at gmail.com>\n"
"Language-Team: Finnish <laatu at lokalisointi.org>\n"
"MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@
#. * The conjunction 'or' will be at the end of a choice of disabled
#. technologies,
#. * for example 'WiFi, WiMAX or 3G.
-#.
+#.
#: ../carrick/carrick-list.c:843
msgid " or "
msgstr " tai "
@@ -32,32 +32,37 @@
#. * Translator note: the comma ',' will be used to join the different
#. disabled technologies
#. * as in the above example; 'WiFi, WiMAX or 3G'
-#.
+#.
#: ../carrick/carrick-list.c:848
msgid ", "
msgstr ", "
-#: ../carrick/carrick-list.c:849 ../carrick/carrick-util.c:34
+#: ../carrick/carrick-list.c:849
+#: ../carrick/carrick-util.c:34
msgid "wired"
msgstr "kiinteä"
#. Switches
-#: ../carrick/carrick-list.c:850 ../carrick/carrick-pane.c:1429
+#: ../carrick/carrick-list.c:850
+#: ../carrick/carrick-pane.c:1429
#: ../carrick/carrick-util.c:32
msgid "WiFi"
msgstr "WiFi"
-#: ../carrick/carrick-list.c:851 ../carrick/carrick-pane.c:1471
+#: ../carrick/carrick-list.c:851
+#: ../carrick/carrick-pane.c:1471
#: ../carrick/carrick-util.c:38
msgid "WiMAX"
msgstr "WiMax"
-#: ../carrick/carrick-list.c:852 ../carrick/carrick-pane.c:1457
+#: ../carrick/carrick-list.c:852
+#: ../carrick/carrick-pane.c:1457
#: ../carrick/carrick-util.c:36
msgid "3G"
msgstr "3G"
-#: ../carrick/carrick-list.c:853 ../carrick/carrick-pane.c:1485
+#: ../carrick/carrick-list.c:853
+#: ../carrick/carrick-pane.c:1485
#: ../carrick/carrick-util.c:40
msgid "Bluetooth"
msgstr "Bluetooth"
@@ -65,14 +70,14 @@
#. * Translators: this string is displayed if there
#. * are no available networks because ConnMan, the
#. * connectivity daemon, is not running.
-#.
+#.
#: ../carrick/carrick-list.c:866
msgid "Sorry, we can't find any networks. It appears that the connection manager is not running. You could try restarting your computer."
msgstr "Yhtään verkkoa ei löydy. Yhteyksien hallinta ei näytä olevan käynnissä. Kokeile laitteen käynnistämistä uudelleen."
#. * Hint display if we detect that the system is in
#. * offline mode and there are no available networks
-#.
+#.
#: ../carrick/carrick-list.c:876
msgid "Sorry, we can't find any networks. You could try disabling Offline mode. "
msgstr "Yhtään verkkoa ei löydy. Voit yrittää Poissa linjoilta -tilan käytöstä poistamista"
@@ -80,12 +85,12 @@
#: ../carrick/carrick-list.c:1013
#, c-format
msgid "Sorry, we can't find any networks. You could try enabling %s."
-msgstr "Yhtään verkkoa ei löydy. Voit yrittää ottaa kayttöön %s. "
+msgstr "Yhtään verkkoa ei löydy. Voit yrittää ottaa käyttöön %s. "
#. * Generic message to display if all available networking
#. * technologies are turned on, but for whatever reason we
#. * can not find any networks
-#.
+#.
#: ../carrick/carrick-list.c:1027
msgid "Sorry, we can't find any networks"
msgstr "Emme valitettavasti löydä yhtään verkkoa."
@@ -102,7 +107,7 @@
#: ../carrick/carrick-notification-manager.c:162
#, c-format
msgid "You're now connected to %s, a %s network"
-msgstr "Olet nyt yhdistettynä kohteesseen %s, joka on %s-verkko"
+msgstr "Olet nyt yhdistettynä kohteeseen %s, joka on %s-verkko"
#: ../carrick/carrick-notification-manager.c:168
#, c-format
@@ -192,7 +197,8 @@
msgid "Password"
msgstr "Salasana"
-#: ../carrick/carrick-pane.c:731 ../carrick/carrick-service-item.c:1787
+#: ../carrick/carrick-pane.c:731
+#: ../carrick/carrick-service-item.c:1787
msgid "Show password"
msgstr "Näytä salasana"
@@ -200,7 +206,8 @@
msgid "Settings"
msgstr "Asetukset"
-#: ../carrick/carrick-pane.c:1443 ../carrick/carrick-service-item.c:328
+#: ../carrick/carrick-pane.c:1443
+#: ../carrick/carrick-service-item.c:328
msgid "Wired"
msgstr "Kiinteä"
@@ -212,7 +219,8 @@
msgid "This will disable all your connections"
msgstr "Tämä katkaisee kaikki yhteydet"
-#: ../carrick/carrick-pane.c:1556 ../src/carrick.c:369
+#: ../carrick/carrick-pane.c:1556
+#: ../src/carrick.c:369
msgid "Networks"
msgstr "Verkot"
@@ -224,7 +232,7 @@
#. Translators:
#. The following are potential errors that a user might see while
#. attempting to configure a 3G data service.
-#.
+#.
#: ../carrick/carrick-service-item.c:51
msgid "Critical Error: Invalid country code"
msgstr "Kriittinen virhe: Virheellinen maakoodi"
@@ -247,13 +255,14 @@
#. TRANSLATORS: this is a wireless security method, at least WEP,
#. * WPA and IEEE8021X are possible token values. Example: "WEP encrypted".
-#.
+#.
#: ../carrick/carrick-service-item.c:192
#, c-format
msgid "%s encrypted"
msgstr "Salattu: %s"
-#: ../carrick/carrick-service-item.c:340 ../carrick/carrick-service-item.c:357
+#: ../carrick/carrick-service-item.c:340
+#: ../carrick/carrick-service-item.c:357
msgid "Disconnect"
msgstr "Katkaise yhteys"
@@ -265,7 +274,8 @@
msgid "Online"
msgstr "Linjoilla"
-#: ../carrick/carrick-service-item.c:367 ../carrick/carrick-service-item.c:376
+#: ../carrick/carrick-service-item.c:367
+#: ../carrick/carrick-service-item.c:376
#, c-format
msgid "Cancel"
msgstr "Peruu"
@@ -278,7 +288,8 @@
msgid "Associating"
msgstr "Liitetään"
-#: ../carrick/carrick-service-item.c:388 ../carrick/carrick-service-item.c:413
+#: ../carrick/carrick-service-item.c:388
+#: ../carrick/carrick-service-item.c:413
#: ../carrick/carrick-service-item.c:1774
msgid "Connect"
msgstr "Yhdistä"
@@ -291,7 +302,8 @@
msgid "Sorry, the connection failed. You could try again."
msgstr "Yhteys epäonnistui. Voit yrittää uudelleen."
-#: ../carrick/carrick-service-item.c:425 ../carrick/carrick-service-item.c:428
+#: ../carrick/carrick-service-item.c:425
+#: ../carrick/carrick-service-item.c:428
#, c-format
msgid "Disconnecting"
msgstr "Katkaistaan yhteys"
@@ -445,7 +457,8 @@
msgid "networks - %s - bluetooth"
msgstr "verkot - %s - bluetooth"
-#: ../src/carrick.c:75 ../src/carrick.c:87
+#: ../src/carrick.c:75
+#: ../src/carrick.c:87
msgid "networks"
msgstr "verkot"
@@ -469,12 +482,14 @@
msgid "- MeeGo connectivity applet"
msgstr "- MeeGo-yhteyssovelma"
-#: ../src/carrick.c:352 ../data/carrick.desktop.in.in.h:2
+#: ../src/carrick.c:352
+#: ../data/carrick.desktop.in.in.h:2
msgid "network"
msgstr "verkko"
#: ../callouts/3g/ggg-country-dialog.c:73
-#: ../callouts/3g/ggg-manual-dialog.c:70 ../callouts/3g/ggg-plan-dialog.c:111
+#: ../callouts/3g/ggg-manual-dialog.c:70
+#: ../callouts/3g/ggg-plan-dialog.c:111
#: ../callouts/3g/ggg-provider-dialog.c:106
#: ../callouts/3g/ggg-service-dialog.c:106
msgid "Cellular Data Connection Wizard"
@@ -539,78 +554,54 @@
#~ msgid "Select your 3G Data Plan"
#~ msgstr "Valitse 3G Data Liittymä"
-
#~ msgid "Plan Name: (required)"
#~ msgstr "Liittymän Nimi: (pakollinen)"
-
#~ msgid "Tertairy DNS:"
#~ msgstr "Lisä DNS:"
-
#~ msgid "Manual Config"
#~ msgstr "Manuaalinen asennus"
-
#~ msgid "Sorry, we can't find any networks. You could try turning on 3G."
#~ msgstr "Yhtään verkkoa ei löydy. Yritä ottaa käyttöön 3G."
-
#~ msgid "Sorry, we can't find any networks. You could try turning on WiFi."
#~ msgstr "Yhtään verkkoa ei löydy. Yritä ottaa käyttöön WiFi."
-
#~ msgid "Sorry, we can't find any networks. You could try turning on WiMAX."
#~ msgstr "Yhtään verkkoa ei löydy. Yritä ottaa käyttöön WiMAX."
-
#~ msgid "Sorry, we can't find any networks. You could try turning on Bluetooth."
#~ msgstr "Yhtään verkkoa ei löydy. Yritä ottaa käyttöön Bluetooth."
-
#~ msgid "Sorry, we can't find any networks. You could try turning on Wired."
#~ msgstr "Emme valitettavasti löydä yhtään verkkoa. Yritä langallisen verkon käyttöön ottamista."
-
#~ msgid "Sorry, we can't find any networks. "
#~ msgstr "Emme valitettavasti löydä yhtään verkkoa."
-
#~ msgid "The ConnMan daemon doesn't seem to be running. You may want to try re-starting your device"
#~ msgstr "ConnMan daemon ei näytä olevan käynnissä. Yritä laitteen käynnistämistä uudelleen."
-
#~ msgid "You could try disabling Offline mode"
#~ msgstr "Voit yrittää Poissa linjoilta -tilan käytöstä poistamista"
-
#~ msgid "You could try turning on "
#~ msgstr "Voit yrittää ottaa käyttöön "
-
#~ msgid " and "
#~ msgstr " ja "
-
#~ msgid "Ethernet"
#~ msgstr "Ethernet"
-
#~ msgid "Sorry, your connection to %s was lost. So we've "
#~ msgstr "Yhteys kohteeseen %s menetetty, joten"
-
#~ msgid "Sorry, your %s connection was lost. So we've "
#~ msgstr "%s-yhteys menetetty, joten"
-
#~ msgid "connected you to a wired network"
#~ msgstr "muodostimme yhteyden langalliseen verkkoon"
-
#~ msgid "connected you to %s, a %s network"
#~ msgstr "muodostimme yhteyden kohteeseen %s, joka on %s-verkko"
-
#~ msgid "connected you to a %s network"
#~ msgstr "muodostimme yhteyden %s-verkkoon"
-
#~ msgid "Sorry, your wired connection was lost. So we've "
#~ msgstr "Langallinen yhteys menetetty, joten"
-
#~ msgid "Offline"
#~ msgstr "Poissa linjoilta"
-
#~ msgid "No active connection."
#~ msgstr "Verkkoyhteyttä ei ole käytettävissä."
-
#~ msgid "Now online and connected to %s."
#~ msgstr "Linjoilla ja yhdistettynä seuraavaan: %s"
-
#~ msgid "Connecting"
#~ msgstr "Yhdistetään"
-
#~ msgid "Sorry, we can't find any networks. The Connection Manager doesn't seem to be running. You may want to try re-starting your device."
#~ msgstr "Yhtään verkkoa ei löydy. ConnMan daemon ei näytä olevan käynnissä. Yritä laitteen käynnistämistä uudelleen."
+
--- po/he.po
+++ po/he.po
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Yaron Shahrabani <sh.yaron at gmail.com>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-07-03 11:59+0000\n"
+"PO-Revision-Date: 2010-08-21 15:33+0300\n"
+"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
+"Language-Team: Gezer (Hebrew)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.6.1\n"
+
+#. * Translator note: The disabled technologies available to be turned on is
+#. put together at
+#. * runtime.
+#. * The conjunction 'or' will be at the end of a choice of disabled
+#. technologies,
+#. * for example 'WiFi, WiMAX or 3G.
+#.
+#: ../carrick/carrick-list.c:843
+msgid " or "
+msgstr "או"
+
+#. * Translator note: the comma ',' will be used to join the different
+#. disabled technologies
+#. * as in the above example; 'WiFi, WiMAX or 3G'
+#.
+#: ../carrick/carrick-list.c:848
+msgid ", "
+msgstr ", "
+
+#: ../carrick/carrick-list.c:849 ../carrick/carrick-util.c:34
+msgid "wired"
+msgstr "קווית"
+
+#. Switches
+#: ../carrick/carrick-list.c:850 ../carrick/carrick-pane.c:1429
+#: ../carrick/carrick-util.c:32
+msgid "WiFi"
+msgstr "WiFi"
+
+#: ../carrick/carrick-list.c:851 ../carrick/carrick-pane.c:1471
+#: ../carrick/carrick-util.c:38
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#: ../carrick/carrick-list.c:852 ../carrick/carrick-pane.c:1457
+#: ../carrick/carrick-util.c:36
+msgid "3G"
+msgstr "3G"
+
+#: ../carrick/carrick-list.c:853 ../carrick/carrick-pane.c:1485
+#: ../carrick/carrick-util.c:40
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#. * Translators: this string is displayed if there
+#. * are no available networks because ConnMan, the
+#. * connectivity daemon, is not running.
+#.
+#: ../carrick/carrick-list.c:866
+msgid "Sorry, we can't find any networks. It appears that the connection manager is not running. You could try restarting your computer."
+msgstr "לא ניתן למצוא רשתות כלשהן, עמך הסליחה. נראה כי מנהל החיבורים אינו פעיל. מומלץ לנסות להפעיל את מחשבך מחדש."
+
+#. * Hint display if we detect that the system is in
+#. * offline mode and there are no available networks
+#.
+#: ../carrick/carrick-list.c:876
+msgid "Sorry, we can't find any networks. You could try disabling Offline mode. "
+msgstr "לא ניתן למצוא רשתות כלשהן, עמך הסליחה. מומלץ לנסות לבטל את המצב הלא מקוון."
+
+#: ../carrick/carrick-list.c:1013
+#, c-format
+msgid "Sorry, we can't find any networks. You could try enabling %s."
+msgstr "לא ניתן למצוא רשתות כלשהן, עמך הסליחה. מומלץ לנסות להפעיל את %s."
+
+#. * Generic message to display if all available networking
+#. * technologies are turned on, but for whatever reason we
+#. * can not find any networks
+#.
+#: ../carrick/carrick-list.c:1027
+msgid "Sorry, we can't find any networks"
+msgstr "לא ניתן למצוא רשתות כלשהן, עמך הסליחה"
+
+#: ../carrick/carrick-notification-manager.c:124
+msgid "Network connected"
+msgstr "הרשת מחוברת"
+
+#: ../carrick/carrick-notification-manager.c:132
+#, c-format
+msgid "You're now connected to a wired network"
+msgstr "בוצע חיבור לרשת קווית"
+
+#: ../carrick/carrick-notification-manager.c:162
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr "בוצע חיבור לרשת %s, שהיא רשת %s"
+
+#: ../carrick/carrick-notification-manager.c:168
+#, c-format
+msgid "You're now connected to a %s network"
+msgstr "בוצע חיבור לרשת %s"
+
+#: ../carrick/carrick-notification-manager.c:185
+msgid "Network lost"
+msgstr "החיבור לרשת אבד"
+
+#: ../carrick/carrick-notification-manager.c:193
+#, c-format
+msgid "Sorry, we've lost your wired connection"
+msgstr "החיבור לרשת הקווית אבד, עמך הסליחה"
+
+#: ../carrick/carrick-notification-manager.c:197
+#, c-format
+msgid "Sorry we've lost your %s connection to %s"
+msgstr "החיבור לרשת ה־%s %s אבד, עמך הסליחה"
+
+#: ../carrick/carrick-notification-manager.c:203
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr "החיבור ה־%s שלך אבד, עמך הסליחה"
+
+#: ../carrick/carrick-notification-manager.c:220
+msgid "Network changed"
+msgstr "הרשת שונתה"
+
+#: ../carrick/carrick-notification-manager.c:239
+#, c-format
+msgid "Sorry, your connection to %s was lost. So we've connected you to a wired network"
+msgstr "החיבור אל %s אבד, לכן חוברת לרשת קווית, עמך הסליחה"
+
+#: ../carrick/carrick-notification-manager.c:246
+#, c-format
+msgid "Sorry, your connection to %s was lost. So we've connected you to %s, a %s network"
+msgstr ""
+
+#: ../carrick/carrick-notification-manager.c:254
+#, c-format
+msgid "Sorry, your connection to %s was lost. So we've connected you to a %s network"
+msgstr ""
+
+#: ../carrick/carrick-notification-manager.c:264
+#, c-format
+msgid "Sorry, your %s connection was lost. So we've connected you to a wired network"
+msgstr ""
+
+#: ../carrick/carrick-notification-manager.c:271
+#, c-format
+msgid "Sorry, your %s connection was lost. So we've connected you to %s, a %s network"
+msgstr ""
+
+#: ../carrick/carrick-notification-manager.c:280
+#, c-format
+msgid "Sorry, your %s connection was lost. So we've connected you to a %s network"
+msgstr ""
+
+#: ../carrick/carrick-pane.c:634
+msgid "New connection settings"
+msgstr "הגדרות חיבור חדש"
+
+#: ../carrick/carrick-pane.c:672
+msgid ""
+"Enter the name of the network you want\n"
+"to connect to and, where necessary, the\n"
+"password and security type."
+msgstr ""
+"יש להזין את שם הרשת שברצונך\n"
+"להתחבר אליה, והיכן שנדרש את\n"
+"הססמה וסוג האבטחה."
+
+#: ../carrick/carrick-pane.c:682
+msgid "Network name"
+msgstr "שם הרשת"
+
+#: ../carrick/carrick-pane.c:694
+msgid "Network security"
+msgstr "אבטחת רשת"
+
+#: ../carrick/carrick-pane.c:704
+msgid "None"
+msgstr "ללא"
+
+#: ../carrick/carrick-pane.c:716
+msgid "Password"
+msgstr "ססמה"
+
+#: ../carrick/carrick-pane.c:731 ../carrick/carrick-service-item.c:1787
+msgid "Show password"
+msgstr "הצגת הססמה"
+
+#: ../carrick/carrick-pane.c:1412
+msgid "Settings"
+msgstr "הגדרות"
+
+#: ../carrick/carrick-pane.c:1443 ../carrick/carrick-service-item.c:328
+msgid "Wired"
+msgstr "קווית"
+
+#: ../carrick/carrick-pane.c:1510
+msgid "Offline mode"
+msgstr "מצב לא מקוון"
+
+#: ../carrick/carrick-pane.c:1520
+msgid "This will disable all your connections"
+msgstr "פעולה זו תבטל את כל החיבורים שלך"
+
+#: ../carrick/carrick-pane.c:1556 ../src/carrick.c:369
+msgid "Networks"
+msgstr "רשתות"
+
+#. New connection button
+#: ../carrick/carrick-pane.c:1562
+msgid "Add new connection"
+msgstr "הוספת חיבור חדש"
+
+#. Translators:
+#. The following are potential errors that a user might see while
+#. attempting to configure a 3G data service.
+#.
+#: ../carrick/carrick-service-item.c:51
+msgid "Critical Error: Invalid country code"
+msgstr "שגיאה קריטית: קוד המדינה אינו תקני"
+
+#: ../carrick/carrick-service-item.c:52
+msgid "Missing required APN (service plan name)"
+msgstr "חסר ה־APN (שם תכנית השירות) הנדרש"
+
+#: ../carrick/carrick-service-item.c:53
+msgid "Internal Error: Invalid network service"
+msgstr "שגיאה פנימית: שירות הרשת בלתי תקני"
+
+#: ../carrick/carrick-service-item.c:54
+msgid "Critical Error: Unable to access Connection Manager"
+msgstr "שגיאה קריטית: לא ניתן לגשת אל מנהל החיבורים"
+
+#: ../carrick/carrick-service-item.c:55
+msgid "ERROR: No 3G Hardware detected"
+msgstr "שגיאה: לא זוהתה חומרת 3G"
+
+#. TRANSLATORS: this is a wireless security method, at least WEP,
+#. * WPA and IEEE8021X are possible token values. Example: "WEP encrypted".
+#.
+#: ../carrick/carrick-service-item.c:192
+#, c-format
+msgid "%s encrypted"
+msgstr "%s מוצפנת"
+
+#: ../carrick/carrick-service-item.c:340 ../carrick/carrick-service-item.c:357
+msgid "Disconnect"
+msgstr "התנתקות"
+
+#: ../carrick/carrick-service-item.c:343
+msgid "Connected"
+msgstr "מחובר"
+
+#: ../carrick/carrick-service-item.c:360
+msgid "Online"
+msgstr "מקוון"
+
+#: ../carrick/carrick-service-item.c:367 ../carrick/carrick-service-item.c:376
+#, c-format
+msgid "Cancel"
+msgstr "ביטול"
+
+#: ../carrick/carrick-service-item.c:370
+msgid "Configuring"
+msgstr "בהגדרה"
+
+#: ../carrick/carrick-service-item.c:379
+msgid "Associating"
+msgstr "בשיוך"
+
+#: ../carrick/carrick-service-item.c:388 ../carrick/carrick-service-item.c:413
+#: ../carrick/carrick-service-item.c:1774
+msgid "Connect"
+msgstr "התחברות"
+
+#: ../carrick/carrick-service-item.c:416
+msgid "Connection failed"
+msgstr "ההתחברות נכשלה"
+
+#: ../carrick/carrick-service-item.c:419
+msgid "Sorry, the connection failed. You could try again."
+msgstr "החיבור אבד, עמך הסליחה. ניתן לנסות שוב."
+
+#: ../carrick/carrick-service-item.c:425 ../carrick/carrick-service-item.c:428
+#, c-format
+msgid "Disconnecting"
+msgstr "בהתנתקות"
+
+#: ../carrick/carrick-service-item.c:494
+msgid "Type password here"
+msgstr "יש להזין את הססמה כאן"
+
+#: ../carrick/carrick-service-item.c:563
+msgid "Really remove?"
+msgstr "באמת להסיר?"
+
+#: ../carrick/carrick-service-item.c:583
+#, c-format
+msgid ""
+"Do you want to remove the %s %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to %s."
+msgstr ""
+"האם ברצונך להסיר את הרשת מסוג ״%s״ %s? פעולה\n"
+"זו תסיר את הססמה ולא ניתן עוד יהיה להתחבר\n"
+"אוטומטית אל %s."
+
+#: ../carrick/carrick-service-item.c:786
+#, c-format
+msgid "Your password isn't the right length. For a WEP connection it needs to be either 10 or 26 characters, you have %i."
+msgstr "הססמה שבחרת אינה באורך הנכון. לחיבור WEP עליה להיות בת 10 או 26 תווים, בססמתך ישנם %i."
+
+#: ../carrick/carrick-service-item.c:797
+#, c-format
+msgid "Your password is too short. For a WPA connection it needs to be at least 8 characters long, you have %i"
+msgstr "הססמה שבחרת קצרה מדי. לחיבור WPA עליה להיות בת 8 תווים לפחות, בססמתך ישנם %i."
+
+#: ../carrick/carrick-service-item.c:801
+#, c-format
+msgid "Your password is too long. For a WPA connection it needs to have fewer than 63 characters, you have %i"
+msgstr "הססמה שבחרת ארוכה מדי. לחיבור WPA עליה להיות בת 63 תווים לכול היותר, בססמתך ישנם %i."
+
+#: ../carrick/carrick-service-item.c:810
+#, c-format
+msgid "Your password is too short. For a WPA2 connection it needs to be at least 8 characters long, you have %i"
+msgstr "הססמה שבחרת קצרה מדי. לחיבור WPA2 עליה להיות בת 8 תווים לפחות, בססמתך ישנם %i."
+
+#: ../carrick/carrick-service-item.c:814
+#, c-format
+msgid "Your password is too long. For a WPA2 connection it needs to have fewer than 63 characters, you have %i"
+msgstr "הססמה שבחרת ארוכה מדי. לחיבור WPA2 עליה להיות בת 63 תווים לכול היותר, בססמתך ישנם %i."
+
+#: ../carrick/carrick-service-item.c:1267
+msgid "Sorry, it looks like the IP address is not valid"
+msgstr "נראה כי כתובת ה־IP לא תקפה, עמך הסליחה"
+
+#: ../carrick/carrick-service-item.c:1279
+msgid "Sorry, it looks like the gateway address is not valid"
+msgstr "נראה כי כתובת שער הגישה לא תקפה, עמך הסליחה"
+
+#: ../carrick/carrick-service-item.c:1291
+msgid "Sorry, it looks like the subnet mask is not valid"
+msgstr "נראה כי כתובת מסיכת הרשת לא תקפה, עמך הסליחה"
+
+#: ../carrick/carrick-service-item.c:1336
+#, c-format
+msgid "Sorry, it looks like the nameserver address '%s' is not valid"
+msgstr "נראה כי כתובת שרת פתרון השמות ׳%s׳ לא תקפה, עמך הסליחה"
+
+#. TRANSLATORS: label for the Advanced expander in a service item
+#: ../carrick/carrick-service-item.c:1698
+msgid "Advanced"
+msgstr "מתקדם"
+
+#: ../carrick/carrick-service-item.c:1708
+msgid "Scanning"
+msgstr "בסריקה"
+
+#. Note: security_sample should contain the longest possible security method
+#. TRANSLATORS: This is an example of a wireless security method
+#. (see another translator comment), used to estimate the string length.
+#. It should look like the ones below network name in the UI
+#: ../carrick/carrick-service-item.c:1729
+msgid "WPA2 encrypted"
+msgstr "מוצפנת ב־WPA2"
+
+#. TRANSLATORS: label in advanced settings (next to combobox
+#. * for DHCP/Static IP)
+#: ../carrick/carrick-service-item.c:1836
+msgid "Connect by:"
+msgstr "התחברות דרך:"
+
+#. TRANSLATORS: label in advanced settings
+#: ../carrick/carrick-service-item.c:1838
+msgid "IP address:"
+msgstr "כתובת ה־IP:"
+
+#. TRANSLATORS: label in advanced settings
+#: ../carrick/carrick-service-item.c:1840
+msgid "Subnet mask:"
+msgstr "מסיכת רשת משנה:"
+
+#. TRANSLATORS: label in advanced settings
+#: ../carrick/carrick-service-item.c:1842
+msgid "Router:"
+msgstr "נתב:"
+
+#. TRANSLATORS: label in advanced settings
+#: ../carrick/carrick-service-item.c:1844
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../carrick/carrick-service-item.c:1850
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../carrick/carrick-service-item.c:1852
+msgid "Static IP"
+msgstr "כתובת IP סטטית"
+
+#. TRANSLATORS: label for apply button in static ip settings
+#: ../carrick/carrick-service-item.c:1902
+msgid "Apply"
+msgstr "החלה"
+
+#: ../src/carrick.c:49
+msgid "networks - not connected"
+msgstr "רשתות — לא מחובר"
+
+#: ../src/carrick.c:55
+msgid "networks - connecting"
+msgstr "רשתות — מתחבר"
+
+#: ../src/carrick.c:61
+msgid "networks - wired"
+msgstr "רשתות — קווית"
+
+#: ../src/carrick.c:63
+#, c-format
+msgid "networks - %s - wifi"
+msgstr "רשתות — %s — wifi"
+
+#: ../src/carrick.c:66
+#, c-format
+msgid "networks - %s - wimax"
+msgstr "רשתות — %s — wimax"
+
+#: ../src/carrick.c:69
+#, c-format
+msgid "networks - %s - 3G"
+msgstr "רשתות — %s — 3G"
+
+#: ../src/carrick.c:72
+#, c-format
+msgid "networks - %s - bluetooth"
+msgstr "רשתות — %s — bluetooth"
+
+#: ../src/carrick.c:75 ../src/carrick.c:87
+msgid "networks"
+msgstr "רשתות"
+
+#: ../src/carrick.c:82
+msgid "networks - error"
+msgstr "רשתות — שגיאה"
+
+#: ../src/carrick.c:297
+msgid "Run in standalone mode"
+msgstr "הפעלה במצב עצמאי"
+
+#: ../src/carrick.c:299
+msgid "Embed in another window (overrides --standalone)"
+msgstr "הטמעה בחלון אחר (דריסת --standalone)"
+
+#: ../src/carrick.c:310
+msgid "Carrick connectivity applet"
+msgstr "יישומון הקישוריות Carrick"
+
+#: ../src/carrick.c:311
+msgid "- MeeGo connectivity applet"
+msgstr "- יישומון הקישוריות של MeeGo"
+
+#: ../src/carrick.c:352 ../data/carrick.desktop.in.in.h:2
+msgid "network"
+msgstr "רשת"
+
+#: ../callouts/3g/ggg-country-dialog.c:73
+#: ../callouts/3g/ggg-manual-dialog.c:70 ../callouts/3g/ggg-plan-dialog.c:111
+#: ../callouts/3g/ggg-provider-dialog.c:106
+#: ../callouts/3g/ggg-service-dialog.c:106
+msgid "Cellular Data Connection Wizard"
+msgstr "אשף התחברות נתונים סלולרית"
+
+#: ../callouts/3g/ggg-country-dialog.c:93
+msgid "Select Country"
+msgstr "בחירת מדינה"
+
+#: ../callouts/3g/ggg-manual-dialog.c:89
+msgid "Manual Configuration"
+msgstr "תצורה אוטומטית"
+
+#: ../callouts/3g/ggg-manual-dialog.c:93
+msgid "Plan Name (required):"
+msgstr "שם התכנית (נדרש):"
+
+#: ../callouts/3g/ggg-manual-dialog.c:96
+msgid "Username:"
+msgstr "שם משתמש:"
+
+#: ../callouts/3g/ggg-manual-dialog.c:99
+msgid "Password:"
+msgstr "ססמה:"
+
+#: ../callouts/3g/ggg-manual-dialog.c:103
+msgid "Gateway:"
+msgstr "שער גישה:"
+
+#: ../callouts/3g/ggg-manual-dialog.c:106
+msgid "Primary DNS:"
+msgstr "DNS ראשי:"
+
+#: ../callouts/3g/ggg-manual-dialog.c:109
+msgid "Secondary DNS:"
+msgstr "DNS משני:"
+
+#: ../callouts/3g/ggg-manual-dialog.c:112
+msgid "Tertiary DNS:"
+msgstr "DNS שלישוני:"
+
+#: ../callouts/3g/ggg-plan-dialog.c:131
+msgid "Select your 3G Plan"
+msgstr "בחירת תכנית ה־3G שלך"
+
+#: ../callouts/3g/ggg-provider-dialog.c:126
+msgid "Select Provider"
+msgstr "בחירת ספק"
+
+#: ../callouts/3g/ggg-service-dialog.c:59
+#, c-format
+msgid "%s (Roaming)"
+msgstr "%s (בנדידה)"
+
+#: ../callouts/3g/ggg-service-dialog.c:125
+msgid "Select 3G Service"
+msgstr "בחירת שירות 3G"
+
+#: ../data/carrick.desktop.in.in.h:1
+msgid "Network settings"
+msgstr "הגדרות הרשת"
--- po/hu.po
+++ po/hu.po
@@ -2,12 +2,12 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: carrick-ng\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:49+0000\n"
+"POT-Creation-Date: 2010-07-03 11:59+0000\n"
"PO-Revision-Date: 2010-01-22 11:22+0100\n"
"Last-Translator: Gergely Lónyai <aleph at mandriva.org>\n"
"Language-Team: Hungarian <aleph at mandriva.org>\n"
@@ -18,332 +18,351 @@
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Country: HUNGARY\n"
-#.
-#. * Translator note: The disabled technologies available to be turned on is put together at
+#. * Translator note: The disabled technologies available to be turned on is
+#. put together at
#. * runtime.
-#. * The conjunction 'or' will be at the end of a choice of disabled technologies,
+#. * The conjunction 'or' will be at the end of a choice of disabled
+#. technologies,
#. * for example 'WiFi, WiMAX or 3G.
-#.
-#: ../carrick/carrick-list.c:859
+#.
+#: ../carrick/carrick-list.c:843
msgid " or "
msgstr " vagy "
-#.
-#. * Translator note: the comma ',' will be used to join the different disabled technologies
+#. * Translator note: the comma ',' will be used to join the different
+#. disabled technologies
#. * as in the above example; 'WiFi, WiMAX or 3G'
-#.
-#: ../carrick/carrick-list.c:864
+#.
+#: ../carrick/carrick-list.c:848
msgid ", "
msgstr ", "
-#: ../carrick/carrick-list.c:865
-#: ../carrick/carrick-util.c:34
+#: ../carrick/carrick-list.c:849 ../carrick/carrick-util.c:34
msgid "wired"
msgstr "vezetékes"
-#: ../carrick/carrick-list.c:866
-#: ../carrick/carrick-pane.c:1469
+#. Switches
+#: ../carrick/carrick-list.c:850 ../carrick/carrick-pane.c:1429
#: ../carrick/carrick-util.c:32
msgid "WiFi"
msgstr "WiFi"
-#: ../carrick/carrick-list.c:867
-#: ../carrick/carrick-pane.c:1563
+#: ../carrick/carrick-list.c:851 ../carrick/carrick-pane.c:1471
#: ../carrick/carrick-util.c:38
msgid "WiMAX"
msgstr "WiMAX"
-#: ../carrick/carrick-list.c:868
-#: ../carrick/carrick-pane.c:1532
+#: ../carrick/carrick-list.c:852 ../carrick/carrick-pane.c:1457
#: ../carrick/carrick-util.c:36
msgid "3G"
msgstr "3G"
-#: ../carrick/carrick-list.c:869
-#: ../carrick/carrick-pane.c:1595
+#: ../carrick/carrick-list.c:853 ../carrick/carrick-pane.c:1485
#: ../carrick/carrick-util.c:40
msgid "Bluetooth"
msgstr "Bluetooth"
-#.
#. * Translators: this string is displayed if there
#. * are no available networks because ConnMan, the
#. * connectivity daemon, is not running.
-#.
-#: ../carrick/carrick-list.c:882
+#.
+#: ../carrick/carrick-list.c:866
msgid "Sorry, we can't find any networks. It appears that the connection manager is not running. You could try restarting your computer."
-msgstr "Elnézést, de nem találok hálózatot. A hálózatkezelő látszólag nem fut. Megpróbálhatod újraindítani készülékedet."
+msgstr "Nem található elérhető hálózat. A hálózatkezelő látszólag nem fut. A készülék újraindítása megoldhatja a problémát."
-#.
#. * Hint display if we detect that the system is in
#. * offline mode and there are no available networks
-#.
-#: ../carrick/carrick-list.c:892
+#.
+#: ../carrick/carrick-list.c:876
msgid "Sorry, we can't find any networks. You could try disabling Offline mode. "
-msgstr "Elnézést, de nem találok hálózatot. Megpróbálhatod a Kapcsolat nélküli mód kikapcsolását."
+msgstr "Nem található elérhető hálózat. A Kapcsolat nélküli mód kikapcsolása megoldhatja a problémát."
-#: ../carrick/carrick-list.c:1029
+#: ../carrick/carrick-list.c:1013
#, c-format
msgid "Sorry, we can't find any networks. You could try enabling %s."
-msgstr "Elnézést, de nem találok hálózatot. Megpróbálhatod engedélyezni a %s-t."
+msgstr "Nem található elérhető hálózat. A(z) %s-t."
-#.
#. * Generic message to display if all available networking
#. * technologies are turned on, but for whatever reason we
#. * can not find any networks
-#.
-#: ../carrick/carrick-list.c:1043
+#.
+#: ../carrick/carrick-list.c:1027
msgid "Sorry, we can't find any networks"
-msgstr "Elnézést, de nem találok hálózatot."
+msgstr "Nem található elérhető hálózat"
-#: ../carrick/carrick-notification-manager.c:104
+#: ../carrick/carrick-notification-manager.c:124
msgid "Network connected"
-msgstr "Kapcsolódtam a hálózathoz"
+msgstr "A hálózati kapcsolat létrejött"
-#: ../carrick/carrick-notification-manager.c:112
+#: ../carrick/carrick-notification-manager.c:132
#, c-format
msgid "You're now connected to a wired network"
-msgstr "Kapcsolódtam a vezetékes hálózathoz"
+msgstr "A vezetékes kapcsolat létrejött"
-#: ../carrick/carrick-notification-manager.c:142
+#: ../carrick/carrick-notification-manager.c:162
#, c-format
msgid "You're now connected to %s, a %s network"
-msgstr "Kapcsolódtam a(z) %s-hoz, ez egy %s hálózat"
+msgstr "%s - %s hálózati kapcsolat létrejött"
-#: ../carrick/carrick-notification-manager.c:148
+#: ../carrick/carrick-notification-manager.c:168
#, c-format
msgid "You're now connected to a %s network"
-msgstr "Kapcsolódtam a(z) %s hálózathoz"
+msgstr "%s hálózati kapcsolat létrejött"
-#: ../carrick/carrick-notification-manager.c:165
+#: ../carrick/carrick-notification-manager.c:185
msgid "Network lost"
-msgstr "Elvesztettem a hálózatot"
+msgstr "A hálózati kapcsolat megszakadt"
-#: ../carrick/carrick-notification-manager.c:173
+#: ../carrick/carrick-notification-manager.c:193
#, c-format
msgid "Sorry, we've lost your wired connection"
-msgstr "Elnézést, megszakadt a vezetékes kapcsolat"
+msgstr "A vezetékes kapcsolat megszakadt"
-#: ../carrick/carrick-notification-manager.c:177
+#: ../carrick/carrick-notification-manager.c:197
#, c-format
msgid "Sorry we've lost your %s connection to %s"
-msgstr "Elnézést, megszakadt a(z) %s kapcsolat a(z) %s porton"
+msgstr "A következő kapcsolat megszakadt: %s - %s"
-#: ../carrick/carrick-notification-manager.c:183
+#: ../carrick/carrick-notification-manager.c:203
#, c-format
msgid "Sorry, we've lost your %s connection"
msgstr "Elnézést, megszakadt a(z) %s kapcsolat"
-#: ../carrick/carrick-notification-manager.c:200
+#: ../carrick/carrick-notification-manager.c:220
msgid "Network changed"
-msgstr "Hálózatot váltottam"
+msgstr "A hálózat megváltozott"
-#: ../carrick/carrick-notification-manager.c:219
+#: ../carrick/carrick-notification-manager.c:239
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to a wired network"
-msgstr "Elnézést, megszakadt a kapcsolat a(z) %s porton. Csatlakoztam a vezetékes hálózathoz"
+msgstr "A(z) %s kapcsolat megszakadt. Vezetékes kapcsolat került létrehozásra"
-#: ../carrick/carrick-notification-manager.c:226
+#: ../carrick/carrick-notification-manager.c:246
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to %s, a %s network"
-msgstr "Elnézést, megszakadt a kapcsolat a(z) %s porton. Csatlakoztam a(z) %s-hoz, ez egy %s hálózat "
+msgstr "A(z) %s kapcsolat megszakadt. A következő kapcsolat került létrehozásra: %s - %s"
-#: ../carrick/carrick-notification-manager.c:234
+#: ../carrick/carrick-notification-manager.c:254
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to a %s network"
-msgstr "Elnézést, megszakadt a kapcsolat a(z) %s porton. Csatlakoztam a(z) %s hálózathoz"
+msgstr "A(z) %s kapcsolat megszakadt. A következő kapcsolat került létrehozásra: %s"
-#: ../carrick/carrick-notification-manager.c:244
+#: ../carrick/carrick-notification-manager.c:264
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to a wired network"
-msgstr "Elnézést, megszakadt a(z) %s kapcsolat. Csatlakoztam a vezetékes hálózathoz"
+msgstr "A(z) %s kapcsolat megszakadt. Vezetékes kapcsolat került létrehozásra"
-#: ../carrick/carrick-notification-manager.c:251
+#: ../carrick/carrick-notification-manager.c:271
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to %s, a %s network"
-msgstr "Elnézést, megszakadt a(z) %s kapcsolat. Csatlakoztam a(z) %s-hoz, ez egy %s hálózat "
+msgstr "A(z) %s kapcsolat megszakadt. A következő kapcsolat került létrehozásra: %s - %s"
-#: ../carrick/carrick-notification-manager.c:260
+#: ../carrick/carrick-notification-manager.c:280
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to a %s network"
-msgstr "Elnézést, megszakadt a(z) %s kapcsolat. Csatlakoztam a(z) %s hálózathoz"
+msgstr "A(z) %s kapcsolat megszakadt. A következő kapcsolat került létrehozásra: %s"
-#: ../carrick/carrick-pane.c:633
+#: ../carrick/carrick-pane.c:634
msgid "New connection settings"
msgstr "Új hálózat beállítása"
-#: ../carrick/carrick-pane.c:669
+#: ../carrick/carrick-pane.c:672
msgid ""
"Enter the name of the network you want\n"
"to connect to and, where necessary, the\n"
"password and security type."
msgstr ""
-"Írd be a hálózat nevét, melyhez\n"
-"kapcsolódni kívánsz és ha szükséges\n"
-"jelszót és a biztonsági típust."
+"Írja be a hálózat nevét, melyhez\n"
+"kapcsolódni kíván, valamint szükség esetén a\n"
+"jelszót és a biztonsági protokoll típusát."
-#: ../carrick/carrick-pane.c:679
+#: ../carrick/carrick-pane.c:682
msgid "Network name"
msgstr "Hálózat neve"
-#: ../carrick/carrick-pane.c:691
+#: ../carrick/carrick-pane.c:694
msgid "Network security"
msgstr "Hálózati biztonság"
-#: ../carrick/carrick-pane.c:701
+#: ../carrick/carrick-pane.c:704
msgid "None"
msgstr "Nincs"
-#: ../carrick/carrick-pane.c:715
+#: ../carrick/carrick-pane.c:716
msgid "Password"
msgstr "Jelszó"
-#: ../carrick/carrick-pane.c:730
-#: ../carrick/carrick-service-item.c:1284
+#: ../carrick/carrick-pane.c:731 ../carrick/carrick-service-item.c:1787
msgid "Show password"
-msgstr "Jelszó mutatása"
+msgstr "Jelszó megjelenítése"
-#: ../carrick/carrick-pane.c:1404
-msgid "Networks"
-msgstr "Hálózatok"
+#: ../carrick/carrick-pane.c:1412
+msgid "Settings"
+msgstr "Beállítások"
-#. New connection button
-#: ../carrick/carrick-pane.c:1428
-msgid "Add new connection"
-msgstr "Új kapcsolat hozzáadása"
-
-#: ../carrick/carrick-pane.c:1501
-#: ../carrick/carrick-service-item.c:249
+#: ../carrick/carrick-pane.c:1443 ../carrick/carrick-service-item.c:328
msgid "Wired"
msgstr "Vezetékes"
-#: ../carrick/carrick-pane.c:1639
+#: ../carrick/carrick-pane.c:1510
msgid "Offline mode"
msgstr "Kapcsolat nélküli mód"
-#: ../carrick/carrick-pane.c:1664
+#: ../carrick/carrick-pane.c:1520
msgid "This will disable all your connections"
-msgstr "Ez minden hálózatod leállítja"
+msgstr "Ez minden hálózati kapcsolatot letilt"
+
+#: ../carrick/carrick-pane.c:1556 ../src/carrick.c:369
+msgid "Networks"
+msgstr "Hálózatok"
+
+#. New connection button
+#: ../carrick/carrick-pane.c:1562
+msgid "Add new connection"
+msgstr "Új kapcsolat hozzáadása"
#. Translators:
#. The following are potential errors that a user might see while
#. attempting to configure a 3G data service.
-#.
-#: ../carrick/carrick-service-item.c:49
+#.
+#: ../carrick/carrick-service-item.c:51
msgid "Critical Error: Invalid country code"
msgstr "Kritikus hiba: érvénytelen országkód"
-#: ../carrick/carrick-service-item.c:50
+#: ../carrick/carrick-service-item.c:52
msgid "Missing required APN (service plan name)"
msgstr "Hiányzik az APN (a szolgáltatás neve)"
-#: ../carrick/carrick-service-item.c:51
+#: ../carrick/carrick-service-item.c:53
msgid "Internal Error: Invalid network service"
msgstr "Belső hiba: érvénytelen hálózati szolgáltatás"
-#: ../carrick/carrick-service-item.c:52
+#: ../carrick/carrick-service-item.c:54
msgid "Critical Error: Unable to access Connection Manager"
msgstr "Kritikus hiba: nem lehet csatlakozni a Hálózatkezelőhöz"
-#: ../carrick/carrick-service-item.c:53
+#: ../carrick/carrick-service-item.c:55
msgid "ERROR: No 3G Hardware detected"
msgstr "HIBA: nem találok 3G-s hardvert"
#. TRANSLATORS: this is a wireless security method, at least WEP,
-#. * WPA and WPA2 are possible token values. Example: "WEP encrypted".
-#.
-#: ../carrick/carrick-service-item.c:185
+#. * WPA and IEEE8021X are possible token values. Example: "WEP encrypted".
+#.
+#: ../carrick/carrick-service-item.c:192
#, c-format
msgid "%s encrypted"
msgstr "%s titkosított"
-#: ../carrick/carrick-service-item.c:280
+#: ../carrick/carrick-service-item.c:340 ../carrick/carrick-service-item.c:357
msgid "Disconnect"
msgstr "Bontás"
-#: ../carrick/carrick-service-item.c:283
+#: ../carrick/carrick-service-item.c:343
msgid "Connected"
-msgstr "Kapcsolatban"
+msgstr "Kapcsolódva"
-#: ../carrick/carrick-service-item.c:290
-#: ../carrick/carrick-service-item.c:299
+#: ../carrick/carrick-service-item.c:360
+msgid "Online"
+msgstr "Online"
+
+#: ../carrick/carrick-service-item.c:367 ../carrick/carrick-service-item.c:376
#, c-format
msgid "Cancel"
msgstr "Mégsem"
-#: ../carrick/carrick-service-item.c:293
+#: ../carrick/carrick-service-item.c:370
msgid "Configuring"
msgstr "Beállítás"
-#: ../carrick/carrick-service-item.c:302
+#: ../carrick/carrick-service-item.c:379
msgid "Associating"
msgstr "Társítás"
-#: ../carrick/carrick-service-item.c:311
-#: ../carrick/carrick-service-item.c:336
-#: ../carrick/carrick-service-item.c:1273
+#: ../carrick/carrick-service-item.c:388 ../carrick/carrick-service-item.c:413
+#: ../carrick/carrick-service-item.c:1774
msgid "Connect"
msgstr "Kapcsolódás"
-#: ../carrick/carrick-service-item.c:339
+#: ../carrick/carrick-service-item.c:416
msgid "Connection failed"
msgstr "Sikertelen kapcsolódás"
-#: ../carrick/carrick-service-item.c:342
+#: ../carrick/carrick-service-item.c:419
msgid "Sorry, the connection failed. You could try again."
-msgstr "Elnézést, de nem találok hálózatot. Megpróbálhatod bekapcsolni a 3G-t."
+msgstr "A kapcsolódás sikertelen. Próbálja újra!"
-#: ../carrick/carrick-service-item.c:348
-#: ../carrick/carrick-service-item.c:351
+#: ../carrick/carrick-service-item.c:425 ../carrick/carrick-service-item.c:428
#, c-format
msgid "Disconnecting"
-msgstr "Bontás"
+msgstr "Kapcsolat bontása"
-#: ../carrick/carrick-service-item.c:409
+#: ../carrick/carrick-service-item.c:494
msgid "Type password here"
-msgstr "Írd ide a jelszavad"
+msgstr "Adja meg a jelszavát"
-#: ../carrick/carrick-service-item.c:472
+#: ../carrick/carrick-service-item.c:563
msgid "Really remove?"
-msgstr "Valóban töröljem?"
+msgstr "Biztosan el szeretné távolítani?"
-#: ../carrick/carrick-service-item.c:490
+#: ../carrick/carrick-service-item.c:583
#, c-format
msgid ""
"Do you want to remove the %s %s network? This\n"
"will forget the password and you will no longer be\n"
"automatically connected to %s."
msgstr ""
-"Törölni akarod a %s %s hálózatot? Ez a jelszó\n"
-"elfelejtését jelenti, és többé nem tudsz automatikusan\n"
+"Biztosan el szeretné távolítani a(z) %s %s hálózatot? Ez a jelszó\n"
+"elfelejtését jelenti, és többé nem tud automatikusan\n"
"kapcsolódni ehhez: %s."
-#: ../carrick/carrick-service-item.c:667
+#: ../carrick/carrick-service-item.c:786
#, c-format
msgid "Your password isn't the right length. For a WEP connection it needs to be either 10 or 26 characters, you have %i."
-msgstr "A jelszavad hossza nem megfelelő. A WEP kapcsolathoz 10 vagy 26 karakter hosszú jelszó szükséges. A tied %i hosszú."
+msgstr "A jelszó hossza nem megfelelő. A WEP kapcsolathoz 10 vagy 26 karakter hosszú jelszó szükséges. A megadott jelszó %i karakter hosszú."
-#: ../carrick/carrick-service-item.c:678
+#: ../carrick/carrick-service-item.c:797
#, c-format
msgid "Your password is too short. For a WPA connection it needs to be at least 8 characters long, you have %i"
-msgstr "A jelszavad túl rövid. A WPA kapcsolathoz legalább 8 karakter hosszú jelszó szükséges. A tied %i hosszú"
+msgstr "A jelszó túl rövid. A WPA kapcsolathoz legalább 8 karakter hosszú jelszó szükséges. A megadott jelszó %i karakter hosszú."
-#: ../carrick/carrick-service-item.c:682
+#: ../carrick/carrick-service-item.c:801
#, c-format
msgid "Your password is too long. For a WPA connection it needs to have fewer than 63 characters, you have %i"
-msgstr "A jelszavad túl hosszú. A WPA kapcsolathoz maximum 63 karakter hosszú jelszó szükséges. A tied %i hosszú"
+msgstr "A jelszó túl hosszú. A WPA kapcsolathoz maximum 63 karakter hosszú jelszó szükséges. A megadott jelszó %i karakter hosszú."
-#: ../carrick/carrick-service-item.c:691
+#: ../carrick/carrick-service-item.c:810
#, c-format
msgid "Your password is too short. For a WPA2 connection it needs to be at least 8 characters long, you have %i"
-msgstr "A jelszavad túl rövid. A WPA2 kapcsolathoz legalább 8 karakter hosszú jelszó szükséges. A tied %i hosszú"
+msgstr "A jelszó túl rövid. A WPA2 kapcsolathoz legalább 8 karakter hosszú jelszó szükséges. A megadott jelszó %i karakter hosszú."
-#: ../carrick/carrick-service-item.c:695
+#: ../carrick/carrick-service-item.c:814
#, c-format
msgid "Your password is too long. For a WPA2 connection it needs to have fewer than 63 characters, you have %i"
-msgstr "A jelszavad túl hosszú. A WPA2 kapcsolathoz maximum 63 karakter hosszú jelszó szükséges. A tied %i hosszú"
+msgstr "A jelszó túl hosszú. A WPA2 kapcsolathoz maximum 63 karakter hosszú jelszó szükséges. A megadott jelszó %i karakter hosszú."
+
+#: ../carrick/carrick-service-item.c:1267
+msgid "Sorry, it looks like the IP address is not valid"
+msgstr "Az IP-cím valószínűleg érvénytelen"
-#: ../carrick/carrick-service-item.c:1209
+#: ../carrick/carrick-service-item.c:1279
+msgid "Sorry, it looks like the gateway address is not valid"
+msgstr "Az átjáró címe valószínűleg érvénytelen"
+
+#: ../carrick/carrick-service-item.c:1291
+msgid "Sorry, it looks like the subnet mask is not valid"
+msgstr "Az alhálózati maszk valószínűleg érvénytelen"
+
+#: ../carrick/carrick-service-item.c:1336
+#, c-format
+msgid "Sorry, it looks like the nameserver address '%s' is not valid"
+msgstr "A(z) '%s' névszerver valószínűleg érvénytelen"
+
+#. TRANSLATORS: label for the Advanced expander in a service item
+#: ../carrick/carrick-service-item.c:1698
+msgid "Advanced"
+msgstr "Haladó"
+
+#: ../carrick/carrick-service-item.c:1708
msgid "Scanning"
msgstr "Keresés"
@@ -351,74 +370,115 @@
#. TRANSLATORS: This is an example of a wireless security method
#. (see another translator comment), used to estimate the string length.
#. It should look like the ones below network name in the UI
-#: ../carrick/carrick-service-item.c:1228
+#: ../carrick/carrick-service-item.c:1729
msgid "WPA2 encrypted"
msgstr "WPA2 titkosítás"
-#: ../src/carrick.c:64
+#. TRANSLATORS: label in advanced settings (next to combobox
+#. * for DHCP/Static IP)
+#: ../carrick/carrick-service-item.c:1836
+msgid "Connect by:"
+msgstr "Kapcsolódás:"
+
+#. TRANSLATORS: label in advanced settings
+#: ../carrick/carrick-service-item.c:1838
+msgid "IP address:"
+msgstr "IP-cím:"
+
+#. TRANSLATORS: label in advanced settings
+#: ../carrick/carrick-service-item.c:1840
+msgid "Subnet mask:"
+msgstr "Alhálózati maszk:"
+
+#. TRANSLATORS: label in advanced settings
+#: ../carrick/carrick-service-item.c:1842
+msgid "Router:"
+msgstr "Router:"
+
+#. TRANSLATORS: label in advanced settings
+#: ../carrick/carrick-service-item.c:1844
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../carrick/carrick-service-item.c:1850
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../carrick/carrick-service-item.c:1852
+msgid "Static IP"
+msgstr "Statikus IP"
+
+#. TRANSLATORS: label for apply button in static ip settings
+#: ../carrick/carrick-service-item.c:1902
+msgid "Apply"
+msgstr "Alkalmaz"
+
+#: ../src/carrick.c:49
msgid "networks - not connected"
msgstr "hálózatok - nincs kapcsolat"
-#: ../src/carrick.c:70
+#: ../src/carrick.c:55
msgid "networks - connecting"
msgstr "hálózatok - kapcsolódás"
-#: ../src/carrick.c:76
+#: ../src/carrick.c:61
msgid "networks - wired"
msgstr "hálózatok - vezetékes"
-#: ../src/carrick.c:78
+#: ../src/carrick.c:63
#, c-format
msgid "networks - %s - wifi"
msgstr "hálózatok - %s - wifi"
-#: ../src/carrick.c:81
+#: ../src/carrick.c:66
#, c-format
msgid "networks - %s - wimax"
msgstr "hálózatok - %s - wimax"
-#: ../src/carrick.c:84
+#: ../src/carrick.c:69
#, c-format
msgid "networks - %s - 3G"
msgstr "hálózatok - %s - 3G"
-#: ../src/carrick.c:87
+#: ../src/carrick.c:72
#, c-format
msgid "networks - %s - bluetooth"
msgstr "hálózatok - %s - bluetooth"
-#: ../src/carrick.c:90
-#: ../src/carrick.c:102
+#: ../src/carrick.c:75 ../src/carrick.c:87
msgid "networks"
msgstr "hálózatok"
-#: ../src/carrick.c:97
+#: ../src/carrick.c:82
msgid "networks - error"
msgstr "hálózatok - hiba"
-#: ../src/carrick.c:129
+#: ../src/carrick.c:297
msgid "Run in standalone mode"
-msgstr "Futtatás általános módban"
+msgstr "Futtatás önálló módban"
-#: ../src/carrick.c:140
+#: ../src/carrick.c:299
+msgid "Embed in another window (overrides --standalone)"
+msgstr "Beágyazása egy másik ablakban (felülbírálja -- önálló)"
+
+#: ../src/carrick.c:310
msgid "Carrick connectivity applet"
msgstr "Carrick csatlakozó alkalmazás"
-#: ../src/carrick.c:141
-msgid "- Moblin connectivity applet"
-msgstr "- Moblin csatlakozó alkalmazás"
+#: ../src/carrick.c:311
+msgid "- MeeGo connectivity applet"
+msgstr "- MeeGo csatlakozó alkalmazás"
-#: ../src/carrick.c:164
+#: ../src/carrick.c:352 ../data/carrick.desktop.in.in.h:2
msgid "network"
msgstr "hálózat"
#: ../callouts/3g/ggg-country-dialog.c:73
-#: ../callouts/3g/ggg-manual-dialog.c:70
-#: ../callouts/3g/ggg-plan-dialog.c:111
+#: ../callouts/3g/ggg-manual-dialog.c:70 ../callouts/3g/ggg-plan-dialog.c:111
#: ../callouts/3g/ggg-provider-dialog.c:106
#: ../callouts/3g/ggg-service-dialog.c:106
msgid "Cellular Data Connection Wizard"
-msgstr "3G Csatlakozás Varázsló"
+msgstr "3G csatlakozás varázsló"
#: ../callouts/3g/ggg-country-dialog.c:93
msgid "Select Country"
@@ -430,7 +490,7 @@
#: ../callouts/3g/ggg-manual-dialog.c:93
msgid "Plan Name (required):"
-msgstr "Terület neve (szükséges):"
+msgstr "Szolgáltatás neve (szükséges):"
#: ../callouts/3g/ggg-manual-dialog.c:96
msgid "Username:"
@@ -458,7 +518,7 @@
#: ../callouts/3g/ggg-plan-dialog.c:131
msgid "Select your 3G Plan"
-msgstr "Válaszd ki a 3G területedet"
+msgstr "3G csomag kiválasztása"
#: ../callouts/3g/ggg-provider-dialog.c:126
msgid "Select Provider"
@@ -473,35 +533,36 @@
msgid "Select 3G Service"
msgstr "3G szolgáltatás kiválasztása"
+#: ../data/carrick.desktop.in.in.h:1
+msgid "Network settings"
+msgstr "Hálózati beállítások"
+
#~ msgid "Sorry, we can't find any networks. "
#~ msgstr "Elnézést, de nem találunk hálózatot."
-#~ msgid ""
-#~ "The ConnMan daemon doesn't seem to be running. You may want to try re-"
-#~ "starting your device"
-#~ msgstr ""
-#~ "A ConnMan látszólag nem fut. Megpróbálhatod újraindítani készülékedet"
+
+#~ msgid "The ConnMan daemon doesn't seem to be running. You may want to try re-starting your device"
+#~ msgstr "A ConnMan látszólag nem fut. Megpróbálhatod újraindítani készülékedet"
+
#~ msgid "You could try disabling Offline mode"
#~ msgstr "Megpróbálhatod a Kapcsolat nélküli mód kikapcsolását"
+
#~ msgid "You could try turning on "
#~ msgstr "Megpróbálhatod bekapcsolni"
+
#~ msgid " and "
#~ msgstr "és"
+
#~ msgid "Ethernet"
#~ msgstr "Ethernet"
+
#~ msgid "Sorry, we can't find any networks. You could try turning on WiFi."
-#~ msgstr ""
-#~ "Elnézést, de nem találunk hálózatot. Megpróbálhatod bekapcsolni a WiFi-t."
+#~ msgstr "Elnézést, de nem találunk hálózatot. Megpróbálhatod bekapcsolni a WiFi-t."
+
#~ msgid "Sorry, we can't find any networks. You could try turning on WiMAX."
-#~ msgstr ""
-#~ "Elnézést, de nem találunk hálózatot. Megpróbálhatod bekapcsolni a WiMAX-"
-#~ "ot."
-#~ msgid ""
-#~ "Sorry, we can't find any networks. You could try turning on Bluetooth."
-#~ msgstr ""
-#~ "Elnézést, de nem találunk hálózatot. Megpróbálhatod bekapcsolni a "
-#~ "Bluetooth-t."
-#~ msgid "Sorry, we can't find any networks. You could try turning on Wired."
-#~ msgstr ""
-#~ "Elnézést, de nem találunk hálózatot. Megpróbálhatod bekapcsolni a "
-#~ "vezetékes kapcsolatot."
+#~ msgstr "Elnézést, de nem találunk hálózatot. Megpróbálhatod bekapcsolni a WiMAX-ot."
+#~ msgid "Sorry, we can't find any networks. You could try turning on Bluetooth."
+#~ msgstr "Elnézést, de nem találunk hálózatot. Megpróbálhatod bekapcsolni a Bluetooth-t."
+
+#~ msgid "Sorry, we can't find any networks. You could try turning on Wired."
+#~ msgstr "Elnézést, de nem találunk hálózatot. Megpróbálhatod bekapcsolni a vezetékes kapcsolatot."
--- po/it.po
+++ po/it.po
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: carrick-ng\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-12 09:29+0000\n"
-"PO-Revision-Date: 2010-05-12 11:47-0800\n"
+"POT-Creation-Date: 2010-07-03 11:59+0000\n"
+"PO-Revision-Date: 2010-08-26 11:17-0800\n"
"Last-Translator: francesca godani <francesca.godani at ptiglobal.net>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@
#. * The conjunction 'or' will be at the end of a choice of disabled technologies,
#. * for example 'WiFi, WiMAX or 3G.
#.
-#: ../carrick/carrick-list.c:847
+#: ../carrick/carrick-list.c:843
msgid " or "
msgstr " o "
@@ -31,35 +31,35 @@
#. * Translator note: the comma ',' will be used to join the different disabled technologies
#. * as in the above example; 'WiFi, WiMAX or 3G'
#.
-#: ../carrick/carrick-list.c:852
+#: ../carrick/carrick-list.c:848
msgid ", "
msgstr ", "
-#: ../carrick/carrick-list.c:853
+#: ../carrick/carrick-list.c:849
#: ../carrick/carrick-util.c:34
msgid "wired"
msgstr "via cavo"
#. Switches
-#: ../carrick/carrick-list.c:854
+#: ../carrick/carrick-list.c:850
#: ../carrick/carrick-pane.c:1429
#: ../carrick/carrick-util.c:32
msgid "WiFi"
msgstr "WiFi"
-#: ../carrick/carrick-list.c:855
+#: ../carrick/carrick-list.c:851
#: ../carrick/carrick-pane.c:1471
#: ../carrick/carrick-util.c:38
msgid "WiMAX"
msgstr "WiMAX"
-#: ../carrick/carrick-list.c:856
+#: ../carrick/carrick-list.c:852
#: ../carrick/carrick-pane.c:1457
#: ../carrick/carrick-util.c:36
msgid "3G"
msgstr "3G"
-#: ../carrick/carrick-list.c:857
+#: ../carrick/carrick-list.c:853
#: ../carrick/carrick-pane.c:1485
#: ../carrick/carrick-util.c:40
msgid "Bluetooth"
@@ -70,7 +70,7 @@
#. * are no available networks because ConnMan, the
#. * connectivity daemon, is not running.
#.
-#: ../carrick/carrick-list.c:870
+#: ../carrick/carrick-list.c:866
msgid "Sorry, we can't find any networks. It appears that the connection manager is not running. You could try restarting your computer."
msgstr "Impossibile trovare alcuna rete. Il gestore della connessione non sembra essere in esecuzione: provare a riavviare il computer."
@@ -78,11 +78,11 @@
#. * Hint display if we detect that the system is in
#. * offline mode and there are no available networks
#.
-#: ../carrick/carrick-list.c:880
+#: ../carrick/carrick-list.c:876
msgid "Sorry, we can't find any networks. You could try disabling Offline mode. "
msgstr "Impossibile trovare alcuna rete. È possibile provare a disabilitare la modalità fuori rete"
-#: ../carrick/carrick-list.c:1017
+#: ../carrick/carrick-list.c:1013
#, c-format
msgid "Sorry, we can't find any networks. You could try enabling %s."
msgstr "Impossibile trovare alcuna rete. È possibile provare ad abilitare la rete %s."
@@ -92,78 +92,78 @@
#. * technologies are turned on, but for whatever reason we
#. * can not find any networks
#.
-#: ../carrick/carrick-list.c:1031
+#: ../carrick/carrick-list.c:1027
msgid "Sorry, we can't find any networks"
msgstr "Impossibile trovare alcuna rete"
-#: ../carrick/carrick-notification-manager.c:104
+#: ../carrick/carrick-notification-manager.c:124
msgid "Network connected"
msgstr "Rete collegata"
-#: ../carrick/carrick-notification-manager.c:112
+#: ../carrick/carrick-notification-manager.c:132
#, c-format
msgid "You're now connected to a wired network"
msgstr "Si è ora connessi a una rete via cavo"
-#: ../carrick/carrick-notification-manager.c:142
+#: ../carrick/carrick-notification-manager.c:162
#, c-format
msgid "You're now connected to %s, a %s network"
msgstr "Si è ora connessi a %s, una rete %s"
-#: ../carrick/carrick-notification-manager.c:148
+#: ../carrick/carrick-notification-manager.c:168
#, c-format
msgid "You're now connected to a %s network"
msgstr "Si è ora connessi a una rete %s"
-#: ../carrick/carrick-notification-manager.c:165
+#: ../carrick/carrick-notification-manager.c:185
msgid "Network lost"
msgstr "Connessione persa"
-#: ../carrick/carrick-notification-manager.c:173
+#: ../carrick/carrick-notification-manager.c:193
#, c-format
msgid "Sorry, we've lost your wired connection"
msgstr "La connessione alla rete via cavo è stata persa"
-#: ../carrick/carrick-notification-manager.c:177
+#: ../carrick/carrick-notification-manager.c:197
#, c-format
msgid "Sorry we've lost your %s connection to %s"
msgstr "La connessione %s a %s è stata persa"
-#: ../carrick/carrick-notification-manager.c:183
+#: ../carrick/carrick-notification-manager.c:203
#, c-format
msgid "Sorry, we've lost your %s connection"
msgstr "La connessione %s è stata persa"
-#: ../carrick/carrick-notification-manager.c:200
+#: ../carrick/carrick-notification-manager.c:220
msgid "Network changed"
msgstr "Rete cambiata"
-#: ../carrick/carrick-notification-manager.c:219
+#: ../carrick/carrick-notification-manager.c:239
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to a wired network"
msgstr "La connessione a %s è stata persa. Si è ora connessi a una rete via cavo."
-#: ../carrick/carrick-notification-manager.c:226
+#: ../carrick/carrick-notification-manager.c:246
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to %s, a %s network"
msgstr "La connessione a %s è stata persa. Si è ora connessi a %s, una rete %s"
-#: ../carrick/carrick-notification-manager.c:234
+#: ../carrick/carrick-notification-manager.c:254
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to a %s network"
msgstr "La connessione a %s è stata persa. Si è ora connessi a una rete %s"
-#: ../carrick/carrick-notification-manager.c:244
+#: ../carrick/carrick-notification-manager.c:264
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to a wired network"
msgstr "La connessione %s è stata persa. Si è ora connessi a una rete via cavo"
-#: ../carrick/carrick-notification-manager.c:251
+#: ../carrick/carrick-notification-manager.c:271
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to %s, a %s network"
msgstr "La connessione %s è stata persa. Si è ora connessi a %s, una rete %s"
-#: ../carrick/carrick-notification-manager.c:260
+#: ../carrick/carrick-notification-manager.c:280
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to a %s network"
msgstr "La connessione %s è stata persa. Si è ora connessi a una rete %s"
@@ -199,7 +199,7 @@
msgstr "Password"
#: ../carrick/carrick-pane.c:731
-#: ../carrick/carrick-service-item.c:1683
+#: ../carrick/carrick-service-item.c:1787
msgid "Show password"
msgstr "Mostrare password"
@@ -208,7 +208,7 @@
msgstr "Impostazioni"
#: ../carrick/carrick-pane.c:1443
-#: ../carrick/carrick-service-item.c:278
+#: ../carrick/carrick-service-item.c:328
msgid "Wired"
msgstr "Via cavo"
@@ -221,7 +221,7 @@
msgstr "Disabilita tutte le connessioni"
#: ../carrick/carrick-pane.c:1556
-#: ../src/carrick.c:351
+#: ../src/carrick.c:369
msgid "Networks"
msgstr "Reti"
@@ -258,72 +258,72 @@
#. TRANSLATORS: this is a wireless security method, at least WEP,
#. * WPA and IEEE8021X are possible token values. Example: "WEP encrypted".
#.
-#: ../carrick/carrick-service-item.c:191
+#: ../carrick/carrick-service-item.c:192
#, c-format
msgid "%s encrypted"
msgstr "%s cifrato"
# (ndt) pulsante
-#: ../carrick/carrick-service-item.c:290
-#: ../carrick/carrick-service-item.c:307
+#: ../carrick/carrick-service-item.c:340
+#: ../carrick/carrick-service-item.c:357
msgid "Disconnect"
msgstr "Disconnetti"
# (ndt) viene fuori qualche cosa di simile:
# Cablata - Collegata
# Metto al femminile essendo rete
-#: ../carrick/carrick-service-item.c:293
+#: ../carrick/carrick-service-item.c:343
msgid "Connected"
msgstr "Collegata"
-#: ../carrick/carrick-service-item.c:310
+#: ../carrick/carrick-service-item.c:360
msgid "Online"
msgstr "In rete"
-#: ../carrick/carrick-service-item.c:317
-#: ../carrick/carrick-service-item.c:326
+#: ../carrick/carrick-service-item.c:367
+#: ../carrick/carrick-service-item.c:376
#, c-format
msgid "Cancel"
msgstr "Annulla"
-#: ../carrick/carrick-service-item.c:320
+#: ../carrick/carrick-service-item.c:370
msgid "Configuring"
msgstr "Configurazione in corso"
-#: ../carrick/carrick-service-item.c:329
+#: ../carrick/carrick-service-item.c:379
msgid "Associating"
msgstr "Associazione in corso"
-#: ../carrick/carrick-service-item.c:338
-#: ../carrick/carrick-service-item.c:363
-#: ../carrick/carrick-service-item.c:1670
+#: ../carrick/carrick-service-item.c:388
+#: ../carrick/carrick-service-item.c:413
+#: ../carrick/carrick-service-item.c:1774
msgid "Connect"
msgstr "Connetti"
# (ndt) un po' libera, ma preferisco lasciarla così
-#: ../carrick/carrick-service-item.c:366
+#: ../carrick/carrick-service-item.c:416
msgid "Connection failed"
msgstr "Connessione non stabilita"
-#: ../carrick/carrick-service-item.c:369
+#: ../carrick/carrick-service-item.c:419
msgid "Sorry, the connection failed. You could try again."
msgstr "La connessione non è riuscita. Provare nuovamente."
-#: ../carrick/carrick-service-item.c:375
-#: ../carrick/carrick-service-item.c:378
+#: ../carrick/carrick-service-item.c:425
+#: ../carrick/carrick-service-item.c:428
#, c-format
msgid "Disconnecting"
msgstr "Disconnessione in corso"
-#: ../carrick/carrick-service-item.c:468
+#: ../carrick/carrick-service-item.c:494
msgid "Type password here"
msgstr "Digitare la password"
-#: ../carrick/carrick-service-item.c:537
+#: ../carrick/carrick-service-item.c:563
msgid "Really remove?"
msgstr "Rimuovere veramente?"
-#: ../carrick/carrick-service-item.c:557
+#: ../carrick/carrick-service-item.c:583
#, c-format
msgid ""
"Do you want to remove the %s %s network? This\n"
@@ -334,54 +334,54 @@
"la password verrà cancellata e non sarà più possibile\n"
"connettersi automaticamente a %s."
-#: ../carrick/carrick-service-item.c:753
+#: ../carrick/carrick-service-item.c:786
#, c-format
msgid "Your password isn't the right length. For a WEP connection it needs to be either 10 or 26 characters, you have %i."
msgstr "La password non è della dimensione corretta. Per una connessione WEP sono necessari 10 o 26 caratteri, ora ne sono presenti %i."
-#: ../carrick/carrick-service-item.c:764
+#: ../carrick/carrick-service-item.c:797
#, c-format
msgid "Your password is too short. For a WPA connection it needs to be at least 8 characters long, you have %i"
msgstr "La password è troppo corta. Per una connessione WPA sono necessari 8 caratteri, ora ne sono presenti %i."
-#: ../carrick/carrick-service-item.c:768
+#: ../carrick/carrick-service-item.c:801
#, c-format
msgid "Your password is too long. For a WPA connection it needs to have fewer than 63 characters, you have %i"
msgstr "La password è troppo lunga. Per una connessione WPA sono necessari meno di 63 caratteri, ora ne sono presenti %i."
-#: ../carrick/carrick-service-item.c:777
+#: ../carrick/carrick-service-item.c:810
#, c-format
msgid "Your password is too short. For a WPA2 connection it needs to be at least 8 characters long, you have %i"
msgstr "La password è troppo corta. Per una connessione WPA2 sono necessari 8 caratteri, ora ne sono presenti %i."
-#: ../carrick/carrick-service-item.c:781
+#: ../carrick/carrick-service-item.c:814
#, c-format
msgid "Your password is too long. For a WPA2 connection it needs to have fewer than 63 characters, you have %i"
msgstr "La password è troppo lunga. Per una connessione WPA2 sono necessari meno di 63 caratteri, ora ne sono presenti %i."
-#: ../carrick/carrick-service-item.c:1227
+#: ../carrick/carrick-service-item.c:1267
msgid "Sorry, it looks like the IP address is not valid"
msgstr "L'indirizzo IP non è valido"
-#: ../carrick/carrick-service-item.c:1239
+#: ../carrick/carrick-service-item.c:1279
msgid "Sorry, it looks like the gateway address is not valid"
msgstr "L'indirizzo gateway non è valido"
-#: ../carrick/carrick-service-item.c:1251
+#: ../carrick/carrick-service-item.c:1291
msgid "Sorry, it looks like the subnet mask is not valid"
msgstr "La maschera subnet non è valida"
-#: ../carrick/carrick-service-item.c:1271
+#: ../carrick/carrick-service-item.c:1336
#, c-format
msgid "Sorry, it looks like the nameserver address '%s' is not valid"
msgstr "L'indirizzo del server '%s' non è valido "
#. TRANSLATORS: label for the Advanced expander in a service item
-#: ../carrick/carrick-service-item.c:1594
+#: ../carrick/carrick-service-item.c:1698
msgid "Advanced"
msgstr "Avanzato"
-#: ../carrick/carrick-service-item.c:1604
+#: ../carrick/carrick-service-item.c:1708
msgid "Scanning"
msgstr "Analisi in corso"
@@ -389,107 +389,107 @@
#. TRANSLATORS: This is an example of a wireless security method
#. (see another translator comment), used to estimate the string length.
#. It should look like the ones below network name in the UI
-#: ../carrick/carrick-service-item.c:1625
+#: ../carrick/carrick-service-item.c:1729
msgid "WPA2 encrypted"
msgstr "WPA2 cifrato"
#. TRANSLATORS: label in advanced settings (next to combobox
#. * for DHCP/Static IP)
-#: ../carrick/carrick-service-item.c:1732
+#: ../carrick/carrick-service-item.c:1836
msgid "Connect by:"
msgstr "Connetti tramite:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1734
+#: ../carrick/carrick-service-item.c:1838
msgid "IP address:"
msgstr "Indirizzo IP:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1736
+#: ../carrick/carrick-service-item.c:1840
msgid "Subnet mask:"
msgstr "Maschera subnet:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1738
+#: ../carrick/carrick-service-item.c:1842
msgid "Router:"
msgstr "Router:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1740
+#: ../carrick/carrick-service-item.c:1844
msgid "DNS:"
msgstr "DNS:"
-#: ../carrick/carrick-service-item.c:1747
+#: ../carrick/carrick-service-item.c:1850
msgid "DHCP"
msgstr "DHCP"
-#: ../carrick/carrick-service-item.c:1749
+#: ../carrick/carrick-service-item.c:1852
msgid "Static IP"
msgstr "IP statico"
#. TRANSLATORS: label for apply button in static ip settings
-#: ../carrick/carrick-service-item.c:1776
+#: ../carrick/carrick-service-item.c:1902
msgid "Apply"
msgstr "Applica"
-#: ../src/carrick.c:43
+#: ../src/carrick.c:49
msgid "networks - not connected"
msgstr "reti - non collegate"
-#: ../src/carrick.c:49
+#: ../src/carrick.c:55
msgid "networks - connecting"
msgstr "reti - collegamenti"
-#: ../src/carrick.c:55
+#: ../src/carrick.c:61
msgid "networks - wired"
msgstr "reti - via cavo"
-#: ../src/carrick.c:57
+#: ../src/carrick.c:63
#, c-format
msgid "networks - %s - wifi"
msgstr "reti - %s - wifi"
-#: ../src/carrick.c:60
+#: ../src/carrick.c:66
#, c-format
msgid "networks - %s - wimax"
msgstr "reti - %s - wimax"
-#: ../src/carrick.c:63
+#: ../src/carrick.c:69
#, c-format
msgid "networks - %s - 3G"
msgstr "reti - %s - 3G"
-#: ../src/carrick.c:66
+#: ../src/carrick.c:72
#, c-format
msgid "networks - %s - bluetooth"
msgstr "reti - %s - bluetooth"
-#: ../src/carrick.c:69
-#: ../src/carrick.c:81
+#: ../src/carrick.c:75
+#: ../src/carrick.c:87
msgid "networks"
msgstr "reti"
-#: ../src/carrick.c:76
+#: ../src/carrick.c:82
msgid "networks - error"
msgstr "reti - errore"
-#: ../src/carrick.c:279
+#: ../src/carrick.c:297
msgid "Run in standalone mode"
msgstr "Avvia in modalità standalone"
-#: ../src/carrick.c:281
+#: ../src/carrick.c:299
msgid "Embed in another window (overrides --standalone)"
msgstr "Incorpora in un'altra finestra (override - standalone)"
-#: ../src/carrick.c:292
+#: ../src/carrick.c:310
msgid "Carrick connectivity applet"
msgstr "Applet di connettività Carrick"
-#: ../src/carrick.c:293
-msgid "- Moblin connectivity applet"
-msgstr "- Applet di connettività Moblin"
+#: ../src/carrick.c:311
+msgid "- MeeGo connectivity applet"
+msgstr "- Applet di connettività MeeGo"
-#: ../src/carrick.c:334
+#: ../src/carrick.c:352
#: ../data/carrick.desktop.in.in.h:2
msgid "network"
msgstr "rete"
--- po/ja.po
+++ po/ja.po
@@ -3,7 +3,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-12 09:29+0000\n"
+"POT-Creation-Date: 2010-07-03 11:59+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -21,7 +21,7 @@
#. * The conjunction 'or' will be at the end of a choice of disabled technologies,
#. * for example 'WiFi, WiMAX or 3G.
#.
-#: ../carrick/carrick-list.c:847
+#: ../carrick/carrick-list.c:843
msgid " or "
msgstr "または"
@@ -29,35 +29,35 @@
#. * Translator note: the comma ',' will be used to join the different disabled technologies
#. * as in the above example; 'WiFi, WiMAX or 3G'
#.
-#: ../carrick/carrick-list.c:852
+#: ../carrick/carrick-list.c:848
msgid ", "
msgstr "、"
-#: ../carrick/carrick-list.c:853
+#: ../carrick/carrick-list.c:849
#: ../carrick/carrick-util.c:34
msgid "wired"
msgstr "有線接続"
#. Switches
-#: ../carrick/carrick-list.c:854
+#: ../carrick/carrick-list.c:850
#: ../carrick/carrick-pane.c:1429
#: ../carrick/carrick-util.c:32
msgid "WiFi"
msgstr "WiFi"
-#: ../carrick/carrick-list.c:855
+#: ../carrick/carrick-list.c:851
#: ../carrick/carrick-pane.c:1471
#: ../carrick/carrick-util.c:38
msgid "WiMAX"
msgstr "WiMAX"
-#: ../carrick/carrick-list.c:856
+#: ../carrick/carrick-list.c:852
#: ../carrick/carrick-pane.c:1457
#: ../carrick/carrick-util.c:36
msgid "3G"
msgstr "3G"
-#: ../carrick/carrick-list.c:857
+#: ../carrick/carrick-list.c:853
#: ../carrick/carrick-pane.c:1485
#: ../carrick/carrick-util.c:40
msgid "Bluetooth"
@@ -68,7 +68,7 @@
#. * are no available networks because ConnMan, the
#. * connectivity daemon, is not running.
#.
-#: ../carrick/carrick-list.c:870
+#: ../carrick/carrick-list.c:866
msgid "Sorry, we can't find any networks. It appears that the connection manager is not running. You could try restarting your computer."
msgstr "ネットワークが見つかりません。接続マネージャーが実行されていないようです。コンピューターを再起動してみてください。"
@@ -76,11 +76,11 @@
#. * Hint display if we detect that the system is in
#. * offline mode and there are no available networks
#.
-#: ../carrick/carrick-list.c:880
+#: ../carrick/carrick-list.c:876
msgid "Sorry, we can't find any networks. You could try disabling Offline mode. "
msgstr "ネットワークが見つかりません。オフラインモードを無効にしてみてください。"
-#: ../carrick/carrick-list.c:1017
+#: ../carrick/carrick-list.c:1013
#, c-format
msgid "Sorry, we can't find any networks. You could try enabling %s."
msgstr "ネットワークが見つかりません。「%s」を有効にしてみてください。"
@@ -90,78 +90,78 @@
#. * technologies are turned on, but for whatever reason we
#. * can not find any networks
#.
-#: ../carrick/carrick-list.c:1031
+#: ../carrick/carrick-list.c:1027
msgid "Sorry, we can't find any networks"
msgstr "ネットワークが見つかりません。"
-#: ../carrick/carrick-notification-manager.c:104
+#: ../carrick/carrick-notification-manager.c:124
msgid "Network connected"
msgstr "ネットワークに接続されています。"
-#: ../carrick/carrick-notification-manager.c:112
+#: ../carrick/carrick-notification-manager.c:132
#, c-format
msgid "You're now connected to a wired network"
msgstr "有線ネットワークに接続されています"
-#: ../carrick/carrick-notification-manager.c:142
+#: ../carrick/carrick-notification-manager.c:162
#, c-format
msgid "You're now connected to %s, a %s network"
msgstr "%s (%s ネットワーク) に接続されています"
-#: ../carrick/carrick-notification-manager.c:148
+#: ../carrick/carrick-notification-manager.c:168
#, c-format
msgid "You're now connected to a %s network"
msgstr "%s ネットワークに接続されています。"
-#: ../carrick/carrick-notification-manager.c:165
+#: ../carrick/carrick-notification-manager.c:185
msgid "Network lost"
msgstr "ネットワークが失われました"
-#: ../carrick/carrick-notification-manager.c:173
+#: ../carrick/carrick-notification-manager.c:193
#, c-format
msgid "Sorry, we've lost your wired connection"
msgstr "有線接続が失われました"
-#: ../carrick/carrick-notification-manager.c:177
+#: ../carrick/carrick-notification-manager.c:197
#, c-format
msgid "Sorry we've lost your %s connection to %s"
msgstr "%s への接続「%s」が失われました"
-#: ../carrick/carrick-notification-manager.c:183
+#: ../carrick/carrick-notification-manager.c:203
#, c-format
msgid "Sorry, we've lost your %s connection"
msgstr "%s 接続が失われました"
-#: ../carrick/carrick-notification-manager.c:200
+#: ../carrick/carrick-notification-manager.c:220
msgid "Network changed"
msgstr "ネットワークが変更されました"
-#: ../carrick/carrick-notification-manager.c:219
+#: ../carrick/carrick-notification-manager.c:239
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to a wired network"
msgstr "「%s」への接続が失われたので、有線ネットワークに接続されました"
-#: ../carrick/carrick-notification-manager.c:226
+#: ../carrick/carrick-notification-manager.c:246
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to %s, a %s network"
msgstr "「%s」への接続が失われたので、%s (%s ネットワーク) に接続されました"
-#: ../carrick/carrick-notification-manager.c:234
+#: ../carrick/carrick-notification-manager.c:254
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to a %s network"
msgstr "「%s」 への接続が失われたので、%s ネットワークに接続されました "
-#: ../carrick/carrick-notification-manager.c:244
+#: ../carrick/carrick-notification-manager.c:264
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to a wired network"
msgstr "%s 接続が失われたので、有線ネットワークへ接続されました"
-#: ../carrick/carrick-notification-manager.c:251
+#: ../carrick/carrick-notification-manager.c:271
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to %s, a %s network"
msgstr "%s 接続が失われたので、%s (%s ネットワーク) に接続されました"
-#: ../carrick/carrick-notification-manager.c:260
+#: ../carrick/carrick-notification-manager.c:280
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to a %s network"
msgstr "%s 接続が失われたので、%s ネットワークに接続されました"
@@ -197,7 +197,7 @@
msgstr "パスワード"
#: ../carrick/carrick-pane.c:731
-#: ../carrick/carrick-service-item.c:1683
+#: ../carrick/carrick-service-item.c:1787
msgid "Show password"
msgstr "パスワードの表示"
@@ -206,7 +206,7 @@
msgstr "設定"
#: ../carrick/carrick-pane.c:1443
-#: ../carrick/carrick-service-item.c:278
+#: ../carrick/carrick-service-item.c:328
msgid "Wired"
msgstr "有線接続"
@@ -219,7 +219,7 @@
msgstr "接続がすべて無効になります"
#: ../carrick/carrick-pane.c:1556
-#: ../src/carrick.c:351
+#: ../src/carrick.c:369
msgid "Networks"
msgstr "ネットワーク"
@@ -255,67 +255,67 @@
#. TRANSLATORS: this is a wireless security method, at least WEP,
#. * WPA and IEEE8021X are possible token values. Example: "WEP encrypted".
#.
-#: ../carrick/carrick-service-item.c:191
+#: ../carrick/carrick-service-item.c:192
#, c-format
msgid "%s encrypted"
msgstr "暗合化されています： %s"
-#: ../carrick/carrick-service-item.c:290
-#: ../carrick/carrick-service-item.c:307
+#: ../carrick/carrick-service-item.c:340
+#: ../carrick/carrick-service-item.c:357
msgid "Disconnect"
msgstr "切断する"
-#: ../carrick/carrick-service-item.c:293
+#: ../carrick/carrick-service-item.c:343
msgid "Connected"
msgstr "接続中"
-#: ../carrick/carrick-service-item.c:310
+#: ../carrick/carrick-service-item.c:360
msgid "Online"
msgstr "オンライン"
-#: ../carrick/carrick-service-item.c:317
-#: ../carrick/carrick-service-item.c:326
+#: ../carrick/carrick-service-item.c:367
+#: ../carrick/carrick-service-item.c:376
#, c-format
msgid "Cancel"
msgstr "キャンセル"
-#: ../carrick/carrick-service-item.c:320
+#: ../carrick/carrick-service-item.c:370
msgid "Configuring"
msgstr "設定中"
-#: ../carrick/carrick-service-item.c:329
+#: ../carrick/carrick-service-item.c:379
msgid "Associating"
msgstr "関連付け中"
-#: ../carrick/carrick-service-item.c:338
-#: ../carrick/carrick-service-item.c:363
-#: ../carrick/carrick-service-item.c:1670
+#: ../carrick/carrick-service-item.c:388
+#: ../carrick/carrick-service-item.c:413
+#: ../carrick/carrick-service-item.c:1774
msgid "Connect"
msgstr "接続する"
-#: ../carrick/carrick-service-item.c:366
+#: ../carrick/carrick-service-item.c:416
msgid "Connection failed"
msgstr "接続に失敗しました"
-#: ../carrick/carrick-service-item.c:369
+#: ../carrick/carrick-service-item.c:419
msgid "Sorry, the connection failed. You could try again."
msgstr "接続に失敗しました。再度接続してみてください。"
-#: ../carrick/carrick-service-item.c:375
-#: ../carrick/carrick-service-item.c:378
+#: ../carrick/carrick-service-item.c:425
+#: ../carrick/carrick-service-item.c:428
#, c-format
msgid "Disconnecting"
msgstr "切断中"
-#: ../carrick/carrick-service-item.c:468
+#: ../carrick/carrick-service-item.c:494
msgid "Type password here"
msgstr "パスワードを入力する"
-#: ../carrick/carrick-service-item.c:537
+#: ../carrick/carrick-service-item.c:563
msgid "Really remove?"
msgstr "削除しますか？"
-#: ../carrick/carrick-service-item.c:557
+#: ../carrick/carrick-service-item.c:583
#, c-format
msgid ""
"Do you want to remove the %s %s network? This\n"
@@ -326,58 +326,58 @@
"削除するとパスワードが忘れられ、\n"
"%s に自動接続されなくなります。"
-#: ../carrick/carrick-service-item.c:753
+#: ../carrick/carrick-service-item.c:786
#, c-format
msgid "Your password isn't the right length. For a WEP connection it needs to be either 10 or 26 characters, you have %i."
msgstr "パスワードの長さが正しくありません。WEP 接続には、10 文字または 28 文字必要ですが、これは %i 文字です。"
-#: ../carrick/carrick-service-item.c:764
+#: ../carrick/carrick-service-item.c:797
#, c-format
msgid "Your password is too short. For a WPA connection it needs to be at least 8 characters long, you have %i"
msgstr "パスワードが短すぎます。WPA 接続には、少なくとも 8 文字必要ですが、これは %i 文字です"
-#: ../carrick/carrick-service-item.c:768
+#: ../carrick/carrick-service-item.c:801
#, c-format
msgid "Your password is too long. For a WPA connection it needs to have fewer than 63 characters, you have %i"
msgstr "パスワードが長すぎます。WPA 接続には、62 文字より少なくなければなりませんが、これは %i 文字です"
-#: ../carrick/carrick-service-item.c:777
+#: ../carrick/carrick-service-item.c:810
#, c-format
msgid "Your password is too short. For a WPA2 connection it needs to be at least 8 characters long, you have %i"
msgstr "パスワードが短すぎます。WPA2 接続には、少なくとも 8 文字必要ですが、これは %i 文字です"
-#: ../carrick/carrick-service-item.c:781
+#: ../carrick/carrick-service-item.c:814
#, c-format
msgid "Your password is too long. For a WPA2 connection it needs to have fewer than 63 characters, you have %i"
msgstr "パスワードが長すぎます。WPA2 接続には、62 文字より少なくなければなりませんが、これは %i 文字です。"
# translation says "invalid IP address". "Sorry" is omitted because it does not translate well into Japanese
-#: ../carrick/carrick-service-item.c:1227
+#: ../carrick/carrick-service-item.c:1267
msgid "Sorry, it looks like the IP address is not valid"
msgstr "無効な IP アドレスです"
# translation says "invalid gateway address". "Sorry" is omitted because it does not translate well into Japanese
-#: ../carrick/carrick-service-item.c:1239
+#: ../carrick/carrick-service-item.c:1279
msgid "Sorry, it looks like the gateway address is not valid"
msgstr "無効なゲートウェイ アドレスです"
# translation says "invalid subnet mask address". "Sorry" is omitted because it does not translate well into Japanese
-#: ../carrick/carrick-service-item.c:1251
+#: ../carrick/carrick-service-item.c:1291
msgid "Sorry, it looks like the subnet mask is not valid"
msgstr "無効なサブネットマスク アドレスです"
# translation says "invalid name server address %s". "Sorry" is omitted because it does not translate well into Japanese
-#: ../carrick/carrick-service-item.c:1271
+#: ../carrick/carrick-service-item.c:1336
#, c-format
msgid "Sorry, it looks like the nameserver address '%s' is not valid"
msgstr "無効なネームサーバー アドレス「%s」です"
#. TRANSLATORS: label for the Advanced expander in a service item
-#: ../carrick/carrick-service-item.c:1594
+#: ../carrick/carrick-service-item.c:1698
msgid "Advanced"
msgstr "詳細"
-#: ../carrick/carrick-service-item.c:1604
+#: ../carrick/carrick-service-item.c:1708
msgid "Scanning"
msgstr "スキャン中"
@@ -385,107 +385,107 @@
#. TRANSLATORS: This is an example of a wireless security method
#. (see another translator comment), used to estimate the string length.
#. It should look like the ones below network name in the UI
-#: ../carrick/carrick-service-item.c:1625
+#: ../carrick/carrick-service-item.c:1729
msgid "WPA2 encrypted"
msgstr "WPA2 暗合化"
#. TRANSLATORS: label in advanced settings (next to combobox
#. * for DHCP/Static IP)
-#: ../carrick/carrick-service-item.c:1732
+#: ../carrick/carrick-service-item.c:1836
msgid "Connect by:"
msgstr "次を使用して接続："
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1734
+#: ../carrick/carrick-service-item.c:1838
msgid "IP address:"
msgstr "IP アドレス："
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1736
+#: ../carrick/carrick-service-item.c:1840
msgid "Subnet mask:"
msgstr "サブネットマスク："
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1738
+#: ../carrick/carrick-service-item.c:1842
msgid "Router:"
msgstr "ルーター："
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1740
+#: ../carrick/carrick-service-item.c:1844
msgid "DNS:"
msgstr "DNS："
-#: ../carrick/carrick-service-item.c:1747
+#: ../carrick/carrick-service-item.c:1850
msgid "DHCP"
msgstr "DHCP"
-#: ../carrick/carrick-service-item.c:1749
+#: ../carrick/carrick-service-item.c:1852
msgid "Static IP"
msgstr "固定 IP"
#. TRANSLATORS: label for apply button in static ip settings
-#: ../carrick/carrick-service-item.c:1776
+#: ../carrick/carrick-service-item.c:1902
msgid "Apply"
msgstr "適用"
-#: ../src/carrick.c:43
+#: ../src/carrick.c:49
msgid "networks - not connected"
msgstr "ネットワーク - 接続されていません"
-#: ../src/carrick.c:49
+#: ../src/carrick.c:55
msgid "networks - connecting"
msgstr "ネットワーク - 接続しています"
-#: ../src/carrick.c:55
+#: ../src/carrick.c:61
msgid "networks - wired"
msgstr "ネットワーク - 有線接続"
-#: ../src/carrick.c:57
+#: ../src/carrick.c:63
#, c-format
msgid "networks - %s - wifi"
msgstr "ネットワーク - %s - WiFi"
-#: ../src/carrick.c:60
+#: ../src/carrick.c:66
#, c-format
msgid "networks - %s - wimax"
msgstr "ネットワーク - %s - WiMAX"
-#: ../src/carrick.c:63
+#: ../src/carrick.c:69
#, c-format
msgid "networks - %s - 3G"
msgstr "ネットワーク - %s - 3G"
-#: ../src/carrick.c:66
+#: ../src/carrick.c:72
#, c-format
msgid "networks - %s - bluetooth"
msgstr "ネットワーク - %s - Bluetooth"
-#: ../src/carrick.c:69
-#: ../src/carrick.c:81
+#: ../src/carrick.c:75
+#: ../src/carrick.c:87
msgid "networks"
msgstr "ネットワーク"
-#: ../src/carrick.c:76
+#: ../src/carrick.c:82
msgid "networks - error"
msgstr "ネットワーク - エラー"
-#: ../src/carrick.c:279
+#: ../src/carrick.c:297
msgid "Run in standalone mode"
msgstr "スタンドアロン モードで実行する"
-#: ../src/carrick.c:281
+#: ../src/carrick.c:299
msgid "Embed in another window (overrides --standalone)"
msgstr "他のウィンドウに組み込む (--standalone を上書き)"
-#: ../src/carrick.c:292
+#: ../src/carrick.c:310
msgid "Carrick connectivity applet"
msgstr "Carrick 接続アプレット"
-#: ../src/carrick.c:293
-msgid "- Moblin connectivity applet"
+#: ../src/carrick.c:311
+msgid "- MeeGo connectivity applet"
msgstr "- Moblin 接続アプレット"
-#: ../src/carrick.c:334
+#: ../src/carrick.c:352
#: ../data/carrick.desktop.in.in.h:2
msgid "network"
msgstr "ネットワーク"
@@ -557,218 +557,322 @@
#~ msgid "Manual Config"
#~ msgstr "手動で設定"
+
#~ msgid ""
#~ "Sorry, we can't find any networks. It appears that the ConnMan daemon is "
#~ "not running. You could try re-starting your netbook."
#~ msgstr ""
#~ "ネットワークが見つかりません。ConnMan デーモンが実行されていないようです。"
#~ "ネットブックを再起動してみてください。"
+
#~ msgid "Sorry, we can't find any networks. You could try turning on WiFi."
#~ msgstr "ネットワークが見つかりません。WiFi をオンにしてみてください。"
+
#~ msgid "Sorry, we can't find any networks. You could try turning on WiMAX."
#~ msgstr "ネットワークが見つかりません。WiMAX をオンにしてみてください。"
+
#~ msgid "Sorry, we can't find any networks. You could try turning on 3G."
#~ msgstr "ネットワークが見つかりません。3G をオンにしてみてください。"
+
#~ msgid ""
#~ "Sorry, we can't find any networks. You could try turning on Bluetooth."
#~ msgstr "ネットワークが見つかりません。Bluetooth をオンにしてみてください。"
+
#~ msgid "Sorry, we can't find any networks. You could try turning on Wired."
#~ msgstr "ネットワークが見つかりません。優先接続をオンにしてみてください。"
+
#~ msgid "Run Anjal in a window"
#~ msgstr "ウィンドウ内で Anjal を立ち上げる"
+
#~ msgid "Make Anjal the default email client"
#~ msgstr "Anjal をデフォルトのメールクライアントにする"
+
#~ msgid "Anjal email client"
#~ msgstr "Anjal メールクライアント"
+
#~ msgid "Toggle state"
#~ msgstr "切り替え状態"
+
#~ msgid "The toggle state of the button"
#~ msgstr "ボタンの切り替え状態"
+
#~ msgid "toggled"
#~ msgstr "切り替え済み"
+
#~ msgid "From"
#~ msgstr "送信元"
+
#~ msgid "Subject"
#~ msgstr "件名"
+
#~ msgid "Date"
#~ msgstr "日付"
+
#~ msgid "To"
#~ msgstr "宛先"
+
#~ msgid "Flags"
#~ msgstr "フォローアップ"
+
#~ msgid "Thread Count"
#~ msgstr "スレッド数"
+
#~ msgid "Thread Preview"
#~ msgstr "スレッドのプレビュー"
+
#~ msgid "Unread"
#~ msgstr "未読"
+
#~ msgid "Attachment"
#~ msgstr "添付ファイル"
+
#~ msgid "<span foreground=\"%s\" >%s%s</span>"
#~ msgstr "<span foreground=\"%s\" >%s%s</span>"
+
#~ msgid "Message not yet downloaded or preview could not be constructed\n"
#~ msgstr ""
#~ "メッセージがまだダウンロードされていないか、プレビューを作成できません\n"
+
#~ msgid "Inbox"
#~ msgstr "受信トレイ"
+
#~ msgid "Drafts"
#~ msgstr "下書き"
+
#~ msgid "Outbox"
#~ msgstr "送信トレイ"
+
#~ msgid "Sent"
#~ msgstr "送信済み"
+
#~ msgid "Templates"
#~ msgstr "テンプレート"
+
#~ msgid "On This Computer"
#~ msgstr "このコンピューター上"
+
#~ msgid "Error"
#~ msgstr "エラー"
+
#~ msgid "Errors"
#~ msgstr "エラー（複数）"
+
#~ msgid "Warnings and Errors"
#~ msgstr "警告とエラー"
+
#~ msgid "Debug"
#~ msgstr "デバッグ"
+
#~ msgid "Error, Warnings and Debug messages"
#~ msgstr "エラー、警告、デバッグのメッセージ"
+
#~ msgid "Debug Logs"
#~ msgstr "ログのデバッグ"
+
#~ msgid "Show _errors in the status bar for"
#~ msgstr "次のステータスバーにエラーを表示(_E)"
+
#~ msgid "second(s)."
#~ msgstr "秒。"
+
#~ msgid "Log Messages:"
#~ msgstr "メッセージのログ："
+
#~ msgid "Log Level"
#~ msgstr "ログのレベル"
+
#~ msgid "Time"
#~ msgstr "時間"
+
#~ msgid "Messages"
#~ msgstr "メッセージ"
+
#~ msgid "Close this window"
#~ msgstr "このウィンドウを閉じる"
+
#~ msgid "Close Tab"
#~ msgstr "タブを閉じる"
+
#~ msgid "New email"
#~ msgstr "新規メール"
+
#~ msgid "Untitled Message"
#~ msgstr "件名のないメッセージ"
+
#~ msgid "Message"
#~ msgstr "メッセージ"
+
#~ msgid "_Date"
#~ msgstr "日付(_D)"
+
#~ msgid "_Subject"
#~ msgstr "件名(_S)"
+
#~ msgid "_From"
#~ msgstr "送信元(_F)"
+
#~ msgid "Trash"
#~ msgstr "ゴミ箱"
+
#~ msgid "Junk"
#~ msgstr "迷惑メール"
+
#~ msgid "Select Folder"
#~ msgstr "フォルダーの選択"
+
#~ msgid "Loading folder"
#~ msgstr "フォルダーの読み込み"
+
#~ msgid "?"
#~ msgstr "？"
+
#~ msgid "Today %l:%M %p"
#~ msgstr "今日の%p%l:%M"
+
#~ msgid "Yesterday %l:%M %p"
#~ msgstr "昨日の %p%l:%M"
+
#~ msgid "%a %l:%M %p"
#~ msgstr "%p%l:%M (%a)"
+
#~ msgid "%b %d %l:%M %p"
#~ msgstr "%b %d日 %p%l:%M"
+
#~ msgid "%b %d %Y"
#~ msgstr "%Y年 %b %d日"
+
#~ msgid "_Open in New Tab"
#~ msgstr "新しいタブで開く(_O)"
+
#~ msgid "_Open in This Tab"
#~ msgstr "このタブで開く(_O)"
+
#~ msgid "_Delete"
#~ msgstr "削除(_D)"
+
#~ msgid "U_ndelete"
#~ msgstr "削除した内容を元に戻す(_N)"
+
#~ msgid "Mar_k as Read"
#~ msgstr "読んだメールとしてマーク(_K)"
+
#~ msgid "Mark as _Unread"
#~ msgstr "未読としてマーク（_U)"
+
#~ msgid "Mark as _Junk"
#~ msgstr "迷惑メールとしてマーク(_J)"
+
#~ msgid "Mark as _Not Junk"
#~ msgstr "迷惑メールではないものとしてマーク(_N)"
+
#~ msgid "Please select a folder on the folder tree"
#~ msgstr "フォルダーツリー上のフォルダーを選択してください"
+
#~ msgid "_Ascending"
#~ msgstr "昇順(_A)"
+
#~ msgid "D_escending"
#~ msgstr "降順(_E)"
+
#~ msgid "Searching for "
#~ msgstr "次を検索"
+
#~ msgid "Clearing search"
#~ msgstr "検索をクリアする"
+
#~ msgid "<u>show details</u>"
#~ msgstr "<u>詳細の表示</u>"
+
#~ msgid "<u>hide details</u>"
#~ msgstr "<u>詳細を隠す</u>"
+
#~ msgid "Formatting message"
#~ msgstr "メッセージのフォーマット"
+
#~ msgid "From:"
#~ msgstr "送信元："
+
#~ msgid "To:"
#~ msgstr "宛先："
+
#~ msgid "Cc:"
#~ msgstr "CC："
+
#~ msgid "Delete"
#~ msgstr "削除"
+
#~ msgid "Downloading message"
#~ msgstr "メッセージのダウンロード"
+
#~ msgid "Reply to %s"
#~ msgstr "%s に返信"
+
#~ msgid "Reply All"
#~ msgstr "全員に返信"
+
#~ msgid "Forward"
#~ msgstr "転送"
+
#~ msgid "Discard"
#~ msgstr "削除"
+
#~ msgid "Move to tab"
#~ msgstr "タブに移動"
+
#~ msgid "Check Mail"
#~ msgstr "メールの確認"
+
#~ msgid "New Mail"
#~ msgstr "新しいメール"
+
#~ msgid "Sort By"
#~ msgstr "並べ替え"
+
#~ msgid "Quit"
#~ msgstr "終了"
+
#~ msgid "People"
#~ msgstr "ピープル"
+
#~ msgid "Personal"
#~ msgstr "パーソナル"
+
#~ msgid "New Tab"
#~ msgstr "新規タブ"
+
#~ msgid "Please enter your full name."
#~ msgstr "氏名（フルネーム）をご記入ください。"
+
#~ msgid "Please enter your email address."
#~ msgstr "メールアドレスを入力してください。"
+
#~ msgid "The email addres you have entered is invalid."
#~ msgstr "入力されたメールアドレスは無効です。"
+
#~ msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
#~ msgstr "<span size=\"large\" weight=\"bold\">個人情報の詳細：</span>"
+
#~ msgid "Name:"
#~ msgstr "氏名:"
+
#~ msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
#~ msgstr "<span size=\"large\" weight=\"bold\">受信の詳細：</span>"
+
#~ msgid "Server type:"
#~ msgstr "サーバーのタイプ："
+
#~ msgid "Server address:"
#~ msgstr "サーバーのアドレス："
+
#~ msgid "Use encryption:"
#~ msgstr "暗号化の使用："
+
#~ msgid "never"
#~ msgstr "なし"
+
#~ msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
#~ msgstr "<span size=\"large\" weight=\"bold\">送信の詳細：</span>"
+
#~ msgid ""
#~ "To use the email application you'll need to setup an account. Put your "
#~ "email address and password in below and we'll try and work out all the "
@@ -779,6 +883,7 @@
#~ "アドレスとパスワードを下に入力してください。すべての設定は自動的に試行され"
#~ "ますが、自動的に設定ができない場合は、サーバーの詳細を自分で入力する必要が"
#~ "あります。"
+
#~ msgid ""
#~ "Sorry, we can't work out the settings to get your mail automatically. "
#~ "Please enter them below. We've tried to make a start with the details "
@@ -787,137 +892,188 @@
#~ "申し訳ありません。メール取得を自動的に行うための設定ができません。必要な情"
#~ "報を下に入力してください。入力された情報で開始しようとしましたが、この情報"
#~ "を変更する必要があるようです。"
+
#~ msgid "You can specify more options to configure the account."
#~ msgstr "アカウントの設定に、さらにオプションを指定することができます。"
+
#~ msgid ""
#~ "Now we need your settings for sending mail. We've tried to make some "
#~ "guesses but you should check them over to make sure."
#~ msgstr ""
#~ "メールを送信するために設定が必要です。いくつか試行してみましたが、もう一度"
#~ "設定をチェックしてください。"
+
#~ msgid ""
#~ "Time to check things over before we try and connect to the server and "
#~ "fetch your mail."
#~ msgstr ""
#~ "サーバーに接続してメールを取得してみる前に、もう一度チェックしてください。"
+
#~ msgid "Identity"
#~ msgstr "個人情報"
+
#~ msgid "Next - Receiving mail"
#~ msgstr "次へ - メールの受信"
+
#~ msgid "Receiving mail"
#~ msgstr "メールの受信"
+
#~ msgid "Next - Sending mail"
#~ msgstr "次へ - メールの送信"
+
#~ msgid "Back - Identity"
#~ msgstr "戻る - 個人情報"
+
#~ msgid "Next - Receiving options"
#~ msgstr "次へ - 受信オプション"
+
#~ msgid "Receiving options"
#~ msgstr "受信オプション"
+
#~ msgid "Back - Receiving mail"
#~ msgstr "戻る - メールの受信"
+
#~ msgid "Sending mail"
#~ msgstr "メールの送信"
+
#~ msgid "Next - Review account"
#~ msgstr "次へ - アカウントの確認"
+
#~ msgid "Back - Receiving options"
#~ msgstr "戻る - 受信オプション"
+
#~ msgid "Review account"
#~ msgstr "アカウントの確認"
+
#~ msgid "Finish"
#~ msgstr "終了"
+
#~ msgid "Back - Sending"
#~ msgstr "戻る - 送信"
+
#~ msgid "Account Wizard"
#~ msgstr "アカウント作成ウィザード"
+
#~ msgid "Modify"
#~ msgstr "変更"
+
#~ msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
#~ msgstr "<span size=\"large\" weight=\"bold\">アカウントの管理</span>"
+
#~ msgid "Rendering image"
#~ msgstr "画像の表示中"
+
#~ msgid "Retrieving `%s'"
#~ msgstr "`%s' の取り込み中"
+
#~ msgid "Unsigned"
#~ msgstr "未署名"
+
#~ msgid "Valid signature"
#~ msgstr "有効な署名"
+
#~ msgid "Invalid signature"
#~ msgstr "無効な署名"
+
#~ msgid "Valid signature, but cannot verify sender"
#~ msgstr "有効な署名ですが、送信者が確認できません"
+
#~ msgid "Signature exists, but need public key"
#~ msgstr "署名はありますが、パブリックキーが必要です"
+
#~ msgid "Encrypted, weak"
#~ msgstr "暗合化済み、弱い"
+
#~ msgid "Encrypted"
#~ msgstr "暗号化済み"
+
#~ msgid "Encrypted, strong"
#~ msgstr "暗合化済み、強い"
+
#~ msgid "Unknown external-body part."
#~ msgstr "不明な外部本文の一部。"
+
#~ msgid "Malformed external-body part."
#~ msgstr "不正な形式の外部本文の一部。"
+
#~ msgid "Pointer to FTP site (%s)"
#~ msgstr "FTP サイト (%s) へのポインター"
+
#~ msgid "Pointer to local file (%s) valid at site \"%s\""
#~ msgstr "\"%s\" のサイトで有効なローカルファイル (%s) へのポインター"
+
#~ msgid "Pointer to local file (%s)"
#~ msgstr "ローカルファイル (%s) へのポインター"
+
#~ msgid "Pointer to remote data (%s)"
#~ msgstr "リモートデータ (%s) へのポインター"
+
#~ msgid "Pointer to unknown external data (\"%s\" type)"
#~ msgstr "不明な外部データ (\"%s\" タイプ) へのポインター"
+
#~ msgid "Formatting Message..."
#~ msgstr "メッセージのフォーマット中..."
+
#~ msgid "Cc"
#~ msgstr "CC"
+
#~ msgid "Bcc"
#~ msgstr "BCC"
+
#~ msgid "Mailer"
#~ msgstr "メーラー"
+
#~ msgid " (%a, %R %Z)"
#~ msgstr " ((%a) %Z %R)"
+
#~ msgid " (%R %Z)"
#~ msgstr " (%Z %R)"
+
#~ msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
#~ msgstr ""
#~ "このメッセージは <b>%s</b> さんの代わりに <b>%s</b> さんによって送信されま"
#~ "した。"
+
#~ msgid ""
#~ "This message is not signed. There is no guarantee that this message is "
#~ "authentic."
#~ msgstr ""
#~ "このメッセージは署名されていません。このメッセージは信ぴょう性があるとは言"
#~ "えません。"
+
#~ msgid ""
#~ "This message is signed and is valid meaning that it is very likely that "
#~ "this message is authentic."
#~ msgstr ""
#~ "このメッセージは署名されていて有効です。したがって、このメッセージは信ぴょ"
#~ "う性が高いと言えます。"
+
#~ msgid ""
#~ "The signature of this message cannot be verified, it may have been "
#~ "altered in transit."
#~ msgstr ""
#~ "このメッセージの署名を確認できません。送信中に変更された可能性があります。"
+
#~ msgid ""
#~ "This message is signed with a valid signature, but the sender of the "
#~ "message cannot be verified."
#~ msgstr ""
#~ "このメッセージは有効な署名でサインされていますが、メッセージの送信者を確認"
#~ "てきません。"
+
#~ msgid ""
#~ "This message is signed with a signature, but there is no corresponding "
#~ "public key."
#~ msgstr ""
#~ "このメッセージは署名されていますが、対応するパブリックキーがありません。"
+
#~ msgid ""
#~ "This message is not encrypted. Its content may be viewed in transit "
#~ "across the Internet."
#~ msgstr ""
#~ "このメッセージは暗号化されていません。メッセージの内容はインターネットの通"
#~ "過中に閲覧されることもあります。"
+
#~ msgid ""
#~ "This message is encrypted, but with a weak encryption algorithm. It would "
#~ "be difficult, but not impossible for an outsider to view the content of "
@@ -926,12 +1082,14 @@
#~ "このメッセージは暗号化されていますが、弱い暗号化アルゴリズムを使用していま"
#~ "す。困難ですが、部外者は実用的な時間内にこのメッセージを閲覧することが不可"
#~ "能ではありません。"
+
#~ msgid ""
#~ "This message is encrypted. It would be difficult for an outsider to view "
#~ "the content of this message."
#~ msgstr ""
#~ "このメッセージは暗号化されています。このメッセージの内容を部外者が閲覧する"
#~ "のは困難です。"
+
#~ msgid ""
#~ "This message is encrypted, with a strong encryption algorithm. It would "
#~ "be very difficult for an outsider to view the content of this message in "
@@ -939,60 +1097,85 @@
#~ msgstr ""
#~ "このメッセージは強い暗合化アルゴリズムで暗合化されています。このメッセージ"
#~ "の内容を部外者が実用的な時間内に閲覧するのは非常に困難です。"
+
#~ msgid "_View Certificate"
#~ msgstr "証明書の表示(_V)"
+
#~ msgid "This certificate is not viewable"
#~ msgstr "この証明書は表示できません"
+
#~ msgid "Completed on %B %d, %Y, %l:%M %p"
#~ msgstr "%Y年 %B %d日 %p%l:%M に完了済み"
+
#~ msgid "Overdue:"
#~ msgstr "期限切れ："
+
#~ msgid "by %B %d, %Y, %l:%M %p"
#~ msgstr "%Y年 %B %d日 %p%l:%M まで "
+
#~ msgid "_View Inline"
#~ msgstr "インラインで表示(_V)"
+
#~ msgid "_Hide"
#~ msgstr "隠す(_H)"
+
#~ msgid "_Fit to Width"
#~ msgstr "固定幅に合わせる(_F)"
+
#~ msgid "Show _Original Size"
#~ msgstr "元のサイズを表示(_O)"
+
#~ msgid "Saved"
#~ msgstr "保存済み"
+
#~ msgid "Could not save '%s'"
#~ msgstr " '%s' を保存できませんでした"
+
#~ msgid "Could not save the attachment"
#~ msgstr "添付ファイルを保存できませんでした"
+
#~ msgid "attachment.dat"
#~ msgstr "attachment.dat"
+
#~ msgid "Saving..."
#~ msgstr "保存中..."
+
#~ msgid "Download"
#~ msgstr "ダウンロード"
+
#~ msgid "View _Unformatted"
#~ msgstr "未フォーマットのものを表示(_U)"
+
#~ msgid "Hide _Unformatted"
#~ msgstr "未フォーマットのものを隠す(_U)"
+
#~ msgid "O_pen With"
#~ msgstr "プログラムから開く(_P)"
+
#~ msgid ""
#~ "Evolution cannot render this email as it is too large to process. You can "
#~ "view it unformatted or with an external text editor."
#~ msgstr ""
#~ "処理するには大きすぎるため、Evolution ではこのメールを表示できません。"
#~ "フォーマットされていない状態または外部のテキストエディターで表示できます。"
+
#~ msgid "Anjal window height"
#~ msgstr "Anjal ウィンドウの高さ"
+
#~ msgid "Anjal window width"
#~ msgstr "Anjal ウィンドウの幅"
+
#~ msgid "Height of Anjal window."
#~ msgstr "Anjal ウィンドウの高さ"
+
#~ msgid "Width of Anjal window."
#~ msgstr "Anjal ウィンドウの幅"
+
#~ msgid "Warning"
#~ msgstr "警告"
+
#~ msgid "Add a new account"
#~ msgstr "新規アカウントの追加"
+
#~ msgid "Unencrypted"
#~ msgstr "暗合化されていない"
-
--- po/ko.po
+++ po/ko.po
@@ -1,18 +1,20 @@
#
+# Park Shinjo <peremen at gmail.com>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-12 09:29+0000\n"
-"PO-Revision-Date: \n"
-"Last-Translator: GLSKOR_SunKim <sunx.kim at intel.com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2010-07-03 11:59+0000\n"
+"PO-Revision-Date: 2010-07-10 05:33+0900\n"
+"Last-Translator: Park Shinjo <peremen at gmail.com>\n"
+"Language-Team: Korean <peremen at gmail.com>\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-Poedit-Language: Korean\n"
"X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: Lokalize 1.0\n"
#.
#. * Translator note: The disabled technologies available to be turned on is put together at
@@ -20,44 +22,39 @@
#. * The conjunction 'or' will be at the end of a choice of disabled technologies,
#. * for example 'WiFi, WiMAX or 3G.
#.
-#: ../carrick/carrick-list.c:847
+#: ../carrick/carrick-list.c:843
msgid " or "
-msgstr "또는 "
+msgstr " 또는 "
#.
#. * Translator note: the comma ',' will be used to join the different disabled technologies
#. * as in the above example; 'WiFi, WiMAX or 3G'
#.
-#: ../carrick/carrick-list.c:852
+#: ../carrick/carrick-list.c:848
msgid ", "
msgstr ", "
-#: ../carrick/carrick-list.c:853
-#: ../carrick/carrick-util.c:34
+#: ../carrick/carrick-list.c:849 ../carrick/carrick-util.c:34
msgid "wired"
-msgstr "유선 "
+msgstr "유선"
#. Switches
-#: ../carrick/carrick-list.c:854
-#: ../carrick/carrick-pane.c:1429
+#: ../carrick/carrick-list.c:850 ../carrick/carrick-pane.c:1429
#: ../carrick/carrick-util.c:32
msgid "WiFi"
msgstr "WiFi"
-#: ../carrick/carrick-list.c:855
-#: ../carrick/carrick-pane.c:1471
+#: ../carrick/carrick-list.c:851 ../carrick/carrick-pane.c:1471
#: ../carrick/carrick-util.c:38
msgid "WiMAX"
msgstr "WiMAX"
-#: ../carrick/carrick-list.c:856
-#: ../carrick/carrick-pane.c:1457
+#: ../carrick/carrick-list.c:852 ../carrick/carrick-pane.c:1457
#: ../carrick/carrick-util.c:36
msgid "3G"
msgstr "3G"
-#: ../carrick/carrick-list.c:857
-#: ../carrick/carrick-pane.c:1485
+#: ../carrick/carrick-list.c:853 ../carrick/carrick-pane.c:1485
#: ../carrick/carrick-util.c:40
msgid "Bluetooth"
msgstr "블루투스"
@@ -67,103 +64,117 @@
#. * are no available networks because ConnMan, the
#. * connectivity daemon, is not running.
#.
-#: ../carrick/carrick-list.c:870
-msgid "Sorry, we can't find any networks. It appears that the connection manager is not running. You could try restarting your computer."
-msgstr "죄송합니다. 네트워크를 찿을 수 없습니다. 연결 관리자가 실행되는 것 같지 않습니다. 컴퓨터의 재시작을 시도해 보십시오. "
+#: ../carrick/carrick-list.c:866
+msgid ""
+"Sorry, we can't find any networks. It appears that the connection manager is "
+"not running. You could try restarting your computer."
+msgstr ""
+"네트워크를 찾을 수 없습니다. 연결 관리자가 실행 중이지 않은 것 같습니다. "
+"컴퓨터를 다시 시작해 보십시오."
#.
#. * Hint display if we detect that the system is in
#. * offline mode and there are no available networks
#.
-#: ../carrick/carrick-list.c:880
-msgid "Sorry, we can't find any networks. You could try disabling Offline mode. "
-msgstr "죄송합니다. 네트워크를 찾을 수 없습니다. 오프모드 비활성화를 시도해 보십시오. "
+#: ../carrick/carrick-list.c:876
+msgid ""
+"Sorry, we can't find any networks. You could try disabling Offline mode. "
+msgstr "네트워크를 찾을 수 없습니다. 오프라인 모드를 비활성화해 보십시오."
-#: ../carrick/carrick-list.c:1017
+#: ../carrick/carrick-list.c:1013
#, c-format
msgid "Sorry, we can't find any networks. You could try enabling %s."
-msgstr "죄송합니다. 네트워크를 찾을 수 없습니다. %s 활성화를 시도해 보십시오. "
+msgstr "네트워크를 찾을 수 없습니다. %s을(를) 활성화시켜 보십시오."
#.
#. * Generic message to display if all available networking
#. * technologies are turned on, but for whatever reason we
#. * can not find any networks
#.
-#: ../carrick/carrick-list.c:1031
+#: ../carrick/carrick-list.c:1027
msgid "Sorry, we can't find any networks"
-msgstr "죄송합니다. 네트워크를 찾을 수 없습니다."
+msgstr "네트워크를 찾을 수 없습니다"
-#: ../carrick/carrick-notification-manager.c:104
+#: ../carrick/carrick-notification-manager.c:124
msgid "Network connected"
msgstr "연결된 네트워크"
-#: ../carrick/carrick-notification-manager.c:112
+#: ../carrick/carrick-notification-manager.c:132
#, c-format
msgid "You're now connected to a wired network"
-msgstr "현재 유선 네트워크에 연결되었습니다."
+msgstr "유선 네트워크에 연결됨"
-#: ../carrick/carrick-notification-manager.c:142
+#: ../carrick/carrick-notification-manager.c:162
#, c-format
msgid "You're now connected to %s, a %s network"
-msgstr "현재 %s, %s 네트워크에 연결되었습니다."
+msgstr "%s, %s 네트워크에 연결됨"
-#: ../carrick/carrick-notification-manager.c:148
+#: ../carrick/carrick-notification-manager.c:168
#, c-format
msgid "You're now connected to a %s network"
-msgstr "현재 %s 네트워크에 연결되었습니다."
+msgstr "%s 네트워크에 연결됨"
-#: ../carrick/carrick-notification-manager.c:165
+#: ../carrick/carrick-notification-manager.c:185
msgid "Network lost"
-msgstr "네트워크를 찾을 수 없음"
+msgstr "네트워크 끊김"
-#: ../carrick/carrick-notification-manager.c:173
+#: ../carrick/carrick-notification-manager.c:193
#, c-format
msgid "Sorry, we've lost your wired connection"
-msgstr "죄송합니다. 유선 연결이 끊어졌습니다. "
+msgstr "유선 연결이 끊어졌습니다"
-#: ../carrick/carrick-notification-manager.c:177
+#: ../carrick/carrick-notification-manager.c:197
#, c-format
msgid "Sorry we've lost your %s connection to %s"
-msgstr "죄송합니다. %s에 %s의 연결이 끊어졌습니다."
+msgstr "%s을(를) 위한 %s 연결이 끊어졌습니다"
-#: ../carrick/carrick-notification-manager.c:183
+#: ../carrick/carrick-notification-manager.c:203
#, c-format
msgid "Sorry, we've lost your %s connection"
-msgstr "죄송합니다. %s의 연결이 끊어졌습니다."
+msgstr "%s 연결이 끊어졌습니다"
-#: ../carrick/carrick-notification-manager.c:200
+#: ../carrick/carrick-notification-manager.c:220
msgid "Network changed"
-msgstr "변경된 네트워크"
+msgstr "네트워크 변경됨"
-#: ../carrick/carrick-notification-manager.c:219
+#: ../carrick/carrick-notification-manager.c:239
#, c-format
-msgid "Sorry, your connection to %s was lost. So we've connected you to a wired network"
-msgstr "죄송합니다. %s의 연결이 끊어졌습니다. 그래서 유선 네트워크에 연결했습니다."
+msgid ""
+"Sorry, your connection to %s was lost. So we've connected you to a wired "
+"network"
+msgstr "%s 연결이 끊어졌습니다. 유선 네트워크에 연결되었습니다"
-#: ../carrick/carrick-notification-manager.c:226
+#: ../carrick/carrick-notification-manager.c:246
#, c-format
-msgid "Sorry, your connection to %s was lost. So we've connected you to %s, a %s network"
-msgstr "죄송합니다. %s의 연결이 끊어졌습니다. 그래서 %s, %s 네트워크에 연결했습니다. "
+msgid ""
+"Sorry, your connection to %s was lost. So we've connected you to %s, a %s "
+"network"
+msgstr "%s 연결이 끊어졌습니다. %s, %s 네트워크에 연결되었습니다"
-#: ../carrick/carrick-notification-manager.c:234
+#: ../carrick/carrick-notification-manager.c:254
#, c-format
-msgid "Sorry, your connection to %s was lost. So we've connected you to a %s network"
-msgstr "죄송합니다. %s의 연결이 끊어졌습니다. 그래서 %s 네트워크에 연결했습니다."
+msgid ""
+"Sorry, your connection to %s was lost. So we've connected you to a %s network"
+msgstr "%s 연결이 끊어졌습니다. %s 네트워크에 연결되었습니다"
-#: ../carrick/carrick-notification-manager.c:244
+#: ../carrick/carrick-notification-manager.c:264
#, c-format
-msgid "Sorry, your %s connection was lost. So we've connected you to a wired network"
-msgstr "죄송합니다. %s 연결이 끊어졌습니다. 그래서 유선 네트워크에 연결했습니다."
+msgid ""
+"Sorry, your %s connection was lost. So we've connected you to a wired network"
+msgstr "%s 연결이 끊어졌습니다. 유선 네트워크에 연결되었습니다"
-#: ../carrick/carrick-notification-manager.c:251
+#: ../carrick/carrick-notification-manager.c:271
#, c-format
-msgid "Sorry, your %s connection was lost. So we've connected you to %s, a %s network"
-msgstr "죄송합니다. %s 연결이 끊어졌습니다. 그래서 %s 네트워크 %s에 연결했습니다. "
+msgid ""
+"Sorry, your %s connection was lost. So we've connected you to %s, a %s "
+"network"
+msgstr "%s 연결이 끊어졌습니다. %s, %s 네트워크에 연결되었습니다"
-#: ../carrick/carrick-notification-manager.c:260
+#: ../carrick/carrick-notification-manager.c:280
#, c-format
-msgid "Sorry, your %s connection was lost. So we've connected you to a %s network"
-msgstr "죄송합니다. %s 연결이 끊어졌습니다. 그래서 %s 네트워크에 연결했습니다."
+msgid ""
+"Sorry, your %s connection was lost. So we've connected you to a %s network"
+msgstr "%s 연결이 끊어졌습니다. %s 네트워크에 연결되었습니다"
#: ../carrick/carrick-pane.c:634
msgid "New connection settings"
@@ -175,9 +186,9 @@
"to connect to and, where necessary, the\n"
"password and security type."
msgstr ""
-"연결하려고 하는 네트워크의\n"
-"이름과 암호 및 보안 유형을\n"
-"입력하십시오. "
+"연결하려는 네트워크의 이름과,\n"
+"필요하다면 암호와 보안 설정을\n"
+"입력하십시오."
#: ../carrick/carrick-pane.c:682
msgid "Network name"
@@ -195,17 +206,15 @@
msgid "Password"
msgstr "암호"
-#: ../carrick/carrick-pane.c:731
-#: ../carrick/carrick-service-item.c:1683
+#: ../carrick/carrick-pane.c:731 ../carrick/carrick-service-item.c:1787
msgid "Show password"
-msgstr "암호 표시"
+msgstr "암호 보이기"
#: ../carrick/carrick-pane.c:1412
msgid "Settings"
-msgstr "설정값"
+msgstr "설정"
-#: ../carrick/carrick-pane.c:1443
-#: ../carrick/carrick-service-item.c:278
+#: ../carrick/carrick-pane.c:1443 ../carrick/carrick-service-item.c:328
msgid "Wired"
msgstr "유선"
@@ -215,17 +224,16 @@
#: ../carrick/carrick-pane.c:1520
msgid "This will disable all your connections"
-msgstr "이는 모든 연결을 해제할 것입니다."
+msgstr "모든 연결을 해제합니다"
-#: ../carrick/carrick-pane.c:1556
-#: ../src/carrick.c:351
+#: ../carrick/carrick-pane.c:1556 ../src/carrick.c:369
msgid "Networks"
msgstr "네트워크"
#. New connection button
#: ../carrick/carrick-pane.c:1562
msgid "Add new connection"
-msgstr "새로운 연결 추가"
+msgstr "새 연결 추가하기"
#. Translators:
#. The following are potential errors that a user might see while
@@ -237,7 +245,7 @@
#: ../carrick/carrick-service-item.c:52
msgid "Missing required APN (service plan name)"
-msgstr "필요한 APN(서비스 플랜 이름)이 없음"
+msgstr "필요한 APN이 없음"
#: ../carrick/carrick-service-item.c:53
msgid "Internal Error: Invalid network service"
@@ -245,265 +253,268 @@
#: ../carrick/carrick-service-item.c:54
msgid "Critical Error: Unable to access Connection Manager"
-msgstr "치명적 오류: 연결 관리자에 액세스할 수 없음"
+msgstr "치명적 오류: 연결 관리자에 접근할 수 없음"
#: ../carrick/carrick-service-item.c:55
msgid "ERROR: No 3G Hardware detected"
-msgstr "오류: 발견된 3G 하드웨어 없음."
+msgstr "오류: 3G 하드웨어가 발견되지 않았음"
#. TRANSLATORS: this is a wireless security method, at least WEP,
#. * WPA and IEEE8021X are possible token values. Example: "WEP encrypted".
#.
-#: ../carrick/carrick-service-item.c:191
+#: ../carrick/carrick-service-item.c:192
#, c-format
msgid "%s encrypted"
msgstr "%s 암호화"
-#: ../carrick/carrick-service-item.c:290
-#: ../carrick/carrick-service-item.c:307
+#: ../carrick/carrick-service-item.c:340 ../carrick/carrick-service-item.c:357
msgid "Disconnect"
msgstr "연결 끊기"
-#: ../carrick/carrick-service-item.c:293
+#: ../carrick/carrick-service-item.c:343
msgid "Connected"
msgstr "연결됨"
-#: ../carrick/carrick-service-item.c:310
+#: ../carrick/carrick-service-item.c:360
msgid "Online"
msgstr "온라인"
-#: ../carrick/carrick-service-item.c:317
-#: ../carrick/carrick-service-item.c:326
+#: ../carrick/carrick-service-item.c:367 ../carrick/carrick-service-item.c:376
#, c-format
msgid "Cancel"
msgstr "취소"
-#: ../carrick/carrick-service-item.c:320
+#: ../carrick/carrick-service-item.c:370
msgid "Configuring"
msgstr "구성"
-#: ../carrick/carrick-service-item.c:329
+#: ../carrick/carrick-service-item.c:379
msgid "Associating"
-msgstr "융화 중"
+msgstr "연결 중"
-#: ../carrick/carrick-service-item.c:338
-#: ../carrick/carrick-service-item.c:363
-#: ../carrick/carrick-service-item.c:1670
+#: ../carrick/carrick-service-item.c:388 ../carrick/carrick-service-item.c:413
+#: ../carrick/carrick-service-item.c:1774
msgid "Connect"
msgstr "연결"
-#: ../carrick/carrick-service-item.c:366
+#: ../carrick/carrick-service-item.c:416
msgid "Connection failed"
msgstr "연결 실패"
-#: ../carrick/carrick-service-item.c:369
+#: ../carrick/carrick-service-item.c:419
msgid "Sorry, the connection failed. You could try again."
-msgstr "죄송합니다. 연결에 실패했습니다. 다시 시도해 보십시오. "
+msgstr "연결에 실패하였습니다. 다시 시도해 보십시오."
-#: ../carrick/carrick-service-item.c:375
-#: ../carrick/carrick-service-item.c:378
+#: ../carrick/carrick-service-item.c:425 ../carrick/carrick-service-item.c:428
#, c-format
msgid "Disconnecting"
-msgstr "연결을 끊는 중"
+msgstr "연결 끊는 중"
-#: ../carrick/carrick-service-item.c:468
+#: ../carrick/carrick-service-item.c:494
msgid "Type password here"
-msgstr "암호를 입력하십시오."
+msgstr "암호 입력"
-#: ../carrick/carrick-service-item.c:537
+#: ../carrick/carrick-service-item.c:563
msgid "Really remove?"
msgstr "제거하시겠습니까?"
-#: ../carrick/carrick-service-item.c:557
+#: ../carrick/carrick-service-item.c:583
#, c-format
msgid ""
"Do you want to remove the %s %s network? This\n"
"will forget the password and you will no longer be\n"
"automatically connected to %s."
msgstr ""
-"%s %s 네트워크 제거를 원하십니까?\n"
-"이로인해 암호가 삭제될 것이며\n"
-"더이상 자동으로 %s에 연결되지 않을것입니다. "
+"%s %s 네트워크를 제거하시겠습니까?\n"
+"기억하고 있던 암호를 삭제하며, %s에\n"
+"더 이상 자동으로 연결하지 않습니다."
-#: ../carrick/carrick-service-item.c:753
+#: ../carrick/carrick-service-item.c:786
#, c-format
-msgid "Your password isn't the right length. For a WEP connection it needs to be either 10 or 26 characters, you have %i."
-msgstr "암호의 길이가 적당하지 않습니다. WEP 연결을 위해서는 10자 또는 26자의 문자가 필요합니다. 지금은 %d자 입니다. "
+msgid ""
+"Your password isn't the right length. For a WEP connection it needs to be "
+"either 10 or 26 characters, you have %i."
+msgstr "암호 길이가 올바르지 않습니다. WEP 암호는 10, 26글자 중 하나여야 하며, 현재 %i글자 입력하였습니다."
-#: ../carrick/carrick-service-item.c:764
+#: ../carrick/carrick-service-item.c:797
#, c-format
-msgid "Your password is too short. For a WPA connection it needs to be at least 8 characters long, you have %i"
-msgstr "암호가 너무 짧습니다. WEP 연결을 위해서는 적어도 8자 정도의 문자가 필요합니다. 지금은 %d자 입니다. "
+msgid ""
+"Your password is too short. For a WPA connection it needs to be at least 8 "
+"characters long, you have %i"
+msgstr "암호가 너무 짧습니다. WPA 암호는 최소 8글자 이상이어야 하며, 현재 %i글자 입력하였습니다."
-#: ../carrick/carrick-service-item.c:768
+#: ../carrick/carrick-service-item.c:801
#, c-format
-msgid "Your password is too long. For a WPA connection it needs to have fewer than 63 characters, you have %i"
-msgstr "암호가 너무 깁니다 . WPA 연결을 위해서 63자 미만의 문자가 필요합니다. 지금은 %d자 입니다. "
+msgid ""
+"Your password is too long. For a WPA connection it needs to have fewer than "
+"63 characters, you have %i"
+msgstr "암호가 너무 깁니다. WPA 암호는 최대 63글자 이하여야 하며, 현재 %i글자 입력하였습니다"
-#: ../carrick/carrick-service-item.c:777
+#: ../carrick/carrick-service-item.c:810
#, c-format
-msgid "Your password is too short. For a WPA2 connection it needs to be at least 8 characters long, you have %i"
-msgstr "암호가 너무 짧습니다. WEP2 연결을 위해서는 적어도 8자 정도의 문자가 필요합니다. 지금은 %d자 입니다. "
+msgid ""
+"Your password is too short. For a WPA2 connection it needs to be at least 8 "
+"characters long, you have %i"
+msgstr "암호가 너무 짧습니다. WPA2 암호는 최소 8글자 이상이어야 하며, 현재 %i글자 입력하였습니다"
-#: ../carrick/carrick-service-item.c:781
+#: ../carrick/carrick-service-item.c:814
#, c-format
-msgid "Your password is too long. For a WPA2 connection it needs to have fewer than 63 characters, you have %i"
-msgstr "암호가 너무 깁니다 . WPA2 연결을 위해서 63자 미만의 문자가 필요합니다. 지금은 %d자 입니다. "
+msgid ""
+"Your password is too long. For a WPA2 connection it needs to have fewer "
+"than 63 characters, you have %i"
+msgstr "암호가 너무 깁니다. WPA2 암호는 최대 63글자 이하여야 하며, 현재 %i글자 입력하였습니다"
-#: ../carrick/carrick-service-item.c:1227
+#: ../carrick/carrick-service-item.c:1267
msgid "Sorry, it looks like the IP address is not valid"
-msgstr "죄송합니다. IP 주소가 틀린것 같습니다."
+msgstr "IP 주소가 올바르지 않은 것 같습니다"
-#: ../carrick/carrick-service-item.c:1239
+#: ../carrick/carrick-service-item.c:1279
msgid "Sorry, it looks like the gateway address is not valid"
-msgstr "죄송합니다. 게이트웨이 주소가 틀린것 같습니다."
+msgstr "게이트웨이 주소가 올바르지 않은 것 같습니다"
-#: ../carrick/carrick-service-item.c:1251
+#: ../carrick/carrick-service-item.c:1291
msgid "Sorry, it looks like the subnet mask is not valid"
-msgstr "죄송합니다. 서브넷 마스크가 틀린것 같습니다."
+msgstr "서브넷 마스크가 올바르지 않은 것 같습니다"
-#: ../carrick/carrick-service-item.c:1271
+#: ../carrick/carrick-service-item.c:1336
#, c-format
msgid "Sorry, it looks like the nameserver address '%s' is not valid"
-msgstr "죄송합니다. 서버 이름의 주소 '%s'가 틀린것 같습니다."
+msgstr "네임서버 주소 '%s'이(가) 올바르지 않은 것 같습니다"
#. TRANSLATORS: label for the Advanced expander in a service item
-#: ../carrick/carrick-service-item.c:1594
+#: ../carrick/carrick-service-item.c:1698
msgid "Advanced"
-msgstr "어드밴스드"
+msgstr "고급"
-#: ../carrick/carrick-service-item.c:1604
+#: ../carrick/carrick-service-item.c:1708
msgid "Scanning"
-msgstr "스켄 중"
+msgstr "검색"
#. Note: security_sample should contain the longest possible security method
#. TRANSLATORS: This is an example of a wireless security method
#. (see another translator comment), used to estimate the string length.
#. It should look like the ones below network name in the UI
-#: ../carrick/carrick-service-item.c:1625
+#: ../carrick/carrick-service-item.c:1729
msgid "WPA2 encrypted"
-msgstr "암호화된 WPA2"
+msgstr "WPA2 암호화됨"
#. TRANSLATORS: label in advanced settings (next to combobox
#. * for DHCP/Static IP)
-#: ../carrick/carrick-service-item.c:1732
+#: ../carrick/carrick-service-item.c:1836
msgid "Connect by:"
-msgstr "연결자:"
+msgstr "다음에 연결됨:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1734
+#: ../carrick/carrick-service-item.c:1838
msgid "IP address:"
msgstr "IP 주소:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1736
+#: ../carrick/carrick-service-item.c:1840
msgid "Subnet mask:"
msgstr "서브넷 마스크:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1738
+#: ../carrick/carrick-service-item.c:1842
msgid "Router:"
-msgstr "루터:"
+msgstr "라우터:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1740
+#: ../carrick/carrick-service-item.c:1844
msgid "DNS:"
msgstr "DNS:"
-#: ../carrick/carrick-service-item.c:1747
+#: ../carrick/carrick-service-item.c:1850
msgid "DHCP"
msgstr "DHCP"
-#: ../carrick/carrick-service-item.c:1749
+#: ../carrick/carrick-service-item.c:1852
msgid "Static IP"
-msgstr "스테틱 IP"
+msgstr "고정 IP"
#. TRANSLATORS: label for apply button in static ip settings
-#: ../carrick/carrick-service-item.c:1776
+#: ../carrick/carrick-service-item.c:1902
msgid "Apply"
msgstr "적용"
-#: ../src/carrick.c:43
+#: ../src/carrick.c:49
msgid "networks - not connected"
msgstr "네트워크 - 연결되지 않음"
-#: ../src/carrick.c:49
+#: ../src/carrick.c:55
msgid "networks - connecting"
-msgstr "네트워크 - 연결됨"
+msgstr "네트워크 - 연결 중"
-#: ../src/carrick.c:55
+#: ../src/carrick.c:61
msgid "networks - wired"
msgstr "네트워크 - 유선"
-#: ../src/carrick.c:57
+#: ../src/carrick.c:63
#, c-format
msgid "networks - %s - wifi"
msgstr "네트워크 - %s - WiFi"
-#: ../src/carrick.c:60
+#: ../src/carrick.c:66
#, c-format
msgid "networks - %s - wimax"
msgstr "네트워크 - %s - WiMAX"
-#: ../src/carrick.c:63
+#: ../src/carrick.c:69
#, c-format
msgid "networks - %s - 3G"
msgstr "네트워크 - %s - 3G"
-#: ../src/carrick.c:66
+#: ../src/carrick.c:72
#, c-format
msgid "networks - %s - bluetooth"
msgstr "네트워크 - %s - 블루투스"
-#: ../src/carrick.c:69
-#: ../src/carrick.c:81
+#: ../src/carrick.c:75 ../src/carrick.c:87
msgid "networks"
msgstr "네트워크 "
-#: ../src/carrick.c:76
+#: ../src/carrick.c:82
msgid "networks - error"
msgstr "네트워크 - 오류"
-#: ../src/carrick.c:279
+#: ../src/carrick.c:297
msgid "Run in standalone mode"
-msgstr "단독 모드 실행"
+msgstr "단독 모드로 실행"
-#: ../src/carrick.c:281
+#: ../src/carrick.c:299
msgid "Embed in another window (overrides --standalone)"
-msgstr "다른 창에 임베드합니다. (무시 -- 독립형)"
+msgstr "다른 창에 끼워넣음 (--standalone 무시함)"
-#: ../src/carrick.c:292
+#: ../src/carrick.c:310
msgid "Carrick connectivity applet"
-msgstr "Carrick 연결성 애플렛"
+msgstr "Carrick 연결 애플릿"
-#: ../src/carrick.c:293
-msgid "- Moblin connectivity applet"
-msgstr "- Moblin 연결성 애플렛"
+#: ../src/carrick.c:311
+msgid "- MeeGo connectivity applet"
+msgstr "- MeeGo 연결 애플릿"
-#: ../src/carrick.c:334
-#: ../data/carrick.desktop.in.in.h:2
+#: ../src/carrick.c:352 ../data/carrick.desktop.in.in.h:2
msgid "network"
msgstr "네트워크 "
#: ../callouts/3g/ggg-country-dialog.c:73
-#: ../callouts/3g/ggg-manual-dialog.c:70
-#: ../callouts/3g/ggg-plan-dialog.c:111
+#: ../callouts/3g/ggg-manual-dialog.c:70 ../callouts/3g/ggg-plan-dialog.c:111
#: ../callouts/3g/ggg-provider-dialog.c:106
#: ../callouts/3g/ggg-service-dialog.c:106
msgid "Cellular Data Connection Wizard"
-msgstr "Cellular 데이타 연결 마법사"
+msgstr "휴대폰 데이터 연결 마법사"
#: ../callouts/3g/ggg-country-dialog.c:93
msgid "Select Country"
-msgstr "국가를 선택하십시오."
+msgstr "국가 선택"
#: ../callouts/3g/ggg-manual-dialog.c:89
msgid "Manual Configuration"
-msgstr "수동 구성"
+msgstr "수동 설정"
#: ../callouts/3g/ggg-manual-dialog.c:93
msgid "Plan Name (required):"
-msgstr "플랜 이름 (필수):"
+msgstr "연결 이름(필수):"
#: ../callouts/3g/ggg-manual-dialog.c:96
msgid "Username:"
@@ -519,23 +530,23 @@
#: ../callouts/3g/ggg-manual-dialog.c:106
msgid "Primary DNS:"
-msgstr "일차적인 DNS:"
+msgstr "1차 DNS:"
#: ../callouts/3g/ggg-manual-dialog.c:109
msgid "Secondary DNS:"
-msgstr "이차적인 DNS:"
+msgstr "2차 DNS:"
#: ../callouts/3g/ggg-manual-dialog.c:112
msgid "Tertiary DNS:"
-msgstr "삼차적인 DNS:"
+msgstr "3차 DNS:"
#: ../callouts/3g/ggg-plan-dialog.c:131
msgid "Select your 3G Plan"
-msgstr "3G 데이타 플랜을 선택하십시오."
+msgstr "3G 요금제 선택"
#: ../callouts/3g/ggg-provider-dialog.c:126
msgid "Select Provider"
-msgstr "공급자를 선택하십시오. "
+msgstr "통신사 선택"
#: ../callouts/3g/ggg-service-dialog.c:59
#, c-format
@@ -544,7 +555,7 @@
#: ../callouts/3g/ggg-service-dialog.c:125
msgid "Select 3G Service"
-msgstr "3G 서비스를 선택하십시오."
+msgstr "3G 서비스 선택"
#: ../data/carrick.desktop.in.in.h:1
msgid "Network settings"
@@ -552,74 +563,101 @@
#~ msgid "Select your 3G Data Plan"
#~ msgstr "3G 데이타 플랜을 선택하십시오."
+
#~ msgid "Plan Name: (required)"
#~ msgstr "플랜 이름: (필수)"
+
#~ msgid "Tertairy DNS:"
#~ msgstr "삼차적인 DNS:"
+
#~ msgid "Manual Config"
#~ msgstr "수동 구성"
+
#~ msgid "Sorry, we can't find any networks. You could try turning on 3G."
#~ msgstr ""
#~ "죄송합니다. 네트워크를 찾을 수 없습니다. 3G 켜기를 시도해 보십시오. "
+
#~ msgid "Sorry, we can't find any networks. You could try turning on WiFi."
#~ msgstr ""
#~ "죄송합니다. 네트워크를 찾을 수 없습니다. WiFi 켜기를 시도해 보십시오. "
+
#~ msgid "Sorry, we can't find any networks. You could try turning on WiMAX."
#~ msgstr ""
#~ "죄송합니다. 네트워크를 찾을 수 없습니다. WiMAX 켜기를 시도해 보십시오. "
+
#~ msgid ""
#~ "Sorry, we can't find any networks. You could try turning on Bluetooth."
#~ msgstr ""
#~ "죄송합니다. 네트워크를 찾을 수 없습니다. Bluetooth 켜기를 시도해 보십시"
#~ "오. "
+
#~ msgid "Sorry, we can't find any networks. You could try turning on Wired."
#~ msgstr ""
#~ "죄송합니다. 네트워크를 찾을 수 없습니다. 유선 켜기를 시도해 보십시오. "
+
#~ msgid "Sorry, we can't find any networks. "
#~ msgstr "죄송합니다. 네트워크를 찿을수 없습니다."
+
#~ msgid ""
#~ "The ConnMan daemon doesn't seem to be running. You may want to try re-"
#~ "starting your device"
#~ msgstr ""
#~ "ConnMan daemon이 작동하지 않습니다. 장치를 다시 시작해야할수도 있습니다."
+
#~ msgid "You could try disabling Offline mode"
#~ msgstr "오프모드 비활성화 시도해 보십시오."
+
#~ msgid "You could try turning on "
#~ msgstr "켜기를 시도하십시오."
+
#~ msgid " and "
#~ msgstr "및"
+
#~ msgid "Ethernet"
#~ msgstr "이더넷"
+
#~ msgid "Sorry, your connection to %s was lost. So we've "
#~ msgstr "죄송합니다. %s에 당신의 연결이 끊어졌습니다."
+
#~ msgid "Sorry, your %s connection was lost. So we've "
#~ msgstr "죄송합니다. 당신의 %s 연결이 끊어졌습니다."
+
#~ msgid "connected you to a wired network"
#~ msgstr "유선 네트워크에 연결되었습니다."
+
#~ msgid "connected you to %s, a %s network"
#~ msgstr "%s 네트워크 %s에 연결되었습니다."
+
#~ msgid "connected you to a %s network"
#~ msgstr "%s 네트워크에 연결 되었습니다."
+
#~ msgid "Sorry, your wired connection was lost. So we've "
#~ msgstr "죄송합니다. 당신의 유선 연결을 잃었습니다."
+
#~ msgid "Offline"
#~ msgstr "오프라인 "
+
#~ msgid "No active connection."
#~ msgstr "활성 연결이 없습니다. "
+
#~ msgid "Now online and connected to %s."
#~ msgstr "지금은 온라인 상태며 %s로 연결됩니다."
+
#~ msgid "Connecting"
#~ msgstr "연결하는중"
+
#~ msgid "<b><big>Network Requires a Password</big></b>"
#~ msgstr "<b><big>네트워크에는 암호가 필수입니다.</big></b>"
+
#~ msgid "Please enter the password for this network:"
#~ msgstr "네트워크의 암호를 입력하십시오."
+
#~ msgid ""
#~ "Sorry, we can't find any networks. The Connection Manager doesn't seem to "
#~ "be running. You may want to try re-starting your device."
#~ msgstr ""
#~ "죄송합니다. 네트워크를 찿을수 없습니다. Connection Manager가 실행되는 것 "
#~ "같지 않습니다. 장치의 재시작을 시도해 보십시오. "
+
#~ msgid "Passphrase required"
#~ msgstr "암호화가 필요함"
-
--- po/pt_BR.po
+++ po/pt_BR.po
@@ -1,5 +1,6 @@
-# GLSPTB_Gabor <gaborx.k.becht at intel.com>, 2009.
+# GLSPTB_Gabor <gaborx.k.becht at intel.com>, 2009, 2010.
# Og Maciel <ogmaciel at gnome.org>, 2009.
+# Djavan Fagundes <djavan at syst.com.br>, 2010.
#
msgid ""
msgstr ""
@@ -7,7 +8,7 @@
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-07-03 11:59+0000\n"
"PO-Revision-Date: 2010-05-12 09:14-0800\n"
-"Last-Translator: GLSPTB_Gabor <bechtg at gmail.com>\n"
+"Last-Translator: Djavan Fagundes <djavan at syst.com.br>\n"
"Language-Team: Brazilian Portuguese <l10n at moblin.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -64,7 +65,7 @@
#.
#: ../carrick/carrick-list.c:866
msgid "Sorry, we can't find any networks. It appears that the connection manager is not running. You could try restarting your computer."
-msgstr "Sinto muito, mas não encontramos nenhuma rede. Parece que o gerente de conexão não está rodando. Talvez seja melhor reiniciar o seu computador."
+msgstr "Sinto muito, mas não encontramos nenhuma rede. Parece que o gerenciador de conexão não está rodando. Talvez seja melhor reiniciar o seu computador."
#. * Hint display if we detect that the system is in
#. * offline mode and there are no available networks
@@ -131,17 +132,17 @@
#: ../carrick/carrick-notification-manager.c:239
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to a wired network"
-msgstr "Sinto muito, mas sua conexão a %s caiu. Portanto nós conectamos você a uma rede com fio"
+msgstr "Sinto muito, mas sua conexão %s caiu. Portanto nós conectamos você a uma rede com fio"
#: ../carrick/carrick-notification-manager.c:246
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to %s, a %s network"
-msgstr "Sinto muito, mas sua conexão a %s caiu. Portanto nós conectamos você a %s, uma rede %s"
+msgstr "Sinto muito, mas sua conexão %s caiu. Portanto nós conectamos você a %s, uma rede %s"
#: ../carrick/carrick-notification-manager.c:254
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to a %s network"
-msgstr "Sinto muito, mas sua conexão a %s caiu. Portanto nós conectamos você a uma rede %s"
+msgstr "Sinto muito, mas sua conexão %s caiu. Portanto nós conectamos você a uma rede %s"
#: ../carrick/carrick-notification-manager.c:264
#, c-format
@@ -169,7 +170,7 @@
"password and security type."
msgstr ""
"Digite o nome da rede que você deseja\n"
-"conectar e, onde necessário, a senha e\n"
+"conectar e, onde for necessário, a senha e\n"
"tipo de segurança."
#: ../carrick/carrick-pane.c:682
@@ -202,7 +203,7 @@
#: ../carrick/carrick-pane.c:1510
msgid "Offline mode"
-msgstr "Modo offline"
+msgstr "Modo desconectado"
#: ../carrick/carrick-pane.c:1520
msgid "This will disable all your connections"
@@ -227,7 +228,7 @@
#: ../carrick/carrick-service-item.c:52
msgid "Missing required APN (service plan name)"
-msgstr "Falta o APN (nome do plano de serviço) exigido "
+msgstr "Falta o APN (nome do plano de serviço) exigido"
#: ../carrick/carrick-service-item.c:53
msgid "Internal Error: Invalid network service"
@@ -235,7 +236,7 @@
#: ../carrick/carrick-service-item.c:54
msgid "Critical Error: Unable to access Connection Manager"
-msgstr "Erro crítico: não foi possível acessar o Gerente de conexões"
+msgstr "Erro crítico: não foi possível acessar o Gerenciador de conexões"
#: ../carrick/carrick-service-item.c:55
msgid "ERROR: No 3G Hardware detected"
@@ -308,7 +309,7 @@
"automatically connected to %s."
msgstr ""
"Você deseja remover a rede %s %s? Isso\n"
-"esquecerá a senha e você não estará mais\n"
+"irá esquecer a senha e você não será mais\n"
"conectado automaticamente a %s."
#: ../carrick/carrick-service-item.c:786
@@ -324,7 +325,7 @@
#: ../carrick/carrick-service-item.c:801
#, c-format
msgid "Your password is too long. For a WPA connection it needs to have fewer than 63 characters, you have %i"
-msgstr "Sua senha é muito comprida. Para uma conexão WPA ela precisa ter menos que 63 caracteres, e a sua tem %i"
+msgstr "Sua senha é muito longa. Para uma conexão WPA ela precisa ter menos que 63 caracteres, e a sua tem %i"
#: ../carrick/carrick-service-item.c:810
#, c-format
@@ -334,7 +335,7 @@
#: ../carrick/carrick-service-item.c:814
#, c-format
msgid "Your password is too long. For a WPA2 connection it needs to have fewer than 63 characters, you have %i"
-msgstr "Sua senha é muito comprida. Para uma conexão WPA2 ela precisa ter menos que 63 caracteres, e a sua tem %i"
+msgstr "Sua senha é muito longa. Para uma conexão WPA2 ela precisa ter menos que 63 caracteres, e a sua tem %i"
#: ../carrick/carrick-service-item.c:1267
msgid "Sorry, it looks like the IP address is not valid"
@@ -346,7 +347,7 @@
#: ../carrick/carrick-service-item.c:1291
msgid "Sorry, it looks like the subnet mask is not valid"
-msgstr "Sinto muito, parece que a máscara subnet não é válido"
+msgstr "Sinto muito, parece que a máscara subnet não é válida"
#: ../carrick/carrick-service-item.c:1336
#, c-format
@@ -463,7 +464,7 @@
#: ../src/carrick.c:311
msgid "- MeeGo connectivity applet"
-msgstr "- Miniaplicativo de conectividade do Meego"
+msgstr "- Miniaplicativo de conectividade do MeeGo"
#: ../src/carrick.c:352 ../data/carrick.desktop.in.in.h:2
msgid "network"
@@ -478,7 +479,7 @@
#: ../callouts/3g/ggg-country-dialog.c:93
msgid "Select Country"
-msgstr "Selecione país"
+msgstr "Selecionar país"
#: ../callouts/3g/ggg-manual-dialog.c:89
msgid "Manual Configuration"
--- po/ru.po
+++ po/ru.po
@@ -2,12 +2,12 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-12 09:29+0000\n"
+"POT-Creation-Date: 2010-07-03 11:59+0000\n"
"PO-Revision-Date: 2010-05-12 13:11-0800\n"
"Last-Translator: Bogdan Nosach <bogdan.nosach at ptiglobal.net>\n"
"Language-Team: \n"
@@ -18,153 +18,146 @@
"X-Poedit-Language: Russian\n"
"X-Poedit-SourceCharset: utf-8\n"
-#.
-#. * Translator note: The disabled technologies available to be turned on is put together at
+#. * Translator note: The disabled technologies available to be turned on is
+#. put together at
#. * runtime.
-#. * The conjunction 'or' will be at the end of a choice of disabled technologies,
+#. * The conjunction 'or' will be at the end of a choice of disabled
+#. technologies,
#. * for example 'WiFi, WiMAX or 3G.
-#.
-#: ../carrick/carrick-list.c:847
+#.
+#: ../carrick/carrick-list.c:843
msgid " or "
msgstr "или"
-#.
-#. * Translator note: the comma ',' will be used to join the different disabled technologies
+#. * Translator note: the comma ',' will be used to join the different
+#. disabled technologies
#. * as in the above example; 'WiFi, WiMAX or 3G'
-#.
-#: ../carrick/carrick-list.c:852
+#.
+#: ../carrick/carrick-list.c:848
msgid ", "
msgstr ", "
-#: ../carrick/carrick-list.c:853
-#: ../carrick/carrick-util.c:34
+#: ../carrick/carrick-list.c:849 ../carrick/carrick-util.c:34
msgid "wired"
msgstr "проводная"
#. Switches
-#: ../carrick/carrick-list.c:854
-#: ../carrick/carrick-pane.c:1429
+#: ../carrick/carrick-list.c:850 ../carrick/carrick-pane.c:1429
#: ../carrick/carrick-util.c:32
msgid "WiFi"
msgstr "WiFi"
-#: ../carrick/carrick-list.c:855
-#: ../carrick/carrick-pane.c:1471
+#: ../carrick/carrick-list.c:851 ../carrick/carrick-pane.c:1471
#: ../carrick/carrick-util.c:38
msgid "WiMAX"
msgstr "WiMAX"
-#: ../carrick/carrick-list.c:856
-#: ../carrick/carrick-pane.c:1457
+#: ../carrick/carrick-list.c:852 ../carrick/carrick-pane.c:1457
#: ../carrick/carrick-util.c:36
msgid "3G"
msgstr "3G"
-#: ../carrick/carrick-list.c:857
-#: ../carrick/carrick-pane.c:1485
+#: ../carrick/carrick-list.c:853 ../carrick/carrick-pane.c:1485
#: ../carrick/carrick-util.c:40
msgid "Bluetooth"
msgstr "Bluetooth"
-#.
#. * Translators: this string is displayed if there
#. * are no available networks because ConnMan, the
#. * connectivity daemon, is not running.
-#.
-#: ../carrick/carrick-list.c:870
+#.
+#: ../carrick/carrick-list.c:866
msgid "Sorry, we can't find any networks. It appears that the connection manager is not running. You could try restarting your computer."
msgstr "Не найдено ни одной сети. Возможно, мастер соединений не запущен. Попробуйте перегрузить компьютер."
-#.
#. * Hint display if we detect that the system is in
#. * offline mode and there are no available networks
-#.
-#: ../carrick/carrick-list.c:880
+#.
+#: ../carrick/carrick-list.c:876
msgid "Sorry, we can't find any networks. You could try disabling Offline mode. "
msgstr "Не удается найти ни одной сети. Попробуйте отключить режим Оффлайн."
-#: ../carrick/carrick-list.c:1017
+#: ../carrick/carrick-list.c:1013
#, c-format
msgid "Sorry, we can't find any networks. You could try enabling %s."
msgstr "Не удается найти ни одной сети. Попробуйте активировать %s."
-#.
#. * Generic message to display if all available networking
#. * technologies are turned on, but for whatever reason we
#. * can not find any networks
-#.
-#: ../carrick/carrick-list.c:1031
+#.
+#: ../carrick/carrick-list.c:1027
msgid "Sorry, we can't find any networks"
msgstr "Не удается найти ни одной сети"
-#: ../carrick/carrick-notification-manager.c:104
+#: ../carrick/carrick-notification-manager.c:124
msgid "Network connected"
msgstr "Сеть установлена"
-#: ../carrick/carrick-notification-manager.c:112
+#: ../carrick/carrick-notification-manager.c:132
#, c-format
msgid "You're now connected to a wired network"
msgstr "Теперь вы подключены к проводной сети"
-#: ../carrick/carrick-notification-manager.c:142
+#: ../carrick/carrick-notification-manager.c:162
#, c-format
msgid "You're now connected to %s, a %s network"
msgstr "Теперь вы подключены к %s, сети %s"
-#: ../carrick/carrick-notification-manager.c:148
+#: ../carrick/carrick-notification-manager.c:168
#, c-format
msgid "You're now connected to a %s network"
msgstr "Теперь вы подключены к сети %s"
-#: ../carrick/carrick-notification-manager.c:165
+#: ../carrick/carrick-notification-manager.c:185
msgid "Network lost"
msgstr "Соединение с сетью утрачено"
-#: ../carrick/carrick-notification-manager.c:173
+#: ../carrick/carrick-notification-manager.c:193
#, c-format
msgid "Sorry, we've lost your wired connection"
-msgstr "Ваше проовдное подключение утрачено"
+msgstr "Ваше провдное подключение утрачено"
-#: ../carrick/carrick-notification-manager.c:177
+#: ../carrick/carrick-notification-manager.c:197
#, c-format
msgid "Sorry we've lost your %s connection to %s"
msgstr "Ваше подключение %s к %s утрачено"
-#: ../carrick/carrick-notification-manager.c:183
+#: ../carrick/carrick-notification-manager.c:203
#, c-format
msgid "Sorry, we've lost your %s connection"
msgstr "Ваше подключение %s утрачено"
-#: ../carrick/carrick-notification-manager.c:200
+#: ../carrick/carrick-notification-manager.c:220
msgid "Network changed"
msgstr "Сеть изменена"
-#: ../carrick/carrick-notification-manager.c:219
+#: ../carrick/carrick-notification-manager.c:239
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to a wired network"
msgstr "Ваше подключение к %s утрачено. Мы подключили вас к проводной сети"
-#: ../carrick/carrick-notification-manager.c:226
+#: ../carrick/carrick-notification-manager.c:246
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to %s, a %s network"
msgstr "Ваше подключение к %s утрачено. Мы подключили вас к %s, сети %s"
-#: ../carrick/carrick-notification-manager.c:234
+#: ../carrick/carrick-notification-manager.c:254
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to a %s network"
msgstr "Ваше подключение к %s утрачено. Мы подключили вас к сети %s"
-#: ../carrick/carrick-notification-manager.c:244
+#: ../carrick/carrick-notification-manager.c:264
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to a wired network"
msgstr "Ваше подключение к %s утрачено. Мы подключили вас проводной сети"
-#: ../carrick/carrick-notification-manager.c:251
+#: ../carrick/carrick-notification-manager.c:271
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to %s, a %s network"
msgstr "Ваше подключение к %s утрачено. Мы подключили вас к %s, сети %s"
-#: ../carrick/carrick-notification-manager.c:260
+#: ../carrick/carrick-notification-manager.c:280
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to a %s network"
msgstr "Ваше подключение к %s утрачено. Мы подключили вас к сети %s"
@@ -180,8 +173,8 @@
"password and security type."
msgstr ""
"Укажите имя сети, к которой вы хотите\n"
-"подключиться, и, при необходимости, пароль\n"
-"и тип безопасности."
+" подключиться, и, при необходимости, пароль\n"
+" и тип безопасности."
#: ../carrick/carrick-pane.c:682
msgid "Network name"
@@ -199,8 +192,7 @@
msgid "Password"
msgstr "Пароль"
-#: ../carrick/carrick-pane.c:731
-#: ../carrick/carrick-service-item.c:1683
+#: ../carrick/carrick-pane.c:731 ../carrick/carrick-service-item.c:1787
msgid "Show password"
msgstr "Показать пароль"
@@ -208,8 +200,7 @@
msgid "Settings"
msgstr "Настройки"
-#: ../carrick/carrick-pane.c:1443
-#: ../carrick/carrick-service-item.c:278
+#: ../carrick/carrick-pane.c:1443 ../carrick/carrick-service-item.c:328
msgid "Wired"
msgstr "Проводная"
@@ -221,8 +212,7 @@
msgid "This will disable all your connections"
msgstr "Это отключит все ваши подключения"
-#: ../carrick/carrick-pane.c:1556
-#: ../src/carrick.c:351
+#: ../carrick/carrick-pane.c:1556 ../src/carrick.c:369
msgid "Networks"
msgstr "Сетевые подключения"
@@ -234,7 +224,7 @@
#. Translators:
#. The following are potential errors that a user might see while
#. attempting to configure a 3G data service.
-#.
+#.
#: ../carrick/carrick-service-item.c:51
msgid "Critical Error: Invalid country code"
msgstr "Критическая ошибка: неправильный код страны"
@@ -257,68 +247,64 @@
#. TRANSLATORS: this is a wireless security method, at least WEP,
#. * WPA and IEEE8021X are possible token values. Example: "WEP encrypted".
-#.
-#: ../carrick/carrick-service-item.c:191
+#.
+#: ../carrick/carrick-service-item.c:192
#, c-format
msgid "%s encrypted"
msgstr "%s зашифровано"
-#: ../carrick/carrick-service-item.c:290
-#: ../carrick/carrick-service-item.c:307
+#: ../carrick/carrick-service-item.c:340 ../carrick/carrick-service-item.c:357
msgid "Disconnect"
msgstr "Отключить"
-#: ../carrick/carrick-service-item.c:293
+#: ../carrick/carrick-service-item.c:343
msgid "Connected"
msgstr "Подключено"
-#: ../carrick/carrick-service-item.c:310
+#: ../carrick/carrick-service-item.c:360
msgid "Online"
msgstr "Онлайн"
-#: ../carrick/carrick-service-item.c:317
-#: ../carrick/carrick-service-item.c:326
+#: ../carrick/carrick-service-item.c:367 ../carrick/carrick-service-item.c:376
#, c-format
msgid "Cancel"
msgstr "Отменить"
-#: ../carrick/carrick-service-item.c:320
+#: ../carrick/carrick-service-item.c:370
msgid "Configuring"
msgstr "Настройка"
-#: ../carrick/carrick-service-item.c:329
+#: ../carrick/carrick-service-item.c:379
msgid "Associating"
msgstr "Ассоциирование"
-#: ../carrick/carrick-service-item.c:338
-#: ../carrick/carrick-service-item.c:363
-#: ../carrick/carrick-service-item.c:1670
+#: ../carrick/carrick-service-item.c:388 ../carrick/carrick-service-item.c:413
+#: ../carrick/carrick-service-item.c:1774
msgid "Connect"
msgstr "Подключить"
-#: ../carrick/carrick-service-item.c:366
+#: ../carrick/carrick-service-item.c:416
msgid "Connection failed"
msgstr "Сбой подключения"
-#: ../carrick/carrick-service-item.c:369
+#: ../carrick/carrick-service-item.c:419
msgid "Sorry, the connection failed. You could try again."
msgstr "Сбой подключения, повторите попытку."
-#: ../carrick/carrick-service-item.c:375
-#: ../carrick/carrick-service-item.c:378
+#: ../carrick/carrick-service-item.c:425 ../carrick/carrick-service-item.c:428
#, c-format
msgid "Disconnecting"
msgstr "Отключение"
-#: ../carrick/carrick-service-item.c:468
+#: ../carrick/carrick-service-item.c:494
msgid "Type password here"
msgstr "Введите пароль здесь"
-#: ../carrick/carrick-service-item.c:537
+#: ../carrick/carrick-service-item.c:563
msgid "Really remove?"
msgstr "Действительно удалить?"
-#: ../carrick/carrick-service-item.c:557
+#: ../carrick/carrick-service-item.c:583
#, c-format
msgid ""
"Do you want to remove the %s %s network? This\n"
@@ -329,54 +315,54 @@
"приведет к утрате пароля и невозможности\n"
"автоматического подключения к %s."
-#: ../carrick/carrick-service-item.c:753
+#: ../carrick/carrick-service-item.c:786
#, c-format
msgid "Your password isn't the right length. For a WEP connection it needs to be either 10 or 26 characters, you have %i."
msgstr "Пароль содержит неправильное количество символов. Для подключения WEP он должен содержать 10 или 26 символов, у вас %i."
-#: ../carrick/carrick-service-item.c:764
+#: ../carrick/carrick-service-item.c:797
#, c-format
msgid "Your password is too short. For a WPA connection it needs to be at least 8 characters long, you have %i"
msgstr "Слишком короткий пароль. Для подключения WPA он должен состоять минимум из 8 символов, у вас %i"
-#: ../carrick/carrick-service-item.c:768
+#: ../carrick/carrick-service-item.c:801
#, c-format
msgid "Your password is too long. For a WPA connection it needs to have fewer than 63 characters, you have %i"
msgstr "Слишком длинный пароль. Для под подключения WPA пароль должен быть не длиннее 63 символов, у вас %i"
-#: ../carrick/carrick-service-item.c:777
+#: ../carrick/carrick-service-item.c:810
#, c-format
msgid "Your password is too short. For a WPA2 connection it needs to be at least 8 characters long, you have %i"
msgstr "Слишком короткий пароль. Для подключения WPA2 он должен состоять минимум из 8 символов, у вас %i"
-#: ../carrick/carrick-service-item.c:781
+#: ../carrick/carrick-service-item.c:814
#, c-format
msgid "Your password is too long. For a WPA2 connection it needs to have fewer than 63 characters, you have %i"
msgstr "Слишком длинный пароль. Для под подключения WPA2 пароль должен быть не длиннее 63 символов, у вас %i"
-#: ../carrick/carrick-service-item.c:1227
+#: ../carrick/carrick-service-item.c:1267
msgid "Sorry, it looks like the IP address is not valid"
msgstr "Похоже, что IP-адрес недействителен"
-#: ../carrick/carrick-service-item.c:1239
+#: ../carrick/carrick-service-item.c:1279
msgid "Sorry, it looks like the gateway address is not valid"
msgstr "Похоже, что адрес межсетевого шлюза недействителен"
-#: ../carrick/carrick-service-item.c:1251
+#: ../carrick/carrick-service-item.c:1291
msgid "Sorry, it looks like the subnet mask is not valid"
msgstr "Похоже, что маска подсети недействительна"
-#: ../carrick/carrick-service-item.c:1271
+#: ../carrick/carrick-service-item.c:1336
#, c-format
msgid "Sorry, it looks like the nameserver address '%s' is not valid"
msgstr "Похоже, что адрес сервера преобразования имён '%s' недействителен"
#. TRANSLATORS: label for the Advanced expander in a service item
-#: ../carrick/carrick-service-item.c:1594
+#: ../carrick/carrick-service-item.c:1698
msgid "Advanced"
msgstr "Расширенные"
-#: ../carrick/carrick-service-item.c:1604
+#: ../carrick/carrick-service-item.c:1708
msgid "Scanning"
msgstr "Проверка"
@@ -384,114 +370,111 @@
#. TRANSLATORS: This is an example of a wireless security method
#. (see another translator comment), used to estimate the string length.
#. It should look like the ones below network name in the UI
-#: ../carrick/carrick-service-item.c:1625
+#: ../carrick/carrick-service-item.c:1729
msgid "WPA2 encrypted"
msgstr "WPA2 зашифровано"
#. TRANSLATORS: label in advanced settings (next to combobox
#. * for DHCP/Static IP)
-#: ../carrick/carrick-service-item.c:1732
+#: ../carrick/carrick-service-item.c:1836
msgid "Connect by:"
msgstr "Подключить посредством:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1734
+#: ../carrick/carrick-service-item.c:1838
msgid "IP address:"
msgstr "IP-адрес:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1736
+#: ../carrick/carrick-service-item.c:1840
msgid "Subnet mask:"
msgstr "Маска подсети:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1738
+#: ../carrick/carrick-service-item.c:1842
msgid "Router:"
msgstr "Маршрутизатор:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1740
+#: ../carrick/carrick-service-item.c:1844
msgid "DNS:"
msgstr "DNS:"
-#: ../carrick/carrick-service-item.c:1747
+#: ../carrick/carrick-service-item.c:1850
msgid "DHCP"
msgstr "DHCP"
-#: ../carrick/carrick-service-item.c:1749
+#: ../carrick/carrick-service-item.c:1852
msgid "Static IP"
msgstr "Статический IP-адрес"
#. TRANSLATORS: label for apply button in static ip settings
-#: ../carrick/carrick-service-item.c:1776
+#: ../carrick/carrick-service-item.c:1902
msgid "Apply"
msgstr "Применить"
-#: ../src/carrick.c:43
+#: ../src/carrick.c:49
msgid "networks - not connected"
msgstr "сети - не подключено"
-#: ../src/carrick.c:49
+#: ../src/carrick.c:55
msgid "networks - connecting"
msgstr "сети - подключение"
-#: ../src/carrick.c:55
+#: ../src/carrick.c:61
msgid "networks - wired"
msgstr "сети - проводные"
-#: ../src/carrick.c:57
+#: ../src/carrick.c:63
#, c-format
msgid "networks - %s - wifi"
msgstr "сети - %s - wifi"
-#: ../src/carrick.c:60
+#: ../src/carrick.c:66
#, c-format
msgid "networks - %s - wimax"
msgstr "сети - %s - wimax"
-#: ../src/carrick.c:63
+#: ../src/carrick.c:69
#, c-format
msgid "networks - %s - 3G"
msgstr "сети - %s - 3G"
-#: ../src/carrick.c:66
+#: ../src/carrick.c:72
#, c-format
msgid "networks - %s - bluetooth"
msgstr "сети - %s - bluetooth"
-#: ../src/carrick.c:69
-#: ../src/carrick.c:81
+#: ../src/carrick.c:75 ../src/carrick.c:87
msgid "networks"
msgstr "сети"
-#: ../src/carrick.c:76
+#: ../src/carrick.c:82
msgid "networks - error"
msgstr "сети - ошибка"
-#: ../src/carrick.c:279
+#: ../src/carrick.c:297
msgid "Run in standalone mode"
msgstr "Запуск в автономном режиме"
-#: ../src/carrick.c:281
+#: ../src/carrick.c:299
msgid "Embed in another window (overrides --standalone)"
msgstr "Добавлено в другом окне (замещает --отдельный)"
-#: ../src/carrick.c:292
+#: ../src/carrick.c:310
msgid "Carrick connectivity applet"
msgstr "Приложение для подключения Carrick"
-#: ../src/carrick.c:293
-msgid "- Moblin connectivity applet"
-msgstr "- Приложение для подключения Moblin"
+#: ../src/carrick.c:311
+msgid "- MeeGo connectivity applet"
+msgstr "- подключение апплета MeeGo"
-#: ../src/carrick.c:334
-#: ../data/carrick.desktop.in.in.h:2
+#: ../src/carrick.c:352 ../data/carrick.desktop.in.in.h:2
msgid "network"
msgstr "сеть"
#: ../callouts/3g/ggg-country-dialog.c:73
-#: ../callouts/3g/ggg-manual-dialog.c:70
-#: ../callouts/3g/ggg-plan-dialog.c:111
+#: ../callouts/3g/ggg-manual-dialog.c:70 ../callouts/3g/ggg-plan-dialog.c:111
#: ../callouts/3g/ggg-provider-dialog.c:106
#: ../callouts/3g/ggg-service-dialog.c:106
msgid "Cellular Data Connection Wizard"
@@ -553,4 +536,3 @@
#: ../data/carrick.desktop.in.in.h:1
msgid "Network settings"
msgstr "Сетевые параметры"
-
--- po/sv.po
+++ po/sv.po
@@ -3,9 +3,9 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-12 09:29+0000\n"
+"POT-Creation-Date: 2010-07-03 11:59+0000\n"
"PO-Revision-Date: \n"
-"Last-Translator: Anna-Lena Schon <anna-lenax.schon at intel.com>\n"
+"Last-Translator: Petra Mathilda Klein <klein.mathilda at gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@
#. * The conjunction 'or' will be at the end of a choice of disabled technologies,
#. * for example 'WiFi, WiMAX or 3G.
#.
-#: ../carrick/carrick-list.c:847
+#: ../carrick/carrick-list.c:843
msgid " or "
msgstr " eller "
@@ -28,35 +28,35 @@
#. * Translator note: the comma ',' will be used to join the different disabled technologies
#. * as in the above example; 'WiFi, WiMAX or 3G'
#.
-#: ../carrick/carrick-list.c:852
+#: ../carrick/carrick-list.c:848
msgid ", "
msgstr ", "
-#: ../carrick/carrick-list.c:853
+#: ../carrick/carrick-list.c:849
#: ../carrick/carrick-util.c:34
msgid "wired"
msgstr "uttagsansluten"
#. Switches
-#: ../carrick/carrick-list.c:854
+#: ../carrick/carrick-list.c:850
#: ../carrick/carrick-pane.c:1429
#: ../carrick/carrick-util.c:32
msgid "WiFi"
msgstr "WiFi"
-#: ../carrick/carrick-list.c:855
+#: ../carrick/carrick-list.c:851
#: ../carrick/carrick-pane.c:1471
#: ../carrick/carrick-util.c:38
msgid "WiMAX"
msgstr "WiMAX"
-#: ../carrick/carrick-list.c:856
+#: ../carrick/carrick-list.c:852
#: ../carrick/carrick-pane.c:1457
#: ../carrick/carrick-util.c:36
msgid "3G"
msgstr "3G"
-#: ../carrick/carrick-list.c:857
+#: ../carrick/carrick-list.c:853
#: ../carrick/carrick-pane.c:1485
#: ../carrick/carrick-util.c:40
msgid "Bluetooth"
@@ -67,7 +67,7 @@
#. * are no available networks because ConnMan, the
#. * connectivity daemon, is not running.
#.
-#: ../carrick/carrick-list.c:870
+#: ../carrick/carrick-list.c:866
msgid "Sorry, we can't find any networks. It appears that the connection manager is not running. You could try restarting your computer."
msgstr "Vi kan inte hitta några tillgängliga nätverk. Anslutningshanteraren verkar inte fungera. Försök starta om datorn."
@@ -75,11 +75,11 @@
#. * Hint display if we detect that the system is in
#. * offline mode and there are no available networks
#.
-#: ../carrick/carrick-list.c:880
+#: ../carrick/carrick-list.c:876
msgid "Sorry, we can't find any networks. You could try disabling Offline mode. "
msgstr "Vi kan inte hitta några tillgängliga nätverk. Försök lämna läget offline."
-#: ../carrick/carrick-list.c:1017
+#: ../carrick/carrick-list.c:1013
#, c-format
msgid "Sorry, we can't find any networks. You could try enabling %s."
msgstr "Vi kan inte hitta några tillgängliga nätverk. Försök aktivera %s."
@@ -89,78 +89,78 @@
#. * technologies are turned on, but for whatever reason we
#. * can not find any networks
#.
-#: ../carrick/carrick-list.c:1031
+#: ../carrick/carrick-list.c:1027
msgid "Sorry, we can't find any networks"
msgstr "Vi kan inte hitta några tillgängliga nätverk"
-#: ../carrick/carrick-notification-manager.c:104
+#: ../carrick/carrick-notification-manager.c:124
msgid "Network connected"
msgstr "Nätverk anslutet"
-#: ../carrick/carrick-notification-manager.c:112
+#: ../carrick/carrick-notification-manager.c:132
#, c-format
msgid "You're now connected to a wired network"
msgstr "Du är nu ansluten till ett fast nätverk"
-#: ../carrick/carrick-notification-manager.c:142
+#: ../carrick/carrick-notification-manager.c:162
#, c-format
msgid "You're now connected to %s, a %s network"
msgstr "Du är nu ansluten till %s som är ett %s nätverk"
-#: ../carrick/carrick-notification-manager.c:148
+#: ../carrick/carrick-notification-manager.c:168
#, c-format
msgid "You're now connected to a %s network"
msgstr "Du är nu ansluten till ett %s nätverk"
-#: ../carrick/carrick-notification-manager.c:165
+#: ../carrick/carrick-notification-manager.c:185
msgid "Network lost"
msgstr "Nätverk borttappat"
-#: ../carrick/carrick-notification-manager.c:173
+#: ../carrick/carrick-notification-manager.c:193
#, c-format
msgid "Sorry, we've lost your wired connection"
msgstr "Avbruten anslutning"
-#: ../carrick/carrick-notification-manager.c:177
+#: ../carrick/carrick-notification-manager.c:197
#, c-format
msgid "Sorry we've lost your %s connection to %s"
msgstr "Din %s anslutning till %s avbröts"
-#: ../carrick/carrick-notification-manager.c:183
+#: ../carrick/carrick-notification-manager.c:203
#, c-format
msgid "Sorry, we've lost your %s connection"
msgstr "Din %s anslutning avbröts"
-#: ../carrick/carrick-notification-manager.c:200
+#: ../carrick/carrick-notification-manager.c:220
msgid "Network changed"
msgstr "Nätverk ändrat"
-#: ../carrick/carrick-notification-manager.c:219
+#: ../carrick/carrick-notification-manager.c:239
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to a wired network"
msgstr "Din anslutning till %s avbröts. Vi har istället anslutit dig till ett fast nätverk"
-#: ../carrick/carrick-notification-manager.c:226
+#: ../carrick/carrick-notification-manager.c:246
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to %s, a %s network"
msgstr "Din anslutning till %s avbröts. Vi har istället anslutit dig till %s som är ett %s nätverk"
-#: ../carrick/carrick-notification-manager.c:234
+#: ../carrick/carrick-notification-manager.c:254
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to a %s network"
msgstr "Din anslutning till %s avbröts. Vi har istället anslutit dig till ett %s nätverk"
-#: ../carrick/carrick-notification-manager.c:244
+#: ../carrick/carrick-notification-manager.c:264
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to a wired network"
msgstr "Din %s anslutning avbröts. Vi har istället anslutit dig till ett fast nätverk"
-#: ../carrick/carrick-notification-manager.c:251
+#: ../carrick/carrick-notification-manager.c:271
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to %s, a %s network"
msgstr "Din %s anslutning avbröts. Vi har istället anslutit dig till %s som är ett %s nätverk"
-#: ../carrick/carrick-notification-manager.c:260
+#: ../carrick/carrick-notification-manager.c:280
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to a %s network"
msgstr "Din %s anslutning avbröts. Vi har istället anslutit dig till ett %s nätverk"
@@ -196,7 +196,7 @@
msgstr "Lösenord"
#: ../carrick/carrick-pane.c:731
-#: ../carrick/carrick-service-item.c:1683
+#: ../carrick/carrick-service-item.c:1787
msgid "Show password"
msgstr "Visa lösenord"
@@ -205,7 +205,7 @@
msgstr "Inställningar"
#: ../carrick/carrick-pane.c:1443
-#: ../carrick/carrick-service-item.c:278
+#: ../carrick/carrick-service-item.c:328
msgid "Wired"
msgstr "Använder uttag"
@@ -218,7 +218,7 @@
msgstr "Detta inaktiverar alla dina anslutningar"
#: ../carrick/carrick-pane.c:1556
-#: ../src/carrick.c:351
+#: ../src/carrick.c:369
msgid "Networks"
msgstr "Nätverk"
@@ -254,67 +254,67 @@
#. TRANSLATORS: this is a wireless security method, at least WEP,
#. * WPA and IEEE8021X are possible token values. Example: "WEP encrypted".
#.
-#: ../carrick/carrick-service-item.c:191
+#: ../carrick/carrick-service-item.c:192
#, c-format
msgid "%s encrypted"
msgstr "%s krypterad"
-#: ../carrick/carrick-service-item.c:290
-#: ../carrick/carrick-service-item.c:307
+#: ../carrick/carrick-service-item.c:340
+#: ../carrick/carrick-service-item.c:357
msgid "Disconnect"
msgstr "Koppla från"
-#: ../carrick/carrick-service-item.c:293
+#: ../carrick/carrick-service-item.c:343
msgid "Connected"
msgstr "Ansluten"
-#: ../carrick/carrick-service-item.c:310
+#: ../carrick/carrick-service-item.c:360
msgid "Online"
msgstr "Online"
-#: ../carrick/carrick-service-item.c:317
-#: ../carrick/carrick-service-item.c:326
+#: ../carrick/carrick-service-item.c:367
+#: ../carrick/carrick-service-item.c:376
#, c-format
msgid "Cancel"
msgstr "Avbryt"
-#: ../carrick/carrick-service-item.c:320
+#: ../carrick/carrick-service-item.c:370
msgid "Configuring"
msgstr "Konfigurerar"
-#: ../carrick/carrick-service-item.c:329
+#: ../carrick/carrick-service-item.c:379
msgid "Associating"
msgstr "Associerar"
-#: ../carrick/carrick-service-item.c:338
-#: ../carrick/carrick-service-item.c:363
-#: ../carrick/carrick-service-item.c:1670
+#: ../carrick/carrick-service-item.c:388
+#: ../carrick/carrick-service-item.c:413
+#: ../carrick/carrick-service-item.c:1774
msgid "Connect"
msgstr "Anslut"
-#: ../carrick/carrick-service-item.c:366
+#: ../carrick/carrick-service-item.c:416
msgid "Connection failed"
msgstr "Anslutningsfel"
-#: ../carrick/carrick-service-item.c:369
+#: ../carrick/carrick-service-item.c:419
msgid "Sorry, the connection failed. You could try again."
msgstr "Anslutningsfel. Du kan försöka igen."
-#: ../carrick/carrick-service-item.c:375
-#: ../carrick/carrick-service-item.c:378
+#: ../carrick/carrick-service-item.c:425
+#: ../carrick/carrick-service-item.c:428
#, c-format
msgid "Disconnecting"
msgstr "Kopplar från"
-#: ../carrick/carrick-service-item.c:468
+#: ../carrick/carrick-service-item.c:494
msgid "Type password here"
msgstr "Ange lösenord här"
-#: ../carrick/carrick-service-item.c:537
+#: ../carrick/carrick-service-item.c:563
msgid "Really remove?"
msgstr "Radera - är du säker?"
-#: ../carrick/carrick-service-item.c:557
+#: ../carrick/carrick-service-item.c:583
#, c-format
msgid ""
"Do you want to remove the %s %s network? This\n"
@@ -325,54 +325,54 @@
"lösenordet glöms bort och du kommer inte\n"
"längre automatiskt att anslutas till %s."
-#: ../carrick/carrick-service-item.c:753
+#: ../carrick/carrick-service-item.c:786
#, c-format
msgid "Your password isn't the right length. For a WEP connection it needs to be either 10 or 26 characters, you have %i."
msgstr "Ditt lösenord har inte rätt längd. För en WEP-anslutning måste det vara antingen 10 eller 26 tecken, du har %i."
-#: ../carrick/carrick-service-item.c:764
+#: ../carrick/carrick-service-item.c:797
#, c-format
msgid "Your password is too short. For a WPA connection it needs to be at least 8 characters long, you have %i"
msgstr "Ditt lösenord är för kort. För en WPA-anslutning måste det vara minst 8 tecken långt, du har %i."
-#: ../carrick/carrick-service-item.c:768
+#: ../carrick/carrick-service-item.c:801
#, c-format
msgid "Your password is too long. For a WPA connection it needs to have fewer than 63 characters, you have %i"
msgstr "Ditt lösenord är för långt. För en WPA-anslutning måste det vara färre än 63 tecken långt, du har %i"
-#: ../carrick/carrick-service-item.c:777
+#: ../carrick/carrick-service-item.c:810
#, c-format
msgid "Your password is too short. For a WPA2 connection it needs to be at least 8 characters long, you have %i"
msgstr "Ditt lösenord är för kort. För en WPA2-anslutning måste det vara minst 8 tecken långt, du har %i."
-#: ../carrick/carrick-service-item.c:781
+#: ../carrick/carrick-service-item.c:814
#, c-format
msgid "Your password is too long. For a WPA2 connection it needs to have fewer than 63 characters, you have %i"
msgstr "Ditt lösenord är för långt. För en WPA2-anslutning måste det vara färre än 63 tecken långt, du har %i"
-#: ../carrick/carrick-service-item.c:1227
+#: ../carrick/carrick-service-item.c:1267
msgid "Sorry, it looks like the IP address is not valid"
msgstr "Det verkar som att IP adressen inte är giltig"
-#: ../carrick/carrick-service-item.c:1239
+#: ../carrick/carrick-service-item.c:1279
msgid "Sorry, it looks like the gateway address is not valid"
msgstr "Det verkar som att gateway adressen inte är giltig"
-#: ../carrick/carrick-service-item.c:1251
+#: ../carrick/carrick-service-item.c:1291
msgid "Sorry, it looks like the subnet mask is not valid"
msgstr "Det verkar som att subnet masken inte är giltig"
-#: ../carrick/carrick-service-item.c:1271
+#: ../carrick/carrick-service-item.c:1336
#, c-format
msgid "Sorry, it looks like the nameserver address '%s' is not valid"
msgstr "Det verkar som att namnserver adressen '%s' inte är giltig"
#. TRANSLATORS: label for the Advanced expander in a service item
-#: ../carrick/carrick-service-item.c:1594
+#: ../carrick/carrick-service-item.c:1698
msgid "Advanced"
msgstr "Avancerad"
-#: ../carrick/carrick-service-item.c:1604
+#: ../carrick/carrick-service-item.c:1708
msgid "Scanning"
msgstr "Skannar"
@@ -380,107 +380,107 @@
#. TRANSLATORS: This is an example of a wireless security method
#. (see another translator comment), used to estimate the string length.
#. It should look like the ones below network name in the UI
-#: ../carrick/carrick-service-item.c:1625
+#: ../carrick/carrick-service-item.c:1729
msgid "WPA2 encrypted"
msgstr "WPA2-krypterat"
#. TRANSLATORS: label in advanced settings (next to combobox
#. * for DHCP/Static IP)
-#: ../carrick/carrick-service-item.c:1732
+#: ../carrick/carrick-service-item.c:1836
msgid "Connect by:"
msgstr "Anslut:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1734
+#: ../carrick/carrick-service-item.c:1838
msgid "IP address:"
msgstr "IP adress:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1736
+#: ../carrick/carrick-service-item.c:1840
msgid "Subnet mask:"
msgstr "Subnet mask:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1738
+#: ../carrick/carrick-service-item.c:1842
msgid "Router:"
msgstr "Router:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1740
+#: ../carrick/carrick-service-item.c:1844
msgid "DNS:"
msgstr "DNS:"
-#: ../carrick/carrick-service-item.c:1747
+#: ../carrick/carrick-service-item.c:1850
msgid "DHCP"
msgstr "DHCP"
-#: ../carrick/carrick-service-item.c:1749
+#: ../carrick/carrick-service-item.c:1852
msgid "Static IP"
msgstr "Statisk IP"
#. TRANSLATORS: label for apply button in static ip settings
-#: ../carrick/carrick-service-item.c:1776
+#: ../carrick/carrick-service-item.c:1902
msgid "Apply"
msgstr "Verkställ"
-#: ../src/carrick.c:43
+#: ../src/carrick.c:49
msgid "networks - not connected"
msgstr "nätverk - inte ansluten"
-#: ../src/carrick.c:49
+#: ../src/carrick.c:55
msgid "networks - connecting"
msgstr "nätverk - ansluter"
-#: ../src/carrick.c:55
+#: ../src/carrick.c:61
msgid "networks - wired"
msgstr "nätverk - uttag"
-#: ../src/carrick.c:57
+#: ../src/carrick.c:63
#, c-format
msgid "networks - %s - wifi"
msgstr "nätverk - %s - WiFi"
-#: ../src/carrick.c:60
+#: ../src/carrick.c:66
#, c-format
msgid "networks - %s - wimax"
msgstr "nätverk - %s - WiMAX"
-#: ../src/carrick.c:63
+#: ../src/carrick.c:69
#, c-format
msgid "networks - %s - 3G"
msgstr "nätverk - %s - 3G"
-#: ../src/carrick.c:66
+#: ../src/carrick.c:72
#, c-format
msgid "networks - %s - bluetooth"
msgstr "nätverk - %s - bluetooth"
-#: ../src/carrick.c:69
-#: ../src/carrick.c:81
+#: ../src/carrick.c:75
+#: ../src/carrick.c:87
msgid "networks"
msgstr "nätverk"
-#: ../src/carrick.c:76
+#: ../src/carrick.c:82
msgid "networks - error"
msgstr "nätverk - fel"
-#: ../src/carrick.c:279
+#: ../src/carrick.c:297
msgid "Run in standalone mode"
msgstr "Kör i fristående läge "
-#: ../src/carrick.c:281
+#: ../src/carrick.c:299
msgid "Embed in another window (overrides --standalone)"
msgstr "Bädda in i annat fönster (åsidosättningar - fristående)"
-#: ../src/carrick.c:292
+#: ../src/carrick.c:310
msgid "Carrick connectivity applet"
msgstr "Carrick anslutningsmodul"
-#: ../src/carrick.c:293
-msgid "- Moblin connectivity applet"
-msgstr "-Moblin anslutningsmodul"
+#: ../src/carrick.c:311
+msgid "- MeeGo connectivity applet"
+msgstr "-MeeGo anslutningsmodul"
-#: ../src/carrick.c:334
+#: ../src/carrick.c:352
#: ../data/carrick.desktop.in.in.h:2
msgid "network"
msgstr "nätverk"
@@ -491,7 +491,7 @@
#: ../callouts/3g/ggg-provider-dialog.c:106
#: ../callouts/3g/ggg-service-dialog.c:106
msgid "Cellular Data Connection Wizard"
-msgstr "Anslutningsguide för mobidata"
+msgstr "Anslutningsguide för mobildata"
#: ../callouts/3g/ggg-country-dialog.c:93
msgid "Select Country"
--- po/zh_CN.po
+++ po/zh_CN.po
@@ -2,12 +2,12 @@
# Copyright (C) 2009 Intel
# This file is distributed under the same license as the PACKAGE package.
# Zhu Yanhai <yanhai.zhu at linux.intel.com>, 2009.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: carrick\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-12 09:29+0000\n"
+"POT-Creation-Date: 2010-07-03 11:59+0000\n"
"PO-Revision-Date: 2010-05-12 13:40-0800\n"
"Last-Translator: mackey tian <mackeyx.tian at ptiglobal.net>\n"
"Language-Team: zh_CN\n"
@@ -15,153 +15,146 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#.
-#. * Translator note: The disabled technologies available to be turned on is put together at
+#. * Translator note: The disabled technologies available to be turned on is
+#. put together at
#. * runtime.
-#. * The conjunction 'or' will be at the end of a choice of disabled technologies,
+#. * The conjunction 'or' will be at the end of a choice of disabled
+#. technologies,
#. * for example 'WiFi, WiMAX or 3G.
-#.
-#: ../carrick/carrick-list.c:847
+#.
+#: ../carrick/carrick-list.c:843
msgid " or "
msgstr "或者"
-#.
-#. * Translator note: the comma ',' will be used to join the different disabled technologies
+#. * Translator note: the comma ',' will be used to join the different
+#. disabled technologies
#. * as in the above example; 'WiFi, WiMAX or 3G'
-#.
-#: ../carrick/carrick-list.c:852
+#.
+#: ../carrick/carrick-list.c:848
msgid ", "
msgstr "，"
-#: ../carrick/carrick-list.c:853
-#: ../carrick/carrick-util.c:34
+#: ../carrick/carrick-list.c:849 ../carrick/carrick-util.c:34
msgid "wired"
msgstr "有线"
#. Switches
-#: ../carrick/carrick-list.c:854
-#: ../carrick/carrick-pane.c:1429
+#: ../carrick/carrick-list.c:850 ../carrick/carrick-pane.c:1429
#: ../carrick/carrick-util.c:32
msgid "WiFi"
msgstr "WiFi"
-#: ../carrick/carrick-list.c:855
-#: ../carrick/carrick-pane.c:1471
+#: ../carrick/carrick-list.c:851 ../carrick/carrick-pane.c:1471
#: ../carrick/carrick-util.c:38
msgid "WiMAX"
msgstr "WiMAX"
-#: ../carrick/carrick-list.c:856
-#: ../carrick/carrick-pane.c:1457
+#: ../carrick/carrick-list.c:852 ../carrick/carrick-pane.c:1457
#: ../carrick/carrick-util.c:36
msgid "3G"
msgstr "3G"
-#: ../carrick/carrick-list.c:857
-#: ../carrick/carrick-pane.c:1485
+#: ../carrick/carrick-list.c:853 ../carrick/carrick-pane.c:1485
#: ../carrick/carrick-util.c:40
msgid "Bluetooth"
msgstr "蓝牙"
-#.
#. * Translators: this string is displayed if there
#. * are no available networks because ConnMan, the
#. * connectivity daemon, is not running.
-#.
-#: ../carrick/carrick-list.c:870
+#.
+#: ../carrick/carrick-list.c:866
msgid "Sorry, we can't find any networks. It appears that the connection manager is not running. You could try restarting your computer."
msgstr "抱歉，我们无法找到任何网络连接。看来连接管理器没有在运行。您可能需要重启电脑。"
-#.
#. * Hint display if we detect that the system is in
#. * offline mode and there are no available networks
-#.
-#: ../carrick/carrick-list.c:880
+#.
+#: ../carrick/carrick-list.c:876
msgid "Sorry, we can't find any networks. You could try disabling Offline mode. "
msgstr "抱歉，我们无法找到任何网络连接。您可以尝试关闭离线模式。"
-#: ../carrick/carrick-list.c:1017
+#: ../carrick/carrick-list.c:1013
#, c-format
msgid "Sorry, we can't find any networks. You could try enabling %s."
msgstr "抱歉，我们无法找到任何网络。您可以尝试启动 %s。"
-#.
#. * Generic message to display if all available networking
#. * technologies are turned on, but for whatever reason we
#. * can not find any networks
-#.
-#: ../carrick/carrick-list.c:1031
+#.
+#: ../carrick/carrick-list.c:1027
msgid "Sorry, we can't find any networks"
msgstr "抱歉，无法找到任何网络连接。"
-#: ../carrick/carrick-notification-manager.c:104
+#: ../carrick/carrick-notification-manager.c:124
msgid "Network connected"
msgstr "网络已连接"
-#: ../carrick/carrick-notification-manager.c:112
+#: ../carrick/carrick-notification-manager.c:132
#, c-format
msgid "You're now connected to a wired network"
msgstr "您现在已经连至一个有线网络"
-#: ../carrick/carrick-notification-manager.c:142
+#: ../carrick/carrick-notification-manager.c:162
#, c-format
msgid "You're now connected to %s, a %s network"
msgstr "您现在已经连接至%s，一个%s网络"
-#: ../carrick/carrick-notification-manager.c:148
+#: ../carrick/carrick-notification-manager.c:168
#, c-format
msgid "You're now connected to a %s network"
msgstr "您现在已经连接至一个%s网络"
-#: ../carrick/carrick-notification-manager.c:165
+#: ../carrick/carrick-notification-manager.c:185
msgid "Network lost"
msgstr "找不到网络"
-#: ../carrick/carrick-notification-manager.c:173
+#: ../carrick/carrick-notification-manager.c:193
#, c-format
msgid "Sorry, we've lost your wired connection"
msgstr "抱歉，您的有线连接出问题了"
-#: ../carrick/carrick-notification-manager.c:177
+#: ../carrick/carrick-notification-manager.c:197
#, c-format
msgid "Sorry we've lost your %s connection to %s"
msgstr "抱歉，您的 %s 连接出问题了，它原来连接至 %s"
-#: ../carrick/carrick-notification-manager.c:183
+#: ../carrick/carrick-notification-manager.c:203
#, c-format
msgid "Sorry, we've lost your %s connection"
msgstr "抱歉，您的 %s 连接出问题了"
-#: ../carrick/carrick-notification-manager.c:200
+#: ../carrick/carrick-notification-manager.c:220
msgid "Network changed"
msgstr "网络已改变"
-#: ../carrick/carrick-notification-manager.c:219
+#: ../carrick/carrick-notification-manager.c:239
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to a wired network"
msgstr "抱歉，您连接至 %s 的连接出问题了。所以现在将连接至有线网络。"
-#: ../carrick/carrick-notification-manager.c:226
+#: ../carrick/carrick-notification-manager.c:246
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to %s, a %s network"
msgstr "抱歉，您连接至 %s 的连接出问题了。现在将您连至 %s，一个 %s 网络。"
-#: ../carrick/carrick-notification-manager.c:234
+#: ../carrick/carrick-notification-manager.c:254
#, c-format
msgid "Sorry, your connection to %s was lost. So we've connected you to a %s network"
msgstr "抱歉，您连接至 %s 的连接出问题了。现在将您连至一个 %s 网络。"
-#: ../carrick/carrick-notification-manager.c:244
+#: ../carrick/carrick-notification-manager.c:264
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to a wired network"
msgstr "抱歉，您的 %s 连接出问题了。现在将您连至有线网络。"
-#: ../carrick/carrick-notification-manager.c:251
+#: ../carrick/carrick-notification-manager.c:271
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to %s, a %s network"
msgstr "抱歉，您的 %s 连接出问题了。现在将您连至%s，一个 %s 网络。"
-#: ../carrick/carrick-notification-manager.c:260
+#: ../carrick/carrick-notification-manager.c:280
#, c-format
msgid "Sorry, your %s connection was lost. So we've connected you to a %s network"
msgstr "抱歉，您的 %s 连接出问题了。现在将您连至一个 %s 网络。"
@@ -193,8 +186,7 @@
msgid "Password"
msgstr "密码"
-#: ../carrick/carrick-pane.c:731
-#: ../carrick/carrick-service-item.c:1683
+#: ../carrick/carrick-pane.c:731 ../carrick/carrick-service-item.c:1787
msgid "Show password"
msgstr "显示密码"
@@ -202,8 +194,7 @@
msgid "Settings"
msgstr "设置"
-#: ../carrick/carrick-pane.c:1443
-#: ../carrick/carrick-service-item.c:278
+#: ../carrick/carrick-pane.c:1443 ../carrick/carrick-service-item.c:328
msgid "Wired"
msgstr "有线"
@@ -215,8 +206,7 @@
msgid "This will disable all your connections"
msgstr "这将关闭您的所有连接"
-#: ../carrick/carrick-pane.c:1556
-#: ../src/carrick.c:351
+#: ../carrick/carrick-pane.c:1556 ../src/carrick.c:369
msgid "Networks"
msgstr "网络"
@@ -228,7 +218,7 @@
#. Translators:
#. The following are potential errors that a user might see while
#. attempting to configure a 3G data service.
-#.
+#.
#: ../carrick/carrick-service-item.c:51
msgid "Critical Error: Invalid country code"
msgstr "严重错误：无效的国家代码"
@@ -251,68 +241,64 @@
#. TRANSLATORS: this is a wireless security method, at least WEP,
#. * WPA and IEEE8021X are possible token values. Example: "WEP encrypted".
-#.
-#: ../carrick/carrick-service-item.c:191
+#.
+#: ../carrick/carrick-service-item.c:192
#, c-format
msgid "%s encrypted"
msgstr "%s 已加密"
-#: ../carrick/carrick-service-item.c:290
-#: ../carrick/carrick-service-item.c:307
+#: ../carrick/carrick-service-item.c:340 ../carrick/carrick-service-item.c:357
msgid "Disconnect"
msgstr "断开连接"
-#: ../carrick/carrick-service-item.c:293
+#: ../carrick/carrick-service-item.c:343
msgid "Connected"
msgstr "已连接"
-#: ../carrick/carrick-service-item.c:310
+#: ../carrick/carrick-service-item.c:360
msgid "Online"
msgstr "在线"
-#: ../carrick/carrick-service-item.c:317
-#: ../carrick/carrick-service-item.c:326
+#: ../carrick/carrick-service-item.c:367 ../carrick/carrick-service-item.c:376
#, c-format
msgid "Cancel"
msgstr "取消"
-#: ../carrick/carrick-service-item.c:320
+#: ../carrick/carrick-service-item.c:370
msgid "Configuring"
msgstr "配置"
-#: ../carrick/carrick-service-item.c:329
+#: ../carrick/carrick-service-item.c:379
msgid "Associating"
msgstr "正在连接"
-#: ../carrick/carrick-service-item.c:338
-#: ../carrick/carrick-service-item.c:363
-#: ../carrick/carrick-service-item.c:1670
+#: ../carrick/carrick-service-item.c:388 ../carrick/carrick-service-item.c:413
+#: ../carrick/carrick-service-item.c:1774
msgid "Connect"
msgstr "连接"
-#: ../carrick/carrick-service-item.c:366
+#: ../carrick/carrick-service-item.c:416
msgid "Connection failed"
msgstr "连接失败"
-#: ../carrick/carrick-service-item.c:369
+#: ../carrick/carrick-service-item.c:419
msgid "Sorry, the connection failed. You could try again."
msgstr "抱歉，连接失败。您可以再试一次。"
-#: ../carrick/carrick-service-item.c:375
-#: ../carrick/carrick-service-item.c:378
+#: ../carrick/carrick-service-item.c:425 ../carrick/carrick-service-item.c:428
#, c-format
msgid "Disconnecting"
msgstr "断开连接"
-#: ../carrick/carrick-service-item.c:468
+#: ../carrick/carrick-service-item.c:494
msgid "Type password here"
msgstr "请在此处输入密码"
-#: ../carrick/carrick-service-item.c:537
+#: ../carrick/carrick-service-item.c:563
msgid "Really remove?"
msgstr "真的要删除吗?"
-#: ../carrick/carrick-service-item.c:557
+#: ../carrick/carrick-service-item.c:583
#, c-format
msgid ""
"Do you want to remove the %s %s network? This\n"
@@ -322,54 +308,54 @@
"您想删除网络连接 %s %s 吗? 这样系统会同时删除为该连接保存\n"
"的密码，并且您将不再会被自动连接至%s。"
-#: ../carrick/carrick-service-item.c:753
+#: ../carrick/carrick-service-item.c:786
#, c-format
msgid "Your password isn't the right length. For a WEP connection it needs to be either 10 or 26 characters, you have %i."
msgstr "您的密码长度不正确。对于 WEP 连接，需要 10 或 26 个字符，您有 %i 个。"
-#: ../carrick/carrick-service-item.c:764
+#: ../carrick/carrick-service-item.c:797
#, c-format
msgid "Your password is too short. For a WPA connection it needs to be at least 8 characters long, you have %i"
msgstr "您的密码太短了。对于 WPA 连接，需要至少 8 个字符，您只有 %i 个。"
-#: ../carrick/carrick-service-item.c:768
+#: ../carrick/carrick-service-item.c:801
#, c-format
msgid "Your password is too long. For a WPA connection it needs to have fewer than 63 characters, you have %i"
msgstr "您的密码太长了。对于 WPA 连接，需要少于 63 个字符，您有 %i 个。"
-#: ../carrick/carrick-service-item.c:777
+#: ../carrick/carrick-service-item.c:810
#, c-format
msgid "Your password is too short. For a WPA2 connection it needs to be at least 8 characters long, you have %i"
msgstr "您的密码太短了。对于 WPA2 连接，需要至少 8 个字符，您有 %i 个。"
-#: ../carrick/carrick-service-item.c:781
+#: ../carrick/carrick-service-item.c:814
#, c-format
msgid "Your password is too long. For a WPA2 connection it needs to have fewer than 63 characters, you have %i"
msgstr "您的密码太长了。对于 WPA2 连接，需要少于 63 个字符，您有 %i 个。"
-#: ../carrick/carrick-service-item.c:1227
+#: ../carrick/carrick-service-item.c:1267
msgid "Sorry, it looks like the IP address is not valid"
msgstr "对不起，IP 地址可能无效"
-#: ../carrick/carrick-service-item.c:1239
+#: ../carrick/carrick-service-item.c:1279
msgid "Sorry, it looks like the gateway address is not valid"
msgstr "对不起，网关地址可能无效"
-#: ../carrick/carrick-service-item.c:1251
+#: ../carrick/carrick-service-item.c:1291
msgid "Sorry, it looks like the subnet mask is not valid"
msgstr "对不起，子网掩码可能无效"
-#: ../carrick/carrick-service-item.c:1271
+#: ../carrick/carrick-service-item.c:1336
#, c-format
msgid "Sorry, it looks like the nameserver address '%s' is not valid"
msgstr "对不起，域名服务器地址“%s”可能无效"
#. TRANSLATORS: label for the Advanced expander in a service item
-#: ../carrick/carrick-service-item.c:1594
+#: ../carrick/carrick-service-item.c:1698
msgid "Advanced"
msgstr "高级"
-#: ../carrick/carrick-service-item.c:1604
+#: ../carrick/carrick-service-item.c:1708
msgid "Scanning"
msgstr "正在扫描"
@@ -377,114 +363,111 @@
#. TRANSLATORS: This is an example of a wireless security method
#. (see another translator comment), used to estimate the string length.
#. It should look like the ones below network name in the UI
-#: ../carrick/carrick-service-item.c:1625
+#: ../carrick/carrick-service-item.c:1729
msgid "WPA2 encrypted"
msgstr "WPA2 已加密"
#. TRANSLATORS: label in advanced settings (next to combobox
#. * for DHCP/Static IP)
-#: ../carrick/carrick-service-item.c:1732
+#: ../carrick/carrick-service-item.c:1836
msgid "Connect by:"
msgstr "连接："
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1734
+#: ../carrick/carrick-service-item.c:1838
msgid "IP address:"
msgstr "IP 地址："
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1736
+#: ../carrick/carrick-service-item.c:1840
msgid "Subnet mask:"
msgstr "子网掩码："
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1738
+#: ../carrick/carrick-service-item.c:1842
msgid "Router:"
msgstr "路由器："
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1740
+#: ../carrick/carrick-service-item.c:1844
msgid "DNS:"
msgstr "DNS："
-#: ../carrick/carrick-service-item.c:1747
+#: ../carrick/carrick-service-item.c:1850
msgid "DHCP"
msgstr "DHCP"
-#: ../carrick/carrick-service-item.c:1749
+#: ../carrick/carrick-service-item.c:1852
msgid "Static IP"
msgstr "静态 IP"
#. TRANSLATORS: label for apply button in static ip settings
-#: ../carrick/carrick-service-item.c:1776
+#: ../carrick/carrick-service-item.c:1902
msgid "Apply"
msgstr "应用"
-#: ../src/carrick.c:43
+#: ../src/carrick.c:49
msgid "networks - not connected"
msgstr "网络 - 未连接"
-#: ../src/carrick.c:49
+#: ../src/carrick.c:55
msgid "networks - connecting"
msgstr "网络 - 正在连接"
-#: ../src/carrick.c:55
+#: ../src/carrick.c:61
msgid "networks - wired"
msgstr "网络 - 有线"
-#: ../src/carrick.c:57
+#: ../src/carrick.c:63
#, c-format
msgid "networks - %s - wifi"
msgstr "网络 - %s - WiFi"
-#: ../src/carrick.c:60
+#: ../src/carrick.c:66
#, c-format
msgid "networks - %s - wimax"
msgstr "网络 - %s - WiMAX"
-#: ../src/carrick.c:63
+#: ../src/carrick.c:69
#, c-format
msgid "networks - %s - 3G"
msgstr "网络 - %s - 3G"
-#: ../src/carrick.c:66
+#: ../src/carrick.c:72
#, c-format
msgid "networks - %s - bluetooth"
msgstr "网络 - %s - 蓝牙"
-#: ../src/carrick.c:69
-#: ../src/carrick.c:81
+#: ../src/carrick.c:75 ../src/carrick.c:87
msgid "networks"
msgstr "网络"
-#: ../src/carrick.c:76
+#: ../src/carrick.c:82
msgid "networks - error"
msgstr "网络 - 错误"
-#: ../src/carrick.c:279
+#: ../src/carrick.c:297
msgid "Run in standalone mode"
msgstr "以独立模式运行"
-#: ../src/carrick.c:281
+#: ../src/carrick.c:299
msgid "Embed in another window (overrides --standalone)"
msgstr "嵌入在另一个窗口（覆盖 - 单机）"
-#: ../src/carrick.c:292
+#: ../src/carrick.c:310
msgid "Carrick connectivity applet"
msgstr "Carrick 连接小程序"
-#: ../src/carrick.c:293
-msgid "- Moblin connectivity applet"
-msgstr "- Moblin 连接小程序"
+#: ../src/carrick.c:311
+msgid "- MeeGo connectivity applet"
+msgstr "- MeeGo 连接小程序"
-#: ../src/carrick.c:334
-#: ../data/carrick.desktop.in.in.h:2
+#: ../src/carrick.c:352 ../data/carrick.desktop.in.in.h:2
msgid "network"
msgstr "网络"
#: ../callouts/3g/ggg-country-dialog.c:73
-#: ../callouts/3g/ggg-manual-dialog.c:70
-#: ../callouts/3g/ggg-plan-dialog.c:111
+#: ../callouts/3g/ggg-manual-dialog.c:70 ../callouts/3g/ggg-plan-dialog.c:111
#: ../callouts/3g/ggg-provider-dialog.c:106
#: ../callouts/3g/ggg-service-dialog.c:106
msgid "Cellular Data Connection Wizard"
@@ -551,39 +534,27 @@
#~ msgstr "手动配置"
#~ msgid "Sorry, we can't find any networks. You could try turning on 3G."
-#~ msgstr ""
-#~ "抱歉，我们无法找到任何网络连接。您也许可以检查一下3G网络开关是否打开。"
+#~ msgstr "抱歉，我们无法找到任何网络连接。您也许可以检查一下3G网络开关是否打开。"
-#~ msgid ""
-#~ "Sorry, we can't find any networks. It appears that the ConnMan daemon is "
-#~ "not running. You could try re-starting your netbook."
-#~ msgstr ""
-#~ "抱歉，我们无法找到任何网络连接。ConnMan守护进程似乎没有运行。您可能需要重"
-#~ "启您的上网本。"
+#~ msgid "Sorry, we can't find any networks. It appears that the ConnMan daemon is not running. You could try re-starting your netbook."
+#~ msgstr "抱歉，我们无法找到任何网络连接。ConnMan守护进程似乎没有运行。您可能需要重启您的上网本。"
#~ msgid "Sorry, we can't find any networks. You could try turning on WiFi."
-#~ msgstr ""
-#~ "抱歉，我们无法找到任何网络连接。您也许可以检查一下无线网络开关是否打开。"
+#~ msgstr "抱歉，我们无法找到任何网络连接。您也许可以检查一下无线网络开关是否打开。"
#~ msgid "Sorry, we can't find any networks. You could try turning on WiMAX."
-#~ msgstr ""
-#~ "抱歉，我们无法找到任何网络连接。您也许可以检查一下无线网络开关是否打开。"
+#~ msgstr "抱歉，我们无法找到任何网络连接。您也许可以检查一下无线网络开关是否打开。"
-#~ msgid ""
-#~ "Sorry, we can't find any networks. You could try turning on Bluetooth."
-#~ msgstr ""
-#~ "抱歉，我们无法找到任何网络连接。您也许可以检查一下蓝牙开关是否打开。"
+#~ msgid "Sorry, we can't find any networks. You could try turning on Bluetooth."
+#~ msgstr "抱歉，我们无法找到任何网络连接。您也许可以检查一下蓝牙开关是否打开。"
#~ msgid "Sorry, we can't find any networks. You could try turning on Wired."
-#~ msgstr ""
-#~ "抱歉，我们无法找到任何网络连接。您也许可以检查一下网络是否已经插好。"
+#~ msgstr "抱歉，我们无法找到任何网络连接。您也许可以检查一下网络是否已经插好。"
#~ msgid "Sorry, we can't find any networks. "
#~ msgstr "抱歉，一个网络连接也没找到。"
-#~ msgid ""
-#~ "The ConnMan daemon doesn't seem to be running. You may want to try re-"
-#~ "starting your device"
+#~ msgid "The ConnMan daemon doesn't seem to be running. You may want to try re-starting your device"
#~ msgstr "ConnMan守护进程似乎没有运行。您可能需要重启您的设备。"
#~ msgid "You could try disabling Offline mode"
--- src/Makefile.in
+++ src/Makefile.in
@@ -147,6 +147,8 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GCONF_CFLAGS = @GCONF_CFLAGS@
+GCONF_LIBS = @GCONF_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
--- src/carrick.c
+++ src/carrick.c
@@ -46,6 +46,9 @@
if (g_str_equal (state, "idle"))
{
+ /* TRANSLATORS: Tooltips for the toolbar icon
+ * The possible placeholder is service name (such as
+ * a wireless network name) */
tip = g_strdup (_("networks - not connected"));
*icon_state = ICON_OFFLINE;
}
@@ -71,6 +74,9 @@
else if (g_str_equal (connection_type, "bluetooth"))
tip = g_strdup_printf (_("networks - %s - bluetooth"),
connection_name);
+ else if (g_str_equal (connection_type, "vpn"))
+ tip = g_strdup_printf (_("networks - %s - VPN"),
+ connection_name);
else
tip = g_strdup (_("networks"));
@@ -100,10 +106,8 @@
static MplPanelClient *panel_client = NULL;
static void
-_client_set_size_cb (MplPanelClient *client,
- guint width,
- guint height,
- gpointer user_data)
+_client_show_cb (MplPanelClient *client,
+ gpointer user_data)
{
CarrickApplet *applet = CARRICK_APPLET (user_data);
CarrickPane *pane = CARRICK_PANE (carrick_applet_get_pane (applet));
@@ -154,6 +158,13 @@
mpl_panel_client_hide (panel_client);
}
+void
+carrick_shell_show (void)
+{
+ if (panel_client)
+ mpl_panel_client_show (panel_client);
+}
+
static void
panel_hide_cb (MplPanelClient *panel_client, gpointer user_data)
{
@@ -354,8 +365,8 @@
"offline",
TRUE);
g_signal_connect (panel_client,
- "set-size",
- (GCallback) _client_set_size_cb,
+ "show",
+ (GCallback) _client_show_cb,
applet);
window = mpl_panel_gtk_get_window (MPL_PANEL_GTK (panel_client));
--- tests/Makefile.in
+++ tests/Makefile.in
@@ -116,6 +116,8 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GCONF_CFLAGS = @GCONF_CFLAGS@
+GCONF_LIBS = @GCONF_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
++++++ meego-panel-networks.yaml
--- meego-panel-networks.yaml
+++ meego-panel-networks.yaml
@@ -1,6 +1,6 @@
Name: meego-panel-networks
Summary: Connection management panel
-Version: 1.2.14
+Version: 1.2.16
Release: 1
Group: Applications/Internet
License: GPL 2
@@ -18,6 +18,7 @@
PkgConfigBR:
- gtk+-2.0
- dbus-glib-1
+ - gconf-2.0
- libnotify
- mx-gtk-1.0
- meego-panel >= 0.49.0
More information about the MeeGo-commits
mailing list