aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--po/it.po1682
-rw-r--r--po/zh_HK.po827
-rw-r--r--po/zh_TW.po827
-rw-r--r--src/empathy-accounts-dialog.c59
4 files changed, 1946 insertions, 1449 deletions
diff --git a/po/it.po b/po/it.po
index da0970ef2..1579ad880 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,22 +1,23 @@
# Italian translation for Empaty
-# Copyright (C) 2003-2008, 2009, 2010 The Free Software Foundation, Inc.
+# Copyright (C) 2003-2010, 2011 The Free Software Foundation, Inc.
# This file is distributed under the same license as the Empaty package.
# Fabio Bonelli <fabiobonelli@libero.it>, 2003
# Michele Baldessari <michele@pupazzo.org>, 2003
+# Milo Casagrande <milo@ubuntu.com>, 2007-2010, 2011.
#
-#
-# Milo Casagrande <milo@ubuntu.com>, 2007-2008, 2009, 2010.
msgid ""
msgstr ""
"Project-Id-Version: Empathy\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 14:19+0200\n"
-"PO-Revision-Date: 2010-09-25 14:41+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-03-22 12:06+0000\n"
+"PO-Revision-Date: 2011-03-21 16:01+0100\n"
"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../data/empathy.desktop.in.in.h:1
@@ -124,243 +125,233 @@ msgid "Empathy default download folder"
msgstr "Cartella predefinita per gli scaricamenti"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has asked about importing accounts"
-msgstr "Indica se è stata fatta richiesta di importare gli account"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr ""
"Indica se il programma ha eseguito la migrazione dei registri di butterfly"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy should auto-away when idle"
msgstr ""
"Indica se il programma deve impostare automaticamente lo stato di assenza "
"quando inattivo"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy should auto-connect on startup"
msgstr "Indica se il programma deve connettersi automaticamente all'avvio"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy should reduce the location's accuracy"
msgstr ""
"Indica se il programma deve ridurre la precisione della posizione geografica"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr ""
"Indica se il programma deve usare l'immagine del contatto come icona della "
"finestra della conversazione"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Enable WebKit Developer Tools"
msgstr "Abilita gli strumenti per sviluppatori di WebKit"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Enable popup notifications for new messages"
-msgstr "Abilita le notifiche sonore per i nuovi messaggi"
+msgstr "Abilita le notifiche per i nuovi messaggi"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable spell checker"
msgstr "Abilita il correttore ortografico"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Hide main window"
msgstr "Nasconde la finestra principale"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide the main window."
msgstr "Nasconde la finestra principale."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Nick completed character"
msgstr "Carattere soprannome completato"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Open new chats in separate windows"
msgstr "Apre nuove conversazioni in finestre separate"
# (ndt) messo con la maiuscola, dovrebbe essere con la maiuscola il nome originale
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Path of the Adium theme to use"
msgstr "Percorso al tema di Adium da usare"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr ""
"Il percorso al tema di Adium da usare se il tema scelto per la conversazione "
"è Adium."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Play a sound for incoming messages"
msgstr "Emette un suono all'arrivo dei messaggi"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Play a sound for new conversations"
msgstr "Emette un suono per le nuove conversazioni"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Play a sound for outgoing messages"
msgstr "Emette un suono all'invio dei messaggi"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound when a contact logs in"
msgstr "Emette un suono quando un contatto si collega"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound when a contact logs out"
msgstr "Emette un suono quando un contatto si scollega"
# (ndt) per cercare di renderla impersonale
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound when we log in"
msgstr "Emette un suono quando l'utente locale si collega"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when we log out"
msgstr "Emette un suono quando l'utente locale si scollega"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Pop up notifications if the chat isn't focused"
msgstr "Notifica se la conversazione non ha il focus"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Pop up notifications when a contact logs in"
msgstr "Notifica quando un contatto si collega"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Pop up notifications when a contact logs out"
msgstr "Notifica quando un contatto si scollega"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Show avatars"
msgstr "Mostra gli avatar"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Show contact list in rooms"
msgstr "Mostra l'elenco contatti nelle stanze di conversazione"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Show hint about closing the main window"
msgstr "Mostra suggerimento riguardo la chiusura della finestra principale"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show offline contacts"
msgstr "Mostra contatti fuori rete"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show protocols"
msgstr "Mostra i protocolli"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Spell checking languages"
msgstr "Lingue controllo ortografico"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "The default folder to save file transfers in."
msgstr "La cartella predefinita in cui salvare i file ricevuti."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "The last directory that an avatar image was chosen from."
msgstr "L'ultima directory da cui è stata scelta un'immagine per l'avatar."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "The position for the chat window side pane"
msgstr "La posizione del riquadro laterale della finestra di conversazione"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "The stored position (in pixels) of the chat window side pane."
msgstr ""
"Lo posizione (in pixel) salvata del riquadro laterale della finestra di "
"conversazione."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The theme that is used to display the conversation in chat windows."
msgstr ""
"Il tema usato per mostrare le conversazioni nelle finestre di conversazione."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "Use graphical smileys"
msgstr "Utilizza faccine grafiche"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use notification sounds"
msgstr "Utilizza suoni per le notifiche"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "Use theme for chat rooms"
msgstr "Utilizza un tema per le stanze di conversazione"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr ""
"Indica se il programma può pubblicare o meno la propria posizione geografica "
"agli altri contatti."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can use the GPS to guess the location."
msgstr ""
"Indica se il programma può usare o meno il GPS per ipotizzare la posizione "
"geografica."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr ""
"Indica se il programma può usare o meno la rete dei telefoni cellulari per "
"ipotizzare la posizione geografica."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can use the network to guess the location."
msgstr ""
"Indica se il programma può usare o meno la rete per ipotizzare la posizione "
"geografica."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr ""
-"Indica se il programma ha richiesto o meno l'importazione degli account da "
-"un altro programma."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Indica se il programma ha migrato o meno i registri di butterfly."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr ""
"Indica se il programma deve collegarsi o meno automaticamente agli account "
"all'avvio."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr ""
"Indica se il programma deve impostare o meno automaticamente lo stato di "
"assenza se l'utente è inattivo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
"Indica se il programma deve ridurre o meno la precisione della posizione "
"geografica per motivi di privacy."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr ""
"Indica se il programma deve usare o meno l'immagine del contatto come icona "
"della finestra della conversazione."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
"Indica se gli strumenti per sviluppatori di WebKit, come \"Ispettore web\", "
"debbano essere abilitati."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
@@ -368,71 +359,71 @@ msgstr ""
"Indica se deve essere usato o meno il gestore della connessione per "
"disconnettersi/connettersi automaticamente."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr ""
"Indica se verificare o meno le parole digitate con le lingue selezionate."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid "Whether to convert smileys into graphical images in conversations."
msgstr ""
"Indica se convertire o meno le faccine in immagini grafiche durante le "
"conversazioni."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr ""
"Indica se emettere o meno un suono quando i contatti si collegano alla rete."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr ""
"Indica se emettere o meno un suono quando i contatti si scollegano dalla "
"rete."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether to play a sound to notify of events."
msgstr "Indica se emettere o meno un suono per segnalare gli eventi."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid "Whether to play a sound to notify of incoming messages."
msgstr "Indica se emettere o meno un suono all'arrivo dei messaggi."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to play a sound to notify of new conversations."
msgstr "Indica se emettere o meno un suono per le nuove conversazioni."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Indica se emettere o meno un suono per l'invio dei messaggi."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid "Whether to play a sound when logging into a network."
msgstr "Indica se emettere o meno un suono quando ci si collega in una rete."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound when logging out of a network."
msgstr "Indica se emettere o meno un suono quando ci si scollega da una rete."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play sound notifications when away or busy."
msgstr ""
-"Indica se emettere o meno una notifica sonora quando si è assenti o non "
+"Indica se emettere o meno notifiche sonore quando si è assenti o non "
"disponibili."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to show a popup notification when a contact goes offline."
msgstr ""
"Indica se mostrare o meno una notifica quando un contatto va fuori rete."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to show a popup notification when a contact goes online."
msgstr ""
"Indica se mostrare o meno una notifica quando un contatto entra in rete."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -440,43 +431,43 @@ msgstr ""
"Indica se mostrare o meno una notifica quando si riceve un nuovo messaggio "
"anche se la finestra di conversazione è già aperta, ma non ha il focus."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to show a popup notification when receiving a new message."
msgstr ""
"Indica se mostrare o meno una notifica quando si riceve un nuovo messaggio."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
"Indica se mostrare o meno le immagini dei contatti nell'elenco contatti e "
"nelle finestre di conversazione."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show contacts that are offline in the contact list."
msgstr ""
"Indica se mostrare o meno i contatti fuori rete nell'elenco dei contatti."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to show popup notifications when away or busy."
msgstr ""
-"Indica se mostrare o meno una notifica quando si è assenti o non disponibili."
+"Indica se mostrare o meno notifiche quando si è assenti o non disponibili."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to show protocols for contacts in the contact list."
msgstr ""
"Indica se mostrare o meno i protocolli per i contatti nell'elenco contatti."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show the contact list in chat rooms."
msgstr ""
"Indica se mostrare o meno l'elenco contatti nelle stanze di conversazione."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show the contact list in compact mode."
msgstr "Indica se mostrare o meno l'elenco contatti in modalità compatta."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
@@ -484,11 +475,11 @@ msgstr ""
"Indica se mostrare o meno un dialogo riguardo la chiusura della finestra "
"principale con il pulsante \"x\" nella barra del titolo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to use the theme for chat rooms."
msgstr "Indica se usare o meno un tema per le stanze di conversazione."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid ""
"Which criterion to use when sorting the contact list. Default is to sort by "
"the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -504,18 +495,15 @@ msgstr "Gestisce account di messaggistica e VoIP"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2157
+#: ../src/empathy-accounts-dialog.c:2269
msgid "Messaging and VoIP Accounts"
msgstr "Account di messaggistica e VoIP"
-# (ndt) metto 'codice di controllo' anche se è molto libera, ma se è visibile all'utente, forse è più comprensibile
-#: ../libempathy/empathy-ft-handler.c:851
-msgid "The hash of the received file and the sent one do not match"
-msgstr ""
-"Il codice di controllo del file ricevuto e di quello inviato non "
-"corrispondono"
+#: ../libempathy/empathy-ft-handler.c:825
+msgid "File transfer completed, but the file was corrupted"
+msgstr "Trasferimento file completato, ma il file era danneggiato"
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1113
msgid "File transfer not supported by remote contact"
msgstr "Il trasferimento di file non è supportato dal contatto remoto"
@@ -527,171 +515,174 @@ msgstr "Il file selezionato non è un file regolare"
msgid "The selected file is empty"
msgstr "Il file selezionato è vuoto"
-#: ../libempathy/empathy-tp-file.c:283
+#: ../libempathy/empathy-tp-file.c:268
msgid "Socket type not supported"
msgstr "Tipo di socket non supportato"
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:387
msgid "No reason was specified"
msgstr "Nessun motivo specificato"
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-tp-file.c:390
msgid "The change in state was requested"
msgstr "È stata richiesta la modifica dello stato"
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-tp-file.c:393
msgid "You canceled the file transfer"
msgstr "È stato annullato il trasferimento del file"
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-tp-file.c:396
msgid "The other participant canceled the file transfer"
msgstr "L'altro utente ha annullato il trasferimento del file"
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-tp-file.c:399
msgid "Error while trying to transfer the file"
msgstr "Errore nel tentativo di trasferire il file"
-#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-tp-file.c:402
msgid "The other participant is unable to transfer the file"
msgstr "L'altro utente non è in grado di trasferire il file"
-#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:382
msgid "Unknown reason"
msgstr "Motivo sconosciuto"
-#: ../libempathy/empathy-utils.c:246
+#: ../libempathy/empathy-utils.c:304
msgid "Available"
msgstr "Disponibile"
-#: ../libempathy/empathy-utils.c:248
+#: ../libempathy/empathy-utils.c:306
msgid "Busy"
msgstr "Non disponibile"
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:309
msgid "Away"
msgstr "Assente"
-#: ../libempathy/empathy-utils.c:253
+#: ../libempathy/empathy-utils.c:311
msgid "Invisible"
msgstr "Invisibile"
-#: ../libempathy/empathy-utils.c:255
+#: ../libempathy/empathy-utils.c:313
msgid "Offline"
msgstr "Fuori rete"
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1893
-#: ../src/empathy-call-window.c:1894 ../src/empathy-call-window.c:1895
-#: ../src/empathy-call-window.c:1896 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:315
+#: ../src/empathy-streamed-media-window.c:1904
+#: ../src/empathy-streamed-media-window.c:1905
+#: ../src/empathy-streamed-media-window.c:1906
+#: ../src/empathy-streamed-media-window.c:1907
+#: ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Sconosciuto"
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:354
msgid "No reason specified"
msgstr "Nessun motivo specificato"
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:356 ../libempathy/empathy-utils.c:412
msgid "Status is set to offline"
msgstr "Lo stato è impostato a «Fuori rete»"
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:358 ../libempathy/empathy-utils.c:392
msgid "Network error"
msgstr "Errore di rete"
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:360 ../libempathy/empathy-utils.c:394
msgid "Authentication failed"
msgstr "Autenticazione non riuscita"
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:362 ../libempathy/empathy-utils.c:396
msgid "Encryption error"
msgstr "Errore di cifratura"
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:364
msgid "Name in use"
msgstr "Nome in uso"
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:366 ../libempathy/empathy-utils.c:398
msgid "Certificate not provided"
msgstr "Certificato non fornito"
-#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:368 ../libempathy/empathy-utils.c:400
msgid "Certificate untrusted"
msgstr "Certificato non fidato"
-#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:370 ../libempathy/empathy-utils.c:402
msgid "Certificate expired"
msgstr "Certificato scaduto"
-#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:372 ../libempathy/empathy-utils.c:404
msgid "Certificate not activated"
msgstr "Certificato non attivato"
-#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:374 ../libempathy/empathy-utils.c:406
msgid "Certificate hostname mismatch"
msgstr "Corrispondenza errata nel nome host del certificato"
-#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:376 ../libempathy/empathy-utils.c:408
msgid "Certificate fingerprint mismatch"
msgstr "Corrispondenza errata nell'impronta del certificato"
-#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:378 ../libempathy/empathy-utils.c:410
msgid "Certificate self-signed"
msgstr "Certificato auto-firmato"
-#: ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:380
msgid "Certificate error"
msgstr "Errore nel certificato"
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:414
msgid "Encryption is not available"
msgstr "La cifratura non è disponibile"
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:416
msgid "Certificate is invalid"
msgstr "Il certificato non è valido"
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:418
msgid "Connection has been refused"
msgstr "La connessione è stata rifiutata"
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:420
msgid "Connection can't be established"
msgstr "La connessione non può essere stabilita"
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:422
msgid "Connection has been lost"
msgstr "La connessione è stata persa"
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:424
msgid "This resource is already connected to the server"
msgstr "Questa risorsa è già collegata al server"
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:426
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr ""
"La connessione è stata sostituita con una nuova che sfrutta la stessa risorsa"
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:429
msgid "The account already exists on the server"
msgstr "L'account esiste già sul server"
# (ndt) rivedere too busy
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:431
msgid "Server is currently too busy to handle the connection"
msgstr "Il server è troppo carico per gestire la connessione"
-#: ../libempathy/empathy-utils.c:375
+#: ../libempathy/empathy-utils.c:433
msgid "Certificate has been revoked"
msgstr "Il certificato è stato revocato"
-#: ../libempathy/empathy-utils.c:377
+#: ../libempathy/empathy-utils.c:435
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr ""
"Il cifrario utilizzato dall'algoritmo del certificato non è sicuro o ha una "
"cifratura debole"
-#: ../libempathy/empathy-utils.c:380
+#: ../libempathy/empathy-utils.c:438
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
@@ -699,17 +690,21 @@ msgstr ""
"La lunghezza del certificato o la profondità della catena del certificato "
"del server supera i limiti imposti dalla libreria di cifratura"
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:601
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Persone nelle vicinanze"
# (ndt) opzione
-#: ../libempathy/empathy-utils.c:549
+#: ../libempathy/empathy-utils.c:606
msgid "Yahoo! Japan"
msgstr "Yahoo! Giappone"
-#: ../libempathy/empathy-utils.c:550
+#: ../libempathy/empathy-utils.c:635
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../libempathy/empathy-utils.c:636
msgid "Facebook Chat"
msgstr "Chat di Facebook"
@@ -759,72 +754,89 @@ msgstr[1] "%d mesi fa"
msgid "in the future"
msgstr "nel futuro"
-#: ../libempathy-gtk/empathy-account-chooser.c:463
+#: ../libempathy-gtk/empathy-account-chooser.c:491
msgid "All"
msgstr "Tutti"
-#: ../libempathy-gtk/empathy-account-widget.c:514
-#: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Account"
-#: ../libempathy-gtk/empathy-account-widget.c:515
+#: ../libempathy-gtk/empathy-account-widget.c:683
msgid "Password"
msgstr "Password"
-#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-account-widget.c:684
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Server"
-#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-account-widget.c:685
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Porta"
-#: ../libempathy-gtk/empathy-account-widget.c:589
-#: ../libempathy-gtk/empathy-account-widget.c:646
+#: ../libempathy-gtk/empathy-account-widget.c:757
+#: ../libempathy-gtk/empathy-account-widget.c:814
#, c-format
msgid "%s:"
msgstr "%s:"
+# (ndt) idee su dove/cosa sia My Web Accounts?
+#: ../libempathy-gtk/empathy-account-widget.c:1166
+#, c-format
+msgid "The account %s is edited via My Web Accounts."
+msgstr "L'account %s viene modificato attraverso «My Web Accounts»."
+
+#: ../libempathy-gtk/empathy-account-widget.c:1172
+#, c-format
+msgid "The account %s cannot be edited in Empathy."
+msgstr "L'account %s non può essere modificato utilizzando il programma."
+
#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "Launch My Web Accounts"
+msgstr "Lancia «My Web Accounts»"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1530
msgid "Username:"
msgstr "Nome utente:"
-#: ../libempathy-gtk/empathy-account-widget.c:1521
+#: ../libempathy-gtk/empathy-account-widget.c:1897
msgid "A_pply"
msgstr "A_pplica"
# (ndt) pulsante
-#: ../libempathy-gtk/empathy-account-widget.c:1551
+#: ../libempathy-gtk/empathy-account-widget.c:1927
msgid "L_og in"
msgstr "Acce_di"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1617
+#: ../libempathy-gtk/empathy-account-widget.c:1993
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1401
+#: ../libempathy-gtk/empathy-individual-widget.c:1481
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "Account:"
-#: ../libempathy-gtk/empathy-account-widget.c:1628
+#: ../libempathy-gtk/empathy-account-widget.c:2004
msgid "_Enabled"
msgstr "_Abilitato"
-#: ../libempathy-gtk/empathy-account-widget.c:1693
+#: ../libempathy-gtk/empathy-account-widget.c:2069
msgid "This account already exists on the server"
msgstr "Questo account esiste già sul server"
-#: ../libempathy-gtk/empathy-account-widget.c:1696
+#: ../libempathy-gtk/empathy-account-widget.c:2072
msgid "Create a new account on the server"
msgstr "Creare un nuovo account sul server"
-#: ../libempathy-gtk/empathy-account-widget.c:1789
+#: ../libempathy-gtk/empathy-account-widget.c:2264
msgid "Ca_ncel"
msgstr "A_nnulla"
@@ -833,7 +845,7 @@ msgstr "A_nnulla"
#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2077
+#: ../libempathy-gtk/empathy-account-widget.c:2561
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s su %2$s"
@@ -841,12 +853,12 @@ msgstr "%1$s su %2$s"
# (ndt) il %s pare sia il protocollo
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2103
+#: ../libempathy-gtk/empathy-account-widget.c:2587
#, c-format
msgid "%s Account"
msgstr "Account %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2107
+#: ../libempathy-gtk/empathy-account-widget.c:2591
msgid "New account"
msgstr "Nuovo account"
@@ -877,34 +889,54 @@ msgstr "Avanzate"
msgid "Pass_word:"
msgstr "Pass_word:"
-# (ndt) come in pidgin ;)
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+msgid "Remember Password"
+msgstr "Ricordare la password"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-password-dialog.c:311
+msgid "Remember password"
+msgstr "Ricordare la password"
+
+# (ndt) come in pidgin ;)
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
msgid "Screen _Name:"
msgstr "_Nominativo pubblico:"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
msgid "What is your AIM password?"
msgstr "Qual è la password di AIM?"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
msgid "What is your AIM screen name?"
msgstr "Qual è il nominativo pubblico AIM?"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Port:"
msgstr "_Porta:"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Server:"
@@ -920,11 +952,11 @@ msgstr "<b>Esempio:</b> nomeutente"
msgid "Login I_D:"
msgstr "I_D accesso:"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
msgid "What is your GroupWise User ID?"
msgstr "Qual è l'identificativo GroupWise?"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
msgid "What is your GroupWise password?"
msgstr "Qual è la password di GroupWise?"
@@ -941,11 +973,11 @@ msgstr "Co_difica caratteri:"
msgid "ICQ _UIN:"
msgstr "_UIN ICQ:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
msgid "What is your ICQ UIN?"
msgstr "Qual è il numero ICQ?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
msgid "What is your ICQ password?"
msgstr "Qual è la password di ICQ?"
@@ -1048,13 +1080,13 @@ msgstr "Scavalcare impostazioni server"
msgid "Priori_ty:"
msgstr "Pri_orità:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
msgid "Reso_urce:"
msgstr "_Risorsa:"
# (ndt) sarebbe da segnalare di non usare cose come "questa pagina" dove "questa pagina" è un link...
#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1068,39 +1100,39 @@ msgstr ""
"facebook.com/username/\">questa pagina</a> per sceglierne uno."
# (ndt) opzione
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "Use old SS_L"
msgstr "_Usare vecchio SSL"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Facebook password?"
msgstr "Qual è la password di Facebook?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Facebook username?"
msgstr "Qual è il proprio nome utente di Facebook?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Google ID?"
msgstr "Qual è il proprio identificativo di Google?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Google password?"
msgstr "Qual è la password di Google?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your Jabber ID?"
msgstr "Qual è il proprio identificativo di Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your Jabber password?"
msgstr "Qual è la password di Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
msgid "What is your desired Jabber ID?"
msgstr "Che identificativo Jabber utilizzare?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
msgid "What is your desired Jabber password?"
msgstr "Che password utilizzare?"
@@ -1108,11 +1140,11 @@ msgstr "Che password utilizzare?"
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>Esempio:</b> utente@hotmail.it"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
msgid "What is your Windows Live ID?"
msgstr "Qual è il proprio identificativo di Windows Live?"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
msgid "What is your Windows Live password?"
msgstr "Qual è la password di Windows Live?"
@@ -1193,27 +1225,27 @@ msgstr "Porta:"
msgid "Proxy Options"
msgstr "Opzioni proxy"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
msgid "STUN Server:"
msgstr "Server STUN:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "Server:"
msgstr "Server:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
msgid "Transport:"
msgstr "Trasporto:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "What is your SIP account password?"
msgstr "Qual è la password dell'account SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
msgid "What is your SIP login ID?"
msgstr "Qual è il proprio identificativo di accesso SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
msgid "_Username:"
msgstr "_Nome utente:"
@@ -1222,97 +1254,105 @@ msgid "I_gnore conference and chat room invitations"
msgstr "I_gnorare inviti per conferenze e stanze di conversazione"
# (ndt) metto Yahoo!?
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! ID?"
msgstr "Qual è il proprio identificativo Yahoo?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "What is your Yahoo! password?"
msgstr "Qual è la password di Yahoo?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "Yahoo! I_D:"
msgstr "I_D Yahoo:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
msgid "_Room List locale:"
msgstr "_Nazione elenco stanze:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
msgid "Couldn't convert image"
msgstr "Impossibile convertire l'immagine"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
msgid "None of the accepted image formats are supported on your system"
msgstr "Nessuno dei formati di immagine accettati è supportato dal sistema"
# (ndt) titolo dialogo
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:930
msgid "Select Your Avatar Image"
msgstr "Selezione immagine"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
msgid "No Image"
msgstr "Nessuna immagine"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:995
msgid "Images"
msgstr "Immagini"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:999
msgid "All Files"
msgstr "Tutti i file"
-#: ../libempathy-gtk/empathy-avatar-image.c:323
+#: ../libempathy-gtk/empathy-avatar-image.c:322
msgid "Click to enlarge"
msgstr "Clic per ingrandire"
-#: ../libempathy-gtk/empathy-chat.c:642
+#: ../libempathy-gtk/empathy-chat.c:652
msgid "Failed to open private chat"
msgstr "Apertura della conversazione privata non riuscita"
-#: ../libempathy-gtk/empathy-chat.c:682
+#: ../libempathy-gtk/empathy-chat.c:717
msgid "Topic not supported on this conversation"
msgstr "Argomento non supportato in questa conversazione"
-#: ../libempathy-gtk/empathy-chat.c:688
+#: ../libempathy-gtk/empathy-chat.c:723
msgid "You are not allowed to change the topic"
msgstr "Non si è autorizzati a modificare l'argomento"
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:906
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: pulisce tutti i messaggi dalla conversazione attuale"
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:909
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <argomento>: imposta l'argomento per la conversazione attuale"
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:912
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <ID stanza>: entra in una nuova stanza"
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:915
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <ID stanza>: entra in una nuova stanza"
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:920
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr ""
+"/part [<ID stanza>] [<motivo>]: esce dalla stanza, in modo predefinito "
+"quella attuale"
+
+#: ../libempathy-gtk/empathy-chat.c:925
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <ID contatto> [<messaggio>]: apre una conversazione privata"
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:928
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <ID contatto> <messaggio>: apre una conversazione privata"
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:931
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <soprannome>: modifica il proprio soprannome sul server attuale"
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:934
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <messaggio>: invia un messaggio ACTION alla conversazione attuale"
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:937
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1322,7 +1362,7 @@ msgstr ""
"inviare un messaggio che inizia con «/». Per esempio: \"/say /join è usato "
"per entrare in una nuova stanza\""
-#: ../libempathy-gtk/empathy-chat.c:854
+#: ../libempathy-gtk/empathy-chat.c:942
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1330,85 +1370,99 @@ msgstr ""
"/help [<comando>]: mostra tutti i comandi supportati. Se <comando> è "
"definito, ne mostra l'uso."
-#: ../libempathy-gtk/empathy-chat.c:864
+#: ../libempathy-gtk/empathy-chat.c:952
#, c-format
msgid "Usage: %s"
msgstr "Uso: %s"
-#: ../libempathy-gtk/empathy-chat.c:893
+#: ../libempathy-gtk/empathy-chat.c:991
msgid "Unknown command"
msgstr "Comando sconosciuto"
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1117
msgid "Unknown command; see /help for the available commands"
msgstr "Comando sconosciuto. Provare /help per i comandi disponibili."
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1254
msgid "offline"
msgstr "fuori rete"
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1257
msgid "invalid contact"
msgstr "contatto non valido"
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1260
msgid "permission denied"
msgstr "permesso negato"
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1263
msgid "too long message"
msgstr "messaggio troppo lungo"
-#: ../libempathy-gtk/empathy-chat.c:1164
+#: ../libempathy-gtk/empathy-chat.c:1266
msgid "not implemented"
msgstr "non implementato"
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1270
msgid "unknown"
msgstr "sconosciuto"
-#: ../libempathy-gtk/empathy-chat.c:1172
+#: ../libempathy-gtk/empathy-chat.c:1274
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Errore nell'inviare il messaggio «%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1335 ../src/empathy-chat-window.c:717
msgid "Topic:"
msgstr "Argomento:"
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1347
#, c-format
msgid "Topic set to: %s"
msgstr "Argomento impostato a: %s"
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1349
msgid "No topic defined"
msgstr "Nessun argomento definito"
-#: ../libempathy-gtk/empathy-chat.c:1775
+#: ../libempathy-gtk/empathy-chat.c:1848
msgid "(No Suggestions)"
msgstr "(Nessun suggerimento)"
-#: ../libempathy-gtk/empathy-chat.c:1829
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:1916
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr "Aggiungi «%s» al dizionario"
+
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:1953
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "Aggiungi «%s» al dizionario %s"
+
+#: ../libempathy-gtk/empathy-chat.c:2010
msgid "Insert Smiley"
msgstr "Inserisci faccina"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1801
+#: ../libempathy-gtk/empathy-chat.c:2028
+#: ../libempathy-gtk/empathy-ui-utils.c:1808
msgid "_Send"
msgstr "_Invia"
-#: ../libempathy-gtk/empathy-chat.c:1881
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:2063
msgid "_Spelling Suggestions"
msgstr "_Suggerimenti ortografici"
-#: ../libempathy-gtk/empathy-chat.c:1958
+#: ../libempathy-gtk/empathy-chat.c:2152
msgid "Failed to retrieve recent logs"
-msgstr "Recupero dei registri non riuscito"
+msgstr "Recupero dei registri recenti non riuscito"
# (ndt) messa così per renderla asessuale
-#: ../libempathy-gtk/empathy-chat.c:2064
+#: ../libempathy-gtk/empathy-chat.c:2263
#, c-format
msgid "%s has disconnected"
msgstr "L'utente %s si è disconnesso"
@@ -1416,13 +1470,13 @@ msgstr "L'utente %s si è disconnesso"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2071
+#: ../libempathy-gtk/empathy-chat.c:2270
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s ha espulso %1$s"
# (ndt) messa così per renderla asessuale
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2273
#, c-format
msgid "%s was kicked"
msgstr "L'utente %s è stato espulso"
@@ -1430,19 +1484,19 @@ msgstr "L'utente %s è stato espulso"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2082
+#: ../libempathy-gtk/empathy-chat.c:2281
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s ha bandito %1$s"
# (ndt) messa così per renderla asessuale
-#: ../libempathy-gtk/empathy-chat.c:2085
+#: ../libempathy-gtk/empathy-chat.c:2284
#, c-format
msgid "%s was banned"
msgstr "L'utente %s è stato bandito"
# (ndt) messa così per renderla asessuale
-#: ../libempathy-gtk/empathy-chat.c:2089
+#: ../libempathy-gtk/empathy-chat.c:2288
#, c-format
msgid "%s has left the room"
msgstr "L'utente %s ha lasciato la stanza"
@@ -1452,88 +1506,154 @@ msgstr "L'utente %s ha lasciato la stanza"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2098
+#: ../libempathy-gtk/empathy-chat.c:2297
#, c-format
msgid " (%s)"
msgstr " (%s)"
# (ndt) per renderla "asessuale"
-#: ../libempathy-gtk/empathy-chat.c:2123
+#: ../libempathy-gtk/empathy-chat.c:2322
#, c-format
msgid "%s has joined the room"
msgstr "L'utente %s è entrato nella stanza"
# (ndt) per cercare di stare "asessuali"
-#: ../libempathy-gtk/empathy-chat.c:2148
+#: ../libempathy-gtk/empathy-chat.c:2347
#, c-format
msgid "%s is now known as %s"
msgstr "L'utente %s è ora conosciuto come %s"
# (ndt) plurale per comprendere uomini e donne
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
+#: ../libempathy-gtk/empathy-chat.c:2486
+#: ../src/empathy-streamed-media-window.c:1949
+#: ../src/empathy-event-manager.c:1122
msgid "Disconnected"
msgstr "Disconnessi"
-#: ../libempathy-gtk/empathy-chat.c:2934
-msgid "Wrong password; please try again:"
-msgstr "Password errata. Provare nuovamente:"
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3116
+msgid "Would you like to store this password?"
+msgstr "Salvare questa password?"
-#: ../libempathy-gtk/empathy-chat.c:2935
+# (ndt) pulsante
+#: ../libempathy-gtk/empathy-chat.c:3122
+msgid "Remember"
+msgstr "Ricorda"
+
+# (ndt) pulsante
+#: ../libempathy-gtk/empathy-chat.c:3132
+msgid "Not now"
+msgstr "Non ora"
+
+#: ../libempathy-gtk/empathy-chat.c:3176
msgid "Retry"
msgstr "Riprova"
-#: ../libempathy-gtk/empathy-chat.c:2940
+#: ../libempathy-gtk/empathy-chat.c:3180
+msgid "Wrong password; please try again:"
+msgstr "Password errata. Provare nuovamente:"
+
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3297
msgid "This room is protected by a password:"
msgstr "Questa stanza è protetta da una password:"
# (ndt) pulsante
-#: ../libempathy-gtk/empathy-chat.c:2941
+#: ../libempathy-gtk/empathy-chat.c:3324
msgid "Join"
msgstr "Entra"
-#: ../libempathy-gtk/empathy-chat.c:3081
+#: ../libempathy-gtk/empathy-chat.c:3494 ../src/empathy-event-manager.c:1144
msgid "Connected"
msgstr "Connessi"
-#: ../libempathy-gtk/empathy-chat.c:3134
-#: ../libempathy-gtk/empathy-log-window.c:653
+#: ../libempathy-gtk/empathy-chat.c:3547
+#: ../libempathy-gtk/empathy-log-window.c:650
msgid "Conversation"
msgstr "Conversazione"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+msgid "Unknown or invalid identifier"
+msgstr "Identificatore sconosciuto o non valido"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+msgid "Contact blocking temporarily unavailable"
+msgstr "Blocco del contatto momentaneamente non disponibile"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+msgid "Contact blocking unavailable"
+msgstr "Blocco del contatto non disponibile"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+msgid "Permission Denied"
+msgstr "Permesso negato"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+msgid "Could not block contact"
+msgstr "Impossibile bloccare il contatto"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+msgid "Edit Blocked Contacts"
+msgstr "Modifica contatti bloccati"
+
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:791
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-theme-adium.c:794
msgid "_Copy Link Address"
msgstr "_Copia indirizzo collegamento"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
-#: ../libempathy-gtk/empathy-theme-adium.c:798
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-theme-adium.c:801
msgid "_Open Link"
msgstr "Apri c_ollegamento"
# (ndt) domenica 01 ottobre 2007
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:424
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
# (ndt) titolo dialogo
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
+#: ../libempathy-gtk/empathy-contact-dialogs.c:299
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Modifica informazioni contatto"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:350
msgid "Personal Information"
msgstr "Informazioni personali"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
-#: ../libempathy-gtk/empathy-individual-dialogs.c:112
+#: ../libempathy-gtk/empathy-contact-dialogs.c:459
+#: ../libempathy-gtk/empathy-individual-dialogs.c:119
msgid "New Contact"
msgstr "Nuovo contatto"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:533
+#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#, c-format
+msgid "Block %s?"
+msgstr "Bloccare %s?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr "Bloccare veramente «%s»? "
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:543
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+msgid "_Block"
+msgstr "_Blocca"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "_Segnalare abuso da questo contatto"
+msgstr[1] "_Segnalare abuso da questi contatti"
+
# (ndt) pulsante
#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
msgid "Decide _Later"
@@ -1544,6 +1664,10 @@ msgstr "_Decidi successivamente"
msgid "Subscription Request"
msgstr "Richiesta di approvazione"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "_Block User"
+msgstr "_Blocca utente"
+
# (ndt) inteso come "contatti"
#: ../libempathy-gtk/empathy-contact-list-store.h:71
msgid "Ungrouped"
@@ -1554,286 +1678,307 @@ msgstr "Non raggruppati"
msgid "Favorite People"
msgstr "Preferiti"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2232
+#: ../libempathy-gtk/empathy-contact-list-view.c:2001
+#: ../libempathy-gtk/empathy-individual-view.c:2336
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Rimuovere veramente il gruppo «%s»?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2235
+#: ../libempathy-gtk/empathy-contact-list-view.c:2003
+#: ../libempathy-gtk/empathy-individual-view.c:2339
msgid "Removing group"
msgstr "Rimozione gruppo"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2055
-#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2289
-#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../libempathy-gtk/empathy-contact-list-view.c:2052
+#: ../libempathy-gtk/empathy-contact-list-view.c:2129
+#: ../libempathy-gtk/empathy-individual-view.c:2394
+#: ../libempathy-gtk/empathy-individual-view.c:2588
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "_Rimuovi"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2320
+#: ../libempathy-gtk/empathy-contact-list-view.c:2082
+#: ../libempathy-gtk/empathy-individual-view.c:2458
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Rimuovere veramente il contatto «%s»?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2322
+#: ../libempathy-gtk/empathy-contact-list-view.c:2084
+#: ../libempathy-gtk/empathy-individual-view.c:2479
msgid "Removing contact"
msgstr "Rimozione contatto"
-#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../libempathy-gtk/empathy-contact-menu.c:219
#: ../src/empathy-main-window.ui.h:13
msgid "_Add Contact…"
msgstr "A_ggiungi contatto..."
-#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:514
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:299
+msgid "_Block Contact"
+msgstr "_Blocca contatto"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:328
+#: ../libempathy-gtk/empathy-individual-menu.c:517
+#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "_Conversazione"
-#: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:557
+#: ../libempathy-gtk/empathy-contact-menu.c:359
+#: ../libempathy-gtk/empathy-individual-menu.c:560
msgctxt "menu item"
msgid "_Audio Call"
msgstr "Chiamata _audio"
-#: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:599
+#: ../libempathy-gtk/empathy-contact-menu.c:390
+#: ../libempathy-gtk/empathy-individual-menu.c:602
msgctxt "menu item"
msgid "_Video Call"
msgstr "Chiamata _video"
-#: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:642
-#: ../src/empathy-main-window.ui.h:25
+#: ../libempathy-gtk/empathy-contact-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:645
+#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "Conversazioni _precedenti"
-#: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:683
+#: ../libempathy-gtk/empathy-contact-menu.c:458
+#: ../libempathy-gtk/empathy-individual-menu.c:686
msgid "Send File"
msgstr "Invia file"
# (ndt) voce di menù
-#: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-contact-menu.c:481
+#: ../libempathy-gtk/empathy-individual-menu.c:728
msgid "Share My Desktop"
msgstr "Condividi desktop"
# (ndt) dovrebbe essere relativo a un contatto
-#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1539
-#: ../libempathy-gtk/empathy-individual-menu.c:759
-#: ../libempathy-gtk/empathy-individual-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-menu.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:1763
+#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
msgid "Favorite"
msgstr "Preferito"
-#: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:786
+#: ../libempathy-gtk/empathy-contact-menu.c:550
+#: ../libempathy-gtk/empathy-individual-menu.c:791
msgid "Infor_mation"
msgstr "Informa_zioni"
-#: ../libempathy-gtk/empathy-contact-menu.c:490
+#: ../libempathy-gtk/empathy-contact-menu.c:596
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Modifica"
-#: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:903
+#: ../libempathy-gtk/empathy-contact-menu.c:650
+#: ../libempathy-gtk/empathy-individual-menu.c:972
+#: ../src/empathy-chat-window.c:935
msgid "Inviting you to this room"
msgstr "Invito per questa stanza"
-#: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:681
+#: ../libempathy-gtk/empathy-individual-menu.c:1019
msgid "_Invite to Chat Room"
msgstr "_Invita nella stanza"
+#. Title
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+msgid "Search contacts"
+msgstr "Cerca contatti"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+msgid "Search: "
+msgstr "Cerca:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+msgid "_Add Contact"
+msgstr "A_ggiungi contatto..."
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+msgid "No contacts found"
+msgstr "Nessun contatto trovato"
+
#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
msgstr "Seleziona un contatto"
-#: ../libempathy-gtk/empathy-contact-widget.c:217
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "Nome completo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:218
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "Numero di telefono:"
-#: ../libempathy-gtk/empathy-contact-widget.c:219
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "Indirizzo email:"
-#: ../libempathy-gtk/empathy-contact-widget.c:220
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
msgstr "Sito web:"
-#: ../libempathy-gtk/empathy-contact-widget.c:221
-#: ../libempathy-gtk/empathy-individual-widget.c:152
+#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "Compleanno:"
-#: ../libempathy-gtk/empathy-contact-widget.c:578
-#: ../libempathy-gtk/empathy-individual-widget.c:454
+#: ../libempathy-gtk/empathy-contact-widget.c:762
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Country ISO Code:"
msgstr "Codice ISO del paese:"
-#: ../libempathy-gtk/empathy-contact-widget.c:580
-#: ../libempathy-gtk/empathy-individual-widget.c:456
+#: ../libempathy-gtk/empathy-contact-widget.c:764
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Country:"
msgstr "Paese:"
-#: ../libempathy-gtk/empathy-contact-widget.c:582
-#: ../libempathy-gtk/empathy-individual-widget.c:458
+#: ../libempathy-gtk/empathy-contact-widget.c:766
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "State:"
msgstr "Stato:"
-#: ../libempathy-gtk/empathy-contact-widget.c:584
-#: ../libempathy-gtk/empathy-individual-widget.c:460
+#: ../libempathy-gtk/empathy-contact-widget.c:768
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "City:"
msgstr "Città:"
-#: ../libempathy-gtk/empathy-contact-widget.c:586
-#: ../libempathy-gtk/empathy-individual-widget.c:462
+#: ../libempathy-gtk/empathy-contact-widget.c:770
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Area:"
msgstr "Area:"
-#: ../libempathy-gtk/empathy-contact-widget.c:588
-#: ../libempathy-gtk/empathy-individual-widget.c:464
+#: ../libempathy-gtk/empathy-contact-widget.c:772
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Postal Code:"
msgstr "Codice postale:"
# (ndt) nome di una colonna
-#: ../libempathy-gtk/empathy-contact-widget.c:590
-#: ../libempathy-gtk/empathy-individual-widget.c:466
+#: ../libempathy-gtk/empathy-contact-widget.c:774
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Street:"
msgstr "Via:"
-#: ../libempathy-gtk/empathy-contact-widget.c:592
-#: ../libempathy-gtk/empathy-individual-widget.c:468
+#: ../libempathy-gtk/empathy-contact-widget.c:776
+#: ../libempathy-gtk/empathy-individual-widget.c:502
msgid "Building:"
msgstr "Edificio:"
# (ndt) questo è prima di una casella di testo
# in cui inserire il criterio di ricerca
-#: ../libempathy-gtk/empathy-contact-widget.c:594
-#: ../libempathy-gtk/empathy-individual-widget.c:470
+#: ../libempathy-gtk/empathy-contact-widget.c:778
+#: ../libempathy-gtk/empathy-individual-widget.c:504
msgid "Floor:"
msgstr "Piano:"
-#: ../libempathy-gtk/empathy-contact-widget.c:596
-#: ../libempathy-gtk/empathy-individual-widget.c:472
+#: ../libempathy-gtk/empathy-contact-widget.c:780
+#: ../libempathy-gtk/empathy-individual-widget.c:506
msgid "Room:"
msgstr "Stanza:"
-#: ../libempathy-gtk/empathy-contact-widget.c:598
-#: ../libempathy-gtk/empathy-individual-widget.c:474
+#: ../libempathy-gtk/empathy-contact-widget.c:782
+#: ../libempathy-gtk/empathy-individual-widget.c:508
msgid "Text:"
msgstr "Testo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:600
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:784
+#: ../libempathy-gtk/empathy-individual-widget.c:510
msgid "Description:"
msgstr "Descrizione:"
-#: ../libempathy-gtk/empathy-contact-widget.c:602
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:786
+#: ../libempathy-gtk/empathy-individual-widget.c:512
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:604
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:788
+#: ../libempathy-gtk/empathy-individual-widget.c:514
msgid "Accuracy Level:"
msgstr "Livello di precisione:"
-#: ../libempathy-gtk/empathy-contact-widget.c:606
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:790
+#: ../libempathy-gtk/empathy-individual-widget.c:516
msgid "Error:"
msgstr "Errore:"
-#: ../libempathy-gtk/empathy-contact-widget.c:608
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-individual-widget.c:518
msgid "Vertical Error (meters):"
msgstr "Errore verticale (metri):"
-#: ../libempathy-gtk/empathy-contact-widget.c:610
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:794
+#: ../libempathy-gtk/empathy-individual-widget.c:520
msgid "Horizontal Error (meters):"
msgstr "Errore orizzontale (metri):"
-#: ../libempathy-gtk/empathy-contact-widget.c:612
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:796
+#: ../libempathy-gtk/empathy-individual-widget.c:522
msgid "Speed:"
msgstr "Velocità:"
-#: ../libempathy-gtk/empathy-contact-widget.c:614
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:798
+#: ../libempathy-gtk/empathy-individual-widget.c:524
msgid "Bearing:"
msgstr "Orientamento:"
-#: ../libempathy-gtk/empathy-contact-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:800
+#: ../libempathy-gtk/empathy-individual-widget.c:526
msgid "Climb Speed:"
msgstr "Velocità di salita:"
-#: ../libempathy-gtk/empathy-contact-widget.c:618
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:802
+#: ../libempathy-gtk/empathy-individual-widget.c:528
msgid "Last Updated on:"
msgstr "Ultimo aggiornamento:"
-#: ../libempathy-gtk/empathy-contact-widget.c:620
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:804
+#: ../libempathy-gtk/empathy-individual-widget.c:530
msgid "Longitude:"
msgstr "Longitudine:"
-#: ../libempathy-gtk/empathy-contact-widget.c:622
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:806
+#: ../libempathy-gtk/empathy-individual-widget.c:532
msgid "Latitude:"
msgstr "Latitudine:"
-#: ../libempathy-gtk/empathy-contact-widget.c:624
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:808
+#: ../libempathy-gtk/empathy-individual-widget.c:534
msgid "Altitude:"
msgstr "Altitudine:"
# (ndt) nome della scheda
-#: ../libempathy-gtk/empathy-contact-widget.c:687
-#: ../libempathy-gtk/empathy-contact-widget.c:704
-#: ../libempathy-gtk/empathy-individual-widget.c:582
-#: ../libempathy-gtk/empathy-individual-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-contact-widget.c:888
+#: ../libempathy-gtk/empathy-individual-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:633
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Posizione geografica"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:706
-#: ../libempathy-gtk/empathy-individual-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:890
+#: ../libempathy-gtk/empathy-individual-widget.c:635
#, c-format
msgid "%s, %s"
msgstr "%s, il giorno %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:758
-#: ../libempathy-gtk/empathy-individual-widget.c:650
+#: ../libempathy-gtk/empathy-contact-widget.c:942
+#: ../libempathy-gtk/empathy-individual-widget.c:684
msgid "%B %e, %Y at %R UTC"
msgstr "%-d %B %Y alle %H.%M UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:841
-#: ../libempathy-gtk/empathy-individual-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:1024
+#: ../libempathy-gtk/empathy-individual-widget.c:919
msgid "Save Avatar"
msgstr "Salva immagine"
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:899
+#: ../libempathy-gtk/empathy-contact-widget.c:1080
+#: ../libempathy-gtk/empathy-individual-widget.c:977
msgid "Unable to save avatar"
msgstr "Impossibile salvare l'immagine"
@@ -1844,7 +1989,7 @@ msgstr "<b>Posizione</b> alla data\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1227
+#: ../libempathy-gtk/empathy-individual-widget.c:1307
msgid "Alias:"
msgstr "Pseudonimo:"
@@ -1864,7 +2009,7 @@ msgstr "Dettagli contatto"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1431
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
msgid "Identifier:"
msgstr "Identificatore:"
@@ -1900,18 +2045,30 @@ msgid "_Add Group"
msgstr "A_ggiungi gruppo"
# (ndt) nome di una colonna
-#: ../libempathy-gtk/empathy-groups-widget.c:397
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+#: ../libempathy-gtk/empathy-groups-widget.c:398
+msgctxt "verb in a column header displaying group names"
msgid "Select"
msgstr "Selezione"
-#: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-main-window.c:1247
+#: ../libempathy-gtk/empathy-groups-widget.c:408
+#: ../src/empathy-main-window.c:1436
msgid "Group"
msgstr "Gruppo"
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+msgid "The following identity will be blocked:"
+msgid_plural "The following identities will be blocked:"
+msgstr[0] "La seguente identità verrà bloccata:"
+msgstr[1] "Le seguenti identità verranno bloccate:"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+msgid "The following identity can not be blocked:"
+msgid_plural "The following identities can not be blocked:"
+msgstr[0] "La seguente identità non può essere bloccata:"
+msgstr[1] "Le seguenti identità non possono essere bloccate:"
+
#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
msgid "Linked Contacts"
msgstr "Contatti uniti"
@@ -1930,44 +2087,71 @@ msgstr "I contatti selezionati nell'elenco a sinistra verranno uniti."
#. Translators: this is used in the context menu for a contact. The first
#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
#. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:132
+#: ../libempathy-gtk/empathy-individual-menu.c:131
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:837
+#: ../libempathy-gtk/empathy-individual-menu.c:839
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Modifica"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-menu.c:865
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "_Unisci contatti..."
+#: ../libempathy-gtk/empathy-individual-view.c:2301
+msgid "Delete and _Block"
+msgstr "Elimina e _blocca"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2467
+#, c-format
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+"Rimuovere veramente il contatto unificato «%s»? Questa azione rimuoverà tutti "
+"i contatti di cui è composto."
+
# (ndt) rivedere meta-contact, trovare idee migliori...
-#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#: ../libempathy-gtk/empathy-individual-widget.c:1652
#, c-format
-msgid "Meta-contact containing %u contact"
-msgid_plural "Meta-contact containing %u contacts"
-msgstr[0] "Meta-contatto contenente %u contatto"
-msgstr[1] "Meta-contatto contenente %u contatti"
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] "Contatto unificato contenente %u contatto"
+msgstr[1] "Contatto unificato contenente %u contatti"
# (ndt) messo 'alla data' per problemi con le date che iniziano con 8 e 11
#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
msgid "<b>Location</b> at (date)"
msgstr "<b>Posizione</b> alla data"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Online from a phone or mobile device"
+msgstr "In rete da un telefono o dispositivo portatile"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
msgid "New Network"
msgstr "Nuova rete"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
msgid "Choose an IRC network"
msgstr "Scegliere una rete IRC"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+msgid "Reset _Networks List"
+msgstr "Ripristina ele_nco reti"
+
+#
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "Seleziona"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "nuovo server"
@@ -1979,47 +2163,48 @@ msgstr "SSL"
#. Translators: this is the title of the linking dialogue (reached by
#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:116
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
msgid "Link Contacts"
msgstr "Unisci contatti"
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
msgctxt "Unlink individual (button)"
msgid "_Unlink…"
msgstr "_Dividi..."
-#: ../libempathy-gtk/empathy-linking-dialog.c:122
+# (ndt) suggerimento, tolto il punto
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
msgid ""
-"Completely split the displayed meta-contact into the contacts it contains."
-msgstr "Divide il meta-contatto visualizzato nei singoli contatti"
+"Completely split the displayed linked contacts into the separate contacts."
+msgstr "Divide il contatto unificato visualizzato nei singoli contatti"
#. Add button
#. Translators: this is an action button in the linking dialogue. "Link" is
#. * used here as a verb meaning "to connect two contacts to form a
#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:137
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
msgid "_Link"
msgstr "_Unisci"
#: ../libempathy-gtk/empathy-linking-dialog.c:183
#, c-format
-msgid "Unlink meta-contact '%s'?"
-msgstr "Dividere il meta-contatto «%s»?"
+msgid "Unlink linked contacts '%s'?"
+msgstr "Dividere il contatto unificato «%s»?"
#: ../libempathy-gtk/empathy-linking-dialog.c:186
msgid ""
-"Are you sure you want to unlink this meta-contact? This will completely "
-"split the meta-contact into the contacts it contains."
+"Are you sure you want to unlink these linked contacts? This will completely "
+"split the linked contacts into separate contacts."
msgstr ""
-"Dividere veramente questo meta-contatto? In questo modo il meta-contatto "
-"verrà diviso nei singoli contatti che lo compongono."
+"Dividere veramente questo contatto unificato? In questo modo verrà diviso "
+"nei singoli contatti di cui è composto."
-#: ../libempathy-gtk/empathy-linking-dialog.c:191
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "_Dividi"
-#: ../libempathy-gtk/empathy-log-window.c:663
+#: ../libempathy-gtk/empathy-log-window.c:660
msgid "Date"
msgstr "Data"
@@ -2061,120 +2246,138 @@ msgid "Contact ID:"
msgstr "ID contatto:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:145
+#: ../libempathy-gtk/empathy-new-message-dialog.c:171
msgid "C_hat"
msgstr "_Conversazione"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:155
+#: ../libempathy-gtk/empathy-new-message-dialog.c:181
msgid "New Conversation"
msgstr "Nuova conversazione"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:205
+#: ../libempathy-gtk/empathy-new-call-dialog.c:253
msgid "Send _Video"
msgstr "Invia _video"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+#: ../libempathy-gtk/empathy-new-call-dialog.c:261
msgid "C_all"
msgstr "C_hiama"
# (ndt) è il titolo del dialogo
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#: ../libempathy-gtk/empathy-new-call-dialog.c:271
msgid "New Call"
msgstr "Nuova chiamata"
+#: ../libempathy-gtk/empathy-password-dialog.c:274
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"Inserire la password per l'account\n"
+"<b>%s</b>"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:168
-#: ../libempathy-gtk/empathy-presence-chooser.c:204
+#: ../libempathy-gtk/empathy-presence-chooser.c:170
+#: ../libempathy-gtk/empathy-presence-chooser.c:206
msgid "Custom Message…"
msgstr "Messaggio personalizzato..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:221
#: ../libempathy-gtk/empathy-presence-chooser.c:223
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
msgid "Edit Custom Messages…"
msgstr "Modifica messaggio personalizzato..."
# (ndt) sono dei suggerimenti, ma indicano l'azione da compiere
-#: ../libempathy-gtk/empathy-presence-chooser.c:346
+#: ../libempathy-gtk/empathy-presence-chooser.c:348
msgid "Click to remove this status as a favorite"
msgstr "Fare clic per rimuovere questo stato dai preferiti"
-#: ../libempathy-gtk/empathy-presence-chooser.c:355
+#: ../libempathy-gtk/empathy-presence-chooser.c:357
msgid "Click to make this status a favorite"
msgstr "Fare clic per aggiungere questo stato tra i preferiti"
-#: ../libempathy-gtk/empathy-presence-chooser.c:389
+#: ../libempathy-gtk/empathy-presence-chooser.c:391
msgid "Set status"
msgstr "Imposta lo stato"
# (ndt) come c'è scritto nel codice: this string sucks
-#: ../libempathy-gtk/empathy-presence-chooser.c:939
+#: ../libempathy-gtk/empathy-presence-chooser.c:946
msgid "Set your presence and current status"
msgstr "Imposta la presenza e lo stato"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+#: ../libempathy-gtk/empathy-presence-chooser.c:1134
msgid "Custom messages…"
msgstr "Messaggi personalizzati..."
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#, c-format
+msgid "New %s account"
+msgstr "Nuovo account %s"
+
#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Trova:"
#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
-msgstr "Maiuscole/minuscole"
+msgstr "Maiuscole/Minuscole"
#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "Stringa non trovata"
# (ndt) dovrebbero essere gli eventi sonori
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
msgstr "Messaggio istantaneo ricevuto"
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
msgstr "Messaggio istantaneo inviato"
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
msgstr "Richiesta di conversazione in arrivo"
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
msgstr "Contatto connesso"
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
msgstr "Contatto disconnesso"
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
msgstr "Connessi al server"
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
msgstr "Disconnessi dal server"
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
msgstr "Chiamata vocale in arrivo"
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Outgoing voice call"
msgstr "Chiamata vocale in uscita"
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
msgid "Voice call ended"
msgstr "Chiamata vocale terminata"
@@ -2187,12 +2390,12 @@ msgid "Edit Custom Messages"
msgstr "Modifica messaggi personalizzati"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "Aggiungere _nuovo prestabilito"
+msgid "Save _New Status Message"
+msgstr "Salva _nuovo messaggio di stato"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "Prestabiliti salvati"
+msgid "Saved Status Messages"
+msgstr "Messaggi di stato salvati"
#: ../libempathy-gtk/empathy-theme-manager.c:67
msgid "Classic"
@@ -2212,88 +2415,102 @@ msgstr "Blu"
# (ndt) o solo server?
#: ../libempathy-gtk/empathy-tls-dialog.c:150
-msgid "The identity provided by the chat server cannot be verified.\n"
+msgid "The identity provided by the chat server cannot be verified."
msgstr ""
-"L'identità fornita dal server di conversazione non può essere verificata.\n"
+"L'identità fornita dal server di conversazione non può essere verificata."
-#: ../libempathy-gtk/empathy-tls-dialog.c:156
-msgid "The certificate is not signed by a Certification Authority"
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+msgid "The certificate is not signed by a Certification Authority."
msgstr "Il certificato non è firmato da un'Autorità di Certificazione"
-#: ../libempathy-gtk/empathy-tls-dialog.c:160
-msgid "The certificate has expired"
-msgstr "Il certificato è scaduto"
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+msgid "The certificate has expired."
+msgstr "Il certificato è scaduto."
-#: ../libempathy-gtk/empathy-tls-dialog.c:163
-msgid "The certificate hasn't yet been activated"
-msgstr "Il certificato non è ancora stato attivato"
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+msgid "The certificate hasn't yet been activated."
+msgstr "Il certificato non è ancora stato attivato."
-#: ../libempathy-gtk/empathy-tls-dialog.c:166
-msgid "The certificate does not have the expected fingerprint"
-msgstr "Il certificato non contiene la firma attesa"
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+msgid "The certificate does not have the expected fingerprint."
+msgstr "Il certificato non contiene l'impronta digitale attesa."
-#: ../libempathy-gtk/empathy-tls-dialog.c:169
-msgid "The hostname verified by the certificate doesn't match the server name"
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+msgid "The hostname verified by the certificate doesn't match the server name."
msgstr ""
-"Il nome host verificato dal certificato non corrisponde al nome del server"
+"Il nome host verificato dal certificato non corrisponde al nome del server."
-#: ../libempathy-gtk/empathy-tls-dialog.c:173
-msgid "The certificate is self-signed"
-msgstr "Il certificato è auto-firmato"
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid "The certificate is self-signed."
+msgstr "Il certificato è auto-firmato."
-#: ../libempathy-gtk/empathy-tls-dialog.c:176
-msgid "The certificate has been revoked by the issuing Certification Authority"
-msgstr "Il certificato è stato revocato dall'Autorità di Certificazione"
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
+msgstr "Il certificato è stato revocato dall'Autorità di Certificazione."
# (ndt) crittograficamente non mi piace...
-#: ../libempathy-gtk/empathy-tls-dialog.c:180
-msgid "The certificate is cryptographically weak"
-msgstr "Il certificato è cifrato con una chiave debole"
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+msgid "The certificate is cryptographically weak."
+msgstr "Il certificato è cifrato con una chiave debole."
-#: ../libempathy-gtk/empathy-tls-dialog.c:183
-msgid "The certificate length exceeds verifiable limits"
-msgstr "La lunghezza del certificato supera i limiti verificabili"
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+msgid "The certificate length exceeds verifiable limits."
+msgstr "La lunghezza del certificato supera i limiti verificabili."
-#: ../libempathy-gtk/empathy-tls-dialog.c:187
-msgid "The certificate is malformed"
-msgstr "Il certificato non è corretto"
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+msgid "The certificate is malformed."
+msgstr "Il certificato non è corretto."
-#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
#, c-format
msgid "Expected hostname: %s"
msgstr "Nome host atteso: %s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
#, c-format
msgid "Certificate hostname: %s"
msgstr "Nome host del certificato: %s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:263
+#: ../libempathy-gtk/empathy-tls-dialog.c:281
msgid "Continue"
msgstr "Continua"
-#: ../libempathy-gtk/empathy-tls-dialog.c:269
+#: ../libempathy-gtk/empathy-tls-dialog.c:287
msgid "This connection is untrusted. Would you like to continue anyway?"
msgstr "Questa connessione non è sicura. Continuare in ogni caso?"
-#: ../libempathy-gtk/empathy-tls-dialog.c:286
+#: ../libempathy-gtk/empathy-tls-dialog.c:297
msgid "Remember this choice for future connections"
msgstr "Ricordare per le successive connessioni"
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:303
msgid "Certificate Details"
msgstr "Dettagli certificato"
-#: ../libempathy-gtk/empathy-ui-utils.c:1698
+#: ../libempathy-gtk/empathy-ui-utils.c:1705
msgid "Unable to open URI"
msgstr "Impossibile aprire l'URI"
# (ndt) titolo
-#: ../libempathy-gtk/empathy-ui-utils.c:1793
+#: ../libempathy-gtk/empathy-ui-utils.c:1800
msgid "Select a file"
msgstr "Seleziona un file"
-#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
+msgid "Insufficient free space to save file"
+msgstr "Spazio insufficiente per salvare il file"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#, c-format
+msgid ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
+msgstr ""
+"%s di spazio libero sono richiesti per salvare questo file, ma sono "
+"disponibili solamente %s. Scegliere un'altra posizione."
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1924
#, c-format
msgid "Incoming file from %s"
msgstr "File in arrivo da parte di %s"
@@ -2483,20 +2700,36 @@ msgid "Instant Message (Empathy)"
msgstr "Messaggio istantaneo (Empathy)"
# (ndt) opzione
-#: ../src/empathy.c:414
+#: ../src/empathy.c:308
msgid "Don't connect on startup"
msgstr "Non connettere all'avvio"
# (ndt) opzione
-#: ../src/empathy.c:418
+#: ../src/empathy.c:312
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Non mostrare l'elenco contatti o qualsiasi altro dialogo all'avvio"
-#: ../src/empathy.c:435
+#: ../src/empathy.c:320
msgid "- Empathy IM Client"
msgstr "- Messaggistica istantanea Empathy"
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy.c:499
+msgid "Error contacting the Account Manager"
+msgstr "Errore nel contattare il gestore di account"
+
+#: ../src/empathy.c:501
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"Si è verificato un errore durante il tentativo di connessione al gestore di "
+"account Telepathy:\n"
+"%s"
+
+#: ../src/empathy-about-dialog.c:81
msgid ""
"Empathy is free software; you can redistribute it and/or modify it under the "
"terms of the GNU General Public License as published by the Free Software "
@@ -2508,7 +2741,7 @@ msgstr ""
"Free Software Foundation; versione 2 della licenza, o (a scelta) una "
"versione più recente."
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
msgid ""
"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -2520,7 +2753,7 @@ msgstr ""
"APPLICABILITÀ PER UNO SCOPO PARTICOLARE. Per maggiori dettagli consultare la "
"GNU General Public License."
-#: ../src/empathy-about-dialog.c:93
+#: ../src/empathy-about-dialog.c:89
msgid ""
"You should have received a copy of the GNU General Public License along with "
"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -2530,11 +2763,11 @@ msgstr ""
"questo programma. In caso contrario scrivere a: Free Software Foundation, "
"Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA"
-#: ../src/empathy-about-dialog.c:121
+#: ../src/empathy-about-dialog.c:107
msgid "An Instant Messaging client for GNOME"
msgstr "Un client di messaggistica istantanea per GNOME"
-#: ../src/empathy-about-dialog.c:127
+#: ../src/empathy-about-dialog.c:113
msgid "translator-credits"
msgstr ""
"Milo Casagrande <milo@ubuntu.com>\n"
@@ -2573,46 +2806,36 @@ msgstr ""
"secondo momento dal menù «Modifica»."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1316
+#: ../src/empathy-account-assistant.c:1271
msgid "An error occurred"
msgstr "Si è verificato un errore"
-#. To translator: %s is the protocol name
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:614
-#, c-format
-msgid "New %s account"
-msgstr "Nuovo account %s"
-
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:467
msgid "What kind of chat account do you have?"
msgstr "Che tipo di account è disponibile?"
-#: ../src/empathy-account-assistant.c:521
+#: ../src/empathy-account-assistant.c:473
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Sono disponibili altri account da configurare?"
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:479
msgid "Enter your account details"
msgstr "Inserire i dettagli dell'account"
# (ndt) tolto chat volutamente
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:484
msgid "What kind of chat account do you want to create?"
msgstr "Che tipo di account creare?"
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:490
msgid "Do you want to create other chat accounts?"
msgstr "Creare altri account?"
-#: ../src/empathy-account-assistant.c:545
+#: ../src/empathy-account-assistant.c:497
msgid "Enter the details for the new account"
msgstr "Inserire i dettagli del nuovo account"
-#: ../src/empathy-account-assistant.c:660
+#: ../src/empathy-account-assistant.c:612
msgid ""
"With Empathy you can chat with people online nearby and with friends and "
"colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -2625,43 +2848,43 @@ msgstr ""
"possibile effettuare chiamate audio o video."
# (ndt) non so perché si ostinano a usare chat...
-#: ../src/empathy-account-assistant.c:677
+#: ../src/empathy-account-assistant.c:629
msgid "Do you have an account you've been using with another chat program?"
msgstr ""
"È disponibile un account usato con un altro programma di messaggistica?"
# (ndt) dopo di questa c'è un elenco a discesa...
-#: ../src/empathy-account-assistant.c:700
+#: ../src/empathy-account-assistant.c:652
msgid "Yes, import my account details from "
msgstr "Sì, importare gli account da "
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:673
msgid "Yes, I'll enter my account details now"
msgstr "Sì, inserire i dettagli dell'account ora"
-#: ../src/empathy-account-assistant.c:743
+#: ../src/empathy-account-assistant.c:695
msgid "No, I want a new account"
msgstr "No, creare un nuovo account"
-#: ../src/empathy-account-assistant.c:753
+#: ../src/empathy-account-assistant.c:705
msgid "No, I just want to see people online nearby for now"
msgstr "No, visualizzare solo le persone nelle vicinanze"
-#: ../src/empathy-account-assistant.c:774
+#: ../src/empathy-account-assistant.c:726
msgid "Select the accounts you want to import:"
msgstr "Selezionare gli account da importare:"
-#: ../src/empathy-account-assistant.c:858
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-account-assistant.c:813
+#: ../src/empathy-new-chatroom-dialog.c:562
+#: ../src/empathy-new-chatroom-dialog.c:563
msgid "Yes"
msgstr "Sì"
-#: ../src/empathy-account-assistant.c:865
+#: ../src/empathy-account-assistant.c:820
msgid "No, that's all for now"
msgstr "No, per ora è tutto"
-#: ../src/empathy-account-assistant.c:1130
+#: ../src/empathy-account-assistant.c:1085
msgid ""
"Empathy can automatically discover and chat with the people connected on the "
"same network as you. If you want to use this feature, please check that the "
@@ -2674,17 +2897,17 @@ msgstr ""
"comunque possibile modificare in seguito questi dettagli o disabilitare "
"questa funzionalità attraverso il dialogo «Account»."
-#: ../src/empathy-account-assistant.c:1136
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1091
+#: ../src/empathy-account-assistant.c:1147
msgid "Edit->Accounts"
msgstr "Modifica → Account"
# (ndt) checkbutton
-#: ../src/empathy-account-assistant.c:1152
-msgid "I don't want to enable this feature for now"
-msgstr "Non abilitare ora questa funzionalità"
+#: ../src/empathy-account-assistant.c:1107
+msgid "I do _not want to enable this feature for now"
+msgstr "No_n abilitare ora questa funzionalità"
-#: ../src/empathy-account-assistant.c:1188
+#: ../src/empathy-account-assistant.c:1143
msgid ""
"You won't be able to chat with people connected to your local network, as "
"telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2696,69 +2919,70 @@ msgstr ""
"abilitare questa funzionalità, installare il pacchetto «telepathy-salut» e "
"creare un account «Persone nelle vicinanze» attraverso il dialogo «Account»."
-#: ../src/empathy-account-assistant.c:1194
+#: ../src/empathy-account-assistant.c:1149
msgid "telepathy-salut not installed"
msgstr "Il pacchetto «telepathy-salut» non è installato"
-#: ../src/empathy-account-assistant.c:1240
+#: ../src/empathy-account-assistant.c:1195
msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Account di messaggistica e VoIP"
+msgstr "Assistente per account di messaggistica e VoIP"
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1229
msgid "Welcome to Empathy"
msgstr "Benvenuti in Empathy"
# (ndt) titolo dialogo assistente
-#: ../src/empathy-account-assistant.c:1283
+#: ../src/empathy-account-assistant.c:1238
msgid "Import your existing accounts"
msgstr "Importazione account"
-#: ../src/empathy-account-assistant.c:1301
+#: ../src/empathy-account-assistant.c:1256
msgid "Please enter personal details"
msgstr "Inserire i dettagli personali"
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:65
+#: ../src/empathy-accounts-dialog.c:64
#, c-format
msgid "There are unsaved modifications to your %s account."
msgstr "Sono presenti delle modifiche non salvate per l'account %s."
#. The primary text of the dialog shown to the user when he is about to lose
#. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:68
msgid "Your new account has not been saved yet."
msgstr "Il nuovo account non è ancora stato salvato."
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
+#: ../src/empathy-accounts-dialog.c:286
+#: ../src/empathy-streamed-media-window.c:809
msgid "Connecting…"
msgstr "Connessione..."
-#: ../src/empathy-accounts-dialog.c:322
+#: ../src/empathy-accounts-dialog.c:327
#, c-format
msgid "Offline — %s"
msgstr "Fuori rete — %s"
# (ndt) plurale per comprendere uomini e donne
-#: ../src/empathy-accounts-dialog.c:334
+#: ../src/empathy-accounts-dialog.c:339
#, c-format
msgid "Disconnected — %s"
msgstr "Disconnessi — %s"
-#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-accounts-dialog.c:350
msgid "Offline — No Network Connection"
msgstr "Fuori rete — Nessuna connessione di rete"
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:357
msgid "Unknown Status"
msgstr "Stato sconosciuto"
-#: ../src/empathy-accounts-dialog.c:364
+#: ../src/empathy-accounts-dialog.c:369
msgid "Offline — Account Disabled"
msgstr "Fuori rete — Account disabilitato"
# (ndt) messo scartate perché il pulsante nella finestra è "Scarta"
-#: ../src/empathy-accounts-dialog.c:811
+#: ../src/empathy-accounts-dialog.c:772
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2766,17 +2990,17 @@ msgstr ""
"Sta per essere creato un nuovo account e le modifiche\n"
"effettuate verranno scartate. Procedere veramente?"
-#: ../src/empathy-accounts-dialog.c:1158
+#: ../src/empathy-accounts-dialog.c:1133
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Rimuovere «%s» dal computer?"
-#: ../src/empathy-accounts-dialog.c:1162
+#: ../src/empathy-accounts-dialog.c:1137
msgid "This will not remove your account on the server."
msgstr "Questo non rimuoverà l'account dal server."
# (ndt) messo scartate perché il pulsante nella finestra è "Scarta"
-#: ../src/empathy-accounts-dialog.c:1400
+#: ../src/empathy-accounts-dialog.c:1375
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2784,8 +3008,17 @@ msgstr ""
"Sta per essere selezionato un altro account e le modifiche\n"
"effettuate verranno scartate. Procedere veramente?"
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1593
+msgid "_Enable"
+msgstr "_Abilita"
+
+#: ../src/empathy-accounts-dialog.c:1594
+msgid "_Disable"
+msgstr "_Disabilita"
+
# (ndt) messo scartate perché il pulsante nella finestra è "Scarta"
-#: ../src/empathy-accounts-dialog.c:2003
+#: ../src/empathy-accounts-dialog.c:2113
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2795,7 +3028,7 @@ msgstr ""
#: ../src/empathy-accounts-dialog.ui.h:1
msgid "Loading account information"
-msgstr "Caricamento informazioni contatto"
+msgstr "Caricamento informazioni account"
#: ../src/empathy-accounts-dialog.ui.h:2
msgid "No protocol installed"
@@ -2822,11 +3055,11 @@ msgstr "A_ggiungi..."
msgid "_Import…"
msgstr "_Importa..."
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:246
msgid " - Empathy authentication client"
msgstr " - Client autenticazione Empathy"
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:262
msgid "Empathy authentication client"
msgstr "Client autenticazione Empathy"
@@ -2834,54 +3067,54 @@ msgstr "Client autenticazione Empathy"
msgid "People nearby"
msgstr "Persone nelle vicinanze"
-#: ../src/empathy-av.c:133
+#: ../src/empathy-av.c:118
msgid "- Empathy Audio/Video Client"
msgstr "- Client audio/video Empathy"
-#: ../src/empathy-av.c:149
+#: ../src/empathy-av.c:134
msgid "Empathy Audio/Video Client"
msgstr "Client audio/video Empathy"
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-streamed-media-window.c:479
msgid "Contrast"
msgstr "Contrasto"
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-streamed-media-window.c:482
msgid "Brightness"
msgstr "Luminosità"
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-streamed-media-window.c:485
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-streamed-media-window.c:590
msgid "Volume"
msgstr "Volume"
-#: ../src/empathy-call-window.c:1173
+#: ../src/empathy-streamed-media-window.c:1166
msgid "_Sidebar"
msgstr "_Barra laterale"
-#: ../src/empathy-call-window.c:1192
+#: ../src/empathy-streamed-media-window.c:1186
msgid "Audio input"
msgstr "Ingresso audio"
-#: ../src/empathy-call-window.c:1196
+#: ../src/empathy-streamed-media-window.c:1190
msgid "Video input"
msgstr "Ingresso video"
-#: ../src/empathy-call-window.c:1200
+#: ../src/empathy-streamed-media-window.c:1194
msgid "Dialpad"
msgstr "Tastierino"
-#: ../src/empathy-call-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1205
msgid "Details"
msgstr "Dettagli"
# (ndt) quello che c'è dopo è il nome del contatto
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1273
+#: ../src/empathy-streamed-media-window.c:1274
#, c-format
msgid "Call with %s"
msgstr "Chiamata con %s"
@@ -2889,42 +3122,42 @@ msgstr "Chiamata con %s"
# (ndt) è il titolo del dialogo
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1352
+#: ../src/empathy-streamed-media-window.c:1353
msgid "Call"
msgstr "Chiamata"
-#: ../src/empathy-call-window.c:1506
+#: ../src/empathy-streamed-media-window.c:1507
msgid "The IP address as seen by the machine"
msgstr "L'indirizzo IP visto dal computer"
-#: ../src/empathy-call-window.c:1508
+#: ../src/empathy-streamed-media-window.c:1509
msgid "The IP address as seen by a server on the Internet"
msgstr "L'indirizzo IP visto da un server su Internet"
# (ndt) il lato oscuro... questa è interessante e da rivedere
-#: ../src/empathy-call-window.c:1510
+#: ../src/empathy-streamed-media-window.c:1511
msgid "The IP address of the peer as seen by the other side"
-msgstr "L'indirizzo del nodo visto dall'altro lato"
+msgstr "L'indirizzo IP del nodo visto dall'altro lato"
-#: ../src/empathy-call-window.c:1512
+#: ../src/empathy-streamed-media-window.c:1513
msgid "The IP address of a relay server"
msgstr "L'indirizzo IP di un relay server"
-#: ../src/empathy-call-window.c:1514
+#: ../src/empathy-streamed-media-window.c:1515
msgid "The IP address of the multicast group"
msgstr "L'indirizzo IP del gruppo multicast"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2247
+#: ../src/empathy-streamed-media-window.c:2266
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Connessi — %d.%02dm"
-#: ../src/empathy-call-window.c:2308
+#: ../src/empathy-streamed-media-window.c:2327
msgid "Technical Details"
msgstr "Dettagli tecnici"
-#: ../src/empathy-call-window.c:2346
+#: ../src/empathy-streamed-media-window.c:2365
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2933,7 +3166,7 @@ msgstr ""
"Il programma di %s non è in grado di comprendere alcuno dei formati audio "
"supportati da questo computer"
-#: ../src/empathy-call-window.c:2351
+#: ../src/empathy-streamed-media-window.c:2370
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2942,7 +3175,7 @@ msgstr ""
"Il programma di %s non è in grado di comprendere alcuno dei formati video "
"supportati da questo computer"
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-streamed-media-window.c:2376
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2951,23 +3184,23 @@ msgstr ""
"Impossibile stabilire una connessione con %s. Si potrebbe essere collegati a "
"una rete che non supporta connessioni dirette."
-#: ../src/empathy-call-window.c:2363
+#: ../src/empathy-streamed-media-window.c:2382
msgid "There was a failure on the network"
msgstr "Si è verificato un problema sulla rete"
# (ndt) eliminato volutamente il riferimento a computer
-#: ../src/empathy-call-window.c:2367
+#: ../src/empathy-streamed-media-window.c:2386
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "I formati audio necessari per eseguire la chiamata non sono installati"
# (ndt) eliminato volutamente il riferimento a computer
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-streamed-media-window.c:2389
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "I formati video necessari per eseguire la chiamata non sono installati"
-#: ../src/empathy-call-window.c:2380
+#: ../src/empathy-streamed-media-window.c:2399
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2978,19 +3211,19 @@ msgstr ""
"\"%s\">Segnalare un problema</a> e allegare le informazioni raccolte "
"attraverso l'azione «Debug» presente nel menù «Aiuto»."
-#: ../src/empathy-call-window.c:2388
+#: ../src/empathy-streamed-media-window.c:2407
msgid "There was a failure in the call engine"
msgstr "Si è verificato un problema nel motore delle chiamate"
-#: ../src/empathy-call-window.c:2391
+#: ../src/empathy-streamed-media-window.c:2410
msgid "The end of the stream was reached"
msgstr "Raggiunta la fine del flusso"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-streamed-media-window.c:2450
msgid "Can't establish audio stream"
msgstr "Impossibile stabilire il flusso audio"
-#: ../src/empathy-call-window.c:2441
+#: ../src/empathy-streamed-media-window.c:2460
msgid "Can't establish video stream"
msgstr "Impossibile stabilire il flusso video"
@@ -3095,39 +3328,39 @@ msgstr "Anteprima"
msgid "_Call"
msgstr "C_hiama"
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
msgid "_View"
msgstr "_Visualizza"
-#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d non letto)"
msgstr[1] "%s (%d non letti)"
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:486
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (e %u altro)"
msgstr[1] "%s (e %u altri)"
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:502
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d non letto da altri)"
msgstr[1] "%s (%d non letti da altri)"
-#: ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:511
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d non letto da tutti)"
msgstr[1] "%s (%d non letti da tutti)"
-#: ../src/empathy-chat-window.c:695
+#: ../src/empathy-chat-window.c:721
msgid "Typing a message."
msgstr "Scrittura messaggio."
@@ -3163,7 +3396,7 @@ msgstr "Sposta scheda a _destra"
msgid "Notify for All Messages"
msgstr "Notificare tutti i messaggi"
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
msgid "_Contents"
msgstr "_Sommario"
@@ -3175,7 +3408,7 @@ msgstr "_Conversazione"
msgid "_Detach Tab"
msgstr "Dist_acca scheda"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
msgid "_Edit"
msgstr "_Modifica"
@@ -3183,7 +3416,7 @@ msgstr "_Modifica"
msgid "_Favorite Chat Room"
msgstr "_Stanza preferita"
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
msgid "_Help"
msgstr "A_iuto"
@@ -3226,87 +3459,92 @@ msgstr "Connessione automatica"
msgid "Manage Favorite Rooms"
msgstr "Gestione stanze preferite"
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:507
msgid "Incoming video call"
msgstr "Chiamata video in arrivo"
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:507
msgid "Incoming call"
msgstr "Chiamata in arrivo"
-#: ../src/empathy-event-manager.c:472
+#: ../src/empathy-event-manager.c:511
#, c-format
msgid "%s is video calling you. Do you want to answer?"
-msgstr "%s sta video chiamando, rispondere?"
+msgstr "%s sta video-chiamando, rispondere?"
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:512
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s sta chiamando, rispondere?"
-#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:660
#, c-format
msgid "Incoming call from %s"
msgstr "Chiamata in arrivo da %s"
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:540
msgid "_Reject"
msgstr "Ri_fiuta"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:546
msgid "_Answer"
msgstr "_Rispondi"
-#: ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:660
#, c-format
msgid "Incoming video call from %s"
msgstr "Chiamata video in arrivo da %s"
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:737
msgid "Room invitation"
msgstr "Invito in una stanza"
-#: ../src/empathy-event-manager.c:697
+#: ../src/empathy-event-manager.c:739
#, c-format
msgid "Invitation to join %s"
msgstr "Invito per entrare in %s"
-#: ../src/empathy-event-manager.c:704
+#: ../src/empathy-event-manager.c:746
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s sta inviando un invito per entrare in %s"
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:754
msgid "_Decline"
msgstr "_Rifiuta"
# (ndt) pulsante
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:759
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Entra"
-#: ../src/empathy-event-manager.c:743
+#: ../src/empathy-event-manager.c:786
#, c-format
msgid "%s invited you to join %s"
msgstr "C'è un invito per entrare in %2$s da parte di %1$s"
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:792
#, c-format
msgid "You have been invited to join %s"
msgstr "C'è un invito per entrare in %s"
-#: ../src/empathy-event-manager.c:797
+#: ../src/empathy-event-manager.c:843
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Trasferimento file in arrivo da %s"
-#: ../src/empathy-event-manager.c:1005
+#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:370
+msgid "Password required"
+msgstr "Password richiesta"
+
+# (ndt) so che non è impersonale... ma non mi viene niente di buono che sia impersonale...
+#: ../src/empathy-event-manager.c:1069
#, c-format
-msgid "Subscription requested by %s"
-msgstr "Richiesta di approvazione di %s"
+msgid "%s would like permission to see when you are online"
+msgstr "%s vorrebbe poter visualizzare la tua presenza in rete"
-#: ../src/empathy-event-manager.c:1009
+#: ../src/empathy-event-manager.c:1073
#, c-format
msgid ""
"\n"
@@ -3315,16 +3553,6 @@ msgstr ""
"\n"
"Messaggio: %s"
-#: ../src/empathy-event-manager.c:1052
-#, c-format
-msgid "%s is now offline."
-msgstr "%s è ora fuori rete."
-
-#: ../src/empathy-event-manager.c:1072
-#, c-format
-msgid "%s is now online."
-msgstr "%s è ora in rete."
-
#. Translators: time left, when it is more than one hour
#: ../src/empathy-ft-manager.c:99
#, c-format
@@ -3416,15 +3644,15 @@ msgstr "Verifica dell'integrità del file «%s»"
msgid "Hashing \"%s\""
msgstr "Calcolo codice di controllo di «%s»"
-#: ../src/empathy-ft-manager.c:996
+#: ../src/empathy-ft-manager.c:1016
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1008
+#: ../src/empathy-ft-manager.c:1028
msgid "File"
msgstr "File"
-#: ../src/empathy-ft-manager.c:1030
+#: ../src/empathy-ft-manager.c:1050
msgid "Remaining"
msgstr "Restante"
@@ -3454,47 +3682,57 @@ msgstr "Importa account"
# (ndt) nome di una colonna
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:292
+#: ../src/empathy-import-widget.c:301
msgid "Import"
msgstr "Importa"
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:310
msgid "Protocol"
msgstr "Protocollo"
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:334
msgid "Source"
msgstr "Sorgente"
-#: ../src/empathy-main-window.c:383
+# (ndt) pare tooltip... mah...
+#: ../src/empathy-main-window.c:387
+msgid "Provide Password"
+msgstr "Fornisce password"
+
+# (ndt) tooltip
+#: ../src/empathy-main-window.c:393
+msgid "Disconnect"
+msgstr "Disconnette"
+
+#: ../src/empathy-main-window.c:533
msgid "No match found"
msgstr "Nessun risultato"
# (ndt) suggerimento
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:688
msgid "Reconnect"
msgstr "Riconnette"
# (ndt) suggerimento
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:694
msgid "Edit Account"
msgstr "Modifica account"
# (ndt) suggerimento
-#: ../src/empathy-main-window.c:547
+#: ../src/empathy-main-window.c:700
msgid "Close"
msgstr "Chiude"
-#: ../src/empathy-main-window.c:1229
+#: ../src/empathy-main-window.c:1418
msgid "Contact"
msgstr "Contatto"
-#: ../src/empathy-main-window.c:1554
+#: ../src/empathy-main-window.c:1765
msgid "Contact List"
msgstr "Elenco contatti"
# (ndt) suggerimento
-#: ../src/empathy-main-window.c:1663
+#: ../src/empathy-main-window.c:1881
msgid "Show and edit accounts"
msgstr "Mostra e modifica account"
@@ -3503,10 +3741,9 @@ msgstr "Mostra e modifica account"
msgid "Contacts on a _Map"
msgstr "Contatti sulla _mappa"
-# (ndt) ?
#: ../src/empathy-main-window.ui.h:2
-msgid "Context"
-msgstr "Contesto"
+msgid "Find in Contact _List"
+msgstr "Trova in E_lenco contatti"
# (ndt) voce di menù, stanze
#: ../src/empathy-main-window.ui.h:3
@@ -3552,52 +3789,60 @@ msgstr "Ordinare per s_tato"
msgid "_Accounts"
msgstr "_Account"
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "Contatti _bloccati"
+
+#: ../src/empathy-main-window.ui.h:16
msgid "_Compact Size"
msgstr "_Dimensione ridotta"
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:18
msgid "_Debug"
msgstr "_Debug"
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:20
msgid "_File Transfers"
msgstr "Trasferimenti _file"
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:22
msgid "_Join…"
msgstr "_Entra..."
-#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "_Nuova conversazione..."
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window.ui.h:24
msgid "_Offline Contacts"
msgstr "C_ontatti fuori rete"
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
msgid "_Personal Information"
msgstr "Informazioni _personali"
# (ndt) voce di menù per accedere alle opzioni relative ai canali IRC
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window.ui.h:27
msgid "_Room"
msgstr "St_anza"
+#: ../src/empathy-main-window.ui.h:28
+msgid "_Search for Contacts…"
+msgstr "_Cerca contatti..."
+
# (ndt) pare il titolo di una colonna
-#: ../src/empathy-new-chatroom-dialog.c:379
+#: ../src/empathy-new-chatroom-dialog.c:337
msgid "Chat Room"
msgstr "Stanza"
# (ndt) titolo scheda
-#: ../src/empathy-new-chatroom-dialog.c:395
+#: ../src/empathy-new-chatroom-dialog.c:353
msgid "Members"
msgstr "Membri"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:560
#, c-format
msgid ""
"%s\n"
@@ -3610,16 +3855,16 @@ msgstr ""
"Password richiesta: %s\n"
"Membri: %s"
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:562
+#: ../src/empathy-new-chatroom-dialog.c:563
msgid "No"
msgstr "No"
-#: ../src/empathy-new-chatroom-dialog.c:638
+#: ../src/empathy-new-chatroom-dialog.c:591
msgid "Could not start room listing"
msgstr "Impossibile recuperare l'elenco delle stanze"
-#: ../src/empathy-new-chatroom-dialog.c:648
+#: ../src/empathy-new-chatroom-dialog.c:601
msgid "Could not stop room listing"
msgstr "Impossibile bloccare il recupero dell'elenco delle stanze"
@@ -3656,39 +3901,39 @@ msgstr "Stan_za:"
# (ndt) quelli che seguono sono
# messaggi di eventi a cui associare un suono
-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:139
msgid "Message received"
msgstr "Messaggio ricevuto"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:140
msgid "Message sent"
msgstr "Messaggio inviato"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:141
msgid "New conversation"
msgstr "Nuova conversazione"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:142
msgid "Contact goes online"
msgstr "Il contatto entra in rete"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:143
msgid "Contact goes offline"
msgstr "Il contatto va fuori rete"
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:144
msgid "Account connected"
msgstr "Account connesso"
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:145
msgid "Account disconnected"
msgstr "Account disconnesso"
-#: ../src/empathy-preferences.c:445
+#: ../src/empathy-preferences.c:446
msgid "Language"
msgstr "Lingua"
-#: ../src/empathy-preferences.c:882
+#: ../src/empathy-preferences.c:875
msgid "Preferences"
msgstr "Preferenze"
@@ -3846,26 +4091,6 @@ msgstr "_Pubblicare la posizione geografica ai propri contatti"
msgid "_Reduce location accuracy"
msgstr "_Ridurre la precisione della posizione geografica"
-#: ../src/empathy-status-icon.c:141
-msgid "Respond"
-msgstr "Rispondi"
-
-#: ../src/empathy-status-icon.c:147
-msgid "Reject"
-msgstr "Rifiuta"
-
-#: ../src/empathy-status-icon.c:151
-msgid "Answer"
-msgstr "Rispondi"
-
-#: ../src/empathy-status-icon.c:158
-msgid "Decline"
-msgstr "Declina"
-
-#: ../src/empathy-status-icon.c:162
-msgid "Accept"
-msgstr "Accetta"
-
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Stato"
@@ -3875,67 +4100,67 @@ msgid "_Quit"
msgstr "_Esci"
# (ndt) questo è il titolo della finestra che mostra la mappa... molto libera
-#: ../src/empathy-map-view.c:452
+#: ../src/empathy-map-view.c:442
msgid "Contact Map View"
msgstr "Mappa posizioni dei contatti"
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1218
msgid "Save"
msgstr "Salva"
-#: ../src/empathy-debug-window.c:1395
+#: ../src/empathy-debug-window.c:1394
msgid "Debug Window"
msgstr "Finestra di debug"
-#: ../src/empathy-debug-window.c:1475
+#: ../src/empathy-debug-window.c:1476
msgid "Pause"
msgstr "Pausa"
-#: ../src/empathy-debug-window.c:1487
+#: ../src/empathy-debug-window.c:1488
msgid "Level "
msgstr "Livello "
-#: ../src/empathy-debug-window.c:1507
+#: ../src/empathy-debug-window.c:1508
msgid "Debug"
msgstr "Debug"
-#: ../src/empathy-debug-window.c:1513
+#: ../src/empathy-debug-window.c:1514
msgid "Info"
msgstr "Informazioni"
-#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
+#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
msgid "Message"
msgstr "Messaggio"
-#: ../src/empathy-debug-window.c:1525
+#: ../src/empathy-debug-window.c:1526
msgid "Warning"
msgstr "Avviso"
-#: ../src/empathy-debug-window.c:1531
+#: ../src/empathy-debug-window.c:1532
msgid "Critical"
msgstr "Critico"
-#: ../src/empathy-debug-window.c:1537
+#: ../src/empathy-debug-window.c:1538
msgid "Error"
msgstr "Errore"
-#: ../src/empathy-debug-window.c:1556
+#: ../src/empathy-debug-window.c:1557
msgid "Time"
msgstr "Orario"
-#: ../src/empathy-debug-window.c:1559
+#: ../src/empathy-debug-window.c:1560
msgid "Domain"
msgstr "Dominio"
-#: ../src/empathy-debug-window.c:1561
+#: ../src/empathy-debug-window.c:1562
msgid "Category"
msgstr "Categoria"
-#: ../src/empathy-debug-window.c:1563
+#: ../src/empathy-debug-window.c:1564
msgid "Level"
msgstr "Livello"
-#: ../src/empathy-debug-window.c:1600
+#: ../src/empathy-debug-window.c:1601
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3956,38 +4181,73 @@ msgstr "Scegliere un contatto da invitare nella conversazione:"
msgid "Invite"
msgstr "Invita"
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:183
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr ""
"Non visualizza alcun dialogo, esegue qualsiasi operazione (come "
"l'importazione) ed esce"
-#: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs if there are any non-Salut accounts"
-msgstr "Non visualizza alcun dialogo se ci sono account diversi da \"Salut\""
+#: ../src/empathy-accounts.c:187
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+"Non visualizza alcun dialogo se ci sono account diversi da \"Persone nelle "
+"vicinanze\""
# (ndt) spero che una cosa così non si veda mai...
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:191
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
"Seleziona l'account fornito (per esempio gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:193
msgid "<account-id>"
msgstr "<account-id>"
-#: ../src/empathy-accounts.c:200
+#: ../src/empathy-accounts.c:198
msgid "- Empathy Accounts"
-msgstr "- Empathy account"
+msgstr "- Account Empathy"
-#: ../src/empathy-accounts.c:216
+#: ../src/empathy-accounts.c:237
msgid "Empathy Accounts"
msgstr "Account Empathy"
-#: ../src/empathy-debugger.c:40
+#: ../src/empathy-debugger.c:66
msgid "Empathy Debugger"
msgstr "Debugger Empathy"
-# (ndt) opzione
-#~ msgid "Use _Yahoo! Japan"
-#~ msgstr "Usare _Yahoo! Giappone"
+#: ../src/empathy-chat.c:107
+msgid "- Empathy Chat Client"
+msgstr "- Client chat Empathy"
+
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "Rispondi"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "Rifiuta"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "Rispondi"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "Declina"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "Accetta"
+
+#: ../src/empathy-call-observer.c:130
+#, c-format
+msgid "Missed call from %s"
+msgstr "Chiamata persa da %s"
+
+#: ../src/empathy-call-observer.c:133
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s ha appena cercato di chiamare, ma era in corso un'altra chiamata."
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 0eaf09744..a3fd3ca30 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,10 +7,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: empathy 2.91.90\n"
+"Project-Id-Version: empathy 2.91.91\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-23 19:27+0800\n"
-"PO-Revision-Date: 2011-02-23 19:28+0800\n"
+"POT-Creation-Date: 2011-03-22 19:20+0800\n"
+"PO-Revision-Date: 2011-03-22 19:21+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
"Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
"Language: zh_TW\n"
@@ -422,23 +422,23 @@ msgstr "管理訊息與 VoIP 帳號"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2229
+#: ../src/empathy-accounts-dialog.c:2242
msgid "Messaging and VoIP Accounts"
msgstr "訊息與 VoIP 帳號"
-#: ../libempathy/empathy-ft-handler.c:835
+#: ../libempathy/empathy-ft-handler.c:825
msgid "File transfer completed, but the file was corrupted"
msgstr "檔案傳輸完畢,但是檔案已損毀"
-#: ../libempathy/empathy-ft-handler.c:1126
+#: ../libempathy/empathy-ft-handler.c:1113
msgid "File transfer not supported by remote contact"
msgstr "遠端聯絡人不支援檔案傳輸"
-#: ../libempathy/empathy-ft-handler.c:1182
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is not a regular file"
msgstr "選取的檔案不是正規的檔案"
-#: ../libempathy/empathy-ft-handler.c:1191
+#: ../libempathy/empathy-ft-handler.c:1178
msgid "The selected file is empty"
msgstr "選取的檔案是空白的"
@@ -470,161 +470,161 @@ msgstr "嘗試傳輸檔案時發生錯誤"
msgid "The other participant is unable to transfer the file"
msgstr "其他的參與者無法傳輸該檔案"
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:382
msgid "Unknown reason"
msgstr "不明原因"
-#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:304
msgid "Available"
msgstr "有空"
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:306
msgid "Busy"
msgstr "忙碌"
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:309
msgid "Away"
msgstr "離開"
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:311
msgid "Invisible"
msgstr "隱藏"
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:313
msgid "Offline"
msgstr "離線"
-#: ../libempathy/empathy-utils.c:316
-#: ../src/empathy-streamed-media-window.c:1897
-#: ../src/empathy-streamed-media-window.c:1898
-#: ../src/empathy-streamed-media-window.c:1899
-#: ../src/empathy-streamed-media-window.c:1900
+#: ../libempathy/empathy-utils.c:315
+#: ../src/empathy-streamed-media-window.c:1904
+#: ../src/empathy-streamed-media-window.c:1905
+#: ../src/empathy-streamed-media-window.c:1906
+#: ../src/empathy-streamed-media-window.c:1907
#: ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "不明"
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:354
msgid "No reason specified"
msgstr "沒有指定原因"
-#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:356 ../libempathy/empathy-utils.c:412
msgid "Status is set to offline"
msgstr "狀態設為離線"
-#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:358 ../libempathy/empathy-utils.c:392
msgid "Network error"
msgstr "網絡錯誤"
-#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:360 ../libempathy/empathy-utils.c:394
msgid "Authentication failed"
msgstr "驗證失敗"
-#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:362 ../libempathy/empathy-utils.c:396
msgid "Encryption error"
msgstr "加密發生錯誤"
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:364
msgid "Name in use"
msgstr "使用中的名稱"
-#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:366 ../libempathy/empathy-utils.c:398
msgid "Certificate not provided"
msgstr "沒有提供證書"
-#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:368 ../libempathy/empathy-utils.c:400
msgid "Certificate untrusted"
msgstr "證書不被信任"
-#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:370 ../libempathy/empathy-utils.c:402
msgid "Certificate expired"
msgstr "證書已逾期"
-#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:372 ../libempathy/empathy-utils.c:404
msgid "Certificate not activated"
msgstr "證書尚未使用"
-#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:374 ../libempathy/empathy-utils.c:406
msgid "Certificate hostname mismatch"
msgstr "證書主機名稱不符"
-#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:376 ../libempathy/empathy-utils.c:408
msgid "Certificate fingerprint mismatch"
msgstr "證書指紋檔不符"
-#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:378 ../libempathy/empathy-utils.c:410
msgid "Certificate self-signed"
msgstr "證書為自我簽署"
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:380
msgid "Certificate error"
msgstr "證書錯誤"
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:414
msgid "Encryption is not available"
msgstr "加密無法使用"
-#: ../libempathy/empathy-utils.c:417
+#: ../libempathy/empathy-utils.c:416
msgid "Certificate is invalid"
msgstr "證書無效"
-#: ../libempathy/empathy-utils.c:419
+#: ../libempathy/empathy-utils.c:418
msgid "Connection has been refused"
msgstr "連線遭拒"
-#: ../libempathy/empathy-utils.c:421
+#: ../libempathy/empathy-utils.c:420
msgid "Connection can't be established"
msgstr "無法建立連線"
-#: ../libempathy/empathy-utils.c:423
+#: ../libempathy/empathy-utils.c:422
msgid "Connection has been lost"
msgstr "已失去連線"
-#: ../libempathy/empathy-utils.c:425
+#: ../libempathy/empathy-utils.c:424
msgid "This resource is already connected to the server"
msgstr "此資源已連接至該伺服器"
-#: ../libempathy/empathy-utils.c:427
+#: ../libempathy/empathy-utils.c:426
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr "連線已被使用相同資源的新連線取代"
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:429
msgid "The account already exists on the server"
msgstr "該帳號已經存在於伺服器上"
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:431
msgid "Server is currently too busy to handle the connection"
msgstr "伺服器目前過於忙碌以致於無法處理該連線"
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:433
msgid "Certificate has been revoked"
msgstr "已撤銷證書"
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:435
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr "證書使用不安全的密碼演算法,或是密碼處理上較弱"
-#: ../libempathy/empathy-utils.c:439
+#: ../libempathy/empathy-utils.c:438
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
msgstr "伺服器證書的長度,或是伺服器證書鏈的深度超過密碼函式庫所能處理的範圍"
-#: ../libempathy/empathy-utils.c:602
+#: ../libempathy/empathy-utils.c:601
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "附近的人"
-#: ../libempathy/empathy-utils.c:607
+#: ../libempathy/empathy-utils.c:606
msgid "Yahoo! Japan"
msgstr "Yahoo! 日本"
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:635
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:636
msgid "Facebook Chat"
msgstr "Facebook 聊天"
@@ -668,86 +668,87 @@ msgstr[0] "%d 個月以前"
msgid "in the future"
msgstr "未來"
-#: ../libempathy-gtk/empathy-account-chooser.c:501
+#: ../libempathy-gtk/empathy-account-chooser.c:491
msgid "All"
msgstr "全部"
-#: ../libempathy-gtk/empathy-account-widget.c:679
-#: ../libempathy-gtk/empathy-log-window.c:653
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-log-window.c:643
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:680
+#: ../libempathy-gtk/empathy-account-widget.c:683
msgid "Password"
msgstr "密碼"
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:684
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "伺服器"
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:685
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "連接埠"
-#: ../libempathy-gtk/empathy-account-widget.c:754
-#: ../libempathy-gtk/empathy-account-widget.c:811
+#: ../libempathy-gtk/empathy-account-widget.c:757
+#: ../libempathy-gtk/empathy-account-widget.c:814
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1163
+#: ../libempathy-gtk/empathy-account-widget.c:1166
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "%s 帳號已透過我的網絡帳號修改。"
-#: ../libempathy-gtk/empathy-account-widget.c:1169
+#: ../libempathy-gtk/empathy-account-widget.c:1172
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "%s 帳號無法於 Empathy 內修改。"
-#: ../libempathy-gtk/empathy-account-widget.c:1189
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Launch My Web Accounts"
msgstr "啟動我的網絡帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:1527
+#: ../libempathy-gtk/empathy-account-widget.c:1530
msgid "Username:"
msgstr "使用者名稱:"
-#: ../libempathy-gtk/empathy-account-widget.c:1894
+#: ../libempathy-gtk/empathy-account-widget.c:1897
msgid "A_pply"
msgstr "套用(_A)"
-#: ../libempathy-gtk/empathy-account-widget.c:1924
+#: ../libempathy-gtk/empathy-account-widget.c:1927
msgid "L_og in"
msgstr "登入(_O)"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1990
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:451
+#: ../libempathy-gtk/empathy-account-widget.c:1993
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1479
+#: ../libempathy-gtk/empathy-individual-widget.c:1481
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "帳號:"
-#: ../libempathy-gtk/empathy-account-widget.c:2001
+#: ../libempathy-gtk/empathy-account-widget.c:2004
msgid "_Enabled"
msgstr "已啟用(_E)"
-#: ../libempathy-gtk/empathy-account-widget.c:2066
+#: ../libempathy-gtk/empathy-account-widget.c:2069
msgid "This account already exists on the server"
msgstr "此帳號已經存在這個伺服器上"
-#: ../libempathy-gtk/empathy-account-widget.c:2069
+#: ../libempathy-gtk/empathy-account-widget.c:2072
msgid "Create a new account on the server"
msgstr "在這個伺服器上建立新的帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:2261
+#: ../libempathy-gtk/empathy-account-widget.c:2264
msgid "Ca_ncel"
msgstr "取消(_N)"
@@ -756,19 +757,19 @@ msgstr "取消(_N)"
#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2558
+#: ../libempathy-gtk/empathy-account-widget.c:2561
#, c-format
msgid "%1$s on %2$s"
msgstr "%2$s 上的 %1$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2584
+#: ../libempathy-gtk/empathy-account-widget.c:2587
#, c-format
msgid "%s Account"
msgstr "%s 帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:2588
+#: ../libempathy-gtk/empathy-account-widget.c:2591
msgid "New account"
msgstr "新增帳號"
@@ -1175,19 +1176,19 @@ msgstr "無法轉換圖片"
msgid "None of the accepted image formats are supported on your system"
msgstr "你的系統上沒有支援已接受的圖片格式"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:930
msgid "Select Your Avatar Image"
msgstr "選擇你的大頭貼圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
msgid "No Image"
msgstr "沒有圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:995
msgid "Images"
msgstr "圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:999
msgid "All Files"
msgstr "所有檔案"
@@ -1195,155 +1196,161 @@ msgstr "所有檔案"
msgid "Click to enlarge"
msgstr "請按這裏放大"
-#: ../libempathy-gtk/empathy-chat.c:646
+#: ../libempathy-gtk/empathy-chat.c:652
msgid "Failed to open private chat"
msgstr "開啟私人對話失敗"
-#: ../libempathy-gtk/empathy-chat.c:697
+#: ../libempathy-gtk/empathy-chat.c:717
msgid "Topic not supported on this conversation"
msgstr "此談話的主題不被支援"
-#: ../libempathy-gtk/empathy-chat.c:703
+#: ../libempathy-gtk/empathy-chat.c:723
msgid "You are not allowed to change the topic"
msgstr "你不被允許更改這個主題"
-#: ../libempathy-gtk/empathy-chat.c:842
+#: ../libempathy-gtk/empathy-chat.c:906
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear:清除目前談話的所有訊息"
-#: ../libempathy-gtk/empathy-chat.c:845
+#: ../libempathy-gtk/empathy-chat.c:909
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <主題>:設置目前談話的主題"
-#: ../libempathy-gtk/empathy-chat.c:848
+#: ../libempathy-gtk/empathy-chat.c:912
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <聊天室 ID>:參加新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:851
+#: ../libempathy-gtk/empathy-chat.c:915
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <聊天室 ID>:參加新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:920
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr "/part [<聊天室 ID>] [<原因>]:離開聊天室,預設為目前的聊天室"
+
+#: ../libempathy-gtk/empathy-chat.c:925
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <聯絡人 ID> [<訊息>]:開啟私人對話"
-#: ../libempathy-gtk/empathy-chat.c:859
+#: ../libempathy-gtk/empathy-chat.c:928
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <聯絡人 ID> <訊息>:開啟私人對話"
-#: ../libempathy-gtk/empathy-chat.c:863
+#: ../libempathy-gtk/empathy-chat.c:931
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <網名>:更改在目前伺服器上的你的網名"
-#: ../libempathy-gtk/empathy-chat.c:866
+#: ../libempathy-gtk/empathy-chat.c:934
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <訊息>:送出一個 ACTION 訊息到目前的談話中"
-#: ../libempathy-gtk/empathy-chat.c:869
+#: ../libempathy-gtk/empathy-chat.c:937
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
"join a new chat room\""
msgstr "/say <訊息>:送出 <訊息> 到目前的談話中。這用於傳送以「/」開頭的訊息。舉例來說:「/say /join 是用來參加新的聊天室」"
-#: ../libempathy-gtk/empathy-chat.c:874
+#: ../libempathy-gtk/empathy-chat.c:942
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr "/help [<命令>]:顯示所有支援的指令。如果有定義這個 <命令> 的話,便顯示它的用法。"
-#: ../libempathy-gtk/empathy-chat.c:884
+#: ../libempathy-gtk/empathy-chat.c:952
#, c-format
msgid "Usage: %s"
msgstr "用法:%s"
-#: ../libempathy-gtk/empathy-chat.c:926
+#: ../libempathy-gtk/empathy-chat.c:991
msgid "Unknown command"
msgstr "未知的命令"
-#: ../libempathy-gtk/empathy-chat.c:1052
+#: ../libempathy-gtk/empathy-chat.c:1117
msgid "Unknown command; see /help for the available commands"
msgstr "未知的指令;請參見 /help 以取得可用的指令"
-#: ../libempathy-gtk/empathy-chat.c:1192
+#: ../libempathy-gtk/empathy-chat.c:1254
msgid "offline"
msgstr "離線"
-#: ../libempathy-gtk/empathy-chat.c:1195
+#: ../libempathy-gtk/empathy-chat.c:1257
msgid "invalid contact"
msgstr "無效的聯絡人"
-#: ../libempathy-gtk/empathy-chat.c:1198
+#: ../libempathy-gtk/empathy-chat.c:1260
msgid "permission denied"
msgstr "權限被拒絕"
-#: ../libempathy-gtk/empathy-chat.c:1201
+#: ../libempathy-gtk/empathy-chat.c:1263
msgid "too long message"
msgstr "太長的訊息"
-#: ../libempathy-gtk/empathy-chat.c:1204
+#: ../libempathy-gtk/empathy-chat.c:1266
msgid "not implemented"
msgstr "未實作"
-#: ../libempathy-gtk/empathy-chat.c:1208
+#: ../libempathy-gtk/empathy-chat.c:1270
msgid "unknown"
msgstr "不明"
-#: ../libempathy-gtk/empathy-chat.c:1212
+#: ../libempathy-gtk/empathy-chat.c:1274
#, c-format
msgid "Error sending message '%s': %s"
msgstr "傳送訊息「%s」時發生錯誤;%s"
-#: ../libempathy-gtk/empathy-chat.c:1273 ../src/empathy-chat-window.c:704
+#: ../libempathy-gtk/empathy-chat.c:1335 ../src/empathy-chat-window.c:717
msgid "Topic:"
msgstr "主題:"
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1347
#, c-format
msgid "Topic set to: %s"
msgstr "主題設定為: %s"
-#: ../libempathy-gtk/empathy-chat.c:1287
+#: ../libempathy-gtk/empathy-chat.c:1349
msgid "No topic defined"
msgstr "尚未定義主題"
-#: ../libempathy-gtk/empathy-chat.c:1786
+#: ../libempathy-gtk/empathy-chat.c:1848
msgid "(No Suggestions)"
msgstr "(沒有建議)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1854
+#: ../libempathy-gtk/empathy-chat.c:1916
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "加入「%s」至字典"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1891
+#: ../libempathy-gtk/empathy-chat.c:1953
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "加入「%s」至 %s 字典"
-#: ../libempathy-gtk/empathy-chat.c:1950
+#: ../libempathy-gtk/empathy-chat.c:2010
msgid "Insert Smiley"
msgstr "插入表情符號"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1968
-#: ../libempathy-gtk/empathy-ui-utils.c:1810
+#: ../libempathy-gtk/empathy-chat.c:2028
+#: ../libempathy-gtk/empathy-ui-utils.c:1808
msgid "_Send"
msgstr "傳送(_S)"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2003
+#: ../libempathy-gtk/empathy-chat.c:2063
msgid "_Spelling Suggestions"
msgstr "拼字建議(_S)"
-#: ../libempathy-gtk/empathy-chat.c:2092
+#: ../libempathy-gtk/empathy-chat.c:2152
msgid "Failed to retrieve recent logs"
msgstr "無法取得最近的日誌"
-#: ../libempathy-gtk/empathy-chat.c:2198
+#: ../libempathy-gtk/empathy-chat.c:2263
#, c-format
msgid "%s has disconnected"
msgstr "%s 已斷線"
@@ -1351,12 +1358,12 @@ msgstr "%s 已斷線"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2205
+#: ../libempathy-gtk/empathy-chat.c:2270
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s 被 %2$s 踢出去"
-#: ../libempathy-gtk/empathy-chat.c:2208
+#: ../libempathy-gtk/empathy-chat.c:2273
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢出"
@@ -1364,17 +1371,17 @@ msgstr "%s 被踢出"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2216
+#: ../libempathy-gtk/empathy-chat.c:2281
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s 被 %2$s 設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:2219
+#: ../libempathy-gtk/empathy-chat.c:2284
#, c-format
msgid "%s was banned"
msgstr "%s 被設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:2223
+#: ../libempathy-gtk/empathy-chat.c:2288
#, c-format
msgid "%s has left the room"
msgstr "%s 已經離開此聊天室"
@@ -1384,66 +1391,90 @@ msgstr "%s 已經離開此聊天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2232
+#: ../libempathy-gtk/empathy-chat.c:2297
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2257
+#: ../libempathy-gtk/empathy-chat.c:2322
#, c-format
msgid "%s has joined the room"
msgstr "%s 已經參加此聊天室"
-#: ../libempathy-gtk/empathy-chat.c:2282
+#: ../libempathy-gtk/empathy-chat.c:2347
#, c-format
msgid "%s is now known as %s"
msgstr "%s 現在被稱為 %s"
-#: ../libempathy-gtk/empathy-chat.c:2421
-#: ../src/empathy-streamed-media-window.c:1942
+#: ../libempathy-gtk/empathy-chat.c:2486
+#: ../src/empathy-streamed-media-window.c:1949
#: ../src/empathy-event-manager.c:1122
msgid "Disconnected"
msgstr "已斷線"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3051
+#: ../libempathy-gtk/empathy-chat.c:3116
msgid "Would you like to store this password?"
msgstr "你想要儲存此密碼?"
-#: ../libempathy-gtk/empathy-chat.c:3057
+#: ../libempathy-gtk/empathy-chat.c:3122
msgid "Remember"
msgstr "記住"
-#: ../libempathy-gtk/empathy-chat.c:3067
+#: ../libempathy-gtk/empathy-chat.c:3132
msgid "Not now"
msgstr "現在不要"
-#: ../libempathy-gtk/empathy-chat.c:3111
+#: ../libempathy-gtk/empathy-chat.c:3176
msgid "Retry"
msgstr "重試"
-#: ../libempathy-gtk/empathy-chat.c:3115
+#: ../libempathy-gtk/empathy-chat.c:3180
msgid "Wrong password; please try again:"
msgstr "密碼錯誤;請再試一次:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3232
+#: ../libempathy-gtk/empathy-chat.c:3297
msgid "This room is protected by a password:"
msgstr "此聊天室已被密碼保護:"
-#: ../libempathy-gtk/empathy-chat.c:3259
+#: ../libempathy-gtk/empathy-chat.c:3324
msgid "Join"
msgstr "參加"
-#: ../libempathy-gtk/empathy-chat.c:3429 ../src/empathy-event-manager.c:1144
+#: ../libempathy-gtk/empathy-chat.c:3494 ../src/empathy-event-manager.c:1144
msgid "Connected"
msgstr "成功連線"
-#: ../libempathy-gtk/empathy-chat.c:3482
-#: ../libempathy-gtk/empathy-log-window.c:660
+#: ../libempathy-gtk/empathy-chat.c:3547
+#: ../libempathy-gtk/empathy-log-window.c:650
msgid "Conversation"
msgstr "談話"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+msgid "Unknown or invalid identifier"
+msgstr "未知或無效的識別身分"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+msgid "Contact blocking temporarily unavailable"
+msgstr "聯絡人封鎖暫時無法使用"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+msgid "Contact blocking unavailable"
+msgstr "聯絡人封鎖無法使用"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+msgid "Permission Denied"
+msgstr "已拒絕授權"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+msgid "Could not block contact"
+msgstr "無法封鎖聯絡人"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+msgid "Edit Blocked Contacts"
+msgstr "編輯封鎖的聯絡人"
+
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
#: ../libempathy-gtk/empathy-theme-adium.c:794
@@ -1462,20 +1493,43 @@ msgstr "開啟連結(_O)"
msgid "%A %B %d %Y"
msgstr "%Y %B %d %A"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:265
+#: ../libempathy-gtk/empathy-contact-dialogs.c:299
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "編輯聯絡人資訊"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:316
+#: ../libempathy-gtk/empathy-contact-dialogs.c:350
msgid "Personal Information"
msgstr "個人資料"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:425
-#: ../libempathy-gtk/empathy-individual-dialogs.c:115
+#: ../libempathy-gtk/empathy-contact-dialogs.c:459
+#: ../libempathy-gtk/empathy-individual-dialogs.c:119
msgid "New Contact"
msgstr "新增聯絡人"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:533
+#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#, c-format
+msgid "Block %s?"
+msgstr "封鎖 %s?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr "你確定想要封鎖「%s」讓他無法再與你聯絡嗎?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:543
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+msgid "_Block"
+msgstr "封鎖(_B)"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "回報這些聯絡人濫用帳號(_R)"
+
#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
msgid "Decide _Later"
msgstr "稍後再決定(_L)"
@@ -1484,6 +1538,10 @@ msgstr "稍後再決定(_L)"
msgid "Subscription Request"
msgstr "訂閱要求"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "_Block User"
+msgstr "封鎖使用者(_B)"
+
#: ../libempathy-gtk/empathy-contact-list-store.h:71
msgid "Ungrouped"
msgstr "未羣組"
@@ -1492,114 +1550,122 @@ msgstr "未羣組"
msgid "Favorite People"
msgstr "喜好的人"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2012
-#: ../libempathy-gtk/empathy-individual-view.c:2309
+#: ../libempathy-gtk/empathy-contact-list-view.c:2001
+#: ../libempathy-gtk/empathy-individual-view.c:2336
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "是否想要移除羣組「%s」?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2014
-#: ../libempathy-gtk/empathy-individual-view.c:2312
+#: ../libempathy-gtk/empathy-contact-list-view.c:2003
+#: ../libempathy-gtk/empathy-individual-view.c:2339
msgid "Removing group"
msgstr "正在移除羣組"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2063
-#: ../libempathy-gtk/empathy-contact-list-view.c:2140
-#: ../libempathy-gtk/empathy-individual-view.c:2367
-#: ../libempathy-gtk/empathy-individual-view.c:2514
+#: ../libempathy-gtk/empathy-contact-list-view.c:2052
+#: ../libempathy-gtk/empathy-contact-list-view.c:2129
+#: ../libempathy-gtk/empathy-individual-view.c:2394
+#: ../libempathy-gtk/empathy-individual-view.c:2588
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "移除(_R)"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2093
-#: ../libempathy-gtk/empathy-individual-view.c:2417
+#: ../libempathy-gtk/empathy-contact-list-view.c:2082
+#: ../libempathy-gtk/empathy-individual-view.c:2458
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "是否想要移除聯絡人「%s」?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2095
-#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../libempathy-gtk/empathy-contact-list-view.c:2084
+#: ../libempathy-gtk/empathy-individual-view.c:2479
msgid "Removing contact"
msgstr "正在移除聯絡人"
-#: ../libempathy-gtk/empathy-contact-menu.c:204
+#: ../libempathy-gtk/empathy-contact-menu.c:219
#: ../src/empathy-main-window.ui.h:13
msgid "_Add Contact…"
-msgstr "新增聯絡人(_A)…"
+msgstr "加入聯絡人(_A)…"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:299
+msgid "_Block Contact"
+msgstr "封鎖聯絡人(_B)"
-#: ../libempathy-gtk/empathy-contact-menu.c:231
+#: ../libempathy-gtk/empathy-contact-menu.c:328
#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "聊天(_C)"
-#: ../libempathy-gtk/empathy-contact-menu.c:262
+#: ../libempathy-gtk/empathy-contact-menu.c:359
#: ../libempathy-gtk/empathy-individual-menu.c:560
msgctxt "menu item"
msgid "_Audio Call"
msgstr "語音通話(_A)"
-#: ../libempathy-gtk/empathy-contact-menu.c:293
+#: ../libempathy-gtk/empathy-contact-menu.c:390
#: ../libempathy-gtk/empathy-individual-menu.c:602
msgctxt "menu item"
msgid "_Video Call"
msgstr "視像通話(_V)"
-#: ../libempathy-gtk/empathy-contact-menu.c:334
+#: ../libempathy-gtk/empathy-contact-menu.c:436
#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "上一次談話(_P)"
-#: ../libempathy-gtk/empathy-contact-menu.c:356
+#: ../libempathy-gtk/empathy-contact-menu.c:458
#: ../libempathy-gtk/empathy-individual-menu.c:686
msgid "Send File"
msgstr "傳送檔案"
-#: ../libempathy-gtk/empathy-contact-menu.c:379
+#: ../libempathy-gtk/empathy-contact-menu.c:481
#: ../libempathy-gtk/empathy-individual-menu.c:728
msgid "Share My Desktop"
msgstr "分享我的桌面"
-#: ../libempathy-gtk/empathy-contact-menu.c:419
-#: ../libempathy-gtk/empathy-contact-widget.c:1681
-#: ../libempathy-gtk/empathy-individual-menu.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:1370
+#: ../libempathy-gtk/empathy-contact-menu.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:1763
+#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
msgid "Favorite"
msgstr "喜好"
-#: ../libempathy-gtk/empathy-contact-menu.c:448
-#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-contact-menu.c:550
+#: ../libempathy-gtk/empathy-individual-menu.c:791
msgid "Infor_mation"
msgstr "資訊(_M)"
-#: ../libempathy-gtk/empathy-contact-menu.c:494
+#: ../libempathy-gtk/empathy-contact-menu.c:596
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
-#: ../libempathy-gtk/empathy-contact-menu.c:548
-#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:916
+#: ../libempathy-gtk/empathy-contact-menu.c:650
+#: ../libempathy-gtk/empathy-individual-menu.c:972
+#: ../src/empathy-chat-window.c:935
msgid "Inviting you to this room"
msgstr "邀請你到這個聊天室"
-#: ../libempathy-gtk/empathy-contact-menu.c:579
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:681
+#: ../libempathy-gtk/empathy-individual-menu.c:1019
msgid "_Invite to Chat Room"
msgstr "邀請到聊天室(_I)"
#. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:445
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
msgid "Search contacts"
msgstr "搜尋聯絡人"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:473
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
msgid "Search: "
msgstr "搜尋:"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:534
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+msgid "_Add Contact"
+msgstr "加入聯絡人(_A)"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
msgid "No contacts found"
msgstr "找不到聯絡人"
@@ -1607,178 +1673,178 @@ msgstr "找不到聯絡人"
msgid "Select a contact"
msgstr "選擇聯絡人"
-#: ../libempathy-gtk/empathy-contact-widget.c:276
+#: ../libempathy-gtk/empathy-contact-widget.c:295
#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "全名:"
-#: ../libempathy-gtk/empathy-contact-widget.c:277
+#: ../libempathy-gtk/empathy-contact-widget.c:296
#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "電話號碼:"
-#: ../libempathy-gtk/empathy-contact-widget.c:278
+#: ../libempathy-gtk/empathy-contact-widget.c:297
#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "電子信箱位址:"
-#: ../libempathy-gtk/empathy-contact-widget.c:279
+#: ../libempathy-gtk/empathy-contact-widget.c:298
#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
msgstr "網站:"
-#: ../libempathy-gtk/empathy-contact-widget.c:280
+#: ../libempathy-gtk/empathy-contact-widget.c:299
#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "生日:"
-#: ../libempathy-gtk/empathy-contact-widget.c:724
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:762
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Country ISO Code:"
msgstr "國家 ISO 碼:"
-#: ../libempathy-gtk/empathy-contact-widget.c:726
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:764
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Country:"
msgstr "國家:"
-#: ../libempathy-gtk/empathy-contact-widget.c:728
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:766
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "State:"
msgstr "州:"
-#: ../libempathy-gtk/empathy-contact-widget.c:730
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:768
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "City:"
msgstr "市:"
-#: ../libempathy-gtk/empathy-contact-widget.c:732
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:770
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Area:"
msgstr "區域:"
-#: ../libempathy-gtk/empathy-contact-widget.c:734
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:772
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Postal Code:"
msgstr "郵遞區號:"
-#: ../libempathy-gtk/empathy-contact-widget.c:736
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:774
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Street:"
msgstr "街:"
-#: ../libempathy-gtk/empathy-contact-widget.c:738
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:776
+#: ../libempathy-gtk/empathy-individual-widget.c:502
msgid "Building:"
msgstr "建築:"
-#: ../libempathy-gtk/empathy-contact-widget.c:740
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:778
+#: ../libempathy-gtk/empathy-individual-widget.c:504
msgid "Floor:"
msgstr "樓層:"
-#: ../libempathy-gtk/empathy-contact-widget.c:742
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:780
+#: ../libempathy-gtk/empathy-individual-widget.c:506
msgid "Room:"
msgstr "室:"
-#: ../libempathy-gtk/empathy-contact-widget.c:744
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:782
+#: ../libempathy-gtk/empathy-individual-widget.c:508
msgid "Text:"
msgstr "文字:"
-#: ../libempathy-gtk/empathy-contact-widget.c:746
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:784
+#: ../libempathy-gtk/empathy-individual-widget.c:510
msgid "Description:"
msgstr "描述:"
-#: ../libempathy-gtk/empathy-contact-widget.c:748
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:786
+#: ../libempathy-gtk/empathy-individual-widget.c:512
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:750
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:788
+#: ../libempathy-gtk/empathy-individual-widget.c:514
msgid "Accuracy Level:"
msgstr "準確度等級:"
-#: ../libempathy-gtk/empathy-contact-widget.c:752
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:790
+#: ../libempathy-gtk/empathy-individual-widget.c:516
msgid "Error:"
msgstr "錯誤:"
-#: ../libempathy-gtk/empathy-contact-widget.c:754
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-individual-widget.c:518
msgid "Vertical Error (meters):"
msgstr "垂直誤差 (米):"
-#: ../libempathy-gtk/empathy-contact-widget.c:756
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:794
+#: ../libempathy-gtk/empathy-individual-widget.c:520
msgid "Horizontal Error (meters):"
msgstr "水平誤差 (米):"
-#: ../libempathy-gtk/empathy-contact-widget.c:758
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:796
+#: ../libempathy-gtk/empathy-individual-widget.c:522
msgid "Speed:"
msgstr "速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:760
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:798
+#: ../libempathy-gtk/empathy-individual-widget.c:524
msgid "Bearing:"
msgstr "方位:"
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:800
+#: ../libempathy-gtk/empathy-individual-widget.c:526
msgid "Climb Speed:"
msgstr "爬升速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:802
+#: ../libempathy-gtk/empathy-individual-widget.c:528
msgid "Last Updated on:"
msgstr "上次更新於:"
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:804
+#: ../libempathy-gtk/empathy-individual-widget.c:530
msgid "Longitude:"
msgstr "經度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:806
+#: ../libempathy-gtk/empathy-individual-widget.c:532
msgid "Latitude:"
msgstr "緯度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:808
+#: ../libempathy-gtk/empathy-individual-widget.c:534
msgid "Altitude:"
msgstr "緯度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:833
-#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-individual-widget.c:615
-#: ../libempathy-gtk/empathy-individual-widget.c:632
+#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-contact-widget.c:888
+#: ../libempathy-gtk/empathy-individual-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:633
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "位置"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:852
-#: ../libempathy-gtk/empathy-individual-widget.c:634
+#: ../libempathy-gtk/empathy-contact-widget.c:890
+#: ../libempathy-gtk/empathy-individual-widget.c:635
#, c-format
msgid "%s, %s"
msgstr "%s,%s"
-#: ../libempathy-gtk/empathy-contact-widget.c:904
-#: ../libempathy-gtk/empathy-individual-widget.c:683
+#: ../libempathy-gtk/empathy-contact-widget.c:942
+#: ../libempathy-gtk/empathy-individual-widget.c:684
msgid "%B %e, %Y at %R UTC"
msgstr "%Y %B %e 於 %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:986
-#: ../libempathy-gtk/empathy-individual-widget.c:918
+#: ../libempathy-gtk/empathy-contact-widget.c:1024
+#: ../libempathy-gtk/empathy-individual-widget.c:919
msgid "Save Avatar"
msgstr "儲存大頭貼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1042
-#: ../libempathy-gtk/empathy-individual-widget.c:976
+#: ../libempathy-gtk/empathy-contact-widget.c:1080
+#: ../libempathy-gtk/empathy-individual-widget.c:977
msgid "Unable to save avatar"
msgstr "無法儲存大頭貼"
@@ -1788,7 +1854,7 @@ msgstr "<b>位置</b> 於 (date)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1305
+#: ../libempathy-gtk/empathy-individual-widget.c:1307
msgid "Alias:"
msgstr "別名:"
@@ -1808,7 +1874,7 @@ msgstr "聯絡人詳細資料"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1509
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
msgid "Identifier:"
msgstr "識別身分:"
@@ -1845,10 +1911,20 @@ msgid "Select"
msgstr "選取"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1432
+#: ../src/empathy-main-window.c:1436
msgid "Group"
msgstr "羣組"
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+msgid "The following identity will be blocked:"
+msgid_plural "The following identities will be blocked:"
+msgstr[0] "下列識別身分將被封鎖:"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+msgid "The following identity can not be blocked:"
+msgid_plural "The following identities can not be blocked:"
+msgstr[0] "下列識別身分無法被封鎖:"
+
#. Translators: the heading at the top of the Information dialogue
#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
msgid "Linked Contacts"
@@ -1874,26 +1950,30 @@ msgstr "在清單左方的所選聯絡人將連結在一起。"
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:837
+#: ../libempathy-gtk/empathy-individual-menu.c:839
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-menu.c:865
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "連結聯絡人(_L)…"
-#: ../libempathy-gtk/empathy-individual-view.c:2425
+#: ../libempathy-gtk/empathy-individual-view.c:2301
+msgid "Delete and _Block"
+msgstr "刪除並封鎖(_B)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2467
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
"remove all the contacts which make up this linked contact."
msgstr "你真的想要移除連結聯絡人「%s」嗎?請注意這會移除所有構成此連結聯絡羣的聯絡人。"
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1652
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -1973,7 +2053,7 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "取消連結(_U)"
-#: ../libempathy-gtk/empathy-log-window.c:670
+#: ../libempathy-gtk/empathy-log-window.c:660
msgid "Date"
msgstr "日期"
@@ -2021,17 +2101,17 @@ msgid "New Conversation"
msgstr "新增談話"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:252
+#: ../libempathy-gtk/empathy-new-call-dialog.c:253
msgid "Send _Video"
msgstr "傳送視像(_V)"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:260
+#: ../libempathy-gtk/empathy-new-call-dialog.c:261
msgid "C_all"
msgstr "通話(_A)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:270
+#: ../libempathy-gtk/empathy-new-call-dialog.c:271
msgid "New Call"
msgstr "新增通話"
@@ -2072,12 +2152,12 @@ msgstr "按這裏將這個狀態設為喜好"
msgid "Set status"
msgstr "設定狀態"
-#: ../libempathy-gtk/empathy-presence-chooser.c:948
+#: ../libempathy-gtk/empathy-presence-chooser.c:946
msgid "Set your presence and current status"
msgstr "設定你的上線與目前的狀態"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1136
+#: ../libempathy-gtk/empathy-presence-chooser.c:1134
msgid "Custom messages…"
msgstr "自選訊息…"
@@ -2229,31 +2309,42 @@ msgstr "預期的證書主機名稱:%s"
msgid "Certificate hostname: %s"
msgstr "證書主機名稱:%s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:271
+#: ../libempathy-gtk/empathy-tls-dialog.c:281
msgid "Continue"
msgstr "繼續"
-#: ../libempathy-gtk/empathy-tls-dialog.c:277
+#: ../libempathy-gtk/empathy-tls-dialog.c:287
msgid "This connection is untrusted. Would you like to continue anyway?"
msgstr "此連線未受信任。你無論如何都要繼續嗎?"
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:297
msgid "Remember this choice for future connections"
msgstr "請記住此選擇以供未來連線使用"
-#: ../libempathy-gtk/empathy-tls-dialog.c:302
+#: ../libempathy-gtk/empathy-tls-dialog.c:303
msgid "Certificate Details"
msgstr "證書詳細資料"
-#: ../libempathy-gtk/empathy-ui-utils.c:1707
+#: ../libempathy-gtk/empathy-ui-utils.c:1705
msgid "Unable to open URI"
msgstr "無法開啓 URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1802
+#: ../libempathy-gtk/empathy-ui-utils.c:1800
msgid "Select a file"
msgstr "選擇一個檔案"
-#: ../libempathy-gtk/empathy-ui-utils.c:1871
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
+msgid "Insufficient free space to save file"
+msgstr "空間不足以儲存檔案"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#, c-format
+msgid ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
+msgstr "需要 %s 的空間以儲存此檔案,但僅有 %s 可用。請選擇其他位置。"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1924
#, c-format
msgid "Incoming file from %s"
msgstr "收到來自 %s 的檔案"
@@ -2441,23 +2532,23 @@ msgstr "沒有錯誤訊息"
msgid "Instant Message (Empathy)"
msgstr "即時通訊 (Empathy)"
-#: ../src/empathy.c:310
+#: ../src/empathy.c:308
msgid "Don't connect on startup"
msgstr "啟動時不要自動連線"
-#: ../src/empathy.c:314
+#: ../src/empathy.c:312
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "啟動時不顯示聯絡人清單或任何其他對話窗"
-#: ../src/empathy.c:322
+#: ../src/empathy.c:320
msgid "- Empathy IM Client"
msgstr "- Empathy 即時通用戶端"
-#: ../src/empathy.c:501
+#: ../src/empathy.c:499
msgid "Error contacting the Account Manager"
msgstr "聯絡帳號管理程式時發生錯誤"
-#: ../src/empathy.c:503
+#: ../src/empathy.c:501
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2536,7 +2627,7 @@ msgid ""
msgstr "你可以回到前頁再次輸入帳號的詳細資料或結束此助理,稍後再從「編輯」選單加入帳號。"
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1271
msgid "An error occurred"
msgstr "發生錯誤"
@@ -2596,17 +2687,17 @@ msgstr "不,我現在只想看看附近有誰上線"
msgid "Select the accounts you want to import:"
msgstr "選擇要匯入的帳號:"
-#: ../src/empathy-account-assistant.c:810
-#: ../src/empathy-new-chatroom-dialog.c:567
-#: ../src/empathy-new-chatroom-dialog.c:568
+#: ../src/empathy-account-assistant.c:813
+#: ../src/empathy-new-chatroom-dialog.c:562
+#: ../src/empathy-new-chatroom-dialog.c:563
msgid "Yes"
msgstr "是"
-#: ../src/empathy-account-assistant.c:817
+#: ../src/empathy-account-assistant.c:820
msgid "No, that's all for now"
msgstr "不,目前就這樣"
-#: ../src/empathy-account-assistant.c:1082
+#: ../src/empathy-account-assistant.c:1085
msgid ""
"Empathy can automatically discover and chat with the people connected on the "
"same network as you. If you want to use this feature, please check that the "
@@ -2614,16 +2705,16 @@ msgid ""
"disable this feature by using the 'Accounts' dialog"
msgstr "Empathy 可以自動探索與你連線到相同網絡上的人們,並且和他們聊天。如果你想要使用此功能,請檢查下列詳細資料是否正確。你也可以在以後簡單地更改這些細節,或是用「帳號」對話窗來停用此功能"
-#: ../src/empathy-account-assistant.c:1088
-#: ../src/empathy-account-assistant.c:1144
+#: ../src/empathy-account-assistant.c:1091
+#: ../src/empathy-account-assistant.c:1147
msgid "Edit->Accounts"
msgstr "編輯 -> 帳號"
-#: ../src/empathy-account-assistant.c:1104
-msgid "I don't want to enable this feature for now"
-msgstr "我現在不想要啟用這項功能"
+#: ../src/empathy-account-assistant.c:1107
+msgid "I do _not want to enable this feature for now"
+msgstr "我現在不想要啟用這項功能(_N)"
-#: ../src/empathy-account-assistant.c:1140
+#: ../src/empathy-account-assistant.c:1143
msgid ""
"You won't be able to chat with people connected to your local network, as "
"telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2631,23 +2722,23 @@ msgid ""
"the Accounts dialog"
msgstr "你無法與連線到你本機網絡的人們聊天,因為 telepathy-salut 尚未安裝。如果你想要啟用此功能,請安裝 telepathy-salut 套件,並從「帳號」對話窗建立「附近的人」帳號"
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1149
msgid "telepathy-salut not installed"
msgstr "telepathy-salut 尚未安裝"
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1195
msgid "Messaging and VoIP Accounts Assistant"
msgstr "訊息與 VoIP 帳號助理"
-#: ../src/empathy-account-assistant.c:1226
+#: ../src/empathy-account-assistant.c:1229
msgid "Welcome to Empathy"
msgstr "歡迎使用 Empathy"
-#: ../src/empathy-account-assistant.c:1235
+#: ../src/empathy-account-assistant.c:1238
msgid "Import your existing accounts"
msgstr "匯入現有的帳號"
-#: ../src/empathy-account-assistant.c:1253
+#: ../src/empathy-account-assistant.c:1256
msgid "Please enter personal details"
msgstr "請輸入個人詳細資料"
@@ -2725,7 +2816,7 @@ msgstr "啟用(_E)"
msgid "_Disable"
msgstr "停用(_D)"
-#: ../src/empathy-accounts-dialog.c:2073
+#: ../src/empathy-accounts-dialog.c:2086
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2759,11 +2850,11 @@ msgstr "加入(_A)…"
msgid "_Import…"
msgstr "匯入(_I)…"
-#: ../src/empathy-auth-client.c:243
+#: ../src/empathy-auth-client.c:246
msgid " - Empathy authentication client"
msgstr "- Empathy 認證用戶端"
-#: ../src/empathy-auth-client.c:259
+#: ../src/empathy-auth-client.c:262
msgid "Empathy authentication client"
msgstr "Empathy 認證用戶端"
@@ -2795,105 +2886,105 @@ msgstr "Gamma"
msgid "Volume"
msgstr "音量"
-#: ../src/empathy-streamed-media-window.c:1165
+#: ../src/empathy-streamed-media-window.c:1166
msgid "_Sidebar"
msgstr "側邊欄(_S)"
-#: ../src/empathy-streamed-media-window.c:1185
+#: ../src/empathy-streamed-media-window.c:1186
msgid "Audio input"
msgstr "音效輸入"
-#: ../src/empathy-streamed-media-window.c:1189
+#: ../src/empathy-streamed-media-window.c:1190
msgid "Video input"
msgstr "視像輸入"
-#: ../src/empathy-streamed-media-window.c:1193
+#: ../src/empathy-streamed-media-window.c:1194
msgid "Dialpad"
msgstr "播號盤"
-#: ../src/empathy-streamed-media-window.c:1198
+#: ../src/empathy-streamed-media-window.c:1205
msgid "Details"
msgstr "詳細資料"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1267
+#: ../src/empathy-streamed-media-window.c:1274
#, c-format
msgid "Call with %s"
msgstr "與 %s 通話中"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-streamed-media-window.c:1346
+#: ../src/empathy-streamed-media-window.c:1353
msgid "Call"
msgstr "通話"
-#: ../src/empathy-streamed-media-window.c:1500
+#: ../src/empathy-streamed-media-window.c:1507
msgid "The IP address as seen by the machine"
msgstr "機器看見的 IP 位址"
-#: ../src/empathy-streamed-media-window.c:1502
+#: ../src/empathy-streamed-media-window.c:1509
msgid "The IP address as seen by a server on the Internet"
msgstr "互聯網上的伺服器看見的 IP 位址"
-#: ../src/empathy-streamed-media-window.c:1504
+#: ../src/empathy-streamed-media-window.c:1511
msgid "The IP address of the peer as seen by the other side"
msgstr "其他端看見的點的 IP 位址"
-#: ../src/empathy-streamed-media-window.c:1506
+#: ../src/empathy-streamed-media-window.c:1513
msgid "The IP address of a relay server"
msgstr "中繼伺服器的 IP 位址"
-#: ../src/empathy-streamed-media-window.c:1508
+#: ../src/empathy-streamed-media-window.c:1515
msgid "The IP address of the multicast group"
msgstr "多點廣播羣組的 IP 位址"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-streamed-media-window.c:2266
#, c-format
msgid "Connected — %d:%02dm"
msgstr "已連線 — %d:%02dm"
-#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-streamed-media-window.c:2327
msgid "Technical Details"
msgstr "技術細節"
-#: ../src/empathy-streamed-media-window.c:2358
+#: ../src/empathy-streamed-media-window.c:2365
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "%s 的軟件不瞭解任何你電腦上所支援的音訊格式"
-#: ../src/empathy-streamed-media-window.c:2363
+#: ../src/empathy-streamed-media-window.c:2370
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "%s 的軟件不瞭解任何你電腦上所支援的視像格式"
-#: ../src/empathy-streamed-media-window.c:2369
+#: ../src/empathy-streamed-media-window.c:2376
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
"does not allow direct connections."
msgstr "無法和 %s 建立連線。你們其中之一可能在一個不允許直接連線的網絡之上。"
-#: ../src/empathy-streamed-media-window.c:2375
+#: ../src/empathy-streamed-media-window.c:2382
msgid "There was a failure on the network"
msgstr "這個網絡上有錯誤發生"
-#: ../src/empathy-streamed-media-window.c:2379
+#: ../src/empathy-streamed-media-window.c:2386
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "此通話所必要的音訊格式尚未在你的電腦上安裝"
-#: ../src/empathy-streamed-media-window.c:2382
+#: ../src/empathy-streamed-media-window.c:2389
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "此通話所必要的視像格式尚未在你的電腦上安裝"
-#: ../src/empathy-streamed-media-window.c:2392
+#: ../src/empathy-streamed-media-window.c:2399
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2901,19 +2992,19 @@ msgid ""
"the Help menu."
msgstr "在 Telepathy 元件中發生未預期的狀況。請<a href=\"%s\">匯報這個錯誤</a>並附上從求助選單內的「除錯」視窗中所收集的紀錄。"
-#: ../src/empathy-streamed-media-window.c:2400
+#: ../src/empathy-streamed-media-window.c:2407
msgid "There was a failure in the call engine"
msgstr "通話引擎內有錯誤發生"
-#: ../src/empathy-streamed-media-window.c:2403
+#: ../src/empathy-streamed-media-window.c:2410
msgid "The end of the stream was reached"
msgstr "已達串流末端"
-#: ../src/empathy-streamed-media-window.c:2443
+#: ../src/empathy-streamed-media-window.c:2450
msgid "Can't establish audio stream"
msgstr "無法建立音訊串流"
-#: ../src/empathy-streamed-media-window.c:2453
+#: ../src/empathy-streamed-media-window.c:2460
msgid "Can't establish video stream"
msgstr "無法建立視像串流"
@@ -3009,35 +3100,35 @@ msgstr "視像預覽"
msgid "_Call"
msgstr "通話(_C)"
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
msgid "_View"
msgstr "檢視(_V)"
-#: ../src/empathy-chat-window.c:469 ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d 個未讀)"
-#: ../src/empathy-chat-window.c:481
+#: ../src/empathy-chat-window.c:486
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (與 %u 其他的)"
-#: ../src/empathy-chat-window.c:497
+#: ../src/empathy-chat-window.c:502
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (來自其他人的 %d 個未讀)"
-#: ../src/empathy-chat-window.c:506
+#: ../src/empathy-chat-window.c:511
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (來自所有人的 %d 個未讀)"
-#: ../src/empathy-chat-window.c:708
+#: ../src/empathy-chat-window.c:721
msgid "Typing a message."
msgstr "正在輸入訊息。"
@@ -3073,7 +3164,7 @@ msgstr "將分頁右移(_R)"
msgid "Notify for All Messages"
msgstr "所有訊息都通知"
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
msgid "_Contents"
msgstr "內容(_C)"
@@ -3085,7 +3176,7 @@ msgstr "談話(_C)"
msgid "_Detach Tab"
msgstr "分離分頁(_D)"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
msgid "_Edit"
msgstr "編輯(_E)"
@@ -3093,7 +3184,7 @@ msgstr "編輯(_E)"
msgid "_Favorite Chat Room"
msgstr "喜好的聊天室(_F)"
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
msgid "_Help"
msgstr "求助(_H)"
@@ -3167,7 +3258,7 @@ msgstr "接聽(_A)"
#: ../src/empathy-event-manager.c:660
#, c-format
msgid "Incoming video call from %s"
-msgstr "來自 %s 的視像電話"
+msgstr "來自 %s 的視像通話"
#: ../src/empathy-event-manager.c:737
msgid "Room invitation"
@@ -3207,7 +3298,7 @@ msgstr "你被邀請參加 %s"
msgid "Incoming file transfer from %s"
msgstr "收到來自 %s 的檔案傳輸"
-#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:367
+#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:370
msgid "Password required"
msgstr "需要密碼"
@@ -3359,39 +3450,39 @@ msgstr "通訊協定"
msgid "Source"
msgstr "來源"
-#: ../src/empathy-main-window.c:384
+#: ../src/empathy-main-window.c:387
msgid "Provide Password"
msgstr "提供密碼"
-#: ../src/empathy-main-window.c:390
+#: ../src/empathy-main-window.c:393
msgid "Disconnect"
msgstr "斷線"
-#: ../src/empathy-main-window.c:530
+#: ../src/empathy-main-window.c:533
msgid "No match found"
msgstr "找不到符合項目"
-#: ../src/empathy-main-window.c:685
+#: ../src/empathy-main-window.c:688
msgid "Reconnect"
msgstr "重新連接"
-#: ../src/empathy-main-window.c:691
+#: ../src/empathy-main-window.c:694
msgid "Edit Account"
msgstr "編輯帳號"
-#: ../src/empathy-main-window.c:697
+#: ../src/empathy-main-window.c:700
msgid "Close"
msgstr "關閉"
-#: ../src/empathy-main-window.c:1414
+#: ../src/empathy-main-window.c:1418
msgid "Contact"
msgstr "聯絡人"
-#: ../src/empathy-main-window.c:1748
+#: ../src/empathy-main-window.c:1765
msgid "Contact List"
msgstr "聯絡人清單"
-#: ../src/empathy-main-window.c:1862
+#: ../src/empathy-main-window.c:1881
msgid "Show and edit accounts"
msgstr "顯示並編輯帳號"
@@ -3443,39 +3534,43 @@ msgstr "根據狀態排序(_S)"
msgid "_Accounts"
msgstr "帳號(_A)"
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "被封鎖的聯絡人"
+
+#: ../src/empathy-main-window.ui.h:16
msgid "_Compact Size"
msgstr "精簡大小(_C)"
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:18
msgid "_Debug"
msgstr "偵錯(_D)"
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:20
msgid "_File Transfers"
msgstr "檔案傳輸(_F)"
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:22
msgid "_Join…"
msgstr "參加(_J)…"
-#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "新增談話(_N)…"
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window.ui.h:24
msgid "_Offline Contacts"
msgstr "離線聯絡人(_O)"
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
msgid "_Personal Information"
msgstr "個人資料(_P)"
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window.ui.h:27
msgid "_Room"
msgstr "聊天室(_R)"
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:28
msgid "_Search for Contacts…"
msgstr "搜尋聯絡人(_S)…"
@@ -3489,7 +3584,7 @@ msgstr "成員"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:565
+#: ../src/empathy-new-chatroom-dialog.c:560
#, c-format
msgid ""
"%s\n"
@@ -3502,16 +3597,16 @@ msgstr ""
"需要密碼:%s\n"
"成員:%s"
-#: ../src/empathy-new-chatroom-dialog.c:567
-#: ../src/empathy-new-chatroom-dialog.c:568
+#: ../src/empathy-new-chatroom-dialog.c:562
+#: ../src/empathy-new-chatroom-dialog.c:563
msgid "No"
msgstr "否"
-#: ../src/empathy-new-chatroom-dialog.c:596
+#: ../src/empathy-new-chatroom-dialog.c:591
msgid "Could not start room listing"
msgstr "無法開始列出聊天室清單"
-#: ../src/empathy-new-chatroom-dialog.c:606
+#: ../src/empathy-new-chatroom-dialog.c:601
msgid "Could not stop room listing"
msgstr "無法停止列出聊天室清單"
@@ -3732,55 +3827,55 @@ msgstr "儲存"
msgid "Debug Window"
msgstr "偵錯視窗"
-#: ../src/empathy-debug-window.c:1474
+#: ../src/empathy-debug-window.c:1476
msgid "Pause"
msgstr "暫停"
-#: ../src/empathy-debug-window.c:1486
+#: ../src/empathy-debug-window.c:1488
msgid "Level "
msgstr "等級"
-#: ../src/empathy-debug-window.c:1506
+#: ../src/empathy-debug-window.c:1508
msgid "Debug"
msgstr "偵錯"
-#: ../src/empathy-debug-window.c:1512
+#: ../src/empathy-debug-window.c:1514
msgid "Info"
msgstr "資訊"
-#: ../src/empathy-debug-window.c:1518 ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
msgid "Message"
msgstr "訊息"
-#: ../src/empathy-debug-window.c:1524
+#: ../src/empathy-debug-window.c:1526
msgid "Warning"
msgstr "警告"
-#: ../src/empathy-debug-window.c:1530
+#: ../src/empathy-debug-window.c:1532
msgid "Critical"
msgstr "嚴重"
-#: ../src/empathy-debug-window.c:1536
+#: ../src/empathy-debug-window.c:1538
msgid "Error"
msgstr "錯誤"
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:1557
msgid "Time"
msgstr "時刻"
-#: ../src/empathy-debug-window.c:1558
+#: ../src/empathy-debug-window.c:1560
msgid "Domain"
msgstr "網域"
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1562
msgid "Category"
msgstr "分類"
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1564
msgid "Level"
msgstr "等級"
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1601
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3799,28 +3894,28 @@ msgstr "選擇想要邀請進入談話的聯絡人:"
msgid "Invite"
msgstr "邀請"
-#: ../src/empathy-accounts.c:179
+#: ../src/empathy-accounts.c:183
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "不要顯示任何對話窗;執行任何作業 (例:匯入) 並離開"
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:187
msgid ""
"Don't display any dialogs unless there are only \"People Nearby\" accounts"
msgstr "不要顯示任何對話窗,除非只有「附近的人」帳號"
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:191
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr "初始選取所給予的帳號 (例:gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:189
+#: ../src/empathy-accounts.c:193
msgid "<account-id>"
msgstr "<account-id>"
-#: ../src/empathy-accounts.c:194
+#: ../src/empathy-accounts.c:198
msgid "- Empathy Accounts"
msgstr "- Empathy 帳號"
-#: ../src/empathy-accounts.c:233
+#: ../src/empathy-accounts.c:237
msgid "Empathy Accounts"
msgstr "Empathy 帳號"
@@ -3854,6 +3949,16 @@ msgstr "拒絕"
msgid "Accept"
msgstr "接受"
+#: ../src/empathy-call-observer.c:130
+#, c-format
+msgid "Missed call from %s"
+msgstr "漏接 %s 的來電"
+
+#: ../src/empathy-call-observer.c:133
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s 剛剛播打給你,但你正與他人通話。"
+
#~ msgid "%s is now offline."
#~ msgstr "%s 現在離線。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a059880cd..edc6fae7d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,10 +7,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: empathy 2.91.90\n"
+"Project-Id-Version: empathy 2.91.91\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-23 19:27+0800\n"
-"PO-Revision-Date: 2011-02-18 16:24+0800\n"
+"POT-Creation-Date: 2011-03-22 19:20+0800\n"
+"PO-Revision-Date: 2011-03-20 17:03+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
"Language-Team: Chinese (traditional) <chinese-l10n@googlegroups.com>\n"
"Language: zh_TW\n"
@@ -424,23 +424,23 @@ msgstr "管理訊息與 VoIP 帳號"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2229
+#: ../src/empathy-accounts-dialog.c:2242
msgid "Messaging and VoIP Accounts"
msgstr "訊息與 VoIP 帳號"
-#: ../libempathy/empathy-ft-handler.c:835
+#: ../libempathy/empathy-ft-handler.c:825
msgid "File transfer completed, but the file was corrupted"
msgstr "檔案傳輸完畢,但是檔案已損毀"
-#: ../libempathy/empathy-ft-handler.c:1126
+#: ../libempathy/empathy-ft-handler.c:1113
msgid "File transfer not supported by remote contact"
msgstr "遠端連絡人不支援檔案傳輸"
-#: ../libempathy/empathy-ft-handler.c:1182
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is not a regular file"
msgstr "選取的檔案不是正規的檔案"
-#: ../libempathy/empathy-ft-handler.c:1191
+#: ../libempathy/empathy-ft-handler.c:1178
msgid "The selected file is empty"
msgstr "選取的檔案是空白的"
@@ -472,161 +472,161 @@ msgstr "嘗試傳輸檔案時發生錯誤"
msgid "The other participant is unable to transfer the file"
msgstr "其他的參與者無法傳輸該檔案"
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:382
msgid "Unknown reason"
msgstr "不明原因"
-#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:304
msgid "Available"
msgstr "有空"
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:306
msgid "Busy"
msgstr "忙碌"
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:309
msgid "Away"
msgstr "離開"
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:311
msgid "Invisible"
msgstr "隱藏"
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:313
msgid "Offline"
msgstr "離線"
-#: ../libempathy/empathy-utils.c:316
-#: ../src/empathy-streamed-media-window.c:1897
-#: ../src/empathy-streamed-media-window.c:1898
-#: ../src/empathy-streamed-media-window.c:1899
-#: ../src/empathy-streamed-media-window.c:1900
+#: ../libempathy/empathy-utils.c:315
+#: ../src/empathy-streamed-media-window.c:1904
+#: ../src/empathy-streamed-media-window.c:1905
+#: ../src/empathy-streamed-media-window.c:1906
+#: ../src/empathy-streamed-media-window.c:1907
#: ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "不明"
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:354
msgid "No reason specified"
msgstr "沒有指定原因"
-#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:356 ../libempathy/empathy-utils.c:412
msgid "Status is set to offline"
msgstr "狀態設為離線"
-#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:358 ../libempathy/empathy-utils.c:392
msgid "Network error"
msgstr "網路錯誤"
-#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:360 ../libempathy/empathy-utils.c:394
msgid "Authentication failed"
msgstr "驗證失敗"
-#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:362 ../libempathy/empathy-utils.c:396
msgid "Encryption error"
msgstr "加密發生錯誤"
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:364
msgid "Name in use"
msgstr "使用中的名稱"
-#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:366 ../libempathy/empathy-utils.c:398
msgid "Certificate not provided"
msgstr "沒有提供憑證"
-#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:368 ../libempathy/empathy-utils.c:400
msgid "Certificate untrusted"
msgstr "憑證不被信任"
-#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:370 ../libempathy/empathy-utils.c:402
msgid "Certificate expired"
msgstr "憑證已逾期"
-#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:372 ../libempathy/empathy-utils.c:404
msgid "Certificate not activated"
msgstr "憑證尚未使用"
-#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:374 ../libempathy/empathy-utils.c:406
msgid "Certificate hostname mismatch"
msgstr "憑證主機名稱不符"
-#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:376 ../libempathy/empathy-utils.c:408
msgid "Certificate fingerprint mismatch"
msgstr "憑證指紋檔不符"
-#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:378 ../libempathy/empathy-utils.c:410
msgid "Certificate self-signed"
msgstr "憑證為自我簽署"
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:380
msgid "Certificate error"
msgstr "憑證錯誤"
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:414
msgid "Encryption is not available"
msgstr "加密無法使用"
-#: ../libempathy/empathy-utils.c:417
+#: ../libempathy/empathy-utils.c:416
msgid "Certificate is invalid"
msgstr "憑證無效"
-#: ../libempathy/empathy-utils.c:419
+#: ../libempathy/empathy-utils.c:418
msgid "Connection has been refused"
msgstr "連線遭拒"
-#: ../libempathy/empathy-utils.c:421
+#: ../libempathy/empathy-utils.c:420
msgid "Connection can't be established"
msgstr "無法建立連線"
-#: ../libempathy/empathy-utils.c:423
+#: ../libempathy/empathy-utils.c:422
msgid "Connection has been lost"
msgstr "已失去連線"
-#: ../libempathy/empathy-utils.c:425
+#: ../libempathy/empathy-utils.c:424
msgid "This resource is already connected to the server"
msgstr "此資源已連接至該伺服器"
-#: ../libempathy/empathy-utils.c:427
+#: ../libempathy/empathy-utils.c:426
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr "連線已被使用相同資源的新連線取代"
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:429
msgid "The account already exists on the server"
msgstr "該帳號已經存在於伺服器上"
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:431
msgid "Server is currently too busy to handle the connection"
msgstr "伺服器目前過於忙碌以致於無法處理該連線"
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:433
msgid "Certificate has been revoked"
msgstr "已撤銷憑證"
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:435
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr "憑證使用不安全的密碼演算法,或是密碼處理上較弱"
-#: ../libempathy/empathy-utils.c:439
+#: ../libempathy/empathy-utils.c:438
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
msgstr "伺服器憑證的長度,或是伺服器憑證鏈的深度超過密碼函式庫所能處理的範圍"
-#: ../libempathy/empathy-utils.c:602
+#: ../libempathy/empathy-utils.c:601
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "附近的人"
-#: ../libempathy/empathy-utils.c:607
+#: ../libempathy/empathy-utils.c:606
msgid "Yahoo! Japan"
msgstr "Yahoo! 日本"
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:635
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:636
msgid "Facebook Chat"
msgstr "Facebook 聊天"
@@ -670,86 +670,87 @@ msgstr[0] "%d 個月以前"
msgid "in the future"
msgstr "未來"
-#: ../libempathy-gtk/empathy-account-chooser.c:501
+#: ../libempathy-gtk/empathy-account-chooser.c:491
msgid "All"
msgstr "全部"
-#: ../libempathy-gtk/empathy-account-widget.c:679
-#: ../libempathy-gtk/empathy-log-window.c:653
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-log-window.c:643
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:680
+#: ../libempathy-gtk/empathy-account-widget.c:683
msgid "Password"
msgstr "密碼"
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:684
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "伺服器"
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:685
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "連接埠"
-#: ../libempathy-gtk/empathy-account-widget.c:754
-#: ../libempathy-gtk/empathy-account-widget.c:811
+#: ../libempathy-gtk/empathy-account-widget.c:757
+#: ../libempathy-gtk/empathy-account-widget.c:814
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1163
+#: ../libempathy-gtk/empathy-account-widget.c:1166
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "%s 帳號已透過我的網路帳號修改。"
-#: ../libempathy-gtk/empathy-account-widget.c:1169
+#: ../libempathy-gtk/empathy-account-widget.c:1172
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "%s 帳號無法於 Empathy 內修改。"
-#: ../libempathy-gtk/empathy-account-widget.c:1189
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Launch My Web Accounts"
msgstr "啟動我的網路帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:1527
+#: ../libempathy-gtk/empathy-account-widget.c:1530
msgid "Username:"
msgstr "使用者名稱:"
-#: ../libempathy-gtk/empathy-account-widget.c:1894
+#: ../libempathy-gtk/empathy-account-widget.c:1897
msgid "A_pply"
msgstr "套用(_A)"
-#: ../libempathy-gtk/empathy-account-widget.c:1924
+#: ../libempathy-gtk/empathy-account-widget.c:1927
msgid "L_og in"
msgstr "登入(_O)"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1990
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:451
+#: ../libempathy-gtk/empathy-account-widget.c:1993
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1479
+#: ../libempathy-gtk/empathy-individual-widget.c:1481
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "帳號:"
-#: ../libempathy-gtk/empathy-account-widget.c:2001
+#: ../libempathy-gtk/empathy-account-widget.c:2004
msgid "_Enabled"
msgstr "已啟用(_E)"
-#: ../libempathy-gtk/empathy-account-widget.c:2066
+#: ../libempathy-gtk/empathy-account-widget.c:2069
msgid "This account already exists on the server"
msgstr "此帳號已經存在這個伺服器上"
-#: ../libempathy-gtk/empathy-account-widget.c:2069
+#: ../libempathy-gtk/empathy-account-widget.c:2072
msgid "Create a new account on the server"
msgstr "在這個伺服器上建立新的帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:2261
+#: ../libempathy-gtk/empathy-account-widget.c:2264
msgid "Ca_ncel"
msgstr "取消(_N)"
@@ -758,19 +759,19 @@ msgstr "取消(_N)"
#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2558
+#: ../libempathy-gtk/empathy-account-widget.c:2561
#, c-format
msgid "%1$s on %2$s"
msgstr "%2$s 上的 %1$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2584
+#: ../libempathy-gtk/empathy-account-widget.c:2587
#, c-format
msgid "%s Account"
msgstr "%s 帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:2588
+#: ../libempathy-gtk/empathy-account-widget.c:2591
msgid "New account"
msgstr "新增帳號"
@@ -1178,19 +1179,19 @@ msgstr "無法轉換圖片"
msgid "None of the accepted image formats are supported on your system"
msgstr "您的系統上沒有支援已接受的圖片格式"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:930
msgid "Select Your Avatar Image"
msgstr "選擇您的大頭貼圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
msgid "No Image"
msgstr "沒有圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:995
msgid "Images"
msgstr "圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:999
msgid "All Files"
msgstr "所有檔案"
@@ -1198,51 +1199,57 @@ msgstr "所有檔案"
msgid "Click to enlarge"
msgstr "請按這裡放大"
-#: ../libempathy-gtk/empathy-chat.c:646
+#: ../libempathy-gtk/empathy-chat.c:652
msgid "Failed to open private chat"
msgstr "開啟私人對話失敗"
-#: ../libempathy-gtk/empathy-chat.c:697
+#: ../libempathy-gtk/empathy-chat.c:717
msgid "Topic not supported on this conversation"
msgstr "此談話的主題不被支援"
-#: ../libempathy-gtk/empathy-chat.c:703
+#: ../libempathy-gtk/empathy-chat.c:723
msgid "You are not allowed to change the topic"
msgstr "您不被允許變更這個主題"
-#: ../libempathy-gtk/empathy-chat.c:842
+#: ../libempathy-gtk/empathy-chat.c:906
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear:清除目前談話的所有訊息"
-#: ../libempathy-gtk/empathy-chat.c:845
+#: ../libempathy-gtk/empathy-chat.c:909
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <主題>:設置目前談話的主題"
-#: ../libempathy-gtk/empathy-chat.c:848
+#: ../libempathy-gtk/empathy-chat.c:912
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <聊天室 ID>:參加新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:851
+#: ../libempathy-gtk/empathy-chat.c:915
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <聊天室 ID>:參加新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:920
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr "/part [<聊天室 ID>] [<原因>]:離開聊天室,預設為目前的聊天室"
+
+#: ../libempathy-gtk/empathy-chat.c:925
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <聯絡人 ID> [<訊息>]:開啟私人對話"
-#: ../libempathy-gtk/empathy-chat.c:859
+#: ../libempathy-gtk/empathy-chat.c:928
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <聯絡人 ID> <訊息>:開啟私人對話"
-#: ../libempathy-gtk/empathy-chat.c:863
+#: ../libempathy-gtk/empathy-chat.c:931
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <暱稱>:變更在目前伺服器上的您的暱稱"
-#: ../libempathy-gtk/empathy-chat.c:866
+#: ../libempathy-gtk/empathy-chat.c:934
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <訊息>:送出一個 ACTION 訊息到目前的談話中"
-#: ../libempathy-gtk/empathy-chat.c:869
+#: ../libempathy-gtk/empathy-chat.c:937
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1251,7 +1258,7 @@ msgstr ""
"/say <訊息>:送出 <訊息> 到目前的談話中。這用於傳送以「/」開頭的訊息。舉例來"
"說:「/say /join 是用來參加新的聊天室」"
-#: ../libempathy-gtk/empathy-chat.c:874
+#: ../libempathy-gtk/empathy-chat.c:942
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1259,98 +1266,98 @@ msgstr ""
"/help [<命令>]:顯示所有支援的指令。如果有定義這個 <命令> 的話,便顯示它的用"
"法。"
-#: ../libempathy-gtk/empathy-chat.c:884
+#: ../libempathy-gtk/empathy-chat.c:952
#, c-format
msgid "Usage: %s"
msgstr "用法:%s"
-#: ../libempathy-gtk/empathy-chat.c:926
+#: ../libempathy-gtk/empathy-chat.c:991
msgid "Unknown command"
msgstr "未知的命令"
-#: ../libempathy-gtk/empathy-chat.c:1052
+#: ../libempathy-gtk/empathy-chat.c:1117
msgid "Unknown command; see /help for the available commands"
msgstr "未知的指令;請參見 /help 以取得可用的指令"
-#: ../libempathy-gtk/empathy-chat.c:1192
+#: ../libempathy-gtk/empathy-chat.c:1254
msgid "offline"
msgstr "離線"
-#: ../libempathy-gtk/empathy-chat.c:1195
+#: ../libempathy-gtk/empathy-chat.c:1257
msgid "invalid contact"
msgstr "無效的連絡人"
-#: ../libempathy-gtk/empathy-chat.c:1198
+#: ../libempathy-gtk/empathy-chat.c:1260
msgid "permission denied"
msgstr "權限被拒絕"
-#: ../libempathy-gtk/empathy-chat.c:1201
+#: ../libempathy-gtk/empathy-chat.c:1263
msgid "too long message"
msgstr "太長的訊息"
-#: ../libempathy-gtk/empathy-chat.c:1204
+#: ../libempathy-gtk/empathy-chat.c:1266
msgid "not implemented"
msgstr "未實作"
-#: ../libempathy-gtk/empathy-chat.c:1208
+#: ../libempathy-gtk/empathy-chat.c:1270
msgid "unknown"
msgstr "不明"
-#: ../libempathy-gtk/empathy-chat.c:1212
+#: ../libempathy-gtk/empathy-chat.c:1274
#, c-format
msgid "Error sending message '%s': %s"
msgstr "傳送訊息「%s」時發生錯誤;%s"
-#: ../libempathy-gtk/empathy-chat.c:1273 ../src/empathy-chat-window.c:704
+#: ../libempathy-gtk/empathy-chat.c:1335 ../src/empathy-chat-window.c:717
msgid "Topic:"
msgstr "主題:"
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1347
#, c-format
msgid "Topic set to: %s"
msgstr "主題設定為: %s"
-#: ../libempathy-gtk/empathy-chat.c:1287
+#: ../libempathy-gtk/empathy-chat.c:1349
msgid "No topic defined"
msgstr "尚未定義主題"
-#: ../libempathy-gtk/empathy-chat.c:1786
+#: ../libempathy-gtk/empathy-chat.c:1848
msgid "(No Suggestions)"
msgstr "(沒有建議)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1854
+#: ../libempathy-gtk/empathy-chat.c:1916
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "加入「%s」至字典"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1891
+#: ../libempathy-gtk/empathy-chat.c:1953
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "加入「%s」至 %s 字典"
-#: ../libempathy-gtk/empathy-chat.c:1950
+#: ../libempathy-gtk/empathy-chat.c:2010
msgid "Insert Smiley"
msgstr "插入表情符號"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1968
-#: ../libempathy-gtk/empathy-ui-utils.c:1810
+#: ../libempathy-gtk/empathy-chat.c:2028
+#: ../libempathy-gtk/empathy-ui-utils.c:1808
msgid "_Send"
msgstr "傳送(_S)"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2003
+#: ../libempathy-gtk/empathy-chat.c:2063
msgid "_Spelling Suggestions"
msgstr "拼字建議(_S)"
-#: ../libempathy-gtk/empathy-chat.c:2092
+#: ../libempathy-gtk/empathy-chat.c:2152
msgid "Failed to retrieve recent logs"
msgstr "無法取得最近的日誌"
-#: ../libempathy-gtk/empathy-chat.c:2198
+#: ../libempathy-gtk/empathy-chat.c:2263
#, c-format
msgid "%s has disconnected"
msgstr "%s 已斷線"
@@ -1358,12 +1365,12 @@ msgstr "%s 已斷線"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2205
+#: ../libempathy-gtk/empathy-chat.c:2270
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s 被 %2$s 踢出去"
-#: ../libempathy-gtk/empathy-chat.c:2208
+#: ../libempathy-gtk/empathy-chat.c:2273
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢出"
@@ -1371,17 +1378,17 @@ msgstr "%s 被踢出"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2216
+#: ../libempathy-gtk/empathy-chat.c:2281
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s 被 %2$s 設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:2219
+#: ../libempathy-gtk/empathy-chat.c:2284
#, c-format
msgid "%s was banned"
msgstr "%s 被設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:2223
+#: ../libempathy-gtk/empathy-chat.c:2288
#, c-format
msgid "%s has left the room"
msgstr "%s 已經離開此聊天室"
@@ -1391,66 +1398,90 @@ msgstr "%s 已經離開此聊天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2232
+#: ../libempathy-gtk/empathy-chat.c:2297
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2257
+#: ../libempathy-gtk/empathy-chat.c:2322
#, c-format
msgid "%s has joined the room"
msgstr "%s 已經參加此聊天室"
-#: ../libempathy-gtk/empathy-chat.c:2282
+#: ../libempathy-gtk/empathy-chat.c:2347
#, c-format
msgid "%s is now known as %s"
msgstr "%s 現在被稱為 %s"
-#: ../libempathy-gtk/empathy-chat.c:2421
-#: ../src/empathy-streamed-media-window.c:1942
+#: ../libempathy-gtk/empathy-chat.c:2486
+#: ../src/empathy-streamed-media-window.c:1949
#: ../src/empathy-event-manager.c:1122
msgid "Disconnected"
msgstr "已斷線"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3051
+#: ../libempathy-gtk/empathy-chat.c:3116
msgid "Would you like to store this password?"
msgstr "您想要儲存此密碼?"
-#: ../libempathy-gtk/empathy-chat.c:3057
+#: ../libempathy-gtk/empathy-chat.c:3122
msgid "Remember"
msgstr "記住"
-#: ../libempathy-gtk/empathy-chat.c:3067
+#: ../libempathy-gtk/empathy-chat.c:3132
msgid "Not now"
msgstr "現在不要"
-#: ../libempathy-gtk/empathy-chat.c:3111
+#: ../libempathy-gtk/empathy-chat.c:3176
msgid "Retry"
msgstr "重試"
-#: ../libempathy-gtk/empathy-chat.c:3115
+#: ../libempathy-gtk/empathy-chat.c:3180
msgid "Wrong password; please try again:"
msgstr "密碼錯誤;請再試一次:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3232
+#: ../libempathy-gtk/empathy-chat.c:3297
msgid "This room is protected by a password:"
msgstr "此聊天室已被密碼保護:"
-#: ../libempathy-gtk/empathy-chat.c:3259
+#: ../libempathy-gtk/empathy-chat.c:3324
msgid "Join"
msgstr "參加"
-#: ../libempathy-gtk/empathy-chat.c:3429 ../src/empathy-event-manager.c:1144
+#: ../libempathy-gtk/empathy-chat.c:3494 ../src/empathy-event-manager.c:1144
msgid "Connected"
msgstr "成功連線"
-#: ../libempathy-gtk/empathy-chat.c:3482
-#: ../libempathy-gtk/empathy-log-window.c:660
+#: ../libempathy-gtk/empathy-chat.c:3547
+#: ../libempathy-gtk/empathy-log-window.c:650
msgid "Conversation"
msgstr "談話"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+msgid "Unknown or invalid identifier"
+msgstr "未知或無效的識別身分"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+msgid "Contact blocking temporarily unavailable"
+msgstr "聯絡人封鎖暫時無法使用"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+msgid "Contact blocking unavailable"
+msgstr "聯絡人封鎖無法使用"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+msgid "Permission Denied"
+msgstr "已拒絕授權"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+msgid "Could not block contact"
+msgstr "無法封鎖聯絡人"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+msgid "Edit Blocked Contacts"
+msgstr "編輯封鎖的聯絡人"
+
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
#: ../libempathy-gtk/empathy-theme-adium.c:794
@@ -1469,20 +1500,43 @@ msgstr "開啟連結(_O)"
msgid "%A %B %d %Y"
msgstr "%Y %B %d %A"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:265
+#: ../libempathy-gtk/empathy-contact-dialogs.c:299
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "編輯連絡人資訊"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:316
+#: ../libempathy-gtk/empathy-contact-dialogs.c:350
msgid "Personal Information"
msgstr "個人資訊"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:425
-#: ../libempathy-gtk/empathy-individual-dialogs.c:115
+#: ../libempathy-gtk/empathy-contact-dialogs.c:459
+#: ../libempathy-gtk/empathy-individual-dialogs.c:119
msgid "New Contact"
msgstr "新增連絡人"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:533
+#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#, c-format
+msgid "Block %s?"
+msgstr "封鎖 %s?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr "您確定想要封鎖「%s」讓他無法再與您聯絡嗎?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:543
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+msgid "_Block"
+msgstr "封鎖(_B)"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "回報這些聯絡人濫用帳號(_R)"
+
#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
msgid "Decide _Later"
msgstr "稍後再決定(_L)"
@@ -1491,6 +1545,10 @@ msgstr "稍後再決定(_L)"
msgid "Subscription Request"
msgstr "訂閱要求"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "_Block User"
+msgstr "封鎖使用者(_B)"
+
#: ../libempathy-gtk/empathy-contact-list-store.h:71
msgid "Ungrouped"
msgstr "未群組"
@@ -1499,114 +1557,122 @@ msgstr "未群組"
msgid "Favorite People"
msgstr "喜好的人"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2012
-#: ../libempathy-gtk/empathy-individual-view.c:2309
+#: ../libempathy-gtk/empathy-contact-list-view.c:2001
+#: ../libempathy-gtk/empathy-individual-view.c:2336
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "是否想要移除群組「%s」?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2014
-#: ../libempathy-gtk/empathy-individual-view.c:2312
+#: ../libempathy-gtk/empathy-contact-list-view.c:2003
+#: ../libempathy-gtk/empathy-individual-view.c:2339
msgid "Removing group"
msgstr "正在移除群組"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2063
-#: ../libempathy-gtk/empathy-contact-list-view.c:2140
-#: ../libempathy-gtk/empathy-individual-view.c:2367
-#: ../libempathy-gtk/empathy-individual-view.c:2514
+#: ../libempathy-gtk/empathy-contact-list-view.c:2052
+#: ../libempathy-gtk/empathy-contact-list-view.c:2129
+#: ../libempathy-gtk/empathy-individual-view.c:2394
+#: ../libempathy-gtk/empathy-individual-view.c:2588
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "移除(_R)"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2093
-#: ../libempathy-gtk/empathy-individual-view.c:2417
+#: ../libempathy-gtk/empathy-contact-list-view.c:2082
+#: ../libempathy-gtk/empathy-individual-view.c:2458
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "是否想要移除連絡人「%s」?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2095
-#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../libempathy-gtk/empathy-contact-list-view.c:2084
+#: ../libempathy-gtk/empathy-individual-view.c:2479
msgid "Removing contact"
msgstr "正在移除連絡人"
-#: ../libempathy-gtk/empathy-contact-menu.c:204
+#: ../libempathy-gtk/empathy-contact-menu.c:219
#: ../src/empathy-main-window.ui.h:13
msgid "_Add Contact…"
-msgstr "新增聯絡人(_A)…"
+msgstr "加入聯絡人(_A)…"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:299
+msgid "_Block Contact"
+msgstr "封鎖聯絡人(_B)"
-#: ../libempathy-gtk/empathy-contact-menu.c:231
+#: ../libempathy-gtk/empathy-contact-menu.c:328
#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "聊天(_C)"
-#: ../libempathy-gtk/empathy-contact-menu.c:262
+#: ../libempathy-gtk/empathy-contact-menu.c:359
#: ../libempathy-gtk/empathy-individual-menu.c:560
msgctxt "menu item"
msgid "_Audio Call"
msgstr "語音通話(_A)"
-#: ../libempathy-gtk/empathy-contact-menu.c:293
+#: ../libempathy-gtk/empathy-contact-menu.c:390
#: ../libempathy-gtk/empathy-individual-menu.c:602
msgctxt "menu item"
msgid "_Video Call"
msgstr "視訊通話(_V)"
-#: ../libempathy-gtk/empathy-contact-menu.c:334
+#: ../libempathy-gtk/empathy-contact-menu.c:436
#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "上一次談話(_P)"
-#: ../libempathy-gtk/empathy-contact-menu.c:356
+#: ../libempathy-gtk/empathy-contact-menu.c:458
#: ../libempathy-gtk/empathy-individual-menu.c:686
msgid "Send File"
msgstr "傳送檔案"
-#: ../libempathy-gtk/empathy-contact-menu.c:379
+#: ../libempathy-gtk/empathy-contact-menu.c:481
#: ../libempathy-gtk/empathy-individual-menu.c:728
msgid "Share My Desktop"
msgstr "分享我的桌面"
-#: ../libempathy-gtk/empathy-contact-menu.c:419
-#: ../libempathy-gtk/empathy-contact-widget.c:1681
-#: ../libempathy-gtk/empathy-individual-menu.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:1370
+#: ../libempathy-gtk/empathy-contact-menu.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:1763
+#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
msgid "Favorite"
msgstr "喜好"
-#: ../libempathy-gtk/empathy-contact-menu.c:448
-#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-contact-menu.c:550
+#: ../libempathy-gtk/empathy-individual-menu.c:791
msgid "Infor_mation"
msgstr "資訊(_M)"
-#: ../libempathy-gtk/empathy-contact-menu.c:494
+#: ../libempathy-gtk/empathy-contact-menu.c:596
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
-#: ../libempathy-gtk/empathy-contact-menu.c:548
-#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:916
+#: ../libempathy-gtk/empathy-contact-menu.c:650
+#: ../libempathy-gtk/empathy-individual-menu.c:972
+#: ../src/empathy-chat-window.c:935
msgid "Inviting you to this room"
msgstr "邀請您到這個聊天室"
-#: ../libempathy-gtk/empathy-contact-menu.c:579
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:681
+#: ../libempathy-gtk/empathy-individual-menu.c:1019
msgid "_Invite to Chat Room"
msgstr "邀請到聊天室(_I)"
#. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:445
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
msgid "Search contacts"
msgstr "搜尋連絡人"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:473
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
msgid "Search: "
msgstr "搜尋:"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:534
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+msgid "_Add Contact"
+msgstr "加入聯絡人(_A)"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
msgid "No contacts found"
msgstr "找不到聯絡人"
@@ -1614,178 +1680,178 @@ msgstr "找不到聯絡人"
msgid "Select a contact"
msgstr "選擇連絡人"
-#: ../libempathy-gtk/empathy-contact-widget.c:276
+#: ../libempathy-gtk/empathy-contact-widget.c:295
#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "全名:"
-#: ../libempathy-gtk/empathy-contact-widget.c:277
+#: ../libempathy-gtk/empathy-contact-widget.c:296
#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "電話號碼:"
-#: ../libempathy-gtk/empathy-contact-widget.c:278
+#: ../libempathy-gtk/empathy-contact-widget.c:297
#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "電子信箱位址:"
-#: ../libempathy-gtk/empathy-contact-widget.c:279
+#: ../libempathy-gtk/empathy-contact-widget.c:298
#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
msgstr "網站:"
-#: ../libempathy-gtk/empathy-contact-widget.c:280
+#: ../libempathy-gtk/empathy-contact-widget.c:299
#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "生日:"
-#: ../libempathy-gtk/empathy-contact-widget.c:724
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:762
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Country ISO Code:"
msgstr "國家 ISO 碼:"
-#: ../libempathy-gtk/empathy-contact-widget.c:726
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:764
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Country:"
msgstr "國家:"
-#: ../libempathy-gtk/empathy-contact-widget.c:728
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:766
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "State:"
msgstr "州:"
-#: ../libempathy-gtk/empathy-contact-widget.c:730
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:768
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "City:"
msgstr "市:"
-#: ../libempathy-gtk/empathy-contact-widget.c:732
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:770
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Area:"
msgstr "區域:"
-#: ../libempathy-gtk/empathy-contact-widget.c:734
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:772
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Postal Code:"
msgstr "郵遞區號:"
-#: ../libempathy-gtk/empathy-contact-widget.c:736
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:774
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Street:"
msgstr "街:"
-#: ../libempathy-gtk/empathy-contact-widget.c:738
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:776
+#: ../libempathy-gtk/empathy-individual-widget.c:502
msgid "Building:"
msgstr "建築:"
-#: ../libempathy-gtk/empathy-contact-widget.c:740
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:778
+#: ../libempathy-gtk/empathy-individual-widget.c:504
msgid "Floor:"
msgstr "樓層:"
-#: ../libempathy-gtk/empathy-contact-widget.c:742
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:780
+#: ../libempathy-gtk/empathy-individual-widget.c:506
msgid "Room:"
msgstr "室:"
-#: ../libempathy-gtk/empathy-contact-widget.c:744
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:782
+#: ../libempathy-gtk/empathy-individual-widget.c:508
msgid "Text:"
msgstr "文字:"
-#: ../libempathy-gtk/empathy-contact-widget.c:746
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:784
+#: ../libempathy-gtk/empathy-individual-widget.c:510
msgid "Description:"
msgstr "描述:"
-#: ../libempathy-gtk/empathy-contact-widget.c:748
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:786
+#: ../libempathy-gtk/empathy-individual-widget.c:512
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:750
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:788
+#: ../libempathy-gtk/empathy-individual-widget.c:514
msgid "Accuracy Level:"
msgstr "準確度等級:"
-#: ../libempathy-gtk/empathy-contact-widget.c:752
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:790
+#: ../libempathy-gtk/empathy-individual-widget.c:516
msgid "Error:"
msgstr "錯誤:"
-#: ../libempathy-gtk/empathy-contact-widget.c:754
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-individual-widget.c:518
msgid "Vertical Error (meters):"
msgstr "垂直誤差 (公尺):"
-#: ../libempathy-gtk/empathy-contact-widget.c:756
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:794
+#: ../libempathy-gtk/empathy-individual-widget.c:520
msgid "Horizontal Error (meters):"
msgstr "水平誤差 (公尺):"
-#: ../libempathy-gtk/empathy-contact-widget.c:758
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:796
+#: ../libempathy-gtk/empathy-individual-widget.c:522
msgid "Speed:"
msgstr "速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:760
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:798
+#: ../libempathy-gtk/empathy-individual-widget.c:524
msgid "Bearing:"
msgstr "方位:"
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:800
+#: ../libempathy-gtk/empathy-individual-widget.c:526
msgid "Climb Speed:"
msgstr "爬升速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:802
+#: ../libempathy-gtk/empathy-individual-widget.c:528
msgid "Last Updated on:"
msgstr "上次更新於:"
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:804
+#: ../libempathy-gtk/empathy-individual-widget.c:530
msgid "Longitude:"
msgstr "經度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:806
+#: ../libempathy-gtk/empathy-individual-widget.c:532
msgid "Latitude:"
msgstr "緯度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:808
+#: ../libempathy-gtk/empathy-individual-widget.c:534
msgid "Altitude:"
msgstr "緯度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:833
-#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-individual-widget.c:615
-#: ../libempathy-gtk/empathy-individual-widget.c:632
+#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-contact-widget.c:888
+#: ../libempathy-gtk/empathy-individual-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:633
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "位置"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:852
-#: ../libempathy-gtk/empathy-individual-widget.c:634
+#: ../libempathy-gtk/empathy-contact-widget.c:890
+#: ../libempathy-gtk/empathy-individual-widget.c:635
#, c-format
msgid "%s, %s"
msgstr "%s,%s"
-#: ../libempathy-gtk/empathy-contact-widget.c:904
-#: ../libempathy-gtk/empathy-individual-widget.c:683
+#: ../libempathy-gtk/empathy-contact-widget.c:942
+#: ../libempathy-gtk/empathy-individual-widget.c:684
msgid "%B %e, %Y at %R UTC"
msgstr "%Y %B %e 於 %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:986
-#: ../libempathy-gtk/empathy-individual-widget.c:918
+#: ../libempathy-gtk/empathy-contact-widget.c:1024
+#: ../libempathy-gtk/empathy-individual-widget.c:919
msgid "Save Avatar"
msgstr "儲存大頭貼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1042
-#: ../libempathy-gtk/empathy-individual-widget.c:976
+#: ../libempathy-gtk/empathy-contact-widget.c:1080
+#: ../libempathy-gtk/empathy-individual-widget.c:977
msgid "Unable to save avatar"
msgstr "無法儲存大頭貼"
@@ -1795,7 +1861,7 @@ msgstr "<b>位置</b> 於 (date)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1305
+#: ../libempathy-gtk/empathy-individual-widget.c:1307
msgid "Alias:"
msgstr "別名:"
@@ -1815,7 +1881,7 @@ msgstr "連絡人詳細資料"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1509
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
msgid "Identifier:"
msgstr "識別身分:"
@@ -1853,10 +1919,20 @@ msgid "Select"
msgstr "選取"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1432
+#: ../src/empathy-main-window.c:1436
msgid "Group"
msgstr "群組"
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+msgid "The following identity will be blocked:"
+msgid_plural "The following identities will be blocked:"
+msgstr[0] "下列識別身分將被封鎖:"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+msgid "The following identity can not be blocked:"
+msgid_plural "The following identities can not be blocked:"
+msgstr[0] "下列識別身分無法被封鎖:"
+
#. Translators: the heading at the top of the Information dialogue
#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
msgid "Linked Contacts"
@@ -1882,19 +1958,23 @@ msgstr "在清單左方的所選聯絡人將連結在一起。"
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:837
+#: ../libempathy-gtk/empathy-individual-menu.c:839
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-menu.c:865
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "連結聯絡人(_L)…"
-#: ../libempathy-gtk/empathy-individual-view.c:2425
+#: ../libempathy-gtk/empathy-individual-view.c:2301
+msgid "Delete and _Block"
+msgstr "刪除並封鎖(_B)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2467
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
@@ -1903,7 +1983,7 @@ msgstr ""
"您真的想要移除連結聯絡人「%s」嗎?請注意這會移除所有構成此連結聯絡群的聯絡"
"人。"
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1652
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -1984,7 +2064,7 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "取消連結(_U)"
-#: ../libempathy-gtk/empathy-log-window.c:670
+#: ../libempathy-gtk/empathy-log-window.c:660
msgid "Date"
msgstr "日期"
@@ -2032,17 +2112,17 @@ msgid "New Conversation"
msgstr "新增談話"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:252
+#: ../libempathy-gtk/empathy-new-call-dialog.c:253
msgid "Send _Video"
msgstr "傳送視訊(_V)"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:260
+#: ../libempathy-gtk/empathy-new-call-dialog.c:261
msgid "C_all"
msgstr "通話(_A)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:270
+#: ../libempathy-gtk/empathy-new-call-dialog.c:271
msgid "New Call"
msgstr "新增通話"
@@ -2083,12 +2163,12 @@ msgstr "按這裡將這個狀態設為喜好"
msgid "Set status"
msgstr "設定狀態"
-#: ../libempathy-gtk/empathy-presence-chooser.c:948
+#: ../libempathy-gtk/empathy-presence-chooser.c:946
msgid "Set your presence and current status"
msgstr "設定您的上線與目前的狀態"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1136
+#: ../libempathy-gtk/empathy-presence-chooser.c:1134
msgid "Custom messages…"
msgstr "自訂訊息…"
@@ -2240,31 +2320,42 @@ msgstr "預期的憑證主機名稱:%s"
msgid "Certificate hostname: %s"
msgstr "憑證主機名稱:%s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:271
+#: ../libempathy-gtk/empathy-tls-dialog.c:281
msgid "Continue"
msgstr "繼續"
-#: ../libempathy-gtk/empathy-tls-dialog.c:277
+#: ../libempathy-gtk/empathy-tls-dialog.c:287
msgid "This connection is untrusted. Would you like to continue anyway?"
msgstr "此連線未受信任。您無論如何都要繼續嗎?"
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:297
msgid "Remember this choice for future connections"
msgstr "請記住此選擇以供未來連線使用"
-#: ../libempathy-gtk/empathy-tls-dialog.c:302
+#: ../libempathy-gtk/empathy-tls-dialog.c:303
msgid "Certificate Details"
msgstr "憑證詳細資料"
-#: ../libempathy-gtk/empathy-ui-utils.c:1707
+#: ../libempathy-gtk/empathy-ui-utils.c:1705
msgid "Unable to open URI"
msgstr "無法開啓 URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1802
+#: ../libempathy-gtk/empathy-ui-utils.c:1800
msgid "Select a file"
msgstr "選擇一個檔案"
-#: ../libempathy-gtk/empathy-ui-utils.c:1871
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
+msgid "Insufficient free space to save file"
+msgstr "空間不足以儲存檔案"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#, c-format
+msgid ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
+msgstr "需要 %s 的空間以儲存此檔案,但僅有 %s 可用。請選擇其他位置。"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1924
#, c-format
msgid "Incoming file from %s"
msgstr "收到來自 %s 的檔案"
@@ -2452,23 +2543,23 @@ msgstr "沒有錯誤訊息"
msgid "Instant Message (Empathy)"
msgstr "即時通訊 (Empathy)"
-#: ../src/empathy.c:310
+#: ../src/empathy.c:308
msgid "Don't connect on startup"
msgstr "啟動時不要自動連線"
-#: ../src/empathy.c:314
+#: ../src/empathy.c:312
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "啟動時不顯示連絡人清單或任何其他對話窗"
-#: ../src/empathy.c:322
+#: ../src/empathy.c:320
msgid "- Empathy IM Client"
msgstr "- Empathy 即時通用戶端"
-#: ../src/empathy.c:501
+#: ../src/empathy.c:499
msgid "Error contacting the Account Manager"
msgstr "聯絡帳號管理程式時發生錯誤"
-#: ../src/empathy.c:503
+#: ../src/empathy.c:501
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2557,7 +2648,7 @@ msgstr ""
"號。"
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1271
msgid "An error occurred"
msgstr "發生錯誤"
@@ -2620,17 +2711,17 @@ msgstr "不,我現在只想看看附近有誰上線"
msgid "Select the accounts you want to import:"
msgstr "選擇要匯入的帳號:"
-#: ../src/empathy-account-assistant.c:810
-#: ../src/empathy-new-chatroom-dialog.c:567
-#: ../src/empathy-new-chatroom-dialog.c:568
+#: ../src/empathy-account-assistant.c:813
+#: ../src/empathy-new-chatroom-dialog.c:562
+#: ../src/empathy-new-chatroom-dialog.c:563
msgid "Yes"
msgstr "是"
-#: ../src/empathy-account-assistant.c:817
+#: ../src/empathy-account-assistant.c:820
msgid "No, that's all for now"
msgstr "不,目前就這樣"
-#: ../src/empathy-account-assistant.c:1082
+#: ../src/empathy-account-assistant.c:1085
msgid ""
"Empathy can automatically discover and chat with the people connected on the "
"same network as you. If you want to use this feature, please check that the "
@@ -2641,16 +2732,16 @@ msgstr ""
"用此功能,請檢查下列詳細資料是否正確。您也可以在以後簡單地變更這些細節,或是"
"用「帳號」對話窗來停用此功能"
-#: ../src/empathy-account-assistant.c:1088
-#: ../src/empathy-account-assistant.c:1144
+#: ../src/empathy-account-assistant.c:1091
+#: ../src/empathy-account-assistant.c:1147
msgid "Edit->Accounts"
msgstr "編輯 -> 帳號"
-#: ../src/empathy-account-assistant.c:1104
-msgid "I don't want to enable this feature for now"
-msgstr "我現在不想要啟用這項功能"
+#: ../src/empathy-account-assistant.c:1107
+msgid "I do _not want to enable this feature for now"
+msgstr "我現在不想要啟用這項功能(_N)"
-#: ../src/empathy-account-assistant.c:1140
+#: ../src/empathy-account-assistant.c:1143
msgid ""
"You won't be able to chat with people connected to your local network, as "
"telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2661,23 +2752,23 @@ msgstr ""
"啟用此功能,請安裝 telepathy-salut 套件,並從「帳號」對話窗建立「附近的人」帳"
"號"
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1149
msgid "telepathy-salut not installed"
msgstr "telepathy-salut 尚未安裝"
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1195
msgid "Messaging and VoIP Accounts Assistant"
msgstr "訊息與 VoIP 帳號助理"
-#: ../src/empathy-account-assistant.c:1226
+#: ../src/empathy-account-assistant.c:1229
msgid "Welcome to Empathy"
msgstr "歡迎使用 Empathy"
-#: ../src/empathy-account-assistant.c:1235
+#: ../src/empathy-account-assistant.c:1238
msgid "Import your existing accounts"
msgstr "匯入現有的帳號"
-#: ../src/empathy-account-assistant.c:1253
+#: ../src/empathy-account-assistant.c:1256
msgid "Please enter personal details"
msgstr "請輸入個人詳細資料"
@@ -2755,7 +2846,7 @@ msgstr "啟用(_E)"
msgid "_Disable"
msgstr "停用(_D)"
-#: ../src/empathy-accounts-dialog.c:2073
+#: ../src/empathy-accounts-dialog.c:2086
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2789,11 +2880,11 @@ msgstr "加入(_A)…"
msgid "_Import…"
msgstr "匯入(_I)…"
-#: ../src/empathy-auth-client.c:243
+#: ../src/empathy-auth-client.c:246
msgid " - Empathy authentication client"
msgstr "- Empathy 認證用戶端"
-#: ../src/empathy-auth-client.c:259
+#: ../src/empathy-auth-client.c:262
msgid "Empathy authentication client"
msgstr "Empathy 認證用戶端"
@@ -2825,105 +2916,105 @@ msgstr "Gamma"
msgid "Volume"
msgstr "音量"
-#: ../src/empathy-streamed-media-window.c:1165
+#: ../src/empathy-streamed-media-window.c:1166
msgid "_Sidebar"
msgstr "側邊欄(_S)"
-#: ../src/empathy-streamed-media-window.c:1185
+#: ../src/empathy-streamed-media-window.c:1186
msgid "Audio input"
msgstr "音效輸入"
-#: ../src/empathy-streamed-media-window.c:1189
+#: ../src/empathy-streamed-media-window.c:1190
msgid "Video input"
msgstr "視訊輸入"
-#: ../src/empathy-streamed-media-window.c:1193
+#: ../src/empathy-streamed-media-window.c:1194
msgid "Dialpad"
msgstr "播號盤"
-#: ../src/empathy-streamed-media-window.c:1198
+#: ../src/empathy-streamed-media-window.c:1205
msgid "Details"
msgstr "詳細資料"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1267
+#: ../src/empathy-streamed-media-window.c:1274
#, c-format
msgid "Call with %s"
msgstr "與 %s 通話中"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-streamed-media-window.c:1346
+#: ../src/empathy-streamed-media-window.c:1353
msgid "Call"
msgstr "通話"
-#: ../src/empathy-streamed-media-window.c:1500
+#: ../src/empathy-streamed-media-window.c:1507
msgid "The IP address as seen by the machine"
msgstr "機器看見的 IP 位址"
-#: ../src/empathy-streamed-media-window.c:1502
+#: ../src/empathy-streamed-media-window.c:1509
msgid "The IP address as seen by a server on the Internet"
msgstr "網際網路上的伺服器看見的 IP 位址"
-#: ../src/empathy-streamed-media-window.c:1504
+#: ../src/empathy-streamed-media-window.c:1511
msgid "The IP address of the peer as seen by the other side"
msgstr "其他端看見的點的 IP 位址"
-#: ../src/empathy-streamed-media-window.c:1506
+#: ../src/empathy-streamed-media-window.c:1513
msgid "The IP address of a relay server"
msgstr "中繼伺服器的 IP 位址"
-#: ../src/empathy-streamed-media-window.c:1508
+#: ../src/empathy-streamed-media-window.c:1515
msgid "The IP address of the multicast group"
msgstr "多點廣播群組的 IP 位址"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-streamed-media-window.c:2266
#, c-format
msgid "Connected — %d:%02dm"
msgstr "已連線 — %d:%02dm"
-#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-streamed-media-window.c:2327
msgid "Technical Details"
msgstr "技術細節"
-#: ../src/empathy-streamed-media-window.c:2358
+#: ../src/empathy-streamed-media-window.c:2365
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "%s 的軟體不瞭解任何您電腦上所支援的音訊格式"
-#: ../src/empathy-streamed-media-window.c:2363
+#: ../src/empathy-streamed-media-window.c:2370
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "%s 的軟體不瞭解任何您電腦上所支援的視訊格式"
-#: ../src/empathy-streamed-media-window.c:2369
+#: ../src/empathy-streamed-media-window.c:2376
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
"does not allow direct connections."
msgstr "無法和 %s 建立連線。您們其中之一可能在一個不允許直接連線的網路之上。"
-#: ../src/empathy-streamed-media-window.c:2375
+#: ../src/empathy-streamed-media-window.c:2382
msgid "There was a failure on the network"
msgstr "這個網路上有錯誤發生"
-#: ../src/empathy-streamed-media-window.c:2379
+#: ../src/empathy-streamed-media-window.c:2386
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "此通話所必要的音訊格式尚未在您的電腦上安裝"
-#: ../src/empathy-streamed-media-window.c:2382
+#: ../src/empathy-streamed-media-window.c:2389
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "此通話所必要的視訊格式尚未在您的電腦上安裝"
-#: ../src/empathy-streamed-media-window.c:2392
+#: ../src/empathy-streamed-media-window.c:2399
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2933,19 +3024,19 @@ msgstr ""
"在 Telepathy 元件中發生未預期的狀況。請<a href=\"%s\">回報這個錯誤</a>並附上"
"從求助選單內的「除錯」視窗中所收集的紀錄。"
-#: ../src/empathy-streamed-media-window.c:2400
+#: ../src/empathy-streamed-media-window.c:2407
msgid "There was a failure in the call engine"
msgstr "通話引擎內有錯誤發生"
-#: ../src/empathy-streamed-media-window.c:2403
+#: ../src/empathy-streamed-media-window.c:2410
msgid "The end of the stream was reached"
msgstr "已達串流末端"
-#: ../src/empathy-streamed-media-window.c:2443
+#: ../src/empathy-streamed-media-window.c:2450
msgid "Can't establish audio stream"
msgstr "無法建立音訊串流"
-#: ../src/empathy-streamed-media-window.c:2453
+#: ../src/empathy-streamed-media-window.c:2460
msgid "Can't establish video stream"
msgstr "無法建立視訊串流"
@@ -3041,35 +3132,35 @@ msgstr "視訊預覽"
msgid "_Call"
msgstr "通話(_C)"
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
msgid "_View"
msgstr "檢視(_V)"
-#: ../src/empathy-chat-window.c:469 ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d 個未讀)"
-#: ../src/empathy-chat-window.c:481
+#: ../src/empathy-chat-window.c:486
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (與 %u 其他的)"
-#: ../src/empathy-chat-window.c:497
+#: ../src/empathy-chat-window.c:502
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (來自其他人的 %d 個未讀)"
-#: ../src/empathy-chat-window.c:506
+#: ../src/empathy-chat-window.c:511
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (來自所有人的 %d 個未讀)"
-#: ../src/empathy-chat-window.c:708
+#: ../src/empathy-chat-window.c:721
msgid "Typing a message."
msgstr "正在輸入訊息。"
@@ -3105,7 +3196,7 @@ msgstr "將分頁右移(_R)"
msgid "Notify for All Messages"
msgstr "所有訊息都通知"
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
msgid "_Contents"
msgstr "內容(_C)"
@@ -3117,7 +3208,7 @@ msgstr "談話(_C)"
msgid "_Detach Tab"
msgstr "分離分頁(_D)"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
msgid "_Edit"
msgstr "編輯(_E)"
@@ -3125,7 +3216,7 @@ msgstr "編輯(_E)"
msgid "_Favorite Chat Room"
msgstr "喜好的聊天室(_F)"
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
msgid "_Help"
msgstr "求助(_H)"
@@ -3199,7 +3290,7 @@ msgstr "接聽(_A)"
#: ../src/empathy-event-manager.c:660
#, c-format
msgid "Incoming video call from %s"
-msgstr "來自 %s 的視訊電話"
+msgstr "來自 %s 的視訊通話"
#: ../src/empathy-event-manager.c:737
msgid "Room invitation"
@@ -3239,7 +3330,7 @@ msgstr "您被邀請參加 %s"
msgid "Incoming file transfer from %s"
msgstr "收到來自 %s 的檔案傳輸"
-#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:367
+#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:370
msgid "Password required"
msgstr "需要密碼"
@@ -3391,39 +3482,39 @@ msgstr "通訊協定"
msgid "Source"
msgstr "來源"
-#: ../src/empathy-main-window.c:384
+#: ../src/empathy-main-window.c:387
msgid "Provide Password"
msgstr "提供密碼"
-#: ../src/empathy-main-window.c:390
+#: ../src/empathy-main-window.c:393
msgid "Disconnect"
msgstr "斷線"
-#: ../src/empathy-main-window.c:530
+#: ../src/empathy-main-window.c:533
msgid "No match found"
msgstr "找不到符合項目"
-#: ../src/empathy-main-window.c:685
+#: ../src/empathy-main-window.c:688
msgid "Reconnect"
msgstr "重新連接"
-#: ../src/empathy-main-window.c:691
+#: ../src/empathy-main-window.c:694
msgid "Edit Account"
msgstr "編輯帳號"
-#: ../src/empathy-main-window.c:697
+#: ../src/empathy-main-window.c:700
msgid "Close"
msgstr "關閉"
-#: ../src/empathy-main-window.c:1414
+#: ../src/empathy-main-window.c:1418
msgid "Contact"
msgstr "連絡人"
-#: ../src/empathy-main-window.c:1748
+#: ../src/empathy-main-window.c:1765
msgid "Contact List"
msgstr "連絡人清單"
-#: ../src/empathy-main-window.c:1862
+#: ../src/empathy-main-window.c:1881
msgid "Show and edit accounts"
msgstr "顯示並編輯帳號"
@@ -3475,39 +3566,43 @@ msgstr "依狀態排序(_S)"
msgid "_Accounts"
msgstr "帳號(_A)"
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "被封鎖的聯絡人"
+
+#: ../src/empathy-main-window.ui.h:16
msgid "_Compact Size"
msgstr "精簡大小(_C)"
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:18
msgid "_Debug"
msgstr "偵錯(_D)"
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:20
msgid "_File Transfers"
msgstr "檔案傳輸(_F)"
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:22
msgid "_Join…"
msgstr "參加(_J)…"
-#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "新增談話(_N)…"
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window.ui.h:24
msgid "_Offline Contacts"
msgstr "離線連絡人(_O)"
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
msgid "_Personal Information"
msgstr "個人資訊(_P)"
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window.ui.h:27
msgid "_Room"
msgstr "聊天室(_R)"
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:28
msgid "_Search for Contacts…"
msgstr "搜尋聯絡人(_S)…"
@@ -3521,7 +3616,7 @@ msgstr "成員"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:565
+#: ../src/empathy-new-chatroom-dialog.c:560
#, c-format
msgid ""
"%s\n"
@@ -3534,16 +3629,16 @@ msgstr ""
"需要密碼:%s\n"
"成員:%s"
-#: ../src/empathy-new-chatroom-dialog.c:567
-#: ../src/empathy-new-chatroom-dialog.c:568
+#: ../src/empathy-new-chatroom-dialog.c:562
+#: ../src/empathy-new-chatroom-dialog.c:563
msgid "No"
msgstr "否"
-#: ../src/empathy-new-chatroom-dialog.c:596
+#: ../src/empathy-new-chatroom-dialog.c:591
msgid "Could not start room listing"
msgstr "無法開始列出聊天室清單"
-#: ../src/empathy-new-chatroom-dialog.c:606
+#: ../src/empathy-new-chatroom-dialog.c:601
msgid "Could not stop room listing"
msgstr "無法停止列出聊天室清單"
@@ -3767,55 +3862,55 @@ msgstr "儲存"
msgid "Debug Window"
msgstr "偵錯視窗"
-#: ../src/empathy-debug-window.c:1474
+#: ../src/empathy-debug-window.c:1476
msgid "Pause"
msgstr "暫停"
-#: ../src/empathy-debug-window.c:1486
+#: ../src/empathy-debug-window.c:1488
msgid "Level "
msgstr "等級"
-#: ../src/empathy-debug-window.c:1506
+#: ../src/empathy-debug-window.c:1508
msgid "Debug"
msgstr "偵錯"
-#: ../src/empathy-debug-window.c:1512
+#: ../src/empathy-debug-window.c:1514
msgid "Info"
msgstr "資訊"
-#: ../src/empathy-debug-window.c:1518 ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
msgid "Message"
msgstr "訊息"
-#: ../src/empathy-debug-window.c:1524
+#: ../src/empathy-debug-window.c:1526
msgid "Warning"
msgstr "警告"
-#: ../src/empathy-debug-window.c:1530
+#: ../src/empathy-debug-window.c:1532
msgid "Critical"
msgstr "嚴重"
-#: ../src/empathy-debug-window.c:1536
+#: ../src/empathy-debug-window.c:1538
msgid "Error"
msgstr "錯誤"
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:1557
msgid "Time"
msgstr "時刻"
-#: ../src/empathy-debug-window.c:1558
+#: ../src/empathy-debug-window.c:1560
msgid "Domain"
msgstr "網域"
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1562
msgid "Category"
msgstr "分類"
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1564
msgid "Level"
msgstr "等級"
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1601
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3834,28 +3929,28 @@ msgstr "選擇想要邀請進入談話的聯絡人:"
msgid "Invite"
msgstr "邀請"
-#: ../src/empathy-accounts.c:179
+#: ../src/empathy-accounts.c:183
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "不要顯示任何對話窗;執行任何作業 (例:匯入) 並離開"
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:187
msgid ""
"Don't display any dialogs unless there are only \"People Nearby\" accounts"
msgstr "不要顯示任何對話窗,除非只有「附近的人」帳號"
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:191
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr "初始選取所給予的帳號 (例:gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:189
+#: ../src/empathy-accounts.c:193
msgid "<account-id>"
msgstr "<account-id>"
-#: ../src/empathy-accounts.c:194
+#: ../src/empathy-accounts.c:198
msgid "- Empathy Accounts"
msgstr "- Empathy 帳號"
-#: ../src/empathy-accounts.c:233
+#: ../src/empathy-accounts.c:237
msgid "Empathy Accounts"
msgstr "Empathy 帳號"
@@ -3889,6 +3984,16 @@ msgstr "拒絕"
msgid "Accept"
msgstr "接受"
+#: ../src/empathy-call-observer.c:130
+#, c-format
+msgid "Missed call from %s"
+msgstr "漏接 %s 的來電"
+
+#: ../src/empathy-call-observer.c:133
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s 剛剛播打給您,但您正與他人通話。"
+
#~ msgid "%s is now offline."
#~ msgstr "%s 現在離線。"
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 501b93648..83179a8b9 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -1501,6 +1501,28 @@ accounts_dialog_get_account_iter (EmpathyAccountsDialog *dialog,
}
static void
+select_and_scroll_to_iter (EmpathyAccountsDialog *dialog,
+ GtkTreeIter *iter)
+{
+ EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+ GtkTreeSelection *selection;
+ GtkTreePath *path;
+ GtkTreeModel *model;
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
+
+ gtk_tree_selection_select_iter (selection, iter);
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
+ path = gtk_tree_model_get_path (model, iter);
+
+ gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (priv->treeview), path, NULL,
+ TRUE, 0, 0.5);
+
+ gtk_tree_path_free (path);
+}
+
+static void
accounts_dialog_model_set_selected (EmpathyAccountsDialog *dialog,
EmpathyAccountSettings *settings)
{
@@ -1510,7 +1532,7 @@ accounts_dialog_model_set_selected (EmpathyAccountsDialog *dialog,
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
if (accounts_dialog_get_settings_iter (dialog, settings, &iter))
- gtk_tree_selection_select_iter (selection, &iter);
+ select_and_scroll_to_iter (dialog, &iter);
}
static void
@@ -1752,6 +1774,7 @@ accounts_dialog_add_account (EmpathyAccountsDialog *dialog,
const gchar *name;
gboolean enabled;
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+ gboolean selected = FALSE;
model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
status = tp_account_get_connection_status (account, NULL);
@@ -1761,7 +1784,16 @@ accounts_dialog_add_account (EmpathyAccountsDialog *dialog,
settings = empathy_account_settings_new_for_account (account);
if (!accounts_dialog_get_account_iter (dialog, account, &iter))
- gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ {
+ gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ }
+ else
+ {
+ GtkTreeSelection *selection;
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
+ selected = gtk_tree_selection_iter_is_selected (selection, &iter);
+ }
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
COL_NAME, name,
@@ -1770,6 +1802,14 @@ accounts_dialog_add_account (EmpathyAccountsDialog *dialog,
COL_ACCOUNT_SETTINGS, settings,
-1);
+ if (selected)
+ {
+ /* We just modified the selected account. Its display name may have been
+ * changed and so it's place in the treeview. Scroll to it so it stays
+ * visible. */
+ select_and_scroll_to_iter (dialog, &iter);
+ }
+
accounts_dialog_connection_changed_cb (account,
0,
status,
@@ -1943,20 +1983,7 @@ accounts_dialog_set_selected_account (EmpathyAccountsDialog *dialog,
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
if (accounts_dialog_get_account_iter (dialog, account, &iter))
- {
- GtkTreePath *path;
- GtkTreeModel *model;
-
- gtk_tree_selection_select_iter (selection, &iter);
-
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
- path = gtk_tree_model_get_path (model, &iter);
-
- gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (priv->treeview), path, NULL,
- TRUE, 0, 0.5);
-
- gtk_tree_path_free (path);
- }
+ select_and_scroll_to_iter (dialog, &iter);
}
static void