# HG changeset patch # User Mark Doliner # Date 1177050850 0 # Node ID d7e385be03463d3aa29231398ee916369a2180da # Parent 31dad9806e9d041a9e4c4dbbba2255cf5d75e262# Parent 9a4854d71234de693fd4f10e20b00a6537532801 merge of 'eab57450eff9fe8f08a5a0c429d0f2727ce8d297' and 'f723520deba5ec94d3c5eee87e935e88acf54164' diff -r 31dad9806e9d -r d7e385be0346 .todo --- a/.todo Fri Apr 20 06:21:52 2007 +0000 +++ b/.todo Fri Apr 20 06:34:10 2007 +0000 @@ -3,23 +3,5 @@ Gaim TODO List - - WinGaim specific stuff - - wingaim: Gtk windows that appear when you hover over a button, and just stay there and never close until you click on them once - - - with 3 or more tabs, only the right most tab is closable. this appears to be a gtk for win32 problem - - - wingaim font issues - - - wingaim: sounds while away? - - - Write a seperate program that implements multiple-users. It should encrypt/decrypt .gaimrc's based on a provided password, then launch gaim -f, with that .gaimrc. - - diff -r 31dad9806e9d -r d7e385be0346 libpurple/example/Makefile.am --- a/libpurple/example/Makefile.am Fri Apr 20 06:21:52 2007 +0000 +++ b/libpurple/example/Makefile.am Fri Apr 20 06:34:10 2007 +0000 @@ -1,4 +1,4 @@ -bin_PROGRAMS = nullclient +noinst_PROGRAMS = nullclient nullclient_SOURCES = defines.h nullclient.c nullclient_DEPENDENCIES = diff -r 31dad9806e9d -r d7e385be0346 pidgin.spec.in --- a/pidgin.spec.in Fri Apr 20 06:21:52 2007 +0000 +++ b/pidgin.spec.in Fri Apr 20 06:34:10 2007 +0000 @@ -18,7 +18,7 @@ Name: @PACKAGE@ Version: %pidginver Release: 0%{?beta:.beta%{beta}} -Epoch: 0 +Epoch: 2 License: GPL Group: Applications/Internet URL: http://pidgin.im/ @@ -72,7 +72,8 @@ %package devel Summary: Development headers, documentation, and libraries for Pidgin Group: Applications/Internet -Requires: pkgconfig, pidgin = %{epoch}:%{version}, libpurple-devel = %{epoch}:%{version} +Requires: pidgin = %{epoch}:%{version}, libpurple-devel = %{epoch}:%{version} +Requires: pkgconfig Obsoletes: gaim-devel %package -n libpurple @@ -86,6 +87,7 @@ Summary: Development headers, documentation, and libraries for libpurple Group: Applications/Internet Requires: libpurple = %{epoch}:%{version} +Requires: pkgconfig %if 0%{?_with_howl:1} || 0%{?_with_avahi:1} %package -n libpurple-bonjour @@ -118,6 +120,7 @@ Summary: Headers etc. for finch stuffs Group: Applications/Internet Requires: finch = %{epoch}:%{version}, libpurple-devel = %{epoch}:%{version} +Requires: pkgconfig %endif %description @@ -228,8 +231,6 @@ rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' -# do we want to ship the nullclient ? -rm -f $RPM_BUILD_ROOT%{_bindir}/nullclient rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/gaim.svg %if 0%{!?_with_howl:1} && 0%{!?_with_avahi:1} @@ -297,7 +298,10 @@ %{_sysconfdir}/gconf/schemas/purple.schemas > /dev/null || : killall -HUP gconfd-2 || : fi -/sbin/ldconfig + +%post -n libpurple -p /sbin/ldconfig + +%post -n finch -p /sbin/ldconfig %preun if [ "$1" -eq 0 -a -n "`which gconftool-2 2>/dev/null`" ]; then @@ -307,7 +311,9 @@ killall -HUP gconfd-2 || : fi -%postun -p /sbin/ldconfig +%postun -n libpurple -p /sbin/ldconfig + +%postun -n finch -p /sbin/ldconfig %files -f %{name}-%{version}-pidginplugins %defattr(-, root, root) @@ -330,7 +336,6 @@ %{_bindir}/pidgin %{_datadir}/pixmaps/pidgin -%{_datadir}/pixmaps/pidgin.svg %dir %{_datadir}/sounds/pidgin %{_datadir}/sounds/pidgin/* %{_datadir}/applications/* @@ -427,6 +432,12 @@ %endif %changelog +* Thu Apr 19 2007 Stu Tomlinson +- Fix pkgconfig Requires +- Add ldconfig in pre/post scripts for libpurple & finch +- Bump Epoch to 2 because Fedora unfortunately forgot to drop the Epoch + during the rename :( + * Tue Apr 17 2007 Stu Tomlinson - Add some Obsolete:s to help upgrades - Remove explicit Packager: %%{packager} from spec, it was redundant diff -r 31dad9806e9d -r d7e385be0346 pidgin/gtkaccount.c --- a/pidgin/gtkaccount.c Fri Apr 20 06:21:52 2007 +0000 +++ b/pidgin/gtkaccount.c Fri Apr 20 06:34:10 2007 +0000 @@ -229,11 +229,9 @@ if (pixbuf == NULL) { /* Show a placeholder icon */ - gchar *filename; - filename = g_build_filename(DATADIR, "pixmaps", - "pidgin", "insert-image.png", NULL); - pixbuf = gdk_pixbuf_new_from_file(filename, NULL); - g_free(filename); + GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); + pixbuf = gtk_widget_render_icon(dialog->window, PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, + icon_size, "PidginAccount"); } gtk_image_set_from_pixbuf(GTK_IMAGE(dialog->icon_entry), pixbuf); diff -r 31dad9806e9d -r d7e385be0346 pidgin/gtkblist.c --- a/pidgin/gtkblist.c Fri Apr 20 06:21:52 2007 +0000 +++ b/pidgin/gtkblist.c Fri Apr 20 06:34:10 2007 +0000 @@ -312,6 +312,47 @@ gtk_blist_join_chat(chat); } +static void gtk_blist_renderer_editing_started_cb(GtkCellRenderer *renderer, + GtkCellEditable *editable, + gchar *path_str, + gpointer user_data) +{ + GtkTreeIter iter; + GtkTreePath *path = NULL; + GValue val; + PurpleBlistNode *node; + const char *text = NULL; + char *esc; + + path = gtk_tree_path_new_from_string (path_str); + gtk_tree_model_get_iter (GTK_TREE_MODEL(gtkblist->treemodel), &iter, path); + gtk_tree_path_free (path); + val.g_type = 0; + gtk_tree_model_get_value (GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &val); + node = g_value_get_pointer(&val); + + switch (node->type) { + case PURPLE_BLIST_CONTACT_NODE: + text = purple_contact_get_alias((PurpleContact *)node); + break; + case PURPLE_BLIST_BUDDY_NODE: + text = purple_buddy_get_alias((PurpleBuddy *)node); + break; + case PURPLE_BLIST_GROUP_NODE: + text = ((PurpleGroup *)node)->name; + break; + default: + g_return_if_reached(); + } + + esc = g_markup_escape_text(text, -1); + if (GTK_IS_ENTRY (editable)) { + GtkEntry *entry = GTK_ENTRY (editable); + gtk_entry_set_text(entry, esc); + } + g_free(esc); +} + static void gtk_blist_renderer_edited_cb(GtkCellRendererText *text_rend, char *arg1, char *arg2, gpointer nada) { @@ -371,8 +412,6 @@ { GtkTreeIter iter; GtkTreePath *path; - const char *text = NULL; - char *esc; if (!(get_iter_from_node(node, &iter))) { /* This is either a bug, or the buddy is in a collapsed contact */ @@ -382,27 +421,6 @@ return; } - switch (node->type) { - case PURPLE_BLIST_BUDDY_NODE: - text = purple_buddy_get_alias((PurpleBuddy *)node); - break; - case PURPLE_BLIST_CONTACT_NODE: - text = purple_contact_get_alias((PurpleContact *)node); - break; - case PURPLE_BLIST_GROUP_NODE: - text = ((PurpleGroup *)node)->name; - break; - case PURPLE_BLIST_CHAT_NODE: - text = purple_chat_get_name((PurpleChat *)node); - break; - default: - g_return_if_reached(); - } - - esc = g_markup_escape_text(text, -1); - gtk_tree_store_set(gtkblist->treemodel, &iter, NAME_COLUMN, esc, -1); - g_free(esc); - path = gtk_tree_model_get_path(GTK_TREE_MODEL(gtkblist->treemodel), &iter); g_object_set(G_OBJECT(gtkblist->text_rend), "editable", TRUE, NULL); gtk_tree_view_set_enable_search (GTK_TREE_VIEW(gtkblist->treeview), FALSE); @@ -4402,6 +4420,7 @@ #endif "markup", NAME_COLUMN, NULL); + g_signal_connect(G_OBJECT(rend), "editing-started", G_CALLBACK(gtk_blist_renderer_editing_started_cb), NULL); g_signal_connect(G_OBJECT(rend), "edited", G_CALLBACK(gtk_blist_renderer_edited_cb), NULL); g_object_set(rend, "ypad", 0, "yalign", 0.5, NULL); #if GTK_CHECK_VERSION(2,6,0) diff -r 31dad9806e9d -r d7e385be0346 pidgin/gtkconv.c --- a/pidgin/gtkconv.c Fri Apr 20 06:21:52 2007 +0000 +++ b/pidgin/gtkconv.c Fri Apr 20 06:34:10 2007 +0000 @@ -4773,6 +4773,9 @@ if (gtkconv->u.im->anim != NULL) g_object_unref(G_OBJECT(gtkconv->u.im->anim)); + if (gtkconv->u.im->typing_timer != 0) + g_source_remove(gtkconv->u.im->typing_timer); + g_free(gtkconv->u.im); } else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) { purple_signals_disconnect_by_handle(gtkconv->u.chat); diff -r 31dad9806e9d -r d7e385be0346 pidgin/gtkstatusbox.c --- a/pidgin/gtkstatusbox.c Fri Apr 20 06:21:52 2007 +0000 +++ b/pidgin/gtkstatusbox.c Fri Apr 20 06:34:10 2007 +0000 @@ -2042,11 +2042,10 @@ if (status_box->buddy_icon == NULL) { /* Show a placeholder icon */ - gchar *filename; - filename = g_build_filename(DATADIR, "pixmaps", - "pidgin", "insert-image.png", NULL); - status_box->buddy_icon = gdk_pixbuf_new_from_file(filename, NULL); - g_free(filename); + GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); + status_box->buddy_icon = gtk_widget_render_icon(GTK_WIDGET(status_box), + PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, + icon_size, "PidginStatusBox"); } if (status_box->buddy_icon != NULL) { diff -r 31dad9806e9d -r d7e385be0346 pidgin/pidginstock.c --- a/pidgin/pidginstock.c Fri Apr 20 06:21:52 2007 +0000 +++ b/pidgin/pidginstock.c Fri Apr 20 06:34:10 2007 +0000 @@ -46,11 +46,6 @@ { PIDGIN_STOCK_CHAT, NULL, GTK_STOCK_JUMP_TO }, { PIDGIN_STOCK_CLEAR, NULL, GTK_STOCK_CLEAR }, { PIDGIN_STOCK_CLOSE_TABS, NULL, GTK_STOCK_CLOSE }, -#if GTK_CHECK_VERSION(2,6,0) - { PIDGIN_STOCK_CONNECT, NULL, GTK_STOCK_CONNECT }, -#else - { PIDGIN_STOCK_CONNECT, "icons", "stock_connect_16.png" }, -#endif { PIDGIN_STOCK_DEBUG, NULL, GTK_STOCK_PROPERTIES }, { PIDGIN_STOCK_DOWNLOAD, NULL, GTK_STOCK_GO_DOWN }, #if GTK_CHECK_VERSION(2,6,0) diff -r 31dad9806e9d -r d7e385be0346 pidgin/pixmaps/Makefile.am --- a/pidgin/pixmaps/Makefile.am Fri Apr 20 06:21:52 2007 +0000 +++ b/pidgin/pixmaps/Makefile.am Fri Apr 20 06:34:10 2007 +0000 @@ -3,7 +3,6 @@ EXTRA_DIST = \ about_menu.png \ edit.png \ - pidgin.svg \ logo.png \ pause.png \ arrow-down.xpm \ @@ -13,17 +12,9 @@ Makefile.mingw \ pidgin.ico - pidginbuttonpixdir = $(datadir)/pixmaps/pidgin/buttons pidginbuttonpix_DATA = about_menu.png edit.png pause.png pidgindistpixdir = $(datadir)/pixmaps/pidgin pidgindistpix_DATA = logo.png arrow-down.xpm arrow-left.xpm arrow-right.xpm arrow-up.xpm - -distpixmapdir = $(datadir)/pixmaps -distpixmap_DATA = pidgin.svg - - - - diff -r 31dad9806e9d -r d7e385be0346 pidgin/pixmaps/pidgin.svg --- a/pidgin/pixmaps/pidgin.svg Fri Apr 20 06:21:52 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,176 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r 31dad9806e9d -r d7e385be0346 pidgin/win32/gtkwin32dep.c --- a/pidgin/win32/gtkwin32dep.c Fri Apr 20 06:21:52 2007 +0000 +++ b/pidgin/win32/gtkwin32dep.c Fri Apr 20 06:34:10 2007 +0000 @@ -267,7 +267,7 @@ g_return_if_fail(GDK_WINDOW_TYPE(gdkwin) != GDK_WINDOW_CHILD); if(GDK_WINDOW_DESTROYED(gdkwin)) - return; + return; if(MyFlashWindowEx) { FLASHWINFO info; @@ -308,6 +308,10 @@ } window = GTK_WINDOW(win->window); + /* Don't flash if the window is in the foreground */ + if (GetForegroundWindow() == GDK_WINDOW_HWND(GTK_WIDGET(window)->window)) + return; + winpidgin_window_flash(window, TRUE); /* Stop flashing when window receives focus */ g_signal_connect(G_OBJECT(window), "focus-in-event", diff -r 31dad9806e9d -r d7e385be0346 po/id.po --- a/po/id.po Fri Apr 20 06:21:52 2007 +0000 +++ b/po/id.po Fri Apr 20 06:34:10 2007 +0000 @@ -1,14965 +1,14965 @@ -# Gaim Indonesian (id) translations -# Copyright (C) 2007 Rai S. Regawa -# -# This file is distributed under the same license as the Gaim package. -# -msgid "" -msgstr "" -"Project-Id-Version: Gaim 1.1.3\\n" -"Report-Msgid-Bugs-To: \\n" -"POT-Creation-Date: 2007-03-10 14:10+0000\\n" -"PO-Revision-Date: 2007-03-10 14:10+0000\\n" -"Last-Translator: Rai S. Regawa \\n" -"Language-Team: \\n" -"MIME-Version: 1.0\\n" -"Content-Type: text/plain; charset=iso-8859-1\\n" -"Content-Transfer-Encoding: 8bit\\n" -"Plural-Forms: nplurals=2; plural=n>1;\\n" - -#: ../gaim.desktop.in.h:1 -msgid "Gaim Internet Messenger" -msgstr "Pengirim Pesan Internet Gaim" - -#: ../gaim.desktop.in.h:2 -msgid "Internet Messenger" -msgstr "Pengirim Pesan Internet" - -#: ../gaim.desktop.in.h:3 -msgid "Send instant messages over multiple protocols" -msgstr "Kirim pesan-pesan instan memalui banyak protokol" - -#: ../console/gntaccount.c:119 ../console/gntblist.c:272 -#: ../console/gntblist.c:390 ../console/gntblist.c:403 -#: ../console/gntplugin.c:154 ../console/gntplugin.c:199 -#: ../console/gntstatus.c:291 ../console/gntstatus.c:299 -#: ../libgaim/protocols/jabber/buddy.c:1399 -#: ../libgaim/protocols/jabber/chat.c:679 -#: ../libgaim/protocols/jabber/chat.c:690 -#: ../libgaim/protocols/jabber/jabber.c:1210 -#: ../libgaim/protocols/qq/group_join.c:324 -#: ../libgaim/protocols/silc/ops.c:1451 -msgid "Error" -msgstr "Kesalahan" - -#: ../console/gntaccount.c:119 -msgid "Account was not added" -msgstr "Akun tidak ditambahkan" - -#: ../console/gntaccount.c:120 -msgid "Screenname of an account must be non-empty." -msgstr "Nama layar dari sebuah akun tidak boleh kosong." - -#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:567 -msgid "New mail notifications" -msgstr "Pemberitahuan email baru" - -#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:496 -msgid "Remember password" -msgstr "Ingat kata sandi" - -#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1430 ../gtk/gtkblist.c:3868 -msgid "Modify Account" -msgstr "Modifikasi Akun" - -#: ../console/gntaccount.c:474 -msgid "New Account" -msgstr "Akun Baru" - -#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:407 ../gtk/gtkft.c:695 -msgid "Protocol:" -msgstr "Protokol:" - -#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:412 ../gtk/gtkblist.c:5229 -#: ../gtk/plugins/gevolution/new_person_dialog.c:295 -msgid "Screen name:" -msgstr "Nama layar:" - -#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:487 -msgid "Password:" -msgstr "Kata Sandi:" - -#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:5250 ../gtk/gtkblist.c:5613 -msgid "Alias:" -msgstr "Nama Alias:" - -#. Cancel -#: ../console/gntaccount.c:554 ../console/gntaccount.c:615 -#: ../console/gntaccount.c:834 ../console/gntblist.c:313 -#: ../console/gntblist.c:380 ../console/gntblist.c:413 -#: ../console/gntblist.c:737 ../console/gntblist.c:906 -#: ../console/gntblist.c:997 ../console/gntblist.c:2021 -#: ../console/gntprefs.c:224 ../console/gntstatus.c:139 -#: ../console/gntstatus.c:472 ../console/gntstatus.c:597 -#: ../gtk/gtkaccount.c:1866 ../gtk/gtkaccount.c:2433 ../gtk/gtkblist.c:5669 -#: ../gtk/gtkdialogs.c:685 ../gtk/gtkdialogs.c:822 ../gtk/gtkdialogs.c:913 -#: ../gtk/gtkdialogs.c:932 ../gtk/gtkdialogs.c:954 ../gtk/gtkdialogs.c:974 -#: ../gtk/gtkdialogs.c:1018 ../gtk/gtkdialogs.c:1056 ../gtk/gtkdialogs.c:1110 -#: ../gtk/gtkdialogs.c:1147 ../gtk/gtkdialogs.c:1172 -#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:286 -#: ../gtk/gtkpounce.c:1098 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579 -#: ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615 ../gtk/gtkrequest.c:270 -#: ../gtk/gtksavedstatuses.c:336 ../libgaim/account.c:961 -#: ../libgaim/account.c:1149 ../libgaim/account.c:1183 -#: ../libgaim/conversation.c:1164 ../libgaim/plugins/buddynote.c:51 -#: ../libgaim/protocols/gg/gg.c:498 ../libgaim/protocols/gg/gg.c:656 -#: ../libgaim/protocols/gg/gg.c:792 ../libgaim/protocols/gg/gg.c:871 -#: ../libgaim/protocols/jabber/buddy.c:588 -#: ../libgaim/protocols/jabber/buddy.c:1761 -#: ../libgaim/protocols/jabber/buddy.c:1795 -#: ../libgaim/protocols/jabber/chat.c:788 -#: ../libgaim/protocols/jabber/jabber.c:861 -#: ../libgaim/protocols/jabber/jabber.c:1365 -#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:249 -#: ../libgaim/protocols/msn/msn.c:264 ../libgaim/protocols/msn/msn.c:279 -#: ../libgaim/protocols/msn/msn.c:294 ../libgaim/protocols/msn/msn.c:311 -#: ../libgaim/protocols/oscar/oscar.c:6043 -#: ../libgaim/protocols/oscar/peer.c:1021 -#: ../libgaim/protocols/qq/buddy_info.c:484 -#: ../libgaim/protocols/qq/buddy_opt.c:212 -#: ../libgaim/protocols/qq/buddy_opt.c:402 ../libgaim/protocols/qq/group.c:124 -#: ../libgaim/protocols/qq/group_join.c:138 -#: ../libgaim/protocols/qq/group_join.c:359 -#: ../libgaim/protocols/qq/group_opt.c:142 -#: ../libgaim/protocols/qq/group_opt.c:392 -#: ../libgaim/protocols/qq/sys_msg.c:104 ../libgaim/protocols/qq/sys_msg.c:159 -#: ../libgaim/protocols/qq/sys_msg.c:247 -#: ../libgaim/protocols/sametime/sametime.c:3410 -#: ../libgaim/protocols/sametime/sametime.c:3495 -#: ../libgaim/protocols/sametime/sametime.c:3665 -#: ../libgaim/protocols/sametime/sametime.c:5409 -#: ../libgaim/protocols/sametime/sametime.c:5498 -#: ../libgaim/protocols/sametime/sametime.c:5622 -#: ../libgaim/protocols/silc/buddy.c:467 -#: ../libgaim/protocols/silc/buddy.c:1078 -#: ../libgaim/protocols/silc/buddy.c:1183 -#: ../libgaim/protocols/silc/chat.c:597 -#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1912 -#: ../libgaim/protocols/silc/silc.c:750 ../libgaim/protocols/silc/silc.c:955 -#: ../libgaim/protocols/yahoo/yahoo.c:961 -#: ../libgaim/protocols/yahoo/yahoo.c:3208 -#: ../libgaim/protocols/yahoo/yahoo.c:3217 -msgid "Cancel" -msgstr "Batalkan" - -#. Save -#: ../console/gntaccount.c:558 ../console/gntprefs.c:224 -#: ../console/gntstatus.c:475 ../console/gntstatus.c:585 ../gtk/gtkdebug.c:762 -#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1182 -#: ../libgaim/plugins/buddynote.c:50 ../libgaim/protocols/jabber/buddy.c:587 -msgid "Save" -msgstr "Simpan" - -#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1860 -#: ../gtk/gtksavedstatuses.c:328 -#, c-format -msgid "Are you sure you want to delete %s?" -msgstr "Apakah anda yakin ingin menghapus %s?" - -#. Close any other opened delete window -#: ../console/gntaccount.c:614 -msgid "Delete Account" -msgstr "Hapus Akun" - -#: ../console/gntaccount.c:615 ../console/gntaccount.c:681 -#: ../console/gntstatus.c:139 ../console/gntstatus.c:201 -#: ../gtk/gtkaccount.c:1865 ../gtk/gtkpounce.c:1097 ../gtk/gtkrequest.c:273 -#: ../gtk/gtksavedstatuses.c:335 -msgid "Delete" -msgstr "Hapus" - -#: ../console/gntaccount.c:644 ../console/gntblist.c:1927 -#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2259 ../gtk/gtkdocklet.c:543 -msgid "Accounts" -msgstr "Akun-akun" - -#: ../console/gntaccount.c:650 -msgid "You can enable/disable accounts from the following list." -msgstr "Anda dapat mengaktifkan/menonaktifkan akun-akun dari daftar berikut." - -#: ../console/gntaccount.c:673 ../console/gntaccount.c:833 -#: ../console/gntblist.c:313 ../console/gntblist.c:380 -#: ../console/gntblist.c:413 ../console/gntnotify.c:309 -#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2432 ../gtk/gtkblist.c:5668 -#: ../gtk/gtkconv.c:1654 ../gtk/gtkrequest.c:274 -#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/qq/sys_msg.c:104 -#: ../libgaim/protocols/qq/sys_msg.c:159 ../libgaim/protocols/qq/sys_msg.c:247 -#: ../libgaim/protocols/sametime/sametime.c:5497 -#: ../libgaim/protocols/silc/chat.c:596 -msgid "Add" -msgstr "Tambahkan" - -#: ../console/gntaccount.c:677 -msgid "Modify" -msgstr "Modifikasi" - -#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2379 -#, c-format -msgid "%s%s%s%s has made %s his or her buddy%s%s" -msgstr "%s%s%s%s telah menjadikan %s sebagai temannya%s%s" - -#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2431 -msgid "Add buddy to your list?" -msgstr "Tambahkan teman kepada daftar anda?" - -#: ../console/gntblist.c:264 -msgid "You must provide a screename for the buddy." -msgstr "Anda harus menyediakan nama layar untuk teman ini." - -#: ../console/gntblist.c:266 -msgid "You must provide a group." -msgstr "Anda harus menyediakan sebuah kelompok." - -#: ../console/gntblist.c:268 -msgid "You must select an account." -msgstr "Anda harus pilih sebuah akun." - -#: ../console/gntblist.c:272 -msgid "Error adding buddy" -msgstr "Kesalahan dalam menambahkan teman" - -#: ../console/gntblist.c:297 ../gtk/gtkaccount.c:1941 -#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/oscar/oscar.c:2849 -msgid "Screen Name" -msgstr "Nama Layar" - -#: ../console/gntblist.c:300 ../console/gntblist.c:372 ../gtk/gtkdialogs.c:931 -#: ../gtk/gtkdialogs.c:953 ../gtk/gtkdialogs.c:973 ../gtk/gtkrequest.c:277 -#: ../libgaim/protocols/msn/msn.c:1362 ../libgaim/protocols/silc/chat.c:587 -#: ../libgaim/protocols/yahoo/yahoo_profile.c:680 -#: ../libgaim/protocols/zephyr/zephyr.c:789 -#: ../libgaim/protocols/zephyr/zephyr.c:1207 -msgid "Alias" -msgstr "Nama Alias" - -#: ../console/gntblist.c:303 ../console/gntblist.c:375 -msgid "Group" -msgstr "Kelompok" - -#: ../console/gntblist.c:306 -#: ../console/gntblist.c:363 -#: ../console/gntblist.c:1166 ../console/gntnotify.c:155 -#: ../console/gntstatus.c:563 ../gtk/gtkblist.c:2710 ../gtk/gtknotify.c:467 -#: ../gtk/gtkpounce.c:1265 ../gtk/plugins/gevolution/gevolution.c:444 -#: ../libgaim/plugins/idle.c:153 ../libgaim/plugins/idle.c:189 -msgid "Account" -msgstr "Akun" - -#: ../console/gntblist.c:312 ../console/gntblist.c:784 ../gtk/gtkblist.c:5183 -#: ../gtk/plugins/gevolution/add_buddy_dialog.c:447 -#: ../libgaim/protocols/silc/buddy.c:736 -#: ../libgaim/protocols/silc/buddy.c:1030 -#: ../libgaim/protocols/silc/buddy.c:1075 -#: ../libgaim/protocols/silc/buddy.c:1174 -#: ../libgaim/protocols/yahoo/yahoo.c:3122 -msgid "Add Buddy" -msgstr "Tambahkan Teman" - -#: ../console/gntblist.c:312 -msgid "Please enter buddy information." -msgstr "Mohon masukkan informasi teman." - -#: ../console/gntblist.c:335 ../libgaim/blist.c:1195 -msgid "Chats" -msgstr "Percakapan-percakapan" - -#. Extract their Name and put it in -#: ../console/gntblist.c:369 ../gtk/gtkplugin.c:579 ../gtk/gtkroomlist.c:621 -#: ../gtk/plugins/gevolution/add_buddy_dialog.c:132 -#: ../gtk/plugins/gevolution/assoc-buddy.c:123 -#: ../libgaim/protocols/jabber/jabber.c:792 -#: ../libgaim/protocols/msn/msn.c:1535 ../libgaim/protocols/msn/msn.c:1600 -#: ../libgaim/protocols/msn/msn.c:1627 ../libgaim/protocols/qq/buddy_info.c:44 -msgid "Name" -msgstr "Nama" - -#: ../console/gntblist.c:378 ../console/gntblist.c:786 ../gtk/gtkblist.c:5559 -msgid "Add Chat" -msgstr "Tambahkan Percakapan" - -#: ../console/gntblist.c:379 -msgid "You can edit more information from the context menu later." -msgstr "Anda dapat menambahkan lebih banyak informasi dari menu konteks belakangan." - -#: ../console/gntblist.c:390 ../console/gntblist.c:403 -msgid "Error adding group" -msgstr "Kesalahan dalam menambahkan kelompok" - -#: ../console/gntblist.c:391 -msgid "You must give a name for the group to add." -msgstr "Anda harus memberikan sebuah nama untuk dapat menambahkan kelompok." - -#: ../console/gntblist.c:404 -msgid "A group with the name already exists." -msgstr "Kelompok dengan nama tersebut sudah ada." - -#: ../console/gntblist.c:411 ../console/gntblist.c:788 ../gtk/gtkblist.c:5665 -#: ../libgaim/protocols/sametime/sametime.c:5408 -#: ../libgaim/protocols/sametime/sametime.c:5495 -msgid "Add Group" -msgstr "Tambahkan Kelompok" - -#: ../console/gntblist.c:411 -msgid "Enter the name of the group" -msgstr "Masukan nama dari kelompok tersebut" - -#: ../console/gntblist.c:736 -msgid "Edit Chat" -msgstr "Rubah Percakapan" - -#: ../console/gntblist.c:736 -msgid "Please Update the necessary fields." -msgstr "Mohon perbaharui bagian yang diperlukan." - -#: ../console/gntblist.c:737 ../console/gntstatus.c:196 -msgid "Edit" -msgstr "Rubah" - -#: ../console/gntblist.c:751 -msgid "Auto-join" -msgstr "Gabung-Otomatis" - -#: ../console/gntblist.c:760 -msgid "Edit Settings" -msgstr "Rubah Pengaturan" - -#: ../console/gntblist.c:806 ../libgaim/protocols/silc/chat.c:878 -msgid "Get Info" -msgstr "Dapatkan Info" - -#: ../console/gntblist.c:811 -msgid "Add Buddy Pounce" -msgstr "Tambahkan Peringatan Teman" - -#: ../console/gntblist.c:818 ../gtk/gtkconv.c:1602 -#: ../libgaim/protocols/oscar/oscar.c:633 -msgid "Send File" -msgstr "Kirim File" - -#: ../console/gntblist.c:822 -msgid "View Log" -msgstr "Lihat Log" - -#: ../console/gntblist.c:902 -#, c-format -msgid "Please enter the new name for %s" -msgstr "Mohon masukkan nama baru untuk %s" - -#: ../console/gntblist.c:904 ../console/gntblist.c:905 -#: ../console/gntblist.c:1116 -msgid "Rename" -msgstr "Ganti Nama" - -#: ../console/gntblist.c:904 -msgid "Enter empty string to reset the name." -msgstr "Masukkan string kosong untuk memperbaharui nama." - -#: ../console/gntblist.c:977 -msgid "Removing this contact will also remove all the buddies in the contact" -msgstr "Menghilangkan kontak ini akan juga menghilangkan semua teman dalam kontak tersebut" - -#: ../console/gntblist.c:985 -msgid "Removing this group will also remove all the buddies in the group" -msgstr "Menghilangkan kelompok ini akan juga menghilangkan semua teman dalam kelompok tersebut" - -#: ../console/gntblist.c:990 -#, c-format -msgid "Are you sure you want to remove %s?" -msgstr "Apakah anda yakin ingin menghilangkan %s?" - -#. XXX: anything to do with the returned ui-handle? -#: ../console/gntblist.c:993 -msgid "Confirm Remove" -msgstr "Konfirmasi Penghilangan" - -#: ../console/gntblist.c:996 ../console/gntblist.c:1118 ../gtk/gtkblist.c:1106 -#: ../gtk/gtkconv.c:1651 ../gtk/gtkrequest.c:275 ../gtk/gtkstatusbox.c:248 -msgid "Remove" -msgstr "Hilangkan" - -#. Buddy List -#: ../console/gntblist.c:1093 ../console/gntblist.c:2088 -#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:4091 -#: ../gtk/plugins/win32/winprefs/winprefs.c:327 -msgid "Buddy List" -msgstr "Daftar Teman" - -#: ../console/gntblist.c:1123 -msgid "Place tagged" -msgstr "Tempat sudah ditandai" - -#: ../console/gntblist.c:1128 -msgid "Toggle Tag" -msgstr "Bentuk Penanda" - -#. General -#: ../console/gntblist.c:1161 ../gtk/gtkblist.c:2734 -#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1035 -#: ../libgaim/protocols/gg/gg.c:1110 ../libgaim/protocols/gg/gg.c:2207 -#: ../libgaim/protocols/jabber/buddy.c:274 -#: ../libgaim/protocols/jabber/buddy.c:814 -#: ../libgaim/protocols/jabber/buddy.c:1562 -#: ../libgaim/protocols/jabber/buddy.c:1744 -#: ../libgaim/protocols/jabber/jabber.c:802 -#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1538 -#: ../libgaim/protocols/qq/buddy_info.c:43 -#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036 -#: ../libgaim/protocols/silc/ops.c:1179 ../libgaim/protocols/silc/ops.c:1328 -#: ../libgaim/protocols/yahoo/yahoo_profile.c:1042 -msgid "Nickname" -msgstr "Nama Panggilan" - -#. Idle stuff -#: ../console/gntblist.c:1181 ../gtk/gtkblist.c:2754 ../gtk/gtkblist.c:3307 -#: ../gtk/gtkprefs.c:1807 ../libgaim/protocols/bonjour/bonjour.c:333 -#: ../libgaim/protocols/jabber/buddy.c:645 -#: ../libgaim/protocols/jabber/buddy.c:683 ../libgaim/protocols/msn/msn.c:548 -#: ../libgaim/protocols/msn/state.c:32 -#: ../libgaim/protocols/novell/novell.c:2860 -#: ../libgaim/protocols/oscar/oscar.c:2873 -#: ../libgaim/protocols/yahoo/yahoo.c:2876 -#: ../libgaim/protocols/yahoo/yahoo_profile.c:686 -msgid "Idle" -msgstr "Diam/Tak Terpakai" - -#: ../console/gntblist.c:1270 -#, c-format -msgid "" -"Online: %d\\n" -"Total: %d" -msgstr "" -"Online: %d\\n" -"Total: %d" - -#: ../console/gntblist.c:1279 -#, c-format -msgid "Account: %s (%s)" -msgstr "Akun: %s (%s)" - -#: ../console/gntblist.c:1291 -#, c-format -msgid "" -"\\n" -"Last Seen: %s ago" -msgstr "" -"\\n" -"Terakhir Terlihat: %s yang lalu" - -#: ../console/gntblist.c:1540 ../gtk/gtkdocklet.c:491 -#: ../gtk/gtkstatusbox.c:1000 -msgid "New..." -msgstr "Baru..." - -#: ../console/gntblist.c:1547 ../gtk/gtkdocklet.c:492 -#: ../gtk/gtkstatusbox.c:1001 -msgid "Saved..." -msgstr "Tersimpan..." - -#: ../console/gntblist.c:1895 ../console/gntplugin.c:216 ../console/gntui.c:73 -#: ../gtk/gtkdocklet.c:544 ../gtk/gtkplugin.c:528 -msgid "Plugins" -msgstr "Plug-ins" - -#: ../console/gntblist.c:2002 ../gtk/gtkdialogs.c:666 ../gtk/gtkdialogs.c:803 -#: ../gtk/gtkdialogs.c:883 -msgid "_Name" -msgstr "_Nama" - -#: ../console/gntblist.c:2007 ../gtk/gtkdialogs.c:671 ../gtk/gtkdialogs.c:808 -#: ../gtk/gtkdialogs.c:888 -msgid "_Account" -msgstr "_Akun" - -#: ../console/gntblist.c:2015 ../gtk/gtkdialogs.c:679 -msgid "New Instant Message" -msgstr "Pesan Instan Baru" - -#: ../console/gntblist.c:2017 ../gtk/gtkdialogs.c:681 -msgid "" -"Please enter the screen name or alias of the person you would like to IM." -msgstr "" -"Mohon masukkan nama layar atau nama alias dari orang yang ingin kirimkan PI." - -#: ../console/gntblist.c:2020 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3867 -#: ../gtk/gtkdialogs.c:684 ../gtk/gtkdialogs.c:821 ../gtk/gtkdialogs.c:912 -#: ../gtk/gtkrequest.c:269 ../libgaim/account.c:960 ../libgaim/account.c:1148 -#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655 -#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1364 -#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:248 -#: ../libgaim/protocols/msn/msn.c:263 ../libgaim/protocols/msn/msn.c:278 -#: ../libgaim/protocols/msn/msn.c:293 ../libgaim/protocols/oscar/oscar.c:6042 -#: ../libgaim/protocols/silc/buddy.c:466 -#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424 -#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725 -#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1911 -#: ../libgaim/protocols/silc/silc.c:749 ../libgaim/protocols/yahoo/yahoo.c:960 -#: ../libgaim/protocols/yahoo/yahoo.c:3207 -#: ../libgaim/protocols/yahoo/yahoo.c:3216 -msgid "OK" -msgstr "OK" - -#. Create the "Options" frame. -#: ../console/gntblist.c:2039 ../gtk/gtkpounce.c:776 -msgid "Options" -msgstr "Pilihan-pilihan" - -#: ../console/gntblist.c:2045 -msgid "Send IM..." -msgstr "Kirim PI..." - -#: ../console/gntblist.c:2049 -msgid "Toggle offline buddies" -msgstr "Tandai teman-teman yang sedang offline" - -#: ../console/gntblist.c:2053 -msgid "Sort by status" -msgstr "Urut berdasarkan status" - -#: ../console/gntblist.c:2057 -msgid "Sort alphabetically" -msgstr "Urut secara abjad" - -#: ../console/gntblist.c:2061 -msgid "Sort by log size" -msgstr "Urut berdasarkan ukuran log" - -#: ../console/gntconn.c:36 -#, c-format -msgid "%s (%s)" -msgstr "%s (%s)" - -#: ../console/gntconn.c:39 -#, c-format -msgid "%s disconnected." -msgstr "%s terputus." - -#: ../console/gntconn.c:40 -#, c-format -msgid "" -"%s was disconnected due to the following error:\\n" -"%s" -msgstr "" -"%s telah terputus karena kesalahan berikut:\\n" -"%s" - -#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3865 ../libgaim/account.c:988 -#: ../libgaim/connection.c:107 -msgid "Connection Error" -msgstr "Kesalahan Sambungan" - -#: ../console/gntconv.c:102 -msgid "No such command." -msgstr "Tidak ada perintah seperti itu." - -#: ../console/gntconv.c:106 ../gtk/gtkconv.c:505 -msgid "Syntax Error: You typed the wrong number of arguments to that command." -msgstr "" -"Kesalahan Syntax: Anda mengetikkan nomor argumen yang salah pada perintah tersebut." - -#: ../console/gntconv.c:111 ../gtk/gtkconv.c:510 -msgid "Your command failed for an unknown reason." -msgstr "Perintah anda gagal karena alasan yang tidak jelas." - -#: ../console/gntconv.c:116 ../gtk/gtkconv.c:516 -msgid "That command only works in chats, not IMs." -msgstr "Perintah tersebut hanya berfungsi dalam percakapan, tidak dalam PI." - -#: ../console/gntconv.c:119 ../gtk/gtkconv.c:519 -msgid "That command only works in IMs, not chats." -msgstr "Perintah tersebut hanya berfungsi dalam PI, tidak dalam percakapan." - -#: ../console/gntconv.c:123 ../gtk/gtkconv.c:523 -msgid "That command doesn't work on this protocol." -msgstr "Perintah tersebut tidak berfungsi pada protokol ini." - -#: ../console/gntconv.c:130 -msgid "Commands are not supported yet. Message was NOT sent." -msgstr "Perintah-perintah ini belum didukung. Pesan TIDAK terkirim." - -#: ../console/gntconv.c:232 -#, c-format -msgid "%s (%s -- %s)" -msgstr "%s (%s -- %s)" - -#: ../console/gntconv.c:255 -#, c-format -msgid "%s [%s]" -msgstr "%s [%s]" - -#: ../console/gntconv.c:260 ../console/gntconv.c:432 -#, c-format -msgid "" -"\\n" -"%s is typing..." -msgstr "" -"\\n" -"%s sedang mengetik..." - -#: ../console/gntconv.c:399 -msgid " " -msgstr " " - -#. Print the list of users in the room -#: ../console/gntconv.c:501 -msgid "List of users:\\n" -msgstr "Daftar dari pengguna:\\n" - -#: ../console/gntconv.c:625 ../gtk/gtkconv.c:386 -msgid "Supported debug options are: version" -msgstr "Pilihan-pilihan debug yang didukung adalah: versi" - -#: ../console/gntconv.c:660 ../gtk/gtkconv.c:422 -msgid "No such command (in this context)." -msgstr "Perintah tidak ada (dalam konteks ini)." - -#: ../console/gntconv.c:702 ../gtk/gtkconv.c:6824 -msgid "" -"say : Send a message normally as if you weren't using a " -"command." -msgstr "" -"katakan : Kirim pesan secara normal sebagaimana jika tidak menggunakan " -"sebuah perintah." - -#: ../console/gntconv.c:705 ../gtk/gtkconv.c:6827 -msgid "me : Send an IRC style action to a buddy or chat." -msgstr "saya : Kirim sebuah aksi bergaya IRC kepada teman atau percakapan." - -#: ../console/gntconv.c:708 ../gtk/gtkconv.c:6830 -msgid "" -"debug