diff --git a/AUTHORS b/AUTHORS index 18491ea5c..1c568c2c5 100644 --- a/AUTHORS +++ b/AUTHORS @@ -26,6 +26,7 @@ Vasilis Tsivikis (Greek) Alexander Maslov (Russian) Oleg Brezhnev (Russian) Sérgio Marques (Portuguese) +Mladen Pejaković (Serbian) Special thanks: diff --git a/bin/locale/qt_sr.qm b/bin/locale/qt_sr.qm new file mode 100644 index 000000000..f040c606d Binary files /dev/null and b/bin/locale/qt_sr.qm differ diff --git a/bin/locale/qt_sr_BA.qm b/bin/locale/sr_BA.qm similarity index 100% rename from bin/locale/qt_sr_BA.qm rename to bin/locale/sr_BA.qm diff --git a/bin/locale/qt_sr_RS.qm b/bin/locale/sr_RS.qm similarity index 100% rename from bin/locale/qt_sr_RS.qm rename to bin/locale/sr_RS.qm diff --git a/src/app/mainapplication.h b/src/app/mainapplication.h index 3db4e5f34..8b52b71cd 100644 --- a/src/app/mainapplication.h +++ b/src/app/mainapplication.h @@ -45,7 +45,6 @@ class DownloadManager; class AutoFillModel; class DesktopNotificationsFactory; class IconProvider; -class Style; class SearchEnginesManager; class DatabaseWriter; class MainApplication : public QtSingleApplication @@ -103,8 +102,6 @@ public: IconProvider* iconProvider() { return m_iconProvider; } DatabaseWriter* dbWriter() { return m_dbWriter; } - static Style* appStyle; - public slots: bool saveStateSlot(); void quitApplication(); diff --git a/src/network/qupzillaschemehandler.cpp b/src/network/qupzillaschemehandler.cpp index bc11b4134..a3b929402 100644 --- a/src/network/qupzillaschemehandler.cpp +++ b/src/network/qupzillaschemehandler.cpp @@ -219,7 +219,8 @@ QString QupZillaSchemeReply::aboutPage() 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("Sérgio Marques", "smarquespt@gmail.com") + " (Portuguese)" + authorString("Sérgio Marques", "smarquespt@gmail.com") + " (Portuguese)
" + + authorString("Mladen Pejaković", "pejakm@gmail.com") + " (Serbian)" ); return aPage; diff --git a/src/other/aboutdialog.cpp b/src/other/aboutdialog.cpp index dbbf5e006..22db7bd88 100644 --- a/src/other/aboutdialog.cpp +++ b/src/other/aboutdialog.cpp @@ -91,7 +91,8 @@ void AboutDialog::showAuthors() "Vasilis Tsivikis (Greek)
" "Alexander Maslov (Russian)
" "Oleg Brezhnev (Russian)
" - "Sérgio Marques (Portuguese)" + "Sérgio Marques (Portuguese)
" + "Mladen Pejaković (Serbian)" )); m_authorsHtml.append(""); } diff --git a/translations/homepage/en_US.php b/translations/homepage/en_US.php index 50eb8346d..9082e4fa3 100644 --- a/translations/homepage/en_US.php +++ b/translations/homepage/en_US.php @@ -10,6 +10,7 @@ $menu_download = "Download"; $menu_reportbug = "Report Issue"; $menu_about = "Contribute"; $footer_site = "www.qupzilla.com"; +$translated_by = ""; //Home Page $actual_version = "Current Version"; diff --git a/translations/homepage/pl_PL.php b/translations/homepage/pl_PL.php index 83825eb9e..01862754c 100644 --- a/translations/homepage/pl_PL.php +++ b/translations/homepage/pl_PL.php @@ -1,68 +1,68 @@ Don't hesitate and download it right now!"; -$actual_version_button = "DOWNLOAD"; -$older_versions = "Changelog"; -$older_versions_text = "You ever wanted to know what happened from that version to this?
You can find everything in changelog at github!"; -$older_versions_button = "Changelog"; -$reportbug = "Report Issue"; -$reportbug_text = "Did you found some bug or you only have a suggestion how to improve QupZilla?
- Please open an issue at github issue tracker."; -$reportbug_button = "Report now"; -$technology = "Technology"; -$technology_text = "QupZilla is modern web browser based on WebKit core and Qt Framework. WebKit guarante fast - browsing and Qt availability on all major platforms."; -$technology_button = "WebKit & Qt"; -$looknfeel_header = "Native look'n'feel"; -$looknfeel_text = "QupZilla is using native widgets style on major Linux Desktop Environments. It is also using icons from active desktop icon theme. If you find native theme too boring or have some problems with it, you can always switch to other themes."; -$library_header = "Unified Library"; -$library_text = "QupZilla unifies bookmarks, history and rss reader in one well-arranged window. No more multiple windows, QupZilla uses just one!
-With integrated rss reader, you can stay up to date with your favourite sites. QupZilla can also import bookmarks from other browsers."; -$adblock_header = "Integrated AdBlock"; -$adblock_text = "Are you bored of websited full of advertisements? Are they eating your bandwidth and time? The only thing you need with QupZilla is to update EasyList or maybe add your own rules and start browsing ad free."; +$actual_version = "Aktualna Wersja"; +$actual_version_text = "Aktualna wersja jest z ". $qupzilla_version_date . + " i jest to wersja " . $qupzilla_version . ". Zmiany w changelogu.
Nie wahaj się i pobierz już teraz!"; +$actual_version_button = "POBIERZ"; +$older_versions = "Lista Zmian"; +$older_versions_text = "Czy kiedykolwiek chciałeś wiedzieć, co się zmieniło w nowej wersji?
Wszystko możesz znaleźć w liście zmian na github!"; +$older_versions_button = "Lista zmian"; +$reportbug = "Zgłoś Błąd"; +$reportbug_text = "Czy znalazłeś jakiś błąd lub masz tylko sugestie, jak poprawić QupZille?
+ Otwórz nowy wątek na trackerze QupZilli na github."; +$reportbug_button = "Zgłoś teraz"; +$technology = "Technologia"; +$technology_text = "QupZilla jest nowoczesną przeglądarką bazującą na silniku WebKit i Frameworku Qt. WebKit gwarantuje szybkie + przeglądanie a Qt wieloplatformowość aplikacji."; +$technology_button = "WebKit i Qt"; +$looknfeel_header = "Nowoczesny wygląd i odczucia"; +$looknfeel_text = "QupZilla wykorzystuje wiele natywnych motywów dla popularnych linuksowych środowisk graficznych. Jeżeli twój natywny motyw jest zbyt nudny lub masz z nim jakieś problemy, możesz w prosty sposób go zmienić."; +$library_header = "Ujednolicone Biblioteki"; +$library_text = "QupZilla łączy zakładki, historię oraz czytnik rss w jednym oknie. Nigdy więcej dla takiego rozbicia, z QupZillą wszystko będziesz mieć w jednym oknie!
+Dzięki wbudowanemu czytnikowi RSS, można pozostać na bieżąco z ulubionymi stronami. QupZilla może także importować zakładki z innych przeglądarek."; +$adblock_header = "Zintegrowany AdBlock"; +$adblock_text = "Czy nie denerwują się strony przeładowane reklamami? Ładują się za długo? Jedyne co potrzebujesz w QupZill to aktualizacja EasyList lub dodanie swojich własnych reguł blokowania reklam."; $speeddial_header = "Speed Dial"; -$speeddial_text = "This popular extension is finally available for QupZilla users! You can now access your favourite pages as fast as you want on one page opened in new tab. Needless to say that it fully supports drag&drop and page thumbnail loading."; -$devnews_header = "Development News"; -$feed_loading = "Loading..."; +$speeddial_text = "Ten popularny dodatek wreszcie zagościł w QupZilli! Możesz teraz uzyskać dostęp do ulubionych stron tak szybko, jak chcesz w każdej nowej karcie. Nie zapomnijmy wspomnieć że Spped Dial umożliwia zarządznie zakładkami za pomocą drag&drop (przeciągnij i upuść)."; +$devnews_header = "Nowości"; +$feed_loading = "Ładowanie..."; // Download Page -$other_linux = "Other Linux"; -$source_code = "Source Code"; -$choose_os = "Please choose your operating system"; -$windows_text = "32bit and 64bit Windows installers can be downloaded by clicking on links bellow"; -$ubuntu_text = "Oneiric, Natty and Maverick users can install QupZilla by running these commands"; -$for_development_version = "for development version:"; -$packages_text = "32bit and 64bit packages"; +$other_linux = "Inne z rodziny Linux"; +$source_code = "Kod Źródłowy"; +$choose_os = "Wybierz system operacyjny"; +$windows_text = "32bit i 64bit instalator dla systemu Windows można pobrać klikając na linki poniżej"; +$ubuntu_text = "Użytkownicy Ubuntu Oneric, Natty i Maverick mogą zainstalować QupZille wykonując komendy"; +$for_development_version = "wersja developerska:"; +$packages_text = "Paczki 32bit i 64bit"; $tarballs_text = "32bit and 64bit precompiled tarballs"; -$can_be_downloaded = "can be downloaded by clicking on links bellow"; -$source_text = "You can get source code by cloning repository (if you have git installed)"; -$view_source = "view source on github.com"; -$download_snapshot = "download current snapshot"; +$can_be_downloaded = "można pobrać klikająć w link poniżej"; +$source_text = "Możesz pobrać kod źródłowy, klonując repozytorium (jeżeli ma się zainstalowany git)"; +$view_source = "pokaż źródła na github.com"; +$download_snapshot = "Pobierz aktualną migawkę"; // Contribute Page -$contribute_to = "Contribute to QupZilla"; -$contribute_text = "QupZilla is open source project, so your help is very welcome! I will be very happy to include patches you send me. But hacking into - code is not the only one way to help, you can translate QupZilla to your language or just share it with your friends. Remember, every (even small) help is highly appreciated!"; -$getting_source = "Getting Source"; -$getting_source_text1 = "The easiest way you can get QupZilla source is to clone it from github repository. You can do it by running this command"; -$getting_source_text2 = "and then you can start hacking. You cand send me your patches by e-mail or at github."; -$translating = "Translating into other languages"; -$translating_text = "Another way how to contribute is to add or improve current translation. If you want add new language, you can generate new translations file manually, or you can contact me, and I will do it for you. You cand send me your translations again by e-mail or at github."; -$translating_moreinfo = "More informations about translating here [wiki at github]"; -$share_with_friends = "Share with Friends!"; -$share_with_friends_text = "Do you like QupZilla? Then share it amongst your friends!" +$contribute_to = "Przyczyń się dla QupZilli"; +$contribute_text = "QupZilla jest projektem open source, dlatego twoja pomoc jest mile widziana! Będę bardzo szczęśliwy z poprawek które mi wyślesz. + Tworzenie kodu nie jest jedynym sposobem aby pomóc, można tłumaczyć QupZille na swój język lub po prostu podzielić się nią ze znajomymi. Pamiętaj, że każda (nawet mała) pomoc jest wysoko ceniona!"; +$getting_source = "Kod Źródłowy"; +$getting_source_text1 = "Najprostszą metodą na zdobycie kodu źródłowego jest sklonowanie repozytorium na github. Możesz to zrobić wykonując komendę"; +$getting_source_text2 = "i poprostu zacząć hakować. Możesz wysyłać poprawki za pomoca e-maila lub po przez github."; +$translating = "Tłumaczenie na inne języki"; +$translating_text = "Innym sposobem aby przyczynić sie dla projektu jest dodanie nowego lub poprawienie obecnego tłumaczenia. Jeżeli chcesz dodać nowe tłumaczenie, możesz wygenerowac plik tłumaczenia ręcznie, lub skontaktować się ze mną, a ja zrobie to dla Ciebie. Możesz mi wysłać swoje tłumaczenie po przez e-mial lub github."; +$translating_moreinfo = "Więcej informacji o tłumaczeniu tutaj [wiki na github]"; +$share_with_friends = "Podziel się ze znajomymi!"; +$share_with_friends_text = "Lubisz QupZille? W takim razie podziel się nią ze swoimi znajomymi!" ?> diff --git a/translations/homepage/pt_PT.php b/translations/homepage/pt_PT.php index a2d92c874..5a949d907 100644 --- a/translations/homepage/pt_PT.php +++ b/translations/homepage/pt_PT.php @@ -10,6 +10,7 @@ $menu_download = "Transferir"; $menu_reportbug = "Reportar erros"; $menu_about = "Participar"; $footer_site = "www.qupzilla.com"; +$translated_by = "Página traduzida por Sérgio Marques"; //Home Page $actual_version = "Versão atual"; @@ -26,13 +27,13 @@ $technology = "Tecnologia"; $technology_text = "O QupZilla é um navegador web baseado no WebKit e na plataforma Qt. O WebKit garante uma navegação rápida e a plataforma Qt disponibiliza a tecnologia nos principais sistemas operativos."; $technology_button = "WebKit e Qt"; $looknfeel_header = "Aparência de acordo com o sistema operativo"; -$looknfeel_text = "O QupZilla utiliza o estilo e os ícones dos ambientes de trabalho Linux. No entanto, se considerar que este aspeto é aborrecido ou caso tenha alguns problemas,pode sempre trocar entre os temas disponíveis."; +$looknfeel_text = "O QupZilla utiliza o estilo e os ícones dos ambientes de trabalho Linux. No entanto, se considerar que este aspeto é aborrecido ou caso tenha alguns problemas, pode sempre trocar entre os temas disponíveis."; $library_header = "Uniformidade"; -$library_text = "O QupZilla agrega os marcadores, histórico e as fontes RSS numa só janela. Nada de diversas janelas para estes itens!
Com o leitor RSS integrado, pode estar a par das suas fontes preferidas. Para além disso, o QupZilla consegue importar os marcadores de outros navegadores web."; +$library_text = "O QupZilla agrega os marcadores, histórico e fontes RSS numa só janela. Nada de diversas janelas para estes itens!
Com o leitor RSS integrado, tem sempre as suas fontes atualizadas. Para além disso, o QupZilla consegue importar os marcadores de outros navegadores web."; $adblock_header = "AdBlock integrado"; $adblock_text = "Não gosta dos anúncios que algumas páginas web exibem? Estão estes anúncios a gastar largura de banda e fazem-no(a) perder tempo? Com o QupZilla, tudo o que tem de fazer é atualizar a EasyList ou, eventualmente, adicionar as suas regras e pode navegar sem ser importunado."; $speeddial_header = "Ligação rápida"; -$speeddial_text = "Finalmente, este funcionalidade está disponível para os utilizadores QupZilla! Agora, já pode aceder fácil e rapidamente às suas páginas favoritas com apenas um clique. As miniaturas das páginas são carregadas automaticamente e pode utilizar o processo arrastar e largar para as mover entre as diversas posições."; +$speeddial_text = "Finalmente, este funcionalidade está disponível para os utilizadores QupZilla! Agora já pode aceder, fácil e rapidamente, às suas páginas favoritas com apenas um clique. As miniaturas das páginas são carregadas automaticamente e pode utilizar o processo arrastar e largar para as mover entre as diversas posições."; $devnews_header = "Desenvolvimento"; $feed_loading = "A carregar..."; @@ -43,7 +44,7 @@ $choose_os = "Escolha o seu sistema operativo"; $windows_text = "Pode transferir as versões 32 bits e 64 bits para o Windows nas ligações abaixo"; $ubuntu_text = "Os utilizadores do Ubuntu Oneiric, Natty e Maverick podem instalar o QupZilla através destes comandos"; $for_development_version = "Versões de desenvolvimento:"; -$packages_text = "Pacotes 32 bits e 64 bits"; +$packages_text = "Os pacotes 32 bits e 64 bits"; $tarballs_text = "Os pacotes pré-compilados 32 bits e 64 bits"; $can_be_downloaded = "podem ser transferidos nas ligações abaixo"; $source_text = "Pode obter o código fonte clonando o repositório (se tiver o git instalado)";