# HG changeset patch # User unc0rr # Date 1348255797 -14400 # Node ID fc44e4e33d1cd978e5ad67e9ee0218849fe8f6ca # Parent 2455207a2c71757234ff02b862f0b2b8ae538cab Support for proxies (not tested) diff -r 2455207a2c71 -r fc44e4e33d1c QTfrontend/gameuiconfig.cpp --- a/QTfrontend/gameuiconfig.cpp Fri Sep 21 01:29:33 2012 +0200 +++ b/QTfrontend/gameuiconfig.cpp Fri Sep 21 23:29:57 2012 +0400 @@ -23,6 +23,7 @@ #include #include #include +#include #include "gameuiconfig.h" #include "hwform.h" @@ -109,6 +110,12 @@ Form->ui.pageOptions->CBLanguage->setCurrentIndex(Form->ui.pageOptions->CBLanguage->findData(value("misc/locale", "").toString())); + Form->ui.pageOptions->cbProxyType->setCurrentIndex(value("proxy/type", 0).toInt()); + Form->ui.pageOptions->leProxy->setText(value("proxy/host", "").toString()); + Form->ui.pageOptions->sbProxyPort->setValue(value("proxy/port", "8080").toInt()); + Form->ui.pageOptions->leProxyLogin->setText(value("proxy/login", "").toString()); + Form->ui.pageOptions->leProxyPassword->setText(value("proxy/password", "").toString()); + depth = HWApplication::desktop()->depth(); if (depth < 16) depth = 16; else if (depth > 16) depth = 32; @@ -217,6 +224,31 @@ setValue("misc/autoUpdate", isAutoUpdateEnabled()); #endif + int proxyType = Form->ui.pageOptions->cbProxyType->currentIndex(); + setValue("proxy/type", proxyType); + + if(proxyType > 0) + { + setValue("proxy/host", Form->ui.pageOptions->leProxy->text()); + setValue("proxy/port", Form->ui.pageOptions->sbProxyPort->value()); + setValue("proxy/login", Form->ui.pageOptions->leProxyLogin->text()); + setValue("proxy/password", Form->ui.pageOptions->leProxyPassword->text()); + } + + const QNetworkProxy::ProxyType proxyTypesMap[] = { + QNetworkProxy::NoProxy + , QNetworkProxy::Socks5Proxy + , QNetworkProxy::HttpProxy}; + + QNetworkProxy proxy; + proxy.setType(proxyTypesMap[proxyType]); + proxy.setHostName(Form->ui.pageOptions->leProxy->text()); + proxy.setPort(Form->ui.pageOptions->sbProxyPort->value()); + proxy.setUser(Form->ui.pageOptions->leProxyLogin->text()); + proxy.setPassword(Form->ui.pageOptions->leProxyPassword->text()); + QNetworkProxy::setApplicationProxy(proxy); + + { // save colors QStandardItemModel * model = DataManager::instance().colorsModel(); for(int i = model->rowCount() - 1; i >= 0; --i) diff -r 2455207a2c71 -r fc44e4e33d1c QTfrontend/ui/page/pageoptions.cpp --- a/QTfrontend/ui/page/pageoptions.cpp Fri Sep 21 01:29:33 2012 +0200 +++ b/QTfrontend/ui/page/pageoptions.cpp Fri Sep 21 23:29:57 2012 +0400 @@ -442,7 +442,53 @@ gbCLayout->addWidget(BtnAssociateFiles); } - page2Layout->addWidget(new QWidget(this), 1, 0); + { + IconedGroupBox * gbProxy = new IconedGroupBox(this); + gbProxy->setIcon(QIcon(":/res/Settings.png")); + gbProxy->setTitle(QGroupBox::tr("Proxy settings")); + page2Layout->addWidget(gbProxy, 1, 0); + QGridLayout * gbLayout = new QGridLayout(gbProxy); + + QStringList sl; + sl + << tr("Proxy host") + << tr("Proxy port") + << tr("Proxy login") + << tr("Proxy password") + ; + for(int i = 0; i < sl.size(); ++i) + { + QLabel * l = new QLabel(gbProxy); + l->setText(sl[i]); + gbLayout->addWidget(l, i + 1, 0); + } + + cbProxyType = new QComboBox(gbProxy); + cbProxyType->addItems(QStringList() + << tr("No proxy") + << tr("Socks5 proxy") + << tr("HTTP proxy")); + gbLayout->addWidget(cbProxyType, 0, 1); + + leProxy = new QLineEdit(gbProxy); + gbLayout->addWidget(leProxy, 1, 1); + + sbProxyPort = new QSpinBox(gbProxy); + sbProxyPort->setMaximum(65535); + gbLayout->addWidget(sbProxyPort, 2, 1); + + leProxyLogin = new QLineEdit(gbProxy); + gbLayout->addWidget(leProxyLogin, 3, 1); + + leProxyPassword = new QLineEdit(gbProxy); + leProxyPassword->setEchoMode(QLineEdit::Password); + gbLayout->addWidget(leProxyPassword, 4, 1); + + + connect(cbProxyType, SIGNAL(currentIndexChanged(int)), this, SLOT(onProxyTypeChanged())); + } + + page2Layout->addWidget(new QWidget(this), 2, 0); } previousQuality = this->SLQuality->value(); @@ -576,3 +622,13 @@ m_colorButtons[topLeft.row()]->setStyleSheet(QString("background: %1").arg(model->item(topLeft.row())->data().value().name())); } + +void PageOptions::onProxyTypeChanged() +{ + bool b = cbProxyType->currentIndex() > 0; + + sbProxyPort->setEnabled(b); + leProxy->setEnabled(b); + leProxyLogin->setEnabled(b); + leProxyPassword->setEnabled(b); +} diff -r 2455207a2c71 -r fc44e4e33d1c QTfrontend/ui/page/pageoptions.h --- a/QTfrontend/ui/page/pageoptions.h Fri Sep 21 01:29:33 2012 +0200 +++ b/QTfrontend/ui/page/pageoptions.h Fri Sep 21 23:29:57 2012 +0400 @@ -44,7 +44,7 @@ QComboBox *CBLanguage; - IconedGroupBox *teamsBox;; + IconedGroupBox *teamsBox; QPushButton *BtnAssociateFiles; QComboBox *CBTeamName; IconedGroupBox *AGGroupBox; @@ -71,6 +71,11 @@ QLineEdit *editNetPassword; QSlider *SLQuality; QCheckBox *CBFrontendEffects; + QComboBox * cbProxyType; + QSpinBox * sbProxyPort; + QLineEdit * leProxy; + QLineEdit * leProxyLogin; + QLineEdit * leProxyPassword; void setTeamOptionsEnabled(bool enabled); @@ -105,6 +110,7 @@ void savePwdChanged(int state); void colorButtonClicked(int i); void onColorModelDataChanged(const QModelIndex & topLeft, const QModelIndex & bottomRight); + void onProxyTypeChanged(); }; #endif diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_ar.ts --- a/share/hedgewars/Data/Locale/hedgewars_ar.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_ar.ts Fri Sep 21 23:29:57 2012 +0400 @@ -1063,6 +1063,34 @@ Reset to default colors + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1827,6 +1855,10 @@ Description + + Proxy settings + + QLabel diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_bg.ts --- a/share/hedgewars/Data/Locale/hedgewars_bg.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_bg.ts Fri Sep 21 23:29:57 2012 +0400 @@ -1039,6 +1039,34 @@ Reset to default colors + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1783,6 +1811,10 @@ Description + + Proxy settings + + QLabel diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_cs.ts --- a/share/hedgewars/Data/Locale/hedgewars_cs.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_cs.ts Fri Sep 21 23:29:57 2012 +0400 @@ -1051,6 +1051,34 @@ Reset to default colors + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1818,6 +1846,10 @@ Description + + Proxy settings + + QLabel diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_de.ts --- a/share/hedgewars/Data/Locale/hedgewars_de.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_de.ts Fri Sep 21 23:29:57 2012 +0400 @@ -1133,6 +1133,34 @@ Reset to default colors + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1903,6 +1931,10 @@ Description + + Proxy settings + + QLabel diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_en.ts --- a/share/hedgewars/Data/Locale/hedgewars_en.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_en.ts Fri Sep 21 23:29:57 2012 +0400 @@ -617,12 +617,14 @@ %1 thought it's good to shoot his own hedgehogs with %2 pts. + %1 killed %2 of his own hedgehogs. + @@ -1077,6 +1079,34 @@ Reset to default colors + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1223,6 +1253,7 @@ %1 players online + @@ -1834,6 +1865,10 @@ Description + + Proxy settings + + QLabel diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_es.ts --- a/share/hedgewars/Data/Locale/hedgewars_es.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_es.ts Fri Sep 21 23:29:57 2012 +0400 @@ -1133,6 +1133,34 @@ Reset to default colors + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1935,6 +1963,10 @@ Description + + Proxy settings + + QLabel diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_fi.ts --- a/share/hedgewars/Data/Locale/hedgewars_fi.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_fi.ts Fri Sep 21 23:29:57 2012 +0400 @@ -1108,6 +1108,34 @@ Reset to default colors + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1906,6 +1934,10 @@ Description + + Proxy settings + + QLabel diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_fr.ts --- a/share/hedgewars/Data/Locale/hedgewars_fr.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_fr.ts Fri Sep 21 23:29:57 2012 +0400 @@ -1091,6 +1091,34 @@ Reset to default colors + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1860,6 +1888,10 @@ Description + + Proxy settings + + QLabel diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_hu.ts --- a/share/hedgewars/Data/Locale/hedgewars_hu.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_hu.ts Fri Sep 21 23:29:57 2012 +0400 @@ -1057,6 +1057,34 @@ Reset to default colors + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1813,6 +1841,10 @@ Description + + Proxy settings + + QLabel diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_it.ts --- a/share/hedgewars/Data/Locale/hedgewars_it.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_it.ts Fri Sep 21 23:29:57 2012 +0400 @@ -425,7 +425,7 @@ Remote host has closed connection - L'host remoto ha terminato la connessione. + L'host remoto ha terminato la connessione. The server is too old. Disconnecting now. @@ -956,7 +956,7 @@ Read about who is behind the Hedgewars Project - Leggi chi c'è dietro allo sviluppo di Hedgewars + Leggi chi c'è dietro allo sviluppo di Hedgewars Leave a feedback here reporting issues, suggesting features or just saying how you like Hedgewars @@ -1109,6 +1109,34 @@ Reset to default colors Ripristina colori originali + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1887,6 +1915,10 @@ Description Descrizione + + Proxy settings + + QLabel @@ -2106,7 +2138,7 @@ Please provide either the YouTube account name or the email address associated with the Google Account. - Inserire il nome utente YouTube o l'indirizzo e-mail associato all'account Google. + Inserire il nome utente YouTube o l'indirizzo e-mail associato all'account Google. Account name (or email): @@ -2263,7 +2295,7 @@ Please fill out all fields - E' necessario compilare tutti i campi + E' necessario compilare tutti i campi Success @@ -2275,16 +2307,16 @@ Error during authentication with www.google.com - Errore durante l'autenticazione con il server www.google.com + Errore durante l'autenticazione con il server www.google.com Error creating the issue - Errore nella segnalazione dell'errore + Errore nella segnalazione dell'errore Error while authenticating at google.com: - Errore durante l'autenticazione su google.com: + Errore durante l'autenticazione su google.com: Login or password is incorrect @@ -2293,7 +2325,7 @@ Error while sending metadata to youtube.com: - Errore nell'invio dei dati a youtube.com: + Errore nell'invio dei dati a youtube.com: diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_ja.ts --- a/share/hedgewars/Data/Locale/hedgewars_ja.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_ja.ts Fri Sep 21 23:29:57 2012 +0400 @@ -1026,6 +1026,34 @@ Reset to default colors + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1727,6 +1755,10 @@ Description + + Proxy settings + + QLabel diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_ko.ts --- a/share/hedgewars/Data/Locale/hedgewars_ko.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_ko.ts Fri Sep 21 23:29:57 2012 +0400 @@ -967,6 +967,34 @@ Reset to default colors + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1635,6 +1663,10 @@ Description + + Proxy settings + + QLabel diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_lt.ts --- a/share/hedgewars/Data/Locale/hedgewars_lt.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_lt.ts Fri Sep 21 23:29:57 2012 +0400 @@ -404,35 +404,35 @@ - + Room destroyed - + You got kicked - - + + %1 *** %2 has joined the room - + %1 *** %2 has joined - - + + %1 *** %2 has left - - + + %1 *** %2 has left (%3) @@ -1193,6 +1193,41 @@ Reset to default colors + + + Proxy host + + + + + Proxy port + + + + + Proxy login + + + + + Proxy password + + + + + No proxy + + + + + Socks5 proxy + + + + + HTTP proxy + + PagePlayDemo @@ -1726,7 +1761,7 @@ QCheckBox - + Show ammo menu tooltips @@ -1736,7 +1771,7 @@ - + Append date and time to record file name @@ -1781,7 +1816,7 @@ - + Show FPS @@ -2005,11 +2040,16 @@ - + Miscellaneous + + Proxy settings + + + Game Modifiers @@ -2185,7 +2225,7 @@ - + FPS limit @@ -2607,7 +2647,7 @@ - + Associate file extensions diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_nl.ts --- a/share/hedgewars/Data/Locale/hedgewars_nl.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_nl.ts Fri Sep 21 23:29:57 2012 +0400 @@ -984,6 +984,34 @@ Reset to default colors + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1655,6 +1683,10 @@ Description + + Proxy settings + + QLabel diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_pl.ts --- a/share/hedgewars/Data/Locale/hedgewars_pl.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_pl.ts Fri Sep 21 23:29:57 2012 +0400 @@ -1161,6 +1161,34 @@ Reset to default colors + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1976,6 +2004,10 @@ Description + + Proxy settings + + QLabel diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_pt_BR.ts --- a/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Fri Sep 21 23:29:57 2012 +0400 @@ -1171,6 +1171,34 @@ Reset to default colors + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1973,6 +2001,10 @@ Description + + Proxy settings + + QLabel diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_pt_PT.ts --- a/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Fri Sep 21 23:29:57 2012 +0400 @@ -1098,6 +1098,34 @@ Reset to default colors + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1872,6 +1900,10 @@ Description + + Proxy settings + + QLabel diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_ru.ts --- a/share/hedgewars/Data/Locale/hedgewars_ru.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_ru.ts Fri Sep 21 23:29:57 2012 +0400 @@ -1109,6 +1109,34 @@ Reset to default colors Сбросить на цвета по умолчанию + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1884,6 +1912,10 @@ Description Описание + + Proxy settings + + QLabel diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_sk.ts --- a/share/hedgewars/Data/Locale/hedgewars_sk.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_sk.ts Fri Sep 21 23:29:57 2012 +0400 @@ -1156,6 +1156,34 @@ Reset to default colors + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1971,6 +1999,10 @@ Description + + Proxy settings + + QLabel diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_sv.ts --- a/share/hedgewars/Data/Locale/hedgewars_sv.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_sv.ts Fri Sep 21 23:29:57 2012 +0400 @@ -1125,6 +1125,34 @@ Reset to default colors + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1927,6 +1955,10 @@ Description + + Proxy settings + + QLabel diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_tr_TR.ts --- a/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Fri Sep 21 23:29:57 2012 +0400 @@ -1003,6 +1003,34 @@ Reset to default colors + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1707,6 +1735,10 @@ Description + + Proxy settings + + QLabel diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_uk.ts --- a/share/hedgewars/Data/Locale/hedgewars_uk.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_uk.ts Fri Sep 21 23:29:57 2012 +0400 @@ -1105,6 +1105,34 @@ Reset to default colors + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1880,6 +1908,10 @@ Description + + Proxy settings + + QLabel diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_zh_CN.ts --- a/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Fri Sep 21 23:29:57 2012 +0400 @@ -491,25 +491,25 @@ - + %1 *** %2 has joined - - + + %1 *** %2 has left - - + + %1 *** %2 has left (%3) - - + + %1 *** %2 has joined the room @@ -531,12 +531,12 @@ 退出原因： - + Room destroyed 房间损坏 - + You got kicked 被踢出 @@ -1377,6 +1377,41 @@ + + Proxy host + + + + + Proxy port + + + + + Proxy login + + + + + Proxy password + + + + + No proxy + + + + + Socks5 proxy + + + + + HTTP proxy + + + Save 保存 @@ -1992,7 +2027,7 @@ 城堡模式 - + Show FPS 显示帧率 (FPS) @@ -2027,7 +2062,7 @@ 开启音乐 - + Show ammo menu tooltips @@ -2041,7 +2076,7 @@ 分组 - + Append date and time to record file name 记录名称中包含具体时间日期 @@ -2292,11 +2327,16 @@ - + Miscellaneous + + Proxy settings + + + Net nick 昵称 @@ -2465,7 +2505,7 @@ - + FPS limit FPS 上限 @@ -3140,7 +3180,7 @@ - + Associate file extensions diff -r 2455207a2c71 -r fc44e4e33d1c share/hedgewars/Data/Locale/hedgewars_zh_TW.ts --- a/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Fri Sep 21 01:29:33 2012 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Fri Sep 21 23:29:57 2012 +0400 @@ -1029,6 +1029,34 @@ Reset to default colors + + Proxy host + + + + Proxy port + + + + Proxy login + + + + Proxy password + + + + No proxy + + + + Socks5 proxy + + + + HTTP proxy + + PagePlayDemo @@ -1781,6 +1809,10 @@ Description + + Proxy settings + + QLabel