Changeset 13631


Ignore:
Timestamp:
Dec 7, 2012, 1:53:31 AM (8 years ago)
Author:
jordan
Message:

(trunk, libT) #5165: fix r13625 oops

Location:
trunk/libtransmission
Files:
22 edited

Legend:

Unmodified
Added
Removed
  • trunk/libtransmission/announcer-http.c

    r13625 r13631  
    201201    if (response_code != HTTP_OK)
    202202    {
    203         const char * fmt = _ ("Tracker gave HTTP response code %1$ld (%2$s)");
     203        const char * fmt = _("Tracker gave HTTP response code %1$ld (%2$s)");
    204204        const char * response_str = tr_webGetResponseStr (response_code);
    205205        response->errmsg = tr_strdup_printf (fmt, response_code, response_str);
     
    351351    if (response_code != HTTP_OK)
    352352    {
    353         const char * fmt = _ ("Tracker gave HTTP response code %1$ld (%2$s)");
     353        const char * fmt = _("Tracker gave HTTP response code %1$ld (%2$s)");
    354354        const char * response_str = tr_webGetResponseStr (response_code);
    355355        response->errmsg = tr_strdup_printf (fmt, response_code, response_str);
  • trunk/libtransmission/announcer-udp.c

    r13625 r13631  
    259259            errmsg = tr_strndup (evbuffer_pullup (buf, -1), buflen);
    260260        else
    261             errmsg = tr_strdup (_ ("Unknown error"));
     261            errmsg = tr_strdup (_("Unknown error"));
    262262
    263263        tau_scrape_request_fail (request, true, false, errmsg);
     
    409409            errmsg = tr_strndup (evbuffer_pullup (buf, -1), buflen);
    410410        else
    411             errmsg = tr_strdup (_ ("Unknown error"));
     411            errmsg = tr_strdup (_("Unknown error"));
    412412
    413413        tau_announce_request_fail (request, true, false, errmsg);
     
    496496    if (errcode)
    497497    {
    498         char * errmsg = tr_strdup_printf (_ ("DNS Lookup failed: %s"),
     498        char * errmsg = tr_strdup_printf (_("DNS Lookup failed: %s"),
    499499                                          evdns_err_to_string (errcode));
    500500        dbgmsg (tracker->key, "%s", errmsg);
     
    597597            errmsg = tr_strndup (evbuffer_pullup (buf, -1), buflen);
    598598        else
    599             errmsg = tr_strdup (_ ("Connection failed"));
     599            errmsg = tr_strdup (_("Connection failed"));
    600600
    601601        dbgmsg (tracker->key, "%s", errmsg);
  • trunk/libtransmission/announcer.c

    r13625 r13631  
    10561056        if (!response->did_connect)
    10571057        {
    1058             on_announce_error (tier, _ ("Could not connect to tracker"), event);
     1058            on_announce_error (tier, _("Could not connect to tracker"), event);
    10591059        }
    10601060        else if (response->did_timeout)
    10611061        {
    1062             on_announce_error (tier, _ ("Tracker did not respond"), event);
     1062            on_announce_error (tier, _("Tracker did not respond"), event);
    10631063        }
    10641064        else if (response->errmsg)
     
    11221122            else
    11231123            {
    1124                 tr_strlcpy (tier->lastAnnounceStr, _ ("Success"),
     1124                tr_strlcpy (tier->lastAnnounceStr, _("Success"),
    11251125                            sizeof (tier->lastAnnounceStr));
    11261126            }
     
    13311331                if (!response->did_connect)
    13321332                {
    1333                     on_scrape_error (session, tier, _ ("Could not connect to tracker"));
     1333                    on_scrape_error (session, tier, _("Could not connect to tracker"));
    13341334                }
    13351335                else if (response->did_timeout)
    13361336                {
    1337                     on_scrape_error (session, tier, _ ("Tracker did not respond"));
     1337                    on_scrape_error (session, tier, _("Tracker did not respond"));
    13381338                }
    13391339                else if (response->errmsg)
  • trunk/libtransmission/bencode.c

    r13625 r13631  
    11151115                default:
    11161116                    /* did caller give us an uninitialized val? */
    1117                     tr_err ("%s", _ ("Invalid metadata"));
     1117                    tr_err ("%s", _("Invalid metadata"));
    11181118                    break;
    11191119            }
     
    17141714        if (nleft > 0)
    17151715        {
    1716             tr_err (_ ("Couldn't save temporary file \"%1$s\": %2$s"), tmp, tr_strerror (err));
     1716            tr_err (_("Couldn't save temporary file \"%1$s\": %2$s"), tmp, tr_strerror (err));
    17171717            tr_close_file (fd);
    17181718            unlink (tmp);
     
    17291729#endif
    17301730            {
    1731                 tr_inf (_ ("Saved \"%s\""), filename);
     1731                tr_inf (_("Saved \"%s\""), filename);
    17321732            }
    17331733            else
    17341734            {
    17351735                err = errno;
    1736                 tr_err (_ ("Couldn't save file \"%1$s\": %2$s"), filename, tr_strerror (err));
     1736                tr_err (_("Couldn't save file \"%1$s\": %2$s"), filename, tr_strerror (err));
    17371737                unlink (tmp);
    17381738            }
     
    17421742    {
    17431743        err = errno;
    1744         tr_err (_ ("Couldn't save temporary file \"%1$s\": %2$s"), tmp, tr_strerror (err));
     1744        tr_err (_("Couldn't save temporary file \"%1$s\": %2$s"), tmp, tr_strerror (err));
    17451745    }
    17461746
  • trunk/libtransmission/blocklist.c

    r13625 r13631  
    8484    size_t byteCount;
    8585    struct stat st;
    86     const char * err_fmt = _ ("Couldn't read \"%1$s\": %2$s");
     86    const char * err_fmt = _("Couldn't read \"%1$s\": %2$s");
    8787
    8888    blocklistClose (b);
     
    113113    {
    114114        char * base = tr_basename (b->filename);
    115         tr_inf (_ ("Blocklist \"%s\" contains %zu entries"), base, b->ruleCount);
     115        tr_inf (_("Blocklist \"%s\" contains %zu entries"), base, b->ruleCount);
    116116        tr_free (base);
    117117    }
     
    323323    int inCount = 0;
    324324    char line[2048];
    325     const char * err_fmt = _ ("Couldn't read \"%1$s\": %2$s");
     325    const char * err_fmt = _("Couldn't read \"%1$s\": %2$s");
    326326    struct tr_ipv4_range * ranges = NULL;
    327327    size_t ranges_alloc = 0;
     
    366366        {
    367367            /* don't try to display the actual lines - it causes issues */
    368             tr_err (_ ("blocklist skipped invalid address at line %d"), inCount);
     368            tr_err (_("blocklist skipped invalid address at line %d"), inCount);
    369369            continue;
    370370        }
     
    415415
    416416    if (fwrite (ranges, sizeof (struct tr_ipv4_range), ranges_count, out) != ranges_count)
    417         tr_err (_ ("Couldn't save file \"%1$s\": %2$s"), b->filename, tr_strerror (errno));
     417        tr_err (_("Couldn't save file \"%1$s\": %2$s"), b->filename, tr_strerror (errno));
    418418    else {
    419419        char * base = tr_basename (b->filename);
    420         tr_inf (_ ("Blocklist \"%s\" updated with %zu entries"), base, ranges_count);
     420        tr_inf (_("Blocklist \"%s\" updated with %zu entries"), base, ranges_count);
    421421        tr_free (base);
    422422    }
  • trunk/libtransmission/fdlimit.c

    r13625 r13631  
    358358        const int err = tr_mkdirp (dir, 0777) ? errno : 0;
    359359        if (err) {
    360             tr_err (_ ("Couldn't create \"%1$s\": %2$s"), dir, tr_strerror (err));
     360            tr_err (_("Couldn't create \"%1$s\": %2$s"), dir, tr_strerror (err));
    361361            tr_free (dir);
    362362            return err;
     
    379379    {
    380380        const int err = errno;
    381         tr_err (_ ("Couldn't open \"%1$s\": %2$s"), filename, tr_strerror (err));
     381        tr_err (_("Couldn't open \"%1$s\": %2$s"), filename, tr_strerror (err));
    382382        return err;
    383383    }
     
    394394        {
    395395            const int err = errno;
    396             tr_err (_ ("Couldn't truncate \"%1$s\": %2$s"), filename, tr_strerror (err));
     396            tr_err (_("Couldn't truncate \"%1$s\": %2$s"), filename, tr_strerror (err));
    397397            return err;
    398398        }
     
    680680        if ((s = socket (domain, type, 0)) < 0)
    681681            if (sockerrno != EAFNOSUPPORT)
    682                 tr_err (_ ("Couldn't create socket: %s"), tr_strerror (sockerrno));
     682                tr_err (_("Couldn't create socket: %s"), tr_strerror (sockerrno));
    683683
    684684    if (s > -1)
  • trunk/libtransmission/makemeta.c

    r13625 r13631  
    6161    if (i)
    6262    {
    63         tr_err (_ ("Torrent Creator is skipping file \"%s\": %s"),
     63        tr_err (_("Torrent Creator is skipping file \"%s\": %s"),
    6464                buf, tr_strerror (errno));
    6565        tr_free (buf);
  • trunk/libtransmission/metainfo.c

    r13625 r13631  
    109109          if (!out)
    110110            {
    111               tr_nerr (inf->name, _ ("Couldn't create \"%1$s\": %2$s"), name, tr_strerror (errno));
     111              tr_nerr (inf->name, _("Couldn't create \"%1$s\": %2$s"), name, tr_strerror (errno));
    112112            }
    113113          else
     
    605605  if (badTag)
    606606    {
    607       tr_nerr (inf->name, _ ("Invalid metadata entry \"%s\""), badTag);
     607      tr_nerr (inf->name, _("Invalid metadata entry \"%s\""), badTag);
    608608      tr_metainfoFree (inf);
    609609    }
  • trunk/libtransmission/natpmp.c

    r13625 r13631  
    3030
    3131static const char *
    32 getKey (void) { return _ ("Port Forwarding (NAT-PMP)"); }
     32getKey (void) { return _("Port Forwarding (NAT-PMP)"); }
    3333
    3434typedef enum
     
    7070        return;
    7171    if (ret >= 0)
    72         tr_ninf (getKey (), _ ("%s succeeded (%d)"), func, ret);
     72        tr_ninf (getKey (), _("%s succeeded (%d)"), func, ret);
    7373    else
    7474        tr_ndbg (
     
    139139            char str[128];
    140140            evutil_inet_ntop (AF_INET, &response.pnu.publicaddress.addr, str, sizeof (str));
    141             tr_ninf (getKey (), _ ("Found public address \"%s\""), str);
     141            tr_ninf (getKey (), _("Found public address \"%s\""), str);
    142142            nat->state = TR_NATPMP_IDLE;
    143143        }
     
    174174            const int private_port = resp.pnu.newportmapping.privateport;
    175175
    176             tr_ninf (getKey (), _ ("no longer forwarding port %d"), private_port);
     176            tr_ninf (getKey (), _("no longer forwarding port %d"), private_port);
    177177
    178178            if (nat->private_port == private_port)
     
    219219            nat->private_port = resp.pnu.newportmapping.privateport;
    220220            nat->public_port = resp.pnu.newportmapping.mappedpublicport;
    221             tr_ninf (getKey (), _ ("Port %d forwarded successfully"), nat->private_port);
     221            tr_ninf (getKey (), _("Port %d forwarded successfully"), nat->private_port);
    222222        }
    223223        else if (val != NATPMP_TRYAGAIN)
  • trunk/libtransmission/net.c

    r13629 r13631  
    266266    if (bind (s, (struct sockaddr *) &source_sock, sourcelen))
    267267    {
    268         tr_err (_ ("Couldn't set source address %s on %d: %s"),
     268        tr_err (_("Couldn't set source address %s on %d: %s"),
    269269                tr_address_to_string (source_addr), s, tr_strerror (errno));
    270270        return -errno;
     
    282282        if ((tmperrno != ENETUNREACH && tmperrno != EHOSTUNREACH)
    283283                || addr->type == TR_AF_INET)
    284             tr_err (_ ("Couldn't connect socket %d to %s, port %d (errno %d - %s)"),
     284            tr_err (_("Couldn't connect socket %d to %s, port %d (errno %d - %s)"),
    285285                    s, tr_address_to_string (addr), (int)ntohs (port), tmperrno,
    286286                    tr_strerror (tmperrno));
     
    358358
    359359            if (err == EADDRINUSE)
    360                 hint = _ ("Is another copy of Transmission already running?");
     360                hint = _("Is another copy of Transmission already running?");
    361361            else
    362362                hint = NULL;
    363363
    364364            if (hint == NULL)
    365                 fmt = _ ("Couldn't bind port %d on %s: %s");
     365                fmt = _("Couldn't bind port %d on %s: %s");
    366366            else
    367                 fmt = _ ("Couldn't bind port %d on %s: %s (%s)");
     367                fmt = _("Couldn't bind port %d on %s: %s (%s)");
    368368
    369369            tr_err (fmt, port, tr_address_to_string (addr), tr_strerror (err), hint);
  • trunk/libtransmission/peer-mgr.c

    r13625 r13631  
    18061806                    if (!ok)
    18071807                    {
    1808                         tr_torerr (tor, _ ("Piece %lu, which was just downloaded, failed its checksum test"),
     1808                        tr_torerr (tor, _("Piece %lu, which was just downloaded, failed its checksum test"),
    18091809                                 (unsigned long)p);
    18101810                    }
  • trunk/libtransmission/peer-msgs.c

    r13625 r13631  
    18961896            if (!err && tr_torrentPieceNeedsCheck (msgs->torrent, req.index))
    18971897                if ((err = !tr_torrentCheckPiece (msgs->torrent, req.index)))
    1898                     tr_torrentSetLocalError (msgs->torrent, _ ("Please Verify Local Data! Piece #%zu is corrupt."), (size_t)req.index);
     1898                    tr_torrentSetLocalError (msgs->torrent, _("Please Verify Local Data! Piece #%zu is corrupt."), (size_t)req.index);
    18991899
    19001900            if (err)
  • trunk/libtransmission/platform.c

    r13625 r13631  
    358358
    359359          if (count)
    360             tr_inf (_ ("Migrated %1$d files from \"%2$s\" to \"%3$s\""), count, oldDir, newDir);
     360            tr_inf (_("Migrated %1$d files from \"%2$s\" to \"%3$s\""), count, oldDir, newDir);
    361361
    362362          closedir (dirh);
     
    533533  char * tmp = tr_buildPath (path, "index.html", NULL);
    534534  const int ret = !stat (tmp, &sb);
    535   tr_inf (_ ("Searching for web interface file \"%s\""), tmp);
     535  tr_inf (_("Searching for web interface file \"%s\""), tmp);
    536536  tr_free (tmp);
    537537
     
    728728__declspec (align (4)) static LONG volatile g_sl;
    729729#else
    730 static LONG volatile g_sl __attribute__ ((aligned (4)));
     730static LONG volatile g_sl __attribute__((aligned (4)));
    731731#endif
    732732
  • trunk/libtransmission/port-forwarding.c

    r13625 r13631  
    2929
    3030static const char *
    31 getKey (void) { return _ ("Port Forwarding"); }
     31getKey (void) { return _("Port Forwarding"); }
    3232
    3333struct tr_shared
     
    5656    switch (state)
    5757    {
    58         case TR_PORT_MAPPING:   return _ ("Starting");
    59         case TR_PORT_MAPPED:    return _ ("Forwarded");
    60         case TR_PORT_UNMAPPING: return _ ("Stopping");
    61         case TR_PORT_UNMAPPED:  return _ ("Not forwarded");
     58        case TR_PORT_MAPPING:   return _("Starting");
     59        case TR_PORT_MAPPED:    return _("Forwarded");
     60        case TR_PORT_UNMAPPING: return _("Stopping");
     61        case TR_PORT_UNMAPPED:  return _("Not forwarded");
    6262        default:                return "???";
    6363    }
     
    8989
    9090    if (newStatus != oldStatus)
    91         tr_ninf (getKey (), _ ("State changed from \"%1$s\" to \"%2$s\""),
     91        tr_ninf (getKey (), _("State changed from \"%1$s\" to \"%2$s\""),
    9292                getNatStateStr (oldStatus),
    9393                getNatStateStr (newStatus));
     
    179179stop_forwarding (tr_shared * s)
    180180{
    181     tr_ninf (getKey (), "%s", _ ("Stopped"));
     181    tr_ninf (getKey (), "%s", _("Stopped"));
    182182    natPulse (s, false);
    183183
  • trunk/libtransmission/rpc-server.c

    r13625 r13631  
    934934    key = TR_PREFS_KEY_RPC_ENABLED;
    935935    if (!tr_bencDictFindBool (settings, key, &boolVal))
    936         tr_nerr (MY_NAME, _ ("Couldn't find settings key \"%s\""), key);
     936        tr_nerr (MY_NAME, _("Couldn't find settings key \"%s\""), key);
    937937    else
    938938        s->isEnabled = boolVal;
     
    940940    key = TR_PREFS_KEY_RPC_PORT;
    941941    if (!tr_bencDictFindInt (settings, key, &i))
    942         tr_nerr (MY_NAME, _ ("Couldn't find settings key \"%s\""), key);
     942        tr_nerr (MY_NAME, _("Couldn't find settings key \"%s\""), key);
    943943    else
    944944        s->port = i;
     
    946946    key = TR_PREFS_KEY_RPC_URL;
    947947    if (!tr_bencDictFindStr (settings, TR_PREFS_KEY_RPC_URL, &str))
    948         tr_nerr (MY_NAME, _ ("Couldn't find settings key \"%s\""), key);
     948        tr_nerr (MY_NAME, _("Couldn't find settings key \"%s\""), key);
    949949    else
    950950        s->url = tr_strdup (str);
     
    952952    key = TR_PREFS_KEY_RPC_WHITELIST_ENABLED;
    953953    if (!tr_bencDictFindBool (settings, key, &boolVal))
    954         tr_nerr (MY_NAME, _ ("Couldn't find settings key \"%s\""), key);
     954        tr_nerr (MY_NAME, _("Couldn't find settings key \"%s\""), key);
    955955    else
    956956        tr_rpcSetWhitelistEnabled (s, boolVal);
     
    958958    key = TR_PREFS_KEY_RPC_AUTH_REQUIRED;
    959959    if (!tr_bencDictFindBool (settings, key, &boolVal))
    960         tr_nerr (MY_NAME, _ ("Couldn't find settings key \"%s\""), key);
     960        tr_nerr (MY_NAME, _("Couldn't find settings key \"%s\""), key);
    961961    else
    962962        tr_rpcSetPasswordEnabled (s, boolVal);
     
    964964    key = TR_PREFS_KEY_RPC_WHITELIST;
    965965    if (!tr_bencDictFindStr (settings, key, &str) && str)
    966         tr_nerr (MY_NAME, _ ("Couldn't find settings key \"%s\""), key);
     966        tr_nerr (MY_NAME, _("Couldn't find settings key \"%s\""), key);
    967967    else
    968968        tr_rpcSetWhitelist (s, str);
     
    970970    key = TR_PREFS_KEY_RPC_USERNAME;
    971971    if (!tr_bencDictFindStr (settings, key, &str))
    972         tr_nerr (MY_NAME, _ ("Couldn't find settings key \"%s\""), key);
     972        tr_nerr (MY_NAME, _("Couldn't find settings key \"%s\""), key);
    973973    else
    974974        tr_rpcSetUsername (s, str);
     
    976976    key = TR_PREFS_KEY_RPC_PASSWORD;
    977977    if (!tr_bencDictFindStr (settings, key, &str))
    978         tr_nerr (MY_NAME, _ ("Couldn't find settings key \"%s\""), key);
     978        tr_nerr (MY_NAME, _("Couldn't find settings key \"%s\""), key);
    979979    else
    980980        tr_rpcSetPassword (s, str);
     
    982982    key = TR_PREFS_KEY_RPC_BIND_ADDRESS;
    983983    if (!tr_bencDictFindStr (settings, TR_PREFS_KEY_RPC_BIND_ADDRESS, &str)) {
    984         tr_nerr (MY_NAME, _ ("Couldn't find settings key \"%s\""), key);
     984        tr_nerr (MY_NAME, _("Couldn't find settings key \"%s\""), key);
    985985        address = tr_inaddr_any;
    986986    } else if (!tr_address_from_string (&address, str)) {
    987         tr_nerr (MY_NAME, _ ("%s is not a valid address"), str);
     987        tr_nerr (MY_NAME, _("%s is not a valid address"), str);
    988988        address = tr_inaddr_any;
    989989    } else if (address.type != TR_AF_INET) {
    990         tr_nerr (MY_NAME, _ ("%s is not an IPv4 address. RPC listeners must be IPv4"), str);
     990        tr_nerr (MY_NAME, _("%s is not an IPv4 address. RPC listeners must be IPv4"), str);
    991991        address = tr_inaddr_any;
    992992    }
     
    995995    if (s->isEnabled)
    996996    {
    997         tr_ninf (MY_NAME, _ ("Serving RPC and Web requests on port 127.0.0.1:%d%s"), (int) s->port, s->url);
     997        tr_ninf (MY_NAME, _("Serving RPC and Web requests on port 127.0.0.1:%d%s"), (int) s->port, s->url);
    998998        tr_runInEventThread (session, startServer, s);
    999999
    10001000        if (s->isWhitelistEnabled)
    1001             tr_ninf (MY_NAME, "%s", _ ("Whitelist enabled"));
     1001            tr_ninf (MY_NAME, "%s", _("Whitelist enabled"));
    10021002
    10031003        if (s->isPasswordEnabled)
    1004             tr_ninf (MY_NAME, "%s", _ ("Password required"));
     1004            tr_ninf (MY_NAME, "%s", _("Password required"));
    10051005    }
    10061006
  • trunk/libtransmission/rpcimpl.c

    r13625 r13631  
    12581258        fd = tr_open_file_for_writing (filename);
    12591259        if (fd < 0)
    1260             tr_snprintf (result, sizeof (result), _ ("Couldn't save file \"%1$s\": %2$s"), filename, tr_strerror (errno));
     1260            tr_snprintf (result, sizeof (result), _("Couldn't save file \"%1$s\": %2$s"), filename, tr_strerror (errno));
    12611261
    12621262        for (;;)
     
    12691269                const int e = write (fd, buf, buflen - stream.avail_out);
    12701270                if (e < 0) {
    1271                     tr_snprintf (result, sizeof (result), _ ("Couldn't save file \"%1$s\": %2$s"), filename, tr_strerror (errno));
     1271                    tr_snprintf (result, sizeof (result), _("Couldn't save file \"%1$s\": %2$s"), filename, tr_strerror (errno));
    12721272                    break;
    12731273                }
     
    12761276            if (err != Z_OK) {
    12771277                if ((err != Z_STREAM_END) && (err != Z_DATA_ERROR))
    1278                     tr_snprintf (result, sizeof (result), _ ("Error uncompressing blocklist: %s (%d)"), zError (err), err);
     1278                    tr_snprintf (result, sizeof (result), _("Error uncompressing blocklist: %s (%d)"), zError (err), err);
    12791279                break;
    12801280            }
     
    12851285        if (err == Z_DATA_ERROR) /* couldn't inflate it... it's probably already uncompressed */
    12861286            if (write (fd, response, response_byte_count) < 0)
    1287                 tr_snprintf (result, sizeof (result), _ ("Couldn't save file \"%1$s\": %2$s"), filename, tr_strerror (errno));
     1287                tr_snprintf (result, sizeof (result), _("Couldn't save file \"%1$s\": %2$s"), filename, tr_strerror (errno));
    12881288
    12891289        if (*result)
  • trunk/libtransmission/session.c

    r13625 r13631  
    720720    /* first %s is the application name
    721721       second %s is the version number */
    722     tr_inf (_ ("%s %s started"), TR_NAME, LONG_VERSION_STRING);
     722    tr_inf (_("%s %s started"), TR_NAME, LONG_VERSION_STRING);
    723723
    724724    tr_statsInit (session);
     
    19411941
    19421942    if (n)
    1943         tr_inf (_ ("Loaded %d torrents"), n);
     1943        tr_inf (_("Loaded %d torrents"), n);
    19441944
    19451945    if (data->setmeCount)
  • trunk/libtransmission/torrent-magnet.c

    r13625 r13631  
    273273                    if (success && !tr_getBlockSize (info.pieceSize))
    274274                    {
    275                         tr_torrentSetLocalError (tor, "%s", _ ("Magnet torrent's metadata is not usable"));
     275                        tr_torrentSetLocalError (tor, "%s", _("Magnet torrent's metadata is not usable"));
    276276                        success = false;
    277277                    }
  • trunk/libtransmission/torrent.c

    r13627 r13631  
    523523
    524524        case TR_TRACKER_WARNING:
    525             tr_torerr (tor, _ ("Tracker warning: \"%s\""), event->text);
     525            tr_torerr (tor, _("Tracker warning: \"%s\""), event->text);
    526526            tor->error = TR_STAT_TRACKER_WARNING;
    527527            tr_strlcpy (tor->errorTracker, event->tracker, sizeof (tor->errorTracker));
     
    530530
    531531        case TR_TRACKER_ERROR:
    532             tr_torerr (tor, _ ("Tracker error: \"%s\""), event->text);
     532            tr_torerr (tor, _("Tracker error: \"%s\""), event->text);
    533533            tor->error = TR_STAT_TRACKER_ERROR;
    534534            tr_strlcpy (tor->errorTracker, event->tracker, sizeof (tor->errorTracker));
     
    785785    {
    786786        tr_deeplog_tor (tor, "%s", "[LAZY] uh oh, the files disappeared");
    787         tr_torrentSetLocalError (tor, "%s", _ ("No data found! Ensure your drives are connected or use \"Set Location\". To re-download, remove the torrent and re-add it."));
     787        tr_torrentSetLocalError (tor, "%s", _("No data found! Ensure your drives are connected or use \"Set Location\". To re-download, remove the torrent and re-add it."));
    788788    }
    789789
     
    16751675    /* allow finished torrents to be resumed */
    16761676    if (tr_torrentIsSeedRatioDone (tor)) {
    1677         tr_torinf (tor, _ ("Restarted manually -- disabling its seed ratio"));
     1677        tr_torinf (tor, _("Restarted manually -- disabling its seed ratio"));
    16781678        tr_torrentSetRatioMode (tor, TR_RATIOLIMIT_UNLIMITED);
    16791679    }
     
    18271827    tr_bencDictAddInt (d, "date", tr_time ());
    18281828
    1829     tr_torinf (tor, "%s", _ ("Removing torrent"));
     1829    tr_torinf (tor, "%s", _("Removing torrent"));
    18301830
    18311831    stopTorrent (tor);
     
    19111911           that exist */
    19121912        case TR_PARTIAL_SEED:
    1913             return _ ("Done");
     1913            return _("Done");
    19141914
    19151915        case TR_SEED:
    1916             return _ ("Complete");
     1916            return _("Complete");
    19171917
    19181918        default:
    1919             return _ ("Incomplete");
     1919            return _("Incomplete");
    19201920    }
    19211921}
     
    20542054        if (recentChange)
    20552055        {
    2056             tr_torinf (tor, _ ("State changed from \"%1$s\" to \"%2$s\""),
     2056            tr_torinf (tor, _("State changed from \"%1$s\" to \"%2$s\""),
    20572057                      getCompletionString (tor->completeness),
    20582058                      getCompletionString (completeness));
  • trunk/libtransmission/upnp.c

    r13625 r13631  
    3333
    3434static const char *
    35 getKey (void) { return _ ("Port Forwarding (UPnP)"); }
     35getKey (void) { return _("Port Forwarding (UPnP)"); }
    3636
    3737typedef enum
     
    198198                             handle->lanaddr, sizeof (handle->lanaddr)) == UPNP_IGD_VALID_CONNECTED)
    199199        {
    200             tr_ninf (getKey (), _ (
     200            tr_ninf (getKey (), _(
    201201                         "Found Internet Gateway Device \"%s\""),
    202202                     handle->urls.controlURL);
    203             tr_ninf (getKey (), _ (
     203            tr_ninf (getKey (), _(
    204204                         "Local Address is \"%s\""), handle->lanaddr);
    205205            handle->state = TR_UPNP_IDLE;
     
    231231          (tr_upnpGetSpecificPortMappingEntry (handle, "UDP") != UPNPCOMMAND_SUCCESS))
    232232        {
    233             tr_ninf (getKey (), _ ("Port %d isn't forwarded"), handle->port);
     233            tr_ninf (getKey (), _("Port %d isn't forwarded"), handle->port);
    234234            handle->isMapped = false;
    235235        }
     
    242242
    243243        tr_ninf (getKey (),
    244                  _ ("Stopping port forwarding through \"%s\", service \"%s\""),
     244                 _("Stopping port forwarding through \"%s\", service \"%s\""),
    245245                 handle->urls.controlURL, handle->data.first.servicetype);
    246246
     
    275275        }
    276276        tr_ninf (getKey (),
    277                  _ ("Port forwarding through \"%s\", service \"%s\". (local address: %s:%d)"),
     277                 _("Port forwarding through \"%s\", service \"%s\". (local address: %s:%d)"),
    278278                 handle->urls.controlURL, handle->data.first.servicetype,
    279279                 handle->lanaddr, port);
    280280        if (handle->isMapped)
    281281        {
    282             tr_ninf (getKey (), "%s", _ ("Port forwarding successful!"));
     282            tr_ninf (getKey (), "%s", _("Port forwarding successful!"));
    283283            handle->port = port;
    284284            handle->state = TR_UPNP_IDLE;
  • trunk/libtransmission/utils.c

    r13625 r13631  
    436436    int fd;
    437437    ssize_t n;
    438     const char * const err_fmt = _ ("Couldn't read \"%1$s\": %2$s");
     438    const char * const err_fmt = _("Couldn't read \"%1$s\": %2$s");
    439439
    440440    /* try to stat the file */
     
    450450    if ((sb.st_mode & S_IFMT) != S_IFREG)
    451451    {
    452         tr_err (err_fmt, path, _ ("Not a regular file"));
     452        tr_err (err_fmt, path, _("Not a regular file"));
    453453        errno = EISDIR;
    454454        return NULL;
     
    468468    {
    469469        const int err = errno;
    470         tr_err (err_fmt, path, _ ("Memory allocation failed"));
     470        tr_err (err_fmt, path, _("Memory allocation failed"));
    471471        tr_close_file (fd);
    472472        errno = err;
     
    571571            {
    572572                const int err = errno;
    573                 tr_err (_ (
     573                tr_err (_(
    574574                           "Couldn't create \"%1$s\": %2$s"), path,
    575575                       tr_strerror (err));
     
    582582        {
    583583            /* Node exists but isn't a folder */
    584             char * buf = tr_strdup_printf (_ ("File \"%s\" is in the way"), path);
    585             tr_err (_ ("Couldn't create \"%1$s\": %2$s"), path_in, buf);
     584            char * buf = tr_strdup_printf (_("File \"%s\" is in the way"), path);
     585            tr_err (_("Couldn't create \"%1$s\": %2$s"), path_in, buf);
    586586            tr_free (buf);
    587587            tr_free (path);
     
    983983        "ABCDEFGHIJKLMNOPQRSTUVWXYZ" /* upalpha */
    984984        "0123456789"                 /* digit */
    985         "-_.!~*' ()"                  /* mark */
     985        "-_.!~*'()"                  /* mark */
    986986        ";/?:@&=+$,"                 /* reserved */
    987987        "<>#%<\""                    /* delims */
     
    15071507{
    15081508    if ((int)ratio == TR_RATIO_NA)
    1509         tr_strlcpy (buf, _ ("None"), buflen);
     1509        tr_strlcpy (buf, _("None"), buflen);
    15101510    else if ((int)ratio == TR_RATIO_INF)
    15111511        tr_strlcpy (buf, infinity, buflen);
  • trunk/libtransmission/verify.c

    r13625 r13631  
    227227      tr_lockUnlock (getVerifyLock ());
    228228
    229       tr_torinf (tor, "%s", _ ("Verifying torrent"));
     229      tr_torinf (tor, "%s", _("Verifying torrent"));
    230230      tr_torrentSetVerifyState (tor, TR_VERIFY_NOW);
    231231      changed = verifyTorrent (tor, &stopCurrent);
     
    271271
    272272  assert (tr_isTorrent (tor));
    273   tr_torinf (tor, "%s", _ ("Queued for verification"));
     273  tr_torinf (tor, "%s", _("Queued for verification"));
    274274
    275275  node = tr_new (struct verify_node, 1);
Note: See TracChangeset for help on using the changeset viewer.