Lubuntu/liblxqt-packaging
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cherry-picking upstream version 0.9.0+20150930.

Browse Source 
Remove --list-missing from rules, it's included in --fail-missing
This commit is contained in:
Alf Gaida 2015-10-03 10:40:52 +02:00
parent 22f6f2f31f
commit 96efd10caf
6 changed files with 85 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
liblxqt (0.9.0+20150930-1) experimental; urgency=medium
* Cherry-picked upstream-version 0.9.0+20150930.
* Remove --list-missing from rules, it's included in --fail-missing
-- Alf Gaida <agaida@siduction.org> Sat, 03 Oct 2015 10:29:34 +0200
liblxqt (0.9.0+20150911-2) experimental; urgency=medium
* Bump version in symbols control file for LxQt to LXQT transition.

2
debian/rules vendored
View File

@ -8,4 +8,4 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
override_dh_install:
dh_install --list-missing --fail-missing
dh_install --fail-missing

69
lxqtscreensaver.cpp
View File

@ -62,47 +62,46 @@ void ScreenSaver::lockScreen()
void ScreenSaver::xdgProcess_finished(int err, QProcess::ExitStatus status)
{
QWidget *p = qobject_cast<QWidget*>(parent());
// http://portland.freedesktop.org/xdg-utils-1.1.0-rc1/scripts/xdg-screensaver
if (err == QProcess::NormalExit) // QProcess::NormalExit = 0
{
if (err == 0)
emit activated();
}
else if (err == 1)
{
QMessageBox::warning(p,
tr("Screen Saver Error"),
tr("An error occurred starting screensaver. "
"Syntax error in xdg-screensaver arguments.")
);
}
else if (err == 3)
{
QMessageBox::warning(p,
tr("Screen Saver Activation Error"),
tr("An error occurred starting screensaver. "
"Ensure you have xscreensaver installed and running.")
);
}
else if (err == 4)
{
QMessageBox::warning(p,
tr("Screen Saver Activation Error"),
tr("An error occurred starting screensaver. "
"Action 'activate' failed. "
"Ensure you have xscreensaver installed and running.")
);
}
else
{
QMessageBox::warning(p,
tr("Screen Saver Activation Error"),
tr("An error occurred starting screensaver. "
"Unknown error - undocumented return value from xdg-screensaver: %1.").arg(err)
);
QMessageBox *box = new QMessageBox;
box->setAttribute(Qt::WA_DeleteOnClose);
box->setIcon(QMessageBox::Warning);
if (err == 1)
{
box->setWindowTitle(tr("Screen Saver Error"));
box->setText(tr("An error occurred starting screensaver. "
"Syntax error in xdg-screensaver arguments."));
}
else if (err == 3)
{
box->setWindowTitle(tr("Screen Saver Activation Error"));
box->setText(tr("An error occurred starting screensaver. "
"Ensure you have xscreensaver installed and running."));
}
else if (err == 4)
{
box->setWindowTitle(tr("Screen Saver Activation Error"));
box->setText(tr("An error occurred starting screensaver. "
"Action 'activate' failed. "
"Ensure you have xscreensaver installed and running."));
}
else
{
box->setWindowTitle(tr("Screen Saver Activation Error"));
box->setText(tr("An error occurred starting screensaver. "
"Unknown error - undocumented return value from xdg-screensaver: %1.")
.arg(err));
}
box->exec();
}
emit done();
}

28
lxqttranslator.cpp
View File

@ -1,3 +1,31 @@
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXQt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
*
* Copyright: 2013 LXQt team
* Authors:
* Alexander Sokoloff <sokoloff.a@gmail.com>
Luís Pereira <luis.artur.pereira@gmail.com>
*
* This program or library is free software; you can redistribute it
* and/or modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library 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
* Lesser General Public License for more details.
* You should have received a copy of the GNU Lesser General
* Public License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*
* END_COMMON_COPYRIGHT_HEADER */
#include "lxqttranslator.h"
#include <QTranslator>
#include <QLocale>

8
translations/liblxqt_fr_FR.ts
View File

@ -115,7 +115,7 @@
<message>
<location filename="../lxqtpowermanager.cpp" line="173"/>
<source>Do you want to really restart your computer? All unsaved work will be lost...</source>
<translation>Voulez-vous vraiment redémarrer votre ordinateur? Tout travail non souvegardé sera perdu...</translation>
<translation>Voulez-vous vraiment redémarrer votre ordinateur? Tout travail non sauvegardé sera perdu...</translation>
</message>
<message>
<location filename="../lxqtpowermanager.cpp" line="182"/>
@ -125,7 +125,7 @@
<message>
<location filename="../lxqtpowermanager.cpp" line="183"/>
<source>Do you want to really switch off your computer? All unsaved work will be lost...</source>
<translation>Voulez-vous vraiment éteindre votre ordinateur? Tout travail non souvegardé sera perdu...</translation>
<translation>Voulez-vous vraiment éteindre votre ordinateur? Tout travail non sauvegardé sera perdu...</translation>
</message>
<message>
<location filename="../lxqtpowermanager.cpp" line="192"/>
@ -135,7 +135,7 @@
<message>
<location filename="../lxqtpowermanager.cpp" line="193"/>
<source>Do you want to really logout? All unsaved work will be lost...</source>
<translation>Voulez-vous vraiment vous déconnecter? Tout travail non souvegardé sera perdu...</translation>
<translation>Voulez-vous vraiment vous déconnecter? Tout travail non sauvegardé sera perdu...</translation>
</message>
<message>
<location filename="../lxqtpowermanager.cpp" line="201"/>
@ -159,7 +159,7 @@
<message>
<location filename="../lxqtscreensaver.cpp" line="51"/>
<source>Lock Screen</source>
<translation>Vérouiller l&apos;écran</translation>
<translation>Verrouiller l&apos;écran</translation>
</message>
<message>
<location filename="../lxqtscreensaver.cpp" line="70"/>

