- tor-commits - lists.torproject.org

[tor/maint-0.2.1] Ouch: correctly tabify the micro-revision.i target in Makefile.am (0.2.1 only)
by nickm＠torproject.org 19 Apr '11

19 Apr '11

commit cfd7b118a700f8dba53915118b1be4ac267db23b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 19 12:29:20 2011 -0400 Ouch: correctly tabify the micro-revision.i target in Makefile.am (0.2.1 only) --- src/or/Makefile.am | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/or/Makefile.am b/src/or/Makefile.am index 51c1b0f..b56d496 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -55,19 +55,19 @@ noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i tor_main.o: micro-revision.i micro-revision.i: FORCE - @rm -f micro-revision.tmp; \ - if test -d ../../.git && test -x "`which git 2>&1;true`"; then \ - HASH="`git rev-parse --short=16 HEAD`"; \ - echo \"$$HASH\" > micro-revision.tmp; \ - fi; \ - if test ! -f micro-revision.tmp ; then \ - if test ! -f micro-revision.i ; then \ - echo '""' > micro-revision.i; \ - fi; \ - elif test ! -f micro-revision.i || \ - test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ - mv micro-revision.tmp micro-revision.i; \ - fi; true + @rm -f micro-revision.tmp; \ + if test -d ../../.git && test -x "`which git 2>&1;true`"; then \ + HASH="`git rev-parse --short=16 HEAD`"; \ + echo \"$$HASH\" > micro-revision.tmp; \ + fi; \ + if test ! -f micro-revision.tmp ; then \ + if test ! -f micro-revision.i ; then \ + echo '""' > micro-revision.i; \ + fi; \ + elif test ! -f micro-revision.i || \ + test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ + mv micro-revision.tmp micro-revision.i; \ + fi; true #Dummy target to ensure that micro-revision.i _always_ gets built. FORCE:

1 0

[tor/master] Reuse get_bytes_{read, written}() in status.c
by nickm＠torproject.org 19 Apr '11

19 Apr '11

