Hello community, here is the log from the commit of package pumpa for openSUSE:Factory checked in at 2017-06-15 11:18:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pumpa (Old) and /work/SRC/openSUSE:Factory/.pumpa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pumpa" Thu Jun 15 11:18:59 2017 rev:11 rq:494335 version:0.9.3 Changes: -------- --- /work/SRC/openSUSE:Factory/pumpa/pumpa.changes 2016-06-23 13:36:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pumpa.new/pumpa.changes 2017-06-15 11:19:00.428569077 +0200 @@ -1,0 +2,14 @@ +Wed May 10 15:05:13 UTC 2017 - [email protected] + +- Drop redundant mentions from description. + +------------------------------------------------------------------- +Tue May 9 16:45:47 UTC 2017 - [email protected] + +- Update to version 0.9.3: + * Change from SpellCheckUnderline to WaveUnderline. + * Fix a bug related to libtidy version compatibility (deb#834031). + * Add an option to set font_size manually in pumpa.conf. + * Update German translation. + +------------------------------------------------------------------- Old: ---- pumpa-0.9.2.tar.xz pumpa-0.9.2.tar.xz.sign New: ---- pumpa-0.9.3.tar.xz pumpa-0.9.3.tar.xz.sign ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pumpa.spec ++++++ --- /var/tmp/diff_new_pack.wXfdOk/_old 2017-06-15 11:19:01.092475283 +0200 +++ /var/tmp/diff_new_pack.wXfdOk/_new 2017-06-15 11:19:01.092475283 +0200 @@ -1,7 +1,7 @@ # # spec file for package pumpa # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,14 @@ Name: pumpa -Version: 0.9.2 +Version: 0.9.3 Release: 0 -Summary: A simple pump.io client written in C++/Qt +Summary: A pump.io client written in C++/Qt License: GPL-3.0+ Group: System/GUI/Other Url: https://pumpa.branchable.com/ -Source: https://saz.im/software/downloads/%{name}/%{name}-%{version}.tar.xz -Source1: https://saz.im/software/downloads/%{name}/%{name}-%{version}.tar.xz.sign +Source: https://sjoberg.fi/software/downloads/%{name}/%{name}-%{version}.tar.xz +Source1: https://sjoberg.fi/software/downloads/%{name}/%{name}-%{version}.tar.xz.sign Source2: %{name}.keyring BuildRequires: aspell-devel BuildRequires: gcc-c++ @@ -39,18 +39,17 @@ BuildRequires: pkgconfig(Qt5Widgets) %description -Pumpa is a simple pump.io client written in C++ and Qt -and licensed under the GNU GPL 3.0 (or later). +Pumpa is a pump.io client written in C++ and Qt. %prep %setup -q %build %qmake5 \ - QMAKE_CXXFLAGS='%{optflags}' \ - QMAKE_CFLAGS='%{optflags}' \ + QMAKE_CXXFLAGS="%{optflags}" \ + QMAKE_CFLAGS="%{optflags}" \ PREFIX=%{_prefix} -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install %qmake5_install ++++++ pumpa-0.9.2.tar.xz -> pumpa-0.9.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pumpa-0.9.2/debian/changelog new/pumpa-0.9.3/debian/changelog --- old/pumpa-0.9.2/debian/changelog 2016-01-31 20:08:02.000000000 +0100 +++ new/pumpa-0.9.3/debian/changelog 2016-11-05 14:52:04.000000000 +0100 @@ -1,3 +1,11 @@ +pumpa (0.9.3-1) unstable; urgency=medium + + * Fixed bug related to libtidy version compatibility. (Closes: #834031) + * Added option to set font_size manually in pumpa.conf. + * Updated German translation. + + -- Mats Sjöberg <[email protected]> Sat, 05 Nov 2016 06:52:57 +0200 + pumpa (0.9.2-1) unstable; urgency=low * New feature: user profile and avatar image editing. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pumpa-0.9.2/debian/control new/pumpa-0.9.3/debian/control --- old/pumpa-0.9.2/debian/control 2016-01-31 20:08:02.000000000 +0100 +++ new/pumpa-0.9.3/debian/control 2016-11-05 14:52:04.000000000 +0100 @@ -7,7 +7,7 @@ qt5-qmake, libaspell-dev, libtidy-dev -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Homepage: https://pumpa.branchable.com/ Vcs-Git: git://pumpa.branchable.com/ Vcs-Browser: http://source.pumpa.branchable.com/?p=source.git;a=summary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pumpa-0.9.2/debian/menu new/pumpa-0.9.3/debian/menu --- old/pumpa-0.9.2/debian/menu 2016-01-31 20:08:02.000000000 +0100 +++ new/pumpa-0.9.3/debian/menu 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -?package(pumpa): \ - needs="X11" \ - section="Applications/Network/Communication" \ - title="Pumpa" \ - command="/usr/bin/pumpa" \ - icon="/usr/share/pixmaps/pumpa.xpm" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pumpa-0.9.2/packaging/TODO.release new/pumpa-0.9.3/packaging/TODO.release --- old/pumpa-0.9.2/packaging/TODO.release 1970-01-01 01:00:00.000000000 +0100 +++ new/pumpa-0.9.3/packaging/TODO.release 2016-11-05 14:52:04.000000000 +0100 @@ -0,0 +1,20 @@ +- Check translations! + lupdate pumpa.pro + lrelease pumpa.pro +- Update CLIENT_VERSION in src/pumpa_defines.h +- Run `dch` to update debian/changelog +- Recompile and test +- git commit +- test Qt4, clang +- Make debian package to test if it works: + cd packaging + mkdeb.sh 0.x.y +- Make possible changes to make lintian happy +- tag, e.g.: + git tag -s v0.x.y -m "Version v0.x.y." +- git push origin --tags +- Make real debian package and dput +- copy and sync pumpa-0.x.y.tar.xz to https://saz.im/software/downloads/pumpa/ +- Update front page and news: + https://pumpa.branchable.com/ + https://pumpa.branchable.com/news/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pumpa-0.9.2/packaging/mkdeb.sh new/pumpa-0.9.3/packaging/mkdeb.sh --- old/pumpa-0.9.2/packaging/mkdeb.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/pumpa-0.9.3/packaging/mkdeb.sh 2016-11-05 14:52:04.000000000 +0100 @@ -0,0 +1,46 @@ +#!/bin/bash +VERSION=$1 +if [ -z "$VERSION" ]; then + echo "Usage: $0 VERSION" + echo "e.g. $0 0.8.2" + exit 1 +fi + +OLD_FILES=$(find . -name "pumpa*$VERSION*") + +if [ ! -z "$OLD_FILES" ]; then + echo "Old files for that version exist, please clean them up first:" + echo $OLD_FILES + #exit 2 +fi + +DIR="pumpa-${VERSION}" + +# use this for real +#git clone -b v$VERSION git://pumpa.branchable.com/ pumpa + +# use this for testing +git clone .. pumpa + +mv pumpa ${DIR} +rm -rf ${DIR}/.git* +rm -rf ${DIR}/doc + +# make regular tarball +tar -cJf pumpa-${VERSION}.tar.xz ${DIR}/ + +# make debian tarball +rm -rf ${DIR}/win32 +tar czf pumpa_${VERSION}.orig.tar.gz ${DIR}/ + +cd ${DIR} +dpkg-buildpackage +cd .. + +echo "Running lintian ..." +lintian -i -I --show-overrides pumpa_${VERSION}-1_*.changes + +echo +echo "Read the output above carefully!" +echo "If all is OK you can run something like:" +echo "dput mentors pumpa_${VERSION}-1_amd64.changes" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pumpa-0.9.2/src/pumpa_defines.h new/pumpa-0.9.3/src/pumpa_defines.h --- old/pumpa-0.9.2/src/pumpa_defines.h 2016-01-31 20:08:02.000000000 +0100 +++ new/pumpa-0.9.3/src/pumpa_defines.h 2016-11-05 14:52:04.000000000 +0100 @@ -22,7 +22,7 @@ #define CLIENT_NAME "pumpa" #define CLIENT_FANCY_NAME "Pumpa" -#define CLIENT_VERSION "0.9.2" +#define CLIENT_VERSION "0.9.3" #define CLIENT_ICON ":/images/pumpa.png" #define WEBSITE_URL "https://pumpa.branchable.com/"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pumpa-0.9.2/src/pumpasettings.h new/pumpa-0.9.3/src/pumpasettings.h --- old/pumpa-0.9.2/src/pumpasettings.h 2016-01-31 20:08:02.000000000 +0100 +++ new/pumpa-0.9.3/src/pumpasettings.h 2016-11-05 14:52:04.000000000 +0100 @@ -128,6 +128,10 @@ return getValue("show_charcount", false).toBool(); } + int fontSize() const { + return getValue("font_size", -1).toInt(); + } + // setters void siteUrl(QString s) { setValue("site_url", s, "Account"); } void userName(QString s) { setValue("username", s, "Account"); } @@ -165,6 +169,8 @@ void showCharCount(bool b) { setValue("show_charcount", b); } + void fontSize(int i) { setValue("font_size", i); } + signals: void trayIconChanged(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pumpa-0.9.2/src/richtextlabel.cpp new/pumpa-0.9.3/src/richtextlabel.cpp --- old/pumpa-0.9.2/src/richtextlabel.cpp 2016-01-31 20:08:02.000000000 +0100 +++ new/pumpa-0.9.3/src/richtextlabel.cpp 2016-11-05 14:52:04.000000000 +0100 @@ -19,6 +19,10 @@ #include "richtextlabel.h" +#include "pumpasettings.h" + +#include <QFont> + //------------------------------------------------------------------------------ RichTextLabel::RichTextLabel(QWidget* parent, bool singleLine) : @@ -45,6 +49,13 @@ setFocusPolicy(Qt::ClickFocus); setCursor(Qt::IBeamCursor); + + int fontSize = PumpaSettings::getSettings()->fontSize(); + if (fontSize > 0) { + QFont f(font()); + f.setPointSize(fontSize); + setFont(f); + } } //------------------------------------------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pumpa-0.9.2/src/util.cpp new/pumpa-0.9.3/src/util.cpp --- old/pumpa-0.9.2/src/util.cpp 2016-01-31 20:08:02.000000000 +0100 +++ new/pumpa-0.9.3/src/util.cpp 2016-11-05 14:52:04.000000000 +0100 @@ -286,6 +286,8 @@ if (yearPos != -1) releaseDateStr = releaseDateStr.left(yearPos + 5); QDate releaseDate = QLocale::c().toDate(releaseDateStr, "d MMMM yyyy"); + if (releaseDate.isNull()) + releaseDate = QLocale::c().toDate(releaseDateStr, "yyyy/MM/dd"); QDate changeDate = QLocale::c().toDate("24 May 2007", "d MMMM yyyy"); bool isNewer = releaseDate > changeDate; Binary files old/pumpa-0.9.2/translations/pumpa_de.qm and new/pumpa-0.9.3/translations/pumpa_de.qm differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pumpa-0.9.2/translations/pumpa_de.ts new/pumpa-0.9.3/translations/pumpa_de.ts --- old/pumpa-0.9.2/translations/pumpa_de.ts 2016-01-31 20:08:02.000000000 +0100 +++ new/pumpa-0.9.3/translations/pumpa_de.ts 2016-11-05 14:52:04.000000000 +0100 @@ -11,7 +11,7 @@ <message> <location filename="../src/activitywidget.cpp" line="124"/> <source>To:</source> - <translation>an:</translation> + <translation>An:</translation> </message> <message> <location filename="../src/activitywidget.cpp" line="127"/> @@ -39,7 +39,7 @@ <message> <location filename="../src/actorwidget.cpp" line="140"/> <source>stop minimising posts</source> - <translation>Beiträge minimieren ausschalten</translation> + <translation>Beiträge nicht mehr minimieren</translation> </message> <message> <location filename="../src/actorwidget.cpp" line="141"/> @@ -65,42 +65,42 @@ <message> <location filename="../src/editprofiledialog.cpp" line="42"/> <source>&Change picture</source> - <translation type="unfinished">Bild &ändern</translation> + <translation>&Bild ändern</translation> </message> <message> <location filename="../src/editprofiledialog.cpp" line="49"/> <source>Real name</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Klarname</translation> </message> <message> <location filename="../src/editprofiledialog.cpp" line="55"/> <source>Hometown</source> - <translation type="unfinished"></translation> + <translation>Heimatstadt</translation> </message> <message> <location filename="../src/editprofiledialog.cpp" line="61"/> <source>Bio</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Bio</translation> </message> <message> <location filename="../src/editprofiledialog.cpp" line="138"/> <source>Select Image</source> - <translation type="unfinished">Bild auswählen</translation> + <translation>Bild auswählen</translation> </message> <message> <location filename="../src/editprofiledialog.cpp" line="139"/> <source>Image files (*.png *.jpg *.jpeg *.gif);;All files (*.*)</source> - <translation type="unfinished">Bilddatei (*.png *.jpg *.jpeg *.gif);;Alle Dateien (*.*)</translation> + <translation>Bilddateien (*.png *.jpg *.jpeg *.gif);;Alle Dateien (*.*)</translation> </message> <message> <location filename="../src/editprofiledialog.cpp" line="147"/> <source>Sorry!</source> - <translation type="unfinished">Entschuldigung!</translation> + <translation>Entschuldigung!</translation> </message> <message> <location filename="../src/editprofiledialog.cpp" line="148"/> <source>That file didn't appear to be an image.</source> - <translation type="unfinished">Die ausgewählte Datei scheint kein Bild zu sein.</translation> + <translation>Die ausgewählte Datei scheint kein Bild zu sein.</translation> </message> </context> <context> @@ -113,7 +113,7 @@ <message> <location filename="../src/filedownloader.cpp" line="298"/> <source>Network error: too many redirections!</source> - <translation type="unfinished"></translation> + <translation>Netzwerkfehler: Zu viele Weiterleitungen!</translation> </message> <message> <location filename="../src/filedownloader.cpp" line="320"/> @@ -123,7 +123,7 @@ <message> <location filename="../src/filedownloader.cpp" line="330"/> <source>Could not open file %1 for writing: </source> - <translation>Datei %1 konnte zum Schreiben nicht geöffnet werden: </translation> + <translation>Datei %1 konnte nicht zum Schreiben geöffnet werden: </translation> </message> </context> <context> @@ -146,7 +146,7 @@ <location filename="../src/fullobjectwidget.cpp" line="113"/> <source>comment</source> <comment>Button to comment on a post</comment> - <translation type="unfinished">kommentieren</translation> + <translation>kommentieren</translation> </message> <message> <location filename="../src/fullobjectwidget.cpp" line="313"/> @@ -161,12 +161,12 @@ <location filename="../src/fullobjectwidget.cpp" line="349"/> <source>at %1</source> <comment>location of person</comment> - <translation type="unfinished">@ %1</translation> + <translation type="unfinished">in %1</translation> </message> <message> <location filename="../src/fullobjectwidget.cpp" line="351"/> <source>Profile last updated %1</source> - <translation>letzte Profiländerung am %1</translation> + <translation type="unfinished">Profil zuletzt aktualisiert @ %1</translation> </message> <message> <location filename="../src/fullobjectwidget.cpp" line="359"/> @@ -182,12 +182,12 @@ <message> <location filename="../src/fullobjectwidget.cpp" line="386"/> <source>unlike</source> - <translation>unlike</translation> + <translation type="unfinished">defavorisieren</translation> </message> <message> <location filename="../src/fullobjectwidget.cpp" line="386"/> <source>like</source> - <translation>like</translation> + <translation type="unfinished">favorisieren</translation> </message> <message> <location filename="../src/fullobjectwidget.cpp" line="398"/> @@ -209,13 +209,13 @@ <location filename="../src/fullobjectwidget.cpp" line="547"/> <source>shared this.</source> <comment>Many persons shared</comment> - <translation type="unfinished">teilten das.</translation> + <translation>teilten das.</translation> </message> <message> <location filename="../src/fullobjectwidget.cpp" line="549"/> <source>shared this.</source> <comment>One person shared</comment> - <translation type="unfinished">teilten das.</translation> + <translation>teilte das.</translation> </message> <message> <location filename="../src/fullobjectwidget.cpp" line="629"/> @@ -226,7 +226,7 @@ <location filename="../src/fullobjectwidget.cpp" line="673"/> <source>post</source> <comment>Name of object type.</comment> - <translation type="unfinished">Beitrag</translation> + <translation>Beitrag</translation> </message> <message> <location filename="../src/fullobjectwidget.cpp" line="676"/> @@ -238,13 +238,13 @@ <location filename="../src/fullobjectwidget.cpp" line="678"/> <source>comment</source> <comment>Name of object type.</comment> - <translation type="unfinished">kommentieren</translation> + <translation>Kommentar</translation> </message> <message> <location filename="../src/fullobjectwidget.cpp" line="680"/> <source>image</source> <comment>Name of object type.</comment> - <translation type="unfinished">Bild</translation> + <translation>Bild</translation> </message> <message> <source>stop following %1</source> @@ -299,9 +299,9 @@ <message numerus="yes"> <location filename="../src/fullobjectwidget.cpp" line="552"/> <source>%Ln person(s) shared this.</source> - <translation> - <numerusform>von %Ln Person geteilt</numerusform> - <numerusform>von %Ln Personen geteilt</numerusform> + <translation type="unfinished"> + <numerusform>von %Ln Person geteilt.</numerusform> + <numerusform>von %Ln Personen geteilt.</numerusform> </translation> </message> <message> @@ -323,12 +323,12 @@ <message> <location filename="../src/fullobjectwidget.cpp" line="701"/> <source>Are you sure you want to delete this %1?</source> - <translation>Sind Sie sicher das sie %1 löschen wollen?</translation> + <translation>Sind Sie sicher, dass Sie %1 löschen wollen?</translation> </message> <message> <location filename="../src/fullobjectwidget.cpp" line="721"/> <source>Share this %1 by %2?</source> - <translation>%1 von %2 teilen?</translation> + <translation>Diese(n) %1 von %2 teilen?</translation> </message> <message> <source>Are you sure you want to stop following</source> @@ -366,7 +366,7 @@ <message> <location filename="../src/messagewindow.cpp" line="91"/> <source>To:</source> - <translation>To:</translation> + <translation>An:</translation> </message> <message> <location filename="../src/messagewindow.cpp" line="92"/> @@ -381,7 +381,7 @@ <message> <location filename="../src/messagewindow.cpp" line="106"/> <source>+ &To</source> - <translation>+ &To</translation> + <translation>+ &An</translation> </message> <message> <location filename="../src/messagewindow.cpp" line="109"/> @@ -446,7 +446,7 @@ <message> <location filename="../src/messagewindow.cpp" line="364"/> <source>&Update post</source> - <translation>Nachricht akt&ualisieren</translation> + <translation>Beitrag akt&ualisieren</translation> </message> <message> <location filename="../src/messagewindow.cpp" line="366"/> @@ -461,7 +461,7 @@ <message> <location filename="../src/messagewindow.cpp" line="518"/> <source>Characters: %1</source> - <translation type="unfinished"></translation> + <translation>Zeichen: %1</translation> </message> <message> <source>Cancel</source> @@ -478,7 +478,7 @@ <message> <location filename="../src/messagewindow.cpp" line="245"/> <source>Select recipient (To)</source> - <translation>Empfänger auswählen (To)</translation> + <translation>Empfänger auswählen (An)</translation> </message> <message> <location filename="../src/messagewindow.cpp" line="251"/> @@ -540,13 +540,13 @@ <message> <location filename="../src/oauthwizard.cpp" line="49"/> <source><p>In order to use pump.io you need to first register an account with a pump.io server. If you haven't done this yet you can do it now by trying out one of the existing public servers: <br /><a href="http://pump.io/tryit.html">http://pump.io/tryit.html</a>.</p><p>When you are done enter your new pump.io account id below in the form of <b>username@servername</b>.</p></source> - <translation><p>Um pump.io nutzen zu können, benötigen Sie einen Account auf einem pump.io-Server. Wenn Sie noch keinen Account besitzen, können Sie sich einfach an einem der öffentlichen pump.io-Server unter folgendem Link registrieren:</p> -<a href="http://pump.io/tryit.html">http://pump.io/tryit.html</a><p>Wenn Sie einen Account erstellt haben oder bereits ein pump.io-Konto besitzen, tragen Sie Ihre Account-ID in dem Format <b>benutzername@servername</b> in dem unten angezeigten Feld ein.</p></translation> + <translation><p>Um pump.io nutzen zu können, benötigen Sie ein Konto auf einem pump.io-Server. Wenn Sie noch kein Konto besitzen, können Sie sich jetzt einfach an einem der öffentlichen pump.io-Server unter folgendem Link registrieren:</p> +<a href="http://pump.io/tryit.html">http://pump.io/tryit.html</a><p>Wenn Sie ein Konto erstellt haben oder bereits ein pump.io-Konto besitzen, tragen Sie Ihre Konto-ID im Format <b>benutzername@servername</b> unten ein.</p></translation> </message> <message> <location filename="../src/oauthwizard.cpp" line="68"/> <source><b>Your pump.io account id:</b></source> - <translation><b>Ihre pump.io Account-ID:</b></translation> + <translation><b>Ihre pump.io-Konto-ID:</b></translation> </message> <message> <location filename="../src/oauthwizard.cpp" line="75"/> @@ -557,7 +557,7 @@ <location filename="../src/oauthwizard.cpp" line="85"/> <source>Next</source> <translatorcomment>"Back" ist leider nicht vorhanden. Daher macht es keinen Sinn nur Next mit Vor zu übersetzen</translatorcomment> - <translation></translation> + <translation type="unfinished">Weiter</translation> </message> </context> <context> @@ -570,7 +570,7 @@ <message> <location filename="../src/oauthwizard.cpp" line="135"/> <source>In order for Pumpa to be able to read and post new messages to your pump.io account you need to grant Pumpa access via the web page. Pumpa will open the web page for you - just follow the instructions and copy &amp; paste the <b>verifier</b> text string back into the field below. (The token should be automatically pre-filled.)</source> - <translation>Damit Pumpa neue Nachrichten lesen und verfassen kann, müssen Sie den Zugriff auf Ihren pump.io-Account gestatten. Pumpa wird dazu eine Webseite des pump.io-Servers aufrufen, deren Anweisungen Sie folgen. Um den Anmeldevorgang abzuschließen, kopieren Sie den <b>Verifier</b> in das obere Feld. (Der Token sollte von Pumpa automatisch ausgefüllt werden, sobald sich die Webseite öffenet)</translation> + <translation>Damit Pumpa neue Nachrichten lesen und veröffentlichen kann, müssen Sie den Zugriff auf Ihr pump.io-Konto gestatten. Pumpa wird dazu eine Webseite des pump.io-Servers aufrufen, deren Anweisungen Sie folgen. Um den Anmeldevorgang abzuschließen, kopieren Sie den <b>Verifier</b> in das Feld unten. (Der "Token" sollte von Pumpa automatisch eingetragen werden, sobald sich die Webseite öffnet.)</translation> </message> <message> <location filename="../src/oauthwizard.cpp" line="145"/> @@ -588,7 +588,7 @@ <message> <location filename="../src/oauthwizard.cpp" line="226"/> <source>Registering client ...</source> - <translation>Client regestrieren ...</translation> + <translation>Registriere Client ...</translation> </message> <message> <location filename="../src/oauthwizard.cpp" line="257"/> @@ -616,7 +616,7 @@ <message> <location filename="../src/objectwidget.cpp" line="178"/> <source>Re: </source> - <translation>Re: </translation> + <translation>Aw: </translation> </message> <message> <location filename="../src/objectwidget.cpp" line="179"/> @@ -629,40 +629,40 @@ <message> <location filename="../src/pumpapp.cpp" line="160"/> <source>&Inbox</source> - <translation>&Nachrichten</translation> + <translation type="unfinished">E&ingang</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="161"/> <source>&Mentions</source> - <translation>&Vorschläge</translation> + <translation>&Erwähnungen</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="162"/> <source>&Direct</source> - <translation>&Posteingang</translation> + <translation type="unfinished">&Direkt</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="163"/> <source>Mean&while</source> - <translation>N&euigkeiten</translation> + <translation type="unfinished">Inz&wischen</translation> </message> <message numerus="yes"> <location filename="../src/pumpapp.cpp" line="494"/> <source>You have %Ln new notification(s).</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> + <translation> + <numerusform>Sie haben %n neue Benachrichtigung.</numerusform> + <numerusform>Sie haben %n neue Benachrichtigungen.</numerusform> </translation> </message> <message> <location filename="../src/pumpapp.cpp" line="806"/> <source>Copyright &copy; 2013-2015 Mats Sj&ouml;berg</source> - <translation type="unfinished"></translation> + <translation>Copyright &copy; 2013-2015 Mats Sj&ouml;berg</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="1154"/> <source>Fi&rehose</source> - <translation>Fi&rehose</translation> + <translation type="unfinished">Fi&rehose</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="579"/> @@ -672,7 +672,7 @@ <message> <location filename="../src/pumpapp.cpp" line="638"/> <source>%1 &Window</source> - <translation>%1 Fenster</translation> + <translation>%1 &Fenster</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="638"/> @@ -687,17 +687,17 @@ <message> <location filename="../src/pumpapp.cpp" line="653"/> <source>E&xit</source> - <translation>E&xit</translation> + <translation type="unfinished">&Verlassen</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="654"/> <source>Ctrl+Q</source> - <translation>Strg+X</translation> + <translation>Strg+Q</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="657"/> <source>Preferences</source> - <translation>Eigenschaften</translation> + <translation>Einstellungen</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="660"/> @@ -707,7 +707,7 @@ <message> <location filename="../src/pumpapp.cpp" line="661"/> <source>Ctrl+R</source> - <translation>Strg+R</translation> + <translation type="unfinished">Strg+R</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="665"/> @@ -717,22 +717,22 @@ <message> <location filename="../src/pumpapp.cpp" line="666"/> <source>Ctrl+O</source> - <translation>Strg+L</translation> + <translation type="unfinished">Strg+L</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="669"/> <source>F&ollow an account</source> - <translation>Nutzer &folgen</translation> + <translation>Nutzer f&olgen</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="670"/> <source>Ctrl+L</source> - <translation>Strg+F</translation> + <translation type="unfinished">Strg+F</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="676"/> <source>&About</source> - <translation>Über</translation> + <translation>&Über</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="679"/> @@ -758,12 +758,12 @@ <location filename="../src/pumpapp.cpp" line="314"/> <location filename="../src/pumpapp.cpp" line="702"/> <source>Followers</source> - <translation>Followers</translation> + <translation type="unfinished">Verfolger</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="250"/> <source>SSL Error: </source> - <translation>SSL Fehler: </translation> + <translation>SSL-Fehler: </translation> </message> <message> <location filename="../src/pumpapp.cpp" line="253"/> @@ -777,7 +777,7 @@ <location filename="../src/pumpapp.cpp" line="261"/> <source>SSL Server certificate. </source> - <translation>SSL Server Zertifkat.</translation> + <translation>SSL-Server-Zertifkat.</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="262"/> @@ -792,17 +792,17 @@ <message> <location filename="../src/pumpapp.cpp" line="264"/> <source>Effective: </source> - <translation>Effektiv: </translation> + <translation type="unfinished">Wirksam: </translation> </message> <message> <location filename="../src/pumpapp.cpp" line="265"/> <source>Expires: </source> - <translation>Gültig bis: </translation> + <translation type="unfinished">Verfällt: </translation> </message> <message> <location filename="../src/pumpapp.cpp" line="266"/> <source>MD5 digest: </source> - <translation>MD5-Digest: </translation> + <translation>MD5-Hashwert: </translation> </message> <message> <location filename="../src/pumpapp.cpp" line="273"/> @@ -826,27 +826,27 @@ <message> <location filename="../src/pumpapp.cpp" line="506"/> <source>%1 wrote: </source> - <translation>%1 schreibt: </translation> + <translation>%1 schrieb: </translation> </message> <message> <location filename="../src/pumpapp.cpp" line="673"/> <source>Your &profile</source> - <translation type="unfinished"></translation> + <translation>Ihr &Profil</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="682"/> <source>Report &bug online</source> - <translation type="unfinished"></translation> + <translation>Programm&fehler online melden</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="694"/> <source>Close tab</source> - <translation type="unfinished"></translation> + <translation>Reiter schließen</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="695"/> <source>Ctrl+W</source> - <translation></translation> + <translation>Strg+W</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="699"/> @@ -856,7 +856,7 @@ <message> <location filename="../src/pumpapp.cpp" line="705"/> <source>Following</source> - <translation></translation> + <translation type="unfinished">Verfolgte</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="708"/> @@ -871,12 +871,12 @@ <message> <location filename="../src/pumpapp.cpp" line="723"/> <source>&Pumpa</source> - <translation></translation> + <translation>&Pumpa</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="736"/> <source>&Tabs</source> - <translation></translation> + <translation>&Reiter</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="745"/> @@ -886,12 +886,12 @@ <message> <location filename="../src/pumpapp.cpp" line="777"/> <source><p>Pumpa is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</p><p>Pumpa is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.</p><p>You should have received a copy of the GNU General Public License along with Pumpa. If not, see <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>.</p></source> - <translation type="unfinished"></translation> + <translation><p>Pumpa ist freie Software: Sie können es weiterverbreiten und/oder verändern unter den Bedingungen der 'GNU General Public License', wie sie von der 'Free Software Foundation' in Version 3 oder (nach ihrer Wahl) einer späteren Version veröffentlicht wurde.</p><p>Pumpa wird in der Hoffnung verbreitet, dass es nützlich sei, jedoch OHNE JEGLICHE GEWÄHRLEISTUNG; auch ohne eine inbegriffene MARKTGÄNGIKEIT oder EIGNUNG FÜR EINEN BESTIMMTEN ZWECK. Wenden Sie sich an die'GNU General Public License' für weitere Details.</p><p>Sie sollten eine Kopie der 'GNU General Public License' zusamment mit Pumpa erhalten haben. Andernfalls, schauen Sie auf <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>.</p></translation> </message> <message> <location filename="../src/pumpapp.cpp" line="790"/> <source><p>The <a href="https://github.com/kypeli/kQOAuth">kQOAuth library</a> is copyrighted by <a href="http://www.johanpaul.com/">Johan Paul</a> and licensed under LGPL 2.1.</p><p>The <a href="https://github.com/vmg/sundown">sundown Markdown library</a> is copyrighted by Natacha Port&eacute;, Vicent Marti and others, and <a href="https://github.com/vmg/sundown#license">permissively licensed</a>.</p><p>The Pumpa logo was <a href="http://opengameart.org/content/fruit-and-veggie-inventory">created by Joshua Taylor</a> for the <a href="http://lpc.opengameart.org/">Liberated Pixel Cup</a>.The logo is copyrighted by the artist and is dual licensed under the CC-BY-SA 3.0 license and the GNU GPL 3.0.</source> - <translation type="unfinished"></translation> + <translation><p>Die<a href="https://github.com/kypeli/kQOAuth">kQOAuth-Bibliothek</a> hat das Copyright von <a href="http://www.johanpaul.com/">Johan Paul</a> und ist unter LGPL 2.1 lizensiert.</p><p>Die <a href="https://github.com/vmg/sundown">sundown-Markdown-Bibliothek</a> hat das Copyright von Natacha Port&eacute;, Vicent Marti und anderen, und ist <a href="https://github.com/vmg/sundown#license">großzügig lizensiert</a>.</p><p>Das Pumpa-Logo wurde <a href="http://opengameart.org/content/fruit-and-veggie-inventory">von Joshua Taylor entworfen</a> für den <a href="http://lpc.opengameart.org/">Liberated-Pixel-Cup</a>.Das Logo hat das Copyright des Künstlers und ist dopppelt unter der CC-BY-SA 3.0-Lizenz und der GNU GPL 3.0 lizensiert.</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="809"/> @@ -911,7 +911,7 @@ <message> <location filename="../src/pumpapp.cpp" line="934"/> <source>Site not configured yet!</source> - <translation>Seite ist nicht konfiguriert!</translation> + <translation>Seite ist noch nicht konfiguriert!</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="984"/> @@ -926,12 +926,12 @@ <message> <location filename="../src/pumpapp.cpp" line="995"/> <source>Sorry, that doesn't even look like a webfinger ID!</source> - <translation>Entschuldigung, aber das sieht leider nicht nach einer Webfinger-ID aus!</translation> + <translation>Entschuldigung, aber das sieht leider nicht wie eine Webfinger-ID aus!</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="1000"/> <source>Sorry, you are already following that person!</source> - <translation>Entschuldigung! Sie folgen dieser Person bereits!</translation> + <translation>Entschuldigung, Sie folgen dieser Person bereits!</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="1098"/> @@ -946,27 +946,27 @@ <message> <location filename="../src/pumpapp.cpp" line="1130"/> <source>&Context</source> - <translation>Kontext</translation> + <translation>&Kontext</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="1163"/> <source>&Followers</source> - <translation></translation> + <translation>Ver&folger</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="1172"/> <source>F&ollowing</source> - <translation></translation> + <translation>F&olge</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="1181"/> <source>F&avorites</source> - <translation>F&avoriten</translation> + <translation>Fa&voriten</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="1190"/> <source>A&ctivities</source> - <translation>Aktivitäten</translation> + <translation>&Aktivitäten</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="1528"/> @@ -976,7 +976,7 @@ <message> <location filename="../src/pumpapp.cpp" line="1590"/> <source>Ready!</source> - <translation>Fertig!</translation> + <translation>Bereit!</translation> </message> <message> <location filename="../src/pumpapp.cpp" line="1608"/> @@ -1019,17 +1019,17 @@ <message> <location filename="../src/pumpasettingsdialog.cpp" line="40"/> <source>Change account</source> - <translation>Konto ändern</translation> + <translation>Konto wechseln</translation> </message> <message> <location filename="../src/pumpasettingsdialog.cpp" line="45"/> <source>Clicking "Change account" will run the authentication setup again for a new pump.io account. This will remove the current login credentials since Pumpa only supports one account at a time.</source> - <translation>Wenn sie auf "Konto ändern" klicken, wird der Authentifizierungsprozess neu gestartet. Alle Anmeldedaten zu Ihrem pump.io-Account werden vom System entfernt. Mit Pumpa kann zur Zeit nur ein Account zur selben Zeit genutzt werden.</translation> + <translation>Wenn sie auf "Konto wechseln" klicken, wird der Authentifizierungsprozess neu gestartet. Alle Anmeldedaten zu Ihrem pump.io-Konto werden vom System entfernt. Mit Pumpa können zur Zeit nicht mehrere Konten gleichzeitig genutzt werden.</translation> </message> <message> <location filename="../src/pumpasettingsdialog.cpp" line="56"/> <source>Interface</source> - <translation>Schnittstelle</translation> + <translation>Benutzeroberfläche</translation> </message> <message> <location filename="../src/pumpasettingsdialog.cpp" line="63"/> @@ -1044,12 +1044,12 @@ <message> <location filename="../src/pumpasettingsdialog.cpp" line="69"/> <source>Followers</source> - <translation></translation> + <translation type="unfinished">Verfolger</translation> </message> <message> <location filename="../src/pumpasettingsdialog.cpp" line="73"/> <source>Default "To":</source> - <translation>Standardempfänger für "To":</translation> + <translation>Standardempfänger für "An":</translation> </message> <message> <location filename="../src/pumpasettingsdialog.cpp" line="77"/> @@ -1064,7 +1064,7 @@ <message> <location filename="../src/pumpasettingsdialog.cpp" line="82"/> <source>Show message character count</source> - <translation type="unfinished"></translation> + <translation>Zeige Zeichenanzahl von Nachrichten an</translation> </message> <message> <location filename="../src/pumpasettingsdialog.cpp" line="88"/> @@ -1084,12 +1084,12 @@ <message> <location filename="../src/pumpasettingsdialog.cpp" line="94"/> <source>Direct or mention</source> - <translation>Direkt oder mit Vorschlägen</translation> + <translation>Direkt oder Erwähnung</translation> </message> <message> <location filename="../src/pumpasettingsdialog.cpp" line="95"/> <source>Direct, mention or inbox</source> - <translation>Direkt, mit Vorschlägen oder aus dem Posteingang</translation> + <translation>Direkt, Erwähnung oder aus dem Eingang</translation> </message> <message> <location filename="../src/pumpasettingsdialog.cpp" line="96"/>
