From f5ffd002e4ee4d3703f6699ff279f2d03a208b44 Mon Sep 17 00:00:00 2001 From: Hugo Posnic Date: Thu, 22 Dec 2016 20:59:24 +0100 Subject: [PATCH] Remove support of cli-installer (depreciated) --- po/de.po | 67 +++++++++++++++++++++--------------------- po/fr.po | 63 +++++++++++++++++++-------------------- po/manjaro-hello.pot | 58 +++++++++++++++++------------------- po/pl.po | 67 +++++++++++++++++++++--------------------- src/manjaro_hello.py | 7 +---- ui/manjaro-hello.glade | 61 ++++++++++++-------------------------- 6 files changed, 144 insertions(+), 179 deletions(-) diff --git a/po/de.po b/po/de.po index dc11a7e..60d97ad 100644 --- a/po/de.po +++ b/po/de.po @@ -7,20 +7,16 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-20 16:14+0100\n" -"PO-Revision-Date: 2016-12-20 16:30+0100\n" +"POT-Creation-Date: 2016-12-22 20:56+0100\n" +"PO-Revision-Date: 2016-12-22 20:56+0100\n" +"Last-Translator: \n" "Language-Team: \n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.8.11\n" -"Last-Translator: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Language: de\n" - -#: src/manjaro-hello.py:187 -msgid "Can't load page." -msgstr "Seite kann nicht geladen werden." #: ui/manjaro-hello.glade:7 msgid "About" @@ -34,11 +30,11 @@ msgstr "Willkommensdialog für Manjaro" msgid "Github" msgstr "Github" -#: ui/manjaro-hello.glade:95 +#: ui/manjaro-hello.glade:97 msgid "Welcome to Manjaro!" msgstr "Willkommen bei Manjaro!" -#: ui/manjaro-hello.glade:112 +#: ui/manjaro-hello.glade:114 msgid "" "Thank you for joining our community!\n" "\n" @@ -55,74 +51,77 @@ msgstr "" "zurechtzufinden. Genießen Sie also das Benutzererlebnis und zögern Sie nicht " "ihr Feedback an uns zu senden." -#: ui/manjaro-hello.glade:129 +#: ui/manjaro-hello.glade:131 msgid "DOCUMENTATION" msgstr "DOKUMENTATION" -#: ui/manjaro-hello.glade:143 +#: ui/manjaro-hello.glade:145 msgid "SUPPORT" msgstr "UNTERSTÜTZUNG" -#: ui/manjaro-hello.glade:157 +#: ui/manjaro-hello.glade:159 msgid "PROJECT" msgstr "PROJEKT" -#: ui/manjaro-hello.glade:169 +#: ui/manjaro-hello.glade:171 msgid "Read me" msgstr "Lies mich" -#: ui/manjaro-hello.glade:183 +#: ui/manjaro-hello.glade:185 msgid "Release info" msgstr "Versionshinweise" -#: ui/manjaro-hello.glade:197 +#: ui/manjaro-hello.glade:199 msgid "Wiki" msgstr "Wiki" -#: ui/manjaro-hello.glade:211 +#: ui/manjaro-hello.glade:213 msgid "Get involved" msgstr "Mitmachen" -#: ui/manjaro-hello.glade:225 +#: ui/manjaro-hello.glade:227 msgid "Forums" msgstr "Forum" -#: ui/manjaro-hello.glade:239 +#: ui/manjaro-hello.glade:241 msgid "Chat room" msgstr "Chatroom" -#: ui/manjaro-hello.glade:253 +#: ui/manjaro-hello.glade:255 msgid "Mailling lists" msgstr "Mailingliste" -#: ui/manjaro-hello.glade:267 +#: ui/manjaro-hello.glade:269 msgid "Build Manjaro" msgstr "Manjaro-Build erstellen" -#: ui/manjaro-hello.glade:281 +#: ui/manjaro-hello.glade:283 msgid "Donate" msgstr "Spenden" -#: ui/manjaro-hello.glade:393 +#: ui/manjaro-hello.glade:395 msgid "Launch at start" msgstr "Beim Systemstart ausführen" -#: ui/manjaro-hello.glade:430 -msgid "Use Calamares (Graphic method)" -msgstr "Calamares (grafischer Installer) benutzen" - -#: ui/manjaro-hello.glade:444 -msgid "Use CLI-Installer (Command line)" -msgstr "CLI-Installer (Kommandozeile) benutzen" - -#: ui/manjaro-hello.glade:466 +#: ui/manjaro-hello.glade:427 msgid "INSTALLATION" msgstr "INSTALLATION" -#: ui/manjaro-hello.glade:485 +#: ui/manjaro-hello.glade:439 +msgid "Use Calamares (Graphic method)" +msgstr "Calamares (grafischer Installer) benutzen" + +#: ui/manjaro-hello.glade:465 msgid "Welcome" msgstr "Willkommen" -#: ui/manjaro-hello.glade:508 +#: ui/manjaro-hello.glade:488 msgid "Documentation" msgstr "Dokumentation" + +#: src/manjaro_hello.py:204 +msgid "Can't load page." +msgstr "Seite kann nicht geladen werden." + +#~ msgid "Use CLI-Installer (Command line)" +#~ msgstr "CLI-Installer (Kommandozeile) benutzen" diff --git a/po/fr.po b/po/fr.po index 1aff5b3..f1095af 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-17 12:12+0100\n" -"PO-Revision-Date: 2016-12-17 14:31+0100\n" +"POT-Creation-Date: 2016-12-22 20:56+0100\n" +"PO-Revision-Date: 2016-12-22 20:56+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: fr\n" @@ -18,10 +18,6 @@ msgstr "" "X-Generator: Poedit 1.8.11\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: src/manjaro-hello.py:187 -msgid "Can't load page." -msgstr "Impossible de charger la page." - #: ui/manjaro-hello.glade:7 msgid "About" msgstr "À propos" @@ -34,11 +30,11 @@ msgstr "Écran de bienvenue pour Manjaro" msgid "Github" msgstr "Github" -#: ui/manjaro-hello.glade:95 +#: ui/manjaro-hello.glade:97 msgid "Welcome to Manjaro!" msgstr "Bienvenue sur Manjaro !" -#: ui/manjaro-hello.glade:112 +#: ui/manjaro-hello.glade:114 msgid "" "Thank you for joining our community!\n" "\n" @@ -55,78 +51,81 @@ msgstr "" "Alors profitez de l'expérience, et n'hésitez pas à nous faire part de vos " "commentaires." -#: ui/manjaro-hello.glade:129 +#: ui/manjaro-hello.glade:131 msgid "DOCUMENTATION" msgstr "DOCUMENTATION" -#: ui/manjaro-hello.glade:143 +#: ui/manjaro-hello.glade:145 msgid "SUPPORT" msgstr "SUPPORT" -#: ui/manjaro-hello.glade:157 +#: ui/manjaro-hello.glade:159 msgid "PROJECT" msgstr "PROJET" -#: ui/manjaro-hello.glade:169 +#: ui/manjaro-hello.glade:171 msgid "Read me" msgstr "Lisez moi" -#: ui/manjaro-hello.glade:183 +#: ui/manjaro-hello.glade:185 msgid "Release info" msgstr "Informations de version" -#: ui/manjaro-hello.glade:197 +#: ui/manjaro-hello.glade:199 msgid "Wiki" msgstr "Wiki" -#: ui/manjaro-hello.glade:211 +#: ui/manjaro-hello.glade:213 msgid "Get involved" msgstr "S'investir" -#: ui/manjaro-hello.glade:225 +#: ui/manjaro-hello.glade:227 msgid "Forums" msgstr "Forums" -#: ui/manjaro-hello.glade:239 +#: ui/manjaro-hello.glade:241 msgid "Chat room" msgstr "Salon de chat" -#: ui/manjaro-hello.glade:253 +#: ui/manjaro-hello.glade:255 msgid "Mailling lists" msgstr "Listes de diffusion" -#: ui/manjaro-hello.glade:267 +#: ui/manjaro-hello.glade:269 msgid "Build Manjaro" msgstr "Construire Manjaro" -#: ui/manjaro-hello.glade:281 +#: ui/manjaro-hello.glade:283 msgid "Donate" msgstr "Faire un don" -#: ui/manjaro-hello.glade:393 +#: ui/manjaro-hello.glade:395 msgid "Launch at start" msgstr "Lancer au démarrage" -#: ui/manjaro-hello.glade:430 -msgid "Use Calamares (Graphic method)" -msgstr "Utiliser Calamares (Méthode graphique)" - -#: ui/manjaro-hello.glade:444 -msgid "Use CLI-Installer (Command line)" -msgstr "Utiliser CLI-Installer (Ligne de commande)" - -#: ui/manjaro-hello.glade:466 +#: ui/manjaro-hello.glade:427 msgid "INSTALLATION" msgstr "INSTALLATION" -#: ui/manjaro-hello.glade:485 +#: ui/manjaro-hello.glade:439 +msgid "Use Calamares (Graphic method)" +msgstr "Utiliser Calamares (Méthode graphique)" + +#: ui/manjaro-hello.glade:465 msgid "Welcome" msgstr "Bienvenue" -#: ui/manjaro-hello.glade:508 +#: ui/manjaro-hello.glade:488 msgid "Documentation" msgstr "Documentation" +#: src/manjaro_hello.py:204 +msgid "Can't load page." +msgstr "Impossible de charger la page." + +#~ msgid "Use CLI-Installer (Command line)" +#~ msgstr "Utiliser CLI-Installer (Ligne de commande)" + #~ msgid "Project" #~ msgstr "Projet" diff --git a/po/manjaro-hello.pot b/po/manjaro-hello.pot index daaec30..8f16b9b 100644 --- a/po/manjaro-hello.pot +++ b/po/manjaro-hello.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-17 12:12+0100\n" +"POT-Creation-Date: 2016-12-22 20:55+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,10 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/manjaro-hello.py:187 -msgid "Can't load page." -msgstr "" - #: ui/manjaro-hello.glade:7 msgid "About" msgstr "" @@ -33,11 +29,11 @@ msgstr "" msgid "Github" msgstr "" -#: ui/manjaro-hello.glade:95 +#: ui/manjaro-hello.glade:97 msgid "Welcome to Manjaro!" msgstr "" -#: ui/manjaro-hello.glade:112 +#: ui/manjaro-hello.glade:114 msgid "" "Thank you for joining our community!\n" "\n" @@ -47,74 +43,74 @@ msgid "" "your feedback." msgstr "" -#: ui/manjaro-hello.glade:129 +#: ui/manjaro-hello.glade:131 msgid "DOCUMENTATION" msgstr "" -#: ui/manjaro-hello.glade:143 +#: ui/manjaro-hello.glade:145 msgid "SUPPORT" msgstr "" -#: ui/manjaro-hello.glade:157 +#: ui/manjaro-hello.glade:159 msgid "PROJECT" msgstr "" -#: ui/manjaro-hello.glade:169 +#: ui/manjaro-hello.glade:171 msgid "Read me" msgstr "" -#: ui/manjaro-hello.glade:183 +#: ui/manjaro-hello.glade:185 msgid "Release info" msgstr "" -#: ui/manjaro-hello.glade:197 +#: ui/manjaro-hello.glade:199 msgid "Wiki" msgstr "" -#: ui/manjaro-hello.glade:211 +#: ui/manjaro-hello.glade:213 msgid "Get involved" msgstr "" -#: ui/manjaro-hello.glade:225 +#: ui/manjaro-hello.glade:227 msgid "Forums" msgstr "" -#: ui/manjaro-hello.glade:239 +#: ui/manjaro-hello.glade:241 msgid "Chat room" msgstr "" -#: ui/manjaro-hello.glade:253 +#: ui/manjaro-hello.glade:255 msgid "Mailling lists" msgstr "" -#: ui/manjaro-hello.glade:267 +#: ui/manjaro-hello.glade:269 msgid "Build Manjaro" msgstr "" -#: ui/manjaro-hello.glade:281 +#: ui/manjaro-hello.glade:283 msgid "Donate" msgstr "" -#: ui/manjaro-hello.glade:393 +#: ui/manjaro-hello.glade:395 msgid "Launch at start" msgstr "" -#: ui/manjaro-hello.glade:430 -msgid "Use Calamares (Graphic method)" -msgstr "" - -#: ui/manjaro-hello.glade:444 -msgid "Use CLI-Installer (Command line)" -msgstr "" - -#: ui/manjaro-hello.glade:466 +#: ui/manjaro-hello.glade:427 msgid "INSTALLATION" msgstr "" -#: ui/manjaro-hello.glade:485 +#: ui/manjaro-hello.glade:439 +msgid "Use Calamares (Graphic method)" +msgstr "" + +#: ui/manjaro-hello.glade:465 msgid "Welcome" msgstr "" -#: ui/manjaro-hello.glade:508 +#: ui/manjaro-hello.glade:488 msgid "Documentation" msgstr "" + +#: src/manjaro_hello.py:204 +msgid "Can't load page." +msgstr "" diff --git a/po/pl.po b/po/pl.po index 18cf32e..61f6c15 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,21 +7,17 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-19 19:45+0100\n" -"PO-Revision-Date: 2016-12-19 20:01+0100\n" +"POT-Creation-Date: 2016-12-22 20:57+0100\n" +"PO-Revision-Date: 2016-12-22 20:57+0100\n" +"Last-Translator: Daniel Napora \n" "Language-Team: \n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.8.11\n" -"Last-Translator: Daniel Napora \n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"Language: pl\n" - -#: src/manjaro-hello.py:187 -msgid "Can't load page." -msgstr "Nie można załadować strony." #: ui/manjaro-hello.glade:7 msgid "About" @@ -35,11 +31,11 @@ msgstr "Ekran powitalny Manjaro" msgid "Github" msgstr "Github" -#: ui/manjaro-hello.glade:95 +#: ui/manjaro-hello.glade:97 msgid "Welcome to Manjaro!" msgstr "Witaj w Manjaro!" -#: ui/manjaro-hello.glade:112 +#: ui/manjaro-hello.glade:114 msgid "" "Thank you for joining our community!\n" "\n" @@ -55,74 +51,77 @@ msgstr "" "używania nowego systemu operacyjnego. Życzymy miłych wrażeń, nie wahaj się " "podzielić się z nami Twoją opinią." -#: ui/manjaro-hello.glade:129 +#: ui/manjaro-hello.glade:131 msgid "DOCUMENTATION" msgstr "DOKUMENTACJA" -#: ui/manjaro-hello.glade:143 +#: ui/manjaro-hello.glade:145 msgid "SUPPORT" msgstr "WSPARCIE" -#: ui/manjaro-hello.glade:157 +#: ui/manjaro-hello.glade:159 msgid "PROJECT" msgstr "PROJEKT" -#: ui/manjaro-hello.glade:169 +#: ui/manjaro-hello.glade:171 msgid "Read me" msgstr "Czytaj to" -#: ui/manjaro-hello.glade:183 +#: ui/manjaro-hello.glade:185 msgid "Release info" msgstr "Informacje o wydaniu" -#: ui/manjaro-hello.glade:197 +#: ui/manjaro-hello.glade:199 msgid "Wiki" msgstr "Wiki" -#: ui/manjaro-hello.glade:211 +#: ui/manjaro-hello.glade:213 msgid "Get involved" msgstr "Zaangażuj się" -#: ui/manjaro-hello.glade:225 +#: ui/manjaro-hello.glade:227 msgid "Forums" msgstr "Forum" -#: ui/manjaro-hello.glade:239 +#: ui/manjaro-hello.glade:241 msgid "Chat room" msgstr "IRC" -#: ui/manjaro-hello.glade:253 +#: ui/manjaro-hello.glade:255 msgid "Mailling lists" msgstr "Listy mailingowe" -#: ui/manjaro-hello.glade:267 +#: ui/manjaro-hello.glade:269 msgid "Build Manjaro" msgstr "Twórz Manjaro" -#: ui/manjaro-hello.glade:281 +#: ui/manjaro-hello.glade:283 msgid "Donate" msgstr "Wesprzyj" -#: ui/manjaro-hello.glade:393 +#: ui/manjaro-hello.glade:395 msgid "Launch at start" msgstr "Uruchamiaj przy starcie" -#: ui/manjaro-hello.glade:430 -msgid "Use Calamares (Graphic method)" -msgstr "Użyj Calamares (metoda graficzna)" - -#: ui/manjaro-hello.glade:444 -msgid "Use CLI-Installer (Command line)" -msgstr "Użyj instalatora CLI (z linii komend)" - -#: ui/manjaro-hello.glade:466 +#: ui/manjaro-hello.glade:427 msgid "INSTALLATION" msgstr "INSTALACJA" -#: ui/manjaro-hello.glade:485 +#: ui/manjaro-hello.glade:439 +msgid "Use Calamares (Graphic method)" +msgstr "Użyj Calamares (metoda graficzna)" + +#: ui/manjaro-hello.glade:465 msgid "Welcome" msgstr "Witaj" -#: ui/manjaro-hello.glade:508 +#: ui/manjaro-hello.glade:488 msgid "Documentation" msgstr "Dokumentacja" + +#: src/manjaro_hello.py:204 +msgid "Can't load page." +msgstr "Nie można załadować strony." + +#~ msgid "Use CLI-Installer (Command line)" +#~ msgstr "Użyj instalatora CLI (z linii komend)" diff --git a/src/manjaro_hello.py b/src/manjaro_hello.py index c42a927..21b6ff4 100644 --- a/src/manjaro_hello.py +++ b/src/manjaro_hello.py @@ -85,11 +85,9 @@ class ManjaroHello(): # Live systems if self.infos["live"]: - self.builder.get_object("installlabel").set_visible(True) if os.path.isfile("/usr/bin/calamares"): + self.builder.get_object("installlabel").set_visible(True) self.builder.get_object("installgui").set_visible(True) - if os.path.isfile("/usr/bin/cli-installer"): - self.builder.get_object("installcli").set_visible(True) self.window.show() @@ -142,7 +140,6 @@ class ManjaroHello(): "donate": "label", "installlabel": "label", "installgui": "label", - "installcli": "label", "autostartlabel": "label", "aboutdialog": "comments" } @@ -211,8 +208,6 @@ class ManjaroHello(): name = action.get_name() if name == "installgui": subprocess.call(["sudo", "-E", "calamares"]) - elif name == "installcli": - subprocess.call(["sudo cli-installer"]) elif name == "autostart": autostart = True if action.get_active() else False self.change_autostart(autostart) diff --git a/ui/manjaro-hello.glade b/ui/manjaro-hello.glade index 2305c16..c6e82e4 100644 --- a/ui/manjaro-hello.glade +++ b/ui/manjaro-hello.glade @@ -421,48 +421,6 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we 3 - - - True - False - 10 - True - center - - - Use Calamares (Graphic method) - installgui - True - True - - - - False - False - 0 - - - - - Use CLI-Installer (Command line) - installcli - True - True - - - - False - False - 1 - - - - - 0 - 8 - 3 - - False @@ -476,6 +434,25 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we 7 + + + Use Calamares (Graphic method) + installgui + True + True + + + + 1 + 8 + + + + + + + +