Menu
▾
▴
pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(106) |
Oct
(334) |
Nov
(246) |
Dec
(145) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(42) |
Feb
(53) |
Mar
(232) |
Apr
(109) |
May
(137) |
Jun
(63) |
Jul
(26) |
Aug
(263) |
Sep
(193) |
Oct
(507) |
Nov
(440) |
Dec
(241) |
| 2003 |
Jan
(567) |
Feb
(195) |
Mar
(504) |
Apr
(481) |
May
(524) |
Jun
(522) |
Jul
(594) |
Aug
(502) |
Sep
(643) |
Oct
(508) |
Nov
(430) |
Dec
(377) |
| 2004 |
Jan
(361) |
Feb
(251) |
Mar
(219) |
Apr
(499) |
May
(461) |
Jun
(419) |
Jul
(314) |
Aug
(519) |
Sep
(416) |
Oct
(247) |
Nov
(305) |
Dec
(382) |
| 2005 |
Jan
(267) |
Feb
(282) |
Mar
(327) |
Apr
(338) |
May
(189) |
Jun
(400) |
Jul
(462) |
Aug
(530) |
Sep
(316) |
Oct
(523) |
Nov
(481) |
Dec
(650) |
| 2006 |
Jan
(536) |
Feb
(361) |
Mar
(287) |
Apr
(146) |
May
(101) |
Jun
(169) |
Jul
(221) |
Aug
(498) |
Sep
(300) |
Oct
(236) |
Nov
(209) |
Dec
(205) |
| 2007 |
Jan
(30) |
Feb
(23) |
Mar
(26) |
Apr
(15) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sea...@us...> - 2006-11-01 19:23:59
|
Revision: 17649
http://svn.sourceforge.net/gaim/?rev=17649&view=rev
Author: seanegan
Date: 2006-11-01 11:23:39 -0800 (Wed, 01 Nov 2006)
Log Message:
-----------
seanegan: How is "Send unknown "slash" commands as messages" still a pref?
Robot101: why was it ever? :P
datallah: that should be one of the less contentious things to slash
Modified Paths:
--------------
trunk/gtk/gtkconv.c
trunk/gtk/gtkprefs.c
Modified: trunk/gtk/gtkconv.c
===================================================================
--- trunk/gtk/gtkconv.c 2006-11-01 07:32:41 UTC (rev 17648)
+++ trunk/gtk/gtkconv.c 2006-11-01 19:23:39 UTC (rev 17649)
@@ -488,12 +488,6 @@
case GAIM_CMD_STATUS_OK:
return TRUE;
case GAIM_CMD_STATUS_NOT_FOUND:
- if (!gaim_prefs_get_bool("/gaim/gtk/conversations/passthrough_unknown_commands")) {
- gaim_conversation_write(conv, "", _("No such command."),
- GAIM_MESSAGE_NO_LOG, time(NULL));
-
- return TRUE;
- }
return FALSE;
case GAIM_CMD_STATUS_WRONG_ARGS:
gaim_conversation_write(conv, "", _("Syntax Error: You typed the wrong number of arguments "
@@ -6594,7 +6588,6 @@
gaim_prefs_add_bool("/gaim/gtk/conversations/show_timestamps", TRUE);
gaim_prefs_add_bool("/gaim/gtk/conversations/show_formatting_toolbar", TRUE);
- gaim_prefs_add_bool("/gaim/gtk/conversations/passthrough_unknown_commands", FALSE);
gaim_prefs_add_string("/gaim/gtk/conversations/placement", "last");
gaim_prefs_add_int("/gaim/gtk/conversations/placement_number", 1);
Modified: trunk/gtk/gtkprefs.c
===================================================================
--- trunk/gtk/gtkprefs.c 2006-11-01 07:32:41 UTC (rev 17648)
+++ trunk/gtk/gtkprefs.c 2006-11-01 19:23:39 UTC (rev 17649)
@@ -828,8 +828,6 @@
_("Always"), "always",
NULL);
- gaim_gtk_prefs_checkbox(_("Send unknown \"_slash\" commands as messages"),
- "/gaim/gtk/conversations/passthrough_unknown_commands", vbox);
gaim_gtk_prefs_checkbox(_("Show _formatting on incoming messages"),
"/gaim/gtk/conversations/show_incoming_formatting", vbox);
@@ -2079,6 +2077,7 @@
gaim_prefs_remove("/gaim/gtk/conversations/chat/raise_on_events");
gaim_prefs_remove("/gaim/gtk/conversations/ignore_fonts");
gaim_prefs_remove("/gaim/gtk/conversations/ignore_font_sizes");
+ gaim_prefs_remove("/gaim/gtk/conversations/passthrough_unknown_commands");
gaim_prefs_remove("/gaim/gtk/idle");
gaim_prefs_remove("/gaim/gtk/logging/individual_logs");
gaim_prefs_remove("/gaim/gtk/sound/signon");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-11-01 07:33:04
|
Revision: 17648
http://svn.sourceforge.net/gaim/?rev=17648&view=rev
Author: thekingant
Date: 2006-10-31 23:32:41 -0800 (Tue, 31 Oct 2006)
Log Message:
-----------
After seeing Ka-Hing's patch I figured I'd grep around for the same
mistake in other places. I found one in our gstreamer error handling
code.
Luke (or anyone), are you still having gstreamer problems? If so, can
you see if this is less crashy?
Modified Paths:
--------------
trunk/gtk/gtksound.c
Modified: trunk/gtk/gtksound.c
===================================================================
--- trunk/gtk/gtksound.c 2006-11-01 07:29:53 UTC (rev 17647)
+++ trunk/gtk/gtksound.c 2006-11-01 07:32:41 UTC (rev 17648)
@@ -361,7 +361,7 @@
gpointer data)
{
GstElement *play = data;
- GError *err;
+ GError *err = NULL;
switch (GST_MESSAGE_TYPE (msg)) {
case GST_MESSAGE_EOS:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-11-01 07:30:13
|
Revision: 17647
http://svn.sourceforge.net/gaim/?rev=17647&view=rev
Author: thekingant
Date: 2006-10-31 23:29:53 -0800 (Tue, 31 Oct 2006)
Log Message:
-----------
sf patch #1588425, from Ka-Hing Cheung
According to glib-doc, "a GError* must be initialized
to NULL before passing its address to a function that
can report errors."
Modified Paths:
--------------
trunk/libgaim/util.c
Modified: trunk/libgaim/util.c
===================================================================
--- trunk/libgaim/util.c 2006-11-01 05:53:09 UTC (rev 17646)
+++ trunk/libgaim/util.c 2006-11-01 07:29:53 UTC (rev 17647)
@@ -2376,7 +2376,7 @@
{
const char *user_dir = gaim_user_dir();
gchar *filename_full;
- GError *error;
+ GError *error = NULL;
gchar *contents = NULL;
gsize length;
xmlnode *node = NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-11-01 05:53:30
|
Revision: 17646
http://svn.sourceforge.net/gaim/?rev=17646&view=rev
Author: sadrul
Date: 2006-10-31 21:53:09 -0800 (Tue, 31 Oct 2006)
Log Message:
-----------
Fix things to work with the last commit.
Modified Paths:
--------------
trunk/console/gntconv.c
trunk/console/gntdebug.c
trunk/console/libgnt/gntkeys.c
trunk/console/libgnt/gntkeys.h
trunk/console/libgnt/gnttextview.h
trunk/console/libgnt/gnttree.h
Modified: trunk/console/gntconv.c
===================================================================
--- trunk/console/gntconv.c 2006-11-01 03:38:23 UTC (rev 17645)
+++ trunk/console/gntconv.c 2006-11-01 05:53:09 UTC (rev 17646)
@@ -128,13 +128,13 @@
}
else if (key[0] == 27)
{
- if (strcmp(key+1, GNT_KEY_DOWN) == 0)
+ if (strcmp(key, GNT_KEY_DOWN) == 0)
gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), 1);
- else if (strcmp(key+1, GNT_KEY_UP) == 0)
+ else if (strcmp(key, GNT_KEY_UP) == 0)
gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), -1);
- else if (strcmp(key+1, GNT_KEY_PGDOWN) == 0)
+ else if (strcmp(key, GNT_KEY_PGDOWN) == 0)
gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), ggconv->tv->priv.height - 2);
- else if (strcmp(key+1, GNT_KEY_PGUP) == 0)
+ else if (strcmp(key, GNT_KEY_PGUP) == 0)
gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), -(ggconv->tv->priv.height - 2));
else
return FALSE;
Modified: trunk/console/gntdebug.c
===================================================================
--- trunk/console/gntdebug.c 2006-11-01 03:38:23 UTC (rev 17645)
+++ trunk/console/gntdebug.c 2006-11-01 05:53:09 UTC (rev 17646)
@@ -51,13 +51,13 @@
{
if (key[0] == 27)
{
- if (strcmp(key+1, GNT_KEY_DOWN) == 0)
+ if (strcmp(key, GNT_KEY_DOWN) == 0)
gnt_text_view_scroll(view, 1);
- else if (strcmp(key+1, GNT_KEY_UP) == 0)
+ else if (strcmp(key, GNT_KEY_UP) == 0)
gnt_text_view_scroll(view, -1);
- else if (strcmp(key+1, GNT_KEY_PGDOWN) == 0)
+ else if (strcmp(key, GNT_KEY_PGDOWN) == 0)
gnt_text_view_scroll(view, wid->priv.height - 2);
- else if (strcmp(key+1, GNT_KEY_PGUP) == 0)
+ else if (strcmp(key, GNT_KEY_PGUP) == 0)
gnt_text_view_scroll(view, -(wid->priv.height - 2));
else
return FALSE;
Modified: trunk/console/libgnt/gntkeys.c
===================================================================
--- trunk/console/libgnt/gntkeys.c 2006-11-01 03:38:23 UTC (rev 17645)
+++ trunk/console/libgnt/gntkeys.c 2006-11-01 05:53:09 UTC (rev 17646)
@@ -1,5 +1,6 @@
#include "gntkeys.h"
+#include <stdlib.h>
#include <string.h>
const char *term;
Modified: trunk/console/libgnt/gntkeys.h
===================================================================
--- trunk/console/libgnt/gntkeys.h 2006-11-01 03:38:23 UTC (rev 17645)
+++ trunk/console/libgnt/gntkeys.h 2006-11-01 05:53:09 UTC (rev 17646)
@@ -71,4 +71,13 @@
*/
void gnt_keys_refine(char *text);
+
+/* A lot of commonly used variable names are defined in <term.h>.
+ * #undef them to make life easier for everyone. */
+
+#undef columns
+#undef lines
+#undef buttons
+#undef newline
+
#endif
Modified: trunk/console/libgnt/gnttextview.h
===================================================================
--- trunk/console/libgnt/gnttextview.h 2006-11-01 03:38:23 UTC (rev 17645)
+++ trunk/console/libgnt/gnttextview.h 2006-11-01 05:53:09 UTC (rev 17646)
@@ -6,10 +6,6 @@
#include "gntcolors.h"
#include "gntkeys.h"
-#ifdef lines
-#undef lines
-#endif
-
#define GNT_TYPE_TEXTVIEW (gnt_text_view_get_gtype())
#define GNT_TEXT_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_TEXTVIEW, GntTextView))
#define GNT_TEXT_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_TEXTVIEW, GntTextViewClass))
Modified: trunk/console/libgnt/gnttree.h
===================================================================
--- trunk/console/libgnt/gnttree.h 2006-11-01 03:38:23 UTC (rev 17645)
+++ trunk/console/libgnt/gnttree.h 2006-11-01 05:53:09 UTC (rev 17646)
@@ -7,10 +7,6 @@
#include "gntkeys.h"
#include "gnttextview.h"
-#ifdef columns
-#undef columns
-#endif
-
#define GNT_TYPE_TREE (gnt_tree_get_gtype())
#define GNT_TREE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_TREE, GntTree))
#define GNT_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_TREE, GntTreeClass))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-11-01 03:38:43
|
Revision: 17645
http://svn.sourceforge.net/gaim/?rev=17645&view=rev
Author: sadrul
Date: 2006-10-31 19:38:23 -0800 (Tue, 31 Oct 2006)
Log Message:
-----------
Use terminfo/termcap information (from ncurses) as much as possible. There
still need to be some manual 'refinement' based on $TERM. I'll see if I
can get rid of those. Also, I am probably going to allow users to provide
information that terminfo can't provide, like the keycode for ctrl+up etc.
Let me know if any of the keybinding doesn't work.
Modified Paths:
--------------
trunk/console/libgnt/gntbox.c
trunk/console/libgnt/gntcombobox.c
trunk/console/libgnt/gntentry.c
trunk/console/libgnt/gntkeys.c
trunk/console/libgnt/gntkeys.h
trunk/console/libgnt/gntmain.c
trunk/console/libgnt/gntmenu.c
trunk/console/libgnt/gntstyle.c
trunk/console/libgnt/gnttextview.h
trunk/console/libgnt/gnttree.c
trunk/console/libgnt/gnttree.h
trunk/console/libgnt/gntwidget.c
Modified: trunk/console/libgnt/gntbox.c
===================================================================
--- trunk/console/libgnt/gntbox.c 2006-11-01 02:13:37 UTC (rev 17644)
+++ trunk/console/libgnt/gntbox.c 2006-11-01 03:38:23 UTC (rev 17645)
@@ -285,11 +285,11 @@
if (text[0] == 27)
{
- if (strcmp(text+1, GNT_KEY_LEFT) == 0)
+ if (strcmp(text, GNT_KEY_LEFT) == 0)
{
find_prev_focus(box);
}
- else if (strcmp(text+1, GNT_KEY_RIGHT) == 0)
+ else if (strcmp(text, GNT_KEY_RIGHT) == 0)
{
find_next_focus(box);
}
Modified: trunk/console/libgnt/gntcombobox.c
===================================================================
--- trunk/console/libgnt/gntcombobox.c 2006-11-01 02:13:37 UTC (rev 17644)
+++ trunk/console/libgnt/gntcombobox.c 2006-11-01 03:38:23 UTC (rev 17645)
@@ -135,8 +135,8 @@
{
if (text[0] == 27)
{
- if (strcmp(text + 1, GNT_KEY_UP) == 0 ||
- strcmp(text + 1, GNT_KEY_DOWN) == 0)
+ if (strcmp(text, GNT_KEY_UP) == 0 ||
+ strcmp(text, GNT_KEY_DOWN) == 0)
{
popup_dropdown(box);
return TRUE;
@@ -170,10 +170,10 @@
if (event == GNT_MOUSE_SCROLL_UP) {
if (dshowing)
- gnt_widget_key_pressed(box->dropdown, "\033" GNT_KEY_UP);
+ gnt_widget_key_pressed(box->dropdown, GNT_KEY_UP);
} else if (event == GNT_MOUSE_SCROLL_DOWN) {
if (dshowing)
- gnt_widget_key_pressed(box->dropdown, "\033" GNT_KEY_DOWN);
+ gnt_widget_key_pressed(box->dropdown, GNT_KEY_DOWN);
} else if (event == GNT_LEFT_MOUSE_DOWN) {
if (dshowing) {
set_selection(box, gnt_tree_get_selection_data(GNT_TREE(box->dropdown)));
Modified: trunk/console/libgnt/gntentry.c
===================================================================
--- trunk/console/libgnt/gntentry.c 2006-11-01 02:13:37 UTC (rev 17644)
+++ trunk/console/libgnt/gntentry.c 2006-11-01 03:38:23 UTC (rev 17645)
@@ -550,14 +550,14 @@
gnt_widget_class_register_action(parent_class, "cursor-home", move_start,
GNT_KEY_CTRL_A, NULL);
- gnt_widget_register_binding(parent_class, "cursor-home", "\033" GNT_KEY_HOME, NULL);
+ gnt_widget_register_binding(parent_class, "cursor-home", GNT_KEY_HOME, NULL);
gnt_widget_class_register_action(parent_class, "cursor-end", move_end,
GNT_KEY_CTRL_E, NULL);
- gnt_widget_register_binding(parent_class, "cursor-end", "\033" GNT_KEY_END, NULL);
+ gnt_widget_register_binding(parent_class, "cursor-end", GNT_KEY_END, NULL);
gnt_widget_class_register_action(parent_class, "delete-prev", backspace,
GNT_KEY_BACKSPACE, NULL);
gnt_widget_class_register_action(parent_class, "delete-next", delkey,
- "\033" GNT_KEY_DEL, NULL);
+ GNT_KEY_DEL, NULL);
gnt_widget_register_binding(parent_class, "delete-next", GNT_KEY_CTRL_D, NULL);
gnt_widget_class_register_action(parent_class, "delete-start", del_to_home,
GNT_KEY_CTRL_U, NULL);
@@ -572,17 +572,17 @@
gnt_widget_class_register_action(parent_class, "cursor-prev-word", move_back_word,
NULL, NULL);
gnt_widget_class_register_action(parent_class, "cursor-prev", move_back,
- "\033" GNT_KEY_LEFT, NULL);
+ GNT_KEY_LEFT, NULL);
gnt_widget_register_binding(parent_class, "cursor-prev", GNT_KEY_CTRL_B, NULL);
gnt_widget_class_register_action(parent_class, "cursor-next", move_forward,
- "\033" GNT_KEY_RIGHT, NULL);
+ GNT_KEY_RIGHT, NULL);
gnt_widget_register_binding(parent_class, "cursor-next", GNT_KEY_CTRL_F, NULL);
gnt_widget_class_register_action(parent_class, "suggest-show", suggest_show,
"\t", NULL);
gnt_widget_class_register_action(parent_class, "suggest-next", suggest_next,
- "\033" GNT_KEY_DOWN, NULL);
+ GNT_KEY_DOWN, NULL);
gnt_widget_class_register_action(parent_class, "suggest-prev", suggest_prev,
- "\033" GNT_KEY_UP, NULL);
+ GNT_KEY_UP, NULL);
gnt_widget_class_register_action(parent_class, "history-prev", history_prev,
"\033" GNT_KEY_CTRL_DOWN, NULL);
gnt_widget_class_register_action(parent_class, "history-next", history_next,
Modified: trunk/console/libgnt/gntkeys.c
===================================================================
--- trunk/console/libgnt/gntkeys.c 2006-11-01 02:13:37 UTC (rev 17644)
+++ trunk/console/libgnt/gntkeys.c 2006-11-01 03:38:23 UTC (rev 17645)
@@ -2,28 +2,17 @@
#include <string.h>
+const char *term;
+
void gnt_keys_refine(char *text)
{
- if (text[0] == 27)
- {
- /* These are for urxvt */
- if (strcmp(text + 1, "Oa") == 0)
- {
- strcpy(text + 1, GNT_KEY_CTRL_UP);
- }
- else if (strcmp(text + 1, "Ob") == 0)
- {
- strcpy(text + 1, GNT_KEY_CTRL_DOWN);
- }
+ if (*text == 27 && *(text + 1) == '[' && *(text + 3) == '\0' &&
+ (*(text + 2) >= 'A' || *(text + 2) <= 'D')) {
+ if (term == NULL)
+ term = getenv("TERM");
+ /* Apparently this is necessary for urxvt and screen */
+ if (strcmp(term, "screen") == 0 || strcmp(term, "rxvt-unicode") == 0)
+ *(text + 1) = 'O';
}
- else if ((unsigned char)text[0] == 195)
- {
- /* These for xterm */
- if (text[2] == 0)
- {
- text[0] = 27;
- text[1] -= 64;
- }
- }
}
Modified: trunk/console/libgnt/gntkeys.h
===================================================================
--- trunk/console/libgnt/gntkeys.h 2006-11-01 02:13:37 UTC (rev 17644)
+++ trunk/console/libgnt/gntkeys.h 2006-11-01 03:38:23 UTC (rev 17645)
@@ -1,29 +1,34 @@
#ifndef GNT_KEYS_H
#define GNT_KEYS_H
-#define GNT_KEY_POPUP "[29~"
+#include <curses.h>
+#include <term.h>
+#define SAFE(x) ((x) ? (x) : "")
+
+#define GNT_KEY_POPUP SAFE(key_f16) /* Apparently */
+
/* Arrow keys */
-#define GNT_KEY_LEFT "[D"
-#define GNT_KEY_RIGHT "[C"
-#define GNT_KEY_UP "[A"
-#define GNT_KEY_DOWN "[B"
+#define GNT_KEY_LEFT SAFE(key_left)
+#define GNT_KEY_RIGHT SAFE(key_right)
+#define GNT_KEY_UP SAFE(key_up)
+#define GNT_KEY_DOWN SAFE(key_down)
#define GNT_KEY_CTRL_UP "[1;5A"
#define GNT_KEY_CTRL_DOWN "[1;5B"
#define GNT_KEY_CTRL_RIGHT "[1;5C"
#define GNT_KEY_CTRL_LEFT "[1;5D"
-#define GNT_KEY_PGUP "[5~"
-#define GNT_KEY_PGDOWN "[6~"
-#define GNT_KEY_HOME "[7~"
-#define GNT_KEY_END "[8~"
+#define GNT_KEY_PGUP SAFE(key_ppage)
+#define GNT_KEY_PGDOWN SAFE(key_npage)
+#define GNT_KEY_HOME SAFE(key_home)
+#define GNT_KEY_END SAFE(key_end)
-#define GNT_KEY_ENTER "\r"
+#define GNT_KEY_ENTER carriage_return
-#define GNT_KEY_BACKSPACE "\177"
-#define GNT_KEY_DEL "[3~"
-#define GNT_KEY_INS "[2~"
+#define GNT_KEY_BACKSPACE SAFE(key_backspace)
+#define GNT_KEY_DEL SAFE(key_dc)
+#define GNT_KEY_INS SAFE(key_ic)
#define GNT_KEY_CTRL_A "\001"
#define GNT_KEY_CTRL_B "\002"
@@ -48,18 +53,18 @@
#define GNT_KEY_CTRL_X "\030"
#define GNT_KEY_CTRL_Y "\031"
-#define GNT_KEY_F1 "[[A"
-#define GNT_KEY_F2 "[[B"
-#define GNT_KEY_F3 "[[C"
-#define GNT_KEY_F4 "[[D"
-#define GNT_KEY_F5 "[[E"
-#define GNT_KEY_F6 "[17~"
-#define GNT_KEY_F7 "[18~"
-#define GNT_KEY_F8 "[19~"
-#define GNT_KEY_F9 "[20~"
-#define GNT_KEY_F10 "[21~"
-#define GNT_KEY_F11 "[23~"
-#define GNT_KEY_F12 "[24~"
+#define GNT_KEY_F1 SAFE(key_f1)
+#define GNT_KEY_F2 SAFE(key_f2)
+#define GNT_KEY_F3 SAFE(key_f3)
+#define GNT_KEY_F4 SAFE(key_f4)
+#define GNT_KEY_F5 SAFE(key_f5)
+#define GNT_KEY_F6 SAFE(key_f6)
+#define GNT_KEY_F7 SAFE(key_f7)
+#define GNT_KEY_F8 SAFE(key_f8)
+#define GNT_KEY_F9 SAFE(key_f9)
+#define GNT_KEY_F10 SAFE(key_f10)
+#define GNT_KEY_F11 SAFE(key_f11)
+#define GNT_KEY_F12 SAFE(key_f12)
/**
* This will do stuff with the terminal settings and stuff.
Modified: trunk/console/libgnt/gntmain.c
===================================================================
--- trunk/console/libgnt/gntmain.c 2006-11-01 02:13:37 UTC (rev 17644)
+++ trunk/console/libgnt/gntmain.c 2006-11-01 03:38:23 UTC (rev 17645)
@@ -822,7 +822,7 @@
if (buffer[0] == 27)
{
/* Some special key has been pressed */
- if (strcmp(buffer+1, GNT_KEY_POPUP) == 0)
+ if (strcmp(buffer, GNT_KEY_POPUP) == 0)
{}
else if (strcmp(buffer + 1, "c") == 0)
{
@@ -906,7 +906,7 @@
gnt_widget_get_position(widget, &x, &y);
gnt_widget_get_size(widget, &w, &h);
- if (strcmp(buffer + 1, GNT_KEY_LEFT) == 0)
+ if (strcmp(buffer, GNT_KEY_LEFT) == 0)
{
if (x > X_MIN)
{
@@ -914,7 +914,7 @@
changed = TRUE;
}
}
- else if (strcmp(buffer + 1, GNT_KEY_RIGHT) == 0)
+ else if (strcmp(buffer, GNT_KEY_RIGHT) == 0)
{
if (x + w < X_MAX)
{
@@ -922,7 +922,7 @@
changed = TRUE;
}
}
- else if (strcmp(buffer + 1, GNT_KEY_UP) == 0)
+ else if (strcmp(buffer, GNT_KEY_UP) == 0)
{
if (y > Y_MIN)
{
@@ -930,7 +930,7 @@
changed = TRUE;
}
}
- else if (strcmp(buffer + 1, GNT_KEY_DOWN) == 0)
+ else if (strcmp(buffer, GNT_KEY_DOWN) == 0)
{
if (y + h < Y_MAX)
{
@@ -983,7 +983,7 @@
gnt_widget_get_size(widget, &width, &height);
- if (strcmp(buffer + 1, GNT_KEY_DOWN) == 0)
+ if (strcmp(buffer, GNT_KEY_DOWN) == 0)
{
if (widget->priv.y + height < Y_MAX)
{
@@ -991,17 +991,17 @@
changed = TRUE;
}
}
- else if (strcmp(buffer + 1, GNT_KEY_UP) == 0)
+ else if (strcmp(buffer, GNT_KEY_UP) == 0)
{
height--;
changed = TRUE;
}
- else if (strcmp(buffer + 1, GNT_KEY_LEFT) == 0)
+ else if (strcmp(buffer, GNT_KEY_LEFT) == 0)
{
width--;
changed = TRUE;
}
- else if (strcmp(buffer + 1, GNT_KEY_RIGHT) == 0)
+ else if (strcmp(buffer, GNT_KEY_RIGHT) == 0)
{
if (widget->priv.x + width < X_MAX)
{
Modified: trunk/console/libgnt/gntmenu.c
===================================================================
--- trunk/console/libgnt/gntmenu.c 2006-11-01 02:13:37 UTC (rev 17644)
+++ trunk/console/libgnt/gntmenu.c 2006-11-01 03:38:23 UTC (rev 17645)
@@ -148,17 +148,15 @@
}
if (menu->type == GNT_MENU_TOPLEVEL) {
- if (text[0] == 27) {
- if (strcmp(text + 1, GNT_KEY_LEFT) == 0) {
- menu->selected--;
- if (menu->selected < 0)
- menu->selected = g_list_length(menu->list) - 1;
- } else if (strcmp(text + 1, GNT_KEY_RIGHT) == 0) {
- menu->selected++;
- if (menu->selected >= g_list_length(menu->list))
- menu->selected = 0;
- }
- } else if (text[0] == '\r' && text[1] == 0) {
+ if (strcmp(text, GNT_KEY_LEFT) == 0) {
+ menu->selected--;
+ if (menu->selected < 0)
+ menu->selected = g_list_length(menu->list) - 1;
+ } else if (strcmp(text, GNT_KEY_RIGHT) == 0) {
+ menu->selected++;
+ if (menu->selected >= g_list_length(menu->list))
+ menu->selected = 0;
+ } else if (strcmp(text, GNT_KEY_ENTER) == 0) {
gnt_widget_activate(widget);
}
Modified: trunk/console/libgnt/gntstyle.c
===================================================================
--- trunk/console/libgnt/gntstyle.c 2006-11-01 02:13:37 UTC (rev 17644)
+++ trunk/console/libgnt/gntstyle.c 2006-11-01 03:38:23 UTC (rev 17645)
@@ -94,33 +94,33 @@
return g_strdup(code); \
} while (0)
- SPECIAL_KEY("home", "\033" GNT_KEY_HOME);
- SPECIAL_KEY("end", "\033" GNT_KEY_END);
- SPECIAL_KEY("pageup", "\033" GNT_KEY_PGUP);
- SPECIAL_KEY("pagedown", "\033" GNT_KEY_PGDOWN);
- SPECIAL_KEY("insert", "\033" GNT_KEY_INS);
- SPECIAL_KEY("delete", "\033" GNT_KEY_DEL);
+ SPECIAL_KEY("home", GNT_KEY_HOME);
+ SPECIAL_KEY("end", GNT_KEY_END);
+ SPECIAL_KEY("pageup", GNT_KEY_PGUP);
+ SPECIAL_KEY("pagedown", GNT_KEY_PGDOWN);
+ SPECIAL_KEY("insert", GNT_KEY_INS);
+ SPECIAL_KEY("delete", GNT_KEY_DEL);
- SPECIAL_KEY("left", "\033" GNT_KEY_LEFT);
- SPECIAL_KEY("right", "\033" GNT_KEY_RIGHT);
- SPECIAL_KEY("up", "\033" GNT_KEY_UP);
- SPECIAL_KEY("down", "\033" GNT_KEY_DOWN);
+ SPECIAL_KEY("left", GNT_KEY_LEFT);
+ SPECIAL_KEY("right", GNT_KEY_RIGHT);
+ SPECIAL_KEY("up", GNT_KEY_UP);
+ SPECIAL_KEY("down", GNT_KEY_DOWN);
SPECIAL_KEY("tab", "\t");
- SPECIAL_KEY("menu", "\033" GNT_KEY_POPUP);
+ SPECIAL_KEY("menu", GNT_KEY_POPUP);
- SPECIAL_KEY("f1", "\033" GNT_KEY_F1);
- SPECIAL_KEY("f2", "\033" GNT_KEY_F2);
- SPECIAL_KEY("f3", "\033" GNT_KEY_F3);
- SPECIAL_KEY("f4", "\033" GNT_KEY_F4);
- SPECIAL_KEY("f5", "\033" GNT_KEY_F5);
- SPECIAL_KEY("f6", "\033" GNT_KEY_F6);
- SPECIAL_KEY("f7", "\033" GNT_KEY_F7);
- SPECIAL_KEY("f8", "\033" GNT_KEY_F8);
- SPECIAL_KEY("f9", "\033" GNT_KEY_F9);
- SPECIAL_KEY("f10", "\033" GNT_KEY_F10);
- SPECIAL_KEY("f11", "\033" GNT_KEY_F11);
- SPECIAL_KEY("f12", "\033" GNT_KEY_F12);
+ SPECIAL_KEY("f1", GNT_KEY_F1);
+ SPECIAL_KEY("f2", GNT_KEY_F2);
+ SPECIAL_KEY("f3", GNT_KEY_F3);
+ SPECIAL_KEY("f4", GNT_KEY_F4);
+ SPECIAL_KEY("f5", GNT_KEY_F5);
+ SPECIAL_KEY("f6", GNT_KEY_F6);
+ SPECIAL_KEY("f7", GNT_KEY_F7);
+ SPECIAL_KEY("f8", GNT_KEY_F8);
+ SPECIAL_KEY("f9", GNT_KEY_F9);
+ SPECIAL_KEY("f10", GNT_KEY_F10);
+ SPECIAL_KEY("f11", GNT_KEY_F11);
+ SPECIAL_KEY("f12", GNT_KEY_F12);
#undef SPECIAL_KEY
Modified: trunk/console/libgnt/gnttextview.h
===================================================================
--- trunk/console/libgnt/gnttextview.h 2006-11-01 02:13:37 UTC (rev 17644)
+++ trunk/console/libgnt/gnttextview.h 2006-11-01 03:38:23 UTC (rev 17645)
@@ -6,6 +6,10 @@
#include "gntcolors.h"
#include "gntkeys.h"
+#ifdef lines
+#undef lines
+#endif
+
#define GNT_TYPE_TEXTVIEW (gnt_text_view_get_gtype())
#define GNT_TEXT_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_TEXTVIEW, GntTextView))
#define GNT_TEXT_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_TEXTVIEW, GntTextViewClass))
Modified: trunk/console/libgnt/gnttree.c
===================================================================
--- trunk/console/libgnt/gnttree.c 2006-11-01 02:13:37 UTC (rev 17644)
+++ trunk/console/libgnt/gnttree.c 2006-11-01 03:38:23 UTC (rev 17645)
@@ -709,15 +709,15 @@
g_str_equal, g_free, (GDestroyNotify)gnt_widget_action_param_free);
gnt_widget_class_register_action(parent_class, "move-up", action_up,
- "\033" GNT_KEY_UP, NULL);
+ GNT_KEY_UP, NULL);
gnt_widget_register_binding(parent_class, "move-up", GNT_KEY_CTRL_P, NULL);
gnt_widget_class_register_action(parent_class, "move-down", action_down,
- "\033" GNT_KEY_DOWN, NULL);
+ GNT_KEY_DOWN, NULL);
gnt_widget_register_binding(parent_class, "move-down", GNT_KEY_CTRL_N, NULL);
gnt_widget_class_register_action(parent_class, "page-up", action_page_up,
- "\033" GNT_KEY_PGUP, NULL);
+ GNT_KEY_PGUP, NULL);
gnt_widget_class_register_action(parent_class, "page-down", action_page_down,
- "\033" GNT_KEY_PGDOWN, NULL);
+ GNT_KEY_PGDOWN, NULL);
gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), parent_class);
Modified: trunk/console/libgnt/gnttree.h
===================================================================
--- trunk/console/libgnt/gnttree.h 2006-11-01 02:13:37 UTC (rev 17644)
+++ trunk/console/libgnt/gnttree.h 2006-11-01 03:38:23 UTC (rev 17645)
@@ -7,6 +7,10 @@
#include "gntkeys.h"
#include "gnttextview.h"
+#ifdef columns
+#undef columns
+#endif
+
#define GNT_TYPE_TREE (gnt_tree_get_gtype())
#define GNT_TREE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_TREE, GntTree))
#define GNT_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_TREE, GntTreeClass))
Modified: trunk/console/libgnt/gntwidget.c
===================================================================
--- trunk/console/libgnt/gntwidget.c 2006-11-01 02:13:37 UTC (rev 17644)
+++ trunk/console/libgnt/gntwidget.c 2006-11-01 03:38:23 UTC (rev 17645)
@@ -259,7 +259,7 @@
/* This is relevant for all widgets */
gnt_widget_class_register_action(klass, "context-menu", context_menu,
- "\033" GNT_KEY_POPUP, NULL);
+ GNT_KEY_POPUP, NULL);
gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), klass);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rl...@us...> - 2006-11-01 02:14:06
|
Revision: 17644
http://svn.sourceforge.net/gaim/?rev=17644&view=rev
Author: rlaager
Date: 2006-10-31 18:13:37 -0800 (Tue, 31 Oct 2006)
Log Message:
-----------
SF Patch #1586467 from Benjamin Moody - floppusmaximus
"Currently if a plugin creates a multi-line, non-HTML
string preference, i.e. a GaimPluginPref with type
GAIM_PLUGIN_PREF_STRING_FORMAT and format-type
GAIM_STRING_FORMAT_TYPE_MULTILINE, the resulting widget
is extremely narrow and impossible to use.
This is because the widget is packed into an hbox
without allowing expansion (expand = fill = FALSE.) If
HTML is enabled, the presence of the format bar forces
the widget to be wide enough to be usable. Disabling
HTML causes the format bar to be removed, so the widget
is set to the minimum allowed size."
Modified Paths:
--------------
trunk/COPYRIGHT
trunk/gtk/gtkpluginpref.c
Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT 2006-11-01 01:27:16 UTC (rev 17643)
+++ trunk/COPYRIGHT 2006-11-01 02:13:37 UTC (rev 17644)
@@ -202,6 +202,7 @@
Paul Miller
Arkadiusz Miskiewicz
Andrew Molloy
+Benjamin Moody
Tim Mooney
Sergio Moretto
Christian Muise
Modified: trunk/gtk/gtkpluginpref.c
===================================================================
--- trunk/gtk/gtkpluginpref.c 2006-11-01 01:27:16 UTC (rev 17643)
+++ trunk/gtk/gtkpluginpref.c 2006-11-01 02:13:37 UTC (rev 17644)
@@ -154,7 +154,7 @@
"changed", G_CALLBACK(imhtml_cb), imhtml);
g_signal_connect(G_OBJECT(imhtml),
"format_function_toggle", G_CALLBACK(imhtml_format_cb), imhtml);
- gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, 0);
}
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rl...@us...> - 2006-11-01 01:27:38
|
Revision: 17643
http://svn.sourceforge.net/gaim/?rev=17643&view=rev
Author: rlaager
Date: 2006-10-31 17:27:16 -0800 (Tue, 31 Oct 2006)
Log Message:
-----------
SF Patch #1469315 from R.Ramkumar - andyetitmoves
"This is a small patch to make sounds enabled when
available an optional feature. The use case is: Sounds
being annoying, I would like them only when I am not
seeing the comp. When I am on the comp, I have
guifications/gaim-osd to inform me of whatever happens,
and that happens to be less intrusive (especially when
music is on :) )."
The patch originally used:
"Play sounds:" ("Always", "When available", "When away")
I changed them to the strings KingAnt suggested:
"Play sounds:" ("Always", "Only when available", "Only when not available")
The ones from the patch submitter are not quite as clear, but they're shorter.
What does everyone think about this?
Modified Paths:
--------------
trunk/COPYRIGHT
trunk/gtk/gtkprefs.c
trunk/libgaim/prefs.c
trunk/libgaim/sound.c
Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT 2006-11-01 00:57:39 UTC (rev 17642)
+++ trunk/COPYRIGHT 2006-11-01 01:27:16 UTC (rev 17643)
@@ -237,6 +237,7 @@
Federicco Mena Quintero
Yosef Radchenko
David Raeman
+R. Ramkumar
Mart Raudsepp
Etan Reisner
Kristian Rietveld
Modified: trunk/gtk/gtkprefs.c
===================================================================
--- trunk/gtk/gtkprefs.c 2006-11-01 00:57:39 UTC (rev 17642)
+++ trunk/gtk/gtkprefs.c 2006-11-01 01:27:16 UTC (rev 17643)
@@ -1606,8 +1606,12 @@
vbox = gaim_gtk_make_frame (ret, _("Sound Options"));
gaim_gtk_prefs_checkbox(_("Sounds when conversation has _focus"),
"/gaim/gtk/sound/conv_focus", vbox);
- gaim_gtk_prefs_checkbox(_("_Sounds while away"),
- "/core/sound/while_away", vbox);
+ gaim_gtk_prefs_dropdown(vbox, _("Enable sounds:"),
+ GAIM_PREF_INT, "/core/sound/while_status",
+ _("Only when available"), 1,
+ _("Only when not available"), 2,
+ _("Always"), 3,
+ NULL);
#ifdef USE_GSTREAMER
hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
Modified: trunk/libgaim/prefs.c
===================================================================
--- trunk/libgaim/prefs.c 2006-11-01 00:57:39 UTC (rev 17642)
+++ trunk/libgaim/prefs.c 2006-11-01 01:27:16 UTC (rev 17643)
@@ -1116,6 +1116,14 @@
gaim_prefs_remove("/plugins/core/autorecon/hide_reconnecting_dialog");
gaim_prefs_remove("/plugins/core/autorecon/restore_state");
gaim_prefs_remove("/plugins/core/autorecon");
+
+ /* Convert old sounds while_away pref to new 3-way pref. */
+ if (gaim_prefs_exists("/core/sound/while_away") &&
+ gaim_prefs_get_bool("/core/sound/while_away"))
+ {
+ gaim_prefs_set_int("/core/sound/while_status", 3);
+ }
+ gaim_prefs_remove("/core/sound/while_away");
}
void *
Modified: trunk/libgaim/sound.c
===================================================================
--- trunk/libgaim/sound.c 2006-11-01 00:57:39 UTC (rev 17642)
+++ trunk/libgaim/sound.c 2006-11-01 01:27:16 UTC (rev 17643)
@@ -28,18 +28,45 @@
static GaimSoundUiOps *sound_ui_ops = NULL;
-void
-gaim_sound_play_file(const char *filename, const GaimAccount *account)
+#define STATUS_AVAILABLE 1
+#define STATUS_AWAY 2
+
+static gboolean
+gaim_sound_play_required(const GaimAccount *account)
{
- GaimStatus *status;
+ gint pref_status = gaim_prefs_get_int("/core/sound/while_status");
- if ((account != NULL) && (!gaim_prefs_get_bool("/core/sound/while_away")))
+ if (pref_status == 3)
{
- status = gaim_account_get_active_status(account);
- if (gaim_status_is_online(status) && !gaim_status_is_available(status))
- return;
+ /* Play sounds: Always */
+ return TRUE;
}
+ if (account != NULL)
+ {
+ GaimStatus *status = gaim_account_get_active_status(account);
+
+ if (gaim_status_is_online(status))
+ {
+ gboolean available = gaim_status_is_available(status);
+ return (( available && pref_status == STATUS_AVAILABLE) ||
+ (!available && pref_status == STATUS_AWAY));
+ }
+ }
+
+ /* We get here a couple of ways. Either the request has been OK'ed
+ * by gaim_sound_play_event() and we're here because the UI has
+ * called gaim_sound_play_file(), or we're here for something
+ * not related to an account (like testing a sound). */
+ return TRUE;
+}
+
+void
+gaim_sound_play_file(const char *filename, const GaimAccount *account)
+{
+ if (!gaim_sound_play_required(account))
+ return;
+
if(sound_ui_ops && sound_ui_ops->play_file)
sound_ui_ops->play_file(filename);
}
@@ -47,17 +74,9 @@
void
gaim_sound_play_event(GaimSoundEventID event, const GaimAccount *account)
{
- GaimStatus *status;
+ if (!gaim_sound_play_required(account))
+ return;
- if ((account != NULL) &&
- (!gaim_prefs_get_bool("/core/sound/while_away")))
- {
- status = gaim_account_get_active_status(account);
- if (gaim_status_is_online(status) &&
- !gaim_status_is_available(status))
- return;
- }
-
if(sound_ui_ops && sound_ui_ops->play_event) {
int plugin_return;
@@ -107,8 +126,7 @@
GAIM_SUBTYPE_ACCOUNT));
gaim_prefs_add_none("/core/sound");
- gaim_prefs_add_bool("/core/sound/while_away", FALSE);
-
+ gaim_prefs_add_int("/core/sound/while_status", STATUS_AVAILABLE);
}
void
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sea...@us...> - 2006-11-01 00:57:46
|
Revision: 17642
http://svn.sourceforge.net/gaim/?rev=17642&view=rev
Author: seanegan
Date: 2006-10-31 16:57:39 -0800 (Tue, 31 Oct 2006)
Log Message:
-----------
Show icon pref. No way to change it yet (other than your editor)
Modified Paths:
--------------
trunk/gtk/gtkdocklet-x11.c
trunk/gtk/gtkdocklet.c
Modified: trunk/gtk/gtkdocklet-x11.c
===================================================================
--- trunk/gtk/gtkdocklet-x11.c 2006-10-31 23:01:39 UTC (rev 17641)
+++ trunk/gtk/gtkdocklet-x11.c 2006-11-01 00:57:39 UTC (rev 17642)
@@ -208,8 +208,11 @@
{
g_return_if_fail(docklet != NULL);
+ if (embed_timeout)
+ g_source_remove(embed_timeout);
+
gaim_gtk_docklet_remove();
-
+
g_signal_handlers_disconnect_by_func(G_OBJECT(docklet), G_CALLBACK(docklet_x11_destroyed_cb), NULL);
gtk_widget_destroy(GTK_WIDGET(docklet));
Modified: trunk/gtk/gtkdocklet.c
===================================================================
--- trunk/gtk/gtkdocklet.c 2006-10-31 23:01:39 UTC (rev 17641)
+++ trunk/gtk/gtkdocklet.c 2006-11-01 00:57:39 UTC (rev 17642)
@@ -120,6 +120,18 @@
/* determine if any ims have unseen messages */
convs = get_pending_list(DOCKLET_TOOLTIP_LINE_LIMIT);
+ if (!strcmp(gaim_prefs_get_string("/gaim/gtk/docklet/show"), "pending")) {
+ if (convs && ui_ops->create && !visibility_manager) {
+ ui_ops->create();
+ return FALSE;
+ } else if (!convs && ui_ops->destroy && visibility_manager) {
+ ui_ops->destroy();
+ return FALSE;
+ } else if (!visibility_manager) {
+ return FALSE;
+ }
+ }
+
if (convs != NULL) {
pending = TRUE;
@@ -561,7 +573,8 @@
gaim_gtk_docklet_embedded()
{
if (!visibility_manager) {
- gaim_gtk_blist_visibility_manager_add();
+ if (strcmp(gaim_prefs_get_string("/gaim/gtk/docklet/show"),"pending"))
+ gaim_gtk_blist_visibility_manager_add();
visibility_manager = TRUE;
}
docklet_update_status();
@@ -574,7 +587,12 @@
{
if (visibility_manager) {
gaim_gtk_blist_visibility_manager_remove();
+ if (docklet_blinking_timer) {
+ g_source_remove(docklet_blinking_timer);
+ docklet_blinking_timer = 0;
+ }
visibility_manager = FALSE;
+ status = DOCKLET_STATUS_OFFLINE;
}
}
@@ -604,8 +622,9 @@
gaim_prefs_add_string("/gaim/gtk/docklet/show", "always");
docklet_ui_init();
- if (ui_ops && ui_ops->create)
+ if (!strcmp(gaim_prefs_get_string("/gaim/gtk/docklet/show"), "always") && ui_ops && ui_ops->create)
ui_ops->create();
+
gaim_signal_connect(conn_handle, "signed-on",
docklet_handle, GAIM_CALLBACK(docklet_signed_on_cb), NULL);
gaim_signal_connect(conn_handle, "signed-off",
@@ -631,6 +650,6 @@
void
gaim_gtk_docklet_uninit()
{
- if (ui_ops && ui_ops->destroy)
+ if (visibility_manager && ui_ops && ui_ops->destroy)
ui_ops->destroy();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-10-31 23:01:43
|
Revision: 17641
http://svn.sourceforge.net/gaim/?rev=17641&view=rev
Author: sadrul
Date: 2006-10-31 15:01:39 -0800 (Tue, 31 Oct 2006)
Log Message:
-----------
Registering the same action causes crashes. Register action once with a default
binding, and then register other bindings for that action if necessary.
Modified Paths:
--------------
trunk/console/libgnt/gntentry.c
Modified: trunk/console/libgnt/gntentry.c
===================================================================
--- trunk/console/libgnt/gntentry.c 2006-10-31 21:36:27 UTC (rev 17640)
+++ trunk/console/libgnt/gntentry.c 2006-10-31 23:01:39 UTC (rev 17641)
@@ -573,12 +573,10 @@
NULL, NULL);
gnt_widget_class_register_action(parent_class, "cursor-prev", move_back,
"\033" GNT_KEY_LEFT, NULL);
- gnt_widget_class_register_action(parent_class, "cursor-prev", move_back,
- GNT_KEY_CTRL_B, NULL);
+ gnt_widget_register_binding(parent_class, "cursor-prev", GNT_KEY_CTRL_B, NULL);
gnt_widget_class_register_action(parent_class, "cursor-next", move_forward,
"\033" GNT_KEY_RIGHT, NULL);
- gnt_widget_class_register_action(parent_class, "cursor-next", move_forward,
- GNT_KEY_CTRL_F, NULL);
+ gnt_widget_register_binding(parent_class, "cursor-next", GNT_KEY_CTRL_F, NULL);
gnt_widget_class_register_action(parent_class, "suggest-show", suggest_show,
"\t", NULL);
gnt_widget_class_register_action(parent_class, "suggest-next", suggest_next,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ebl...@us...> - 2006-10-31 21:36:34
|
Revision: 17640
http://svn.sourceforge.net/gaim/?rev=17640&view=rev
Author: eblanton
Date: 2006-10-31 13:36:27 -0800 (Tue, 31 Oct 2006)
Log Message:
-----------
C-b and C-f should move the cursor back and forward, respectively, in gntentry
Modified Paths:
--------------
trunk/console/libgnt/gntentry.c
Modified: trunk/console/libgnt/gntentry.c
===================================================================
--- trunk/console/libgnt/gntentry.c 2006-10-31 20:47:51 UTC (rev 17639)
+++ trunk/console/libgnt/gntentry.c 2006-10-31 21:36:27 UTC (rev 17640)
@@ -573,8 +573,12 @@
NULL, NULL);
gnt_widget_class_register_action(parent_class, "cursor-prev", move_back,
"\033" GNT_KEY_LEFT, NULL);
+ gnt_widget_class_register_action(parent_class, "cursor-prev", move_back,
+ GNT_KEY_CTRL_B, NULL);
gnt_widget_class_register_action(parent_class, "cursor-next", move_forward,
"\033" GNT_KEY_RIGHT, NULL);
+ gnt_widget_class_register_action(parent_class, "cursor-next", move_forward,
+ GNT_KEY_CTRL_F, NULL);
gnt_widget_class_register_action(parent_class, "suggest-show", suggest_show,
"\t", NULL);
gnt_widget_class_register_action(parent_class, "suggest-next", suggest_next,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ev...@us...> - 2006-10-31 20:47:56
|
Revision: 17639
http://svn.sourceforge.net/gaim/?rev=17639&view=rev
Author: evands
Date: 2006-10-31 12:47:51 -0800 (Tue, 31 Oct 2006)
Log Message:
-----------
Use the PACKAGE_NAME #define rather than hardcoding 'Gaim'. This should be no change for Gaim users, but means that compiling with a name of 'libgaim' reflects the user-agent properly, and that makes me a happy penguin.
Modified Paths:
--------------
trunk/libgaim/protocols/msn/msg.c
Modified: trunk/libgaim/protocols/msn/msg.c
===================================================================
--- trunk/libgaim/protocols/msn/msg.c 2006-10-31 17:47:57 UTC (rev 17638)
+++ trunk/libgaim/protocols/msn/msg.c 2006-10-31 20:47:51 UTC (rev 17639)
@@ -121,7 +121,7 @@
char *message_cr;
msg = msn_message_new(MSN_MSG_TEXT);
- msn_message_set_attr(msg, "User-Agent", "Gaim/" VERSION);
+ msn_message_set_attr(msg, "User-Agent", PACKAGE_NAME "/" VERSION);
msn_message_set_content_type(msg, "text/plain");
msn_message_set_charset(msg, "UTF-8");
msn_message_set_flag(msg, 'A');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lsc...@us...> - 2006-10-31 17:48:06
|
Revision: 17638
http://svn.sourceforge.net/gaim/?rev=17638&view=rev
Author: lschiere
Date: 2006-10-31 09:47:57 -0800 (Tue, 31 Oct 2006)
Log Message:
-----------
assigning responsibility as requested in the tracker item
Modified Paths:
--------------
trunk/gtk/gtkdialogs.c
trunk/po/ChangeLog
Modified: trunk/gtk/gtkdialogs.c
===================================================================
--- trunk/gtk/gtkdialogs.c 2006-10-31 08:26:10 UTC (rev 17637)
+++ trunk/gtk/gtkdialogs.c 2006-10-31 17:47:57 UTC (rev 17638)
@@ -167,7 +167,7 @@
{N_("Serbian"), "sr", "Aleksandar Urosevic", "ur...@us..."},
{N_("Slovak"), "sk", "Richard Golier", "go...@gm..."},
{N_("Slovenian"), "sl", "Matjaz Horvat", "ma...@ow..."},
- {N_("Albanian"), "sq", "Programe Shqip", "an...@us..."},
+ {N_("Albanian"), "sq", "Besnik Bleta", "be...@pr..."},
{N_("Swedish"), "sv", "Tore Lundqvist", "tl...@mi..."},
{N_("Tamil"), "ta", "Viveka Nathan K", "viv...@us..."},
{N_("Telugu"), "te", "Mr. Subbaramaih", "inf...@cd..."},
Modified: trunk/po/ChangeLog
===================================================================
--- trunk/po/ChangeLog 2006-10-31 08:26:10 UTC (rev 17637)
+++ trunk/po/ChangeLog 2006-10-31 17:47:57 UTC (rev 17638)
@@ -1,7 +1,7 @@
Gaim: The Pimpin' Penguin IM Clone that's good for the soul!
version 2.0.0:
- * Albanian translation updated (Programe Shqip)
+ * Albanian translation updated (Besnik Bleta)
* Arabic translation added (Mohamed Magdy)
* Bengali translation added (INDRANIL DAS GUPTA and Samia Nimatullah)
* Bosnian translation added (Lejla Hadzialic)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-10-31 08:26:21
|
Revision: 17637
http://svn.sourceforge.net/gaim/?rev=17637&view=rev
Author: thekingant
Date: 2006-10-31 00:26:10 -0800 (Tue, 31 Oct 2006)
Log Message:
-----------
Kevin noticed that I'd forgotten to document this
Modified Paths:
--------------
trunk/libgaim/proxy.h
Modified: trunk/libgaim/proxy.h
===================================================================
--- trunk/libgaim/proxy.h 2006-10-31 04:40:05 UTC (rev 17636)
+++ trunk/libgaim/proxy.h 2006-10-31 08:26:10 UTC (rev 17637)
@@ -224,6 +224,11 @@
* connect," it is used for establishing any outgoing TCP connection,
* whether through a proxy or not.
*
+ * @param handle A handle that should be associated with this
+ * connection attempt. The handle can be used
+ * to cancel the connection attempt using the
+ * gaim_proxy_connect_cancel_with_handle()
+ * function.
* @param account The account making the connection.
* @param host The destination host.
* @param port The destination port.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-10-31 04:40:43
|
Revision: 17636
http://svn.sourceforge.net/gaim/?rev=17636&view=rev
Author: datallah
Date: 2006-10-30 20:40:05 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
Fix default language selection to be your current Windows language.
Commit language changes I forgot to commit.
Modified Paths:
--------------
trunk/gaim-installer.nsi
trunk/gtk/win32/nsis/translations/albanian.nsh
trunk/gtk/win32/nsis/translations/bulgarian.nsh
trunk/gtk/win32/nsis/translations/catalan.nsh
trunk/gtk/win32/nsis/translations/czech.nsh
trunk/gtk/win32/nsis/translations/danish.nsh
trunk/gtk/win32/nsis/translations/dutch.nsh
trunk/gtk/win32/nsis/translations/english.nsh
trunk/gtk/win32/nsis/translations/finnish.nsh
trunk/gtk/win32/nsis/translations/french.nsh
trunk/gtk/win32/nsis/translations/galician.nsh
trunk/gtk/win32/nsis/translations/german.nsh
trunk/gtk/win32/nsis/translations/hebrew.nsh
trunk/gtk/win32/nsis/translations/hungarian.nsh
trunk/gtk/win32/nsis/translations/italian.nsh
trunk/gtk/win32/nsis/translations/japanese.nsh
trunk/gtk/win32/nsis/translations/korean.nsh
trunk/gtk/win32/nsis/translations/kurdish.nsh
trunk/gtk/win32/nsis/translations/lithuanian.nsh
trunk/gtk/win32/nsis/translations/norwegian.nsh
trunk/gtk/win32/nsis/translations/polish.nsh
trunk/gtk/win32/nsis/translations/portuguese-br.nsh
trunk/gtk/win32/nsis/translations/portuguese.nsh
trunk/gtk/win32/nsis/translations/romanian.nsh
trunk/gtk/win32/nsis/translations/russian.nsh
trunk/gtk/win32/nsis/translations/serbian-latin.nsh
trunk/gtk/win32/nsis/translations/simp-chinese.nsh
trunk/gtk/win32/nsis/translations/slovak.nsh
trunk/gtk/win32/nsis/translations/slovenian.nsh
trunk/gtk/win32/nsis/translations/spanish.nsh
trunk/gtk/win32/nsis/translations/swedish.nsh
trunk/gtk/win32/nsis/translations/trad-chinese.nsh
trunk/gtk/win32/nsis/translations/valencian.nsh
trunk/gtk/win32/nsis/translations/vietnamese.nsh
Modified: trunk/gaim-installer.nsi
===================================================================
--- trunk/gaim-installer.nsi 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gaim-installer.nsi 2006-10-31 04:40:05 UTC (rev 17636)
@@ -1096,8 +1096,10 @@
${GetParameters} $R0
ClearErrors
- ${GetOptions} $R0 "/L=" $LANGUAGE
- IfErrors 0 skip_lang
+ ${GetOptions} $R0 "/L=" $R0
+ IfErrors +3
+ StrCpy $LANGUAGE $R0
+ Goto skip_lang
; Select Language
; Display Language selection dialog
Modified: trunk/gtk/win32/nsis/translations/albanian.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/albanian.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/albanian.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -9,7 +9,7 @@
;;
; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED "Ose mungon mjedisi GTK+ runtime ose lyp përditësim.$\rJu lutem instaloni GTK+ runtime v${GTK_VERSION} ose më të vonshëm"
+!define GTK_INSTALLER_NEEDED "Ose mungon mjedisi GTK+ runtime ose lyp përditësim.$\rJu lutem instaloni GTK+ runtime v${GTK_MIN_VERSION} ose më të vonshëm"
; License Page
!define GAIM_LICENSE_BUTTON "Më tej >"
Modified: trunk/gtk/win32/nsis/translations/bulgarian.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/bulgarian.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/bulgarian.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -9,7 +9,7 @@
; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED "GTK+ runtime \xEB\xE8\xEF\xF1\xE2\xE0 \xE8\xEB\xE8 \xF2\xF0\xFF\xE1\xE2\xE0 \xE4\xE0 \xE1\xFA\xE4\xE5 \xEE\xE1\xED\xEE\xE2\xE5\xED\xE0.$\r\xCC\xEE\xEB\xFF \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xE9\xF2\xE5 \xE2\xE5\xF0\xF1\xE8\xFF v${GTK_VERSION} \xE8\xEB\xE8 \xEF\xEE-\xED\xEE\xE2\xE0"
+!define GTK_INSTALLER_NEEDED "GTK+ runtime \xEB\xE8\xEF\xF1\xE2\xE0 \xE8\xEB\xE8 \xF2\xF0\xFF\xE1\xE2\xE0 \xE4\xE0 \xE1\xFA\xE4\xE5 \xEE\xE1\xED\xEE\xE2\xE5\xED\xE0.$\r\xCC\xEE\xEB\xFF \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xE9\xF2\xE5 \xE2\xE5\xF0\xF1\xE8\xFF v${GTK_MIN_VERSION} \xE8\xEB\xE8 \xEF\xEE-\xED\xEE\xE2\xE0"
; Components Page
!define GAIM_SECTION_TITLE "Gaim \xCA\xEB\xE8\xE5\xED\xF2 \xE7\xE0 \xC1\xFA\xF0\xE7\xE8 \xD1\xFA\xEE\xE1\xF9\xE5\xED\xE8\xFF (\xE8\xE7\xE8\xF1\xEA\xE2\xE0 \xF1\xE5)"
Modified: trunk/gtk/win32/nsis/translations/catalan.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/catalan.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/catalan.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -12,7 +12,7 @@
; Startup Checks
!define INSTALLER_IS_RUNNING "L'instal.lador encara est\xE0 executant-se."
!define GAIM_IS_RUNNING "Hi ha una inst\xE0ncia del Gaim executant-se. Surt del Gaim i torna a intentar-ho."
-!define GTK_INSTALLER_NEEDED "L'entorn d'execuci\xF3 GTK+ no existeix o necessita \xE9sser actualitzat.$\rSius plau instal.la la versi\xF3${GTK_VERSION} o superior de l'entonr GTK+"
+!define GTK_INSTALLER_NEEDED "L'entorn d'execuci\xF3 GTK+ no existeix o necessita \xE9sser actualitzat.$\rSius plau instal.la la versi\xF3${GTK_MIN_VERSION} o superior de l'entonr GTK+"
; License Page
!define GAIM_LICENSE_BUTTON "Seg\xFCent >"
Modified: trunk/gtk/win32/nsis/translations/czech.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/czech.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/czech.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -9,7 +9,7 @@
;;
; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED "GTK+ runtime bu\xEFto chyb\xED, nebo je pot\xF8eba prov\xE9st upgrade.$\rProve\xEFte instalaci verze${GTK_VERSION} nebo vy\x9A\x9A\xED."
+!define GTK_INSTALLER_NEEDED "GTK+ runtime bu\xEFto chyb\xED, nebo je pot\xF8eba prov\xE9st upgrade.$\rProve\xEFte instalaci verze${GTK_MIN_VERSION} nebo vy\x9A\x9A\xED."
; License Page
!define GAIM_LICENSE_BUTTON "Dal\x9A\xED >"
Modified: trunk/gtk/win32/nsis/translations/danish.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/danish.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/danish.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -9,7 +9,7 @@
;;
; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED "GTK+ runtime environment enten mangler eller skal opgraderes.$\rInstall\xE9r venligst GTK+ runtime version v${GTK_VERSION} eller h\xF8jere."
+!define GTK_INSTALLER_NEEDED "GTK+ runtime environment enten mangler eller skal opgraderes.$\rInstall\xE9r venligst GTK+ runtime version v${GTK_MIN_VERSION} eller h\xF8jere."
; License Page
!define GAIM_LICENSE_BUTTON "N\xE6ste >"
Modified: trunk/gtk/win32/nsis/translations/dutch.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/dutch.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/dutch.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -11,7 +11,7 @@
; Startup Checks
!define INSTALLER_IS_RUNNING "Er is al een installatie actief."
!define GAIM_IS_RUNNING "Gaim wordt op dit moment uitgevoerd. Sluit Gaim af en start de installatie opnieuw."
-!define GTK_INSTALLER_NEEDED "De GTK+ runtime-omgeving is niet aanwezig of moet vernieuwd worden.$\rInstalleer v${GTK_VERSION} of nieuwer van de GTK+ runtime-omgeving"
+!define GTK_INSTALLER_NEEDED "De GTK+ runtime-omgeving is niet aanwezig of moet vernieuwd worden.$\rInstalleer v${GTK_MIN_VERSION} of nieuwer van de GTK+ runtime-omgeving"
; License Page
Modified: trunk/gtk/win32/nsis/translations/english.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/english.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/english.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -14,7 +14,7 @@
; Startup Checks
!insertmacro GAIM_MACRO_DEFAULT_STRING INSTALLER_IS_RUNNING "The installer is already running."
!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_IS_RUNNING "An instance of Gaim is currently running. Exit Gaim and then try again."
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_INSTALLER_NEEDED "The GTK+ runtime environment is either missing or needs to be upgraded.$\rPlease install v${GTK_VERSION} or higher of the GTK+ runtime"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_INSTALLER_NEEDED "The GTK+ runtime environment is either missing or needs to be upgraded.$\rPlease install v${GTK_MIN_VERSION} or higher of the GTK+ runtime"
; License Page
!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_LICENSE_BUTTON "Next >"
Modified: trunk/gtk/win32/nsis/translations/finnish.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/finnish.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/finnish.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -9,7 +9,7 @@
;;
; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED "GTK+ runtime ymp\xE4rist\xF6 joko puuttuu tai tarvitsee p\xE4ivityst\xE4.$\rOle hyv\xE4 ja asenna v${GTK_VERSION} tai uudempi GTK+ runtime"
+!define GTK_INSTALLER_NEEDED "GTK+ runtime ymp\xE4rist\xF6 joko puuttuu tai tarvitsee p\xE4ivityst\xE4.$\rOle hyv\xE4 ja asenna v${GTK_MIN_VERSION} tai uudempi GTK+ runtime"
; License Page
!define GAIM_LICENSE_BUTTON "Seuraava >"
Modified: trunk/gtk/win32/nsis/translations/french.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/french.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/french.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -15,7 +15,7 @@
; Startup Checks
!define INSTALLER_IS_RUNNING "Le programme d'installation est d\xE9j\xE0 en cours d'ex\xE9cution."
!define GAIM_IS_RUNNING "Une instance de Gaim est en cours d'ex\xE9cution. Veuillez quitter Gaim et r\xE9essayer."
-!define GTK_INSTALLER_NEEDED "Les biblioth\xE8ques de l'environnement GTK+ ne sont pas install\xE9es ou ont besoin d'une mise \xE0 jour.$\rVeuillez installer la version ${GTK_VERSION} ou plus r\xE9cente des biblioth\xE8ques GTK+."
+!define GTK_INSTALLER_NEEDED "Les biblioth\xE8ques de l'environnement GTK+ ne sont pas install\xE9es ou ont besoin d'une mise \xE0 jour.$\rVeuillez installer la version ${GTK_MIN_VERSION} ou plus r\xE9cente des biblioth\xE8ques GTK+."
; License Page
!define GAIM_LICENSE_BUTTON "Suivant >"
Modified: trunk/gtk/win32/nsis/translations/galician.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/galician.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/galician.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -9,7 +9,7 @@
;;
; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED "O entorno de execuci\xF3n de GTK+ falta ou necesita ser actualizado.$\rPor favor, instale a versi\xF3n v${GTK_VERSION} do executable GTK+ ou algunha posterior."
+!define GTK_INSTALLER_NEEDED "O entorno de execuci\xF3n de GTK+ falta ou necesita ser actualizado.$\rPor favor, instale a versi\xF3n v${GTK_MIN_VERSION} do executable GTK+ ou algunha posterior."
; License Page
!define GAIM_LICENSE_BUTTON "Seguinte >"
Modified: trunk/gtk/win32/nsis/translations/german.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/german.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/german.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -12,7 +12,7 @@
; Startup checks
!define INSTALLER_IS_RUNNING "Der Installer l\xE4uft schon."
!define GAIM_IS_RUNNING "Eine Instanz von Gaim l\xE4uft momentan schon. Beenden Sie Gaim und versuchen Sie es nochmal."
-!define GTK_INSTALLER_NEEDED "Die GTK+ Runtime Umgebung fehlt entweder oder mu\xDF aktualisiert werden.$\rBitte installieren Sie v${GTK_VERSION} oder h\xF6her der GTK+ Runtime"
+!define GTK_INSTALLER_NEEDED "Die GTK+ Runtime Umgebung fehlt entweder oder mu\xDF aktualisiert werden.$\rBitte installieren Sie v${GTK_MIN_VERSION} oder h\xF6her der GTK+ Runtime"
; License Page
!define GAIM_LICENSE_BUTTON "Weiter >"
Modified: trunk/gtk/win32/nsis/translations/hebrew.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/hebrew.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/hebrew.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -9,7 +9,7 @@
;;
; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED ".\xEC\xE0 \xF0\xEE\xF6\xE0\xFA \xE0\xE5 \xF6\xF8\xE9\xEB\xE4 \xF9\xE9\xE3\xF8\xE5\xE2 GTK+ \xF1\xE1\xE9\xE1\xFA$\r\xE1\xE1\xF7\xF9\xE4 \xE4\xFA\xF7\xEF v${GTK_VERSION} .GTK+ \xE0\xE5 \xE2\xE1\xE5\xE4\xE4 \xE9\xE5\xFA\xF8 \xF9\xEC \xF1\xE1\xE9\xE1\xFA"
+!define GTK_INSTALLER_NEEDED ".\xEC\xE0 \xF0\xEE\xF6\xE0\xFA \xE0\xE5 \xF6\xF8\xE9\xEB\xE4 \xF9\xE9\xE3\xF8\xE5\xE2 GTK+ \xF1\xE1\xE9\xE1\xFA$\r\xE1\xE1\xF7\xF9\xE4 \xE4\xFA\xF7\xEF v${GTK_MIN_VERSION} .GTK+ \xE0\xE5 \xE2\xE1\xE5\xE4\xE4 \xE9\xE5\xFA\xF8 \xF9\xEC \xF1\xE1\xE9\xE1\xFA"
; License Page
!define GAIM_LICENSE_BUTTON "\xE4\xE1\xE0 >"
Modified: trunk/gtk/win32/nsis/translations/hungarian.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/hungarian.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/hungarian.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -9,7 +9,7 @@
;;
; Startup Checks
-!define GTK_INSTALLER_NEEDED "A GTK+ futtat\xF3 k\xF6rnyezet hi\xE1nyzik vagy friss\xEDt\xE9se sz\xFCks\xE9ges.$\rK\xE9rem telep\xEDtse a v${GTK_VERSION} vagy magasabb verzi\xF3j\xFA GTK+ futtat\xF3 k\xF6rnyezetet."
+!define GTK_INSTALLER_NEEDED "A GTK+ futtat\xF3 k\xF6rnyezet hi\xE1nyzik vagy friss\xEDt\xE9se sz\xFCks\xE9ges.$\rK\xE9rem telep\xEDtse a v${GTK_MIN_VERSION} vagy magasabb verzi\xF3j\xFA GTK+ futtat\xF3 k\xF6rnyezetet."
!define INSTALLER_IS_RUNNING "A telep\xEDto m\xE1r fut."
!define GAIM_IS_RUNNING "Jelenleg fut a Gaim egy p\xE9ld\xE1nya. L\xE9pjen ki a Gaimb\xF3l \xE9s azut\xE1n pr\xF3b\xE1lja \xFAjra."
Modified: trunk/gtk/win32/nsis/translations/italian.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/italian.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/italian.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -9,7 +9,7 @@
;;
; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED "L'ambiente di runtime GTK+ non \xE8 presente o deve essere aggiornato.$\rInstallare GTK+ versione ${GTK_VERSION} o maggiore"
+!define GTK_INSTALLER_NEEDED "L'ambiente di runtime GTK+ non \xE8 presente o deve essere aggiornato.$\rInstallare GTK+ versione ${GTK_MIN_VERSION} o maggiore"
; License Page
!define GAIM_LICENSE_BUTTON "Avanti >"
Modified: trunk/gtk/win32/nsis/translations/japanese.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/japanese.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/japanese.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -12,7 +12,7 @@
; Startup Checks
!define INSTALLER_IS_RUNNING "\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xAA\x8A\xF9\x82Ɏ\xC0\x8Ds\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7"
!define GAIM_IS_RUNNING "Gaim \x82\xAA\x8E\xC0\x8Ds\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7\x81BGaim \x82\xF0\x8FI\x97\xB9\x82\xB5\x82Ă\xA9\x82\xE7\x8Dēx\x8E\xC0\x8Ds\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2"
-!define GTK_INSTALLER_NEEDED "GTK+\x83\x89\x83\x93\x83^\x83C\x83\x80\x8A\xAB\x82\xAA\x96\xB3\x82\xA2\x82\xA9\x82\xE0\x82\xB5\x82\xAD\x82̓A\x83b\x83v\x83O\x83\x8C\x81[\x83h\x82\xB7\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B$\rv${GTK_VERSION}\x82\xE0\x82\xB5\x82\xAD\x82͂\xBB\x82\xEA\x88ȏ\xE3\x82\xCCGTK+\x83\x89\x83\x93\x83^\x83C\x83\x80\x82\xF0\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B"
+!define GTK_INSTALLER_NEEDED "GTK+\x83\x89\x83\x93\x83^\x83C\x83\x80\x8A\xAB\x82\xAA\x96\xB3\x82\xA2\x82\xA9\x82\xE0\x82\xB5\x82\xAD\x82̓A\x83b\x83v\x83O\x83\x8C\x81[\x83h\x82\xB7\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B$\rv${GTK_MIN_VERSION}\x82\xE0\x82\xB5\x82\xAD\x82͂\xBB\x82\xEA\x88ȏ\xE3\x82\xCCGTK+\x83\x89\x83\x93\x83^\x83C\x83\x80\x82\xF0\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B"
; License Page
!define GAIM_LICENSE_BUTTON "\x8E\x9F\x82\xD6 >"
Modified: trunk/gtk/win32/nsis/translations/korean.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/korean.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/korean.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -8,7 +8,7 @@
;;
; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED "GTK+ \xB7\xB1Ÿ\xC0\xD3 ȯ\xB0濡 \xB9\xAE\xC1\xA6\xB0\xA1 \xC0ְų\xAA \xBE\xF7\xB1\xB9\xC0̵尡 \xC7ʿ\xE4\xC7մϴ\xD9.$\rGTK+ \xB7\xB1Ÿ\xC0\xD3 ȯ\xB0\xE6\xC0\xBB v${GTK_VERSION}\xC0̳\xAA \xB1\xD7 \xC0̻\xF3 \xB9\xF6\xC0\xFC\xC0\xB8\xB7\xCE \xBC\xB3ġ\xC7\xD8\xC1ּ\xBC\xBF\xE4."
+!define GTK_INSTALLER_NEEDED "GTK+ \xB7\xB1Ÿ\xC0\xD3 ȯ\xB0濡 \xB9\xAE\xC1\xA6\xB0\xA1 \xC0ְų\xAA \xBE\xF7\xB1\xB9\xC0̵尡 \xC7ʿ\xE4\xC7մϴ\xD9.$\rGTK+ \xB7\xB1Ÿ\xC0\xD3 ȯ\xB0\xE6\xC0\xBB v${GTK_MIN_VERSION}\xC0̳\xAA \xB1\xD7 \xC0̻\xF3 \xB9\xF6\xC0\xFC\xC0\xB8\xB7\xCE \xBC\xB3ġ\xC7\xD8\xC1ּ\xBC\xBF\xE4."
; Components Page
!define GAIM_SECTION_TITLE "\xB0\xA1\xC0\xD3 \xB8\xC5\xC0\xFA (\xC7ʼ\xF6)"
Modified: trunk/gtk/win32/nsis/translations/kurdish.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/kurdish.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/kurdish.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -12,7 +12,7 @@
; Startup Checks
!define INSTALLER_IS_RUNNING "Sazker jixwe dime\xFEe."
!define GAIM_IS_RUNNING "Gaim niha jixwe dime\xFEe. Ji Gaim\xEA derkeve \xFB careke din bicerib\xEEne."
-!define GTK_INSTALLER_NEEDED "Derdora runtime ya GTK+ an tune an rojanekirina w\xEA p\xEAw\xEEst e. $\rJi kerema xwe v${GTK_VERSION} an bilindtir a GTK+ saz bike."
+!define GTK_INSTALLER_NEEDED "Derdora runtime ya GTK+ an tune an rojanekirina w\xEA p\xEAw\xEEst e. $\rJi kerema xwe v${GTK_MIN_VERSION} an bilindtir a GTK+ saz bike."
; License Page
!define GAIM_LICENSE_BUTTON "P\xEA\xFE >"
Modified: trunk/gtk/win32/nsis/translations/lithuanian.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/lithuanian.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/lithuanian.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -9,7 +9,7 @@
; Startup Checks
!define INSTALLER_IS_RUNNING "Diegimo programa jau paleista."
!define GAIM_IS_RUNNING "\xD0iuo metu Gaim yra paleistas. U\xFEdarykite \xF0i\xE0 program\xE0 ir pabandykite i\xF0 naujo."
-!define GTK_INSTALLER_NEEDED "GTK+ vykdymo meto aplinkos n\xEBra arba ji turi b\xFBti atnaujinta.$\r\xC1diekite v${GTK_VERSION} arba naujesn\xE6 GTK+ vykdymo meto aplinkos versij\xE0"
+!define GTK_INSTALLER_NEEDED "GTK+ vykdymo meto aplinkos n\xEBra arba ji turi b\xFBti atnaujinta.$\r\xC1diekite v${GTK_MIN_VERSION} arba naujesn\xE6 GTK+ vykdymo meto aplinkos versij\xE0"
; License Page
!define GAIM_LICENSE_BUTTON "Toliau >"
Modified: trunk/gtk/win32/nsis/translations/norwegian.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/norwegian.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/norwegian.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -11,7 +11,7 @@
; Startup Checks
!define INSTALLER_IS_RUNNING "Installeren kj\xF8rer allerede."
!define GAIM_IS_RUNNING "En instans av Gaim kj\xF8rer fra f\xF8r. Avslutt Gaim og pr\xF8v igjen."
-!define GTK_INSTALLER_NEEDED "GTK+ runtime environment mangler eller trenger en oppgradering.$\rVennligst install\xE9r GTK+ v${GTK_VERSION} eller h\xF8yere"
+!define GTK_INSTALLER_NEEDED "GTK+ runtime environment mangler eller trenger en oppgradering.$\rVennligst install\xE9r GTK+ v${GTK_MIN_VERSION} eller h\xF8yere"
; License Page
!define GAIM_LICENSE_BUTTON "Neste >"
Modified: trunk/gtk/win32/nsis/translations/polish.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/polish.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/polish.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -9,7 +9,7 @@
;;
; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED "Runtime \x9Crodowiska GTK+ zosta\xB3 zagubiony lub wymaga upgrade-u.$\r Prosz\xEA zainstaluj v${GTK_VERSION} albo wy\xBFsz\xB9 wersj\xEA runtime-u GTK+."
+!define GTK_INSTALLER_NEEDED "Runtime \x9Crodowiska GTK+ zosta\xB3 zagubiony lub wymaga upgrade-u.$\r Prosz\xEA zainstaluj v${GTK_MIN_VERSION} albo wy\xBFsz\xB9 wersj\xEA runtime-u GTK+."
; License Page
!define GAIM_LICENSE_BUTTON "Dalej >"
Modified: trunk/gtk/win32/nsis/translations/portuguese-br.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/portuguese-br.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/portuguese-br.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -9,7 +9,7 @@
;;
; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED "O ambiente de tempo de execu\xE7\xE3o do GTK+ est\xE1 ausente ou precisa ser atualizado.$\rFavor instalar a vers\xE3o v${GTK_VERSION} ou superior do ambiente de tempo de execu\xE7\xE3o do GTK+."
+!define GTK_INSTALLER_NEEDED "O ambiente de tempo de execu\xE7\xE3o do GTK+ est\xE1 ausente ou precisa ser atualizado.$\rFavor instalar a vers\xE3o v${GTK_MIN_VERSION} ou superior do ambiente de tempo de execu\xE7\xE3o do GTK+."
; License Page
!define GAIM_LICENSE_BUTTON "Avan\xE7ar >"
Modified: trunk/gtk/win32/nsis/translations/portuguese.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/portuguese.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/portuguese.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -11,7 +11,7 @@
; Startup Checks
!define INSTALLER_IS_RUNNING "O instalador j\xE1 est\xE1 a ser executado."
!define GAIM_IS_RUNNING "Uma inst\xE2ncia do Gaim j\xE1 est\xE1 a ser executada. Saia do Gaim e tente de novo."
-!define GTK_INSTALLER_NEEDED "O ambiente de GTK+ est\xE1 ausente ou precisa de ser actualizado.$\rPor favor instale a vers\xE3o v${GTK_VERSION} ou mais recente do ambiente de GTK+."
+!define GTK_INSTALLER_NEEDED "O ambiente de GTK+ est\xE1 ausente ou precisa de ser actualizado.$\rPor favor instale a vers\xE3o v${GTK_MIN_VERSION} ou mais recente do ambiente de GTK+."
; License Page
!define GAIM_LICENSE_BUTTON "Seguinte >"
Modified: trunk/gtk/win32/nsis/translations/romanian.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/romanian.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/romanian.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -10,7 +10,7 @@
; Startup Checks
!define INSTALLER_IS_RUNNING "Instalarea este deja pornit\xE3."
!define GAIM_IS_RUNNING "O instan\xFE\xE3 a programului Gaim este deja pornit\xE3. \xCEnchide\xFEi-o \xBAi \xEEncerca\xFEi din nou."
-!define GTK_INSTALLER_NEEDED "Mediul GTK+ nu e prezent sau ave\xFEi o versiune prea veche.$\rInstala\xFEi cel pu\xFEin versiunea v${GTK_VERSION} a mediului GTK+"
+!define GTK_INSTALLER_NEEDED "Mediul GTK+ nu e prezent sau ave\xFEi o versiune prea veche.$\rInstala\xFEi cel pu\xFEin versiunea v${GTK_MIN_VERSION} a mediului GTK+"
; License Page
!define GAIM_LICENSE_BUTTON "\xCEnainte >"
Modified: trunk/gtk/win32/nsis/translations/russian.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/russian.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/russian.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -9,7 +9,7 @@
;;
; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED "\xCE\xEA\xF0\xF3\xE6\xE5\xED\xE8\xE5 \xE4\xEB\xFF \xE7\xE0\xEF\xF3\xF1\xEA\xE0 GTK+ \xED\xE5\xE4\xEE\xF1\xF2\xF3\xEF\xED\xEE \xE8\xEB\xE8 \xED\xF3\xE6\xE4\xE0\xE5\xF2\xF1\xFF \xE2 \xEE\xE1\xED\xEE\xE2\xEB\xE5\xED\xE8\xE8.$\r\xCF\xEE\xE6\xE0\xEB\xF3\xE9\xF1\xF2\xE0 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xE5 v${GTK_VERSION} \xE8\xEB\xE8 \xE1\xEE\xEB\xE5\xE5 \xF1\xF2\xE0\xF0\xF8\xF3\xFE \xE2\xE5\xF0\xF1\xE8\xFE GTK+."
+!define GTK_INSTALLER_NEEDED "\xCE\xEA\xF0\xF3\xE6\xE5\xED\xE8\xE5 \xE4\xEB\xFF \xE7\xE0\xEF\xF3\xF1\xEA\xE0 GTK+ \xED\xE5\xE4\xEE\xF1\xF2\xF3\xEF\xED\xEE \xE8\xEB\xE8 \xED\xF3\xE6\xE4\xE0\xE5\xF2\xF1\xFF \xE2 \xEE\xE1\xED\xEE\xE2\xEB\xE5\xED\xE8\xE8.$\r\xCF\xEE\xE6\xE0\xEB\xF3\xE9\xF1\xF2\xE0 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xE5 v${GTK_MIN_VERSION} \xE8\xEB\xE8 \xE1\xEE\xEB\xE5\xE5 \xF1\xF2\xE0\xF0\xF8\xF3\xFE \xE2\xE5\xF0\xF1\xE8\xFE GTK+."
; License Page
!define GAIM_LICENSE_BUTTON "\xD1\xEB\xE5\xE4\xF3\xFE\xF9\xE5\xE5 >"
Modified: trunk/gtk/win32/nsis/translations/serbian-latin.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/serbian-latin.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/serbian-latin.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -8,7 +8,7 @@
;;
; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED "GTK+ okolina za izvr\x9Aavanje ili nije na\xF0ena ili se moraunaprediti.$\rMolimo instalirajte v${GTK_VERSION} ili ve\xE6u GTK+ okoline za izvr\x9Aavanje"
+!define GTK_INSTALLER_NEEDED "GTK+ okolina za izvr\x9Aavanje ili nije na\xF0ena ili se moraunaprediti.$\rMolimo instalirajte v${GTK_MIN_VERSION} ili ve\xE6u GTK+ okoline za izvr\x9Aavanje"
; Components Page
!define GAIM_SECTION_TITLE "Gaim klijent za brze poruke (neophodno)"
Modified: trunk/gtk/win32/nsis/translations/simp-chinese.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/simp-chinese.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/simp-chinese.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -11,7 +11,7 @@
; Startup GTK+ check
!define INSTALLER_IS_RUNNING "\xB0\xB2װ\xB3\xCC\xD0\xF2\xD2Ѿ\xAD\xD4\xCB\xD0С\xA3"
!define GAIM_IS_RUNNING "Gaim \xB5\xC4ʵ\xC0\xFD\xD5\xFD\xD4\xDA\xD4\xCB\xD0\xD0\xD6С\xA3\xC7\xEB\xCD˳\xF6 Gaim Ȼ\xBA\xF3\xD4\xD9\xCA\xD4һ\xB4Ρ\xA3"
-!define GTK_INSTALLER_NEEDED "\xBF\xC9\xC4\xDCȱ\xC9\xD9 GTK+ \xD4\xCB\xD0\xD0ʱ\xBF̻\xB7\xBE\xB3\xA3\xAC\xBB\xF2\xD5\xDF\xD0\xE8Ҫ\xB8\xFC\xD0¸û\xB7\xBE\xB3\xA1\xA3$\r\xC7밲װ v${GTK_VERSION} \xBB\xF2\xB8\xFC\xB8߰汾\xB5\xC4 GTK+ \xD4\xCB\xD0\xD0ʱ\xBF̻\xB7\xBE\xB3"
+!define GTK_INSTALLER_NEEDED "\xBF\xC9\xC4\xDCȱ\xC9\xD9 GTK+ \xD4\xCB\xD0\xD0ʱ\xBF̻\xB7\xBE\xB3\xA3\xAC\xBB\xF2\xD5\xDF\xD0\xE8Ҫ\xB8\xFC\xD0¸û\xB7\xBE\xB3\xA1\xA3$\r\xC7밲װ v${GTK_MIN_VERSION} \xBB\xF2\xB8\xFC\xB8߰汾\xB5\xC4 GTK+ \xD4\xCB\xD0\xD0ʱ\xBF̻\xB7\xBE\xB3"
; License Page
!define GAIM_LICENSE_BUTTON "\xCF\xC2һ\xB2\xBD >"
Modified: trunk/gtk/win32/nsis/translations/slovak.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/slovak.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/slovak.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -11,7 +11,7 @@
; Startup Checks
!define INSTALLER_IS_RUNNING "In\x9Atal\xE1cia je u\x9E spusten\xE1"
!define GAIM_IS_RUNNING "Gaim je pr\xE1ve spusten\xFD. Vypnite ho a sk\xFAste znova."
-!define GTK_INSTALLER_NEEDED "GTK+ runtime prostredie ch\xFDba alebo mus\xED by\x9D upgradovan\xE9.$\rNain\x9Atalujte, pros\xEDm, GTK+ runtime verziu v${GTK_VERSION}, alebo nov\x9Aiu"
+!define GTK_INSTALLER_NEEDED "GTK+ runtime prostredie ch\xFDba alebo mus\xED by\x9D upgradovan\xE9.$\rNain\x9Atalujte, pros\xEDm, GTK+ runtime verziu v${GTK_MIN_VERSION}, alebo nov\x9Aiu"
; License Page
!define GAIM_LICENSE_BUTTON "\xCFalej >"
Modified: trunk/gtk/win32/nsis/translations/slovenian.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/slovenian.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/slovenian.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -11,7 +11,7 @@
; Startup GTK+ check
!define INSTALLER_IS_RUNNING "Name\x9A\xE8anje \x9Ee poteka."
!define GAIM_IS_RUNNING "Trenutno \x9Ee te\xE8e razli\xE8ica Gaima. Prosimo zaprite Gaim in poskusite znova."
-!define GTK_INSTALLER_NEEDED "Izvajalno okolje GTK+ manjka ali pa ga je potrebno nadgraditi.$\rProsimo namestite v${GTK_VERSION} ali vi\x9Ajo razli\xE8ico izvajalnega okolja GTK+"
+!define GTK_INSTALLER_NEEDED "Izvajalno okolje GTK+ manjka ali pa ga je potrebno nadgraditi.$\rProsimo namestite v${GTK_MIN_VERSION} ali vi\x9Ajo razli\xE8ico izvajalnega okolja GTK+"
; License Page
!define GAIM_LICENSE_BUTTON "Naprej >"
Modified: trunk/gtk/win32/nsis/translations/spanish.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/spanish.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/spanish.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -9,7 +9,7 @@
;;
; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED "El entorno de ejecuci\xF3n de GTK+ falta o necesita ser actualizado.$\rPor favor, instale la versi\xF3n v${GTK_VERSION} del ejecutable GTK+ o alguna posterior."
+!define GTK_INSTALLER_NEEDED "El entorno de ejecuci\xF3n de GTK+ falta o necesita ser actualizado.$\rPor favor, instale la versi\xF3n v${GTK_MIN_VERSION} del ejecutable GTK+ o alguna posterior."
; License Page
!define GAIM_LICENSE_BUTTON "Siguiente >"
Modified: trunk/gtk/win32/nsis/translations/swedish.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/swedish.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/swedish.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -14,7 +14,7 @@
; Startup Checks
!define INSTALLER_IS_RUNNING "Installationsprogrammet k\xF6rs redan."
!define GAIM_IS_RUNNING "En instans av Giam k\xF6rs redan. Avsluta Gaim och f\xF6rs\xF6k igen."
-!define GTK_INSTALLER_NEEDED "K\xF6rmilj\xF6n GTK+ \xE4r antingen inte installerat eller beh\xF6ver uppgraderas.$\rVar god installera v${GTK_VERSION} eller h\xF6gre av GTK+-k\xF6rmilj\xF6n."
+!define GTK_INSTALLER_NEEDED "K\xF6rmilj\xF6n GTK+ \xE4r antingen inte installerat eller beh\xF6ver uppgraderas.$\rVar god installera v${GTK_MIN_VERSION} eller h\xF6gre av GTK+-k\xF6rmilj\xF6n."
; License Page
!define GAIM_LICENSE_BUTTON "N\xE4sta >"
Modified: trunk/gtk/win32/nsis/translations/trad-chinese.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/trad-chinese.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/trad-chinese.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -13,7 +13,7 @@
; Startup Checks
!define INSTALLER_IS_RUNNING "\xA6w\xB8˵{\xA6\xA1\xA5\xBF\xA6b\xB0\xF5\xA6椤\xA1C"
!define GAIM_IS_RUNNING "Gaim \xA5\xBF\xA6b\xB0\xF5\xA6椤\xA1A\xBDХ\xFD\xB5\xB2\xA7\xF4\xB3o\xADӵ{\xA6\xA1\xAB\xE1\xA6A\xA6\xE6\xA6w\xB8ˡC"
-!define GTK_INSTALLER_NEEDED "\xA7䤣\xA8\xEC\xB2ŦX\xAA\xBA GTK+ \xB0\xF5\xA6\xE6\xC0\xF4\xB9ҩάO\xBBݭn\xB3Q\xA7\xF3\xB7s\xA1C$\r\xBDЦw\xB8\xCB v${GTK_VERSION} \xA5H\xA4W\xAA\xA9\xA5\xBB\xAA\xBA GTK+ \xB0\xF5\xA6\xE6\xC0\xF4\xB9ҡC"
+!define GTK_INSTALLER_NEEDED "\xA7䤣\xA8\xEC\xB2ŦX\xAA\xBA GTK+ \xB0\xF5\xA6\xE6\xC0\xF4\xB9ҩάO\xBBݭn\xB3Q\xA7\xF3\xB7s\xA1C$\r\xBDЦw\xB8\xCB v${GTK_MIN_VERSION} \xA5H\xA4W\xAA\xA9\xA5\xBB\xAA\xBA GTK+ \xB0\xF5\xA6\xE6\xC0\xF4\xB9ҡC"
; License Page
!define GAIM_LICENSE_BUTTON "\xA4U\xA4@\xA8B >"
Modified: trunk/gtk/win32/nsis/translations/valencian.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/valencian.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/valencian.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -14,7 +14,7 @@
; Startup Checks
!define INSTALLER_IS_RUNNING "L'instalador encara est\xE0 eixecutant-se."
!define GAIM_IS_RUNNING "Una instancia de Gaim est\xE0 eixecutant-se. Ix del Gaim i torna a intentar-ho."
-!define GTK_INSTALLER_NEEDED "L'entorn d'eixecucio GTK+ no es troba o necessita ser actualisat.$\rPer favor instala la versio${GTK_VERSION} o superior de l'entorn GTK+"
+!define GTK_INSTALLER_NEEDED "L'entorn d'eixecucio GTK+ no es troba o necessita ser actualisat.$\rPer favor instala la versio${GTK_MIN_VERSION} o superior de l'entorn GTK+"
; License Page
!define GAIM_LICENSE_BUTTON "Seg\xFCent >"
Modified: trunk/gtk/win32/nsis/translations/vietnamese.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/vietnamese.nsh 2006-10-31 03:11:33 UTC (rev 17635)
+++ trunk/gtk/win32/nsis/translations/vietnamese.nsh 2006-10-31 04:40:05 UTC (rev 17636)
@@ -10,7 +10,7 @@
;;
; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED "The GTK+ runtime environment không có hoặc cần được nâng cấp.$\rHãy cài đặt GTK+ runtime v${GTK_VERSION} hoặc mới hơn"
+!define GTK_INSTALLER_NEEDED "The GTK+ runtime environment không có hoặc cần được nâng cấp.$\rHãy cài đặt GTK+ runtime v${GTK_MIN_VERSION} hoặc mới hơn"
; License Page
!define GAIM_LICENSE_BUTTON "Tiếp theo >"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ebl...@us...> - 2006-10-31 03:11:50
|
Revision: 17635
http://svn.sourceforge.net/gaim/?rev=17635&view=rev
Author: eblanton
Date: 2006-10-30 19:11:33 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
Fix ^n and ^p to not be backwards
Modified Paths:
--------------
trunk/console/libgnt/gnttree.c
Modified: trunk/console/libgnt/gnttree.c
===================================================================
--- trunk/console/libgnt/gnttree.c 2006-10-31 03:01:21 UTC (rev 17634)
+++ trunk/console/libgnt/gnttree.c 2006-10-31 03:11:33 UTC (rev 17635)
@@ -710,10 +710,10 @@
gnt_widget_class_register_action(parent_class, "move-up", action_up,
"\033" GNT_KEY_UP, NULL);
- gnt_widget_register_binding(parent_class, "move-up", GNT_KEY_CTRL_N, NULL);
+ gnt_widget_register_binding(parent_class, "move-up", GNT_KEY_CTRL_P, NULL);
gnt_widget_class_register_action(parent_class, "move-down", action_down,
"\033" GNT_KEY_DOWN, NULL);
- gnt_widget_register_binding(parent_class, "move-down", GNT_KEY_CTRL_P, NULL);
+ gnt_widget_register_binding(parent_class, "move-down", GNT_KEY_CTRL_N, NULL);
gnt_widget_class_register_action(parent_class, "page-up", action_page_up,
"\033" GNT_KEY_PGUP, NULL);
gnt_widget_class_register_action(parent_class, "page-down", action_page_down,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-10-31 03:01:43
|
Revision: 17634
http://svn.sourceforge.net/gaim/?rev=17634&view=rev
Author: marv_sf
Date: 2006-10-30 19:01:21 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
revert the protocol version, this should avoid all those new yahoo bugs people keep complaining about.
Modified Paths:
--------------
trunk/libgaim/protocols/yahoo/yahoo_packet.h
Modified: trunk/libgaim/protocols/yahoo/yahoo_packet.h
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo_packet.h 2006-10-31 01:01:01 UTC (rev 17633)
+++ trunk/libgaim/protocols/yahoo/yahoo_packet.h 2006-10-31 03:01:21 UTC (rev 17634)
@@ -70,6 +70,7 @@
YAHOO_SERVICE_AUTHRESP = 0x54,
YAHOO_SERVICE_LIST = 0x55,
YAHOO_SERVICE_AUTH = 0x57,
+ YAHOO_SERVICE_AUTHBUDDY = 0x6d,
YAHOO_SERVICE_ADDBUDDY = 0x83,
YAHOO_SERVICE_REMBUDDY = 0x84,
YAHOO_SERVICE_IGNORECONTACT, /* > 1, 7, 13 < 1, 66, 13, 0*/
@@ -116,7 +117,7 @@
};
#define YAHOO_WEBMESSENGER_PROTO_VER 0x0065
-#define YAHOO_PROTO_VER 0x000f
+#define YAHOO_PROTO_VER 0x000c
#define YAHOO_PROTO_VER_JAPAN 0x000c
#define YAHOO_PACKET_HDRLEN (4 + 2 + 2 + 2 + 2 + 4 + 4)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rl...@us...> - 2006-10-31 01:01:11
|
Revision: 17633
http://svn.sourceforge.net/gaim/?rev=17633&view=rev
Author: rlaager
Date: 2006-10-30 17:01:01 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
Make the default_formatize() function not set the font size to the default size (3). If someone thinks I should separate that magical 3 value out of gtkconv (since it comes from gtkimhtml.c), let me know. I think that's more trouble than it's worth.
Modified Paths:
--------------
trunk/gtk/gtkconv.c
Modified: trunk/gtk/gtkconv.c
===================================================================
--- trunk/gtk/gtkconv.c 2006-10-31 00:37:34 UTC (rev 17632)
+++ trunk/gtk/gtkconv.c 2006-10-31 01:01:01 UTC (rev 17633)
@@ -276,9 +276,16 @@
gaim_prefs_get_string("/gaim/gtk/conversations/font_face"));
if (!(conv->features & GAIM_CONNECTION_NO_FONTSIZE))
- gtk_imhtml_font_set_size(GTK_IMHTML(c->entry),
- gaim_prefs_get_int("/gaim/gtk/conversations/font_size"));
+ {
+ int size = gaim_prefs_get_int("/gaim/gtk/conversations/font_size");
+ /* 3 is the default. */
+ if (size != 3)
+ {
+ gtk_imhtml_font_set_size(GTK_IMHTML(c->entry), size);
+ }
+ }
+
if(strcmp(gaim_prefs_get_string("/gaim/gtk/conversations/fgcolor"), "") != 0)
{
gdk_color_parse(gaim_prefs_get_string("/gaim/gtk/conversations/fgcolor"),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bo...@us...> - 2006-10-31 00:38:29
|
Revision: 17632
http://svn.sourceforge.net/gaim/?rev=17632&view=rev
Author: boler
Date: 2006-10-30 16:37:34 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
Fixes https://launchpad.net/bugs/68240 (I can't import list of gadu-gadu).
Modified Paths:
--------------
trunk/libgaim/protocols/gg/buddylist.c
Modified: trunk/libgaim/protocols/gg/buddylist.c
===================================================================
--- trunk/libgaim/protocols/gg/buddylist.c 2006-10-30 22:45:28 UTC (rev 17631)
+++ trunk/libgaim/protocols/gg/buddylist.c 2006-10-31 00:37:34 UTC (rev 17632)
@@ -106,7 +106,17 @@
show = charset_convert(data_tbl[3], "CP1250", "UTF-8");
name = data_tbl[6];
+ if (NULL == name || '\0' == *name) {
+ gaim_debug_warning("gg",
+ "Something is wrong on line %d of the buddylist. Skipping.\n",
+ i + 1);
+ continue;
+ }
+ if (NULL == show || '\0' == *show) {
+ show = g_strdup(name);
+ }
+
gaim_debug_info("gg", "got buddy: name=%s show=%s\n", name, show);
if (gaim_find_buddy(gaim_connection_get_account(gc), name)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lsc...@us...> - 2006-10-30 22:46:59
|
Revision: 17631
http://svn.sourceforge.net/gaim/?rev=17631&view=rev
Author: lschiere
Date: 2006-10-30 14:45:28 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
several translation updates
Modified Paths:
--------------
trunk/gtk/gtkdialogs.c
trunk/po/ChangeLog
trunk/po/fa.po
trunk/po/sq.po
trunk/po/zh_TW.po
Modified: trunk/gtk/gtkdialogs.c
===================================================================
--- trunk/gtk/gtkdialogs.c 2006-10-30 21:48:42 UTC (rev 17630)
+++ trunk/gtk/gtkdialogs.c 2006-10-30 22:45:28 UTC (rev 17631)
@@ -136,6 +136,7 @@
{N_("Euskera(Basque)"), "eu", "Iñaki Larrañaga Murgoitio", "do...@zu..."},
{N_("Persian"), "fa", "Elnaz Sarbar", "el...@fa..."},
{N_("Persian"), "fa", "Meelad Zakaria", "me...@fa..."},
+ {N_("Persian"), "fa", "Roozbeh Pournader ", "ro...@fa..."},
{N_("Finnish"), "fi", "Timo Jyrinki", "tim...@ik..."},
{N_("French"), "fr", "Éric Boumaour", "zon...@us..."},
{N_("Galician"), "gl", "Ignacio Casal Quinteiro", "nac...@gm..."},
@@ -166,6 +167,7 @@
{N_("Serbian"), "sr", "Aleksandar Urosevic", "ur...@us..."},
{N_("Slovak"), "sk", "Richard Golier", "go...@gm..."},
{N_("Slovenian"), "sl", "Matjaz Horvat", "ma...@ow..."},
+ {N_("Albanian"), "sq", "Programe Shqip", "an...@us..."},
{N_("Swedish"), "sv", "Tore Lundqvist", "tl...@mi..."},
{N_("Tamil"), "ta", "Viveka Nathan K", "viv...@us..."},
{N_("Telugu"), "te", "Mr. Subbaramaih", "inf...@cd..."},
Modified: trunk/po/ChangeLog
===================================================================
--- trunk/po/ChangeLog 2006-10-30 21:48:42 UTC (rev 17630)
+++ trunk/po/ChangeLog 2006-10-30 22:45:28 UTC (rev 17631)
@@ -1,6 +1,7 @@
Gaim: The Pimpin' Penguin IM Clone that's good for the soul!
version 2.0.0:
+ * Albanian translation updated (Programe Shqip)
* Arabic translation added (Mohamed Magdy)
* Bengali translation added (INDRANIL DAS GUPTA and Samia Nimatullah)
* Bosnian translation added (Lejla Hadzialic)
@@ -36,7 +37,8 @@
* Lithuanian win32 translation added (Laurynas Biveinis)
* Macedonian translation updated (Арангел Ангов)
* Nepali translation added (Shyam Krishna Bal)
- * Persian translation added (Elnaz Sarbar, Meelad Zakaria)
+ * Persian translation added (Elnaz Sarbar, Meelad Zakaria, Roozbeh
+ Pournader)
* Polish translation updated (Emil Nowak)
* Portuguese translation updated (Duarte Henriques)
* Portuguese (Brazilian) translation updated (Rodrigo Torres, Mauricio de
Modified: trunk/po/fa.po
===================================================================
--- trunk/po/fa.po 2006-10-30 21:48:42 UTC (rev 17630)
+++ trunk/po/fa.po 2006-10-30 22:45:28 UTC (rev 17631)
@@ -1,14 +1,15 @@
-# Gaim Persian translation.
+# Persian translation of gaim.
# Copyright (C) 2005, 2006 Sharif Farsiweb, Inc,
# This file is distributed under the same license as the gaim package.
-# Elnaz Sarbar <el...@fa...>, 2005, 2006.
+# Elnaz Sarbar <el...@fa...>, 2005, 2006.
# Meelad Zakaria <me...@fa...>, 2006.
+# Roozbeh Pournader <ro...@fa...>, 2006.
msgid ""
msgstr ""
"Project-Id-Version: gaim 1.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-28 00:00-0500\n"
-"PO-Revision-Date: 2006-03-02 15:29+0330\n"
+"POT-Creation-Date: 2006-06-17 00:00-0400\n"
+"PO-Revision-Date: 2006-06-17 21:01+0330\n"
"Last-Translator: Elnaz Sarbar <el...@fa...>\n"
"Language-Team: Persian\n"
"MIME-Version: 1.0\n"
@@ -26,7 +27,7 @@
#: ../gaim.desktop.in.h:3
msgid "Send instant messages over multiple protocols"
-msgstr "ارسال پیغام فوری با قراردادهای متعدد"
+msgstr "ارسال پیغام اینترنتی با قراردادهای متعدد"
#. *< type
#. *< ui_requirement
@@ -55,13 +56,14 @@
msgstr "رفیقتان رفته است"
#: ../plugins/contact_priority.c:63
+#, fuzzy
msgid "Buddy is \"extended\" away"
-msgstr "رفیقتان رفتهی «بیشتر» است"
+msgstr "رفیقتان برای مدتی رفته است"
#. Not used yet.
#: ../plugins/contact_priority.c:66
msgid "Buddy is mobile"
-msgstr "رفیقتان در حال حرکت است"
+msgstr "رفیقتان در راه است"
#: ../plugins/contact_priority.c:68
msgid "Buddy is offline"
@@ -76,7 +78,8 @@
"The buddy with the <i>largest score</i> is the buddy who will have priority "
"in the contact.\n"
msgstr ""
-"رفیقی که <i>بالاترین امتیاز</i> را دارد، رفیقی است که در تماس اولویت خواهد داشت.\n"
+"رفیقی که <i>بالاترین امتیاز</i> را بیاورد برای تماس اولویت خواهد "
+"داشت.\n"
#: ../plugins/contact_priority.c:125
msgid "Use last buddy when scores are equal"
@@ -102,7 +105,7 @@
#: ../plugins/contact_priority.c:185
msgid ""
"Allows for controlling the values associated with different buddy states."
-msgstr "اجازهی کنترل مقادیر مرتبط با وضعیتهای مختلف رفقا را به شما میدهد."
+msgstr "اجازهٔ کنترل مقادیر مرتبط با وضعیتهای مختلف رفقا را به شما میدهد."
#. *< description
#: ../plugins/contact_priority.c:187
@@ -110,7 +113,7 @@
"Allows for changing the point values of idle/away/offline states for buddies "
"in contact priority computations."
msgstr ""
-"اجازهی تغییر بارمبندی وضعیتهای بیکار/رفته/برونخط رفقا در محاسبات اولویت تماس "
+"اجازهٔ تغییر بارمبندی وضعیتهای بیکار/رفته/برونخط رفقا در محاسبات اولویت تماس "
"را به شما میدهد."
#. *< api_version
@@ -121,8 +124,9 @@
#. *< priority
#. *< id
#: ../plugins/crazychat/cc_gaim_plugin.c:146
+#, fuzzy
msgid "Crazychat"
-msgstr "گپِ خَف"
+msgstr "گپ"
#. *< name
#. *< version
@@ -134,8 +138,8 @@
#. * description
#: ../plugins/crazychat/cc_gaim_plugin.c:151
msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
-msgstr
-"از گیم برای به دست آوردن ip رفقا جهت اتصال برای یک نشست گپِ خَف استفاده میکند"
+msgstr ""
+"برای به دست آوردن IP رفقا جهت اتصال برای یک نشست گپِ خَف از گیم استفاده میکند"
#. make the network configuration frame
#: ../plugins/crazychat/cc_gaim_plugin.c:295
@@ -156,14 +160,14 @@
msgstr "تنظیم امکانات"
#. add enabled / disabled
-#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2251
-#: ../src/gtkplugin.c:577
+#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2262
+#: ../src/gtkplugin.c:574
msgid "Enabled"
msgstr "به کار انداخته شده"
#: ../plugins/crazychat/cc_gaim_plugin.c:350
msgid "Disabled"
-msgstr "از کار انداخته شده"
+msgstr "از کار انداخته شد"
#. *< type
#. *< ui_requirement
@@ -171,7 +175,7 @@
#. *< dependencies
#. *< priority
#. *< id
-#: ../plugins/dbus-example.c:135
+#: ../plugins/dbus-example.c:152
msgid "DBus"
msgstr "DBus"
@@ -179,54 +183,58 @@
#. *< version
#. * summary
#. * description
-#: ../plugins/dbus-example.c:138 ../plugins/dbus-example.c:140
+#: ../plugins/dbus-example.c:155 ../plugins/dbus-example.c:157
msgid "DBus Plugin Example"
-msgstr "نمونهی متصل شوندهی DBus"
+msgstr "نمونهٔ متصل شوندهٔ DBus"
#: ../plugins/docklet/docklet.c:154
msgid "Right-click for more unread messages...\n"
-msgstr "برای دیدن پیغامهای خوانده نشدهی بیشتر کلیک راست کنید...\n"
+msgstr "برای دیدن بقیهٔ پیغامهای خوانده نشده کلیک راست کنید...\n"
-#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3274
+#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3241
#, c-format
msgid "%d unread message from %s\n"
msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%Id پیغام خوانده نشده از %s\n"
+msgstr[0] "%Idپیغام نخوانده از %s\n"
#: ../plugins/docklet/docklet.c:432
msgid "Change Status"
msgstr "تغییر وضعیت"
#: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
-#: ../src/protocols/jabber/buddy.c:1101 ../src/protocols/msn/state.c:29
-#: ../src/protocols/msn/state.c:30 ../src/protocols/msn/state.c:37
-#: ../src/protocols/msn/state.c:38 ../src/protocols/novell/novell.c:2845
-#: ../src/protocols/yahoo/yahoo.c:2734 ../src/status.c:155
+#: ../src/protocols/gg/gg.c:996 ../src/protocols/jabber/buddy.c:1363
+#: ../src/protocols/msn/state.c:29 ../src/protocols/msn/state.c:30
+#: ../src/protocols/msn/state.c:37 ../src/protocols/msn/state.c:38
+#: ../src/protocols/novell/novell.c:2843 ../src/protocols/yahoo/yahoo.c:2731
+#: ../src/status.c:155
msgid "Available"
msgstr "در دسترس"
#. Away stuff
-#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1759
-#: ../src/gtkstatusbox.c:674 ../src/protocols/irc/irc.c:520
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/jabber/buddy.c:1105
-#: ../src/protocols/novell/novell.c:2848 ../src/protocols/oscar/oscar.c:729
-#: ../src/protocols/oscar/oscar.c:6759 ../src/protocols/oscar/oscar.c:7800
-#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3188
+#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1774
+#: ../src/gtkstatusbox.c:674 ../src/protocols/gg/gg.c:999
+#: ../src/protocols/irc/irc.c:520 ../src/protocols/irc/msgs.c:223
+#: ../src/protocols/jabber/buddy.c:1367 ../src/protocols/novell/novell.c:2846
+#: ../src/protocols/oscar/oscar.c:719 ../src/protocols/oscar/oscar.c:4398
+#: ../src/protocols/oscar/oscar.c:5441 ../src/protocols/silc/buddy.c:1469
+#: ../src/protocols/yahoo/yahoo.c:3185 ../src/protocols/yahoo/yahoo.c:3258
#: ../src/status.c:158
msgid "Away"
msgstr "رفته"
#: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:733 ../src/protocols/yahoo/yahoo.c:2728
+#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/yahoo/yahoo.c:2725
#: ../src/status.c:157
msgid "Invisible"
msgstr "نامرئی"
-#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:3004
-#: ../src/gtkstatusbox.c:676 ../src/protocols/jabber/buddy.c:1099
-#: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:795
-#: ../src/protocols/oscar/oscar.c:7772 ../src/protocols/yahoo/yahoo.c:2732
-#: ../src/status.c:154
+#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2971
+#: ../src/gtkstatusbox.c:676 ../src/protocols/gg/gg.c:993
+#: ../src/protocols/jabber/buddy.c:1361 ../src/protocols/novell/novell.c:2855
+#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:5413
+#: ../src/protocols/yahoo/yahoo.c:2729 ../src/status.c:154
msgid "Offline"
msgstr "برونخط"
@@ -236,29 +244,29 @@
#: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:682
msgid "Saved..."
-msgstr "ذخیرهی شد..."
+msgstr "ذخیره شد..."
#: ../plugins/docklet/docklet.c:484
msgid "Show Buddy List"
-msgstr "فهرست رفقا نمایش داده شود"
+msgstr "نمایش فهرست رفقا"
-#: ../plugins/docklet/docklet.c:489
+#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5680
msgid "Unread Messages"
-msgstr "پیغامهای خوانده نشده"
+msgstr "پیغامهای خوانده نشده"
#: ../plugins/docklet/docklet.c:510
msgid "New Message..."
msgstr "پیغام جدید..."
-#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2467
+#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2478
msgid "Accounts"
msgstr "حسابها"
-#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:541
+#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:538
msgid "Plugins"
msgstr "متصل شوندهها"
-#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1900
+#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1915
msgid "Preferences"
msgstr "ترجیحات"
@@ -279,11 +287,11 @@
#: ../plugins/docklet/docklet.c:682
msgid "_Instant Messages:"
-msgstr "پیغامهای _فوری:"
+msgstr "پیغامهای _اینترنتی:"
#: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
-#: ../plugins/win32/winprefs/winprefs.c:424 ../src/gtkprefs.c:823
-#: ../src/gtkprefs.c:1749 ../src/gtkprefs.c:1763
+#: ../plugins/win32/winprefs/winprefs.c:462 ../src/gtkprefs.c:823
+#: ../src/gtkprefs.c:1764 ../src/gtkprefs.c:1778
msgid "Never"
msgstr "هرگز"
@@ -293,7 +301,7 @@
#: ../plugins/docklet/docklet.c:686 ../plugins/docklet/docklet.c:694
#: ../plugins/timestamp_format.c:39 ../plugins/timestamp_format.c:48
-#: ../plugins/win32/winprefs/winprefs.c:425 ../src/gtkprefs.c:825
+#: ../plugins/win32/winprefs/winprefs.c:463 ../src/gtkprefs.c:825
msgid "Always"
msgstr "همیشه"
@@ -303,7 +311,7 @@
#: ../plugins/docklet/docklet.c:693
msgid "When my nick is said"
-msgstr "وقتی لقب من گفته شد"
+msgstr "وقتی لقب شما گفته شد"
#. *< type
#. *< ui_requirement
@@ -313,14 +321,14 @@
#. *< id
#: ../plugins/docklet/docklet.c:720
msgid "System Tray Icon"
-msgstr "شمایل سینی سیستم"
+msgstr "شمایل محوطهٔ اعلانات"
#. *< name
#. *< version
#. * summary
#: ../plugins/docklet/docklet.c:723
msgid "Displays an icon for Gaim in the system tray."
-msgstr "شمایلی برای گیم در سینی سیستم نمایش میدهد."
+msgstr "شمایلی برای گیم محوطهٔ اعلانات سیستم نمایش میدهد."
#. * description
#: ../plugins/docklet/docklet.c:725
@@ -330,10 +338,10 @@
"and to toggle display of the buddy list. Also provides options to blink for "
"unread messages."
msgstr ""
-"برای بیان وضعیت گیم در لحظه، دسترسی آسان به کارکردهایی که معمولاً مورد "
-"استفاده هستند و زدن ضامن نمایش فهرست رفقا، شمایلی در سینی سیستم (مثلاً در"
-" گنوم، KDE یا ویندوز) نمایش میدهد. همچنین گزینههایی برای چشمک زدن "
-"وقتی پیغام نخواندهای وجود دارد در اختیار میگذارد."
+"برای بیان وضعیت گیم در لحظه، دسترسی آسان به کارکردهایی که زیاد مورد "
+"استفاده هستند و نمایش یا عدم نمایش فهرست رفقا، شمایلی در "
+"محوطهٔ اعلانات سیستم (مثلاً در گنوم، KDE یا ویندوز) نمایش میدهد. همچنین گزینهای "
+"برای چشمک زدن هنگام وجود پیغام خوانده نشده دارد."
#: ../plugins/docklet/eggtrayicon.c:123
msgid "Orientation"
@@ -341,7 +349,7 @@
#: ../plugins/docklet/eggtrayicon.c:124
msgid "The orientation of the tray."
-msgstr "جهت سینی."
+msgstr "جهت محوطهٔ اعلانات سیستم.."
#: ../plugins/extplacement.c:80
msgid "By conversation count"
@@ -373,7 +381,7 @@
#. *< version
#: ../plugins/extplacement.c:137
msgid "Extra conversation placement options."
-msgstr "گزینههای اضافی تعیین جای گفتگوها"
+msgstr "گزینههای اضافی تعیین جای گفتگوها."
#. *< summary
#. * description
@@ -382,7 +390,7 @@
"Restrict the number of conversations per windows, optionally separating IMs "
"and Chats"
msgstr ""
-"محدود کردن تعداد گفتگوها در هر پنجره، جدا کردن پیغامهای فوری و گپها به طور "
+"محدود کردن تعداد گفتگوها در هر پنجره، جدا کردن پیغامهای اینترنتی و گپها به طور "
"اختیاری"
#. *< type
@@ -391,15 +399,15 @@
#. *< dependencies
#. *< priority
#. *< id
-#: ../plugins/filectl.c:245
+#: ../plugins/filectl.c:248
msgid "Gaim File Control"
-msgstr "کنترل پروندهی گیم"
+msgstr "کنترل پروندهٔ گیم"
#. *< name
#. *< version
#. * summary
#. * description
-#: ../plugins/filectl.c:248 ../plugins/filectl.c:250
+#: ../plugins/filectl.c:251 ../plugins/filectl.c:253
msgid "Allows you to control Gaim by entering commands in a file."
msgstr ""
"شما را قادر میسازد با وارد کردن فرمانها در یک پرونده گیم را کنترل کنید."
@@ -412,14 +420,14 @@
#. *< id
#: ../plugins/gaiminc.c:91
msgid "Gaim Demonstration Plugin"
-msgstr "متصلشوندهی نمایشی گیم"
+msgstr "متصلشوندهٔ نمایشی گیم"
#. *< name
#. *< version
#. * summary
#: ../plugins/gaiminc.c:94
msgid "An example plugin that does stuff - see the description."
-msgstr "متصل شوندهی نمونه که کارهای بسیار خطیری انجام میدهد ـ شرح را ببینید."
+msgstr "یک متصل شوندهٔ نمونه که شیرینکاری میکند ـ شرح را ببینید."
#. * description
#: ../plugins/gaiminc.c:96
@@ -429,11 +437,11 @@
"- It reverses all incoming text\n"
"- It sends a message to people on your list immediately when they sign on"
msgstr ""
-"این متصلشونده خیلی خیلی باحال است و کارهای خیلی خیلی مهمی انجام میدهد:\n"
-"‐ میگوید چه کسی این برنامه را نوشته و شما کی وارد سیستم شدهاید\n"
-"‐ همهی متنهای دریافتی را برعکس میکند\n"
-"‐ به محض این که هر یک از رفقای موجود در فهرست شما وارد سیستم شد پیغامی برای "
-"او میفرستد"
+"این متصلشونده خیلی باحال است و کلی شیرینکاری بلد است:\n"
+"‐ میگوید چه کسی این برنامه را نوشته و شما کِی وارد سیستم شدهاید\n"
+"‐ همهٔ متنهای دریافتی را برعکس میکند\n"
+"‐ به محض این که هر یک از رفقای موجود در فهرست شما وارد سیستم شدند پیغامی برایشان "
+"میفرستد"
#: ../plugins/gaimrc.c:41
msgid "Cursor Color"
@@ -445,15 +453,15 @@
#: ../plugins/gaimrc.c:43
msgid "Hyperlink Color"
-msgstr "رنگ پیوند"
+msgstr "رنگ پیوند اینترنتی"
#: ../plugins/gaimrc.c:56
msgid "GtkTreeView Expander Size"
-msgstr "اندازهی باز کننده GtkTreeView"
+msgstr "اندازهٔ باز کنندهٔ نمای درختی GTK"
#: ../plugins/gaimrc.c:57
msgid "GtkTreeView Horizontal Separation"
-msgstr ""
+msgstr "جداسازی افقی نمای درختی GTK"
#: ../plugins/gaimrc.c:76
msgid "Conversation Entry"
@@ -461,28 +469,28 @@
#: ../plugins/gaimrc.c:77
msgid "Conversation History"
-msgstr "تاریخچهی گفتگو"
+msgstr "تاریخچهٔ گفتگو"
#: ../plugins/gaimrc.c:78
msgid "Log Viewer"
-msgstr "نمایشدهندهی تاریخچه"
+msgstr "نمایشدهندهٔ تاریخچه"
#: ../plugins/gaimrc.c:79
msgid "Request Dialog"
-msgstr "محاورهی درخواست"
+msgstr "محاورهٔ درخواست"
#: ../plugins/gaimrc.c:80
msgid "Notify Dialog"
-msgstr "محاورهی اطلاع دادن"
+msgstr "محاورهٔ اطلاعرسانی"
#: ../plugins/gaimrc.c:91
msgid "GtkTreeView Indent Expanders"
-msgstr ""
+msgstr "بازکنندههای تورفتگی نمای درختی GTK"
#: ../plugins/gaimrc.c:287
#, c-format
msgid "Select Color for %s"
-msgstr "انتخاب رنگ %s"
+msgstr "رنگ %s را انتخاب کنید"
#: ../plugins/gaimrc.c:289
msgid "Select Color"
@@ -493,52 +501,52 @@
msgid "Select Font for %s"
msgstr "قلم %s را انتخاب کنید"
-#: ../plugins/gaimrc.c:362
+#: ../plugins/gaimrc.c:364
msgid "Select Interface Font"
-msgstr "انتخاب قلم واسط"
+msgstr "انتخاب قلم برای واسط"
-#: ../plugins/gaimrc.c:415
+#: ../plugins/gaimrc.c:420
msgid "General"
msgstr "عمومی"
-#: ../plugins/gaimrc.c:420
+#: ../plugins/gaimrc.c:425
msgid "GTK+ Interface Font"
msgstr "قلم واسط GTK+"
-#: ../plugins/gaimrc.c:440
+#: ../plugins/gaimrc.c:445
msgid "GTK+ Text Shortcut Theme"
-msgstr ""
+msgstr "تم میانبر متنی GTK+"
-#: ../plugins/gaimrc.c:475
+#: ../plugins/gaimrc.c:480
msgid "Interface colors"
msgstr "رنگهای واسط"
-#: ../plugins/gaimrc.c:499
+#: ../plugins/gaimrc.c:504
msgid "Widget Sizes"
-msgstr "اندازههای ویجت"
+msgstr "اندازهٔ ویجتها"
-#: ../plugins/gaimrc.c:520
+#: ../plugins/gaimrc.c:525
msgid "Fonts"
msgstr "قلمها"
-#: ../plugins/gaimrc.c:543
+#: ../plugins/gaimrc.c:548
msgid "Tools"
msgstr "ابزارها"
-#: ../plugins/gaimrc.c:548
+#: ../plugins/gaimrc.c:553
#, c-format
msgid "Write settings to %s%sgtkrc-2.0"
msgstr "تنظیمات در %s%sgtkrc-2.0 نوشته شود"
-#: ../plugins/gaimrc.c:556
+#: ../plugins/gaimrc.c:561
msgid "Re-read gtkrc files"
msgstr "بازخوانی پروندههای gtkrc"
-#: ../plugins/gaimrc.c:583
+#: ../plugins/gaimrc.c:588
msgid "Gaim GTK+ Theme Control"
msgstr "کنترل تم GTK+ گیم"
-#: ../plugins/gaimrc.c:585 ../plugins/gaimrc.c:586
+#: ../plugins/gaimrc.c:590 ../plugins/gaimrc.c:591
msgid "Provides access to commonly used gtkrc settings."
msgstr "دسترسی به تنظیمات معمول gtkrc را ممکن میسازد."
@@ -549,11 +557,11 @@
#: ../plugins/gestures/gestures.c:242
msgid "Middle mouse button"
-msgstr "دکمهی وسط موشی"
+msgstr "دکمهٔ وسط موشی"
#: ../plugins/gestures/gestures.c:247
msgid "Right mouse button"
-msgstr "دکمهی راست موشی"
+msgstr "دکمهٔ راست موشی"
#. "Visual gesture display" checkbox
#: ../plugins/gestures/gestures.c:259
@@ -588,50 +596,63 @@
"Drag up and then to the right to switch to the next conversation."
msgstr ""
"پشتبیانی ژستهای موشی در پنجرههای گفتگو را ممکن میسازد.\n"
-"برای انجام این کنشها دکمهی وسط موشی را پایین نگه دارید:\n"
+"برای انجام این کنشها دکمهٔ وسط موشی را پایین نگه دارید:\n"
"\n"
"برای بستن گفتگو موشی را به پایین و سپس به راست بکشید.\n"
"برای تعویض به گفتگوی قبلی موشی را به بالا و سپس به چپ بکشید.\n"
"برای تعویض به گفتگوی بعدی موشی را به بالا و سپس به راست بکشید."
+#. Extract their Name and put it in
+#. Contact Info
+#. Personal
+#. Business
#: ../plugins/gevolution/add_buddy_dialog.c:131
-#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:590
-#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:755
-#: ../src/protocols/msn/msn.c:1524
+#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:587
+#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:759
+#: ../src/protocols/msn/msn.c:1527 ../src/protocols/msn/msn.c:1580
+#: ../src/protocols/msn/msn.c:1601
msgid "Name"
msgstr "نام"
#: ../plugins/gevolution/add_buddy_dialog.c:142
msgid "Instant Messaging"
-msgstr "پیغام فوری"
+msgstr "پیغامرسانی اینترنتی"
+#: ../plugins/gevolution/add_buddy_dialog.c:442 ../src/gtkblist.c:4527
+#: ../src/protocols/silc/buddy.c:736 ../src/protocols/silc/buddy.c:1030
+#: ../src/protocols/silc/buddy.c:1075 ../src/protocols/silc/buddy.c:1174
+#: ../src/protocols/yahoo/yahoo.c:2974
+msgid "Add Buddy"
+msgstr "اضافه کردن رفیق"
+
#. Add the label.
-#: ../plugins/gevolution/add_buddy_dialog.c:454
+#: ../plugins/gevolution/add_buddy_dialog.c:455
msgid "Select a person from your address book below, or add a new person."
msgstr "شخصی را از دفترجه نشانیتان در زیر انتخاب کنید یا شخص جدیدی اضافه کنید."
#. "Search"
-#: ../plugins/gevolution/add_buddy_dialog.c:467
+#: ../plugins/gevolution/add_buddy_dialog.c:468
#: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1418 ../src/protocols/oscar/oscar.c:8320
-#: ../src/protocols/sametime/sametime.c:5532
+#: ../src/protocols/jabber/buddy.c:1720 ../src/protocols/oscar/oscar.c:6021
+#: ../src/protocols/sametime/sametime.c:5524
msgid "Search"
msgstr "جستجو"
-#: ../plugins/gevolution/add_buddy_dialog.c:548
-#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4570
-#: ../src/gtkblist.c:4934
+#: ../plugins/gevolution/add_buddy_dialog.c:549
+#: ../plugins/gevolution/new_person_dialog.c:307 ../src/gtkblist.c:4611
+#: ../src/gtkblist.c:4975
msgid "Group:"
msgstr "گروه:"
#. "New Person" button
-#: ../plugins/gevolution/add_buddy_dialog.c:574
+#: ../plugins/gevolution/add_buddy_dialog.c:575
#: ../plugins/gevolution/assoc-buddy.c:464
+#: ../plugins/gevolution/new_person_dialog.c:251
msgid "New Person"
msgstr "شخص جدید"
#. "Select Buddy" button
-#: ../plugins/gevolution/add_buddy_dialog.c:591
+#: ../plugins/gevolution/add_buddy_dialog.c:592
msgid "Select Buddy"
msgstr "انتخاب رفیق"
@@ -641,7 +662,7 @@
"Select a person from your address book to add this buddy to, or create a new "
"person."
msgstr ""
-"از دفترچه نشانیتان شخصی را انتخاب کنید تا این رفیق به او اضافه شود یا شخص "
+"از دفترچهٔ نشانیتان شخصی را انتخاب کنید تا این رفیق به اطلاعات او اضافه شود، و یا شخص "
"جدیدی ایجاد کنید."
#. Add the expander
@@ -660,15 +681,15 @@
msgstr "هیچکدام"
#: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
-#: ../src/blist.c:516 ../src/blist.c:1270 ../src/blist.c:1495
-#: ../src/gtkblist.c:4379 ../src/protocols/jabber/roster.c:65
+#: ../src/blist.c:516 ../src/blist.c:1278 ../src/blist.c:1505
+#: ../src/gtkblist.c:4420 ../src/protocols/jabber/roster.c:66
msgid "Buddies"
msgstr "رفقا"
#: ../plugins/gevolution/gevolution.c:262
#: ../plugins/gevolution/gevolution.c:268
msgid "Unable to send e-mail"
-msgstr "نمیتوان نامهی الکترونیکی فرستاد."
+msgstr "نمیتوان نامهٔ الکترونیکی فرستاد"
#: ../plugins/gevolution/gevolution.c:263
msgid "The evolution executable was not found in the PATH."
@@ -680,11 +701,11 @@
#: ../plugins/gevolution/gevolution.c:286
msgid "Add to Address Book"
-msgstr "اضافه کردن به دفترچه نشانی"
+msgstr "اضافه کردن به دفترچهٔ نشانی"
#: ../plugins/gevolution/gevolution.c:290
msgid "Send E-Mail"
-msgstr "ارسال نامهی الکترونیکی"
+msgstr "ارسال نامهٔ الکترونیکی"
#. Configuration frame
#: ../plugins/gevolution/gevolution.c:417
@@ -694,11 +715,11 @@
#. Label
#: ../plugins/gevolution/gevolution.c:420
msgid "Select all accounts that buddies should be auto-added to."
-msgstr ""
-"همهی حسابهایی را که رفقا باید به طور خودکار به آنها اضافه شوند انتخاب کنید."
+msgstr "همهٔ حسابهایی که رفقا به طور خودکار به آنها اضافه شوند را انتخاب کنید."
+"همهٔ حسابهایی را که رفقا باید به طور خودکار به آنها اضافه شوند انتخاب کنید."
-#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147
-#: ../plugins/idle.c:183 ../src/gtknotify.c:371 ../src/gtkpounce.c:1260
+#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:150
+#: ../plugins/idle.c:186 ../src/gtknotify.c:399 ../src/gtkpounce.c:1244
msgid "Account"
msgstr "حساب"
@@ -721,42 +742,43 @@
msgid "Provides integration with Evolution."
msgstr "یکپارچگی با اوولوشن را ممکن میکند."
-#: ../plugins/gevolution/new_person_dialog.c:266
+#: ../plugins/gevolution/new_person_dialog.c:267
msgid "Please enter the person's information below."
msgstr "لطفاً اطلاعات شخص را در زیر وارد کنید."
-#: ../plugins/gevolution/new_person_dialog.c:270
+#: ../plugins/gevolution/new_person_dialog.c:271
msgid "Please enter the buddy's screen name and account type below."
msgstr "لطفاً نام کاربری رفیق و نوع حساب را در زیر وارد کنید."
-#: ../plugins/gevolution/new_person_dialog.c:290
+#: ../plugins/gevolution/new_person_dialog.c:291
msgid "Account type:"
msgstr "نوع حساب:"
-#: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
+#: ../plugins/gevolution/new_person_dialog.c:295 ../src/gtkaccount.c:784
+#: ../src/gtkblist.c:4573
msgid "Screen name:"
msgstr "نام کاربری:"
#. Optional Information section
-#: ../plugins/gevolution/new_person_dialog.c:314
+#: ../plugins/gevolution/new_person_dialog.c:315
msgid "Optional information:"
msgstr "اطلاعات اختیاری:"
#. Label
-#: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:424
-#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:635
+#: ../plugins/gevolution/new_person_dialog.c:338 ../src/gtkaccount.c:424
+#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:625
msgid "Buddy Icon"
msgstr "شمایل رفیق"
-#: ../plugins/gevolution/new_person_dialog.c:349
+#: ../plugins/gevolution/new_person_dialog.c:350
msgid "First name:"
msgstr "نام:"
-#: ../plugins/gevolution/new_person_dialog.c:361
+#: ../plugins/gevolution/new_person_dialog.c:362
msgid "Last name:"
msgstr "نام خانوادگی:"
-#: ../plugins/gevolution/new_person_dialog.c:381
+#: ../plugins/gevolution/new_person_dialog.c:382
msgid "E-mail:"
msgstr "پست الکترونیکی:"
@@ -776,8 +798,8 @@
#. * description
#: ../plugins/gtk-signals-test.c:163 ../plugins/gtk-signals-test.c:165
msgid "Test to see that all ui signals are working properly."
-msgstr ""
-"آزمایش برای اطمینان از این که همهی سیگنالهای رابط کاربر درست کار میکنند."
+msgstr "درست کار کردن سیگنالهای واسط کاربر را آزمایش کنید."
+"آزمایش برای اطمینان از این که همهٔ سیگنالهای رابط کاربر درست کار میکنند."
#: ../plugins/history.c:120
#, c-format
@@ -786,7 +808,7 @@
#: ../plugins/history.c:147
msgid "History Plugin Requires Logging"
-msgstr "متصل شوندهی تاریخچه نیازمند تاریخچهنویسی است"
+msgstr "متصل شوندهٔ تاریخچه نیازمند ثبت وقایع است"
#: ../plugins/history.c:148
msgid ""
@@ -795,9 +817,10 @@
"Enabling logs for instant messages and/or chats will activate history for "
"the same conversation type(s)."
msgstr ""
-"تاریخچهنویسی را میتوان در ابزارها -> ترجیحات -> تاریخچهنویسی به کار انداخت.\n"
+"ثبت وقایع را میتوان در منوی ابزارها -> ترجیحات -> ثبت وقایع به کار انداخت.\n"
"\n"
-"به کار انداختن تاریخچهنویسی برای پیغامهای فوری و/یا گپها، تاریخچه را برای همان نوع گفتگو به کار میاندازد."
+"به کار انداختن ثبت وقایع برای پیغامهای اینترنتی و/یا گپها، تاریخچه را برای "
+"همان نوع گفتگو به کار میاندازد."
#: ../plugins/history.c:188
msgid "History"
@@ -805,14 +828,14 @@
#: ../plugins/history.c:190
msgid "Shows recently logged conversations in new conversations."
-msgstr "نمایش گفتگوهای اخیراً ثبت شده در گفتگوهای جدید."
+msgstr "نمایش گفتگوهای اخیراً ثبت شده در پنجرهٔ گفتگوهای جدید."
#: ../plugins/history.c:191
msgid ""
"When a new conversation is opened this plugin will insert the last "
"conversation into the current conversation."
msgstr ""
-"هر وقت گفتگوی جدیدی باز میشود این متصل شونده آخرین گفتگو را در گفتگوی فعلی "
+"هر وقت گفتگوی جدیدی باز میشود این متصل شونده آخرین گفتگو را در پنجرهٔ گفتگوی فعلی "
"درج خواهد کرد."
#. *< type
@@ -823,7 +846,7 @@
#. *< id
#: ../plugins/iconaway.c:82
msgid "Iconify on Away"
-msgstr "شمایلسازی هنگام رفته"
+msgstr "شمایلسازی هنگام غیبت"
#. *< name
#. *< version
@@ -833,51 +856,53 @@
msgid "Iconifies the buddy list and your conversations when you go away."
msgstr "هنگامی که نیستید فهرست رفقا و گفتگوهای شما را تبدیل به شمایل میکند."
-#: ../plugins/idle.c:152 ../plugins/idle.c:210
+#: ../plugins/idle.c:155 ../plugins/idle.c:213
msgid "Minutes"
msgstr "دقیقه"
-#: ../plugins/idle.c:159 ../plugins/idle.c:192 ../plugins/idle.c:217
-#: ../plugins/idle.c:306
+#. This is a cultural reference. Dy'er Mak'er is a song by Led Zeppelin.
+#. If that doesn't translate well into your language, drop the 's before translating.
+#: ../plugins/idle.c:162 ../plugins/idle.c:195 ../plugins/idle.c:220
+#: ../plugins/idle.c:312
msgid "I'dle Mak'er"
-msgstr "بیکار آفرین"
+msgstr "بیکار ساز"
-#: ../plugins/idle.c:160 ../plugins/idle.c:249
+#: ../plugins/idle.c:163 ../plugins/idle.c:252
msgid "Set Account Idle Time"
msgstr "تنظیم زمان بیکار شدن حساب"
-#: ../plugins/idle.c:163 ../plugins/idle.c:221
+#: ../plugins/idle.c:166 ../plugins/idle.c:224
msgid "_Set"
msgstr "تن_ظیم"
-#: ../plugins/idle.c:164 ../plugins/idle.c:197 ../plugins/idle.c:222
+#: ../plugins/idle.c:167 ../plugins/idle.c:200 ../plugins/idle.c:225
msgid "_Cancel"
msgstr "ان_صراف"
-#: ../plugins/idle.c:177
+#: ../plugins/idle.c:180
msgid "None of your accounts are idle."
msgstr "هیچ یک از حسابهای شما بیکار نیست."
-#: ../plugins/idle.c:193 ../plugins/idle.c:253
+#: ../plugins/idle.c:196 ../plugins/idle.c:256
msgid "Unset Account Idle Time"
-msgstr "پاک کردن زمان بیکار شدن حساب"
+msgstr "لغو زمان بیکار شدن حساب"
-#: ../plugins/idle.c:196
+#: ../plugins/idle.c:199
msgid "_Unset"
-msgstr "_تنظیم نشده"
+msgstr "ل_غو"
-#: ../plugins/idle.c:218 ../plugins/idle.c:257
+#: ../plugins/idle.c:221 ../plugins/idle.c:260
msgid "Set Idle Time for All Accounts"
-msgstr "تنظیم زمان بیکار شدن برای همهی حساب ها"
+msgstr "تنظیم زمان بیکار شدن برای همهٔ حسابها"
-#: ../plugins/idle.c:262
+#: ../plugins/idle.c:265
msgid "Unset Idle Time for All Idled Accounts"
-msgstr "پاک کردن زمان بیکاری برای همهی حسابهای بیکار شده"
+msgstr "لغو زمان بیکاری برای همهٔ حسابهای بیکار شده"
-#: ../plugins/idle.c:308 ../plugins/idle.c:309
+#: ../plugins/idle.c:314 ../plugins/idle.c:315
msgid "Allows you to hand-configure how long you've been idle"
msgstr ""
-"شما را قادر می سازد به طور دستی زمانی را که بیکار بودهاید پیکربندی کنید."
+"شما را قادر می سازد به طور دستی زمانی را که بیکار بودهاید پیکربندی کنید"
#. *< type
#. *< ui_requirement
@@ -894,7 +919,7 @@
#. * summary
#: ../plugins/ipc-test-client.c:90
msgid "Test plugin IPC support, as a client."
-msgstr "آزمایش پشتیبانی متصلشوندهی ICP، به شکل کارگیر."
+msgstr "آزمایش پشتیبانی متصلشوندهٔ ICP، به شکل کارگیر."
#. * description
#: ../plugins/ipc-test-client.c:92
@@ -902,8 +927,8 @@
"Test plugin IPC support, as a client. This locates the server plugin and "
"calls the commands registered."
msgstr ""
-"آزمایش پشتیبانی متصلشوندهی ICP به شکل کارگیر. متصلشوندهی کارگزار را پیدا "
-"کرده و فرمانهای ثبت شده را فراخوانی میکند."
+"آزمایش پشتیبانی متصلشوندهٔ ICP به شکل کارگیر. متصلشوندهٔ کارگزار را پیدا کرده "
+"و فرمانهای ثبت شده را فراخوانی میکند."
#. *< type
#. *< ui_requirement
@@ -920,114 +945,132 @@
#. * summary
#: ../plugins/ipc-test-server.c:77
msgid "Test plugin IPC support, as a server."
-msgstr "آزمایش پشتیبانی متصلشوندهی IPC، به شکل کارگزار."
+msgstr "آزمایش پشتیبانی متصلشوندهٔ IPC، به شکل کارگزار."
#. * description
#: ../plugins/ipc-test-server.c:79
msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr "آزمایش متصلشوندهی IPC، به شکل کارگزار. فرمانهای IPC را ثبت میکند."
+msgstr "آزمایش متصلشوندهٔ IPC، به شکل کارگزار. فرمانهای IPC را ثبت میکند."
-#: ../plugins/log_reader.c:1407
+#: ../plugins/log_reader.c:1405
msgid "User is offline."
msgstr "کاربر برونخط است."
-#: ../plugins/log_reader.c:1413
+#: ../plugins/log_reader.c:1411
msgid "Auto-response sent:"
-msgstr "پاسخ خودکار فرستاده شد:"
+msgstr "پاسخ خودکار ارسال شد:"
-#: ../plugins/log_reader.c:1423 ../plugins/log_reader.c:1426
+#: ../plugins/log_reader.c:1421 ../plugins/log_reader.c:1424
+#: ../plugins/statenotify.c:80
#, c-format
-msgid "%s logged out."
-msgstr "%s از سیستم خارج شد."
+msgid "%s has signed off."
+msgstr "%s از سیستم خارج شد."
-#: ../plugins/log_reader.c:1440
+#: ../plugins/log_reader.c:1438
msgid "One or more messages may have been undeliverable."
-msgstr "ممکن است یک یا چند پیغام غیر قابل تحویل باشند"
+msgstr "ممکن است یک یا چند پیغام به دست او نرسیده باشد."
#. MSG_SERVER_DISCONNECTING
#. we have been kicked off =^(
-#: ../plugins/log_reader.c:1450 ../src/protocols/napster/napster.c:363
+#: ../plugins/log_reader.c:1448 ../src/protocols/napster/napster.c:363
msgid "You were disconnected from the server."
msgstr "شما از کارگزار قطع شدید."
-#: ../plugins/log_reader.c:1458
+#: ../plugins/log_reader.c:1456
msgid ""
"You are currently disconnected. Messages will not be received unless you are "
"logged in."
-msgstr ""
+msgstr "اتصال شما در حال حاضر قطع شده است. تا زمانی که وارد سیستم نشوید پیغامی به شما نخواهد رسید."
-#: ../plugins/log_reader.c:1473
+#: ../plugins/log_reader.c:1471
msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "نمیتوان پیغام را فرستاد چون طول پیغام از حداکثر طول مجاز بیشتر است:"
+msgstr "نمیتوان پیغام را فرستاد چون طول آن از حداکثر مجاز بیشتر است."
-#: ../plugins/log_reader.c:1478
+#: ../plugins/log_reader.c:1476
msgid "Message could not be sent."
-msgstr "نمیتوان پیغام را فرستاد."
+msgstr "فرستادن پیغام ممکن نیست."
-#. Add general preferences.
-#: ../plugins/log_reader.c:1912
-msgid "General Log Reading Configuration"
-msgstr "پیکربندی عمومی خواندن تاریخچه"
-
-#: ../plugins/log_reader.c:1916
-msgid "Fast size calculations"
-msgstr "محاسبات سریع اندازه"
-
-#: ../plugins/log_reader.c:1920
-msgid "Use name heuristics"
-msgstr ""
-
-#. Add Log Directory preferences.
-#: ../plugins/log_reader.c:1926
-msgid "Log Directory"
-msgstr "شاخهی تاریخچه"
-
-#: ../plugins/log_reader.c:1930
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them. Many translators
+#. choose to leave them alone. Choose what's best for your language.
+#: ../plugins/log_reader.c:1838 ../plugins/log_reader.c:1943
msgid "Adium"
msgstr "Adium"
-#: ../plugins/log_reader.c:1934
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them. Many translators
+#. choose to leave them alone. Choose what's best for your language.
+#: ../plugins/log_reader.c:1850 ../plugins/log_reader.c:1947
msgid "Fire"
-msgstr "فایر"
+msgstr "Fire"
-#: ../plugins/log_reader.c:1938
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them. Many translators
+#. choose to leave them alone. Choose what's best for your language.
+#: ../plugins/log_reader.c:1862 ../plugins/log_reader.c:1951
msgid "Messenger Plus!"
-msgstr "پیغامرسان Plus!"
+msgstr "Messenger Plus!"
-#: ../plugins/log_reader.c:1942
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them. Many translators
+#. choose to leave them alone. Choose what's best for your language.
+#: ../plugins/log_reader.c:1874 ../plugins/log_reader.c:1955
msgid "MSN Messenger"
msgstr "پیغامرسان MSN"
-#: ../plugins/log_reader.c:1946
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them. Many translators
+#. choose to leave them alone. Choose what's best for your language.
+#: ../plugins/log_reader.c:1886 ../plugins/log_reader.c:1959
msgid "Trillian"
msgstr "Trillian"
+#. Add general preferences.
+#: ../plugins/log_reader.c:1925
+msgid "General Log Reading Configuration"
+msgstr "پیکربندی عمومی خواندن تاریخچه"
+
+#: ../plugins/log_reader.c:1929
+msgid "Fast size calculations"
+msgstr "محاسبات سریع اندازه"
+
+#: ../plugins/log_reader.c:1933
+msgid "Use name heuristics"
+msgstr "استفاده از نامهای تجربی"
+
+#. Add Log Directory preferences.
+#: ../plugins/log_reader.c:1939
+msgid "Log Directory"
+msgstr "شاخهٔ ثبت وقایع"
+
#. *< type
#. *< ui_requirement
#. *< flags
#. *< dependencies
#. *< priority
#. *< id
-#: ../plugins/log_reader.c:1969
+#: ../plugins/log_reader.c:1982
msgid "Log Reader"
msgstr "تاریخچهخوان"
#. *< name
#. *< version
#. * summary
-#: ../plugins/log_reader.c:1973
+#: ../plugins/log_reader.c:1986
msgid "Includes other IM clients' logs in the log viewer."
-msgstr "تاریخچههای کارگیران پیغام فوری دیگر را در نمایشدهندهی تاریخچه قرار میدهد."
+msgstr ""
+"تاریخچههای کارگیرهای پیغام اینترنتی دیگر را در نمایشدهندهٔ تاریخچه قرار میدهد."
#. * description
-#: ../plugins/log_reader.c:1977
+#: ../plugins/log_reader.c:1990
msgid ""
"When viewing logs, this plugin will include logs from other IM clients. "
"Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
"Trillian."
msgstr ""
-"این متصل شونده، هنگام نمایش تاریخچهها، تاریخچههای کارگیران پیغام فوری دیگر را نشان میدهد. "
-"در حال حاضر، این متصل شونده شامل Adium، فایر، پیغامرسانPlus !، پیغامرسان MSN، و Trillian است."
+"این متصل شونده، هنگام نمایش تاریخچهها، تاریخچههای کارگیرهای پیغام اینترنتی دیگر "
+"را نیز نشان میدهد. در حال حاضر، این متصل شونده شامل Adium، Fire، پیغامرسانPlus!"
+"، پیغامرسان MSN، و Trillian است."
#: ../plugins/mailchk.c:160
msgid "Mail Checker"
@@ -1035,17 +1078,16 @@
#: ../plugins/mailchk.c:162
msgid "Checks for new local mail."
-msgstr "بررسی میکند که نامهی محلی جدیدی رسیده یا نه."
+msgstr "بررسی میکند که نامهٔ محلی جدیدی رسیده یا نه."
#: ../plugins/mailchk.c:163
msgid "Adds a small box to the buddy list that shows if you have new mail."
msgstr ""
-"جعبهی کوچکی به فهرست رفقا اضافه میکند که نشان میدهد شما نامهی جدید دارید یا "
-"نه."
+"جعبهٔ کوچکی به فهرست رفقا اضافه میکند که نشان میدهد شما نامهٔ جدید دارید یا نه."
#: ../plugins/mono/loader/mono.c:213
msgid "Mono Plugin Loader"
-msgstr "بارکنندهی متصل شوندهی مونو"
+msgstr "بارکنندهٔ متصل شوندهٔ مونو"
#: ../plugins/mono/loader/mono.c:215 ../plugins/mono/loader/mono.c:216
msgid "Loads .NET plugins with Mono."
@@ -1055,20 +1097,19 @@
msgid ""
"A music messaging session has been requested. Please click the MM icon to "
"accept."
-msgstr ""
+msgstr "یک نشست پیفام موسیقیایی درخواست شده است. برای قبول درخواست روی شمایل MM کلیک کنید."
#: ../plugins/musicmessaging/musicmessaging.c:45
msgid "Music messaging session confirmed."
-msgstr ""
+msgstr "نشست پیغام موسیقیایی تأیید شد."
#: ../plugins/musicmessaging/musicmessaging.c:414
-#, fuzzy
msgid "Music Messaging"
-msgstr "پیغام فوری"
+msgstr "پیغامرسانی موسیقیایی"
#: ../plugins/musicmessaging/musicmessaging.c:415
msgid "There was a conflict in running the command:"
-msgstr ""
+msgstr "در اجرای فرمان مغایرتی به وجود آمد:"
#: ../plugins/musicmessaging/musicmessaging.c:523
msgid "Error Running Editor"
@@ -1080,9 +1121,8 @@
#. Configuration frame
#: ../plugins/musicmessaging/musicmessaging.c:623
-#, fuzzy
msgid "Music Messaging Configuration"
-msgstr "پیکربندی ژستهای موشی"
+msgstr "پیکربندی پیغامرسانی موسیقیایی"
#: ../plugins/musicmessaging/musicmessaging.c:627
msgid "Score Editor Path"
@@ -1102,14 +1142,14 @@
#. *< version
#: ../plugins/musicmessaging/musicmessaging.c:663
msgid "Music Messaging Plugin for collaborative composition."
-msgstr ""
+msgstr "متصل شوندهٔ پیغامرسانی موسیقیایی برای آهنگسازی چند نفری."
#. * summary
#: ../plugins/musicmessaging/musicmessaging.c:665
msgid ""
"The Music Messaging Plugin allows a number of users to simultaneously work "
"on a piece of music by editting a common score in real-time."
-msgstr ""
+msgstr "با متصل شوندهٔ پیغامرسانی موسیقیایی چند کاربر میتوانند همزمان روی یک قطعهٔ موسیقی کار کنند."
#. ---------- "Notify For" ----------
#: ../plugins/notify.c:638
@@ -1118,15 +1158,15 @@
#: ../plugins/notify.c:642
msgid "_IM windows"
-msgstr "پنجرههای _پیغام فوری"
+msgstr "پنجرههای _پیغام اینترنتی"
#: ../plugins/notify.c:649
msgid "C_hat windows"
msgstr "پنجرههای _گپ"
#: ../plugins/notify.c:657
-msgid "\t_Only when someone says your nick"
-msgstr "\t_فقط وقتی کسی لقب شما را میگوید"
+msgid "\t_Only when someone says your screen name"
+msgstr "\t_فقط وقتی کسی نام کاربری شما را در گپ میگوید"
#: ../plugins/notify.c:667
msgid "_Focused windows"
@@ -1135,11 +1175,11 @@
#. ---------- "Notification Methods" ----------
#: ../plugins/notify.c:675
msgid "Notification Methods"
-msgstr "روشهای اطلاع"
+msgstr "روشهای اطلاعرسانی"
#: ../plugins/notify.c:682
msgid "Prepend _string into window title:"
-msgstr "نمایش _رشتهی متنی در عنوان پنجره:"
+msgstr "نمایش _رشتهٔ متنی در عنوان پنجره:"
#. Count method button
#: ../plugins/notify.c:701
@@ -1149,12 +1189,12 @@
#. Urgent method button
#: ../plugins/notify.c:710
msgid "Set window manager \"_URGENT\" hint"
-msgstr "تنظیم راهنمایی «فوری» مدیر پنجره"
+msgstr "تنظیم راهنمایی «_فوری» مدیر پنجره"
#. Raise window method button
#: ../plugins/notify.c:719
msgid "R_aise conversation window"
-msgstr "_بالا آوردن پنجرهی گفتگو"
+msgstr "پنجرهٔ گفتگو _بالا آورده شود"
#. ---------- "Notification Removals" ----------
#: ../plugins/notify.c:727
@@ -1164,17 +1204,17 @@
#. Remove on focus button
#: ../plugins/notify.c:732
msgid "Remove when conversation window _gains focus"
-msgstr "حذف وقتی پنجرهی گفتگو تمرکز _میگیرد"
+msgstr "حذف وقتی پنجرهٔ گفتگو تمرکز _میگیرد"
#. Remove on click button
#: ../plugins/notify.c:739
msgid "Remove when conversation window _receives click"
-msgstr "حذف وقتی روی پنجرهی گفتگو _کلیک میشود"
+msgstr "حذف وقتی روی پنجرهٔ گفتگو _کلیک میشود"
#. Remove on type button
#: ../plugins/notify.c:747
msgid "Remove when _typing in conversation window"
-msgstr "حذف وقتی در پنجرهی گفتگو _تایپ میشود"
+msgstr "حذف وقتی در پنجرهٔ گفتگو _تایپ میشود"
#. Remove on message send button
#: ../plugins/notify.c:755
@@ -1184,7 +1224,7 @@
#. Remove on conversation switch button
#: ../plugins/notify.c:764
msgid "Remove on switch to conversation ta_b"
-msgstr "حذف وقتی به _زبانهی گفتگو تعویض میشود"
+msgstr "حذف وقتی به _زبانهٔ گفتگو تعویض میشود"
#. *< type
#. *< ui_requirement
@@ -1203,7 +1243,7 @@
#: ../plugins/notify.c:856 ../plugins/notify.c:858
msgid "Provides a variety of ways of notifying you of unread messages."
msgstr ""
-"راههای متنوعی برای اطلاع شما از پیغامهای خوانده نشده در اختیار میگذارد."
+"راههای متنوعی برای اطلاع دادن پیغامهای خوانده نشده در اختیار شما میگذارد."
#. *< type
#. *< ui_requirement
@@ -1213,45 +1253,53 @@
#. *< id
#: ../plugins/perl/perl.c:583
msgid "Perl Plugin Loader"
-msgstr "بارکنندهی متصل شوندهی پِرل"
+msgstr "بارکنندهٔ متصل شوندهٔ پِرل"
#. *< name
#. *< version
#. *< summary
#: ../plugins/perl/perl.c:585 ../plugins/perl/perl.c:586
msgid "Provides support for loading perl plugins."
-msgstr "برای بارکردن متصل شوندههای پرل پشتیبانی فراهم میکند"
+msgstr "برای بار کردن متصل شوندههای پرل پشتیبانی فراهم میکند"
-#: ../plugins/psychic.c:22
+#: ../plugins/psychic.c:19
msgid "Psychic Mode"
-msgstr ""
+msgstr "حالت غیبگویی"
-#: ../plugins/psychic.c:23
+#: ../plugins/psychic.c:20
msgid "Psychic mode for incoming conversation"
-msgstr ""
+msgstr "حالت غیبگویی برای پیغامهای وارده"
-#: ../plugins/psychic.c:24
+#: ../plugins/psychic.c:21
msgid ""
"Causes conversation windows to appear as other users begin to message you. "
"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
msgstr ""
+"باعث میشود یه محض این که کاربران دیگر شروع به وارد کردن پیغام برای شما میکنند، پنجرهٔ گفتگویشان برای شما ظاهر شود."
+"این قابلیت برای AIM، ICQ، Jabber، Sametime و یاهو کار میکند."
-#: ../plugins/psychic.c:60
+#. This is a quote from Star Wars. You should
+#. probably not translate it literally. If
+#. you can't find a fitting cultural reference
+#. in your language, consider translating
+#. something like this instead:
+#. "You feel a new message coming."
+#: ../plugins/psychic.c:63
msgid "You feel a disturbance in the force..."
-msgstr ""
+msgstr "از دوردست صدایی به گوش میرسد..."
-#: ../plugins/psychic.c:79
+#: ../plugins/psychic.c:82
msgid "Only enable for users on the buddy list"
msgstr ""
-"فقط برای کاربرانی که در فهرست رفقای من هستند به کار انداخته شود"
+"فقط برای کاربرانی که در فهرست رفقای شما هستند به کار انداخته شود"
-#: ../plugins/psychic.c:84
+#: ../plugins/psychic.c:87
msgid "Disable when away"
-msgstr "وقتی رفتهام از کار انداخته شود"
+msgstr "هنگامی که رفتهام از کار انداخته شود"
-#: ../plugins/psychic.c:88
+#: ../plugins/psychic.c:91
msgid "Display notification message in conversations"
-msgstr "نمایش پیغامهای اطلاع دادن در گفتگوها"
+msgstr "نمایش پیغامهای اطلاعرسانی در گفتگوها"
#: ../plugins/raw.c:175
msgid "Raw"
@@ -1259,21 +1307,20 @@
#: ../plugins/raw.c:177
msgid "Lets you send raw input to text-based protocols."
-msgstr "به شما اجازه میدهد ورودی خام را به قراردادهای متنی ارسال کنید."
+msgstr "شما را قادر میسازد ورودی خام را به قراردادهای متنی ارسال کنید."
#: ../plugins/raw.c:178
msgid ""
"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
"'Enter' in the entry box to send. Watch the debug window."
msgstr ""
-"به شما اجازه میدهد ورودی خام را به قراردادهای متنی (Jabber، MSN، IRC، TOC) "
-"ارسال کنید. برای ارسال «ورود» را در جعبهی مدخل فشار دهید. پنجرهی اشکالزدایی "
-"را ببینید."
+"شما را قادر میسازد ورودی خام را به قراردادهای متنی (Jabber، MSN، IRC، TOC) "
+"ارسال کنید. برای ارسال در جعبهٔ مدخل کلید «ورود» را فشار دهید. مراقب پنجرهٔ اشکالزدایی باشید."
#: ../plugins/relnot.c:63
#, c-format
msgid "You are using Gaim version %s. The current version is %s.<hr>"
-msgstr "شما از نسخهی %s گیم استفاده میکنید. نسخهی فعلی %s است.<hr>"
+msgstr "شما در حال استفاده از نسخهٔ %s گیم هستید. نسخهٔ فعلی %s است.<hr>"
#: ../plugins/relnot.c:69
#, c-format
@@ -1281,7 +1328,7 @@
"<b>ChangeLog:</b>\n"
"%s<br><br>"
msgstr ""
-"<b>ثبت تغییرات:</b>\n"
+"<b>تغییرات ثبت شده:</b>\n"
"%s<br><br>"
#: ../plugins/relnot.c:74
@@ -1290,12 +1337,12 @@
"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
"\">http://gaim.sourceforge.net</a>."
msgstr ""
-"میتوانید نسخهی %s را از اینجا بگیرید:<br><a href=\"http://gaim.sourceforge."
+"میتوانید نسخهٔ %s را از اینجا بگیرید:<br><a href=\"http://gaim.sourceforge."
"net/\">http://gaim.sourceforge.net</a>."
#: ../plugins/relnot.c:78 ../plugins/relnot.c:79
msgid "New Version Available"
-msgstr "نسخهی جدیدی موجود است"
+msgstr "نسخهٔ جدیدی موجود است"
#. *< type
#. *< ui_requirement
@@ -1312,7 +1359,7 @@
#. * summary
#: ../plugins/relnot.c:140
msgid "Checks periodically for new releases."
-msgstr "به طور منظم وجود انتشارهای جدید را بررسی میکند."
+msgstr "به طور منظم رسیدن انتشارهای جدید گیم را بررسی میکند."
#. * description
#: ../plugins/relnot.c:142
@@ -1320,7 +1367,7 @@
"Checks periodically for new releases and notifies the user with the "
"ChangeLog."
msgstr ""
-"به طور منظم وجود انتشارهای جدید را بررسی میکند و ثبت تغییرات را به اطلاع "
+"به طور منظم رسیدن انتشارهای جدید گیم را بررسی میکند و تغییرات آن با نسخههای قبلی را به اطلاع "
"کاربر میرساند."
#. *< type
@@ -1339,7 +1386,7 @@
#. * description
#: ../plugins/signals-test.c:687 ../plugins/signals-test.c:689
msgid "Test to see that all signals are working properly."
-msgstr "آزمایش برای اطمینان از این که همهی سیگنالها درست کار میکنند."
+msgstr "آزمایش برای اطمینان از این که همهٔ سیگنالها درست کار میکنند آنها را آزمایش میکند."
#. *< type
#. *< ui_requirement
@@ -1347,80 +1394,80 @@
#. *< dependencies
#. *< priority
#. *< id
-#: ../plugins/simple.c:34
+#: ../plugins/simple.c:37
msgid "Simple Plugin"
-msgstr "متصل شوندهی ساده"
+msgstr "متصل شوندهٔ ساده"
#. *< name
#. *< version
#. * summary
#. * description
-#: ../plugins/simple.c:37 ../plugins/simple.c:39
+#: ../plugins/simple.c:40 ../plugins/simple.c:42
msgid "Tests to see that most things are working."
-msgstr "آزمایشهایی برای اطمینان از این که اغلب چیزها کار میکنند."
+msgstr "برای اطمینان از این که اغلب چیزها کار میکنند آزمایشهایی انجام میدهد."
-#: ../plugins/spellchk.c:1917
+#: ../plugins/spellchk.c:1918
msgid "Duplicate Correction"
-msgstr ""
+msgstr "تصحیح مقادیر تکراری"
-#: ../plugins/spellchk.c:1918
+#: ../plugins/spellchk.c:1919
msgid "The specified word already exists in the correction list."
-msgstr "کلمهی مشخص شده از قبل در فهرست اصلاحات قرار دارد."
+msgstr "کلمهٔ مشخص شده از قبل در فهرست اصلاحات قرار دارد."
-#: ../plugins/spellchk.c:2127
+#: ../plugins/spellchk.c:2128
msgid "Text Replacements"
msgstr "جایگزینی متن"
-#: ../plugins/spellchk.c:2150
+#: ../plugins/spellchk.c:2151
msgid "You type"
msgstr "تایپ میکنید"
-#: ../plugins/spellchk.c:2164
+#: ../plugins/spellchk.c:2165
msgid "You send"
msgstr "ارسال میشود"
-#: ../plugins/spellchk.c:2178
+#: ../plugins/spellchk.c:2179
msgid "Whole words only"
-msgstr "فقط کل کلمه"
+msgstr "فقط کلمههای کامل"
-#: ../plugins/spellchk.c:2190
+#: ../plugins/spellchk.c:2191
msgid "Case sensitive"
msgstr "حساس به بزرگی و کوچکی حروف"
-#: ../plugins/spellchk.c:2216
+#: ../plugins/spellchk.c:2217
msgid "Add a new text replacement"
msgstr "اضافه کردن جایگزینی متن جدید"
-#: ../plugins/spellchk.c:2232
+#: ../plugins/spellchk.c:2233
msgid "You _type:"
msgstr "_تایپ میکنید:"
-#: ../plugins/spellchk.c:2249
+#: ../plugins/spellchk.c:2250
msgid "You _send:"
msgstr "_ارسال میشود:"
#. Created here so it can be passed to whole_words_button_toggled.
-#: ../plugins/spellchk.c:2261
+#: ../plugins/spellchk.c:2262
msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr ""
+msgstr "مطابقت _دقیق بزرگی و کوچکی حروف (برای ادارهٔ خودکار بزرگی و کوچکی حروف، نشانه را بردارید)"
-#: ../plugins/spellchk.c:2263
+#: ../plugins/spellchk.c:2264
msgid "Only replace _whole words"
-msgstr "فقط جایگزینی _کل کلمه"
+msgstr "فقط جایگزینی _کلمات کامل"
-#: ../plugins/spellchk.c:2288
+#: ../plugins/spellchk.c:2289
msgid "General Text Replacement Options"
msgstr "گزینههای عمومی جایگزینی متن"
-#: ../plugins/spellchk.c:2289
+#: ../plugins/spellchk.c:2290
msgid "Enable replacement of last word on send"
msgstr "جایگزینی آخرین کلمه هنگام ارسال به کار انداخته شود"
-#: ../plugins/spellchk.c:2314
+#: ../plugins/spellchk.c:2315
msgid "Text replacement"
msgstr "جایگزینی متن"
-#: ../plugins/spellchk.c:2316 ../plugins/spellchk.c:2317
+#: ../plugins/spellchk.c:2317 ../plugins/spellchk.c:2318
msgid "Replaces text in outgoing messages according to user-defined rules."
msgstr ""
"جایگزینی متن در پیغامهای ارسالی با توجه به قوانین تعریف شده توسط کاربر."
@@ -1479,51 +1526,46 @@
msgid "Provides a wrapper around SSL support libraries."
msgstr "پوششی برای کتابخانههای پشتیبانی SSL در اختیار میگذارد."
-#: ../plugins/statenotify.c:49
+#: ../plugins/statenotify.c:50
#, c-format
msgid "%s is no longer away."
-msgstr "%s برگشته است."
+msgstr "%s برگشت."
-#: ../plugins/statenotify.c:51
+#: ../plugins/statenotify.c:52
#, c-format
msgid "%s has gone away."
-msgstr "%s رفته است."
+msgstr "%s رفت."
-#: ../plugins/statenotify.c:61
+#: ../plugins/statenotify.c:62
#, c-format
msgid "%s has become idle."
-msgstr "%s بیکار شده است."
+msgstr "%s بیکار شد."
-#: ../plugins/statenotify.c:63
+#: ../plugins/statenotify.c:64
#, c-format
msgid "%s is no longer idle."
msgstr "%s دیگر بیکار نیست."
-#: ../plugins/statenotify.c:72
+#: ../plugins/statenotify.c:73
#, c-format
msgid "%s has signed on."
-msgstr "%s وارد سیستم شده است."
+msgstr "%s وارد سیستم شد."
-#: ../plugins/statenotify.c:79
-#, c-format
-msgid "%s has signed off."
-msgstr "%s از سیستم خارج شده است."
-
-#: ../plugins/statenotify.c:90
+#: ../plugins/statenotify.c:91
msgid "Notify When"
msgstr "دادن اطلاع زمانی که"
-#: ../plugins/statenotify.c:93
+#: ../plugins/statenotify.c:94
msgid "Buddy Goes _Away"
msgstr "رفیق _میرود"
-#: ../plugins/statenotify.c:96
+#: ../plugins/statenotify.c:97
msgid "Buddy Goes _Idle"
msgstr "رفیق _بیکار میشود"
-#: ../plugins/statenotify.c:99
+#: ../plugins/statenotify.c:100
msgid "Buddy _Signs On/Off"
-msgstr "رفیقتان وارد سیستم/از سیستم خارج میشود"
+msgstr "رفیق وارد سیستم میشود/ از سیستم خارج میشود"
#. *< type
#. *< ui_requirement
@@ -1531,7 +1573,7 @@
#. *< dependencies
#. *< priority
#. *< id
-#: ../plugins/statenotify.c:141
+#: ../plugins/statenotify.c:142
msgid "Buddy State Notification"
msgstr "اطلاع وضعیت رفیق"
@@ -1539,21 +1581,21 @@
#. *< version
#. * summary
#. * description
-#: ../plugins/statenotify.c:144 ../plugins/statenotify.c:147
+#: ../plugins/statenotify.c:145 ../plugins/statenotify.c:148
msgid ""
"Notifies in a conversation window when a buddy goes or returns from away or "
"idle."
msgstr ""
"وقتی رفیقی میرود یا بیکار میشود یا از وضعیت رفته یا بیکاری در میآید، در یک "
-"پنجرهی گفتگو اطلاع میدهد."
+"پنجرهٔ گفتگو اطلاع میدهد."
-#: ../plugins/tcl/tcl.c:369
+#: ../plugins/tcl/tcl.c:402
msgid "Tcl Plugin Loader"
-msgstr "بارکنندهی متصل شوندهی Tcl"
+msgstr "بارکنندهٔ متصل شوندهٔ tcl"
-#: ../plugins/tcl/tcl.c:371 ../plugins/tcl/tcl.c:372
+#: ../plugins/tcl/tcl.c:404 ../plugins/tcl/tcl.c:405
msgid "Provides support for loading Tcl plugins"
-msgstr "برای بار کردن متصل شوندههای Tcl پشتیبانی فراهم میکند"
+msgstr "برای بار کردن متصل شوندههای tcl پشتیبانی فراهم میکند"
#. *< type
#. *< ui_requirement
@@ -1571,17 +1613,17 @@
#. * description
#: ../plugins/ticker/ticker.c:358 ../plugins/ticker/ticker.c:360
msgid "A horizontal scrolling version of the buddy list."
-msgstr "نسخهی افقی و لغزندهی فهرست رفقا."
+msgstr "نسخهٔ افقی و لغزان فهرست رفقا."
-#: ../plugins/timestamp.c:188
+#: ../plugins/timestamp.c:186
msgid "iChat Timestamp"
msgstr "مُهر زمانی آیچَت"
-#: ../plugins/timestamp.c:195
+#: ../plugins/timestamp.c:193
msgid "Delay"
msgstr "تأخیر"
-#: ../plugins/timestamp.c:202
+#: ../plugins/timestamp.c:200
msgid "minutes."
msgstr "دقیقه."
@@ -1591,7 +1633,7 @@
#. *< dependencies
#. *< priority
#. *< id
-#: ../plugins/timestamp.c:264
+#: ../plugins/timestamp.c:256
msgid "Timestamp"
msgstr "مُهر زمانی"
@@ -1599,7 +1641,7 @@
#. *< version
#. * summary
#. * description
-#: ../plugins/timestamp.c:267 ../plugins/timestamp.c:269
+#: ../plugins/timestamp.c:259 ../plugins/timestamp.c:261
msgid "Adds iChat-style timestamps to conversations every N minutes."
msgstr "هر N دقیقه یک مُهر زمانی به سبک آیچت به گفتگو اضافه میکند."
@@ -1621,15 +1663,15 @@
#: ../plugins/timestamp_format.c:37 ../plugins/timestamp_format.c:46
msgid "For delayed messages"
-msgstr "برای پیغامهای با تأخیر"
+msgstr "برای پیغامهای تأخیر دار"
#: ../plugins/timestamp_format.c:38 ../plugins/timestamp_format.c:47
msgid "For delayed messages and in chats"
-msgstr "برای پیغامهای باتأخیر و در گپها"
+msgstr "برای پیغامهای تأخیر دار و در گپها"
#: ../plugins/timestamp_format.c:44
msgid "_Message Logs:"
-msgstr "تاریخچههای _پیغام:"
+msgstr "تاریخچهٔ _پیغامها:"
#. *< type
#. *< ui_requirement
@@ -1654,7 +1696,8 @@
"This plugin allows the user to customize conversation and logging message "
"timestamp formats."
msgstr ""
-"این متصل شونده کاربران را قادر میسازد قالبهای مهر زمانی پیغام گفتگو و تاریخچهنویسی را سفارشی کنند."
+"این متصل شونده کاربران را قادر میسازد قالبهای مهر زمانی پیغام گفتگو و "
+"تاریخچهٔ آن را سفارشی کنند."
#: ../plugins/win32/transparency/win2ktrans.c:183
#: ../plugins/win32/transparency/win2ktrans.c:569
@@ -1665,19 +1708,19 @@
#. IM Convo trans options
#: ../plugins/win32/transparency/win2ktrans.c:533
msgid "IM Conversation Windows"
-msgstr "پنجرههای گفتگوی پیغام فوری"
+msgstr "پنجرههای گفتگوی پیغام اینترنتی"
#: ../plugins/win32/transparency/win2ktrans.c:534
msgid "_IM window transparency"
-msgstr "_شفافیت پنجرهی پیغام فوری"
+msgstr "_شفافیت پنجرهٔ پیغام اینترنتی"
#: ../plugins/win32/transparency/win2ktrans.c:548
msgid "_Show slider bar in IM window"
-msgstr "_نمایش نوار لغزش در پنجرهی پیغام فوری"
+msgstr "_نمایش نوار لغزش در پنجرهٔ پیغام اینترنتی"
#: ../plugins/win32/transparency/win2ktrans.c:555
msgid "Remove IM window transparency on focus"
-msgstr "حذف شفافیت پنجرهی پیغام فوری هنگام تمرکز"
+msgstr "حذف شفافیت پنجرهٔ پیغام اینترنتی هنگام تمرکز"
#: ../plugins/win32/transparency/win2ktrans.c:558
#: ../plugins/win32/transparency/win2ktrans.c:606
@@ -1687,15 +1730,15 @@
#. Buddy List trans options
#: ../plugins/win32/transparency/win2ktrans.c:590
msgid "Buddy List Window"
-msgstr "پنجرهی فهرست رفقا"
+msgstr "پنجرهٔ فهرست رفقا"
#: ../plugins/win32/transparency/win2ktrans.c:591
msgid "_Buddy List window transparency"
-msgstr "شفافیت پنجرهی فهرست _رفقا"
+msgstr "شفافیت پنجرهٔ فهرست _رفقا"
#: ../plugins/win32/transparency/win2ktrans.c:604
msgid "Remove Buddy List window transparency on focus"
-msgstr "حذف شفافیت پنجرهی فهرست رفقا هنگام تمرکز"
+msgstr "حذف شفافیت پنجرهٔ فهرست رفقا هنگام تمرکز"
#. *< type
#. *< ui_requirement
@@ -1703,19 +1746,19 @@
#. *< dependencies
#. *< priority
#. *< id
-#: ../plugins/win32/transparency/win2ktrans.c:657
+#: ../plugins/win32/transparency/win2ktrans.c:658
msgid "Transparency"
msgstr "شفافیت"
#. *< name
#. *< version
#. * summary
-#: ../plugins/win32/transparency/win2ktrans.c:660
+#: ../plugins/win32/transparency/win2ktrans.c:661
msgid "Variable Transparency for the buddy list and conversations."
-msgstr "شفافیت متغیر برای فهرست رفقا و گفتگوها"
+msgstr "شفافیت متغیر برای فهرست رفقا و گفتگوها."
#. * description
-#: ../plugins/win32/transparency/win2ktrans.c:662
+#: ../plugins/win32/transparency/win2ktrans.c:663
msgid ""
"This plugin enables variable alpha transparency on conversation windows and "
"the buddy list.\n"
@@ -1727,192 +1770,199 @@
"\n"
"* توجه: این متصل شونده نیازمند ویندوز 2000 یا بالاتر است."
-#: ../plugins/win32/winprefs/winprefs.c:397
+#: ../plugins/win32/winprefs/winprefs.c:434
msgid "GTK+ Runtime Version"
-msgstr "نسخهی دارای GTK+ در زمان اجرا"
+msgstr "نسخهٔ دارای GTK+ در زمان اجرا"
#. Autostart
-#: ../plugins/win32/winprefs/winprefs.c:405
+#: ../plugins/win32/winprefs/winprefs.c:442
msgid "Startup"
msgstr "راهاندازی"
-#: ../plugins/win32/winprefs/winprefs.c:406
+#: ../plugins/win32/winprefs/winprefs.c:443
msgid "_Start Gaim on Windows startup"
msgstr "آ_غاز گیم هنگام راهاندازی ویندوز"
#. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3623
+#: ../plugins/win32/winprefs/winprefs.c:455 ../src/gtkblist.c:3667
msgid "Buddy List"
msgstr "فهرست رفقا"
-#: ../plugins/win32/winprefs/winprefs.c:418
+#: ../plugins/win32/winprefs/winprefs.c:456
msgid "_Dockable Buddy List"
msgstr "فهرست رفقای _جدا شدنی"
#. Blist On Top
-#: ../plugins/win32/winprefs/winprefs.c:422
+#: ../plugins/win32/winprefs/winprefs.c:460
msgid "_Keep Buddy List window on top:"
-msgstr "_رو نگه داشتن پنجرهی فهرست رفقا:"
+msgstr "رو نگه داشتن پنجرهٔ فهرست رفقا_:"
#. XXX: Did this ever work?
-#: ../plugins/win32/winprefs/winprefs.c:427
+#: ../plugins/win32/winprefs/winprefs.c:465
msgid "Only when docked"
msgstr "فقط وقتی جدا شده است"
#. Conversations
-#: ../plugins/win32/winprefs/winprefs.c:431 ../src/gtkprefs.c:819
-#: ../src/gtkprefs.c:1864
+#: ../plugins/win32/winprefs/winprefs.c:469 ../src/gtkprefs.c:819
+#: ../src/gtkprefs.c:1879
msgid "Conversations"
msgstr "گفتگوها"
-#: ../plugins/win32/winprefs/winprefs.c:432
+#: ../plugins/win32/winprefs/winprefs.c:470
msgid "_Flash window when messages are received"
msgstr "_چشمک زدن پنجره وقتی پیغامی دریافت میشود"
-#: ../plugins/win32/winprefs/winprefs.c:456
+#: ../plugins/win32/winprefs/winprefs.c:494
msgid "WinGaim Options"
msgstr "گزینههای گیم ویندوز"
-#: ../plugins/win32/winprefs/winprefs.c:458
+#: ../plugins/win32/winprefs/winprefs.c:496
msgid "Options specific to Windows Gaim."
msgstr "گزینههای خاص گیم ویندوز."
-#: ../plugins/win32/winprefs/winprefs.c:459
+#: ../plugins/win32/winprefs/winprefs.c:497
msgid ""
"Provides options specific to Windows Gaim, such as...
[truncated message content] |
|
From: <sa...@us...> - 2006-10-30 21:48:49
|
Revision: 17630
http://svn.sourceforge.net/gaim/?rev=17630&view=rev
Author: sadrul
Date: 2006-10-30 13:48:42 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
Remember the size of the debug window, and remember the correct size of the conversation windows after resizing.
Modified Paths:
--------------
trunk/console/gntconv.c
trunk/console/gntdebug.c
Modified: trunk/console/gntconv.c
===================================================================
--- trunk/console/gntconv.c 2006-10-30 05:27:31 UTC (rev 17629)
+++ trunk/console/gntconv.c 2006-10-30 21:48:42 UTC (rev 17630)
@@ -157,10 +157,12 @@
}
static void
-size_changed_cb(GntWidget *w, int width, int height)
+size_changed_cb(GntWidget *widget, int width, int height)
{
- gaim_prefs_set_int(PREF_ROOT "/size/width", width);
- gaim_prefs_set_int(PREF_ROOT "/size/height", height);
+ int w, h;
+ gnt_widget_get_size(widget, &w, &h);
+ gaim_prefs_set_int(PREF_ROOT "/size/width", w);
+ gaim_prefs_set_int(PREF_ROOT "/size/height", h);
}
static void
Modified: trunk/console/gntdebug.c
===================================================================
--- trunk/console/gntdebug.c 2006-10-30 05:27:31 UTC (rev 17629)
+++ trunk/console/gntdebug.c 2006-10-30 21:48:42 UTC (rev 17630)
@@ -36,6 +36,8 @@
#include <stdio.h>
#include <string.h>
+#define PREF_ROOT "/gaim/gnt/debug"
+
static struct
{
GntWidget *window;
@@ -191,6 +193,15 @@
g_free(new_domain);
}
+static void
+size_changed_cb(GntWidget *widget, int oldw, int oldh)
+{
+ int w, h;
+ gnt_widget_get_size(widget, &w, &h);
+ gaim_prefs_set_int(PREF_ROOT "/size/width", w);
+ gaim_prefs_set_int(PREF_ROOT "/size/height", h);
+}
+
void gg_debug_window_show()
{
debug.paused = FALSE;
@@ -206,6 +217,10 @@
debug.tview = gnt_text_view_new();
gnt_box_add_widget(GNT_BOX(debug.window), debug.tview);
+ gnt_widget_set_size(debug.tview,
+ gaim_prefs_get_int(PREF_ROOT "/size/width"),
+ gaim_prefs_get_int(PREF_ROOT "/size/height"));
+ g_signal_connect(G_OBJECT(debug.tview), "size_changed", G_CALLBACK(size_changed_cb), NULL);
gnt_box_add_widget(GNT_BOX(debug.window), gnt_line_new(FALSE));
@@ -268,6 +283,12 @@
REGISTER_G_LOG_HANDLER("GThread");
g_set_print_handler(print_stderr); /* Redirect the debug messages to stderr */
+
+ gaim_prefs_add_none(PREF_ROOT);
+ gaim_prefs_add_none(PREF_ROOT "/size");
+ gaim_prefs_add_int(PREF_ROOT "/size/width", 60);
+ gaim_prefs_add_int(PREF_ROOT "/size/height", 15);
+
if (gaim_debug_is_enabled())
g_timeout_add(0, start_with_debugwin, NULL);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-10-30 05:27:54
|
Revision: 17629
http://svn.sourceforge.net/gaim/?rev=17629&view=rev
Author: thekingant
Date: 2006-10-29 21:27:31 -0800 (Sun, 29 Oct 2006)
Log Message:
-----------
Get rid of an assertion failure. I suspect this was my bug, but I
didn't look into it. It's pretty minor.
Modified Paths:
--------------
trunk/gtk/gtkrequest.c
Modified: trunk/gtk/gtkrequest.c
===================================================================
--- trunk/gtk/gtkrequest.c 2006-10-30 05:09:28 UTC (rev 17628)
+++ trunk/gtk/gtkrequest.c 2006-10-30 05:27:31 UTC (rev 17629)
@@ -1528,7 +1528,7 @@
}
if (filename != NULL)
- gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(filesel), filename);
+ gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(filesel), filename);
if ((current_folder != NULL) && (*current_folder != '\0')) {
folder_set = gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(filesel), current_folder);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-10-30 05:09:30
|
Revision: 17628
http://svn.sourceforge.net/gaim/?rev=17628&view=rev
Author: thekingant
Date: 2006-10-29 21:09:28 -0800 (Sun, 29 Oct 2006)
Log Message:
-----------
A documentation patch from Eduardo P?\195?\169rez to clean up a little bit of code.
Modified Paths:
--------------
trunk/gtk/gtkaccount.c
Modified: trunk/gtk/gtkaccount.c
===================================================================
--- trunk/gtk/gtkaccount.c 2006-10-30 04:45:06 UTC (rev 17627)
+++ trunk/gtk/gtkaccount.c 2006-10-30 05:09:28 UTC (rev 17628)
@@ -2056,9 +2056,13 @@
/* Create the list model. */
dialog->model = gtk_list_store_new(NUM_COLUMNS,
- GDK_TYPE_PIXBUF, G_TYPE_STRING,
- G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_POINTER,
- G_TYPE_POINTER);
+ GDK_TYPE_PIXBUF, /* COLUMN_ICON */
+ G_TYPE_STRING, /* COLUMN_SCREENNAME */
+ G_TYPE_BOOLEAN, /* COLUMN_ENABLED */
+ G_TYPE_STRING, /* COLUMN_PROTOCOL */
+ G_TYPE_POINTER, /* COLUMN_DATA */
+ G_TYPE_POINTER /* COLUMN_PULSE_DATA */
+ );
/* And now the actual treeview */
treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(dialog->model));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-10-30 04:45:14
|
Revision: 17627
http://svn.sourceforge.net/gaim/?rev=17627&view=rev
Author: thekingant
Date: 2006-10-29 20:45:06 -0800 (Sun, 29 Oct 2006)
Log Message:
-----------
Allow this to compile on Solaris, in the event that it is ever uncommented
Modified Paths:
--------------
trunk/libgaim/protocols/qq/send_file.c
Modified: trunk/libgaim/protocols/qq/send_file.c
===================================================================
--- trunk/libgaim/protocols/qq/send_file.c 2006-10-30 04:39:11 UTC (rev 17626)
+++ trunk/libgaim/protocols/qq/send_file.c 2006-10-30 04:45:06 UTC (rev 17627)
@@ -217,8 +217,8 @@
gaim_debug(GAIM_DEBUG_INFO, "QQ", "minor port closed\n");
}
/*
- if (info->buffer != NULL) {
- munmap(info->buffer, gaim_xfer_get_size(xfer));
+ if (info->u.buffer != NULL) {
+ munmap(info->u.buffer, gaim_xfer_get_size(xfer));
gaim_debug(GAIM_DEBUG_INFO, "QQ", "file mapping buffer is freed.\n");
}
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rl...@us...> - 2006-10-30 04:39:28
|
Revision: 17626
http://svn.sourceforge.net/gaim/?rev=17626&view=rev
Author: rlaager
Date: 2006-10-29 20:39:11 -0800 (Sun, 29 Oct 2006)
Log Message:
-----------
Mark a string for translation.
Fixes SF Bug #1586953
Modified Paths:
--------------
trunk/libgaim/protocols/qq/qq.c
Modified: trunk/libgaim/protocols/qq/qq.c
===================================================================
--- trunk/libgaim/protocols/qq/qq.c 2006-10-30 03:54:24 UTC (rev 17625)
+++ trunk/libgaim/protocols/qq/qq.c 2006-10-30 04:39:11 UTC (rev 17626)
@@ -519,7 +519,7 @@
g_string_append_printf(info, _("<b>My Public IP</b>: %s<br>\n"), qd->my_ip);
g_string_append(info, "<hr>\n");
- g_string_append(info, "<i>Information below may not be accurate</i><br>\n");
+ g_string_append(info, _("<i>Information below may not be accurate</i><br>\n"));
g_string_append_printf(info, _("<b>Login Time</b>: %s<br>\n"), ctime(&qd->login_time));
g_string_append_printf(info, _("<b>Last Login IP</b>: %s<br>\n"), qd->last_login_ip);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-10-30 03:54:29
|
Revision: 17625
http://svn.sourceforge.net/gaim/?rev=17625&view=rev
Author: thekingant
Date: 2006-10-29 19:54:24 -0800 (Sun, 29 Oct 2006)
Log Message:
-----------
Mark a newish string as translatable
Modified Paths:
--------------
trunk/libgaim/plugin.c
Modified: trunk/libgaim/plugin.c
===================================================================
--- trunk/libgaim/plugin.c 2006-10-30 03:50:11 UTC (rev 17624)
+++ trunk/libgaim/plugin.c 2006-10-30 03:54:24 UTC (rev 17625)
@@ -362,7 +362,7 @@
else if (plugin->info->ui_requirement &&
strcmp(plugin->info->ui_requirement, gaim_core_get_ui()))
{
- plugin->error = g_strdup_printf("You are using %s, but this plugin requires %s.",
+ plugin->error = g_strdup_printf(_("You are using %s, but this plugin requires %s."),
gaim_core_get_ui(), plugin->info->ui_requirement);
gaim_debug_error("plugins", "%s is not loadable: The UI requirement is not met.\n", plugin->path);
plugin->unloadable = TRUE;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
6 messages has been excluded from this view by a project administrator.
