diff --git a/AUTHORS b/AUTHORS index b1341e3b4..18491ea5c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -25,6 +25,7 @@ Nicolas Ourceau (French) Vasilis Tsivikis (Greek) Alexander Maslov (Russian) Oleg Brezhnev (Russian) +Sérgio Marques (Portuguese) Special thanks: diff --git a/COPYRIGHT b/COPYRIGHT index 94be16e82..c79abc5e2 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -15,6 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * ============================================================ */ + ------------------------------------------------------------------------ AdBlock, LineEdit class and SqueezeLabel class: ------------------------------------------------------------------------ @@ -160,6 +161,40 @@ * Boston, MA 02110-1301 USA */ +----------------------------------------------------------------------------- + CA certificates from Mozilla included in ca-bundle.crt: +----------------------------------------------------------------------------- +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. + ----------------------------------------------------------------------------- QtWin class from http://labs.qt.nokia.com/2009/09/15/using-blur-behind-on-windows/ diff --git a/bin/locale/pt_PT.qm b/bin/locale/pt_PT.qm new file mode 100644 index 000000000..61b6591f8 Binary files /dev/null and b/bin/locale/pt_PT.qm differ diff --git a/bin/locale/qt_pt.qm b/bin/locale/qt_pt.qm new file mode 100644 index 000000000..fc9251186 Binary files /dev/null and b/bin/locale/qt_pt.qm differ diff --git a/src/network/qupzillaschemehandler.cpp b/src/network/qupzillaschemehandler.cpp index 7610fdca0..bc11b4134 100644 --- a/src/network/qupzillaschemehandler.cpp +++ b/src/network/qupzillaschemehandler.cpp @@ -218,7 +218,8 @@ QString QupZillaSchemeReply::aboutPage() authorString("Nicolas Ourceau", "lamessen@hotmail.fr") + " (French)
" + authorString("Vasilis Tsivikis", "vasitsiv.dev@gmail.com") + " (Greek)
" + authorString("Alexander Maslov", "it@delta-z.ru") + " (Russian)
" + - authorString("Oleg Brezhnev", "oleg-423@yandex.ru") + " (Russian)
" + authorString("Oleg Brezhnev", "oleg-423@yandex.ru") + " (Russian)
" + + authorString("Sérgio Marques", "smarquespt@gmail.com") + " (Portuguese)" ); return aPage; diff --git a/src/other/aboutdialog.cpp b/src/other/aboutdialog.cpp index dee3f32cf..464ca702f 100644 --- a/src/other/aboutdialog.cpp +++ b/src/other/aboutdialog.cpp @@ -90,7 +90,8 @@ void AboutDialog::showAuthors() "Nicolas Ourceau (French)
" "Vasilis Tsivikis (Greek)
" "Alexander Maslov (Russian)
" - "Oleg Brezhnev (Russian)" + "Oleg Brezhnev (Russian)
" + "Sérgio Marques (Portuguese)" )); m_authorsHtml.append(""); } diff --git a/src/src.pro b/src/src.pro index 64aa3de2f..b8fbbcf98 100644 --- a/src/src.pro +++ b/src/src.pro @@ -40,6 +40,7 @@ TRANSLATIONS +=../translations/cs_CZ.ts\ ../translations/fr_FR.ts\ ../translations/el_GR.ts\ ../translations/ru_RU.ts\ + ../translations/pt_PT.ts\ ../translations/empty.ts\