mirror of
https://github.com/transmission/transmission
synced 2024-12-31 20:16:57 +00:00
janitorial work for the freeze: (1) finish replacing "transmission-gtk" with "transmission". (2) add Charles to authors lists in man pages. (3) standardize the summary as "A fast and easy BitTorrent client" in the rpm spec, gtk about dialog, and man pages. (4) fold together similar translation strings in the gtk client. (5) use g_strerror instead of strerror in the gtk client.
This commit is contained in:
parent
cc2d8f3310
commit
bb84cb9f09
18 changed files with 43 additions and 56 deletions
9
README
9
README
|
@ -1,16 +1,13 @@
|
|||
README for Transmission
|
||||
=======================
|
||||
|
||||
Transmission is a free, lightweight BitTorrent client. It features a
|
||||
simple, intuitive interface on top of an efficient, cross-platform
|
||||
back-end.
|
||||
Transmission is a fast, easy, and free BitTorrent client.
|
||||
|
||||
Transmission runs on Mac OS X (Cocoa interface),
|
||||
It runs on Mac OS X (Cocoa interface),
|
||||
Linux/NetBSD/FreeBSD/OpenBSD (GTK+ interface)
|
||||
and BeOS (native interface).
|
||||
|
||||
For more information (including build instructions),
|
||||
please consult the website: http://transmission.m0k.org/
|
||||
Visit http://transmission.m0k.org/ for more information.
|
||||
|
||||
|
||||
Building Transmission
|
||||
|
|
|
@ -107,11 +107,12 @@ program was written by
|
|||
.An -nosplit
|
||||
.An Eric Petit Aq titer@m0k.org ,
|
||||
.An Josh Elsasser Aq josh@elsasser.org ,
|
||||
.An Charles Kerr Aq charles@rebelbase.com ,
|
||||
and
|
||||
.An Mitchell Livingston Aq livings124@gmail.com .
|
||||
.Sh SEE ALSO
|
||||
.Xr transmission 1 ,
|
||||
.Xr transmission-daemon 1 ,
|
||||
.Xr transmission-gtk 1 ,
|
||||
.Xr transmission-proxy 1 ,
|
||||
.Xr transmission-remote 1
|
||||
.Pp
|
||||
|
|
|
@ -126,7 +126,7 @@ usage( const char * msg, ... )
|
|||
"usage: %s [-dfh] [-p file] [-s file]\n"
|
||||
"\n"
|
||||
"Transmission %s http://transmission.m0k.org/\n"
|
||||
"A free, lightweight BitTorrent client with a simple, intuitive interface\n"
|
||||
"A fast and easy BitTorrent client\n"
|
||||
"\n"
|
||||
" -d --debug Print data send and received, implies -f\n"
|
||||
" -f --foreground Run in the foreground and log to stderr\n"
|
||||
|
|
|
@ -129,11 +129,11 @@ usage( const char * msg, ... )
|
|||
"usage: %s [options] [files]...\n"
|
||||
"\n"
|
||||
"Transmission %s http://transmission.m0k.org/\n"
|
||||
"A free, lightweight BitTorrent client with a simple, intuitive interface.\n"
|
||||
"A fast and easy BitTorrent client\n"
|
||||
"\n"
|
||||
" -h --help Display this message and exit\n"
|
||||
" -t --type daemon Use the daemon frontend, transmission-daemon\n"
|
||||
" -t --type gtk Use the GTK+ frontend, transmission-gtk\n"
|
||||
" -t --type gtk Use the GTK+ frontend, transmission\n"
|
||||
" -t --type mac Use the Mac OS X frontend\n",
|
||||
getmyname(), LONG_VERSION_STRING );
|
||||
exit( EXIT_SUCCESS );
|
||||
|
|
|
@ -226,7 +226,7 @@ usage( const char * msg, ... )
|
|||
"usage: %s [options]\n"
|
||||
"\n"
|
||||
"Transmission %s http://transmission.m0k.org/\n"
|
||||
"A free, lightweight BitTorrent client with a simple, intuitive interface.\n"
|
||||
"A fast and easy BitTorrent client\n"
|
||||
"\n"
|
||||
" -a --add <torrent> Add a torrent\n"
|
||||
" -d --download-limit <int> Max download rate in KiB/s\n"
|
||||
|
@ -248,7 +248,7 @@ usage( const char * msg, ... )
|
|||
" -S --stop <hash> Stop the torrent with the given hash\n"
|
||||
" -S --stop all Stop all running torrents\n"
|
||||
" -t --type daemon Use the daemon frontend, transmission-daemon\n"
|
||||
" -t --type gtk Use the GTK+ frontend, transmission-gtk\n"
|
||||
" -t --type gtk Use the GTK+ frontend, transmission\n"
|
||||
" -t --type mac Use the MacOS X frontend\n"
|
||||
" -u --upload-limit <int> Max upload rate in KiB/s\n"
|
||||
" -U --upload-unlimited No upload rate limit\n"
|
||||
|
|
|
@ -67,11 +67,12 @@ The
|
|||
program was written by
|
||||
.An Josh Elsasser Aq josh@elsasser.org ,
|
||||
.An Eric Petit Aq titer@m0k.org ,
|
||||
.An Charles Kerr Aq charles@rebelbase.com ,
|
||||
and
|
||||
.An Mitchell Livingston Aq livings124@gmail.com .
|
||||
.Sh SEE ALSO
|
||||
.Xr transmissioncli 1 ,
|
||||
.Xr transmission-gtk 1 ,
|
||||
.Xr transmission 1 ,
|
||||
.Xr transmission-proxy 1 ,
|
||||
.Xr transmission-remote 1
|
||||
.Pp
|
||||
|
|
|
@ -42,7 +42,7 @@ The options are as follows:
|
|||
Connect to either
|
||||
.Xr transmission-daemon 1
|
||||
or
|
||||
.Xr transmission-gtk 1 .
|
||||
.Xr transmission 1 .
|
||||
.It Fl h Fl -help
|
||||
Print command-line option descriptions.
|
||||
.El
|
||||
|
@ -55,11 +55,12 @@ The
|
|||
program was written by
|
||||
.An Josh Elsasser Aq josh@elsasser.org ,
|
||||
.An Eric Petit Aq titer@m0k.org ,
|
||||
.An Charles Kerr Aq charles@rebelbase.com ,
|
||||
and
|
||||
.An Mitchell Livingston Aq livings124@gmail.com .
|
||||
.Sh SEE ALSO
|
||||
.Xr transmissioncli 1 ,
|
||||
.Xr transmission-gtk 1 ,
|
||||
.Xr transmission 1 ,
|
||||
.Xr transmission-remote 1
|
||||
.Pp
|
||||
http://transmission.m0k.org
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
.Nd a remote control utility for
|
||||
.Xr transmission-daemon 1
|
||||
and
|
||||
.Xr transmission-gtk 1
|
||||
.Xr transmission 1
|
||||
.Sh SYNOPSIS
|
||||
.Bk -words
|
||||
.Nm transmission-remote
|
||||
|
@ -147,7 +147,7 @@ hash of
|
|||
Connect to either
|
||||
.Xr transmission-daemon 1
|
||||
or
|
||||
.Xr transmission-gtk 1 .
|
||||
.Xr transmission 1 .
|
||||
.It Fl u Fl -upload-limit Ar upload-rate
|
||||
Set maximum upload rate to
|
||||
.Ar upload-rate
|
||||
|
@ -158,7 +158,7 @@ Remove the upload limit.
|
|||
Proxy the connection to
|
||||
.Xr transmission-daemon 1
|
||||
or
|
||||
.Xr transmission-gtk 1
|
||||
.Xr transmission 1
|
||||
through
|
||||
.Ar command .
|
||||
.El
|
||||
|
@ -195,12 +195,13 @@ The
|
|||
program was written by
|
||||
.An Josh Elsasser Aq josh@elsasser.org ,
|
||||
.An Eric Petit Aq titer@m0k.org ,
|
||||
.An Charles Kerr Aq charles@rebelbase.com ,
|
||||
and
|
||||
.An Mitchell Livingston Aq livings124@gmail.com .
|
||||
.Sh SEE ALSO
|
||||
.Xr transmissioncli 1 ,
|
||||
.Xr transmission-daemon 1 ,
|
||||
.Xr transmission-gtk 1 ,
|
||||
.Xr transmission 1 ,
|
||||
.Xr transmission-proxy 1
|
||||
.Pp
|
||||
http://transmission.m0k.org
|
||||
|
|
|
@ -7,7 +7,7 @@ are used for clarity and are not part of the actual key.
|
|||
|
||||
The IPC protocol is used to allow processes to control or retrieve
|
||||
information from Transmission frontend, such as transmission-daemon,
|
||||
transmission-gtk or the MacOS X frontend. This communication is done
|
||||
or the GTK+ or MacOS X frontends. This communication is done
|
||||
over a unix-domain socket file such as
|
||||
~/.transmission/daemon/socket. In this document the Transmission
|
||||
frontend will be referred to as the server and the process connecting
|
||||
|
|
14
gtk/ipc.c
14
gtk/ipc.c
|
@ -195,7 +195,7 @@ ipc_socket_setup( GtkWindow * parent, TrCore * core )
|
|||
0 > ipc_addmsg( con->msgs, IPC_MSG_UPLIMIT, smsg_int ) )
|
||||
{
|
||||
errmsg( con->u.serv.wind, _("Failed to set up IPC: %s"),
|
||||
strerror( errno ) );
|
||||
g_strerror( errno ) );
|
||||
g_free( con );
|
||||
return;
|
||||
}
|
||||
|
@ -226,7 +226,7 @@ blocking_client( enum ipc_msg msgid, GList * files )
|
|||
con->msgs = ipc_initmsgs();
|
||||
if( NULL == con->msgs )
|
||||
{
|
||||
g_message( _("Failed to set up IPC: %s"), strerror( errno ) );
|
||||
g_message( _("Failed to set up IPC: %s"), g_strerror( errno ) );
|
||||
g_free( con );
|
||||
return FALSE;
|
||||
}
|
||||
|
@ -307,7 +307,7 @@ serv_bind(struct constate *con) {
|
|||
|
||||
fail:
|
||||
errmsg(con->u.serv.wind, _("Failed to set up socket: %s"),
|
||||
strerror(errno));
|
||||
g_strerror(errno));
|
||||
if(0 <= con->fd)
|
||||
close(con->fd);
|
||||
con->fd = -1;
|
||||
|
@ -329,7 +329,7 @@ client_connect(char *path, struct constate *con) {
|
|||
size_t size;
|
||||
|
||||
if(0 > (con->fd = socket(AF_UNIX, SOCK_STREAM, 0))) {
|
||||
g_message( _("Failed to create socket: %s"), strerror(errno));
|
||||
g_message( _("Failed to create socket: %s"), g_strerror(errno));
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
@ -338,7 +338,7 @@ client_connect(char *path, struct constate *con) {
|
|||
strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1);
|
||||
|
||||
if(0 > connect(con->fd, (struct sockaddr*)&addr, SUN_LEN(&addr))) {
|
||||
g_message( _("Failed to connect to %s: %s"), path, strerror(errno));
|
||||
g_message( _("Failed to connect to %s: %s"), path, g_strerror(errno));
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
@ -435,7 +435,7 @@ srv_io_received( GSource * source SHUTUP, void * data, size_t len,
|
|||
break;
|
||||
default:
|
||||
errmsg( con->u.serv.wind, _("IPC parsing failed: %s"),
|
||||
strerror( errno ) );
|
||||
g_strerror( errno ) );
|
||||
}
|
||||
destroycon( con );
|
||||
return 0;
|
||||
|
@ -470,7 +470,7 @@ cli_io_received( GSource * source SHUTUP, void * data, size_t len,
|
|||
g_message( _("IPC protocol parse error") );
|
||||
break;
|
||||
default:
|
||||
g_message( _("IPC parsing failed: %s"), strerror( errno ) );
|
||||
g_message( _("IPC parsing failed: %s"), g_strerror( errno ) );
|
||||
break;
|
||||
}
|
||||
destroycon( con );
|
||||
|
|
|
@ -799,6 +799,7 @@ about ( void )
|
|||
gtk_about_dialog_set_website( a, "http://transmission.m0k.org/" );
|
||||
gtk_about_dialog_set_copyright( a, _("Copyright 2005-2007 The Transmission Project") );
|
||||
gtk_about_dialog_set_authors( a, authors );
|
||||
/* note to translators: put yourself here for credit in the "About" dialog */
|
||||
gtk_about_dialog_set_translator_credits( a, _("translator-credits") );
|
||||
g_signal_connect_swapped( w, "response", G_CALLBACK (gtk_widget_destroy), w );
|
||||
gtk_widget_show_all( w );
|
||||
|
|
|
@ -156,7 +156,7 @@ save_dialog_response_cb( GtkWidget * d, int response, GtkTextBuffer * textbuf )
|
|||
if( !fp )
|
||||
{
|
||||
errmsg( GTK_WINDOW(d),
|
||||
_("Unable to open \"%s\" for writing: %s"),
|
||||
_("Error writing to \"%s\": %s"),
|
||||
filename, g_strerror( errno ) );
|
||||
}
|
||||
else
|
||||
|
@ -171,7 +171,7 @@ save_dialog_response_cb( GtkWidget * d, int response, GtkTextBuffer * textbuf )
|
|||
if( len > fwrite( buf, 1, len, fp ) ) {
|
||||
errmsg( GTK_WINDOW( d ),
|
||||
_("Error writing to \"%s\": %s"),
|
||||
filename, strerror( errno ) );
|
||||
filename, g_strerror( errno ) );
|
||||
}
|
||||
g_free( buf );
|
||||
}
|
||||
|
@ -242,11 +242,11 @@ msgwin_create( TrCore * core )
|
|||
gtk_toolbar_set_style( GTK_TOOLBAR( toolbar), GTK_TOOLBAR_BOTH_HORIZ );
|
||||
|
||||
gtk_toolbar_insert_stock(GTK_TOOLBAR(toolbar), GTK_STOCK_SAVE,
|
||||
_("Save"), NULL,
|
||||
NULL, NULL,
|
||||
G_CALLBACK(save_cb), textbuf, -1);
|
||||
|
||||
gtk_toolbar_insert_stock(GTK_TOOLBAR(toolbar), GTK_STOCK_CLEAR,
|
||||
_("Clear"), NULL,
|
||||
NULL, NULL,
|
||||
G_CALLBACK(clear_cb), textbuf, -1);
|
||||
|
||||
gtk_toolbar_insert_space(GTK_TOOLBAR(toolbar), -1);
|
||||
|
|
|
@ -269,7 +269,7 @@ tr_prefs_dialog_new( GObject * core, GtkWindow * parent )
|
|||
w = new_check_button( s, PREF_KEY_ENCRYPTED_ONLY, core );
|
||||
hig_workarea_add_wide_control( t, &row, w );
|
||||
|
||||
s = _("Display an Icon in the System _Tray");
|
||||
s = _("Show an Icon in the System _Tray");
|
||||
w = new_check_button( s, PREF_KEY_SYSTRAY, core );
|
||||
hig_workarea_add_wide_control( t, &row, w );
|
||||
|
||||
|
|
|
@ -207,7 +207,6 @@ tr_torrent_new( tr_handle * back, const char *torrent, const char *dir,
|
|||
if( paused )
|
||||
flags |= TR_FLAG_PAUSED;
|
||||
|
||||
g_message( "dir is [%s]", dir ? dir : "(null)" );
|
||||
handle = tr_torrentInit( back, torrent, dir, flags, &errcode );
|
||||
|
||||
if(NULL == handle) {
|
||||
|
@ -349,7 +348,7 @@ tr_torrent_status_str ( TrTorrent * gtor )
|
|||
break;
|
||||
|
||||
default:
|
||||
top = g_strdup_printf("Unrecognized state: %d", st->status );
|
||||
top = g_strdup_printf( _("Unrecognized state: %d"), st->status );
|
||||
break;
|
||||
|
||||
}
|
||||
|
|
|
@ -87,7 +87,7 @@ formatname( GtkTreeViewColumn * col UNUSED, GtkCellRenderer * rend,
|
|||
{
|
||||
char * terr;
|
||||
gtk_tree_model_get( model, iter, MC_TERR, &terr, -1 );
|
||||
bottom = g_strconcat( _("Error: "), terr, NULL );
|
||||
bottom = g_strconcat( _("Error"), ": ", terr, NULL );
|
||||
g_free( terr );
|
||||
}
|
||||
else if( TR_STATUS_DOWNLOAD & status )
|
||||
|
@ -190,7 +190,7 @@ makeview( PrivateData * p )
|
|||
|
||||
progrend = tr_cell_renderer_progress_new();
|
||||
/* this string is only used to determine the size of the progress bar */
|
||||
str = g_markup_printf_escaped( "<big>%s</big>", _(" fnord fnord ") );
|
||||
str = g_markup_printf_escaped( "<big>%s</big>", " fnord fnord " );
|
||||
g_object_set( progrend, "bar-sizing", str, NULL );
|
||||
g_free(str);
|
||||
col = gtk_tree_view_column_new_with_attributes( _("Progress"), progrend,
|
||||
|
|
|
@ -24,19 +24,17 @@
|
|||
.Dt TRANSMISSION-GTK 1
|
||||
.Os
|
||||
.Sh NAME
|
||||
.Nm transmission-gtk
|
||||
.Nm transmission
|
||||
.Nd a bittorrent client
|
||||
.Sh SYNOPSIS
|
||||
.Nm transmission-gtk
|
||||
.Nm transmission
|
||||
.Fl h
|
||||
.Nm
|
||||
.Op Fl pq
|
||||
.Op Ar torrent-file ...
|
||||
.Sh DESCRIPTION
|
||||
The
|
||||
.Nm
|
||||
program is a lightweight BitTorrent client with a simple, intuitive
|
||||
GTK+ interface.
|
||||
is a fast and easy BitTorrent client.
|
||||
.Pp
|
||||
BitTorrent is a peer-to-peer file transfer protocol which uses a
|
||||
metainfo file (usually with the .torrent file extension) and a central
|
||||
|
@ -75,11 +73,11 @@ socket file used for interprocess communication (IPC).
|
|||
The
|
||||
.Nm
|
||||
program was written by
|
||||
.An Charles Kerr Aq charles@rebelbase.com ,
|
||||
.An Josh Elsasser Aq josh@elsasser.org ,
|
||||
.An Eric Petit Aq titer@m0k.org ,
|
||||
.An Mitchell Livingston Aq livings124@gmail.com ,
|
||||
and
|
||||
.An Charles Kerr Aq charles@rebelbase.com .
|
||||
.An Mitchell Livingston Aq livings124@gmail.com .
|
||||
.Sh SEE ALSO
|
||||
.Xr transmissioncli 1 ,
|
||||
.Xr transmission-daemon 1 ,
|
||||
|
|
|
@ -1,9 +0,0 @@
|
|||
pushd ..
|
||||
xgettext --default-domain=transmission-gtk \
|
||||
--from-code=UTF-8 \
|
||||
--keyword\=\_ \
|
||||
--keyword\=N\_ \
|
||||
--keyword\=U\_ \
|
||||
--keyword\=Q\_ \
|
||||
*\.[ch]
|
||||
mv transmission-gtk.po po/transmission-gtk.pot
|
|
@ -21,10 +21,7 @@ Requires: gtk2 >= @GTK_REQUIRED@
|
|||
Provides: %{name}
|
||||
|
||||
%description
|
||||
Transmission has been built from the ground up to be a lightweight,
|
||||
yet powerful BitTorrent client. Its simple, intuitive interface
|
||||
strikes a balance between providing useful functionality without
|
||||
feature bloat. Furthermore, it is free for anyone to use or modify.
|
||||
A fast and easy BitTorrent client
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
|
Loading…
Reference in a new issue