[Ayttm-commits] CVS: ayttm/src add_contact_window.c,1.18,1.19 away_window.c,1.14,1.15 chat_window.c,1.61,1.62 main.c,1.23,1.24 message_parse.c,1.17,1.18 plugin.c,1.8,1.9 prefs.c,1.30,1.31 sound.c,1.14,1.15

[Colin Leroy <address@hidden>]

Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv2809/src

Modified Files:
        add_contact_window.c away_window.c chat_window.c main.c 
        message_parse.c plugin.c prefs.c sound.c 
Log Message:
reword a few dialogs


Index: add_contact_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/add_contact_window.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- add_contact_window.c        31 Jan 2003 07:29:19 -0000      1.18
+++ add_contact_window.c        22 Mar 2003 11:48:25 -0000      1.19
@@ -188,7 +188,7 @@
                char *buf = NULL;
                char *err = eb_services[service_id].sc->check_login((char 
*)account, (char *)"");
                if (err != NULL) {
-                       buf = g_strdup_printf(_("The account is not 
syntactically correct:\n%s"), err);
+                       buf = g_strdup_printf(_("The account is not 
syntactically correct:\n\n%s"), err);
                        g_free(err);
                        do_error_dialog(buf, _("Error"));
                        g_free(buf);

Index: away_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/away_window.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- away_window.c       6 Feb 2003 10:08:51 -0000       1.14
+++ away_window.c       22 Mar 2003 11:48:25 -0000      1.15
@@ -234,7 +234,7 @@
                }
        }
        if (!buff || strlen(buff) == 0) {
-               do_error_dialog (_("Enter at least a message.\n"),_("Error"));
+               do_error_dialog (_("You have to enter a message."),_("Error"));
                return;
        }
        g_string_append(a_title, buff); 

Index: chat_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_window.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- chat_window.c       21 Mar 2003 20:09:00 -0000      1.61
+++ chat_window.c       22 Mar 2003 11:48:25 -0000      1.62
@@ -596,7 +596,7 @@
        gchar *buff = (gchar *)g_new0(gchar *, BUF_SIZE);
        GET_CHAT_WINDOW(cw);
 
-       g_snprintf(buff, BUF_SIZE, _("Do you really want to ignore %s?\n"), 
cw->contact->nick);
+       g_snprintf(buff, BUF_SIZE, _("Do you really want to ignore %s?"), 
cw->contact->nick);
 
        eb_do_dialog(buff, _("Ignore Contact"), ignore_dialog_callback, 
cw->contact);   
        g_free(buff);

Index: main.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/main.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- main.c      16 Mar 2003 21:28:51 -0000      1.23
+++ main.c      22 Mar 2003 11:48:25 -0000      1.24
@@ -379,7 +379,7 @@
 #endif
                if (connect(sock, (struct sockaddr*)&remote, len) == -1 ) {
                        perror("connect");
-                       g_snprintf(buff, 1024, _("Ayttm already running, 
pid=%d\n"), pid);
+                       g_snprintf(buff, 1024, _("Ayttm is already running 
(pid=%d), and the remote-control UNIX socket cannot be connected."), pid);
                        /* TODO make sure this one is modal */
                        do_error_dialog(buff, _("Already logged on"));
                        exit(1);

Index: message_parse.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/message_parse.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- message_parse.c     12 Feb 2003 10:12:00 -0000      1.17
+++ message_parse.c     22 Mar 2003 11:48:25 -0000      1.18
@@ -272,8 +272,8 @@
        }
        else
        {
-               do_error_dialog(_("Remote Side has aborted the\nfile transfer"),
-                                               _("Ayttm File Transfer"));
+               do_error_dialog(_("Remote Side has aborted the file transfer"),
+                                               _("Ayttm file x-fer"));
        }
 
 }

Index: plugin.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/plugin.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.c    3 Feb 2003 11:11:26 -0000       1.8
+++ plugin.c    22 Mar 2003 11:48:25 -0000      1.9
@@ -156,7 +156,7 @@
                eb_debug(DBG_CORE, "Calling plugins finish function\n");
                error=epi->pi.finish();
                if(error) {
-                       sprintf(buf, _("Unable to unload plugin %s, still in 
use?\n"), epi->name);
+                       sprintf(buf, _("Unable to unload plugin %s; maybe it is 
still in use?"), epi->name);
                        do_error_dialog(buf, _("Error"));
                        eb_debug(DBG_CORE, "<Plugin failed to unload\n");
                        return(-1);
@@ -268,7 +268,7 @@
        do {
                if((dirp = opendir(cur_path)) == NULL)
                {
-                       sprintf(buf, _("Cannot open module directory \"%s\""), 
cur_path);
+                       sprintf(buf, _("Cannot open module directory \"%s\"."), 
cur_path);
                        do_error_dialog(buf, _("Warning"));
                        buf[0] = '\0';
                        break;
@@ -369,7 +369,7 @@
        if(!info->init) {
                SetPluginInfo(info, name, NULL, PLUGIN_CANNOT_LOAD, _("No init 
function defined"), NULL, FALSE);
                lt_dlclose(Module);
-               sprintf(buf, _("init function not defined for utility module 
%s, unloading module\n"), name);
+               sprintf(buf, _("Utility module %s doesn't define an init 
function; skipping it."), name);
                do_error_dialog(buf, _("Warning"));
                return(-1);
        }

Index: prefs.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/prefs.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- prefs.c     3 Feb 2003 11:11:26 -0000       1.30
+++ prefs.c     22 Mar 2003 11:48:25 -0000      1.31
@@ -184,7 +184,7 @@
                account_pairs = GetPref(buff);
                nela = 
eb_services[oela->service_id].sc->read_local_account_config(account_pairs);
                if(!nela) {
-                       g_snprintf(buff2, buffer_size, _("Unable to create 
account for %s, check config file\n"), buff);
+                       g_snprintf(buff2, buffer_size, _("Unable to create 
account for %s.\nCheck your config file."), buff);
                        do_error_dialog(buff2, _("Invalid account"));
                        oela->service_id=get_service_id("NO SERVICE");
                }

Index: sound.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/sound.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sound.c     29 Jan 2003 19:19:23 -0000      1.14
+++ sound.c     22 Mar 2003 11:48:25 -0000      1.15
@@ -55,7 +55,6 @@
 #include "plugin_api.h"
 
 int clean_pid(void * dummy);   /* util.h */
-void do_error_dialog(char *message, char *title);      /* dialog.h */
 
 #ifdef ESD_SOUND
 #include <esd.h>
@@ -553,7 +552,7 @@
                default:
                        g_snprintf(message, 1024, "Error in opening sound file 
\'%s\', error code = %d", soundfile, errno);
                }
-               do_error_dialog(message, "Ayttm-WARNING");
+               printf(message);
                return FALSE;
        }
        return TRUE;