diff options
| -rw-r--r-- | libempathy-gtk/empathy-call-utils.c | 30 | ||||
| -rw-r--r-- | po/sl.po | 407 | ||||
| -rw-r--r-- | src/empathy-call-window.c | 26 |
3 files changed, 236 insertions, 227 deletions
diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c index 4e8f6d2cd..2991784f1 100644 --- a/libempathy-gtk/empathy-call-utils.c +++ b/libempathy-gtk/empathy-call-utils.c @@ -113,7 +113,7 @@ empathy_call_create_streamed_media_request (const gchar *contact, } static void -create_call_channel_cb (GObject *source, +create_streamed_media_channel_cb (GObject *source, GAsyncResult *result, gpointer user_data) { @@ -124,28 +124,28 @@ create_call_channel_cb (GObject *source, result, &error)) { - DEBUG ("Failed to create Call channel: %s", error->message); + DEBUG ("Failed to create StreamedMedia channel: %s", error->message); show_call_error (error); g_error_free (error); } } static void -create_streamed_media_channel_cb (GObject *source, +create_call_channel_cb (GObject *source, GAsyncResult *result, gpointer user_data) { - TpAccountChannelRequest *call_req = user_data; + TpAccountChannelRequest *streamed_media_req = user_data; GError *error = NULL; if (tp_account_channel_request_create_channel_finish ( TP_ACCOUNT_CHANNEL_REQUEST (source), result, &error)) { - g_object_unref (call_req); + g_object_unref (streamed_media_req); return; } - DEBUG ("Failed to create StreamedMedia channel: %s", error->message); + DEBUG ("Failed to create Call channel: %s", error->message); if (error->code != TP_ERROR_NOT_IMPLEMENTED) { @@ -153,11 +153,11 @@ create_streamed_media_channel_cb (GObject *source, return; } - DEBUG ("Let's try with a Call channel"); + DEBUG ("Let's try with an StreamedMedia channel"); g_error_free (error); - tp_account_channel_request_create_channel_async (call_req, - EMPATHY_CALL_BUS_NAME, NULL, - create_call_channel_cb, + tp_account_channel_request_create_channel_async (streamed_media_req, + EMPATHY_AV_BUS_NAME, NULL, + create_streamed_media_channel_cb, NULL); } @@ -183,12 +183,12 @@ empathy_call_new_with_streams (const gchar *contact, streamed_media_request, timestamp); - tp_account_channel_request_create_channel_async (streamed_media_req, - EMPATHY_AV_BUS_NAME, NULL, - create_streamed_media_channel_cb, - call_req); + tp_account_channel_request_create_channel_async (call_req, + EMPATHY_CALL_BUS_NAME, NULL, + create_call_channel_cb, + streamed_media_req); g_hash_table_unref (call_request); g_hash_table_unref (streamed_media_request); - g_object_unref (streamed_media_req); + g_object_unref (call_req); } @@ -10,14 +10,14 @@ msgid "" msgstr "" "Project-Id-Version: empathy master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n" -"POT-Creation-Date: 2011-07-01 23:37+0000\n" -"PO-Revision-Date: 2011-07-02 12:48+0100\n" +"POT-Creation-Date: 2011-07-19 09:45+0000\n" +"PO-Revision-Date: 2011-07-19 21:53+0100\n" "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n" "Language-Team: Slovenščina <gnome-si@googlegroups.com>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0)\n" "X-Poedit-Language: Slovenian\n" "X-Poedit-Country: SLOVENIA\n" @@ -1481,9 +1481,9 @@ msgid "%s is now known as %s" msgstr "%s je preimenovan v %s" #: ../libempathy-gtk/empathy-chat.c:2688 -#: ../src/empathy-streamed-media-window.c:1935 +#: ../src/empathy-streamed-media-window.c:1939 #: ../src/empathy-event-manager.c:1241 -#: ../src/empathy-call-window.c:1869 +#: ../src/empathy-call-window.c:1858 msgid "Disconnected" msgstr "Prekinjena povezava" @@ -1519,7 +1519,7 @@ msgstr "Pridruži se" #: ../libempathy-gtk/empathy-chat.c:3755 #: ../src/empathy-event-manager.c:1262 -#: ../src/empathy-call-window.c:2125 +#: ../src/empathy-call-window.c:2105 msgid "Connected" msgstr "Povezano" @@ -1575,13 +1575,13 @@ msgstr "Blokirani stiki" #. Copy Link Address menu item #: ../libempathy-gtk/empathy-chat-text-view.c:320 -#: ../libempathy-gtk/empathy-theme-adium.c:1410 +#: ../libempathy-gtk/empathy-theme-adium.c:1417 msgid "_Copy Link Address" msgstr "Kopiraj _naslov povezave" #. Open Link menu item #: ../libempathy-gtk/empathy-chat-text-view.c:327 -#: ../libempathy-gtk/empathy-theme-adium.c:1417 +#: ../libempathy-gtk/empathy-theme-adium.c:1424 msgid "_Open Link" msgstr "_Odpri povezavo" @@ -1691,48 +1691,48 @@ msgid "_Block Contact" msgstr "_Blokiraj stik" #: ../libempathy-gtk/empathy-contact-menu.c:329 -#: ../libempathy-gtk/empathy-individual-menu.c:547 +#: ../libempathy-gtk/empathy-individual-menu.c:548 #: ../src/empathy-main-window.ui.h:16 msgid "_Chat" msgstr "_Klepet" #: ../libempathy-gtk/empathy-contact-menu.c:361 -#: ../libempathy-gtk/empathy-individual-menu.c:638 +#: ../libempathy-gtk/empathy-individual-menu.c:639 msgctxt "menu item" msgid "_Audio Call" msgstr "_Zvočni klic" #: ../libempathy-gtk/empathy-contact-menu.c:394 -#: ../libempathy-gtk/empathy-individual-menu.c:682 +#: ../libempathy-gtk/empathy-individual-menu.c:684 msgctxt "menu item" msgid "_Video Call" msgstr "_Video klic" #: ../libempathy-gtk/empathy-contact-menu.c:440 -#: ../libempathy-gtk/empathy-individual-menu.c:725 +#: ../libempathy-gtk/empathy-individual-menu.c:737 #: ../src/empathy-main-window.ui.h:27 msgid "_Previous Conversations" msgstr "Predhodni po_govori" #: ../libempathy-gtk/empathy-contact-menu.c:462 -#: ../libempathy-gtk/empathy-individual-menu.c:766 +#: ../libempathy-gtk/empathy-individual-menu.c:778 msgid "Send File" msgstr "Pošlji datoteko" #: ../libempathy-gtk/empathy-contact-menu.c:485 -#: ../libempathy-gtk/empathy-individual-menu.c:808 +#: ../libempathy-gtk/empathy-individual-menu.c:820 msgid "Share My Desktop" msgstr "Souporaba namizja" #: ../libempathy-gtk/empathy-contact-menu.c:525 #: ../libempathy-gtk/empathy-contact-widget.c:1890 -#: ../libempathy-gtk/empathy-individual-menu.c:843 +#: ../libempathy-gtk/empathy-individual-menu.c:855 #: ../libempathy-gtk/empathy-individual-widget.c:1386 msgid "Favorite" msgstr "Priljubljeno" #: ../libempathy-gtk/empathy-contact-menu.c:554 -#: ../libempathy-gtk/empathy-individual-menu.c:871 +#: ../libempathy-gtk/empathy-individual-menu.c:883 msgid "Infor_mation" msgstr "_Podrobnosti" @@ -1742,13 +1742,13 @@ msgid "_Edit" msgstr "_Uredi" #: ../libempathy-gtk/empathy-contact-menu.c:654 -#: ../libempathy-gtk/empathy-individual-menu.c:1058 +#: ../libempathy-gtk/empathy-individual-menu.c:1070 #: ../src/empathy-chat-window.c:1010 msgid "Inviting you to this room" msgstr "Vabila v klepetalnico" #: ../libempathy-gtk/empathy-contact-menu.c:685 -#: ../libempathy-gtk/empathy-individual-menu.c:1104 +#: ../libempathy-gtk/empathy-individual-menu.c:1116 msgid "_Invite to Chat Room" msgstr "_Povabi v klepetalnico" @@ -2072,25 +2072,25 @@ msgstr "Stiki izbrani na seznamu na levi, bodo povezani skupaj." #. 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:137 +#: ../libempathy-gtk/empathy-individual-menu.c:138 #, c-format msgid "%s (%s)" msgstr "%s (%s)" #. add an SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:593 +#: ../libempathy-gtk/empathy-individual-menu.c:594 #: ../libempathy-gtk/empathy-new-message-dialog.c:248 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:919 +#: ../libempathy-gtk/empathy-individual-menu.c:931 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_Uredi" #. Translators: this is a verb meaning "to connect two contacts together #. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:945 +#: ../libempathy-gtk/empathy-individual-menu.c:957 msgctxt "Link individual (contextual menu)" msgid "_Link Contacts…" msgstr "_Poveži stike ..." @@ -2184,117 +2184,126 @@ msgctxt "Unlink individual (button)" msgid "_Unlink" msgstr "_Odstrani povezavo" -#: ../libempathy-gtk/empathy-log-window.c:419 +#: ../libempathy-gtk/empathy-log-window.c:458 +msgid "History" +msgstr "Zgodovina" + +#: ../libempathy-gtk/empathy-log-window.c:510 msgid "Show" msgstr "Pokaži" -#: ../libempathy-gtk/empathy-log-window.c:441 +#: ../libempathy-gtk/empathy-log-window.c:532 msgid "Search" msgstr "Poišči" -#: ../libempathy-gtk/empathy-log-window.c:676 -#: ../libempathy-gtk/empathy-log-window.c:840 -msgctxt "A date with the time" -msgid "%A, %e %B %Y %X" -msgstr "%A, %d. %B %Y" +#: ../libempathy-gtk/empathy-log-window.c:946 +#, c-format +msgid "Chat in %s" +msgstr "Klepet v %s" -#: ../libempathy-gtk/empathy-log-window.c:678 +#: ../libempathy-gtk/empathy-log-window.c:948 #, c-format msgid "Chat with %s" msgstr "Klepet s stikom %s" +#: ../libempathy-gtk/empathy-log-window.c:998 +#: ../libempathy-gtk/empathy-log-window.c:1176 +msgctxt "A date with the time" +msgid "%A, %e %B %Y %X" +msgstr "%A, %d. %B %Y" + #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:797 +#: ../libempathy-gtk/empathy-log-window.c:1118 #, c-format msgid "<i>* %s %s</i>" msgstr "<i>* %s %s</i>" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:803 +#: ../libempathy-gtk/empathy-log-window.c:1124 #, c-format msgid "<b>%s:</b> %s" msgstr "<b>%s:</b> %s" -#: ../libempathy-gtk/empathy-log-window.c:859 -#: ../libempathy-gtk/empathy-log-window.c:861 +#: ../libempathy-gtk/empathy-log-window.c:1195 +#: ../libempathy-gtk/empathy-log-window.c:1197 #: ../src/empathy-ft-manager.c:1026 msgid "%" msgstr "%" -#: ../libempathy-gtk/empathy-log-window.c:868 +#: ../libempathy-gtk/empathy-log-window.c:1204 #, c-format msgid "Call took %s, ended at %s" msgstr "Klic začet %s, končan %s" -#: ../libempathy-gtk/empathy-log-window.c:1195 +#: ../libempathy-gtk/empathy-log-window.c:1536 msgid "Today" msgstr "Danes" -#: ../libempathy-gtk/empathy-log-window.c:1199 +#: ../libempathy-gtk/empathy-log-window.c:1540 msgid "Yesterday" msgstr "Včeraj" -#: ../libempathy-gtk/empathy-log-window.c:1215 +#: ../libempathy-gtk/empathy-log-window.c:1556 msgctxt "A date such as '23 May 2010', %e is the day, %B the month and %Y the year" msgid "%e %B %Y" msgstr "e. %B %Y" -#: ../libempathy-gtk/empathy-log-window.c:1296 -#: ../libempathy-gtk/empathy-log-window.c:2736 +#: ../libempathy-gtk/empathy-log-window.c:1637 +#: ../libempathy-gtk/empathy-log-window.c:3203 msgid "Anytime" msgstr "Kadarkoli" -#: ../libempathy-gtk/empathy-log-window.c:1368 -#: ../libempathy-gtk/empathy-log-window.c:1712 +#: ../libempathy-gtk/empathy-log-window.c:1717 +#: ../libempathy-gtk/empathy-log-window.c:2154 msgid "Anyone" msgstr "Kdorkoli" -#: ../libempathy-gtk/empathy-log-window.c:1992 +#: ../libempathy-gtk/empathy-log-window.c:2451 msgid "Who" msgstr "Kdo" -#: ../libempathy-gtk/empathy-log-window.c:2196 +#: ../libempathy-gtk/empathy-log-window.c:2655 msgid "When" msgstr "Kdaj" -#: ../libempathy-gtk/empathy-log-window.c:2312 +#: ../libempathy-gtk/empathy-log-window.c:2771 msgid "Anything" msgstr "Karkoli" -#: ../libempathy-gtk/empathy-log-window.c:2314 +#: ../libempathy-gtk/empathy-log-window.c:2773 msgid "Text chats" msgstr "Besedilni klepet" -#: ../libempathy-gtk/empathy-log-window.c:2316 +#: ../libempathy-gtk/empathy-log-window.c:2775 msgid "Calls" msgstr "Klici" -#: ../libempathy-gtk/empathy-log-window.c:2321 +#: ../libempathy-gtk/empathy-log-window.c:2780 msgid "Incoming calls" msgstr "Dohodni klici" -#: ../libempathy-gtk/empathy-log-window.c:2322 +#: ../libempathy-gtk/empathy-log-window.c:2781 msgid "Outgoing calls" msgstr "Odhodni klici" -#: ../libempathy-gtk/empathy-log-window.c:2323 +#: ../libempathy-gtk/empathy-log-window.c:2782 msgid "Missed calls" msgstr "Prezrti klici" -#: ../libempathy-gtk/empathy-log-window.c:2344 +#: ../libempathy-gtk/empathy-log-window.c:2804 msgid "What" msgstr "Kaj" -#: ../libempathy-gtk/empathy-log-window.c:3039 +#: ../libempathy-gtk/empathy-log-window.c:3506 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "Ali ste prepričani, da želite izbrisati vse podatke beležanja predhodnih pogovorov?" -#: ../libempathy-gtk/empathy-log-window.c:3043 +#: ../libempathy-gtk/empathy-log-window.c:3510 msgid "Clear All" msgstr "Počisti vse" -#: ../libempathy-gtk/empathy-log-window.c:3050 +#: ../libempathy-gtk/empathy-log-window.c:3517 msgid "Delete from:" msgstr "Izbriši iz:" @@ -2305,7 +2314,7 @@ msgstr "<span size=\"x-large\">Nalaganje ...</span>" #. translators: Call is a noun. This string is used in the window #. * title #: ../libempathy-gtk/empathy-log-window.ui.h:2 -#: ../src/empathy-streamed-media-window.c:1340 +#: ../src/empathy-streamed-media-window.c:1344 msgid "Call" msgstr "Kliči" @@ -2319,30 +2328,26 @@ msgid "Delete All History..." msgstr "Izbriši celotno zgodovino ..." #: ../libempathy-gtk/empathy-log-window.ui.h:5 -msgid "History" -msgstr "Zgodovina" - -#: ../libempathy-gtk/empathy-log-window.ui.h:6 msgid "Profile" msgstr "Profil" -#: ../libempathy-gtk/empathy-log-window.ui.h:7 +#: ../libempathy-gtk/empathy-log-window.ui.h:6 #: ../src/empathy-call-window.ui.h:20 #: ../src/empathy-streamed-media-window.ui.h:20 msgid "Video" msgstr "Video" -#: ../libempathy-gtk/empathy-log-window.ui.h:8 +#: ../libempathy-gtk/empathy-log-window.ui.h:7 #: ../src/empathy-chat-window.ui.h:12 #: ../src/empathy-main-window.ui.h:20 msgid "_Edit" msgstr "_Uredi" -#: ../libempathy-gtk/empathy-log-window.ui.h:9 +#: ../libempathy-gtk/empathy-log-window.ui.h:8 msgid "_File" msgstr "_Datoteka" -#: ../libempathy-gtk/empathy-log-window.ui.h:10 +#: ../libempathy-gtk/empathy-log-window.ui.h:9 msgid "page 2" msgstr "stran 2" @@ -2361,17 +2366,17 @@ msgid "New Conversation" msgstr "Nov pogovor" #. add video toggle -#: ../libempathy-gtk/empathy-new-call-dialog.c:216 +#: ../libempathy-gtk/empathy-new-call-dialog.c:231 msgid "Send _Video" msgstr "Pošlji _video" #. add chat button -#: ../libempathy-gtk/empathy-new-call-dialog.c:224 +#: ../libempathy-gtk/empathy-new-call-dialog.c:242 msgid "C_all" msgstr "_Kliči" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:234 +#: ../libempathy-gtk/empathy-new-call-dialog.c:252 msgid "New Call" msgstr "Nov klic" @@ -2500,12 +2505,12 @@ msgstr "Urejanje sporočila po meri" msgid "Remove" msgstr "Odstrani" -#: ../libempathy-gtk/empathy-theme-adium.c:1118 +#: ../libempathy-gtk/empathy-theme-adium.c:1121 #, c-format msgid "Message edited at %s" msgstr "Sporočilo je bilo nazadnje spremenjeno ob %s" -#: ../libempathy-gtk/empathy-theme-adium.c:1937 +#: ../libempathy-gtk/empathy-theme-adium.c:1943 msgid "Normal" msgstr "Običajno" @@ -2989,8 +2994,8 @@ msgid "Your new account has not been saved yet." msgstr "Novi račun še ni bil shranjen." #: ../src/empathy-accounts-dialog.c:345 -#: ../src/empathy-streamed-media-window.c:797 -#: ../src/empathy-call-window.c:780 +#: ../src/empathy-streamed-media-window.c:801 +#: ../src/empathy-call-window.c:880 msgid "Connecting…" msgstr "Povezovanje ..." @@ -3095,180 +3100,180 @@ msgid "People nearby" msgstr "Uporabniki v bližini" #: ../src/empathy-av.c:118 -#: ../src/empathy-call.c:120 +#: ../src/empathy-call.c:124 msgid "- Empathy Audio/Video Client" msgstr "- Empathy odjemalec zvoka in slike" #: ../src/empathy-av.c:134 -#: ../src/empathy-call.c:138 +#: ../src/empathy-call.c:145 msgid "Empathy Audio/Video Client" msgstr "Empathy odjemalec zvoka in slike" #: ../src/empathy-streamed-media-window.c:478 -#: ../src/empathy-call-window.c:472 +#: ../src/empathy-call-window.c:458 msgid "Contrast" msgstr "Kontrast" #: ../src/empathy-streamed-media-window.c:481 -#: ../src/empathy-call-window.c:475 +#: ../src/empathy-call-window.c:461 msgid "Brightness" msgstr "Svetlost" #: ../src/empathy-streamed-media-window.c:484 -#: ../src/empathy-call-window.c:478 +#: ../src/empathy-call-window.c:464 msgid "Gamma" msgstr "Gama" #: ../src/empathy-streamed-media-window.c:589 -#: ../src/empathy-call-window.c:583 +#: ../src/empathy-call-window.c:569 msgid "Volume" msgstr "Glasnost" -#: ../src/empathy-streamed-media-window.c:1153 -#: ../src/empathy-call-window.c:1127 +#: ../src/empathy-streamed-media-window.c:1157 +#: ../src/empathy-call-window.ui.h:22 msgid "_Sidebar" msgstr "_Stranska vrstica" -#: ../src/empathy-streamed-media-window.c:1173 +#: ../src/empathy-streamed-media-window.c:1177 #: ../src/empathy-call-window.c:1149 msgid "Audio input" msgstr "Zvočni vhod" -#: ../src/empathy-streamed-media-window.c:1177 +#: ../src/empathy-streamed-media-window.c:1181 #: ../src/empathy-call-window.c:1153 msgid "Video input" msgstr "Video vhod" -#: ../src/empathy-streamed-media-window.c:1181 +#: ../src/empathy-streamed-media-window.c:1185 #: ../src/empathy-call-window.c:1157 msgid "Dialpad" msgstr "Številčnica" -#: ../src/empathy-streamed-media-window.c:1192 +#: ../src/empathy-streamed-media-window.c:1196 #: ../src/empathy-call-window.c:1167 msgid "Details" msgstr "Podrobnosti" #. 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:1261 -#: ../src/empathy-call-window.c:1239 +#: ../src/empathy-streamed-media-window.c:1265 +#: ../src/empathy-call-window.c:1250 #, c-format msgid "Call with %s" msgstr "Pokliči z %s" -#: ../src/empathy-streamed-media-window.c:1494 -#: ../src/empathy-call-window.c:1459 +#: ../src/empathy-streamed-media-window.c:1498 +#: ../src/empathy-call-window.c:1447 msgid "The IP address as seen by the machine" msgstr "Naslov IP kot ga zazna strojna oprema" -#: ../src/empathy-streamed-media-window.c:1496 -#: ../src/empathy-call-window.c:1461 +#: ../src/empathy-streamed-media-window.c:1500 +#: ../src/empathy-call-window.c:1449 msgid "The IP address as seen by a server on the Internet" msgstr "Naslov IP kot ga zazna strežnik v omrežju" -#: ../src/empathy-streamed-media-window.c:1498 -#: ../src/empathy-call-window.c:1463 +#: ../src/empathy-streamed-media-window.c:1502 +#: ../src/empathy-call-window.c:1451 msgid "The IP address of the peer as seen by the other side" msgstr "Naslov IP kot ga zazna uporabnik na drugi strani" -#: ../src/empathy-streamed-media-window.c:1500 -#: ../src/empathy-call-window.c:1465 +#: ../src/empathy-streamed-media-window.c:1504 +#: ../src/empathy-call-window.c:1453 msgid "The IP address of a relay server" msgstr "Naslov IP posredovalnega strežnika" -#: ../src/empathy-streamed-media-window.c:1502 -#: ../src/empathy-call-window.c:1467 +#: ../src/empathy-streamed-media-window.c:1506 +#: ../src/empathy-call-window.c:1455 msgid "The IP address of the multicast group" msgstr "Naslov IP skupine za večsmerno oddajanje" -#: ../src/empathy-streamed-media-window.c:1884 +#: ../src/empathy-streamed-media-window.c:1888 msgctxt "encoding video codec" msgid "Unknown" msgstr "Neznano" -#: ../src/empathy-streamed-media-window.c:1887 +#: ../src/empathy-streamed-media-window.c:1891 msgctxt "encoding audio codec" msgid "Unknown" msgstr "Neznano" -#: ../src/empathy-streamed-media-window.c:1890 +#: ../src/empathy-streamed-media-window.c:1894 msgctxt "decoding video codec" msgid "Unknown" msgstr "Neznano" -#: ../src/empathy-streamed-media-window.c:1893 +#: ../src/empathy-streamed-media-window.c:1897 msgctxt "decoding audio codec" msgid "Unknown" msgstr "Neznano" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-streamed-media-window.c:2185 +#: ../src/empathy-streamed-media-window.c:2189 #, c-format msgid "Connected — %d:%02dm" msgstr "Povezan - %d:%02d m" -#: ../src/empathy-streamed-media-window.c:2246 -#: ../src/empathy-call-window.c:2187 +#: ../src/empathy-streamed-media-window.c:2250 +#: ../src/empathy-call-window.c:2167 msgid "Technical Details" msgstr "Tehnične podrobnosti" -#: ../src/empathy-streamed-media-window.c:2284 -#: ../src/empathy-call-window.c:2225 +#: ../src/empathy-streamed-media-window.c:2288 +#: ../src/empathy-call-window.c:2205 #, c-format msgid "%s's software does not understand any of the audio formats supported by your computer" msgstr "Program stika %s ne prepozna zvočnih zapisov podprtih na vašem sistemu" -#: ../src/empathy-streamed-media-window.c:2289 -#: ../src/empathy-call-window.c:2230 +#: ../src/empathy-streamed-media-window.c:2293 +#: ../src/empathy-call-window.c:2210 #, c-format msgid "%s's software does not understand any of the video formats supported by your computer" msgstr "Program stika %s ne prepozna video zapisov podprtih na vašem sistemu" -#: ../src/empathy-streamed-media-window.c:2295 -#: ../src/empathy-call-window.c:2236 +#: ../src/empathy-streamed-media-window.c:2299 +#: ../src/empathy-call-window.c:2216 #, 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 "Ni mogoče vzpostaviti povezave z %s. Morda je eden od odjemalcev je v omrežju, ki ne dovoli neposrednih povezav." -#: ../src/empathy-streamed-media-window.c:2301 -#: ../src/empathy-call-window.c:2242 +#: ../src/empathy-streamed-media-window.c:2305 +#: ../src/empathy-call-window.c:2222 msgid "There was a failure on the network" msgstr "Prišlo je do napake na omrežju" -#: ../src/empathy-streamed-media-window.c:2305 -#: ../src/empathy-call-window.c:2246 +#: ../src/empathy-streamed-media-window.c:2309 +#: ../src/empathy-call-window.c:2226 msgid "The audio formats necessary for this call are not installed on your computer" msgstr "Zvočni zapisi za ta klic niso nameščeni" -#: ../src/empathy-streamed-media-window.c:2308 -#: ../src/empathy-call-window.c:2249 +#: ../src/empathy-streamed-media-window.c:2312 +#: ../src/empathy-call-window.c:2229 msgid "The video formats necessary for this call are not installed on your computer" msgstr "Video zapisi za ta klic niso nameščeni" -#: ../src/empathy-streamed-media-window.c:2318 -#: ../src/empathy-call-window.c:2261 +#: ../src/empathy-streamed-media-window.c:2322 +#: ../src/empathy-call-window.c:2241 #, c-format msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu." msgstr "Prišlo je do nepričakovane napake v delu programa Telepathy. Pošljite <a href=\"%s\">poročilo o hrošču</a> in pripnite dnevnik razhroščevanja iz menija pomoči." -#: ../src/empathy-streamed-media-window.c:2326 -#: ../src/empathy-call-window.c:2270 +#: ../src/empathy-streamed-media-window.c:2330 +#: ../src/empathy-call-window.c:2250 msgid "There was a failure in the call engine" msgstr "Prišlo je do napake v klicnem programniku" -#: ../src/empathy-streamed-media-window.c:2329 -#: ../src/empathy-call-window.c:2273 +#: ../src/empathy-streamed-media-window.c:2333 +#: ../src/empathy-call-window.c:2253 msgid "The end of the stream was reached" msgstr "Dosežen je konec pretoka" -#: ../src/empathy-streamed-media-window.c:2369 -#: ../src/empathy-call-window.c:2313 +#: ../src/empathy-streamed-media-window.c:2373 +#: ../src/empathy-call-window.c:2293 msgid "Can't establish audio stream" msgstr "Ni mogoče vzpostaviti zvočnega pretoka" -#: ../src/empathy-streamed-media-window.c:2379 -#: ../src/empathy-call-window.c:2323 +#: ../src/empathy-streamed-media-window.c:2383 +#: ../src/empathy-call-window.c:2303 msgid "Can't establish video stream" msgstr "Ni mogoče vzpostaviti video pretoka" @@ -3283,119 +3288,93 @@ msgid "Call the contact again" msgstr "Znova pokliči stik" #: ../src/empathy-call-window.ui.h:3 -#: ../src/empathy-streamed-media-window.ui.h:3 -msgid "Camera Off" -msgstr "Kamera ni omogočena" - -#: ../src/empathy-call-window.ui.h:4 -#: ../src/empathy-streamed-media-window.ui.h:4 -msgid "Camera On" -msgstr "Kamera je omogočena" - -#: ../src/empathy-call-window.ui.h:5 #: ../src/empathy-streamed-media-window.ui.h:5 msgid "Decoding Codec:" msgstr "Kodek odkodiranja:" -#: ../src/empathy-call-window.ui.h:6 -#: ../src/empathy-streamed-media-window.ui.h:6 -msgid "Disable camera and stop sending video" -msgstr "Onemogoči kamero in zaustavi pošiljanje videa" - -#: ../src/empathy-call-window.ui.h:7 -#: ../src/empathy-streamed-media-window.ui.h:7 -msgid "Enable camera and send video" -msgstr "Omogoči kamero in začni pošiljati video" +#: ../src/empathy-call-window.ui.h:4 +msgid "Disable camera" +msgstr "Onemogoči videokamero" -#: ../src/empathy-call-window.ui.h:8 -#: ../src/empathy-streamed-media-window.ui.h:8 -msgid "Enable camera but don't send video" -msgstr "Omogoči kamero, vendar ne pošlji videa" +#: ../src/empathy-call-window.ui.h:5 +msgid "Display the dialpad" +msgstr "Pokaži številčnico na zaslonu" -#: ../src/empathy-call-window.ui.h:9 +#: ../src/empathy-call-window.ui.h:6 #: ../src/empathy-streamed-media-window.ui.h:9 msgid "Encoding Codec:" msgstr "Kodek kodiranja:" -#: ../src/empathy-call-window.ui.h:10 +#: ../src/empathy-call-window.ui.h:7 #: ../src/empathy-streamed-media-window.ui.h:10 msgid "Hang up" msgstr "Odloži" -#: ../src/empathy-call-window.ui.h:11 +#: ../src/empathy-call-window.ui.h:8 #: ../src/empathy-streamed-media-window.ui.h:11 msgid "Hang up current call" msgstr "Odloži trenutni klic" -#: ../src/empathy-call-window.ui.h:12 +#: ../src/empathy-call-window.ui.h:9 #: ../src/empathy-streamed-media-window.ui.h:12 msgid "Local Candidate:" msgstr "Krajevni odjemalec:" -#: ../src/empathy-call-window.ui.h:13 -#: ../src/empathy-streamed-media-window.ui.h:13 -msgid "Preview" -msgstr "Predogled" +#: ../src/empathy-call-window.ui.h:10 +msgid "Maximise me" +msgstr "Razpni" -#: ../src/empathy-call-window.ui.h:14 +#: ../src/empathy-call-window.ui.h:11 +msgid "Minimise me" +msgstr "Skrči" + +#: ../src/empathy-call-window.ui.h:12 #: ../src/empathy-streamed-media-window.ui.h:14 msgid "Redial" msgstr "Ponovno pokliči" -#: ../src/empathy-call-window.ui.h:15 +#: ../src/empathy-call-window.ui.h:13 #: ../src/empathy-streamed-media-window.ui.h:15 msgid "Remote Candidate:" msgstr "Oddaljeni odjemalec:" -#: ../src/empathy-call-window.ui.h:16 +#: ../src/empathy-call-window.ui.h:14 #: ../src/empathy-streamed-media-window.ui.h:16 msgid "Send Audio" msgstr "Pošlji zvočni posnetek" +#: ../src/empathy-call-window.ui.h:15 +msgid "Send Video" +msgstr "Pošlji video" + +#: ../src/empathy-call-window.ui.h:16 +msgid "Show dialpad" +msgstr "Pokaži številčnico" + #: ../src/empathy-call-window.ui.h:17 #: ../src/empathy-streamed-media-window.ui.h:17 msgid "Toggle audio transmission" msgstr "Preklopi prenos zvoka" #: ../src/empathy-call-window.ui.h:18 +msgid "Toggle video transmission" +msgstr "Preklopi prenos videa" + +#: ../src/empathy-call-window.ui.h:19 #: ../src/empathy-streamed-media-window.ui.h:18 -#: ../src/empathy-call-window.c:1824 -#: ../src/empathy-call-window.c:1825 -#: ../src/empathy-call-window.c:1826 -#: ../src/empathy-call-window.c:1827 +#: ../src/empathy-call-window.c:1813 +#: ../src/empathy-call-window.c:1814 +#: ../src/empathy-call-window.c:1815 +#: ../src/empathy-call-window.c:1816 msgid "Unknown" msgstr "Neznano" -#: ../src/empathy-call-window.ui.h:19 -#: ../src/empathy-streamed-media-window.ui.h:19 -msgid "V_ideo" -msgstr "V_ideo" - #: ../src/empathy-call-window.ui.h:21 -#: ../src/empathy-streamed-media-window.ui.h:21 -msgid "Video Off" -msgstr "Video ni omogočen" - -#: ../src/empathy-call-window.ui.h:22 -#: ../src/empathy-streamed-media-window.ui.h:22 -msgid "Video On" -msgstr "Video je omogočen" - -#: ../src/empathy-call-window.ui.h:23 -#: ../src/empathy-streamed-media-window.ui.h:23 -msgid "Video Preview" -msgstr "Predogled videa" - -#: ../src/empathy-call-window.ui.h:24 #: ../src/empathy-streamed-media-window.ui.h:24 msgid "_Call" msgstr "Po_kliči" -#: ../src/empathy-call-window.ui.h:25 -msgid "_Dialpad" -msgstr "Š_tevilčnica" - -#: ../src/empathy-call-window.ui.h:26 +#: ../src/empathy-call-window.ui.h:23 #: ../src/empathy-main-window.ui.h:30 #: ../src/empathy-streamed-media-window.ui.h:25 msgid "_View" @@ -4197,6 +4176,46 @@ msgstr "Stanje" msgid "_Quit" msgstr "_Končaj" +#: ../src/empathy-streamed-media-window.ui.h:3 +msgid "Camera Off" +msgstr "Kamera ni omogočena" + +#: ../src/empathy-streamed-media-window.ui.h:4 +msgid "Camera On" +msgstr "Kamera je omogočena" + +#: ../src/empathy-streamed-media-window.ui.h:6 +msgid "Disable camera and stop sending video" +msgstr "Onemogoči kamero in zaustavi pošiljanje videa" + +#: ../src/empathy-streamed-media-window.ui.h:7 +msgid "Enable camera and send video" +msgstr "Omogoči kamero in začni pošiljati video" + +#: ../src/empathy-streamed-media-window.ui.h:8 +msgid "Enable camera but don't send video" +msgstr "Omogoči kamero, vendar ne pošlji videa" + +#: ../src/empathy-streamed-media-window.ui.h:13 +msgid "Preview" +msgstr "Predogled" + +#: ../src/empathy-streamed-media-window.ui.h:19 +msgid "V_ideo" +msgstr "V_ideo" + +#: ../src/empathy-streamed-media-window.ui.h:21 +msgid "Video Off" +msgstr "Video ni omogočen" + +#: ../src/empathy-streamed-media-window.ui.h:22 +msgid "Video On" +msgstr "Video je omogočen" + +#: ../src/empathy-streamed-media-window.ui.h:23 +msgid "Video Preview" +msgstr "Predogled videa" + #: ../src/empathy-map-view.c:448 msgid "Contact Map View" msgstr "Prikaz zemljevida stikov" @@ -4343,18 +4362,25 @@ msgstr "Zagotovi" msgid "%s just tried to call you, but you were in another call." msgstr "%s je klical med drugim pogovorom." -#: ../src/empathy-call-window.c:1246 +#. Translators: this is an "Info" label. It should be as short +#. * as possible. +#: ../src/empathy-call-window.c:787 +#: ../src/empathy-call-window.c:801 +msgid "i" +msgstr "i" + +#: ../src/empathy-call-window.c:1257 #, c-format msgid "Call with %d participants" msgstr "Klepet večih (%d) uporabnikov" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2124 +#: ../src/empathy-call-window.c:2104 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02dm" -#: ../src/empathy-call-window.c:2125 +#: ../src/empathy-call-window.c:2105 msgid "On hold" msgstr "Zadržano" @@ -4362,6 +4388,9 @@ msgstr "Zadržano" msgid "_Match case" msgstr "_Upoštevaj velikost črk" +#~ msgid "_Dialpad" +#~ msgstr "Š_tevilčnica" + #~ msgid "Enter Custom Message" #~ msgstr "Vnos sporočila po meri" diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 85a2f4c51..97106be12 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -144,11 +144,6 @@ struct _EmpathyCallWindowPriv easilly repack everything when toggling fullscreen */ GtkWidget *content_hbox; - /* This vbox is contained in the content_hbox and it contains the - sidebar button. When toggling fullscreen, - it needs to be repacked. We keep a reference on it for easier access. */ - GtkWidget *vbox; - gulong video_output_motion_handler_id; guint bus_message_source_id; @@ -999,7 +994,6 @@ empathy_call_window_init (EmpathyCallWindow *self) EmpathyCallWindowPriv *priv; GtkBuilder *gui; GtkWidget *top_vbox; - GtkWidget *h; GtkWidget *page; gchar *filename; GtkWidget *scroll; @@ -1126,15 +1120,8 @@ empathy_call_window_init (EmpathyCallWindow *self) /* The call will be started as soon the pipeline is playing */ priv->start_call_when_playing = TRUE; - priv->vbox = gtk_vbox_new (FALSE, 3); - gtk_box_pack_start (GTK_BOX (priv->content_hbox), priv->vbox, - FALSE, FALSE, CONTENT_HBOX_CHILDREN_PACKING_PADDING); - empathy_call_window_setup_toolbar (self); - h = gtk_hbox_new (FALSE, 3); - gtk_box_pack_end (GTK_BOX (priv->vbox), h, FALSE, FALSE, 3); - priv->sidebar = ev_sidebar_new (); g_signal_connect (G_OBJECT (priv->sidebar), "hide", G_CALLBACK (empathy_call_window_sidebar_hidden_cb), self); @@ -1172,10 +1159,10 @@ empathy_call_window_init (EmpathyCallWindow *self) gtk_widget_hide (priv->sidebar); priv->fullscreen = empathy_call_window_fullscreen_new (self); -#if 0 + empathy_call_window_fullscreen_set_video_widget (priv->fullscreen, - priv->video_output); -#endif + priv->video_container); + g_signal_connect (G_OBJECT (priv->fullscreen->leave_fullscreen_button), "clicked", G_CALLBACK (empathy_call_window_fullscreen_cb), self); @@ -2790,7 +2777,6 @@ show_controls (EmpathyCallWindow *window, gboolean set_fullscreen) { gtk_widget_hide (priv->sidebar); gtk_widget_hide (menu); - gtk_widget_hide (priv->vbox); gtk_widget_hide (priv->statusbar); gtk_widget_hide (priv->toolbar); } @@ -2800,7 +2786,6 @@ show_controls (EmpathyCallWindow *window, gboolean set_fullscreen) gtk_widget_show (priv->sidebar); gtk_widget_show (menu); - gtk_widget_show (priv->vbox); gtk_widget_show (priv->statusbar); gtk_widget_show (priv->toolbar); @@ -2828,11 +2813,6 @@ show_borders (EmpathyCallWindow *window, gboolean set_fullscreen) GTK_PACK_START); #endif } - - gtk_box_set_child_packing (GTK_BOX (priv->content_hbox), - priv->vbox, TRUE, TRUE, - set_fullscreen ? 0 : CONTENT_HBOX_CHILDREN_PACKING_PADDING, - GTK_PACK_START); } static gboolean |