From ae43dbc91013f7a9a1f37ff66ad43a279d267b62 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sun, 23 Aug 2015 22:10:11 +0200 Subject: [PATCH 01/11] removed breaks/replaces --- debian/changelog | 6 ++++++ debian/control | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index df541df..fb25ed5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lxqt-admin (0.9.0+20150807-2) UNRELEASED; urgency=medium + + * removed breaks/replaces + + -- Alf Gaida Sun, 23 Aug 2015 22:09:20 +0200 + lxqt-admin (0.9.0+20150807-1) unstable; urgency=medium [ Alf Gaida ] diff --git a/debian/control b/debian/control index 1511235..f197c8e 100644 --- a/debian/control +++ b/debian/control @@ -25,8 +25,6 @@ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/lxqt-admin.git Package: lxqt-admin Architecture: any -Breaks: lxqt-admin-qt5 (<< 0.9.0) -Replaces: lxqt-admin-qt5 (<< 0.9.0) Depends: ${misc:Depends}, ${shlibs:Depends}, @@ -41,8 +39,6 @@ Package: lxqt-admin-dbg Architecture: any Section: debug Priority: extra -Breaks: lxqt-admin-qt5-dbg (<< 0.9.0) -Replaces: lxqt-admin-qt5-dbg (<< 0.9.0) Depends: ${misc:Depends}, lxqt-admin (= ${binary:Version}), From eaa20772fd12305cf07884fb3f90608275a93a00 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Wed, 2 Sep 2015 00:28:59 +0200 Subject: [PATCH 02/11] Some debian $foo Removed breaks and replaces cme fix dpkg-control --- debian/changelog | 7 ++++--- debian/control | 54 ++++++++++++++++++++++-------------------------- 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/debian/changelog b/debian/changelog index fb25ed5..ea4cebe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -lxqt-admin (0.9.0+20150807-2) UNRELEASED; urgency=medium +lxqt-admin (0.9.0+20150807-2) unstable; urgency=medium - * removed breaks/replaces + * Removed breaks/replaces + * cme fix dpkg-control - -- Alf Gaida Sun, 23 Aug 2015 22:09:20 +0200 + -- Alf Gaida Wed, 02 Sep 2015 00:28:48 +0200 lxqt-admin (0.9.0+20150807-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index f197c8e..2506fcc 100644 --- a/debian/control +++ b/debian/control @@ -1,37 +1,34 @@ Source: lxqt-admin +Maintainer: LXQt Packaging Team +Uploaders: Alf Gaida , + ChangZhuo Chen (陳昌倬) , + Andrew Lee (李健秋) Section: x11 Priority: optional -Maintainer: LXQt Packaging Team -Uploaders: - Alf Gaida , - ChangZhuo Chen (陳昌倬) , - Andrew Lee (李健秋) -Build-Depends: - cmake (>= 3.0.2), - debhelper (>= 9), - liboobs-1-dev, - libkf5windowsystem-dev (>= 5.9), - liblxqt0-dev (>= 0.9.0), - libqt5x11extras5-dev (>= 5.3), - libqt5xdg-dev (>= 1.2.0), - libx11-dev, - pkg-config, - qttools5-dev (>= 5.3), - qttools5-dev-tools (>= 5.3), +Build-Depends: debhelper (>= 9), + cmake (>= 3.0.2), + liboobs-1-dev, + libkf5windowsystem-dev, + liblxqt0-dev, + libqt5x11extras5-dev, + libqt5xdg-dev, + libx11-dev, + pkg-config, + qttools5-dev, + qttools5-dev-tools Standards-Version: 3.9.6 -Homepage: https://github.com/lxde/lxqt-admin -Vcs-Git: git://anonscm.debian.org/pkg-lxqt/lxqt-admin.git Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/lxqt-admin.git +Vcs-Git: git://anonscm.debian.org/pkg-lxqt/lxqt-admin.git +Homepage: https://github.com/lxde/lxqt-admin Package: lxqt-admin Architecture: any -Depends: - ${misc:Depends}, - ${shlibs:Depends}, +Depends: ${misc:Depends}, + ${shlibs:Depends} Description: Admin tools for LXQt Admin tools for LXQt, as of now: - * lxqt-admin-time - * lxqt-admin-user + * lxqt-admin-time + * lxqt-admin-user . This package contain the LXQt Admin Tools. @@ -39,12 +36,11 @@ Package: lxqt-admin-dbg Architecture: any Section: debug Priority: extra -Depends: - ${misc:Depends}, - lxqt-admin (= ${binary:Version}), +Depends: ${misc:Depends}, + lxqt-admin (= ${binary:Version}) Description: Admin tools for LXQt (debug) Admin tools for LXQt, as of now: - * lxqt-admin-time - * lxqt-admin-user + * lxqt-admin-time + * lxqt-admin-user . This package provides the debugging symbols. From 805ba7ebc417f5e8190c99058a226fe0588c261a Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Wed, 2 Sep 2015 00:33:30 +0200 Subject: [PATCH 03/11] Use signing key with watch-file Added upstream signing key and use it in watch file tar-ignore lxqt-admin.kdev4 --- debian/changelog | 4 ++- debian/source/options | 1 + debian/upstream/signing-key.asc | 63 +++++++++++++++++++++++++++++++++ debian/watch | 3 +- 4 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 debian/upstream/signing-key.asc diff --git a/debian/changelog b/debian/changelog index ea4cebe..18671a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ lxqt-admin (0.9.0+20150807-2) unstable; urgency=medium * Removed breaks/replaces * cme fix dpkg-control + * Added upstream signing key and use it in watch file + * tar-ingore lxqt-admin.kdev4 - -- Alf Gaida Wed, 02 Sep 2015 00:28:48 +0200 + -- Alf Gaida Wed, 02 Sep 2015 00:33:20 +0200 lxqt-admin (0.9.0+20150807-1) unstable; urgency=medium diff --git a/debian/source/options b/debian/source/options index 112dfc8..5234f79 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1 +1,2 @@ tar-ignore=.gitignore +tar-ignore=lxqt-admin.kdev4 diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc new file mode 100644 index 0000000..05cd1df --- /dev/null +++ b/debian/upstream/signing-key.asc @@ -0,0 +1,63 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.22 (GNU/Linux) + +mQINBFJevCYBEACx+Hvy+Vsuf+V5jeLUnzjAmHoy8DfTeGWr3ts30IapLHrfi0+U +WpzNnISO77yTr4VNboVZH+GHM/rnPfieODfB4ZW6CZLlInMSKUXcgQsEqXpyBZhA +Ib/SPy2bOfHly1uRJes0uRDsH5+v/hD74sByfnjQlrvI68O6wvGZmDFMNNPVO8+/ +OWBSBNkBuVrrZOMSPsLwQGJ4UtUQ4whburaPJG4VZJc5DLbzJGbEuACc0IAEYJS3 +7AfXVXn4j4Gc9F3o1xTUnbOBnwGPquWwUIm3FM7Ec2OdkvMt3EwvnkMAfeVrq3iE +FDD/KZTxdL0BZH3QD8gB7Jm4v4f3Nkobg6JCvCbcH3wBdZW4mASbwWzfRaDC2zHb +ErTglD7PpShLKZZ0pr9okWZEGw4Ku3q8ALi1JXK/ePTmsBlvkVskOJ3Nnd0avgH4 ++Q/vZoKfH8EhNY745rI+8CE9iv6V9XiSUt4CKEWAENt4A8hq6U2vV+jZv3B6AgD7 +ZjiI59yD4YuYubu8rCnNizTgh1voVw3ietknn/x2H5yH8fByWZ5uL87C0ky/uma6 +ZGbiiAtM4kdkyDMrfRV5nlEG9EKAGPVu5mjeSCrfkETwZ9OFPz1AuDye4ZEXrrcC +iRQ7RX6/GtW18aHER0kzGnfwx5KJzkDrRBY8A2PdXLBcrsN4WpK9EX01PQARAQAB +tCNKZXJvbWUgTGVjbGFuY2hlIDxqZXJvbWVAbGVjbGFuLmNoPokCPwQTAQIAKQUC +Ul68JgIbAwUJAeEzgAcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEDfgrx/a +SPNzSHIP/1ewXcC0TFBcvDD7MrIP7anyNfiWfW7cxkR8GSamkg6HTa6Ndyr1FFjJ +OoDFUP37jWhu59CsHxs2D0zRWJktezfvElscRgqbHcdpIznqsGdI8hXCZafhBGVb +sdAB2LRawcXGxnXt7XajPcSVwLWRE62caBqohznU2iWvI780WNjEbZoA0LhZwaFF +UUPJm8ea9v0IkZVKUyg9WONZ1U7FEG9SaEiSpI8kJdx1fvCwZVDV/NRO5GqnJaho +P1LCne4YdwS6pt1/fRgk32IHxxZfHlLzLHxb6v1JmIg72x28qCmGyK9oFBDbbnYu +6Aq8XbHogOrD5vJM2Pfm2IhV0+JHOjfQbddv8tsAH1M+LI+tToXmg5st1AU3wnTn +pda3hjA1avKwkfBPW/osHc8782ViyS9iX2e9iDtMv608guij4NjpGExzGCypHOd8 ++VXRwJDjvgDynkL206MZ+wn0j5wHsIE8F3Y5Bp1thQOrdDli5MYNQoXhjFmH46XT +bcr84IgW0+AiXZdoFUqvwtzrWy2Onuw5R3k4OyV4skN4DkWXyAk/V+Y4K39JvTKf +H9YuiQ9blNzCu8WiAnjKnh9kNl9E/TyEwI6cHFmIPqF8ST9tJytWHtrKvU9csvXX +n8XNJmpcv2R1e6N+VuWWm5zUPTouv3AxCacLbm8Lh3ymGsk7ZEyhiQIcBBABAgAG +BQJSsFYyAAoJEBMY76xfu9vO6v0P/3wSj3/kE4nP4HfgcVJSzi+lm1ycpbLDZtgh +P1G+zJLVmA+E41vEZimeiYQxBAelatJz+CHzQo3LZ2oVChzVrZcVHn9k4P3pib69 +qCVif3/y0Wmecn+u2TWbOvJ7mthfO7T3W7rkW1/9ES7bUaXcXWQ2sjUBVqFkFsVt +xgJDo8wcxA+K4Yf06GCbxFwrB7X5GraWIkzqGnyse3XAQn8aORAXmE8Yd0FHOjEZ +Beb9shChnkYc3lEvNY8ioCaYSF9xr/Iz9cwpfPkpqFiVYWadtb+Gqeh6zC7vPmcT +zHxrgkq1WwQlSBm724tPt9xuGQoOglqEa23vlQZfv20nyrYjLeYUy6pMCRq7vn/n +nkQOcXF7yQlnqR6xKk0tWsM4e6du0ZvbjBbhHV/kBFVGCLm/upTwoMVm0WJTbr4T +5XfIZo7eA0lvGtUhe1PgcOidBikHfAIfYxu0BoMXoL4jbcQdR5+YBDEfsS0jPhCl +mew2ScW/R/UhUknJUVFTma0KHXzEmKiqeeUCDtwEi6fxdicAYkbcekgkfFiD/w8N +Lk3Uf+0x2MdKA36nUobFkk38oU+GW37kFWJs3f1YRuQFao896eNW/E8ekVMLNxOl +nCjnSbabaxDnxPTyW2KlNjf/QUEK4pT6S5QmuCSrle3PQpaSbAZDHzLBIL9gd3m6 +MH7+SvV4uQINBFJevCYBEADiXDUqstSdhIyuionS2KtE3IeEBIqS7GY8QPRBylIZ +ACVHFI/1HxChBqYVGFaDEQn3gj5lUUQPubfWaxzjF6+UNVQW4+cxmTocndAwfDbI ++E5BLdieFUzbAA05MV5ZjPhTNbSk1jpy4bNy0FILwNqc89Y6SoCbv1r3tZLCrBas +1+AfWknBynx0siGMbLFxtzR6hUkNz9URxt13FrzpUWMpAL8ZQGczOTSaWLrZA5l9 +xLzJ9ww8uM+C2Xej3/sANxi+kQE2GVMKurPS0TICwVWZxbdW/ytIkO67Rhse0q3t +vzjdawfCFRxv7XQB2ZJ6irDxbpHiJoojSWCHJadIyCG03iOiaqsSVvi4KnxtUck+ +udOEJUV5sxdzgeRrsDpeaN//KCWW9WjfsSkvOqP6S1gmWpNFdzF5XrzcgvqvSNqo +XejfakUTJqsIIEHO0zGuJFVzJNh2hQ/9dhjIspUORhtNKaljNvePiBrj2yqmd9PY +FlH1KMHe4H+YVIwPiyeNA87Pu+1yNo8gT7mXhGRfibgWjbt146WUJ7+l2StJMApn +eNSCartNaUNPnw96i2l5c9AsJ3SWC6XWpWzOLVj+9XceeA11lu/ogqEMHzx81NjH +2TePxwKTKxZnAvDmqryp++IgY2/OgIoIk3ZRdYu/dPijTOYWfCet/9/9kAFr9PeJ +KwARAQABiQIlBBgBAgAPBQJSXrwmAhsMBQkB4TOAAAoJEDfgrx/aSPNzJv0QAKkx +lCKEZ6ahAUuNWslsHnNWaHFHNawEO3NIEtQZGVFk2BYISupizvjZF6MnymO/9UFM +pzV6fp3xNdqaKWQBjScOgMgCASRixW2tMAKbJGHZKp3dBixpHgXxy2oOGMS+mQ5m +gWy07usq2YesoMD0K/SG6EnoRPHBvrJihArzMFVUY9hD3hk8bhiy8w9bCYFe+gkm +zpQl3/KN01kyt5LjzEBcIOw8qIBQe9Pk8PyOK75lPoNME714LatgOsyw2kaSQ9Sv +hziRGC5z/fV3PmH7XhSjENPKnCJU51GUMMLaL28t9o7Afh6Q8UV31/JO36vmQXQV ++b+0BoGqEmf3AKBASb2Cr2q4pZFjywwSUXHZ9hQyu1tpbE1dS6aI01kM0y270pk7 +W/ajuzuOxAVL1bJAanL/5+DWM03esZPVdEWhxpWEM40Z6Rhq+Xb2a5xfwCN9PmaQ +o9fez0I+yh53s7Ypv0tBj05FPe5L48+pDi6pz5nddN1B0FzF58jVfsBZUjBlY24+ +VwQeAaWkRXZrSEdtBS5ufsi80x/cNCSTJBWqtborKL1iGgf5MDPYRMSvmZXAeIld +pyL/0pbW7iokewyKzpFfo7KEbwLxB+flWaBZ867JpF4yyRj3b4qcvcyV8QnsoB7Z +KhxTl3gGwD/t0HUcu85zcfs4GkealYhIWfGaAso2 +=fF8P +-----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch index fe48fa6..4b09067 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ version=3 -https://github.com/lxde/lxqt-admin/releases .*/([\d\.]+).tar.gz +opts="pgpsigurlmangle=s/$/.asc/" \ + https://github.com/lxde/lxqt-admin/releases .*/([\d\.]+).tar.gz From ff0ff1dec92b7082eeb2e3de0693f4387d9d78c0 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Wed, 2 Sep 2015 00:41:29 +0200 Subject: [PATCH 04/11] Chrerry-pick upstream version 0.9.0+20150830. --- .gitignore | 1 - lxqt-admin-time/datetime.ui | 20 +- lxqt-admin-time/main.cpp | 2 +- lxqt-admin-time/timeadmindialog.cpp | 2 +- lxqt-admin-time/timeadmindialog.h | 2 +- lxqt-admin-time/timezone.ui | 16 -- .../translations/lxqt-admin-time.ts | 36 +-- .../translations/lxqt-admin-time_de.desktop | 4 + .../translations/lxqt-admin-time_de.ts | 79 ++++++ .../translations/lxqt-admin-time_el.desktop | 3 + .../translations/lxqt-admin-time_el.ts | 78 ++++++ lxqt-admin-user/main.cpp | 2 +- .../translations/lxqt-admin-user_de.desktop | 4 + .../translations/lxqt-admin-user_de.ts | 263 ++++++++++++++++++ .../translations/lxqt-admin-user_el.desktop | 3 + .../translations/lxqt-admin-user_el.ts | 263 ++++++++++++++++++ 16 files changed, 711 insertions(+), 67 deletions(-) delete mode 100644 .gitignore create mode 100644 lxqt-admin-time/translations/lxqt-admin-time_de.desktop create mode 100644 lxqt-admin-time/translations/lxqt-admin-time_de.ts create mode 100644 lxqt-admin-time/translations/lxqt-admin-time_el.desktop create mode 100644 lxqt-admin-time/translations/lxqt-admin-time_el.ts create mode 100644 lxqt-admin-user/translations/lxqt-admin-user_de.desktop create mode 100644 lxqt-admin-user/translations/lxqt-admin-user_de.ts create mode 100644 lxqt-admin-user/translations/lxqt-admin-user_el.desktop create mode 100644 lxqt-admin-user/translations/lxqt-admin-user_el.ts diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 378eac2..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/lxqt-admin-time/datetime.ui b/lxqt-admin-time/datetime.ui index 278023e..781d761 100644 --- a/lxqt-admin-time/datetime.ui +++ b/lxqt-admin-time/datetime.ui @@ -12,27 +12,11 @@ - 0 - 0 + 50 + 50 - - Form - - - - - - 75 - true - - - - Time and date setup - - - diff --git a/lxqt-admin-time/main.cpp b/lxqt-admin-time/main.cpp index 28ca84f..b457249 100644 --- a/lxqt-admin-time/main.cpp +++ b/lxqt-admin-time/main.cpp @@ -30,7 +30,7 @@ int main(int argc, char **argv) { - LxQt::SingleApplication app(argc, argv); + LXQt::SingleApplication app(argc, argv); TimeAdminDialog dlg; dlg.setWindowIcon(QIcon::fromTheme("preferences-system")); app.setActivationWindow(&dlg); diff --git a/lxqt-admin-time/timeadmindialog.cpp b/lxqt-admin-time/timeadmindialog.cpp index 1a92bcc..e5d319d 100644 --- a/lxqt-admin-time/timeadmindialog.cpp +++ b/lxqt-admin-time/timeadmindialog.cpp @@ -39,7 +39,7 @@ #define ZONETAB_PATH "/usr/share/zoneinfo/zone.tab" TimeAdminDialog::TimeAdminDialog(QWidget *parent): - LxQt::ConfigDialog(tr("Time and date configuration"),new LxQt::Settings("TimeDate"), parent), + LXQt::ConfigDialog(tr("Time and date configuration"),new LXQt::Settings("TimeDate"), parent), mTimeConfig(OOBS_TIME_CONFIG(oobs_time_config_get())), mUserLogedIn(false) { diff --git a/lxqt-admin-time/timeadmindialog.h b/lxqt-admin-time/timeadmindialog.h index 0d6cbd2..2b0c2f5 100644 --- a/lxqt-admin-time/timeadmindialog.h +++ b/lxqt-admin-time/timeadmindialog.h @@ -34,7 +34,7 @@ class DateTime; class Timezone; -class TimeAdminDialog: public LxQt::ConfigDialog +class TimeAdminDialog: public LXQt::ConfigDialog { Q_OBJECT diff --git a/lxqt-admin-time/timezone.ui b/lxqt-admin-time/timezone.ui index 5d26a1c..21000fc 100644 --- a/lxqt-admin-time/timezone.ui +++ b/lxqt-admin-time/timezone.ui @@ -10,23 +10,7 @@ 300 - - Form - - - - - - 75 - true - - - - Timezone setup - - - diff --git a/lxqt-admin-time/translations/lxqt-admin-time.ts b/lxqt-admin-time/translations/lxqt-admin-time.ts index ec172cd..e5617de 100644 --- a/lxqt-admin-time/translations/lxqt-admin-time.ts +++ b/lxqt-admin-time/translations/lxqt-admin-time.ts @@ -4,32 +4,22 @@ DateTime - - Form - - - - - Time and date setup - - - - + Time: - + HH:mm:ss - + Date: - + <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> @@ -60,32 +50,22 @@ Timezone - - Form - - - - - Timezone setup - - - - + Your current timezone: - + TextLabel - + Filter - + <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> diff --git a/lxqt-admin-time/translations/lxqt-admin-time_de.desktop b/lxqt-admin-time/translations/lxqt-admin-time_de.desktop new file mode 100644 index 0000000..07c840b --- /dev/null +++ b/lxqt-admin-time/translations/lxqt-admin-time_de.desktop @@ -0,0 +1,4 @@ +#TRANSLATIONS +Name[de]=Datum und Zeit +GenericName[de]=Einstellungen für Datum und Zeit +Comment[de]=Konfiguriert das Datum und die Zeit des Systems diff --git a/lxqt-admin-time/translations/lxqt-admin-time_de.ts b/lxqt-admin-time/translations/lxqt-admin-time_de.ts new file mode 100644 index 0000000..489b7b3 --- /dev/null +++ b/lxqt-admin-time/translations/lxqt-admin-time_de.ts @@ -0,0 +1,79 @@ + + + + + DateTime + + + Time: + Zeit: + + + + HH:mm:ss + No need to translate. + + + + + Date: + Datum: + + + + <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> + <html><head/><body><p>Das Sichern der Einstellungen benötigt Administrator-Rechte.<br>Nach dem Betätigen der Schließen-Schaltfläche wird die Berechtigung eingeholt.</p></body></html> + + + + TimeAdminDialog + + + Time and date configuration + Zeit und Datum einstellen + + + + Date and time + Datum und Zeit + + + + Timezone + Zeitzone + + + + Authentication Error + Authentifizierungsfehler + + + + Timezone + + + Your current timezone: + Derzeitige Zeitzone: + + + + TextLabel + Textfeld + + + + Filter + Filter + + + + <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> + <html><head/><body><p>Das Sichern der Einstellungen benötigt Administrator-Rechte.<br>Nach dem Betätigen der Schließen-Schaltfläche wird die Berechtigung eingeholt.</p></body></html> + + + + None + Keine + + + diff --git a/lxqt-admin-time/translations/lxqt-admin-time_el.desktop b/lxqt-admin-time/translations/lxqt-admin-time_el.desktop new file mode 100644 index 0000000..12c0980 --- /dev/null +++ b/lxqt-admin-time/translations/lxqt-admin-time_el.desktop @@ -0,0 +1,3 @@ +Name[el]=Ημερομηνία και ώρα +GenericName[el]=Ρυθμίσεις της ημερομηνίας και της ώρας +Comment[el]=Διαμόρφωση της ημερομηνίας και της ώρας του συστήματός σας diff --git a/lxqt-admin-time/translations/lxqt-admin-time_el.ts b/lxqt-admin-time/translations/lxqt-admin-time_el.ts new file mode 100644 index 0000000..6680baf --- /dev/null +++ b/lxqt-admin-time/translations/lxqt-admin-time_el.ts @@ -0,0 +1,78 @@ + + + + + DateTime + + + Time: + Ώρα: + + + + HH:mm:ss + HH:mm:ss + + + + Date: + Ημερομηνία: + + + + <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> + <html><head/><body><p>Η αποθήκευση των αλλαγών απαιτεί δικαιώματα διαχειριστή.<br>Θα ερωτηθείτε αφού κάνετε κλικ στο κουμπί του κλεισίματος</p></body></html> + + + + TimeAdminDialog + + + Time and date configuration + Διαμόρφωση της ώρας και της ημερομηνίας + + + + Date and time + Ημερομηνία και ώρα + + + + Timezone + Ωρολογιακή ζώνη + + + + Authentication Error + Σφάλμα πιστοποίησης + + + + Timezone + + + Your current timezone: + Η τρέχουσα ζώνη ώρας: + + + + TextLabel + Ετικέτα κειμένου + + + + Filter + Φίλτρο + + + + <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> + <html><head/><body><p>Η αποθήκευση των αλλαγών απαιτεί δικαιώματα διαχειριστή.<br>Θα ερωτηθείτε αφού κάνετε κλικ στο κουμπί του κλεισίματος</p></body></html> + + + + None + Καμία + + + diff --git a/lxqt-admin-user/main.cpp b/lxqt-admin-user/main.cpp index 98feaae..865ba21 100644 --- a/lxqt-admin-user/main.cpp +++ b/lxqt-admin-user/main.cpp @@ -30,7 +30,7 @@ int main(int argc, char **argv) { - LxQt::SingleApplication app(argc, argv); + LXQt::SingleApplication app(argc, argv); MainWindow window; window.setWindowIcon(QIcon::fromTheme("preferences-system")); app.setActivationWindow(&window); diff --git a/lxqt-admin-user/translations/lxqt-admin-user_de.desktop b/lxqt-admin-user/translations/lxqt-admin-user_de.desktop new file mode 100644 index 0000000..6ca4532 --- /dev/null +++ b/lxqt-admin-user/translations/lxqt-admin-user_de.desktop @@ -0,0 +1,4 @@ +#TRANSLATIONS +Name[de]=Benutzer und Gruppen +GenericName[de]=Einstellungen für Benutzer und Gruppen +Comment[de]=Konfiguriert die Benutzer und Gruppen des Systems diff --git a/lxqt-admin-user/translations/lxqt-admin-user_de.ts b/lxqt-admin-user/translations/lxqt-admin-user_de.ts new file mode 100644 index 0000000..7201449 --- /dev/null +++ b/lxqt-admin-user/translations/lxqt-admin-user_de.ts @@ -0,0 +1,263 @@ + + + + + GroupDialog + + + Group Settings + Gruppeneinstellungen + + + + Group name: + Gruppen-Name: + + + + Group ID: + Gruppen-ID: + + + + Users belong to this group: + Benutzer in dieser Gruppe: + + + + + + Error + Fehler + + + + The group ID is in use. + Die Gruppen-ID existiert bereits. + + + + The group name cannot be empty. + Der Gruppen-Name kann nicht leer sein. + + + + The group name is in use. + Der Gruppen-Name existiert bereits. + + + + MainWindow + + + User and Group Settings + Nutzer- und Gruppeneinstellungen + + + + &Users + &Nutzer + + + + Login Name + Anmeldename + + + + User ID + Nutzer-ID + + + + Full Name + Vollständiger Name + + + + Group + Gruppe + + + + Home Directory + Nutzerverzeichnis + + + + Show system users (for advanced users only) + Systemnutzer anzeigen (nur für erfahrene Nutzer) + + + + &Groups + &Gruppen + + + + Name + Name + + + + Group ID + Gruppen-ID + + + + toolBar + Werkzeugleiste + + + + Add + Hinzufügen + + + + Add new users or groups + Neue Nutzer oder Gruppen hinzufügen + + + + Delete + Entfernen + + + + Delete selected item + Ausgewähltes Element löschen + + + + Properties + Eigenschaften + + + + edit properties of the selected item + Eigenschaften des ausgewählten Elements editieren + + + + Refresh + Erneuern + + + + Refresh the lists + Listen erneuern + + + + Error + Fehler + + + + + Confirm + Bestätigen + + + + Are you sure you want to delete the selected user? + Wollen Sie den ausgewählten Nutzer wirklich löschen? + + + + Are you sure you want to delete the selected group? + Wollen Sie die ausgewählte Gruppe wirklich löschen? + + + + UserDialog + + + User Settings + Nutzereinstellungen + + + + General + Allgemein + + + + Full name: + Vollständiger Name: + + + + Login name: + Anmeldename: + + + + Set password: + Kennwort setzen: + + + + User ID: + Nutzer-ID: + + + + Main group: + Hauptgruppe: + + + + Advanced + Erweitert + + + + Login shell: + Befehlsinterpreter (shell): + + + + Home directory: + Nutzerverzeichnis: + + + + Change password: + Kennwort ändern: + + + + + + Error + Fehler + + + + The user ID is in use. + Die Nutzer-ID existiert bereits. + + + + The user name cannot be empty. + Der Nutzername kann nicht leer sein. + + + + The user name is in use. + Der Nutzername existiert bereits. + + + + Confirm + Bestätigen + + + + Are you sure you want to use an "empty password" for the user? + Wollen Sie wirklich ein "leeres Kennwort" für den Nutzer vergeben? + + + diff --git a/lxqt-admin-user/translations/lxqt-admin-user_el.desktop b/lxqt-admin-user/translations/lxqt-admin-user_el.desktop new file mode 100644 index 0000000..bc5ce3d --- /dev/null +++ b/lxqt-admin-user/translations/lxqt-admin-user_el.desktop @@ -0,0 +1,3 @@ +Name[el]=Χρήστες και ομάδες +GenericName[el]=Ρυθμίσεις χρηστών και ομάδων +Comment[el]=Διαμόρφωση των χρηστών και των ομάδων του συστήματός σας diff --git a/lxqt-admin-user/translations/lxqt-admin-user_el.ts b/lxqt-admin-user/translations/lxqt-admin-user_el.ts new file mode 100644 index 0000000..a52e208 --- /dev/null +++ b/lxqt-admin-user/translations/lxqt-admin-user_el.ts @@ -0,0 +1,263 @@ + + + + + GroupDialog + + + Group Settings + Ρυθμίσεις ομάδας + + + + Group name: + Όνομα ομάδας: + + + + Group ID: + Αναγνωριστικό ομάδας: + + + + Users belong to this group: + Χρήστες που ανήκουν στην ομάδα: + + + + + + Error + Σφάλμα + + + + The group ID is in use. + Το αναγνωριστικό της ομάδας χρησιμοποιείται ήδη. + + + + The group name cannot be empty. + Το όνομα της ομάδας δεν μπορεί να είναι κενό. + + + + The group name is in use. + Το όνομα της ομάδας χρησιμοποιείται ήδη. + + + + MainWindow + + + User and Group Settings + Ρυθμίσεις χρηστών και ομάδων + + + + &Users + &Χρήστες + + + + Login Name + Όνομα χρήστη + + + + User ID + Αναγνωριστικό χρήστη + + + + Full Name + Πλήρες όνομα + + + + Group + Ομάδα + + + + Home Directory + Προσωπικός κατάλογος + + + + Show system users (for advanced users only) + Εμφάνιση των χρηστών του συστήματος (μόνο για προηγμένους χρήστες) + + + + &Groups + &Ομάδες + + + + Name + Όνομα + + + + Group ID + Αναγνωριστικό ομάδας + + + + toolBar + Γραμμή εργαλείων + + + + Add + Προσθήκη + + + + Add new users or groups + Προσθήκη νέων χρηστών ή ομάδων + + + + Delete + Διαγραφή + + + + Delete selected item + Διαγραφή του επιλεγμένου αντικειμένου + + + + Properties + Ιδιότητες + + + + edit properties of the selected item + Επεξεργασία των ιδιοτήτων για το επιλεγμένο αντικείμενο + + + + Refresh + Ανανέωση + + + + Refresh the lists + Ανανέωση της λίστας + + + + Error + Σφάλμα + + + + + Confirm + Επιβεβαίωση + + + + Are you sure you want to delete the selected user? + Είστε σίγουρος-η ότι θέλετε να διαγράψετε τον επιλεγμένο χρήστη; + + + + Are you sure you want to delete the selected group? + Είστε σίγουρος-η ότι θέλετε να διαγράψετε την επιλεγμένη ομάδα; + + + + UserDialog + + + User Settings + Ρυθμίσεις χρήστη + + + + General + Γενικά + + + + Full name: + Πλήρες όνομα: + + + + Login name: + Όνομα χρήστη: + + + + Set password: + Ορισμός του κωδικού πρόσβασης: + + + + User ID: + Αναγνωριστικό χρήστη: + + + + Main group: + Κύρια ομάδα: + + + + Advanced + Προηγμένο + + + + Login shell: + Κέλυφος σύνδεσης: + + + + Home directory: + Προσωπικός κατάλογος: + + + + Change password: + Αλλαγή του κωδικού πρόσβασης: + + + + + + Error + Σφάλμα + + + + The user ID is in use. + Το αναγνωριστικό του χρήστη χρησιμοποιείται ήδη. + + + + The user name cannot be empty. + Το όνομα χρήστη δεν μπορεί να είναι κενό. + + + + The user name is in use. + Το όνομα του χρήστη χρησιμοποιείται ήδη. + + + + Confirm + Επιβεβαίωση + + + + Are you sure you want to use an "empty password" for the user? + Είστε σίγουρος-η ότι θέλετε να χρησιμοποιήσετε έναν «κενό κωδικό πρόσβασης» για τον χρήστη; + + + From 68accb96e8565dd6352a6f46461f734c9292bdf2 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Wed, 2 Sep 2015 00:49:17 +0200 Subject: [PATCH 05/11] Cherry-picked upstream 0.9.0+20150830 LD flags added -Wl,--as-needed --- debian/changelog | 7 +++++++ debian/rules | 2 ++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 18671a4..1d8477c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lxqt-admin (0.9.0+20150830-1) unstable; urgency=medium + + * Cherry-picked upstream 0.9.0+20150830 + * LD flags added -Wl,--as-needed + + -- Alf Gaida Wed, 02 Sep 2015 00:45:54 +0200 + lxqt-admin (0.9.0+20150807-2) unstable; urgency=medium * Removed breaks/replaces diff --git a/debian/rules b/debian/rules index a08ed97..9d9f1ee 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,8 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + %: dh ${@} --buildsystem cmake --parallel From 079f8583989903068488be28a2f8ed84696b31c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ChangZhuo=20Chen=20=28=E9=99=B3=E6=98=8C=E5=80=AC=29?= Date: Sat, 12 Sep 2015 23:01:32 +0800 Subject: [PATCH 06/11] Update maintainer email --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 2506fcc..378ae24 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: lxqt-admin Maintainer: LXQt Packaging Team Uploaders: Alf Gaida , - ChangZhuo Chen (陳昌倬) , + ChangZhuo Chen (陳昌倬) , Andrew Lee (李健秋) Section: x11 Priority: optional From 5512d3a44a931f6cfec35176d917680f8a67efbe Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Tue, 22 Sep 2015 23:23:32 +0200 Subject: [PATCH 07/11] switched to experimental because of the LXQt namespace renaming merge changelog --- debian/changelog | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1d8477c..7accd7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,7 @@ -lxqt-admin (0.9.0+20150830-1) unstable; urgency=medium +lxqt-admin (0.9.0+20150830-1) experimental; urgency=medium * Cherry-picked upstream 0.9.0+20150830 * LD flags added -Wl,--as-needed - - -- Alf Gaida Wed, 02 Sep 2015 00:45:54 +0200 - -lxqt-admin (0.9.0+20150807-2) unstable; urgency=medium - * Removed breaks/replaces * cme fix dpkg-control * Added upstream signing key and use it in watch file From ee6dcea3b8d0ddd765788670f2ebe29260d3e2f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ChangZhuo=20Chen=20=28=E9=99=B3=E6=98=8C=E5=80=AC=29?= Date: Wed, 23 Sep 2015 20:09:18 +0800 Subject: [PATCH 08/11] Add gbp.conf --- debian/gbp.conf | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 debian/gbp.conf diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..9737966 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,7 @@ +[DEFAULT] +debian-branch = debian +pristine-tar = True + +[import-orig] +# Use git cherrypick -n upstream instead. +merge = False From 1ffcdd3bf849592e317349102decf31353ec019c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ChangZhuo=20Chen=20=28=E9=99=B3=E6=98=8C=E5=80=AC=29?= Date: Fri, 25 Sep 2015 22:19:06 +0800 Subject: [PATCH 09/11] Set a minimum version of liblxqt --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 378ae24..cea928f 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9), cmake (>= 3.0.2), liboobs-1-dev, libkf5windowsystem-dev, - liblxqt0-dev, + liblxqt0-dev (>= 0.9.0+20150911), libqt5x11extras5-dev, libqt5xdg-dev, libx11-dev, From 221f03bd5f085257238fdc8385f30d69dac8cd55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ChangZhuo=20Chen=20=28=E9=99=B3=E6=98=8C=E5=80=AC=29?= Date: Fri, 25 Sep 2015 22:19:13 +0800 Subject: [PATCH 10/11] Update changelog --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7accd7e..3dc264c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lxqt-admin (0.9.0+20150830-2) experimental; urgency=medium + + * set a minimum version of liblxqt (>= 0.9.0+20150911) for LxQt to LXQt + namespace changed. + + -- ChangZhuo Chen (陳昌倬) Thu, 24 Sep 2015 00:12:10 +0800 + lxqt-admin (0.9.0+20150830-1) experimental; urgency=medium * Cherry-picked upstream 0.9.0+20150830 From 5265d7d74e812d643965148835857f93a618e899 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Tue, 3 Nov 2015 20:58:09 +0100 Subject: [PATCH 11/11] Cherry-picking upstream version 0.10.0. Set minimum versions for liblxqt and libqtxdg --- .gitignore | 1 + COPYING | 41 +++++++++++++++++++---------------------- debian/changelog | 7 +++++++ debian/control | 4 ++-- 4 files changed, 29 insertions(+), 24 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..378eac2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build diff --git a/COPYING b/COPYING index a8dd823..20fb9c7 100644 --- a/COPYING +++ b/COPYING @@ -1,9 +1,8 @@ - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -23,8 +22,7 @@ specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations -below. +strategy to use in any particular case, based on the explanations below. When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that @@ -89,9 +87,9 @@ libraries. However, the Lesser license provides advantages in certain special circumstances. For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it -becomes a de-facto standard. To achieve this, non-free programs must -be allowed to use the library. A more frequent case is that a free +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. @@ -138,8 +136,8 @@ included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control -compilation and installation of the library. +interface definition files, plus the scripts used to control compilation +and installation of the library. Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of @@ -305,10 +303,10 @@ of these things: the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. - c) Accompany the work with a written offer, valid for at least - three years, to give the same user the materials specified in - Subsection 6a, above, for a charge no more than the cost of - performing this distribution. + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above @@ -386,10 +384,9 @@ all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply, and the section as a whole is intended to apply in other -circumstances. +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any @@ -407,11 +404,11 @@ be a consequence of the rest of this License. 12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License -may add an explicit geographical distribution limitation excluding those -countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. 13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. diff --git a/debian/changelog b/debian/changelog index 3dc264c..7399238 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lxqt-admin (0.10.0-1) experimental; urgency=medium + + * Cherry-picking upstream version 0.10.0. + * Set minimum versions for liblxqt and libqtxdg + + -- Alf Gaida Tue, 03 Nov 2015 20:59:51 +0100 + lxqt-admin (0.9.0+20150830-2) experimental; urgency=medium * set a minimum version of liblxqt (>= 0.9.0+20150911) for LxQt to LXQt diff --git a/debian/control b/debian/control index cea928f..f4407c5 100644 --- a/debian/control +++ b/debian/control @@ -9,9 +9,9 @@ Build-Depends: debhelper (>= 9), cmake (>= 3.0.2), liboobs-1-dev, libkf5windowsystem-dev, - liblxqt0-dev (>= 0.9.0+20150911), + liblxqt0-dev (>= 0.10.0), libqt5x11extras5-dev, - libqt5xdg-dev, + libqt5xdg-dev (>= 1.3.0), libx11-dev, pkg-config, qttools5-dev,