diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2010-05-25 11:16:32 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2010-05-25 11:16:32 +0200 |
commit | 29ee89dfb20af834efd4471ab8bcc953383ffe1f (patch) | |
tree | 32c37db075ee451bf8eeb31f7bf35f08795e9b42 /src/main.cpp | |
parent | Alternate F6 shortcut for open location action (diff) | |
parent | last minute string fixes (diff) | |
download | rekonq-29ee89dfb20af834efd4471ab8bcc953383ffe1f.tar.xz |
Merge commit 'refs/merge-requests/2276' of git://gitorious.org/rekonq/mainline into m2276
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/src/main.cpp b/src/main.cpp index 2697c741..acd65c39 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -66,54 +66,58 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) ""); about.addAuthor(ki18n("Lionel Chauvin"), - ki18n("Developer, Ideas, Mockups. And the icon."), + ki18n("Developer, Ideas, Mockups, rekonq Icon"), "megabigbug@yahoo.fr", ""); about.addAuthor(ki18n("Johannes Zellner"), - ki18n("Patches, suggestions, testing, bugfixing"), + ki18n("Patches, Suggestions, Testing, Bugfixing"), "webmaster@nebulon.de", ""); about.addAuthor(ki18n("Matthieu Gicquel"), - ki18n("Developer, Ideas, Tabloid improvements"), + ki18n("Developer, Ideas, New Tab Page improvements"), "matgic78@gmail.com", ""); about.addAuthor(ki18n("Ronny Scholz"), - ki18n("(Tons of ) patches, testing, bugfixing"), + ki18n("(Tons of) Patches, Testing, Bugfixing"), "ronny_scholz@web.de", ""); - about.addAuthor(ki18n("Rohan Garg"), - ki18n("Handbook, maintains a Kubuntu PPA with rekonq git packages"), - "rohan16garg@gmail.com", - ""); - about.addAuthor(ki18n("Yoann Laissus"), - ki18n("Developer, history & bookmarks improvements"), + ki18n("Developer, History & Bookmarks Improvements"), "yoann.laissus@gmail.com", ""); - - about.addAuthor(ki18n("Cedric Bellegarde"), + + about.addAuthor(ki18n("Cédric Bellegarde"), ki18n("Patched code quite everywhere :)"), "gnumdk@adishatz.1s.fr", ""); - + + about.addAuthor(ki18n("Nikhil Marathe"), + ki18n("Bugfixing, Support for Chrome extensions (not yet available)"), + "nsm.nikhil@gmail.com", + ""); + + about.addAuthor(ki18n("Rohan Garg"), + ki18n("Handbook, Maintains a Kubuntu PPA with rekonq git packages"), + "rohan16garg@gmail.com", + ""); + about.addAuthor(ki18n("Jonathan Raphael Joachim Kolberg"), - ki18n("Handbook, maintains a Kubuntu PPA with rekonq git packages"), + ki18n("Handbook, Maintains a Kubuntu PPA with rekonq git packages"), "bulldog98@freenet.de", ""); - // --------------- about credits ----------------------------- about.addCredit(ki18n("Lindsay Mathieson"), - ki18n("Provided patches & hints. Discovered bugs"), + ki18n("Provided Patches & Hints, Discovered Bugs"), "lindsay.mathieson@gmail.com", ""); about.addCredit(ki18n("Abdurrahman AVCI"), - ki18n("Provided patches & hints"), + ki18n("Provided Patches & Hints"), "abdurrahmanavci@gmail.com", ""); @@ -128,12 +132,12 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) ""); about.addCredit(ki18n("Ivan Čukić"), - ki18n("Patches, bugfixing and ideas"), + ki18n("Patches, Bugfixing and Ideas"), "ivan@fomentgroup.org", ""); about.addCredit(ki18n("Adrià Arrufat"), - ki18n("New tab loading animation"), + ki18n("New Tab Page loading animation"), "swiftscythe@gmail.com", ""); @@ -143,12 +147,12 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) ""); about.addCredit(ki18n("Dario Freddi"), - ki18n("Patches, hints, first KWallet support implementation"), + ki18n("Patches, Hints, First implementation of KWallet support"), "drf@kde.org", ""); about.addCredit(ki18n("Jon de Andrés Frías"), - ki18n("first awesome bar implementation"), + ki18n("First awesome bar implementation"), "jondeandres@gmail.com", ""); |