22
translations/liblxqt_it_IT.ts → translations/liblxqt_it.ts
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="it_IT">
<TS version="2.1" language="it">
<context>
<name>AddPluginDialog</name>
<message>
@ -134,12 +134,12 @@
<message>
<location filename="../lxqtpowermanager.cpp" line="70"/>
<source>LXQt Power Manager Error</source>
<translation type="unfinished">Errore del gestore energetico di LXQt</translation>
<translation>Errore del gestore energetico di LXQt</translation>
</message>
<message>
<location filename="../lxqtpowermanager.cpp" line="70"/>
<source>Hibernate failed.</source>
<translation type="unfinished">L&apos;ibernazione non è riuscita.</translation>
<translation>L&apos;ibernazione non è riuscita.</translation>
</message>
</context>
<context>
@ -185,7 +185,7 @@
<message>
<location filename="../lxqtpowermanager.cpp" line="153"/>
<source>Do you want to really suspend your computer?&lt;p&gt;Suspends the computer into a low power state. System state is not preserved if the power is lost.</source>
<translation>Vuoi davvero sospendere il computer?&lt;p&gt;Sospendi il computer in uno stato a minore consumo energetico. Lo stato del sistema non viene preservato se la batteria si esaurisce o il pc non è collegato all&apos;alimentazione.</translation>
<translation>Sospendere il computer?&lt;p&gt;Sospendi il computer in uno stato a minore consumo energetico. Lo stato del sistema non viene preservato se la batteria si esaurisce o il pc non è collegato all&apos;alimentazione.</translation>
</message>
<message>
<location filename="../lxqtpowermanager.cpp" line="162"/>
@ -195,7 +195,7 @@
<message>
<location filename="../lxqtpowermanager.cpp" line="163"/>
<source>Do you want to really hibernate your computer?&lt;p&gt;Hibernates the computer into a low power state. System state is preserved if the power is lost.</source>
<translation>Vuoi davvero ibernare il computer?&lt;p&gt;Iberna il computer in uno stato a minore consumo energetico. Lo stato del sistema non viene preservato se la batteria si esaurisce o il pc non è collegato all&apos;alimentazione.</translation>
<translation>Ibernare il computer?&lt;p&gt;Iberna il computer in uno stato a minore consumo energetico. Lo stato del sistema viene preservato se la batteria si esaurisce o il pc non è collegato all&apos;alimentazione.</translation>
</message>
<message>
<location filename="../lxqtpowermanager.cpp" line="172"/>
@ -205,17 +205,17 @@
<message>
<location filename="../lxqtpowermanager.cpp" line="173"/>
<source>Do you want to really restart your computer? All unsaved work will be lost...</source>
<translation>Vuoi davvero riavviare il computer? Tutto il lavoro non salvato verrà perso...</translation>
<translation>Riavviare il computer? Tutto il lavoro non salvato verrà perso.</translation>
</message>
<message>
<location filename="../lxqtpowermanager.cpp" line="182"/>
<source>LXQt Session Shutdown</source>
<translation>Spegni la sessione di LXQt</translation>
<translation>Uscire dalla sessione di LXQt</translation>
</message>
<message>
<location filename="../lxqtpowermanager.cpp" line="183"/>
<source>Do you want to really switch off your computer? All unsaved work will be lost...</source>
<translation>Vuoi davvero spegnere il computer? Tutto il lavoro non salvato verrà perso...</translation>
<translation>Spegnere il computer? Tutto il lavoro non salvato verrà perso.</translation>
</message>
<message>
<location filename="../lxqtpowermanager.cpp" line="192"/>
@ -225,7 +225,7 @@
<message>
<location filename="../lxqtpowermanager.cpp" line="193"/>
<source>Do you want to really logout? All unsaved work will be lost...</source>
<translation>Vuoi davvero chiudere la sessione? Tutto il lavoro non salvato verrà perso...</translation>
<translation>Chiudere la sessione? Tutto il lavoro non salvato verrà perso...</translation>
</message>
<message>
<location filename="../lxqtpowermanager.cpp" line="201"/>
@ -270,12 +270,12 @@
<message>
<location filename="../lxqtscreensaver.cpp" line="79"/>
<source>An error occurred starting screensaver. xdg-screensaver is not installed correctly.</source>
<translation>È avvenuto un errore durante l&apos;avvio del salvaschermo. xda-screensaver non è installato correttamente.</translation>
<translation>È avvenuto un errore durante l&apos;avvio del salvaschermo. xdg-screensaver non è installato correttamente.</translation>
</message>
<message>
<location filename="../lxqtscreensaver.cpp" line="87"/>
<source>An error occurred starting screensaver. xdg-screensaver cannot be started.</source>
<translation>È avvenuto un errore durante l&apos;avvio del salvaschermo. xda-screensaver non può essere avviato.</translation>
<translation>È avvenuto un errore durante l&apos;avvio del salvaschermo. xdg-screensaver non può essere avviato.</translation>
</message>
<message>
<location filename="../lxqtscreensaver.cpp" line="99"/>