[meego-commits] 6358: Changes to Trunk:Netbook/meego-panel-networks
Rob Bradford
rob at linux.intel.com
Fri Aug 6 16:59:51 UTC 2010
Hi,
I have made the following changes to meego-panel-networks in project Trunk:Netbook. Please review and accept ASAP.
Thank You,
Rob Bradford
[This message was auto-generated]
---
Request #6358:
submit: devel:ux:netbook/meego-panel-networks(r3) -> Trunk:Netbook/meego-panel-networks
Message:
None
State: new 2010-08-06T04:51:53 rbradford
Comment: None
changes files:
--------------
--- meego-panel-networks.changes
+++ meego-panel-networks.changes
@@ -0,0 +1,4 @@
+* Thu Aug 05 2010 Ross Burton <ross at linux.intel.com> - 1.2.14
+- Update to rest-0.7
+- Translations
+
old:
----
meego-panel-networks-1.2.13.tar.gz
new:
----
meego-panel-networks-1.2.14.tar.gz
spec files:
-----------
--- meego-panel-networks.spec
+++ meego-panel-networks.spec
@@ -7,7 +7,7 @@
Name: meego-panel-networks
Summary: Connection management panel
-Version: 1.2.13
+Version: 1.2.14
Release: 1
Group: Applications/Internet
License: GPL 2
@@ -22,7 +22,7 @@
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(mx-gtk-1.0)
BuildRequires: pkgconfig(meego-panel) >= 0.49.0
-BuildRequires: pkgconfig(rest-0.6)
+BuildRequires: pkgconfig(rest-0.7)
BuildRequires: pkgconfig(mobile-broadband-provider-info)
BuildRequires: pkgconfig(iso-codes)
BuildRequires: intltool
other changes:
--------------
++++++ meego-panel-networks-1.2.13.tar.gz -> meego-panel-networks-1.2.14.tar.gz
--- carrick/connman-marshal.c
+++ carrick/connman-marshal.c
@@ -21,6 +21,7 @@
#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
@@ -44,6 +45,7 @@
#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 */
--- configure
+++ configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for meego-panel-networks 1.2.13.
+# Generated by GNU Autoconf 2.65 for meego-panel-networks 1.2.14.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -698,8 +698,8 @@
# Identity of this package.
PACKAGE_NAME='meego-panel-networks'
PACKAGE_TARNAME='meego-panel-networks'
-PACKAGE_VERSION='1.2.13'
-PACKAGE_STRING='meego-panel-networks 1.2.13'
+PACKAGE_VERSION='1.2.14'
+PACKAGE_STRING='meego-panel-networks 1.2.14'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1491,7 +1491,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.13 to adapt to many kinds of systems.
+\`configure' configures meego-panel-networks 1.2.14 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1562,7 +1562,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of meego-panel-networks 1.2.13:";;
+ short | recursive ) echo "Configuration of meego-panel-networks 1.2.14:";;
esac
cat <<\_ACEOF
@@ -1684,7 +1684,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-meego-panel-networks configure 1.2.13
+meego-panel-networks configure 1.2.14
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2049,7 +2049,7 @@
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.13, which was
+It was created by meego-panel-networks $as_me 1.2.14, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2857,7 +2857,7 @@
# Define the identity of the package.
PACKAGE=meego-panel-networks
- VERSION=1.2.13
+ VERSION=1.2.14
cat >>confdefs.h <<_ACEOF
@@ -13605,12 +13605,12 @@
pkg_cv_REST_CFLAGS="$REST_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rest-0.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "rest-0.6") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rest-0.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "rest-0.7") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_REST_CFLAGS=`$PKG_CONFIG --cflags "rest-0.6" 2>/dev/null`
+ pkg_cv_REST_CFLAGS=`$PKG_CONFIG --cflags "rest-0.7" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -13621,12 +13621,12 @@
pkg_cv_REST_LIBS="$REST_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rest-0.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "rest-0.6") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rest-0.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "rest-0.7") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_REST_LIBS=`$PKG_CONFIG --libs "rest-0.6" 2>/dev/null`
+ pkg_cv_REST_LIBS=`$PKG_CONFIG --libs "rest-0.7" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -13646,14 +13646,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- REST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "rest-0.6" 2>&1`
+ REST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "rest-0.7" 2>&1`
else
- REST_PKG_ERRORS=`$PKG_CONFIG --print-errors "rest-0.6" 2>&1`
+ REST_PKG_ERRORS=`$PKG_CONFIG --print-errors "rest-0.7" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$REST_PKG_ERRORS" >&5
- as_fn_error "Package requirements (rest-0.6) were not met:
+ as_fn_error "Package requirements (rest-0.7) were not met:
$REST_PKG_ERRORS
@@ -14417,7 +14417,7 @@
# 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.13, which was
+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
CONFIG_FILES = $CONFIG_FILES
@@ -14483,7 +14483,7 @@
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.13
+meego-panel-networks config.status 1.2.14
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
--- configure.ac
+++ configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.53)
-AC_INIT(meego-panel-networks, 1.2.13)
+AC_INIT(meego-panel-networks, 1.2.14)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_CONFIG_HEADER(config.h)
@@ -36,7 +36,7 @@
PKG_CHECK_MODULES(DBUS, gthread-2.0 dbus-glib-1 >= 0.73)
PKG_CHECK_MODULES(MX, mx-gtk-1.0)
PKG_CHECK_MODULES(LIBNOTIFY, libnotify)
-PKG_CHECK_MODULES(REST, rest-0.6)
+PKG_CHECK_MODULES(REST, rest-0.7)
AC_MSG_CHECKING([whether to use the MeeGo environment])
AC_ARG_WITH([meego],[AS_HELP_STRING([--without-meego], [disable support for MeeGo environment])],
--- po/ca.po
+++ po/ca.po
@@ -2,12 +2,12 @@
# Copyright (C) 2009 Free Software Foundation, Inc.
# This file is distributed under the same license as the Carrick package.
# Gil Forcada <gilforcada at guifi.net>, 2009.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: Carrick 2.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-15 09:21+0000\n"
+"POT-Creation-Date: 2010-07-03 11:59+0000\n"
"PO-Revision-Date: 2009-08-21 14:39+0200\n"
"Last-Translator: Gil Forcada <gilforcada at guifi.net>\n"
"Language-Team: Catalan <tradgnome at softcatala.org>\n"
@@ -15,11 +15,156 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../carrick/carrick-pane.c:414
+#. * 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 "o"
+
+#. * 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 "amb fil"
+
+#. Switches
+#: ../carrick/carrick-list.c:850 ../carrick/carrick-pane.c:1429
+#: ../carrick/carrick-util.c:32
+msgid "WiFi"
+msgstr "Wi-Fi"
+
+#: ../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
+#, 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."
+
+#. * 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 "No s'ha trobat cap xarxa. Podeu provar de inhabilitar el mode fora de línia. "
+
+#: ../carrick/carrick-list.c:1013
+#, fuzzy, 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."
+
+#. * 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 "No s'ha trobat cap xarxa"
+
+#: ../carrick/carrick-notification-manager.c:124
+msgid "Network connected"
+msgstr "Connectat a la xarxa"
+
+#: ../carrick/carrick-notification-manager.c:132
+#, c-format
+msgid "You're now connected to a wired network"
+msgstr "Esteu connectat a la xarxa per cable"
+
+#: ../carrick/carrick-notification-manager.c:162
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr "Esteu connectat a %s a, a través d'una xarxa %s"
+
+#: ../carrick/carrick-notification-manager.c:168
+#, c-format
+msgid "You're now connected to a %s network"
+msgstr "Esteu connectat a una xarxa %s"
+
+#: ../carrick/carrick-notification-manager.c:185
+msgid "Network lost"
+msgstr "S'ha perdut la connexió"
+
+#: ../carrick/carrick-notification-manager.c:193
+#, c-format
+msgid "Sorry, we've lost your wired connection"
+msgstr "S'ha perdut la connexió per cable"
+
+#: ../carrick/carrick-notification-manager.c:197
+#, c-format
+msgid "Sorry we've lost your %s connection to %s"
+msgstr "S'ha perdut la connexió %s a %s"
+
+#: ../carrick/carrick-notification-manager.c:203
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr "S'ha perdut la connexió %s"
+
+#: ../carrick/carrick-notification-manager.c:220
+msgid "Network changed"
+msgstr "S'ha canviat de xarxa"
+
+#: ../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'ha perdut la connexió %s de manera que s'ha connectat a la xarxa de cable."
+
+#: ../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'ha perdut la connexió %s. S'ha connectat a %s, una xarxa %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'ha perdut la connexió %s. S'ha connectat a la xarxa %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'ha perdut la connexió %s. S'ha connectat a la xarxa de cable"
+
+#: ../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'ha perdut la connexió %s. S'ha connectat a %s, una xarxa %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'ha perdut la connexió %s. S'ha connectat a una xarxa %s"
+
+#: ../carrick/carrick-pane.c:634
msgid "New connection settings"
msgstr "Paràmetres de la connexió nova"
-#: ../carrick/carrick-pane.c:450
+#: ../carrick/carrick-pane.c:672
msgid ""
"Enter the name of the network you want\n"
"to connect to and, where necessary, the\n"
@@ -29,190 +174,135 @@
"us voleu connectar i, si fa falta, la\n"
"contrasenya i el tipus de seguretat."
-#: ../carrick/carrick-pane.c:460
+#: ../carrick/carrick-pane.c:682
msgid "Network name"
msgstr "Nom de la xarxa"
-#: ../carrick/carrick-pane.c:472
+#: ../carrick/carrick-pane.c:694
msgid "Network security"
msgstr "Seguretat de la xarxa"
-#: ../carrick/carrick-pane.c:482
+#: ../carrick/carrick-pane.c:704
msgid "None"
msgstr "Cap"
-#: ../carrick/carrick-pane.c:496
+#: ../carrick/carrick-pane.c:716
msgid "Password"
msgstr "Contrasenya"
-#: ../carrick/carrick-pane.c:511 ../carrick/carrick-service-item.c:1036
+#: ../carrick/carrick-pane.c:731 ../carrick/carrick-service-item.c:1787
msgid "Show password"
msgstr "Mostra la contrasenya"
-#.
-#. * Hint to display when we detect that the connection manager
-#. * is dead. Ideally the system auto-restarts connman so the
-#. * user will not see this, but this is what to show if all
-#. * available recovery measures fail.
-#.
-#: ../carrick/carrick-pane.c:609
-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 ""
-"No s'ha trobat cap xarxa. Sembla que el gestor de connexions no estigui "
-"funcionant. Podeu provar de reiniciar el dispositiu."
+#: ../carrick/carrick-pane.c:1412
+msgid "Settings"
+msgstr "Paràmetres"
-#.
-#. * Hint display if we detect that the system is in
-#. * offline mode and there are no available networks
-#.
-#: ../carrick/carrick-pane.c:620
-msgid ""
-"Sorry, we can't find any networks. You could try disabling Offline mode. "
-msgstr ""
-"No s'ha trobat cap xarxa. Podeu provar de inhabilitar el mode fora de línia. "
+#: ../carrick/carrick-pane.c:1443 ../carrick/carrick-service-item.c:328
+msgid "Wired"
+msgstr "Cable"
-#.
-#. * Hint to display if we detect that wifi has been turned off
-#. * and there are no available networks
-#.
-#: ../carrick/carrick-pane.c:636
-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."
-
-#.
-#. * Hint to display if we detect that wifi is on but
-#. * WiMAX has been turned off and there are no available
-#. * networks
-#.
-#: ../carrick/carrick-pane.c:647
-msgid "Sorry, we can't find any networks. You could try turning on WiMAX."
-msgstr ""
-"No s'ha trobat cap xarxa. Podeu provar d'engegar el WiMAX."
-
-#.
-#. * Hint to display if we detect that wifi and wimax is on but
-#. * 3G has been turned off and there are no available
-#. * networks
-#.
-#: ../carrick/carrick-pane.c:658
-msgid "Sorry, we can't find any networks. You could try turning on 3G."
-msgstr ""
-"No s'ha trobat cap xarxa. Podeu provar d'engegar el 3G."
-
-#.
-#. * Hint to display if we detect that wifi, wimax, and 3G are on but
-#. * bluetooth has been turned off and there are no available networks
-#.
-#: ../carrick/carrick-pane.c:668
-msgid "Sorry, we can't find any networks. You could try turning on Bluetooth."
-msgstr ""
-"No s'ha trobat cap xarxa. Podeu provar d'engegar el Bluetooth."
-
-#.
-#. * Hint to display if we detect that all technologies
-#. * other then ethernet have been turned on, and there
-#. * are no available networks
-#.
-#: ../carrick/carrick-pane.c:679
-msgid "Sorry, we can't find any networks. You could try turning on Wired."
-msgstr ""
-"No s'ha trobat cap xarxa. Podeu provar d'engegar la connexió per cable."
+#: ../carrick/carrick-pane.c:1510
+msgid "Offline mode"
+msgstr "Mode fora de línia"
-#.
-#. * Generic message to display if all available networking
-#. * technologies are turned on, but for whatever reason we
-#. * can not find any networks
-#.
-#: ../carrick/carrick-pane.c:691
-msgid "Sorry, we can't find any networks"
-msgstr "No s'ha trobat cap xarxa"
+#: ../carrick/carrick-pane.c:1520
+msgid "This will disable all your connections"
+msgstr "Inhabilitareu totes les connexions"
-#: ../carrick/carrick-pane.c:1030
+#: ../carrick/carrick-pane.c:1556 ../src/carrick.c:369
msgid "Networks"
msgstr "Xarxes"
-#: ../carrick/carrick-pane.c:1070
+#. New connection button
+#: ../carrick/carrick-pane.c:1562
msgid "Add new connection"
msgstr "Afegeix una connexió nova"
-#: ../carrick/carrick-pane.c:1097
-msgid "WiFi"
-msgstr "Wi-Fi"
-
-#: ../carrick/carrick-pane.c:1129 ../carrick/carrick-service-item.c:224
-msgid "Wired"
-msgstr "Cable"
-
-#: ../carrick/carrick-pane.c:1160
-msgid "3G"
-msgstr "3G"
-
-#: ../carrick/carrick-pane.c:1191
-msgid "WiMAX"
-msgstr "WiMAX"
-
-#: ../carrick/carrick-pane.c:1223
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
-#: ../carrick/carrick-pane.c:1266
-msgid "Offline mode"
-msgstr "Mode fora de línia"
-
-#: ../carrick/carrick-pane.c:1291
-msgid "This will disable all your connections"
-msgstr "Inhabilitareu totes les connexions"
+#. 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ític: el codi de país no és vàlid"
+
+#: ../carrick/carrick-service-item.c:52
+msgid "Missing required APN (service plan name)"
+msgstr "No es troba l'APN (nom del pla de servei) requerida"
+
+#: ../carrick/carrick-service-item.c:53
+msgid "Internal Error: Invalid network service"
+msgstr "Error intern: el servei de xarxa no és vàlid"
+
+#: ../carrick/carrick-service-item.c:54
+msgid "Critical Error: Unable to access Connection Manager"
+msgstr "Error crític: no es pot accedir al gestor de connexions"
+
+#: ../carrick/carrick-service-item.c:55
+msgid "ERROR: No 3G Hardware detected"
+msgstr "Error: no s'ha detectat cap dispositiu 3G"
#. 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:183
+#. * WPA and IEEE8021X are possible token values. Example: "WEP encrypted".
+#.
+#: ../carrick/carrick-service-item.c:192
#, c-format
msgid "%s encrypted"
msgstr "Encriptat amb %s"
-#: ../carrick/carrick-service-item.c:255
+#: ../carrick/carrick-service-item.c:340 ../carrick/carrick-service-item.c:357
msgid "Disconnect"
msgstr "Desconnectat"
-#: ../carrick/carrick-service-item.c:258
+#: ../carrick/carrick-service-item.c:343
msgid "Connected"
msgstr "Connectat"
-#: ../carrick/carrick-service-item.c:263
+#: ../carrick/carrick-service-item.c:360
+msgid "Online"
+msgstr "Connectat"
+
+#: ../carrick/carrick-service-item.c:367 ../carrick/carrick-service-item.c:376
#, c-format
msgid "Cancel"
msgstr "Cancel·la"
-#: ../carrick/carrick-service-item.c:266
+#: ../carrick/carrick-service-item.c:370
msgid "Configuring"
msgstr "S'està configurant"
-#: ../carrick/carrick-service-item.c:273 ../carrick/carrick-service-item.c:281
-#: ../carrick/carrick-service-item.c:1025
+#: ../carrick/carrick-service-item.c:379
+msgid "Associating"
+msgstr "S'està associant"
+
+#: ../carrick/carrick-service-item.c:388 ../carrick/carrick-service-item.c:413
+#: ../carrick/carrick-service-item.c:1774
msgid "Connect"
msgstr "Connectat"
-#: ../carrick/carrick-service-item.c:284
+#: ../carrick/carrick-service-item.c:416
msgid "Connection failed"
msgstr "Ha fallat la connexió"
-#: ../carrick/carrick-service-item.c:289 ../carrick/carrick-service-item.c:292
+#: ../carrick/carrick-service-item.c:419
+msgid "Sorry, the connection failed. You could try again."
+msgstr "Ha fallat la connexió. Proveu de nou."
+
+#: ../carrick/carrick-service-item.c:425 ../carrick/carrick-service-item.c:428
#, c-format
msgid "Disconnecting"
msgstr "S'està desconnectant"
-#: ../carrick/carrick-service-item.c:340
+#: ../carrick/carrick-service-item.c:494
msgid "Type password here"
msgstr "Introduïu la contrasenya"
-#: ../carrick/carrick-service-item.c:403
+#: ../carrick/carrick-service-item.c:563
msgid "Really remove?"
msgstr "Segur que voleu suprimir-la?"
-#: ../carrick/carrick-service-item.c:421
+#: ../carrick/carrick-service-item.c:583
#, c-format
msgid ""
"Do you want to remove the %s %s network? This\n"
@@ -223,97 +313,244 @@
"feu s'esborrarà la contrasenya i no podreu\n"
"connectar-vos automàticament a %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 "La contrasenya no té la llargada correcta. Per a connexions WEP són necessaris 10 o 26 caràcters, heu introduït %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 "La contrasenya és massa curta. Per una connexió WPA són necessaris com a mínim 8 caràcters, heu introduït %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 "La contrasenya és massa llarga. Per a una connexió WPA el màxim són 63 caràcters, heu introduït %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 "La contrasenya és massa curta. Per una connexió WPA2 són necessaris com a mínim 8 caràcters, heu introduït %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 "La contrasenya és massa llarga. Per a una connexió WPA2 el màxim són 63 caràcters, heu introduït %i"
+
+#: ../carrick/carrick-service-item.c:1267
+msgid "Sorry, it looks like the IP address is not valid"
+msgstr "Sembla que l'adreça IP no és vàlida"
+
+#: ../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 ""
+
+#. 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:981
+#: ../carrick/carrick-service-item.c:1729
msgid "WPA2 encrypted"
msgstr "Encriptat amb WPA2"
-#: ../carrick/carrick-notification-manager.c:131
-msgid "Network connected"
-msgstr "Connectat a la xarxa"
+#. TRANSLATORS: label in advanced settings (next to combobox
+#. * for DHCP/Static IP)
+#: ../carrick/carrick-service-item.c:1836
+#, fuzzy
+msgid "Connect by:"
+msgstr "Connectat"
-#: ../carrick/carrick-notification-manager.c:139
-#, c-format
-msgid "You're now connected to a wired network"
-msgstr "Esteu connectat a la xarxa per cable"
+#. TRANSLATORS: label in advanced settings
+#: ../carrick/carrick-service-item.c:1838
+msgid "IP address:"
+msgstr ""
-#: ../carrick/carrick-notification-manager.c:169
-#, c-format
-msgid "You're now connected to %s, a %s network"
-msgstr "Esteu connectat a %s a, a través d'una xarxa %s"
+#. TRANSLATORS: label in advanced settings
+#: ../carrick/carrick-service-item.c:1840
+msgid "Subnet mask:"
+msgstr ""
-#: ../carrick/carrick-notification-manager.c:175
-#, c-format
-msgid "You're now connected to a %s network"
-msgstr "Esteu connectat a una xarxa %s"
+#. TRANSLATORS: label in advanced settings
+#: ../carrick/carrick-service-item.c:1842
+msgid "Router:"
+msgstr ""
-#: ../carrick/carrick-notification-manager.c:192
-msgid "Network lost"
-msgstr "S'ha perdut la connexió"
+#. TRANSLATORS: label in advanced settings
+#: ../carrick/carrick-service-item.c:1844
+msgid "DNS:"
+msgstr ""
-#: ../carrick/carrick-notification-manager.c:200
-#, c-format
-msgid "Sorry, we've lost your wired connection"
-msgstr "S'ha perdut la connexió per cable"
+#: ../carrick/carrick-service-item.c:1850
+msgid "DHCP"
+msgstr ""
-#: ../carrick/carrick-notification-manager.c:204
-#, c-format
-msgid "Sorry we've lost your %s connection to %s"
-msgstr "S'ha perdut la connexió %s a %s"
+#: ../carrick/carrick-service-item.c:1852
+msgid "Static IP"
+msgstr ""
-#: ../carrick/carrick-notification-manager.c:210
-#, c-format
-msgid "Sorry, we've lost your %s connection"
-msgstr "S'ha perdut la connexió %s"
+#. TRANSLATORS: label for apply button in static ip settings
+#: ../carrick/carrick-service-item.c:1902
+msgid "Apply"
+msgstr ""
-#: ../carrick/carrick-notification-manager.c:227
-msgid "Network changed"
-msgstr "S'ha canviat de xarxa"
+#: ../src/carrick.c:49
+#, fuzzy
+msgid "networks - not connected"
+msgstr "Connectat a la xarxa"
-#: ../carrick/carrick-notification-manager.c:246
-#, c-format
-msgid ""
-"Sorry, your connection to %s was lost. So we've connected you to a wired "
-"network"
+#: ../src/carrick.c:55
+#, fuzzy
+msgid "networks - connecting"
+msgstr "Connectat a la xarxa"
+
+#: ../src/carrick.c:61
+msgid "networks - wired"
msgstr ""
-"S'ha perdut la connexió %s de manera que s'ha connectat a la xarxa de cable."
-#: ../carrick/carrick-notification-manager.c:253
+#: ../src/carrick.c:63
#, c-format
-msgid ""
-"Sorry, your connection to %s was lost. So we've connected you to %s, a %s "
-"network"
+msgid "networks - %s - wifi"
msgstr ""
-"S'ha perdut la connexió %s. S'ha connectat a %s, una xarxa %s."
-#: ../carrick/carrick-notification-manager.c:261
+#: ../src/carrick.c:66
#, c-format
-msgid ""
-"Sorry, your connection to %s was lost. So we've connected you to a %s network"
+msgid "networks - %s - wimax"
msgstr ""
-"S'ha perdut la connexió %s. S'ha connectat a la xarxa %s"
-#: ../carrick/carrick-notification-manager.c:271
+#: ../src/carrick.c:69
#, c-format
-msgid ""
-"Sorry, your %s connection was lost. So we've connected you to a wired network"
+msgid "networks - %s - 3G"
msgstr ""
-"S'ha perdut la connexió %s. S'ha connectat a la xarxa de cable"
-#: ../carrick/carrick-notification-manager.c:278
+#: ../src/carrick.c:72
#, c-format
-msgid ""
-"Sorry, your %s connection was lost. So we've connected you to %s, a %s "
-"network"
+msgid "networks - %s - bluetooth"
+msgstr ""
+
+#: ../src/carrick.c:75 ../src/carrick.c:87
+#, fuzzy
+msgid "networks"
+msgstr "Xarxes"
+
+#: ../src/carrick.c:82
+msgid "networks - error"
+msgstr ""
+
+#: ../src/carrick.c:297
+msgid "Run in standalone mode"
msgstr ""
-"S'ha perdut la connexió %s. S'ha connectat a %s, una xarxa %s"
-#: ../carrick/carrick-notification-manager.c:287
+#: ../src/carrick.c:299
+msgid "Embed in another window (overrides --standalone)"
+msgstr ""
+
+#: ../src/carrick.c:310
+msgid "Carrick connectivity applet"
+msgstr ""
+
+#: ../src/carrick.c:311
+msgid "- MeeGo connectivity applet"
+msgstr ""
+
+#: ../src/carrick.c:352 ../data/carrick.desktop.in.in.h:2
+#, fuzzy
+msgid "network"
+msgstr "Xarxes"
+
+#: ../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
+#, fuzzy
+msgid "Manual Configuration"
+msgstr "S'està configurant"
+
+#: ../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
+#, fuzzy
+msgid "Password:"
+msgstr "Contrasenya"
+
+#: ../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 ""
-"Sorry, your %s connection was lost. So we've connected you to a %s network"
+msgid "%s (Roaming)"
+msgstr ""
+
+#: ../callouts/3g/ggg-service-dialog.c:125
+msgid "Select 3G Service"
msgstr ""
-"S'ha perdut la connexió %s. S'ha connectat a una xarxa %s"
+
+#: ../data/carrick.desktop.in.in.h:1
+#, fuzzy
+msgid "Network settings"
+msgstr "S'ha perdut 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."
+
+#~ msgid "Sorry, we can't find any networks. You could try turning on WiMAX."
+#~ msgstr "No s'ha trobat cap xarxa. Podeu provar d'engegar el WiMAX."
+
+#~ msgid "Sorry, we can't find any networks. You could try turning on Bluetooth."
+#~ msgstr "No s'ha trobat cap xarxa. Podeu provar d'engegar el Bluetooth."
+
+#~ msgid "Sorry, we can't find any networks. You could try turning on Wired."
+#~ msgstr "No s'ha trobat cap xarxa. Podeu provar d'engegar la connexió per cable."
--- po/en_GB.po
+++ po/en_GB.po
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: Moblin Carrick\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-12 09:29+0000\n"
-"PO-Revision-Date: 2010-05-13 17:14-0800\n"
+"POT-Creation-Date: 2010-07-03 11:59+0000\n"
+"PO-Revision-Date: 2010-07-20 10:49-0800\n"
"Last-Translator: Margie Foster <margie at linux.intel.com>\n"
"Language-Team: British English <margie at linux.intel.com>\n"
"MIME-Version: 1.0\n"
@@ -25,7 +25,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 " or "
@@ -33,35 +33,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 "wired"
#. 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"
@@ -72,7 +72,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 "Sorry, we can't find any networks. It appears that the connection manager is not running. You could try restarting your computer."
@@ -80,11 +80,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 "Sorry, we can't find any networks. You could try disabling Offline mode. "
-#: ../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 "Sorry, we can't find any networks. You could try enabling %s."
@@ -94,78 +94,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 "Sorry, we can't find any networks"
-#: ../carrick/carrick-notification-manager.c:104
+#: ../carrick/carrick-notification-manager.c:124
msgid "Network connected"
msgstr "Network connected"
-#: ../carrick/carrick-notification-manager.c:112
+#: ../carrick/carrick-notification-manager.c:132
#, c-format
msgid "You're now connected to a wired network"
msgstr "You're now connected to a wired network"
-#: ../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 "You're now connected to %s, a %s network"
-#: ../carrick/carrick-notification-manager.c:148
+#: ../carrick/carrick-notification-manager.c:168
#, c-format
msgid "You're now connected to a %s network"
msgstr "You're now connected to a %s network"
-#: ../carrick/carrick-notification-manager.c:165
+#: ../carrick/carrick-notification-manager.c:185
msgid "Network lost"
msgstr "Network lost"
-#: ../carrick/carrick-notification-manager.c:173
+#: ../carrick/carrick-notification-manager.c:193
#, c-format
msgid "Sorry, we've lost your wired connection"
msgstr "Sorry, we've lost your wired connection"
-#: ../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 "Sorry, we've lost your %s connection to %s"
-#: ../carrick/carrick-notification-manager.c:183
+#: ../carrick/carrick-notification-manager.c:203
#, c-format
msgid "Sorry, we've lost your %s connection"
msgstr "Sorry, we've lost your %s connection"
-#: ../carrick/carrick-notification-manager.c:200
+#: ../carrick/carrick-notification-manager.c:220
msgid "Network changed"
msgstr "Network changed"
-#: ../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 "Sorry, your connection to %s was lost, so we've connected to a wired network"
-#: ../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 "Sorry, your connection to %s was lost, so we've connected to %s, a %s network"
-#: ../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 "Sorry, your connection to %s was lost, so we've connected to a %s network"
-#: ../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 "Sorry, your %s connection was lost, so we've connected to a wired network"
-#: ../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 "Sorry, your %s connection was lost, so we've connected to %s, a %s network"
-#: ../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 "Sorry, your %s connection was lost, so we've connected to a %s network"
@@ -201,7 +201,7 @@
msgstr "Password"
#: ../carrick/carrick-pane.c:731
-#: ../carrick/carrick-service-item.c:1683
+#: ../carrick/carrick-service-item.c:1787
msgid "Show password"
msgstr "Show password"
@@ -210,7 +210,7 @@
msgstr "Settings"
#: ../carrick/carrick-pane.c:1443
-#: ../carrick/carrick-service-item.c:278
+#: ../carrick/carrick-service-item.c:328
msgid "Wired"
msgstr "Wired"
@@ -223,7 +223,7 @@
msgstr "This will disable all your connections"
#: ../carrick/carrick-pane.c:1556
-#: ../src/carrick.c:351
+#: ../src/carrick.c:369
msgid "Networks"
msgstr "Networks"
@@ -259,67 +259,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 encrypted"
-#: ../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 "Disconnect"
-#: ../carrick/carrick-service-item.c:293
+#: ../carrick/carrick-service-item.c:343
msgid "Connected"
msgstr "Connected"
-#: ../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 "Cancel"
-#: ../carrick/carrick-service-item.c:320
+#: ../carrick/carrick-service-item.c:370
msgid "Configuring"
msgstr "Configuring"
-#: ../carrick/carrick-service-item.c:329
+#: ../carrick/carrick-service-item.c:379
msgid "Associating"
msgstr "Associating"
-#: ../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 "Connect"
-#: ../carrick/carrick-service-item.c:366
+#: ../carrick/carrick-service-item.c:416
msgid "Connection failed"
msgstr "Connection failed"
-#: ../carrick/carrick-service-item.c:369
+#: ../carrick/carrick-service-item.c:419
msgid "Sorry, the connection failed. You could try again."
msgstr "Sorry, the connection failed. You could try again."
-#: ../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 "Disconnecting"
-#: ../carrick/carrick-service-item.c:468
+#: ../carrick/carrick-service-item.c:494
msgid "Type password here"
msgstr "Type password here"
-#: ../carrick/carrick-service-item.c:537
+#: ../carrick/carrick-service-item.c:563
msgid "Really remove?"
msgstr "Really remove?"
-#: ../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"
@@ -330,54 +330,54 @@
"will forget the password and you will no longer be\n"
"automatically connected to %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 "Your password isn't the right length. For a WEP connection, it needs to be either 10 or 26 characters, you have %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 "Your password is too short. For a WPA connection, it needs to be at least 8 characters long, you have %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 "Your password is too long. For a WPA connection, it needs to have fewer than 63 characters, you have %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 "Your password is too short. For a WPA2 connection, it needs to be at least 8 characters long, you have %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 "Your password is too long. For a WPA2 connection, it needs to have fewer than 63 characters, you have %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 "Sorry, it looks like the IP address is not valid"
-#: ../carrick/carrick-service-item.c:1239
+#: ../carrick/carrick-service-item.c:1279
msgid "Sorry, it looks like the gateway address is not valid"
msgstr "Sorry, it looks like the gateway address is not valid"
-#: ../carrick/carrick-service-item.c:1251
+#: ../carrick/carrick-service-item.c:1291
msgid "Sorry, it looks like the subnet mask is not valid"
msgstr "Sorry, it looks like the subnet mask is not valid"
-#: ../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 "Sorry, it looks like the nameserver address '%s' is not valid"
#. 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 "Advanced"
-#: ../carrick/carrick-service-item.c:1604
+#: ../carrick/carrick-service-item.c:1708
msgid "Scanning"
msgstr "Scanning"
@@ -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 encrypted"
#. 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 "Connect by:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1734
+#: ../carrick/carrick-service-item.c:1838
msgid "IP address:"
msgstr "IP address:"
#. 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 "Static 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 "Apply"
-#: ../src/carrick.c:43
+#: ../src/carrick.c:49
msgid "networks - not connected"
msgstr "networks - not connected"
-#: ../src/carrick.c:49
+#: ../src/carrick.c:55
msgid "networks - connecting"
msgstr "networks - connecting"
-#: ../src/carrick.c:55
+#: ../src/carrick.c:61
msgid "networks - wired"
msgstr "networks - wired"
-#: ../src/carrick.c:57
+#: ../src/carrick.c:63
#, c-format
msgid "networks - %s - wifi"
msgstr "networks - %s - wifi"
-#: ../src/carrick.c:60
+#: ../src/carrick.c:66
#, c-format
msgid "networks - %s - wimax"
msgstr "networks - %s - wimax"
-#: ../src/carrick.c:63
+#: ../src/carrick.c:69
#, c-format
msgid "networks - %s - 3G"
msgstr "networks - %s - 3G"
-#: ../src/carrick.c:66
+#: ../src/carrick.c:72
#, c-format
msgid "networks - %s - bluetooth"
msgstr "networks - %s - bluetooth"
-#: ../src/carrick.c:69
-#: ../src/carrick.c:81
+#: ../src/carrick.c:75
+#: ../src/carrick.c:87
msgid "networks"
msgstr "networks"
-#: ../src/carrick.c:76
+#: ../src/carrick.c:82
msgid "networks - error"
msgstr "networks - error"
-#: ../src/carrick.c:279
+#: ../src/carrick.c:297
msgid "Run in standalone mode"
msgstr "Run in standalone mode"
-#: ../src/carrick.c:281
+#: ../src/carrick.c:299
msgid "Embed in another window (overrides --standalone)"
msgstr " Embed in another window (overrides --standalone)"
-#: ../src/carrick.c:292
+#: ../src/carrick.c:310
msgid "Carrick connectivity applet"
msgstr "Carrick connectivity applet"
-#: ../src/carrick.c:293
-msgid "- Moblin connectivity applet"
-msgstr "- Moblin connectivity applet"
+#: ../src/carrick.c:311
+msgid "- MeeGo connectivity applet"
+msgstr "- MeeGo connectivity applet"
-#: ../src/carrick.c:334
+#: ../src/carrick.c:352
#: ../data/carrick.desktop.in.in.h:2
msgid "network"
msgstr "network"
--- po/fr.po
+++ po/fr.po
@@ -3,7 +3,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-05 09:17+0000\n"
+"POT-Creation-Date: 2010-07-03 11:59+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: Martine <martine.landais at intel.com>\n"
"Language-Team: lpdufres <loic.dufresne.de.virel at intel.com>\n"
--- po/id.po
+++ po/id.po
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: carrick-ng\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-08 18:55+0000\n"
+"POT-Creation-Date: 2010-07-03 11:59+0000\n"
"PO-Revision-Date: 2009-10-02 14:41+0700\n"
"Last-Translator: Andika Triwidada <andika at gmail.com>\n"
"Language-Team: Indonesian <id at li.org>\n"
@@ -21,7 +21,7 @@
#. technologies,
#. * for example 'WiFi, WiMAX or 3G.
#.
-#: ../carrick/carrick-list.c:847
+#: ../carrick/carrick-list.c:843
msgid " or "
msgstr " atau "
@@ -29,30 +29,31 @@
#. 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 "kabel"
-#: ../carrick/carrick-list.c:854 ../carrick/carrick-pane.c:1405
+#. Switches
+#: ../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:1499
+#: ../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:1468
+#: ../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:1531
+#: ../carrick/carrick-list.c:853 ../carrick/carrick-pane.c:1485
#: ../carrick/carrick-util.c:40
msgid "Bluetooth"
msgstr "Bluetooth"
@@ -61,18 +62,18 @@
#. * 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 "Maaf, kami tak menemukan jaringan manapun. Manajer Koneksi kelihatannya tidak berjalan. Anda mungkin dapat mencoba memulai ulang komputer."
#. * 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 "Maaf, kami tak menemukan jaringan manapun. Coba matikan mode 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 "Maaf, kami tak menemukan jaringan manapun. Anda dapat mencoba mengaktifkan %s."
@@ -81,87 +82,87 @@
#. * 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 "Maaf, kami tak menemukan jaringan manapun"
-#: ../carrick/carrick-notification-manager.c:104
+#: ../carrick/carrick-notification-manager.c:124
msgid "Network connected"
msgstr "Jaringan tersambung"
-#: ../carrick/carrick-notification-manager.c:112
+#: ../carrick/carrick-notification-manager.c:132
#, c-format
msgid "You're now connected to a wired network"
msgstr "Anda kini tersambung ke jaringan ethernet"
-#: ../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 "Anda kini tersambung ke %s, suatu jaringan %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 "Anda kini tersambung ke suatu jaringan %s"
-#: ../carrick/carrick-notification-manager.c:165
+#: ../carrick/carrick-notification-manager.c:185
msgid "Network lost"
msgstr "Jaringan hilang"
-#: ../carrick/carrick-notification-manager.c:173
+#: ../carrick/carrick-notification-manager.c:193
#, c-format
msgid "Sorry, we've lost your wired connection"
msgstr "Maaf, kami kehilangan sambungan ethernet anda"
-#: ../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 "Maaf, kami kehilangan sambungan %s ke %s"
-#: ../carrick/carrick-notification-manager.c:183
+#: ../carrick/carrick-notification-manager.c:203
#, c-format
msgid "Sorry, we've lost your %s connection"
msgstr "Maaf, kami kehilangan sambungan %s anda"
-#: ../carrick/carrick-notification-manager.c:200
+#: ../carrick/carrick-notification-manager.c:220
msgid "Network changed"
msgstr "Jaringan berubah"
-#: ../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 "Maaf, sambungan anda ke %s terputus. Kami telah menyambungkan anda ke suatu jaringan ethernet."
-#: ../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 "Maaf, sambungan anda ke %s terputus. Kami telah menyambungkan anda ke%s, suatu jaringan %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 "Maaf, sambungan anda ke %s terputus. Kami telah menyambungkan anda ke suatu jaringan %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 "Maaf, sambungan %s anda terputus. Kami telah menyambungkan anda ke suatu jaringan ethernet."
-#: ../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 "Maaf, sambungan %s anda terputus. Kami telah menyambungkan anda ke %s, suatu jaringan %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 "Maaf, sambungan %s anda terputus. Kami telah menyambungkan anda ke suatu jaringan %s."
-#: ../carrick/carrick-pane.c:630
+#: ../carrick/carrick-pane.c:634
msgid "New connection settings"
msgstr "Penataan sambungan baru"
-#: ../carrick/carrick-pane.c:668
+#: ../carrick/carrick-pane.c:672
msgid ""
"Enter the name of the network you want\n"
"to connect to and, where necessary, the\n"
@@ -171,44 +172,48 @@
"hubungi dan bila perlu, kata sandi dan tipe\n"
"keamanan."
-#: ../carrick/carrick-pane.c:678
+#: ../carrick/carrick-pane.c:682
msgid "Network name"
msgstr "Nama jaringan"
-#: ../carrick/carrick-pane.c:690
+#: ../carrick/carrick-pane.c:694
msgid "Network security"
msgstr "Keamanan jaringan"
-#: ../carrick/carrick-pane.c:700
+#: ../carrick/carrick-pane.c:704
msgid "None"
msgstr "Tak satupun"
-#: ../carrick/carrick-pane.c:712
+#: ../carrick/carrick-pane.c:716
msgid "Password"
msgstr "Kata sandi"
-#: ../carrick/carrick-pane.c:727 ../carrick/carrick-service-item.c:1303
+#: ../carrick/carrick-pane.c:731 ../carrick/carrick-service-item.c:1787
msgid "Show password"
msgstr "Tampilkan kata sandi"
-#: ../carrick/carrick-pane.c:1437 ../carrick/carrick-service-item.c:241
+#: ../carrick/carrick-pane.c:1412
+msgid "Settings"
+msgstr "Tatanan"
+
+#: ../carrick/carrick-pane.c:1443 ../carrick/carrick-service-item.c:328
msgid "Wired"
msgstr "Ethernet"
-#: ../carrick/carrick-pane.c:1563
+#: ../carrick/carrick-pane.c:1510
msgid "Offline mode"
msgstr "Mode offline"
-#: ../carrick/carrick-pane.c:1588
+#: ../carrick/carrick-pane.c:1520
msgid "This will disable all your connections"
msgstr "Ini akan mematikan semua koneksi anda"
-#: ../carrick/carrick-pane.c:1621 ../src/carrick.c:351
+#: ../carrick/carrick-pane.c:1556 ../src/carrick.c:369
msgid "Networks"
msgstr "Jaringan"
#. New connection button
-#: ../carrick/carrick-pane.c:1633
+#: ../carrick/carrick-pane.c:1562
msgid "Add new connection"
msgstr "Tambah koneksi baru"
@@ -216,86 +221,86 @@
#. The following are potential errors that a user might see while
#. attempting to configure a 3G data service.
#.
-#: ../carrick/carrick-service-item.c:46
+#: ../carrick/carrick-service-item.c:51
msgid "Critical Error: Invalid country code"
msgstr "Galat Krisi: Kode negara tak valid"
-#: ../carrick/carrick-service-item.c:47
+#: ../carrick/carrick-service-item.c:52
msgid "Missing required APN (service plan name)"
msgstr "APN (nama jenis langganan) yang diperlukan hilang"
-#: ../carrick/carrick-service-item.c:48
+#: ../carrick/carrick-service-item.c:53
msgid "Internal Error: Invalid network service"
msgstr "Galat internal: Layanan jaringan tak valid"
-#: ../carrick/carrick-service-item.c:49
+#: ../carrick/carrick-service-item.c:54
msgid "Critical Error: Unable to access Connection Manager"
msgstr "Galat Kritis: Tak bisa mengakses Manajer Sambungan"
-#: ../carrick/carrick-service-item.c:50
+#: ../carrick/carrick-service-item.c:55
msgid "ERROR: No 3G Hardware detected"
msgstr "GALAT: Tak ada perangkat keras 3G yang terdeteksi"
#. 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:177
+#: ../carrick/carrick-service-item.c:192
#, c-format
msgid "%s encrypted"
msgstr "%s tersandi"
-#: ../carrick/carrick-service-item.c:272 ../carrick/carrick-service-item.c:289
+#: ../carrick/carrick-service-item.c:340 ../carrick/carrick-service-item.c:357
msgid "Disconnect"
msgstr "Putus"
-#: ../carrick/carrick-service-item.c:275
+#: ../carrick/carrick-service-item.c:343
msgid "Connected"
msgstr "Tersambung"
-#: ../carrick/carrick-service-item.c:292
+#: ../carrick/carrick-service-item.c:360
msgid "Online"
msgstr "Daring"
-#: ../carrick/carrick-service-item.c:299 ../carrick/carrick-service-item.c:308
+#: ../carrick/carrick-service-item.c:367 ../carrick/carrick-service-item.c:376
#, c-format
msgid "Cancel"
msgstr "Batal"
-#: ../carrick/carrick-service-item.c:302
+#: ../carrick/carrick-service-item.c:370
msgid "Configuring"
msgstr "Menata"
-#: ../carrick/carrick-service-item.c:311
+#: ../carrick/carrick-service-item.c:379
msgid "Associating"
msgstr "Mengasosiasikan"
-#: ../carrick/carrick-service-item.c:320 ../carrick/carrick-service-item.c:345
-#: ../carrick/carrick-service-item.c:1292
+#: ../carrick/carrick-service-item.c:388 ../carrick/carrick-service-item.c:413
+#: ../carrick/carrick-service-item.c:1774
msgid "Connect"
msgstr "Sambung"
-#: ../carrick/carrick-service-item.c:348
+#: ../carrick/carrick-service-item.c:416
msgid "Connection failed"
msgstr "Sambungan gagal"
-#: ../carrick/carrick-service-item.c:351
+#: ../carrick/carrick-service-item.c:419
msgid "Sorry, the connection failed. You could try again."
msgstr "Maaf, sambungan gagal. Anda dapat mencoba lagi."
-#: ../carrick/carrick-service-item.c:357 ../carrick/carrick-service-item.c:360
+#: ../carrick/carrick-service-item.c:425 ../carrick/carrick-service-item.c:428
#, c-format
msgid "Disconnecting"
msgstr "Memutus"
-#: ../carrick/carrick-service-item.c:418
+#: ../carrick/carrick-service-item.c:494
msgid "Type password here"
msgstr "Ketikkan kata sandi di sini"
-#: ../carrick/carrick-service-item.c:481
+#: ../carrick/carrick-service-item.c:563
msgid "Really remove?"
msgstr "Yakin dihapus?"
-#: ../carrick/carrick-service-item.c:501
+#: ../carrick/carrick-service-item.c:583
#, c-format
msgid ""
"Do you want to remove the %s %s network? This\n"
@@ -306,32 +311,54 @@
"melupakan kata sandi dan anda tidak akan secara\n"
"otomatis tersambung ke %s."
-#: ../carrick/carrick-service-item.c:686
+#: ../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 "Panjang kata sandi Anda salah. Bagi sambungan WEP panjangnya mesti 10 atau 26 karakter, Anda punya %i."
-#: ../carrick/carrick-service-item.c:697
+#: ../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 "Kata sandi Anda terlalu pendek. Bagi sambungan WPA panjangnya paling tidak 8 karakter, Anda punya %i"
-#: ../carrick/carrick-service-item.c:701
+#: ../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 "Kata sandi Anda terlalu panjang. Bagi sambungan WPA panjangnya mesti kurang dari 63 karakter, Anda punya %i"
-#: ../carrick/carrick-service-item.c:710
+#: ../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 "Kata sandi Anda terlalu pendek. Bagi sambungan WPA2 panjangnya paling tidak 8 karakter, Anda punya %i"
-#: ../carrick/carrick-service-item.c:714
+#: ../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 "Kata sandi Anda terlalu panjang. Bagi sambungan WPA2 panjangnya mesti kurang dari 63 karakter, Anda punya %i"
-#: ../carrick/carrick-service-item.c:1228
+#: ../carrick/carrick-service-item.c:1267
+msgid "Sorry, it looks like the IP address is not valid"
+msgstr "Maaf, sepertinya alamat IP tak valid"
+
+#: ../carrick/carrick-service-item.c:1279
+msgid "Sorry, it looks like the gateway address is not valid"
+msgstr "Maaf, sepertinya alamat gateway tak valid"
+
+#: ../carrick/carrick-service-item.c:1291
+msgid "Sorry, it looks like the subnet mask is not valid"
+msgstr "Maaf, sepertinya subnet mask tak valid"
+
+#: ../carrick/carrick-service-item.c:1336
+#, c-format
+msgid "Sorry, it looks like the nameserver address '%s' is not valid"
+msgstr "Maaf, sepertinya alamat nameserver '%s' tak valid"
+
+#. TRANSLATORS: label for the Advanced expander in a service item
+#: ../carrick/carrick-service-item.c:1698
+msgid "Advanced"
+msgstr "Tingkat lanjut"
+
+#: ../carrick/carrick-service-item.c:1708
msgid "Scanning"
msgstr "Memindai"
@@ -339,67 +366,106 @@
#. 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:1247
+#: ../carrick/carrick-service-item.c:1729
msgid "WPA2 encrypted"
msgstr "Tersandi WPA2"
-#: ../src/carrick.c:43
+#. TRANSLATORS: label in advanced settings (next to combobox
+#. * for DHCP/Static IP)
+#: ../carrick/carrick-service-item.c:1836
+msgid "Connect by:"
+msgstr "Sambung melalui:"
+
+#. TRANSLATORS: label in advanced settings
+#: ../carrick/carrick-service-item.c:1838
+msgid "IP address:"
+msgstr "Alamat IP:"
+
+#. TRANSLATORS: label in advanced settings
+#: ../carrick/carrick-service-item.c:1840
+msgid "Subnet mask:"
+msgstr "Subnet mask:"
+
+#. 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 "IP statik"
+
+#. TRANSLATORS: label for apply button in static ip settings
+#: ../carrick/carrick-service-item.c:1902
+msgid "Apply"
+msgstr "Terapkan"
+
+#: ../src/carrick.c:49
msgid "networks - not connected"
msgstr "jaringan - tak tersambung"
-#: ../src/carrick.c:49
+#: ../src/carrick.c:55
msgid "networks - connecting"
msgstr "jaringan - menyambung"
-#: ../src/carrick.c:55
+#: ../src/carrick.c:61
msgid "networks - wired"
msgstr "jaringan - kabel"
-#: ../src/carrick.c:57
+#: ../src/carrick.c:63
#, c-format
msgid "networks - %s - wifi"
msgstr "jaringan - %s - wifi"
-#: ../src/carrick.c:60
+#: ../src/carrick.c:66
#, c-format
msgid "networks - %s - wimax"
msgstr "jaringan - %s - wimax"
-#: ../src/carrick.c:63
+#: ../src/carrick.c:69
#, c-format
msgid "networks - %s - 3G"
msgstr "jaringan - %s - 3G"
-#: ../src/carrick.c:66
+#: ../src/carrick.c:72
#, c-format
msgid "networks - %s - bluetooth"
msgstr "jaringan - %s - bluetooth"
-#: ../src/carrick.c:69 ../src/carrick.c:81
+#: ../src/carrick.c:75 ../src/carrick.c:87
msgid "networks"
msgstr "jaringan"
-#: ../src/carrick.c:76
+#: ../src/carrick.c:82
msgid "networks - error"
msgstr "jaringan - galat"
-#: ../src/carrick.c:279
+#: ../src/carrick.c:297
msgid "Run in standalone mode"
msgstr "Jalankan dalam moda berdiri sendiri"
-#: ../src/carrick.c:281
+#: ../src/carrick.c:299
msgid "Embed in another window (overrides --standalone)"
msgstr "Tempelkan ke jendela lain (menimpa --standalone)"
-#: ../src/carrick.c:292
+#: ../src/carrick.c:310
msgid "Carrick connectivity applet"
msgstr "Aplet konektivitas Carrick"
-#: ../src/carrick.c:293
-msgid "- Moblin connectivity applet"
-msgstr "- Aplet konektivitas Moblin"
+#: ../src/carrick.c:311
+msgid "- MeeGo connectivity applet"
+msgstr "- Aplet konektivitas 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 "jaringan"
@@ -467,10 +533,6 @@
msgid "Network settings"
msgstr "Tatanan jaringan"
-#: ../carrick/carrick-pane.c:1396
-msgid "Settings"
-msgstr "Tatanan"
-
#~ msgid "Manual Config"
#~ msgstr "Konfigurasi Manual"
--- po/nl.po
+++ po/nl.po
@@ -2,13 +2,13 @@
# Copyright (C) 2009 THE carrick-ng'S COPYRIGHT HOLDER
# This file is distributed under the same license as the carrick-ng package.
# Auke Kok <auke-jan.h.kok at intel.com>, 2009.
-#
-#
+#
+#
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 12:03-0800\n"
"Last-Translator: Thomas <thomas.martens at ptiglobal.net>\n"
"Language-Team: \n"
@@ -19,153 +19,146 @@
"X-Poedit-Language: Dutch\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 " of "
-#.
-#. * 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 "bedraad"
#. 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 "Sorry, geen netwerken gevonden. Het verbindingsbeheer lijkt niet actief te zijn. Je kunt proberen het apparaat opnieuw op te starten."
-#.
#. * 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 "Sorry, geen netwerken gevonden. Je kunt proberen om Offline mode uit te schakelen."
-#: ../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 "Sorry, geen netwerken gevonden. Je kunt proberen om %s aan te zetten."
-#.
#. * 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 "Sorry, geen netwerken gevonden."
-#: ../carrick/carrick-notification-manager.c:104
+#: ../carrick/carrick-notification-manager.c:124
msgid "Network connected"
msgstr "Netwerk verbonden"
-#: ../carrick/carrick-notification-manager.c:112
+#: ../carrick/carrick-notification-manager.c:132
#, c-format
msgid "You're now connected to a wired network"
msgstr "Je bent verbonden met een bedraad netwerk"
-#: ../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 "Je bent verbonden met %s, een %s netwerk"
-#: ../carrick/carrick-notification-manager.c:148
+#: ../carrick/carrick-notification-manager.c:168
#, c-format
msgid "You're now connected to a %s network"
msgstr "Je bent verbonden met een %s netwerk"
-#: ../carrick/carrick-notification-manager.c:165
+#: ../carrick/carrick-notification-manager.c:185
msgid "Network lost"
msgstr "Netwerk verloren"
-#: ../carrick/carrick-notification-manager.c:173
+#: ../carrick/carrick-notification-manager.c:193
#, c-format
msgid "Sorry, we've lost your wired connection"
msgstr "Sorry, de bedraade verbinding was verbroken"
-#: ../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 "Sorry, de %s verbinding met %s was verbroken"
-#: ../carrick/carrick-notification-manager.c:183
+#: ../carrick/carrick-notification-manager.c:203
#, c-format
msgid "Sorry, we've lost your %s connection"
msgstr "Sorry, de %s verbinding was verbroken"
-#: ../carrick/carrick-notification-manager.c:200
+#: ../carrick/carrick-notification-manager.c:220
msgid "Network changed"
msgstr "Netwerk gewijzigd"
-#: ../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 "Sorry, de verbinding met %s was verbroken. We hebben je verbonden met een bedraad netwerk"
-#: ../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 "Sorry, de verbinding met %s was verbroken. We hebben je verbonden met %s, een %s netwerk"
-#: ../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 "Sorry, de verbinding met %s was verbroken. We hebben je verbonden met een %s netwerk"
-#: ../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 "Sorry, de verbinding met %s was verbroken. We hebben je verbonden met een bedraad netwerk"
-#: ../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 "Sorry, je %s verbinding was verbroken. We hebben je verbonden met %s, een %s netwerk"
-#: ../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 "Sorry, je %s verbinding was verbroken. We hebben je verbonden met een %s netwerk"
@@ -200,8 +193,7 @@
msgid "Password"
msgstr "Wachtwoord"
-#: ../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 "Geef wachtwoord weer"
@@ -209,8 +201,7 @@
msgid "Settings"
msgstr "Instellingen"
-#: ../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 "Bedraad"
@@ -222,8 +213,7 @@
msgid "This will disable all your connections"
msgstr "Dit maakt alle verbindingen inactief"
-#: ../carrick/carrick-pane.c:1556
-#: ../src/carrick.c:351
+#: ../carrick/carrick-pane.c:1556 ../src/carrick.c:369
msgid "Networks"
msgstr "netwerken"
@@ -235,7 +225,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 "Kritieke Fout: Ongeldige land code"
@@ -258,68 +248,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 versleuteld"
-#: ../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 "Verbreek verbinding"
-#: ../carrick/carrick-service-item.c:293
+#: ../carrick/carrick-service-item.c:343
msgid "Connected"
msgstr "Verbonden"
-#: ../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 "Annuleren"
-#: ../carrick/carrick-service-item.c:320
+#: ../carrick/carrick-service-item.c:370
msgid "Configuring"
msgstr "Configureren"
-#: ../carrick/carrick-service-item.c:329
+#: ../carrick/carrick-service-item.c:379
msgid "Associating"
msgstr "associëren"
-#: ../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 "Maak verbinding"
-#: ../carrick/carrick-service-item.c:366
+#: ../carrick/carrick-service-item.c:416
msgid "Connection failed"
msgstr "Verbindingsfout"
-#: ../carrick/carrick-service-item.c:369
+#: ../carrick/carrick-service-item.c:419
msgid "Sorry, the connection failed. You could try again."
msgstr "Sorry, kon geen verbinding maken. Probeer het nogmaals."
-#: ../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 "Verbinding wordt verbroken"
-#: ../carrick/carrick-service-item.c:468
+#: ../carrick/carrick-service-item.c:494
msgid "Type password here"
msgstr "Geef wachtwoord hier op"
-#: ../carrick/carrick-service-item.c:537
+#: ../carrick/carrick-service-item.c:563
msgid "Really remove?"
msgstr "Echt verwijderen?"
-#: ../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"
@@ -330,54 +316,54 @@
"verwijdert ook het opgeslagen wachtwoord. Je zult niet\n"
"langer met %s automatisch verbonden worden."
-#: ../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 "Je wachtwoord is niet de juiste lengte. Een WEP verbinding heeft een lengte van 10 of 26 karakters nodig, je hebt %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 "Je wachtwoord is te kort. Voor een WPA verbinding heb je minstens 8 karakters nodig, je hebt %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 "Je wachtwoord is te lang. Voor een WPA verbinding heb je minder dan 63 karakters nodig, je hebt %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 "Je wachtwoord is te kort. Voor een WPA2 verbinding heb je minstens 8 karakters nodig, je hebt %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 "Je wachtwoord is te lang. Voor een WPA2 verbinding heb je minder dan 63karakters nodig, je hebt %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 "Sorry, het IP adres is onjuist"
-#: ../carrick/carrick-service-item.c:1239
+#: ../carrick/carrick-service-item.c:1279
msgid "Sorry, it looks like the gateway address is not valid"
msgstr "Sorry, het gateway adres is onjuist"
-#: ../carrick/carrick-service-item.c:1251
+#: ../carrick/carrick-service-item.c:1291
msgid "Sorry, it looks like the subnet mask is not valid"
msgstr "Sorry het subnetmasker is onjuist"
-#: ../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 "Sorry, het servernaam adres '%s' is onjuist"
#. 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 "Geavanceerd"
-#: ../carrick/carrick-service-item.c:1604
+#: ../carrick/carrick-service-item.c:1708
msgid "Scanning"
msgstr "Scannen"
@@ -385,114 +371,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 versleuteld"
#. 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 "Maak verbinding via:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1734
+#: ../carrick/carrick-service-item.c:1838
msgid "IP address:"
msgstr "IP-adres:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1736
+#: ../carrick/carrick-service-item.c:1840
msgid "Subnet mask:"
msgstr "Subnetmasker:"
#. 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 "Statisch 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 "Toepassen"
-#: ../src/carrick.c:43
+#: ../src/carrick.c:49
msgid "networks - not connected"
msgstr "netwerken - niet verbonden"
-#: ../src/carrick.c:49
+#: ../src/carrick.c:55
msgid "networks - connecting"
msgstr "netwerken - verbinden"
-#: ../src/carrick.c:55
+#: ../src/carrick.c:61
msgid "networks - wired"
msgstr "netwerken - bedraad"
-#: ../src/carrick.c:57
+#: ../src/carrick.c:63
#, c-format
msgid "networks - %s - wifi"
msgstr "netwerken - %s - Wi-Fi"
-#: ../src/carrick.c:60
+#: ../src/carrick.c:66
#, c-format
msgid "networks - %s - wimax"
msgstr "netwerken - %s - WiMAX"
-#: ../src/carrick.c:63
+#: ../src/carrick.c:69
#, c-format
msgid "networks - %s - 3G"
msgstr "netwerken - %s - 3G"
-#: ../src/carrick.c:66
+#: ../src/carrick.c:72
#, c-format
msgid "networks - %s - bluetooth"
msgstr "netwerken - %s - Bluetooth"
-#: ../src/carrick.c:69
-#: ../src/carrick.c:81
+#: ../src/carrick.c:75 ../src/carrick.c:87
msgid "networks"
msgstr "netwerken"
-#: ../src/carrick.c:76
+#: ../src/carrick.c:82
msgid "networks - error"
msgstr "netwerken - fout"
-#: ../src/carrick.c:279
+#: ../src/carrick.c:297
msgid "Run in standalone mode"
msgstr "Werk in losgekoppelde modus"
-#: ../src/carrick.c:281
+#: ../src/carrick.c:299
msgid "Embed in another window (overrides --standalone)"
msgstr "Ingebed in een ander venster (overschrijft --losgekoppeld)"
-#: ../src/carrick.c:292
+#: ../src/carrick.c:310
msgid "Carrick connectivity applet"
msgstr "Carrick connectiviteits applet"
-#: ../src/carrick.c:293
-msgid "- Moblin connectivity applet"
-msgstr "- Moblin connectiviteits applet"
+#: ../src/carrick.c:311
+msgid "- MeeGo connectivity applet"
+msgstr "- MeeGo verbinding applet"
-#: ../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 "netwerk"
#: ../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"
@@ -557,18 +540,15 @@
#~ msgid "Manual Config"
#~ msgstr "Handmatige Configuratie"
+
#~ msgid "Sorry, we can't find any networks. You could try turning on WiFi."
-#~ msgstr ""
-#~ "Sorry, geen netwerken gevonden. Je kunt proberen om WiFi aan te zetten."
+#~ msgstr "Sorry, geen netwerken gevonden. Je kunt proberen om WiFi aan te zetten."
+
#~ msgid "Sorry, we can't find any networks. You could try turning on WiMAX."
-#~ msgstr ""
-#~ "Sorry, geen netwerken gevonden. Je kunt proberen om WiMAX aan te zetten."
-#~ msgid ""
-#~ "Sorry, we can't find any networks. You could try turning on Bluetooth."
-#~ msgstr ""
-#~ "Sorry, geen netwerken gevonden. Je kunt proberen om Bluetooth aan te "
-#~ "zetten."
-#~ msgid "Sorry, we can't find any networks. You could try turning on Wired."
-#~ msgstr ""
-#~ "Sorry, geen netwerken gevonden. Je kunt proberen on Wired aan te zetten."
+#~ msgstr "Sorry, geen netwerken gevonden. Je kunt proberen om WiMAX aan te zetten."
+
+#~ msgid "Sorry, we can't find any networks. You could try turning on Bluetooth."
+#~ msgstr "Sorry, geen netwerken gevonden. Je kunt proberen om Bluetooth aan te zetten."
+#~ msgid "Sorry, we can't find any networks. You could try turning on Wired."
+#~ msgstr "Sorry, geen netwerken gevonden. Je kunt proberen on Wired aan te zetten."
--- po/pa.po
+++ po/pa.po
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: carrick-ng.Moblin2-UI.carrick\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-05 09:27+0000\n"
-"PO-Revision-Date: 2010-05-06 07:57+0530\n"
+"POT-Creation-Date: 2010-07-03 11:59+0000\n"
+"PO-Revision-Date: 2010-07-30 08:54+0530\n"
"Last-Translator: A S Alam <aalam at users.sf.net>\n"
"Language-Team: Punjabi/Panjabi <punjabi-users at lists.sf.net>\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,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 " ਜਾਂ "
@@ -30,30 +30,31 @@
#. * 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 "ਤਾਰ"
-#: ../carrick/carrick-list.c:854 ../carrick/carrick-pane.c:1368
+#. Switches
+#: ../carrick/carrick-list.c:850 ../carrick/carrick-pane.c:1429
#: ../carrick/carrick-util.c:32
msgid "WiFi"
msgstr "ਵਾਈ-ਫਾਈ"
-#: ../carrick/carrick-list.c:855 ../carrick/carrick-pane.c:1443
+#: ../carrick/carrick-list.c:851 ../carrick/carrick-pane.c:1471
#: ../carrick/carrick-util.c:38
msgid "WiMAX"
msgstr "ਵਾਈਮੈਕਸ"
-#: ../carrick/carrick-list.c:856 ../carrick/carrick-pane.c:1418
+#: ../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:1468
+#: ../carrick/carrick-list.c:853 ../carrick/carrick-pane.c:1485
#: ../carrick/carrick-util.c:40
msgid "Bluetooth"
msgstr "ਬਲਿਊਟੁੱਥ"
@@ -63,7 +64,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."
@@ -75,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 ਨੂੰ ਚਾਲੂ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹੋ।"
@@ -89,53 +90,53 @@
#. * 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 "
@@ -144,7 +145,7 @@
"ਅਫਸੋਸ, ਤੁਹਾਡਾ ਕੁਨੈਕਸ਼ਨ %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 "
@@ -153,21 +154,21 @@
"ਅਫਸੋਸ, ਤੁਹਾਡਾ %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 "
@@ -176,18 +177,18 @@
"ਅਫਸੋਸ, ਤੁਹਾਡਾ ਕੁਨੈਕਸ਼ਨ %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 ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਕਰ ਦਿੱਤਾ "
"ਹੈ।"
-#: ../carrick/carrick-pane.c:629
+#: ../carrick/carrick-pane.c:634
msgid "New connection settings"
msgstr "ਨਵਾਂ ਕੁਨੈਕਸ਼ਨ ਸੈਟਿੰਗ"
-#: ../carrick/carrick-pane.c:667
+#: ../carrick/carrick-pane.c:672
msgid ""
"Enter the name of the network you want\n"
"to connect to and, where necessary, the\n"
@@ -197,43 +198,43 @@
"ਚਾਹੁੰਦੇ ਹੋ, ਅਤੇ ਜਿੱਥੇ ਲਾਜ਼ਮੀ ਹੋਵੇ, ਉੱਥੇ ਪਾਸਵਰਡ\n"
"ਅਤੇ ਸੁਰੱਖਿਆ ਟਾਈਮ ਵੀ ਦਿਓ।"
-#: ../carrick/carrick-pane.c:677
+#: ../carrick/carrick-pane.c:682
msgid "Network name"
msgstr "ਨੈੱਟਵਰਕ ਨਾਂ"
-#: ../carrick/carrick-pane.c:689
+#: ../carrick/carrick-pane.c:694
msgid "Network security"
msgstr "ਨੈੱਟਵਰਕ ਸੁਰੱਖਿਆ"
-#: ../carrick/carrick-pane.c:699
+#: ../carrick/carrick-pane.c:704
msgid "None"
msgstr "ਕੋਈ ਨਹੀਂ"
-#: ../carrick/carrick-pane.c:711
+#: ../carrick/carrick-pane.c:716
msgid "Password"
msgstr "ਪਾਸਵਰਡ"
-#: ../carrick/carrick-pane.c:726 ../carrick/carrick-service-item.c:1303
+#: ../carrick/carrick-pane.c:731 ../carrick/carrick-service-item.c:1787
msgid "Show password"
msgstr "ਪਾਸਵਰਡ ਵੇਖੋ"
-#: ../carrick/carrick-pane.c:1356
+#: ../carrick/carrick-pane.c:1412
msgid "Settings"
msgstr "ਸੈਟਿੰਗ"
-#: ../carrick/carrick-pane.c:1393 ../carrick/carrick-service-item.c:241
+#: ../carrick/carrick-pane.c:1443 ../carrick/carrick-service-item.c:328
msgid "Wired"
msgstr "ਤਾਰ"
-#: ../carrick/carrick-pane.c:1495
-msgid "This will disable all your connections"
-msgstr "ਇਹ ਤੁਹਾਡੇ ਸਭ ਕੁਨੈਕਸ਼ਨ ਆਯੋਗ ਕਰੇਗਾ"
-
-#: ../carrick/carrick-pane.c:1520
+#: ../carrick/carrick-pane.c:1510
msgid "Offline mode"
msgstr "ਆਫਲਾਈਨ ਮੋਡ"
-#: ../carrick/carrick-pane.c:1556 ../src/carrick.c:351
+#: ../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 "ਨੈੱਟਵਰਕ"
@@ -246,86 +247,86 @@
#. The following are potential errors that a user might see while
#. attempting to configure a 3G data service.
#.
-#: ../carrick/carrick-service-item.c:46
+#: ../carrick/carrick-service-item.c:51
msgid "Critical Error: Invalid country code"
msgstr "ਘਾਤਕ ਗਲਤੀ: ਗਲਤ ਦੇਸ਼ ਕੋਡ"
-#: ../carrick/carrick-service-item.c:47
+#: ../carrick/carrick-service-item.c:52
msgid "Missing required APN (service plan name)"
msgstr "ਲੋੜੀਦਾ APN ਗੁੰਮ ਹੈ (ਸਰਵਿਸ ਪਲੈਨ ਨਾਂ)"
-#: ../carrick/carrick-service-item.c:48
+#: ../carrick/carrick-service-item.c:53
msgid "Internal Error: Invalid network service"
msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ: ਗਲਤ ਨੈੱਟਵਰਕ ਸਰਵਿਸ"
-#: ../carrick/carrick-service-item.c:49
+#: ../carrick/carrick-service-item.c:54
msgid "Critical Error: Unable to access Connection Manager"
msgstr "ਨਾਜ਼ੁਕ ਗਲਤੀ: ਕੁਨੈਕਸ਼ਨ ਮੈਨੇਜਰ ਵਰਤਣ ਲਈ ਅਸਮਰੱਥ"
-#: ../carrick/carrick-service-item.c:50
+#: ../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:177
+#: ../carrick/carrick-service-item.c:192
#, c-format
msgid "%s encrypted"
msgstr "%s ਇੰਕ੍ਰਿਪਟਡ"
-#: ../carrick/carrick-service-item.c:272 ../carrick/carrick-service-item.c:289
+#: ../carrick/carrick-service-item.c:340 ../carrick/carrick-service-item.c:357
msgid "Disconnect"
msgstr "ਡਿਸ-ਕੁਨੈਕਟ ਕਰੋ"
-#: ../carrick/carrick-service-item.c:275
+#: ../carrick/carrick-service-item.c:343
msgid "Connected"
msgstr "ਕੁਨੈਕਟ ਹੈ"
-#: ../carrick/carrick-service-item.c:292
+#: ../carrick/carrick-service-item.c:360
msgid "Online"
msgstr "ਆਨਲਾਈਨ"
-#: ../carrick/carrick-service-item.c:299 ../carrick/carrick-service-item.c:308
+#: ../carrick/carrick-service-item.c:367 ../carrick/carrick-service-item.c:376
#, c-format
msgid "Cancel"
msgstr "ਰੱਦ ਕਰੋ"
-#: ../carrick/carrick-service-item.c:302
+#: ../carrick/carrick-service-item.c:370
msgid "Configuring"
msgstr "ਸੰਰਚਨਾ ਜਾਰੀ"
-#: ../carrick/carrick-service-item.c:311
+#: ../carrick/carrick-service-item.c:379
msgid "Associating"
msgstr "ਸਬੰਧਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-#: ../carrick/carrick-service-item.c:320 ../carrick/carrick-service-item.c:345
-#: ../carrick/carrick-service-item.c:1292
+#: ../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:348
+#: ../carrick/carrick-service-item.c:416
msgid "Connection failed"
msgstr "ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੈ"
-#: ../carrick/carrick-service-item.c:351
+#: ../carrick/carrick-service-item.c:419
msgid "Sorry, the connection failed. You could try again."
msgstr "ਅਫਸੋਸ, ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੈ। ਤੁਸੀਂ ਬਾਅਦ 'ਚ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹੋ।"
-#: ../carrick/carrick-service-item.c:357 ../carrick/carrick-service-item.c:360
+#: ../carrick/carrick-service-item.c:425 ../carrick/carrick-service-item.c:428
#, c-format
msgid "Disconnecting"
msgstr "ਡਿਸ-ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-#: ../carrick/carrick-service-item.c:418
+#: ../carrick/carrick-service-item.c:494
msgid "Type password here"
msgstr "ਇੱਥੇ ਪਾਸਵਰਡ ਲਿਖੋ"
-#: ../carrick/carrick-service-item.c:481
+#: ../carrick/carrick-service-item.c:563
msgid "Really remove?"
msgstr "ਕੀ ਹਟਾਉਣਾ ਹੈ?"
-#: ../carrick/carrick-service-item.c:501
+#: ../carrick/carrick-service-item.c:583
#, c-format
msgid ""
"Do you want to remove the %s %s network? This\n"
@@ -336,7 +337,7 @@
"ਪਾਸਵਰਡ ਵੀ ਭੁੱਲਾ ਦਿੱਤਾ ਜਾਵੇਗਾ ਅਤੇ ਤੁਸੀਂ %s ਨਾਲ ਆਟੋਮੈਟਿਕ\n"
"ਕੁਨੈਕਟ ਨਹੀਂ ਕਰ ਸਕੋਗੇ।"
-#: ../carrick/carrick-service-item.c:686
+#: ../carrick/carrick-service-item.c:786
#, c-format
msgid ""
"Your password isn't the right length. For a WEP connection it needs to be "
@@ -345,7 +346,7 @@
"ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਦੀ ਠੀਕ ਲੰਬਾਈ ਨਹੀਂ ਹੈ। WEP ਕੁਨੈਕਸ਼ਨ ਲਈ, ਇਸ ਦੀ ਲੰਬਾਈ ਜਾਂ ਤਾਂ 10 ਜਾਂ 26 ਅੱਖਰ "
"ਹੋਣੀ ਲਾਜ਼ਮੀ ਹੈ, ਤੁਸੀਂ %i ਰੱਖੇ ਹਨ।"
-#: ../carrick/carrick-service-item.c:697
+#: ../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 "
@@ -354,7 +355,7 @@
"ਤੁਹਾਡਾ ਪਾਸਵਰਡ ਬਹੁਤ ਛੋਟਾ ਹੈ। WPA ਕੁਨੈਕਸ਼ਨ ਲਈ ਘੱਟੋ-ਘੱਟ 8 ਅੱਖਰ ਹੋਣੇ ਲਾਜ਼ਮੀ ਹਨ, ਤੁਸੀਂ %i ਹੀ ਦਿੱਤੇ "
"ਹਨ।"
-#: ../carrick/carrick-service-item.c:701
+#: ../carrick/carrick-service-item.c:801
#, c-format
msgid ""
"Your password is too long. For a WPA connection it needs to have fewer than "
@@ -362,7 +363,7 @@
msgstr ""
"ਤੁਹਾਡਾ ਪਾਸਵਰਡ ਬਹੁਤ ਵੱਡਾ ਹੈ। WPA ਕੁਨੈਕਸ਼ਨ ਲਈ 63 ਅੱਖਰਾਂ ਤੋਂ ਘੱਟ ਹੋਣੇ ਲਾਜ਼ਮੀ ਹਨ, ਤੁਸੀਂ %i ਦਿੱਤੇ ਹਨ।"
-#: ../carrick/carrick-service-item.c:710
+#: ../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 "
@@ -371,7 +372,7 @@
"ਤੁਹਾਡਾ ਪਾਸਵਰਡ ਬਹੁਤ ਛੋਟਾ ਹੈ। WPA2 ਕੁਨੈਕਸ਼ਨ ਲਈ ਘੱਟੋ-ਘੱਟ 8 ਅੱਖਰ ਹੋਣੇ ਲਾਜ਼ਮੀ ਹਨ, ਤੁਸੀਂ %i ਹੀ ਦਿੱਤੇ "
"ਹਨ।"
-#: ../carrick/carrick-service-item.c:714
+#: ../carrick/carrick-service-item.c:814
#, c-format
msgid ""
"Your password is too long. For a WPA2 connection it needs to have fewer "
@@ -380,7 +381,29 @@
"ਤੁਹਾਡਾ ਪਾਸਵਰਡ ਬਹੁਤ ਵੱਡਾ ਹੈ। WPA2 ਕੁਨੈਕਸ਼ਨ ਲਈ 63 ਅੱਖਰਾਂ ਤੋਂ ਘੱਟ ਹੋਣੇ ਲਾਜ਼ਮੀ ਹਨ, ਤੁਸੀਂ %i ਦਿੱਤੇ "
"ਹਨ।"
-#: ../carrick/carrick-service-item.c:1228
+#: ../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 "ਸਕੈਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
@@ -388,67 +411,106 @@
#. 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:1247
+#: ../carrick/carrick-service-item.c:1729
msgid "WPA2 encrypted"
msgstr "WPA2 ਇੰਕ੍ਰਿਪਟਡ"
-#: ../src/carrick.c:43
+#. 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: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 - ਵਾਈਮੈਕਸ"
-#: ../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 "ਹੋਰ ਵਿੰਡੋ ਵਿੱਚ ਇੰਬੈੱਡ (--standalone ਅਣਡਿੱਠਾ)"
-#: ../src/carrick.c:292
+#: ../src/carrick.c:310
msgid "Carrick connectivity applet"
msgstr "ਕੱਰਿਕ ਕੁਨੈਕਟਵਿਟੀ ਐਪਲਿਟ"
-#: ../src/carrick.c:293
-msgid "- Moblin connectivity applet"
-msgstr "- ਮੋਬਲਿਨ ਕੁਨੈਕਟਵਿਟੀ ਐਪਲਿਟ"
+#: ../src/carrick.c:311
+msgid "- MeeGo connectivity applet"
+msgstr "- ਮੀਗੋ ਕੁਨੈਕਟਵਿਟੀ ਐਪਲਿਟ"
-#: ../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 "ਨੈੱਟਵਰਕ"
--- po/tr.po
+++ po/tr.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-19 09:20+0000\n"
+"POT-Creation-Date: 2010-07-03 11:59+0000\n"
"PO-Revision-Date: 2010-05-21 11:58-0500\n"
"Last-Translator: Ahmet Özgür Erdemli <dbl2010 at gmail.com>\n"
"Language-Team: MeeGo Türkçe\n"
@@ -16,70 +16,64 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Poedit-Language: Turkish\n"
-"X-Poedit-Country: TURKEY\n"
"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Country: TURKEY\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:843
msgid " or "
msgstr " ya da "
-#.
-#. * 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: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 "kablolulu"
#. 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"
-#.
#. * 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 "Üzgünüz, hiç bir ağ bulamıyoruz. Bağlantı Yöneticisi çalışmıyor gibi görünüyor. Bilgisayarınızı yeniden başlatmayı deneyebilirsiniz."
-#.
#. * 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 "Üzgünüz, hiç bir ağ bulamıyoruz. Çevrimdışı modunu değiştirmeyi deneyebilirsiniz."
@@ -89,83 +83,82 @@
msgid "Sorry, we can't find any networks. You could try enabling %s."
msgstr "Üzgünüz, hiç bir ağ bulamıyoruz. %s açmayı deneyebilirsiniz."
-#.
#. * 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 "Üzgünüz, hiç bir ağ bulamıyoruz."
-#: ../carrick/carrick-notification-manager.c:104
+#: ../carrick/carrick-notification-manager.c:124
msgid "Network connected"
msgstr "Ağa bağlanıldı"
-#: ../carrick/carrick-notification-manager.c:112
+#: ../carrick/carrick-notification-manager.c:132
#, c-format
msgid "You're now connected to a wired network"
msgstr "Kablolu ağa bağlandınız"
-#: ../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 "Şu an %s 'e bağlısınız, bir %s ağı"
-#: ../carrick/carrick-notification-manager.c:148
+#: ../carrick/carrick-notification-manager.c:168
#, c-format
msgid "You're now connected to a %s network"
msgstr "Şu an bir %s ağına bağlısınız"
-#: ../carrick/carrick-notification-manager.c:165
+#: ../carrick/carrick-notification-manager.c:185
msgid "Network lost"
msgstr "Ağ bağlantısı kayboldu"
-#: ../carrick/carrick-notification-manager.c:173
+#: ../carrick/carrick-notification-manager.c:193
#, c-format
msgid "Sorry, we've lost your wired connection"
msgstr "Üzgünüz, kablolu bağlantınızı yitirdik"
-#: ../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 "Üzgünüz, %s bağlantınızı %s e kaybettik"
-#: ../carrick/carrick-notification-manager.c:183
+#: ../carrick/carrick-notification-manager.c:203
#, c-format
msgid "Sorry, we've lost your %s connection"
msgstr "Üzgünüz, %s bağlantınızı kaybettik"
-#: ../carrick/carrick-notification-manager.c:200
+#: ../carrick/carrick-notification-manager.c:220
msgid "Network changed"
msgstr "Ağ değişti"
-#: ../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 "Üzgünüz %s bağlantınız kayboldu. Bu yüzden sizi kablolu bir ağa bağladık"
-#: ../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 "Üzgünüz %s bağlantınız kayboldu. Bu yüzden sizi %s'e, bir %s ağına bağladık"
-#: ../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 "Üzgünüz %s bağlantınız kayboldu. Bu yüzden sizi %s ağına bağladık"
-#: ../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 "Üzgünüz %s bağlantınız kayboldu. Bu yüzden sizi kablolu bir ağa bağladık"
-#: ../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 "Üzgünüz %s bağlantınız kayboldu. Bu yüzden sizi %s'e, bir %s ağına bağladık"
-#: ../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 "Üzgünüz %s bağlantınız kayboldu. Bu yüzden sizi %s ağına bağladık"
@@ -200,8 +193,7 @@
msgid "Password"
msgstr "Şifre"
-#: ../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 "Şifreyi göster"
@@ -209,8 +201,7 @@
msgid "Settings"
msgstr "Ayarlar"
-#: ../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 "Kablolu"
@@ -222,8 +213,7 @@
msgid "This will disable all your connections"
msgstr "Bu tüm bağlantılarınızı etkisizleştirecek"
-#: ../carrick/carrick-pane.c:1556
-#: ../src/carrick.c:351
+#: ../carrick/carrick-pane.c:1556 ../src/carrick.c:369
msgid "Networks"
msgstr "Ağlar"
@@ -235,7 +225,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 "Kritik hata: Geçersiz ülke kodu"
@@ -258,68 +248,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 şifrelenmiş"
-#: ../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 "Bağlantıyı kes"
-#: ../carrick/carrick-service-item.c:293
+#: ../carrick/carrick-service-item.c:343
msgid "Connected"
msgstr "Bağlandı"
-#: ../carrick/carrick-service-item.c:310
+#: ../carrick/carrick-service-item.c:360
msgid "Online"
msgstr "Çevirimiçi"
-#: ../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 "İptal"
-#: ../carrick/carrick-service-item.c:320
+#: ../carrick/carrick-service-item.c:370
msgid "Configuring"
msgstr "Ayarlanıyor"
-#: ../carrick/carrick-service-item.c:329
+#: ../carrick/carrick-service-item.c:379
msgid "Associating"
msgstr "İlişkilendiriliyor"
-#: ../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 "Bağlan"
-#: ../carrick/carrick-service-item.c:366
+#: ../carrick/carrick-service-item.c:416
msgid "Connection failed"
msgstr "Bağlantı başarısız"
-#: ../carrick/carrick-service-item.c:369
+#: ../carrick/carrick-service-item.c:419
msgid "Sorry, the connection failed. You could try again."
msgstr "Üzgünüz bağlantı başarısız. Yeniden deneyebilirsiniz."
-#: ../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 "Bağlantı kesiliyor"
-#: ../carrick/carrick-service-item.c:468
+#: ../carrick/carrick-service-item.c:494
msgid "Type password here"
msgstr "Şifreyi girin"
-#: ../carrick/carrick-service-item.c:537
+#: ../carrick/carrick-service-item.c:563
msgid "Really remove?"
msgstr "Kaldırılsın mı?"
-#: ../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"
@@ -330,54 +316,54 @@
" şifrenizi de kaybettirecek ve %s'e bir daha otomatik\n"
" giriş yapamayacaksınız."
-#: ../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 "Şifrenizin uzunluğu uygun değil. WEP bağlantısı için şifreniz 10 ya da 26 karakter olmalı, sizinki %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 "Şifreniz çok kısa. WPA bağlantısı için şifreniz en az 8 karakter olmalı, sizinki %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 "Şifreniz çok uzun. WPA bağlantısı için şifreniz en fazla 63 karakter olmalı, sizinki %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 "Şifreniz çok kısa. WPA2 bağlantısı için şifreniz en az 8 karakter olmalı, sizinki %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 "Şifreniz çok uzun. WPA2 bağlantısı için şifreniz en fazla 63 karakter olmalı, sizinki %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 "Üzgünüz, IP adresi hatalı gibi"
-#: ../carrick/carrick-service-item.c:1239
+#: ../carrick/carrick-service-item.c:1279
msgid "Sorry, it looks like the gateway address is not valid"
msgstr "Üzgünüz, ağ geçidi hatalı gibi"
-#: ../carrick/carrick-service-item.c:1251
+#: ../carrick/carrick-service-item.c:1291
msgid "Sorry, it looks like the subnet mask is not valid"
msgstr "Üzgünüz, altağ maskelemesi hatalı gibi"
-#: ../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 "Üzgünüz, %s DNS adresi hatalı gibi"
#. 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 "Gelişmiş"
-#: ../carrick/carrick-service-item.c:1604
+#: ../carrick/carrick-service-item.c:1708
msgid "Scanning"
msgstr "Tarıyor"
@@ -385,114 +371,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 şifrelenmiş"
#. 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 "Bağlantı yöntemi:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1734
+#: ../carrick/carrick-service-item.c:1838
msgid "IP address:"
msgstr "IP adresi:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1736
+#: ../carrick/carrick-service-item.c:1840
msgid "Subnet mask:"
msgstr "Altağ maskesi:"
#. TRANSLATORS: label in advanced settings
-#: ../carrick/carrick-service-item.c:1738
+#: ../carrick/carrick-service-item.c:1842
msgid "Router:"
msgstr "Yönlendirici:"
#. 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 "Statik 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 "Uygula"
-#: ../src/carrick.c:43
+#: ../src/carrick.c:49
msgid "networks - not connected"
msgstr "ağlar - bağlı değil"
-#: ../src/carrick.c:49
+#: ../src/carrick.c:55
msgid "networks - connecting"
msgstr "ağlar - bağlanıyor"
-#: ../src/carrick.c:55
+#: ../src/carrick.c:61
msgid "networks - wired"
msgstr "ağlar - kablolu"
-#: ../src/carrick.c:57
+#: ../src/carrick.c:63
#, c-format
msgid "networks - %s - wifi"
msgstr "ağlar - %s - wifi"
-#: ../src/carrick.c:60
+#: ../src/carrick.c:66
#, c-format
msgid "networks - %s - wimax"
msgstr "ağlar - %s - wimax"
-#: ../src/carrick.c:63
+#: ../src/carrick.c:69
#, c-format
msgid "networks - %s - 3G"
msgstr "ağlar - %s - 3G"
-#: ../src/carrick.c:66
+#: ../src/carrick.c:72
#, c-format
msgid "networks - %s - bluetooth"
msgstr "ağlar - %s - bluetooth"
-#: ../src/carrick.c:69
-#: ../src/carrick.c:81
+#: ../src/carrick.c:75 ../src/carrick.c:87
msgid "networks"
msgstr "ağlar"
-#: ../src/carrick.c:76
+#: ../src/carrick.c:82
msgid "networks - error"
msgstr "ağlar - hata"
-#: ../src/carrick.c:279
+#: ../src/carrick.c:297
msgid "Run in standalone mode"
msgstr "Tek başına bağımsız çalış"
-#: ../src/carrick.c:281
+#: ../src/carrick.c:299
msgid "Embed in another window (overrides --standalone)"
msgstr "Başka bir pencerenin içine koy. (bağımsız çalışmayı geçersiz kılar)"
-#: ../src/carrick.c:292
+#: ../src/carrick.c:310
msgid "Carrick connectivity applet"
msgstr "Carrick bağlantı uygulaması"
-#: ../src/carrick.c:293
-msgid "- Moblin connectivity applet"
-msgstr "- Moblin bağlantı uygulaması"
+#: ../src/carrick.c:311
+msgid "- MeeGo connectivity applet"
+msgstr "- MeeGo bağlantı uygulaması"
-#: ../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 "ağ"
#: ../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"
@@ -554,4 +537,3 @@
#: ../data/carrick.desktop.in.in.h:1
msgid "Network settings"
msgstr "Ağ ayarları"
-
--- po/zh_TW.po
+++ po/zh_TW.po
@@ -2,12 +2,12 @@
# Copyright (C) 2010 carrick-ng'S COPYRIGHT HOLDER
# This file is distributed under the same license as the carrick-ng package.
# Cheng-Chia Tseng <pswo10680 at gmail.com>, 2010.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: carrick-ng master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-10 09:18+0000\n"
+"POT-Creation-Date: 2010-07-03 11:59+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: Cheng-Chia Tseng <pswo10680 at gmail.com>\n"
"Language-Team: chinese-l10n <chinese-l10n at googlegroups.com>\n"
@@ -16,67 +16,61 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\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: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:848
msgid ", "
-msgstr "、"
+msgstr ", "
-#: ../carrick/carrick-list.c:849
-#: ../carrick/carrick-util.c:34
+#: ../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-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 "藍牙"
-#.
#. * 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 "抱歉，我們找不到任何網路。您可以試著停用離線模式。"
@@ -86,11 +80,10 @@
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 "抱歉，我們找不到任何網路。 "
@@ -197,8 +190,7 @@
msgid "Password"
msgstr "密碼"
-#: ../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 "顯示密碼"
@@ -206,8 +198,7 @@
msgid "Settings"
msgstr "設定值"
-#: ../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 "有線"
@@ -219,8 +210,7 @@
msgid "This will disable all your connections"
msgstr "這會停用所有您的連線"
-#: ../carrick/carrick-pane.c:1556
-#: ../src/carrick.c:369
+#: ../carrick/carrick-pane.c:1556 ../src/carrick.c:369
msgid "Networks"
msgstr "網路"
@@ -232,7 +222,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 "嚴重錯誤：無效的國家代碼"
@@ -255,14 +245,13 @@
#. 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
+#: ../carrick/carrick-service-item.c:340 ../carrick/carrick-service-item.c:357
msgid "Disconnect"
msgstr "斷開"
@@ -274,8 +263,7 @@
msgid "Online"
msgstr "在線"
-#: ../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 "取消"
@@ -288,8 +276,7 @@
msgid "Associating"
msgstr "正在取得連繫"
-#: ../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 "連接"
@@ -302,8 +289,7 @@
msgid "Sorry, the connection failed. You could try again."
msgstr "抱歉，連線失敗。您可以再試一次。"
-#: ../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 "正在斷開連接"
@@ -457,8 +443,7 @@
msgid "networks - %s - bluetooth"
msgstr "網路 - %s - 藍牙"
-#: ../src/carrick.c:75
-#: ../src/carrick.c:87
+#: ../src/carrick.c:75 ../src/carrick.c:87
msgid "networks"
msgstr "網路"
@@ -482,14 +467,12 @@
msgid "- MeeGo connectivity applet"
msgstr "- MeeGo 連線面板程式"
-#: ../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 "網路"
#: ../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"
@@ -554,73 +537,90 @@
#~ msgid "Select your 3G Data Plan"
#~ msgstr "選取您的 3G Data Plan"
+
#~ msgid "Plan Name: (required)"
#~ msgstr "Plan 名稱：(需要)"
+
#~ msgid "Tertairy DNS:"
#~ msgstr "Tertairy DNS:"
+
#~ 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 ""
-#~ "很抱歉，我們找不到任何網絡。連接管理員似乎沒有正在執行。您可以嘗試重新啟動"
-#~ "您的網路筆電。"
+
+#~ 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 "很抱歉，我們找不到任何網絡。連接管理員似乎沒有正在執行。您可以嘗試重新啟動您的網路筆電。"
+
#~ 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."
+
+#~ 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 "抱歉，我們找不到任何網路。您可以試著啟動有線。 "
+
#~ 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 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 ""
-#~ "很抱歉，我們無法找到任何網絡。連接管理員似乎並沒有運行。您可以嘗試重新啟動"
-#~ "您的設備。"
+
+#~ 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 "很抱歉，我們無法找到任何網絡。連接管理員似乎並沒有運行。您可以嘗試重新啟動您的設備。"
+
#~ msgid "Passphrase required"
#~ msgstr "密語必要"
-
++++++ 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.13
+Version: 1.2.14
Release: 1
Group: Applications/Internet
License: GPL 2
@@ -21,7 +21,7 @@
- libnotify
- mx-gtk-1.0
- meego-panel >= 0.49.0
- - rest-0.6
+ - rest-0.7
- mobile-broadband-provider-info
- iso-codes
Obsoletes:
More information about the MeeGo-commits
mailing list