diff options
| -rw-r--r-- | libempathy/empathy-connectivity.c | 2 | ||||
| -rw-r--r-- | po/lv.po | 207 | ||||
| -rw-r--r-- | src/empathy-main-window.c | 22 | ||||
| -rw-r--r-- | src/empathy-new-chatroom-dialog.c | 2 | ||||
| -rw-r--r-- | src/empathy-preferences.c | 2 | ||||
| -rw-r--r-- | tests/empathy-chatroom-manager-test.c | 2 | ||||
| -rw-r--r-- | tests/test-helper.c | 103 |
7 files changed, 121 insertions, 219 deletions
diff --git a/libempathy/empathy-connectivity.c b/libempathy/empathy-connectivity.c index f6a723ef6..f02b7588b 100644 --- a/libempathy/empathy-connectivity.c +++ b/libempathy/empathy-connectivity.c @@ -403,7 +403,7 @@ empathy_connectivity_set_use_conn (EmpathyConnectivity *connectivity, if (use_conn == priv->use_conn) return; - DEBUG ("use_conn gconf key changed; new value = %s", + DEBUG ("use_conn GSetting key changed; new value = %s", use_conn ? "true" : "false"); priv->use_conn = use_conn; @@ -11,10 +11,10 @@ msgstr "" "Project-Id-Version: lv\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." "cgi?product=empathy&component=general\n" -"POT-Creation-Date: 2010-03-29 08:48+0000\n" -"PO-Revision-Date: 2010-03-29 22:35+0300\n" -"Last-Translator: Peteris Krisjanis <pecisk@gmail.com>\n" -"Language-Team: Latviešu <lata-l10n@googlegroups.com>\n" +"POT-Creation-Date: 2010-04-22 20:59+0000\n" +"PO-Revision-Date: 2010-06-20 14:41+0300\n" +"Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n" +"Language-Team: Latviešu <kde-i18n-doc@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -279,8 +279,6 @@ msgid "Whether Empathy has asked about importing accounts from other programs." msgstr "Vai Empathy ir jautājusi par kontu importēšanu no citām programmām." #: ../data/empathy.schemas.in.h:59 -#| msgid "" -#| "Whether Empathy has asked about importing accounts from other programs." msgid "Whether Empathy has migrated butterfly logs." msgstr "Vai Empathy ir pārnesusi butterfly žurnālus." @@ -375,7 +373,7 @@ msgid "" "Whether to show a popup notification when receiving a new message even if " "the chat is already opened, but not focused." msgstr "" -"Vai rādīt izlecošo paziņojumu, kad saņem jaunu ziņojumu, kad tērzēšanas logs " +"Vai rādīt izlecošo paziņojumu, saņemot jaunu ziņojumu, kad tērzēšanas logs " "jau ir atvērts, bet nav fokusēts." #: ../data/empathy.schemas.in.h:79 @@ -385,7 +383,7 @@ msgstr "Vai rādīt izlecošo paziņojumu, kad saņem jaunu ziņojumu." #: ../data/empathy.schemas.in.h:80 msgid "" "Whether to show avatars for contacts in the contact list and chat windows." -msgstr "Vai rādīt attēlus kontaktiem kontaktu sarakstā un tērzēšanas logos." +msgstr "Vai rādīt kontaktu attēlus kontaktu sarakstā un tērzēšanas logos." #: ../data/empathy.schemas.in.h:81 msgid "Whether to show contacts that are offline in the contact list." @@ -397,7 +395,7 @@ msgstr "Vai rādīt izlecošos paziņojumus, kad esmu prom vai aizņemts." #: ../data/empathy.schemas.in.h:83 msgid "Whether to show protocols for contacts in the contact list." -msgstr "Vai rādīt protokolus kontaktiem kontaktu sarakstā un tērzēšanas logos." +msgstr "Vai rādīt protokolus kontaktu sarakstā un tērzēšanas logos." #: ../data/empathy.schemas.in.h:84 msgid "Whether to show the contact list in chat rooms." @@ -426,7 +424,7 @@ msgid "" "the contact list by state." msgstr "" "Kuru kritēriju izmantot, kārtojot kontaktu sarakstu. Noklusētā vērtība ir " -"\"vārds\" - kārtot pēc kontakta vārda. Vērtība \"statuss\" kārtos kontaktus " +"\"name\" - kārtot pēc kontakta vārda. Vērtība \"state\" kārtos kontaktus " "pēc to statusa." #: ../data/empathy-accounts.desktop.in.in.h:1 @@ -450,13 +448,13 @@ msgstr "Kontakts neatbalsta failu sūtīšanu" #: ../libempathy/empathy-ft-handler.c:1160 msgid "The selected file is not a regular file" -msgstr "Izvēlētais fails nav parasts fails" +msgstr "Izvēlētais fails nav normāls fails" #: ../libempathy/empathy-ft-handler.c:1169 msgid "The selected file is empty" msgstr "Izvēlētais fails ir tukšs" -#: ../libempathy/empathy-tp-contact-list.c:834 +#: ../libempathy/empathy-tp-contact-list.c:911 #: ../src/empathy-auto-salut-account-helper.c:77 msgid "People nearby" msgstr "Tuvumā esošie cilvēki" @@ -887,7 +885,7 @@ msgid "" "Facebook username if you don't have one." msgstr "" "Šeit vajadzīgs lietotāja vārds, nevis e-pasta adrese.\n" -"Ja jūs var atrast facebook.com/<b>saule</b>, ievadiet <b>saule</b>.\n" +"Ja jūsu konts atrodams facebook.com/<b>saule</b>, ievadiet <b>saule</b>.\n" "Ja jums nav Facebook lietotāja vārda, varat to izvēlēties <a href=\"http://" "www.facebook.com/username/\">šajā lapā</a>." @@ -1217,29 +1215,29 @@ msgstr "Temats ir: %s" msgid "No topic defined" msgstr "Temats nav norādīts" -#: ../libempathy-gtk/empathy-chat.c:1629 +#: ../libempathy-gtk/empathy-chat.c:1626 msgid "(No Suggestions)" msgstr "(Nav ieteikumu)" -#: ../libempathy-gtk/empathy-chat.c:1683 +#: ../libempathy-gtk/empathy-chat.c:1680 msgid "Insert Smiley" msgstr "Ievietot smaidiņu" #. send button -#: ../libempathy-gtk/empathy-chat.c:1701 +#: ../libempathy-gtk/empathy-chat.c:1698 #: ../libempathy-gtk/empathy-ui-utils.c:1675 msgid "_Send" msgstr "_Sūtīt" -#: ../libempathy-gtk/empathy-chat.c:1735 +#: ../libempathy-gtk/empathy-chat.c:1732 msgid "_Spelling Suggestions" msgstr "_Pareizrakstības ieteikumi" -#: ../libempathy-gtk/empathy-chat.c:1829 +#: ../libempathy-gtk/empathy-chat.c:1826 msgid "Failed to retrieve recent logs" msgstr "Neizdevās iegūt pēdējos ierakstus" -#: ../libempathy-gtk/empathy-chat.c:1960 +#: ../libempathy-gtk/empathy-chat.c:1957 #, c-format msgid "%s has disconnected" msgstr "%s ir izgājis" @@ -1247,12 +1245,12 @@ msgstr "%s ir izgājis" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:1967 +#: ../libempathy-gtk/empathy-chat.c:1964 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%2$s ņēma un izspēra %1$s" -#: ../libempathy-gtk/empathy-chat.c:1970 +#: ../libempathy-gtk/empathy-chat.c:1967 #, c-format msgid "%s was kicked" msgstr "%s tika izsperts" @@ -1260,17 +1258,17 @@ msgstr "%s tika izsperts" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:1978 +#: ../libempathy-gtk/empathy-chat.c:1975 #, c-format msgid "%1$s was banned by %2$s" msgstr "%2$s ņēma un izraidīja %1$s" -#: ../libempathy-gtk/empathy-chat.c:1981 +#: ../libempathy-gtk/empathy-chat.c:1978 #, c-format msgid "%s was banned" msgstr "%s tika izraidīts" -#: ../libempathy-gtk/empathy-chat.c:1985 +#: ../libempathy-gtk/empathy-chat.c:1982 #, c-format msgid "%s has left the room" msgstr "%s pameta istabu" @@ -1280,51 +1278,51 @@ msgstr "%s pameta istabu" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:1994 +#: ../libempathy-gtk/empathy-chat.c:1991 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2019 +#: ../libempathy-gtk/empathy-chat.c:2016 #, c-format msgid "%s has joined the room" msgstr "%s pievienojās istabai" -#: ../libempathy-gtk/empathy-chat.c:2044 +#: ../libempathy-gtk/empathy-chat.c:2041 #, c-format msgid "%s is now known as %s" -msgstr "%s tagad ir saucas %s" +msgstr "%s tagad saucas %s" -#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1532 +#: ../libempathy-gtk/empathy-chat.c:2176 ../src/empathy-call-window.c:1532 msgid "Disconnected" msgstr "Atvienots" -#: ../libempathy-gtk/empathy-chat.c:2701 +#: ../libempathy-gtk/empathy-chat.c:2698 msgid "Wrong password; please try again:" msgstr "Nepareiza parole; mēģiniet vēlreiz:" -#: ../libempathy-gtk/empathy-chat.c:2702 +#: ../libempathy-gtk/empathy-chat.c:2699 msgid "Retry" msgstr "Mēģināt vēlreiz" -#: ../libempathy-gtk/empathy-chat.c:2707 +#: ../libempathy-gtk/empathy-chat.c:2704 msgid "This room is protected by a password:" msgstr "Šī istaba ir aizsargāta ar paroli:" -#: ../libempathy-gtk/empathy-chat.c:2708 +#: ../libempathy-gtk/empathy-chat.c:2705 msgid "Join" msgstr "Pievienoties" -#: ../libempathy-gtk/empathy-chat.c:2848 +#: ../libempathy-gtk/empathy-chat.c:2845 msgid "Connected" msgstr "Savienots" -#: ../libempathy-gtk/empathy-chat.c:2901 +#: ../libempathy-gtk/empathy-chat.c:2898 #: ../libempathy-gtk/empathy-log-window.c:707 msgid "Conversation" msgstr "Saruna" -#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:672 +#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:671 msgid "Topic:" msgstr "Temats:" @@ -1426,7 +1424,6 @@ msgstr "Dalīties ar manu darbvirsmu" #: ../libempathy-gtk/empathy-contact-menu.c:432 #: ../libempathy-gtk/empathy-contact-widget.c:1379 -#| msgid "Join _Favorites" msgid "Favorite" msgstr "Iecienītais" @@ -1440,7 +1437,7 @@ msgid "_Edit" msgstr "R_ediģēt" #: ../libempathy-gtk/empathy-contact-menu.c:562 -#: ../src/empathy-chat-window.c:857 +#: ../src/empathy-chat-window.c:856 msgid "Inviting you to this room" msgstr "Aicina jūs uz šo istabu" @@ -1457,7 +1454,7 @@ msgid "Select" msgstr "Izvēlēties" #: ../libempathy-gtk/empathy-contact-widget.c:247 -#: ../src/empathy-main-window.c:1050 +#: ../src/empathy-main-window.c:1051 msgid "Group" msgstr "Grupa" @@ -1620,7 +1617,6 @@ msgid "Identifier:" msgstr "Identifikators:" #: ../libempathy-gtk/empathy-contact-widget.ui.h:13 -#| msgid "Information requested…" msgid "Information requested…" msgstr "Informācija pieprasīta..." @@ -2122,7 +2118,7 @@ msgstr "" "šī palīga un pievienot kontus vēlāk, izmantojot Rediģēšanas izvēlni." #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1303 +#: ../src/empathy-account-assistant.c:1308 msgid "An error occurred" msgstr "Notika kļūda" @@ -2131,36 +2127,36 @@ msgstr "Notika kļūda" #. To translator: %s is the name of the protocol, such as "Google Talk" or #. * "Yahoo!" #. -#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580 +#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:580 #, c-format msgid "New %s account" msgstr "Jauns %s konts" -#: ../src/empathy-account-assistant.c:508 +#: ../src/empathy-account-assistant.c:507 msgid "What kind of chat account do you have?" msgstr "Kāda veida tērzēšanas konts jums ir?" -#: ../src/empathy-account-assistant.c:514 +#: ../src/empathy-account-assistant.c:513 msgid "Do you have any other chat accounts you want to set up?" msgstr "Vai vēlaties iestatīt vēl citus tērzēšanas kontus?" -#: ../src/empathy-account-assistant.c:520 +#: ../src/empathy-account-assistant.c:519 msgid "Enter your account details" msgstr "Ievadiet sava konta informāciju" -#: ../src/empathy-account-assistant.c:525 +#: ../src/empathy-account-assistant.c:524 msgid "What kind of chat account do you want to create?" msgstr "Kāda veida tērzēšanas kontu vēlaties izveidot?" -#: ../src/empathy-account-assistant.c:531 +#: ../src/empathy-account-assistant.c:530 msgid "Do you want to create other chat accounts?" msgstr "Vai vēlaties izveidot citus tērzēšanas kontus?" -#: ../src/empathy-account-assistant.c:538 +#: ../src/empathy-account-assistant.c:537 msgid "Enter the details for the new account" msgstr "Ievadiet sava jaunā konta informāciju" -#: ../src/empathy-account-assistant.c:653 +#: ../src/empathy-account-assistant.c:652 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 " @@ -2172,41 +2168,41 @@ msgstr "" "tērzēšanas programmas. Ar mikrofonu un tīmekļa kameru jūs varat veikt arī " "audio un video zvanus." -#: ../src/empathy-account-assistant.c:670 +#: ../src/empathy-account-assistant.c:669 msgid "Do you have an account you've been using with another chat program?" msgstr "Vai jums ir konti, kurus izmantojat ar citu tērzēšanas programmu?" -#: ../src/empathy-account-assistant.c:693 +#: ../src/empathy-account-assistant.c:692 msgid "Yes, import my account details from " msgstr "Jā, es vēlos importēt manu konta informāciju no " -#: ../src/empathy-account-assistant.c:714 +#: ../src/empathy-account-assistant.c:713 msgid "Yes, I'll enter my account details now" msgstr "Jā, es tagad ievadīšu sava konta informāciju" -#: ../src/empathy-account-assistant.c:736 +#: ../src/empathy-account-assistant.c:735 msgid "No, I want a new account" msgstr "Nē, es vēlos veidot jaunu kontu" -#: ../src/empathy-account-assistant.c:746 +#: ../src/empathy-account-assistant.c:745 msgid "No, I just want to see people online nearby for now" msgstr "Nē, es pagaidām vēlos tikai redzēt tuvumā atrodamos cilvēkus" -#: ../src/empathy-account-assistant.c:767 +#: ../src/empathy-account-assistant.c:766 msgid "Select the accounts you want to import:" msgstr "Izvēlieties kontus, kurus vēlaties importēt:" -#: ../src/empathy-account-assistant.c:851 -#: ../src/empathy-new-chatroom-dialog.c:541 -#: ../src/empathy-new-chatroom-dialog.c:542 +#: ../src/empathy-account-assistant.c:850 +#: ../src/empathy-new-chatroom-dialog.c:608 +#: ../src/empathy-new-chatroom-dialog.c:609 msgid "Yes" msgstr "Jā" -#: ../src/empathy-account-assistant.c:858 +#: ../src/empathy-account-assistant.c:857 msgid "No, that's all for now" msgstr "Nē, pagaidām tas ir viss" -#: ../src/empathy-account-assistant.c:1117 +#: ../src/empathy-account-assistant.c:1122 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 " @@ -2218,16 +2214,16 @@ msgstr "" "pareizas. Vēlāk jūs tās varat viegli izmainīt vai atslēgt šo iespēju, " "izmantojot dialogu 'Konti'." -#: ../src/empathy-account-assistant.c:1123 -#: ../src/empathy-account-assistant.c:1179 +#: ../src/empathy-account-assistant.c:1128 +#: ../src/empathy-account-assistant.c:1184 msgid "Edit->Accounts" msgstr "Rediģēt->Konti" -#: ../src/empathy-account-assistant.c:1139 +#: ../src/empathy-account-assistant.c:1144 msgid "I don't want to enable this feature for now" msgstr "Es pagaidām nevēlos ieslēgt šo iespēju" -#: ../src/empathy-account-assistant.c:1175 +#: ../src/empathy-account-assistant.c:1180 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 " @@ -2238,24 +2234,23 @@ msgstr "" "instalēts. Ja vēlaties ieslēgt šo iespēju, lūdzu, instalējiet telepathy-" "salut pakotni un izveidojiet atbilstošo kontu Kontu dialogā" -#: ../src/empathy-account-assistant.c:1181 +#: ../src/empathy-account-assistant.c:1186 msgid "telepathy-salut not installed" msgstr "telepathy-salut nav instalēts" -#: ../src/empathy-account-assistant.c:1227 -#| msgid "Messaging and VoIP Accounts" +#: ../src/empathy-account-assistant.c:1232 msgid "Messaging and VoIP Accounts Assistant" msgstr "Ziņojumapmaiņas un IP balss pārraides kontu asistents" -#: ../src/empathy-account-assistant.c:1261 +#: ../src/empathy-account-assistant.c:1266 msgid "Welcome to Empathy" msgstr "Laipni lūdzam Empathy" -#: ../src/empathy-account-assistant.c:1270 +#: ../src/empathy-account-assistant.c:1275 msgid "Import your existing accounts" msgstr "Importēt jau esošos kontus" -#: ../src/empathy-account-assistant.c:1288 +#: ../src/empathy-account-assistant.c:1293 msgid "Please enter personal details" msgstr "Lūdzu, ievadiet savus datus" @@ -2348,12 +2343,10 @@ msgstr "" "kuru vēlaties izmantot." #: ../src/empathy-accounts-dialog.ui.h:4 -#| msgid "_Add Contact…" msgid "_Add…" msgstr "_Pievienot..." #: ../src/empathy-accounts-dialog.ui.h:5 -#| msgid "Import" msgid "_Import…" msgstr "_Importēt..." @@ -2403,16 +2396,16 @@ msgid "Call" msgstr "Zvans" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-call-window.c:1695 +#: ../src/empathy-call-window.c:1837 #, c-format msgid "Connected — %d:%02dm" msgstr "Savienojies — %d:%02dm" -#: ../src/empathy-call-window.c:1756 +#: ../src/empathy-call-window.c:1898 msgid "Technical Details" msgstr "Tehniskā informācija" -#: ../src/empathy-call-window.c:1794 +#: ../src/empathy-call-window.c:1936 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -2421,7 +2414,7 @@ msgstr "" "Programmatūra, ko lieto %s, nesaprot nevienu no jūsu sistēmas atbalstītajiem " "audio formātiem" -#: ../src/empathy-call-window.c:1799 +#: ../src/empathy-call-window.c:1941 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -2430,7 +2423,7 @@ msgstr "" "Programmatūra, ko lieto %s, nesaprot nevienu no jūsu sistēmas atbalstītajiem " "video formātiem" -#: ../src/empathy-call-window.c:1805 +#: ../src/empathy-call-window.c:1947 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -2439,21 +2432,21 @@ msgstr "" "Nevar izveidot savienojumu ar %s. Iespējams, ka viens no jums atrodas tīklā, " "kurā nav atļauti tiešie savienojumi." -#: ../src/empathy-call-window.c:1811 +#: ../src/empathy-call-window.c:1953 msgid "There was a failure on the network" msgstr "Gadījās tīkla kļūme" -#: ../src/empathy-call-window.c:1815 +#: ../src/empathy-call-window.c:1957 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "Šim zvanam vajadzīgie audio formāti nav instalēti jūsu datorā" -#: ../src/empathy-call-window.c:1818 +#: ../src/empathy-call-window.c:1960 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "Šim zvanam vajadzīgie video formāti nav instalēti jūsu datorā" -#: ../src/empathy-call-window.c:1828 +#: ../src/empathy-call-window.c:1970 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please <a href=\"%s" @@ -2464,15 +2457,15 @@ msgstr "" "\">ziņojiet par šo kļūdu</a>, pievienojot ierakstus no 'Atkļūdot' loga " "Palīdzības izvēlnē." -#: ../src/empathy-call-window.c:1836 +#: ../src/empathy-call-window.c:1978 msgid "There was a failure in the call engine" msgstr "Zvanu dzinī gadījās kļūme" -#: ../src/empathy-call-window.c:1875 +#: ../src/empathy-call-window.c:2017 msgid "Can't establish audio stream" msgstr "Nevar izveidot audio plūsmu" -#: ../src/empathy-call-window.c:1885 +#: ../src/empathy-call-window.c:2027 msgid "Can't establish video stream" msgstr "Nevar izveidot video plūsmu" @@ -2544,7 +2537,7 @@ msgstr "Video priekšskatījums" msgid "_View" msgstr "_Skats" -#: ../src/empathy-chat-window.c:436 ../src/empathy-chat-window.c:456 +#: ../src/empathy-chat-window.c:435 ../src/empathy-chat-window.c:455 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" @@ -2552,7 +2545,7 @@ msgstr[0] "%s (%d nelasīts)" msgstr[1] "%s (%d nelasīti)" msgstr[2] "%s (%d nelasīti)" -#: ../src/empathy-chat-window.c:448 +#: ../src/empathy-chat-window.c:447 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" @@ -2560,7 +2553,7 @@ msgstr[0] "%s (un %u cits)" msgstr[1] "%s (un %u citi)" msgstr[2] "%s (un %u citi)" -#: ../src/empathy-chat-window.c:464 +#: ../src/empathy-chat-window.c:463 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" @@ -2568,7 +2561,7 @@ msgstr[0] "%s (%d nelasīts no citiem)" msgstr[1] "%s (%d nelasīti no citiem)" msgstr[2] "%s (%d nelasīti no citiem)" -#: ../src/empathy-chat-window.c:473 +#: ../src/empathy-chat-window.c:472 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" @@ -2576,7 +2569,7 @@ msgstr[0] "%s (%d nelasīts no visiem)" msgstr[1] "%s (%d nelasīti no visiem)" msgstr[2] "%s (%d nelasīti no visiem)" -#: ../src/empathy-chat-window.c:676 +#: ../src/empathy-chat-window.c:675 msgid "Typing a message." msgstr "Raksta ziņojumu." @@ -2666,7 +2659,7 @@ msgstr "Pārvaldīt iecienītās istabas" #: ../src/empathy-event-manager.c:339 msgid "Incoming video call" -msgstr "Ienākošs video zvans" +msgstr "Ienākošais video zvans" #: ../src/empathy-event-manager.c:339 msgid "Incoming call" @@ -2896,23 +2889,23 @@ msgstr "Avots" msgid "%s account" msgstr "%s konts" -#: ../src/empathy-main-window.c:437 +#: ../src/empathy-main-window.c:438 msgid "Reconnect" msgstr "Savienoties atkal" -#: ../src/empathy-main-window.c:443 +#: ../src/empathy-main-window.c:444 msgid "Edit Account" msgstr "Rediģēt kontu" -#: ../src/empathy-main-window.c:449 +#: ../src/empathy-main-window.c:450 msgid "Close" msgstr "Aizvērt" -#: ../src/empathy-main-window.c:1033 +#: ../src/empathy-main-window.c:1034 msgid "Contact" msgstr "Kontakts" -#: ../src/empathy-main-window.c:1414 +#: ../src/empathy-main-window.c:1415 msgid "Show and edit accounts" msgstr "Rādīt un labot kontus" @@ -3000,17 +2993,17 @@ msgstr "_Personīgā informācija" msgid "_Room" msgstr "_Istaba" -#: ../src/empathy-new-chatroom-dialog.c:338 +#: ../src/empathy-new-chatroom-dialog.c:382 msgid "Chat Room" msgstr "Tērzēšanas istaba" -#: ../src/empathy-new-chatroom-dialog.c:354 +#: ../src/empathy-new-chatroom-dialog.c:398 msgid "Members" msgstr "Dalībnieki" #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, #. yes/no, yes/no and a number. -#: ../src/empathy-new-chatroom-dialog.c:539 +#: ../src/empathy-new-chatroom-dialog.c:606 #, c-format msgid "" "<b>%s</b>\n" @@ -3023,22 +3016,22 @@ msgstr "" "Nepieciešama parole: %s\n" "Dalībnieki: %s" -#: ../src/empathy-new-chatroom-dialog.c:541 -#: ../src/empathy-new-chatroom-dialog.c:542 +#: ../src/empathy-new-chatroom-dialog.c:608 +#: ../src/empathy-new-chatroom-dialog.c:609 msgid "No" msgstr "Nē" -#: ../src/empathy-new-chatroom-dialog.c:569 +#: ../src/empathy-new-chatroom-dialog.c:636 msgid "Could not start room listing" -msgstr "Nevarēju palaist istabu izdruku" +msgstr "Neizdevās palaist istabu izdruku" -#: ../src/empathy-new-chatroom-dialog.c:579 +#: ../src/empathy-new-chatroom-dialog.c:646 msgid "Could not stop room listing" -msgstr "Nevarēju apstādināt istabu izdruku" +msgstr "Neizdevās apstādināt istabu izdruku" #: ../src/empathy-new-chatroom-dialog.ui.h:2 msgid "Couldn't load room list" -msgstr "Nevarēju ielādēt istabu sarakstu" +msgstr "Neizdevās ielādēt istabu sarakstu" #: ../src/empathy-new-chatroom-dialog.ui.h:3 msgid "" @@ -3230,7 +3223,7 @@ msgstr "_Parādīt kontaktiem atrašanās vietu" msgid "_Reduce location accuracy" msgstr "Samazināt atrašanās vietas p_recizitāti" -#: ../src/empathy-status-icon.c:176 +#: ../src/empathy-status-icon.c:153 msgid "Respond" msgstr "Atbildēt" @@ -3342,12 +3335,10 @@ msgid "- Empathy Accounts" msgstr " - Empathy konti" #: ../src/empathy-accounts.c:247 -#| msgid "- Empathy Accounts" msgid "Empathy Accounts" msgstr "Empathy konti" #: ../src/empathy-debugger.c:40 -#| msgid "Empathy" msgid "Empathy Debugger" msgstr "Empathy atkļūdotājs" diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 3a6bf0ae4..9b818bc4c 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -792,22 +792,32 @@ main_window_view_contacts_list_size_cb (GtkRadioAction *action, GtkRadioAction *current, EmpathyMainWindow *window) { - gint value; + GSettings *gsettings_ui; + gint value; value = gtk_radio_action_get_current_value (action); + /* create a new GSettings, so we can delay the setting until both + * values are set */ + gsettings_ui = g_settings_new (EMPATHY_PREFS_UI_SCHEMA); - g_settings_set_boolean (window->gsettings_ui, + DEBUG ("radio button toggled, value = %i", value); + + g_settings_delay (gsettings_ui); + g_settings_set_boolean (gsettings_ui, EMPATHY_PREFS_UI_SHOW_AVATARS, value == CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS); - g_settings_set_boolean (window->gsettings_ui, + g_settings_set_boolean (gsettings_ui, EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST, value == CONTACT_LIST_COMPACT_SIZE); + g_settings_apply (gsettings_ui); empathy_contact_list_store_set_show_avatars (window->list_store, value == CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS); empathy_contact_list_store_set_is_compact (window->list_store, value == CONTACT_LIST_COMPACT_SIZE); + + g_object_unref (gsettings_ui); } static void main_window_notify_show_protocols_cb (GSettings *gsettings, @@ -825,7 +835,7 @@ main_window_notify_contact_list_size_cb (GSettings *gsettings, const gchar *key, EmpathyMainWindow *window) { - gint value = CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS; + gint value; if (g_settings_get_boolean (gsettings, EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST)) { @@ -837,6 +847,8 @@ main_window_notify_contact_list_size_cb (GSettings *gsettings, value = CONTACT_LIST_NORMAL_SIZE; } + DEBUG ("setting changed, value = %i", value); + /* By changing the value of the GtkRadioAction, it emits a signal that calls main_window_view_contacts_list_size_cb which updates the contacts list */ @@ -1536,6 +1548,8 @@ empathy_main_window_show (void) EMPATHY_LIVE_SEARCH (window->search_bar)); gtk_box_pack_start (GTK_BOX (window->main_vbox), window->search_bar, FALSE, TRUE, 0); + g_signal_connect_swapped (window->window, "map", + G_CALLBACK (gtk_widget_grab_focus), window->list_view); /* Load user-defined accelerators. */ main_window_accels_load (); diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c index 50b5f5d82..8d954aa85 100644 --- a/src/empathy-new-chatroom-dialog.c +++ b/src/empathy-new-chatroom-dialog.c @@ -731,6 +731,8 @@ new_chatroom_dialog_join (EmpathyNewChatroomDialog *dialog) room_name = g_strdup (room); } + g_strstrip (room_name); + DEBUG ("Requesting channel for '%s'", room_name); empathy_dispatcher_join_muc (connection, room_name, gtk_get_current_event_time (), NULL, NULL); diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c index 8192049e7..4460d6f85 100644 --- a/src/empathy-preferences.c +++ b/src/empathy-preferences.c @@ -786,7 +786,7 @@ preferences_themes_setup (EmpathyPreferences *preferences) G_CALLBACK (preferences_theme_changed_cb), preferences); - /* Select the theme from the gconf key and track changes */ + /* Select the theme from the GSetting key and track changes */ preferences_theme_notify_cb (preferences->gsettings_chat, EMPATHY_PREFS_CHAT_THEME, preferences); diff --git a/tests/empathy-chatroom-manager-test.c b/tests/empathy-chatroom-manager-test.c index 3d6b6f6b7..b79e898d0 100644 --- a/tests/empathy-chatroom-manager-test.c +++ b/tests/empathy-chatroom-manager-test.c @@ -3,8 +3,6 @@ #include <string.h> #include <glib/gstdio.h> -#include <gconf/gconf.h> -#include <gconf/gconf-client.h> #include <telepathy-glib/account-manager.h> #include <telepathy-glib/util.h> diff --git a/tests/test-helper.c b/tests/test-helper.c index d51d22a52..ca763adb4 100644 --- a/tests/test-helper.c +++ b/tests/test-helper.c @@ -77,106 +77,3 @@ copy_xml_file (const gchar *orig, g_free (buffer); } -#if 0 -EmpathyAccount * -get_test_account (void) -{ - McProfile *profile; - EmpathyAccountManager *account_manager; - EmpathyAccount *account; - GList *accounts; - - account_manager = empathy_account_manager_dup_singleton (); - profile = mc_profile_lookup ("test"); - accounts = mc_accounts_list_by_profile (profile); - if (g_list_length (accounts) == 0) - { - /* need to create a test account */ - account = empathy_account_manager_create_by_profile (account_manager, - profile); - } - else - { - /* reuse an existing test account */ - McAccount *mc_account; - mc_account = accounts->data; - account = empathy_account_manager_lookup (account_manager, - mc_account_get_unique_name (mc_account)); - } - g_object_unref (account_manager); - - g_object_unref (profile); - - return account; -} - -/* Not used for now as there is no API to remove completely gconf keys. - * So we reuse existing accounts instead of creating new ones */ -void -destroy_test_account (EmpathyAccount *account) -{ - GConfClient *client; - gchar *path; - GError *error = NULL; - GSList *entries = NULL, *l; - EmpathyAccountManager *manager; - - client = gconf_client_get_default (); - path = g_strdup_printf ("/apps/telepathy/mc/accounts/%s", - empathy_account_get_unique_name (account)); - - entries = gconf_client_all_entries (client, path, &error); - if (error != NULL) - { - g_print ("failed to list entries in %s: %s\n", path, error->message); - g_error_free (error); - error = NULL; - } - - for (l = entries; l != NULL; l = g_slist_next (l)) - { - GConfEntry *entry = l->data; - - if (g_str_has_suffix (entry->key, "data_dir")) - { - gchar *dir; - - dir = gconf_client_get_string (client, entry->key, &error); - if (error != NULL) - { - g_print ("get data_dir string failed: %s\n", entry->key); - g_error_free (error); - error = NULL; - } - else - { - if (g_rmdir (dir) != 0) - g_print ("can't remove %s\n", dir); - } - - g_free (dir); - } - - /* FIXME: this doesn't remove the key */ - gconf_client_unset (client, entry->key, &error); - if (error != NULL) - { - g_print ("unset of %s failed: %s\n", path, error->message); - g_error_free (error); - error = NULL; - } - - gconf_entry_unref (entry); - } - - g_slist_free (entries); - - g_object_unref (client); - g_free (path); - - manager = empathy_account_manager_dup_singleton (); - empathy_account_manager_remove (manager, account); - g_object_unref (account); - g_object_unref (manager); -} -#endif |