commit c2d9d80a072ab586ba97159f1d401b9ed2980b2d Author: George Kadianakis <desnacked(a)gmail.com> Date: Sat Apr 16 14:48:46 2011 +0200 Reuse get_bytes_{read,written}() in status.c --- src/or/main.c | 9 --------- src/or/main.h | 1 - src/or/status.c | 6 ++---- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 9c19485..6da07ba 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1923,15 +1923,6 @@ get_uptime(void) return stats_n_seconds_working; } -/** Fills <b>n_read_in</b> with total bytes read and <b>n_written_out</b> - with total bytes written */ -void -get_traffic_stats(uint64_t *n_read_in, uint64_t *n_written_out) -{ - *n_read_in = stats_n_bytes_read; - *n_written_out = stats_n_bytes_written; -} - extern uint64_t rephist_total_alloc; extern uint32_t rephist_total_num; diff --git a/src/or/main.h b/src/or/main.h index ca3f641..67c3bb3 100644 --- a/src/or/main.h +++ b/src/or/main.h @@ -52,7 +52,6 @@ void ip_address_changed(int at_interface); void dns_servers_relaunch_checks(void); long get_uptime(void); -void get_traffic_stats(uint64_t *in, uint64_t *out); void control_signal_act(int the_signal); void handle_signals(int is_parent); diff --git a/src/or/status.c b/src/or/status.c index 054567f..3a51c8b 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -78,7 +78,6 @@ bytes_to_usage(uint64_t bytes) int log_heartbeat(time_t now) { - uint64_t in,out; char *bw_sent = NULL; char *bw_rcvd = NULL; char *uptime = NULL; @@ -99,10 +98,9 @@ log_heartbeat(time_t now) "in the cached consensus."); } - get_traffic_stats(&in, &out); uptime = secs_to_uptime(get_uptime()); - bw_sent = bytes_to_usage(out); - bw_rcvd = bytes_to_usage(in); + bw_rcvd = bytes_to_usage(get_bytes_read()); + bw_sent = bytes_to_usage(get_bytes_written()); log_fn(LOG_NOTICE, LD_HEARTBEAT, "Heartbeat: Tor's uptime is %s, with %d " "circuits open. I've pushed %s and received %s.",

1 0

[tor/master] Merge remote-tracking branch 'asn/heartbeat'
by nickm＠torproject.org 19 Apr '11

19 Apr '11

commit 750b5119c056587c599c8acafcbdeb43341d1d61 Merge: c4bf7f5 c2d9d80 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 19 12:08:28 2011 -0400 Merge remote-tracking branch 'asn/heartbeat' src/or/main.c | 9 --------- src/or/main.h | 1 - src/or/status.c | 6 ++---- 3 files changed, 2 insertions(+), 14 deletions(-)

1 0

r24661: {website} update the mirrors table with new mirrors. (website/trunk/include)
by Andrew Lewman 18 Apr '11

18 Apr '11

Author: phobos Date: 2011-04-18 22:15:05 +0000 (Mon, 18 Apr 2011) New Revision: 24661 Modified: website/trunk/include/mirrors-table.wmi Log: update the mirrors table with new mirrors. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2011-04-18 22:10:08 UTC (rev 24660) +++ website/trunk/include/mirrors-table.wmi 2011-04-18 22:15:05 UTC (rev 24661) @@ -173,23 +173,6 @@ <td>DE</td> - <td>torservers</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/dist">http</a></td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/dist">https</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>DE</td> - <td>beme it</td> <td>Up to date</td> @@ -217,7 +200,7 @@ <td> - </td> <td> - </td> <td> - </td> - <td> - </td> + <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> </tr> <tr> @@ -307,6 +290,23 @@ <tr> + <td>AT</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td> - </td> + <td><a href="http://tor.webersiedlung.at/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IN</td> <td>India Tor Fans</td> @@ -409,6 +409,23 @@ <tr> + <td>DE</td> + + <td>torservers</td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/dist">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/dist">https</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>US</td> <td>TheOnionRouter</td>

1 0

r24660: {website} add http://tor.webersiedlung.at mirror (website/trunk)
by Andrew Lewman 18 Apr '11

18 Apr '11

Author: phobos Date: 2011-04-18 22:10:08 +0000 (Mon, 18 Apr 2011) New Revision: 24660 Modified: website/trunk/update-mirrors.pl Log: add http://tor.webersiedlung.at mirror Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-04-18 22:03:43 UTC (rev 24659) +++ website/trunk/update-mirrors.pl 2011-04-18 22:10:08 UTC (rev 24660) @@ -569,6 +569,24 @@ httpsDistMirror => "https://www.torservers.net/mirrors/torproject.org/dist", rsyncDistMirror => "", hiddenServiceMirror => "http://hbpvnydyyjbmhx6b.onion/mirrors/torproject.org/", + }, + mirror034 => { + adminContact => "", + orgName => "", + isoCC => "AT", + subRegion => "", + region => "AT", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://tor.webersiedlung.at/", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "", } );

1 0

r24659: {website} add updated nwlinux mirrors. (website/trunk)
by Andrew Lewman 18 Apr '11

18 Apr '11

Author: phobos Date: 2011-04-18 22:03:43 +0000 (Mon, 18 Apr 2011) New Revision: 24659 Modified: website/trunk/update-mirrors.pl Log: add updated nwlinux mirrors. Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-04-18 12:23:25 UTC (rev 24658) +++ website/trunk/update-mirrors.pl 2011-04-18 22:03:43 UTC (rev 24659) @@ -473,11 +473,11 @@ loadBalanced => "No", httpWebsiteMirror => "http://torproject.nwlinux.us", httpsWebsiteMirror => "", - rsyncWebsiteMirror => "", + rsyncWebsiteMirror => "rsync://nwlinux.us/tor-web", ftpWebsiteMirror => "", httpDistMirror => "http://torproject.nwlinux.us/dist", httpsDistMirror => "", - rsyncDistMirror => "", + rsyncDistMirror => "rsync://nwlinux.us/tor-dist", hiddenServiceMirror => "", }, mirror029 => {

1 0

r24658: {translation} add a few more symbols to the list (translation/trunk/tools)
by Runa Sandvik 18 Apr '11

18 Apr '11

Author: runa Date: 2011-04-18 12:23:25 +0000 (Mon, 18 Apr 2011) New Revision: 24658 Modified: translation/trunk/tools/validate.py Log: add a few more symbols to the list Modified: translation/trunk/tools/validate.py =================================================================== --- translation/trunk/tools/validate.py 2011-04-18 11:21:56 UTC (rev 24657) +++ translation/trunk/tools/validate.py 2011-04-18 12:23:25 UTC (rev 24658) @@ -7,7 +7,7 @@ import getopt symbols = [ - '(', ')', '<', '>', '{', + '(', ')', '<', '>', '{', '\#', '\\' '}', '[', ']', '\"', ';' ]

1 0

[vidalia/alpha] Fixed links in a German and Polish translation
by chiiph＠torproject.org 18 Apr '11

18 Apr '11

commit a79eac28011aa7fd9d92bb26200467f72fbff83f Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Mon Apr 18 10:22:14 2011 +0100 Fixed links in a German and Polish translation --- src/vidalia/i18n/po/.tx/config | 248 +++++++++++++++++----------------- src/vidalia/i18n/po/de/vidalia_de.po | 2 +- src/vidalia/i18n/po/pl/qt_pl.po | 2 +- src/vidalia/i18n/po/pl/vidalia_pl.po | 4 +- 4 files changed, 128 insertions(+), 128 deletions(-) diff --git a/src/vidalia/i18n/po/.tx/config b/src/vidalia/i18n/po/.tx/config index 749d770..2586ea7 100644 --- a/src/vidalia/i18n/po/.tx/config +++ b/src/vidalia/i18n/po/.tx/config @@ -1,3 +1,127 @@ +[torproject.1-vidalia-vidalia-pot] +source_file = templates/vidalia.pot +source_lang = en +trans.af = af/vidalia_af.po +trans.ak = ak/vidalia_ak.po +trans.am = am/vidalia_am.po +trans.ar = ar/vidalia_ar.po +trans.arn = arn/vidalia_arn.po +trans.ast = ast/vidalia_ast.po +trans.az = az/vidalia_az.po +trans.be = be/vidalia_be.po +trans.bg = bg/vidalia_bg.po +trans.bn = bn/vidalia_bn.po +trans.bn_IN = bn_IN/vidalia_bn_IN.po +trans.bo = bo/vidalia_bo.po +trans.br = br/vidalia_br.po +trans.bs = bs/vidalia_bs.po +trans.ca = ca/vidalia_ca.po +trans.cs = cs/vidalia_cs.po +trans.csb = csb/vidalia_csb.po +trans.cy = cy/vidalia_cy.po +trans.da = da/vidalia_da.po +trans.de = de/vidalia_de.po +trans.de_AT = de_AT/vidalia_de_AT.po +trans.de_CH = de_CH/vidalia_de_CH.po +trans.de_DE = de_DE/vidalia_de_DE.po +trans.dz = dz/vidalia_dz.po +trans.el = el/vidalia_el.po +trans.eo = eo/vidalia_eo.po +trans.es = es/vidalia_es.po +trans.et = et/vidalia_et.po +trans.eu = eu/vidalia_eu.po +trans.fa = fa/vidalia_fa.po +trans.fi = fi/vidalia_fi.po +trans.fil = fil/vidalia_fil.po +trans.fo = fo/vidalia_fo.po +trans.fr = fr/vidalia_fr.po +trans.fur = fur/vidalia_fur.po +trans.fy = fy/vidalia_fy.po +trans.ga = ga/vidalia_ga.po +trans.gl = gl/vidalia_gl.po +trans.gu = gu/vidalia_gu.po +trans.gun = gun/vidalia_gun.po +trans.ha = ha/vidalia_ha.po +trans.he = he/vidalia_he.po +trans.hi = hi/vidalia_hi.po +trans.hr = hr/vidalia_hr.po +trans.ht = ht/vidalia_ht.po +trans.hu = hu/vidalia_hu.po +trans.hy = hy/vidalia_hy.po +trans.id = id/vidalia_id.po +trans.is = is/vidalia_is.po +trans.it = it/vidalia_it.po +trans.ja = ja/vidalia_ja.po +trans.jv = jv/vidalia_jv.po +trans.ka = ka/vidalia_ka.po +trans.km = km/vidalia_km.po +trans.kn = kn/vidalia_kn.po +trans.ko = ko/vidalia_ko.po +trans.ku = ku/vidalia_ku.po +trans.kw = kw/vidalia_kw.po +trans.ky = ky/vidalia_ky.po +trans.lb = lb/vidalia_lb.po +trans.lg = lg/vidalia_lg.po +trans.ln = ln/vidalia_ln.po +trans.lo = lo/vidalia_lo.po +trans.lt = lt/vidalia_lt.po +trans.lv = lv/vidalia_lv.po +trans.mg = mg/vidalia_mg.po +trans.mi = mi/vidalia_mi.po +trans.mk = mk/vidalia_mk.po +trans.ml = ml/vidalia_ml.po +trans.mn = mn/vidalia_mn.po +trans.mr = mr/vidalia_mr.po +trans.ms = ms/vidalia_ms.po +trans.mt = mt/vidalia_mt.po +trans.my = my/vidalia_my.po +trans.nah = nah/vidalia_nah.po +trans.nap = nap/vidalia_nap.po +trans.nb = nb/vidalia_nb.po +trans.ne = ne/vidalia_ne.po +trans.nl = nl/vidalia_nl.po +trans.nn = nn/vidalia_nn.po +trans.nso = nso/vidalia_nso.po +trans.oc = oc/vidalia_oc.po +trans.or = or/vidalia_or.po +trans.pa = pa/vidalia_pa.po +trans.pap = pap/vidalia_pap.po +trans.pl = pl/vidalia_pl.po +trans.pms = pms/vidalia_pms.po +trans.ps = ps/vidalia_ps.po +trans.pt = pt/vidalia_pt.po +trans.pt_BR = pt_BR/vidalia_pt_BR.po +trans.ro = ro/vidalia_ro.po +trans.ru = ru/vidalia_ru.po +trans.sco = sco/vidalia_sco.po +trans.sk = sk/vidalia_sk.po +trans.sl = sl/vidalia_sl.po +trans.so = so/vidalia_so.po +trans.son = son/vidalia_son.po +trans.sq = sq/vidalia_sq.po +trans.sr = sr/vidalia_sr.po +trans.st = st/vidalia_st.po +trans.su = su/vidalia_su.po +trans.sv = sv/vidalia_sv.po +trans.sw = sw/vidalia_sw.po +trans.ta = ta/vidalia_ta.po +trans.te = te/vidalia_te.po +trans.tg = tg/vidalia_tg.po +trans.th = th/vidalia_th.po +trans.ti = ti/vidalia_ti.po +trans.tk = tk/vidalia_tk.po +trans.tr = tr/vidalia_tr.po +trans.uk = uk/vidalia_uk.po +trans.ur = ur/vidalia_ur.po +trans.ve = ve/vidalia_ve.po +trans.vi = vi/vidalia_vi.po +trans.wa = wa/vidalia_wa.po +trans.wo = wo/vidalia_wo.po +trans.zh_CN = zh_CN/vidalia_zh_CN.po +trans.zh_HK = zh_HK/vidalia_zh_HK.po +trans.zh_TW = zh_TW/vidalia_zh_TW.po +trans.zu = zu/vidalia_zu.po + [main] host = https://www.transifex.net @@ -123,127 +247,3 @@ trans.zh_HK = zh_HK/qt_zh_HK.po trans.zh_TW = zh_TW/qt_zh_TW.po trans.zu = zu/qt_zu.po -[torproject.1-vidalia-vidalia-pot] -source_file = templates/vidalia.pot -source_lang = en -trans.af = af/vidalia_af.po -trans.ak = ak/vidalia_ak.po -trans.am = am/vidalia_am.po -trans.ar = ar/vidalia_ar.po -trans.arn = arn/vidalia_arn.po -trans.ast = ast/vidalia_ast.po -trans.az = az/vidalia_az.po -trans.be = be/vidalia_be.po -trans.bg = bg/vidalia_bg.po -trans.bn = bn/vidalia_bn.po -trans.bn_IN = bn_IN/vidalia_bn_IN.po -trans.bo = bo/vidalia_bo.po -trans.br = br/vidalia_br.po -trans.bs = bs/vidalia_bs.po -trans.ca = ca/vidalia_ca.po -trans.cs = cs/vidalia_cs.po -trans.csb = csb/vidalia_csb.po -trans.cy = cy/vidalia_cy.po -trans.da = da/vidalia_da.po -trans.de = de/vidalia_de.po -trans.de_AT = de_AT/vidalia_de_AT.po -trans.de_CH = de_CH/vidalia_de_CH.po -trans.de_DE = de_DE/vidalia_de_DE.po -trans.dz = dz/vidalia_dz.po -trans.el = el/vidalia_el.po -trans.eo = eo/vidalia_eo.po -trans.es = es/vidalia_es.po -trans.et = et/vidalia_et.po -trans.eu = eu/vidalia_eu.po -trans.fa = fa/vidalia_fa.po -trans.fi = fi/vidalia_fi.po -trans.fil = fil/vidalia_fil.po -trans.fo = fo/vidalia_fo.po -trans.fr = fr/vidalia_fr.po -trans.fur = fur/vidalia_fur.po -trans.fy = fy/vidalia_fy.po -trans.ga = ga/vidalia_ga.po -trans.gl = gl/vidalia_gl.po -trans.gu = gu/vidalia_gu.po -trans.gun = gun/vidalia_gun.po -trans.ha = ha/vidalia_ha.po -trans.he = he/vidalia_he.po -trans.hi = hi/vidalia_hi.po -trans.hr = hr/vidalia_hr.po -trans.ht = ht/vidalia_ht.po -trans.hu = hu/vidalia_hu.po -trans.hy = hy/vidalia_hy.po -trans.id = id/vidalia_id.po -trans.is = is/vidalia_is.po -trans.it = it/vidalia_it.po -trans.ja = ja/vidalia_ja.po -trans.jv = jv/vidalia_jv.po -trans.ka = ka/vidalia_ka.po -trans.km = km/vidalia_km.po -trans.kn = kn/vidalia_kn.po -trans.ko = ko/vidalia_ko.po -trans.ku = ku/vidalia_ku.po -trans.kw = kw/vidalia_kw.po -trans.ky = ky/vidalia_ky.po -trans.lb = lb/vidalia_lb.po -trans.lg = lg/vidalia_lg.po -trans.ln = ln/vidalia_ln.po -trans.lo = lo/vidalia_lo.po -trans.lt = lt/vidalia_lt.po -trans.lv = lv/vidalia_lv.po -trans.mg = mg/vidalia_mg.po -trans.mi = mi/vidalia_mi.po -trans.mk = mk/vidalia_mk.po -trans.ml = ml/vidalia_ml.po -trans.mn = mn/vidalia_mn.po -trans.mr = mr/vidalia_mr.po -trans.ms = ms/vidalia_ms.po -trans.mt = mt/vidalia_mt.po -trans.my = my/vidalia_my.po -trans.nah = nah/vidalia_nah.po -trans.nap = nap/vidalia_nap.po -trans.nb = nb/vidalia_nb.po -trans.ne = ne/vidalia_ne.po -trans.nl = nl/vidalia_nl.po -trans.nn = nn/vidalia_nn.po -trans.nso = nso/vidalia_nso.po -trans.oc = oc/vidalia_oc.po -trans.or = or/vidalia_or.po -trans.pa = pa/vidalia_pa.po -trans.pap = pap/vidalia_pap.po -trans.pl = pl/vidalia_pl.po -trans.pms = pms/vidalia_pms.po -trans.ps = ps/vidalia_ps.po -trans.pt = pt/vidalia_pt.po -trans.pt_BR = pt_BR/vidalia_pt_BR.po -trans.ro = ro/vidalia_ro.po -trans.ru = ru/vidalia_ru.po -trans.sco = sco/vidalia_sco.po -trans.sk = sk/vidalia_sk.po -trans.sl = sl/vidalia_sl.po -trans.so = so/vidalia_so.po -trans.son = son/vidalia_son.po -trans.sq = sq/vidalia_sq.po -trans.sr = sr/vidalia_sr.po -trans.st = st/vidalia_st.po -trans.su = su/vidalia_su.po -trans.sv = sv/vidalia_sv.po -trans.sw = sw/vidalia_sw.po -trans.ta = ta/vidalia_ta.po -trans.te = te/vidalia_te.po -trans.tg = tg/vidalia_tg.po -trans.th = th/vidalia_th.po -trans.ti = ti/vidalia_ti.po -trans.tk = tk/vidalia_tk.po -trans.tr = tr/vidalia_tr.po -trans.uk = uk/vidalia_uk.po -trans.ur = ur/vidalia_ur.po -trans.ve = ve/vidalia_ve.po -trans.vi = vi/vidalia_vi.po -trans.wa = wa/vidalia_wa.po -trans.wo = wo/vidalia_wo.po -trans.zh_CN = zh_CN/vidalia_zh_CN.po -trans.zh_HK = zh_HK/vidalia_zh_HK.po -trans.zh_TW = zh_TW/vidalia_zh_TW.po -trans.zu = zu/vidalia_zu.po - diff --git a/src/vidalia/i18n/po/de/vidalia_de.po b/src/vidalia/i18n/po/de/vidalia_de.po index e7862d5..eac6134 100644 --- a/src/vidalia/i18n/po/de/vidalia_de.po +++ b/src/vidalia/i18n/po/de/vidalia_de.po @@ -3197,7 +3197,7 @@ msgstr "" msgctxt "ServerPage" msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>" -msgstr "<a href=#bridgeUsage\">Wer hat meine Brücke genuzt?</a>" +msgstr "<a href=\"#bridgeUsage\">Wer hat meine Brücke genuzt?</a>" msgctxt "ServerPage" msgid "<a href=\"#bridgeHelp\">What's this?</a>" diff --git a/src/vidalia/i18n/po/pl/qt_pl.po b/src/vidalia/i18n/po/pl/qt_pl.po index 6907bf7..620a6fc 100644 --- a/src/vidalia/i18n/po/pl/qt_pl.po +++ b/src/vidalia/i18n/po/pl/qt_pl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2011-03-18 11:07+0000\n" +"PO-Revision-Date: 2011-04-18 09:09+0000\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" diff --git a/src/vidalia/i18n/po/pl/vidalia_pl.po b/src/vidalia/i18n/po/pl/vidalia_pl.po index 804ec8d..8c18a30 100644 --- a/src/vidalia/i18n/po/pl/vidalia_pl.po +++ b/src/vidalia/i18n/po/pl/vidalia_pl.po @@ -2674,11 +2674,11 @@ msgstr "Znajdź węzeł-most" msgctxt "NetworkPage" msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>" -msgstr "<a href=\\\"bridges.finding\\\">Jak jeszcze mogę znaleźć węzły-mosty?</a>" +msgstr "<a href=\"bridges.finding\">Jak jeszcze mogę znaleźć węzły-mosty?</a>" msgctxt "NetworkPage" msgid "<a href=\"bridges.finding\">How can I find bridges?</a>" -msgstr "<a href=\\\"bridges.finding\\\">Jak mogę znaleźć węzły-mosty?</a>" +msgstr "<a href=\"bridges.finding\">Jak mogę znaleźć węzły-mosty?</a>" msgctxt "NetworkPage" msgid ""

1 0

[vidalia/alpha] Merge branch 'master' into alpha
by chiiph＠torproject.org 18 Apr '11

18 Apr '11

commit 803d2b3da604513fe2418df3dcf4224fab5e5a41 Merge: 4d108e9 123643f Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Mon Apr 18 09:13:36 2011 -0300 Merge branch 'master' into alpha src/vidalia/i18n/po/.tx/config | 248 +++++++++++++------------- src/vidalia/i18n/po/af/vidalia_af.po | 2 +- src/vidalia/i18n/po/ak/vidalia_ak.po | 2 +- src/vidalia/i18n/po/am/vidalia_am.po | 2 +- src/vidalia/i18n/po/ar/vidalia_ar.po | 14 +- src/vidalia/i18n/po/arn/vidalia_arn.po | 2 +- src/vidalia/i18n/po/ast/vidalia_ast.po | 2 +- src/vidalia/i18n/po/az/vidalia_az.po | 2 +- src/vidalia/i18n/po/bg/vidalia_bg.po | 2 +- src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po | 2 +- src/vidalia/i18n/po/ca/vidalia_ca.po | 2 +- src/vidalia/i18n/po/cs/vidalia_cs.po | 2 +- src/vidalia/i18n/po/csb/vidalia_csb.po | 2 +- src/vidalia/i18n/po/cy/vidalia_cy.po | 2 +- src/vidalia/i18n/po/de/vidalia_de.po | 260 +++++++++++++++++++--------- src/vidalia/i18n/po/de_CH/vidalia_de_CH.po | 2 +- src/vidalia/i18n/po/dz/vidalia_dz.po | 2 +- src/vidalia/i18n/po/el/vidalia_el.po | 2 +- src/vidalia/i18n/po/eo/vidalia_eo.po | 2 +- src/vidalia/i18n/po/es/vidalia_es.po | 4 +- src/vidalia/i18n/po/et/vidalia_et.po | 2 +- src/vidalia/i18n/po/eu/vidalia_eu.po | 2 +- src/vidalia/i18n/po/fil/vidalia_fil.po | 2 +- src/vidalia/i18n/po/fur/vidalia_fur.po | 2 +- src/vidalia/i18n/po/ga/vidalia_ga.po | 2 +- src/vidalia/i18n/po/gl/vidalia_gl.po | 2 +- src/vidalia/i18n/po/gu/vidalia_gu.po | 2 +- src/vidalia/i18n/po/gun/vidalia_gun.po | 2 +- src/vidalia/i18n/po/ha/vidalia_ha.po | 2 +- src/vidalia/i18n/po/he/vidalia_he.po | 2 +- src/vidalia/i18n/po/hi/vidalia_hi.po | 2 +- src/vidalia/i18n/po/hr/vidalia_hr.po | 2 +- src/vidalia/i18n/po/ht/vidalia_ht.po | 2 +- src/vidalia/i18n/po/hu/vidalia_hu.po | 2 +- src/vidalia/i18n/po/id/vidalia_id.po | 2 +- src/vidalia/i18n/po/is/vidalia_is.po | 2 +- src/vidalia/i18n/po/it/vidalia_it.po | 2 +- src/vidalia/i18n/po/kn/vidalia_kn.po | 2 +- src/vidalia/i18n/po/lb/vidalia_lb.po | 2 +- src/vidalia/i18n/po/ln/vidalia_ln.po | 2 +- src/vidalia/i18n/po/lo/vidalia_lo.po | 2 +- src/vidalia/i18n/po/lt/vidalia_lt.po | 2 +- src/vidalia/i18n/po/lv/vidalia_lv.po | 2 +- src/vidalia/i18n/po/mg/vidalia_mg.po | 2 +- src/vidalia/i18n/po/mi/vidalia_mi.po | 2 +- src/vidalia/i18n/po/mk/vidalia_mk.po | 2 +- src/vidalia/i18n/po/ml/vidalia_ml.po | 2 +- src/vidalia/i18n/po/mn/vidalia_mn.po | 2 +- src/vidalia/i18n/po/mr/vidalia_mr.po | 2 +- src/vidalia/i18n/po/ms/vidalia_ms.po | 2 +- src/vidalia/i18n/po/mt/vidalia_mt.po | 2 +- src/vidalia/i18n/po/my/vidalia_my.po | 2 +- src/vidalia/i18n/po/nah/vidalia_nah.po | 2 +- src/vidalia/i18n/po/nap/vidalia_nap.po | 2 +- src/vidalia/i18n/po/nb/vidalia_nb.po | 2 +- src/vidalia/i18n/po/ne/vidalia_ne.po | 2 +- src/vidalia/i18n/po/nl/vidalia_nl.po | 2 +- src/vidalia/i18n/po/nn/vidalia_nn.po | 2 +- src/vidalia/i18n/po/nso/vidalia_nso.po | 2 +- src/vidalia/i18n/po/oc/vidalia_oc.po | 2 +- src/vidalia/i18n/po/pa/vidalia_pa.po | 2 +- src/vidalia/i18n/po/pap/vidalia_pap.po | 2 +- src/vidalia/i18n/po/pl/qt_pl.po | 2 +- src/vidalia/i18n/po/pl/vidalia_pl.po | 6 +- src/vidalia/i18n/po/pms/vidalia_pms.po | 2 +- src/vidalia/i18n/po/ps/vidalia_ps.po | 2 +- src/vidalia/i18n/po/pt/vidalia_pt.po | 2 +- src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po | 2 +- src/vidalia/i18n/po/ru/vidalia_ru.po | 4 +- src/vidalia/i18n/po/sco/vidalia_sco.po | 2 +- src/vidalia/i18n/po/son/vidalia_son.po | 2 +- src/vidalia/i18n/po/su/vidalia_su.po | 2 +- src/vidalia/i18n/po/sw/vidalia_sw.po | 2 +- src/vidalia/i18n/po/ta/vidalia_ta.po | 2 +- src/vidalia/i18n/po/te/vidalia_te.po | 2 +- src/vidalia/i18n/po/tg/vidalia_tg.po | 2 +- src/vidalia/i18n/po/th/vidalia_th.po | 2 +- src/vidalia/i18n/po/ti/vidalia_ti.po | 2 +- src/vidalia/i18n/po/tk/vidalia_tk.po | 2 +- src/vidalia/i18n/po/tr/vidalia_tr.po | 2 +- src/vidalia/i18n/po/ur/vidalia_ur.po | 2 +- src/vidalia/i18n/po/ve/vidalia_ve.po | 2 +- src/vidalia/i18n/po/vi/vidalia_vi.po | 2 +- src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po | 2 +- src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po | 2 +- src/vidalia/i18n/po/zu/vidalia_zu.po | 2 +- 86 files changed, 397 insertions(+), 299 deletions(-)

1 0

[vidalia/alpha] Merge remote-tracking branch 'runa/master'
by chiiph＠torproject.org 18 Apr '11

18 Apr '11

commit 123643f568a36b0544c2130fb4cf4018c157ed2c Merge: a1d9af2 a79eac2 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Mon Apr 18 09:12:21 2011 -0300 Merge remote-tracking branch 'runa/master' src/vidalia/i18n/po/.tx/config | 248 +++++++++++++------------- src/vidalia/i18n/po/af/vidalia_af.po | 2 +- src/vidalia/i18n/po/ak/vidalia_ak.po | 2 +- src/vidalia/i18n/po/am/vidalia_am.po | 2 +- src/vidalia/i18n/po/ar/vidalia_ar.po | 14 +- src/vidalia/i18n/po/arn/vidalia_arn.po | 2 +- src/vidalia/i18n/po/ast/vidalia_ast.po | 2 +- src/vidalia/i18n/po/az/vidalia_az.po | 2 +- src/vidalia/i18n/po/bg/vidalia_bg.po | 2 +- src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po | 2 +- src/vidalia/i18n/po/ca/vidalia_ca.po | 2 +- src/vidalia/i18n/po/cs/vidalia_cs.po | 2 +- src/vidalia/i18n/po/csb/vidalia_csb.po | 2 +- src/vidalia/i18n/po/cy/vidalia_cy.po | 2 +- src/vidalia/i18n/po/de/vidalia_de.po | 260 +++++++++++++++++++--------- src/vidalia/i18n/po/de_CH/vidalia_de_CH.po | 2 +- src/vidalia/i18n/po/dz/vidalia_dz.po | 2 +- src/vidalia/i18n/po/el/vidalia_el.po | 2 +- src/vidalia/i18n/po/eo/vidalia_eo.po | 2 +- src/vidalia/i18n/po/es/vidalia_es.po | 4 +- src/vidalia/i18n/po/et/vidalia_et.po | 2 +- src/vidalia/i18n/po/eu/vidalia_eu.po | 2 +- src/vidalia/i18n/po/fil/vidalia_fil.po | 2 +- src/vidalia/i18n/po/fur/vidalia_fur.po | 2 +- src/vidalia/i18n/po/ga/vidalia_ga.po | 2 +- src/vidalia/i18n/po/gl/vidalia_gl.po | 2 +- src/vidalia/i18n/po/gu/vidalia_gu.po | 2 +- src/vidalia/i18n/po/gun/vidalia_gun.po | 2 +- src/vidalia/i18n/po/ha/vidalia_ha.po | 2 +- src/vidalia/i18n/po/he/vidalia_he.po | 2 +- src/vidalia/i18n/po/hi/vidalia_hi.po | 2 +- src/vidalia/i18n/po/hr/vidalia_hr.po | 2 +- src/vidalia/i18n/po/ht/vidalia_ht.po | 2 +- src/vidalia/i18n/po/hu/vidalia_hu.po | 2 +- src/vidalia/i18n/po/id/vidalia_id.po | 2 +- src/vidalia/i18n/po/is/vidalia_is.po | 2 +- src/vidalia/i18n/po/it/vidalia_it.po | 2 +- src/vidalia/i18n/po/kn/vidalia_kn.po | 2 +- src/vidalia/i18n/po/lb/vidalia_lb.po | 2 +- src/vidalia/i18n/po/ln/vidalia_ln.po | 2 +- src/vidalia/i18n/po/lo/vidalia_lo.po | 2 +- src/vidalia/i18n/po/lt/vidalia_lt.po | 2 +- src/vidalia/i18n/po/lv/vidalia_lv.po | 2 +- src/vidalia/i18n/po/mg/vidalia_mg.po | 2 +- src/vidalia/i18n/po/mi/vidalia_mi.po | 2 +- src/vidalia/i18n/po/mk/vidalia_mk.po | 2 +- src/vidalia/i18n/po/ml/vidalia_ml.po | 2 +- src/vidalia/i18n/po/mn/vidalia_mn.po | 2 +- src/vidalia/i18n/po/mr/vidalia_mr.po | 2 +- src/vidalia/i18n/po/ms/vidalia_ms.po | 2 +- src/vidalia/i18n/po/mt/vidalia_mt.po | 2 +- src/vidalia/i18n/po/my/vidalia_my.po | 2 +- src/vidalia/i18n/po/nah/vidalia_nah.po | 2 +- src/vidalia/i18n/po/nap/vidalia_nap.po | 2 +- src/vidalia/i18n/po/nb/vidalia_nb.po | 2 +- src/vidalia/i18n/po/ne/vidalia_ne.po | 2 +- src/vidalia/i18n/po/nl/vidalia_nl.po | 2 +- src/vidalia/i18n/po/nn/vidalia_nn.po | 2 +- src/vidalia/i18n/po/nso/vidalia_nso.po | 2 +- src/vidalia/i18n/po/oc/vidalia_oc.po | 2 +- src/vidalia/i18n/po/pa/vidalia_pa.po | 2 +- src/vidalia/i18n/po/pap/vidalia_pap.po | 2 +- src/vidalia/i18n/po/pl/qt_pl.po | 2 +- src/vidalia/i18n/po/pl/vidalia_pl.po | 6 +- src/vidalia/i18n/po/pms/vidalia_pms.po | 2 +- src/vidalia/i18n/po/ps/vidalia_ps.po | 2 +- src/vidalia/i18n/po/pt/vidalia_pt.po | 2 +- src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po | 2 +- src/vidalia/i18n/po/ru/vidalia_ru.po | 4 +- src/vidalia/i18n/po/sco/vidalia_sco.po | 2 +- src/vidalia/i18n/po/son/vidalia_son.po | 2 +- src/vidalia/i18n/po/su/vidalia_su.po | 2 +- src/vidalia/i18n/po/sw/vidalia_sw.po | 2 +- src/vidalia/i18n/po/ta/vidalia_ta.po | 2 +- src/vidalia/i18n/po/te/vidalia_te.po | 2 +- src/vidalia/i18n/po/tg/vidalia_tg.po | 2 +- src/vidalia/i18n/po/th/vidalia_th.po | 2 +- src/vidalia/i18n/po/ti/vidalia_ti.po | 2 +- src/vidalia/i18n/po/tk/vidalia_tk.po | 2 +- src/vidalia/i18n/po/tr/vidalia_tr.po | 2 +- src/vidalia/i18n/po/ur/vidalia_ur.po | 2 +- src/vidalia/i18n/po/ve/vidalia_ve.po | 2 +- src/vidalia/i18n/po/vi/vidalia_vi.po | 2 +- src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po | 2 +- src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po | 2 +- src/vidalia/i18n/po/zu/vidalia_zu.po | 2 +- 86 files changed, 397 insertions(+), 299 deletions(-)

1 0