Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

Merge branch 'master' of github.com:nowrep/QupZilla

Browse Source 
Conflicts:
	translations/de_DE.ts
This commit is contained in:
nowrep 2012-01-10 21:15:46 +01:00
commit 53d0c256c5
3 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/locale/de_DE.qm
View File

Binary file not shown.

29
translations/de_DE.ts
View File

@ -48,7 +48,7 @@
<message>
<location filename="../src/other/aboutdialog.cpp" line="78"/>
<source>&lt;p&gt;&lt;b&gt;Main developer:&lt;/b&gt;&lt;br/&gt;%1 &amp;lt;%2&amp;gt;&lt;/p&gt;</source>
<translation type="unfinished"></translation>
<translation>&lt;p&gt;&lt;b&gt;Hauptentwickler:&lt;/b&gt;&lt;br/&gt;%1 &amp;lt;%2&amp;gt;&lt;/p&gt;</translation>
</message>
<message>
<source>&lt;p&gt;&lt;b&gt;Main developers:&lt;/b&gt;&lt;br/&gt;%1 &amp;lt;%2&amp;gt;&lt;/p&gt;</source>
@ -678,7 +678,7 @@
<message>
<location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="64"/>
<source>&amp;Organize Bookmarks</source>
<translation>Bookmarks &amp;bearbeiten</translation>
<translation>Lesezeichen &amp;bearbeiten</translation>
</message>
<message>
<location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="66"/>
@ -3229,7 +3229,7 @@
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="130"/>
<source>If you are experiencing problems with QupZilla, please try to disable all plugins first. &lt;br/&gt;If this does not fix it, then please fill out this form: </source>
<translation type="unfinished"></translation>
<translation>Wenn Sie bei der Nutzung von QupZilla auf Probleme stoßen, deaktivieren Sie bitte zuerst alle Plugins. &lt;br/&gt; Sollte dies das Problem nicht lösen, füllen Sie bitte dieses Formular aus: </translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="136"/>
@ -3239,7 +3239,7 @@
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="137"/>
<source>Please fill out all required fields!</source>
<translation type="unfinished"></translation>
<translation>Bitte füllen Sie alle erforderlichen Felder aus!</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="187"/>
@ -4406,22 +4406,22 @@ Nachdem Speicherpfade hinzugefügt oder gelöscht wurden, muss QupZilla neu gest
<message>
<location filename="../src/webview/webview.cpp" line="536"/>
<source>&amp;Copy page link</source>
<translation type="unfinished"></translation>
<translation>Link zur Seite &amp;kopieren</translation>
</message>
<message>
<location filename="../src/webview/webview.cpp" line="537"/>
<source>Send page link...</source>
<translation type="unfinished"></translation>
<translation>Link der Seite versenden...</translation>
</message>
<message>
<location filename="../src/webview/webview.cpp" line="538"/>
<source>&amp;Print page</source>
<translation type="unfinished"></translation>
<translation>Seite &amp;drucken</translation>
</message>
<message>
<location filename="../src/webview/webview.cpp" line="545"/>
<source>Validate page</source>
<translation type="unfinished"></translation>
<translation>Seite überprüfen</translation>
</message>
<message>
<location filename="../src/webview/webview.cpp" line="552"/>
@ -4429,7 +4429,16 @@ Nachdem Speicherpfade hinzugefügt oder gelöscht wurden, muss QupZilla neu gest
<translation>S&amp;eiteninformationen anzeigen</translation>
</message>
<message>
<<<<<<< HEAD
<location filename="../src/webview/webview.cpp" line="550"/>
=======
<location filename="../src/webview/webview.cpp" line="569"/>
<source>Dictionary (Google Translate)</source>
<translation>Wörterbuch (Google Translate)</translation>
</message>
<message>
<location filename="../src/webview/webview.cpp" line="553"/>
>>>>>>> 889476770a327d6b0b419a1758d4bc2549f27d1f
<source>Show Web &amp;Inspector</source>
<translation>Web &amp;Inspector anzeigen</translation>
</message>
@ -4482,7 +4491,7 @@ Nachdem Speicherpfade hinzugefügt oder gelöscht wurden, muss QupZilla neu gest
<message>
<location filename="../src/webview/webview.cpp" line="561"/>
<source>Send text...</source>
<translation type="unfinished"></translation>
<translation>Text senden...</translation>
</message>
<message>
<location filename="../src/webview/webview.cpp" line="566"/>
@ -4497,7 +4506,7 @@ Nachdem Speicherpfade hinzugefügt oder gelöscht wurden, muss QupZilla neu gest
<message>
<location filename="../src/webview/webview.cpp" line="578"/>
<source>Go to &amp;web address</source>
<translation type="unfinished"></translation>
<translation>Gehe zu &amp;Web-Adresse</translation>
</message>
<message>
<location filename="../src/webview/webview.cpp" line="584"/>

22
translations/homepage/en_US.php
View File

@ -21,18 +21,18 @@ $older_versions = "Changelog";
$older_versions_text = "You ever wanted to know what happened from that version to this? <br/>You can find everything in <a>changelog</a> at github!";
$older_versions_button = "Changelog";
$reportbug = "Report Issue";
$reportbug_text = "Did you found some bug or you only have a suggestion how to <a>improve</a> QupZilla?<br/>
$reportbug_text = "Did you find a bug or you only have a suggestion how to <a>improve</a> QupZilla?<br/>
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 <a>fast</a>
$technology_text = "QupZilla is modern web browser based on WebKit core and Qt Framework. WebKit guarantees <a>fast</a>
browsing and Qt availability on all major platforms.";
$technology_button = "WebKit &amp; 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.";
$looknfeel_text = "QupZilla is using native widgets style on major Linux Desktop Environments. It is also using icons from the active desktop icon theme. If you find native themes 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!<br/>
With integrated rss reader, you can stay up to date with your favourite sites. QupZilla can also import bookmarks from other browsers.";
With the 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.";
$speeddial_header = "Speed Dial";
@ -44,12 +44,12 @@ $feed_loading = "Loading...";
$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";
$windows_text = "32bit and 64bit Windows installers can be downloaded by clicking on links below";
$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";
$tarballs_text = "32bit and 64bit precompiled tarballs";
$can_be_downloaded = "can be downloaded by clicking on links bellow";
$can_be_downloaded = "can be downloaded by clicking on links below";
$source_text = "You can get source code by cloning repository (if you have git installed)";
$source_text2 = "You can also view it online and download it in zip archive";
$view_source = "view source on github.com";
@ -57,14 +57,14 @@ $download_snapshot = "download current snapshot";
// 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!";
$contribute_text = "QupZilla is an 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.";
$getting_source_text2 = "and then you can start hacking. You can 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 <a href='https://github.com/nowrep/QupZilla/wiki/Translating'>here</a> [wiki at github]";
$translating_text = "Another way how to contribute is to add or improve current translations. 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 information about translating <a href='https://github.com/nowrep/QupZilla/wiki/Translating'>here</a> [wiki at github]";
$share_with_friends = "Share with Friends!";
$share_with_friends_text = "Do you like QupZilla? Then share it amongst your friends!"
?>