Merge branch 'discover' into 'master'

Merge branch 'Discover' into 'master'

See merge request applications/manjaro-hello!80

data/preferences.json

@@ -11,11 +11,11 @@
   "ui_path": "/usr/share/manjaro-hello/ui/manjaro-hello.glade",
   "urls": {
     "development": "https://gitlab.manjaro.org",
-    "chat": "https://kiwiirc.com/client/irc.freenode.net/?nick=manjaro-web|?#manjaro",
+    "discover": "https://discover.manjaro.org/",
     "donate": "https://manjaro.org/donate",
     "facebook": "https://www.facebook.com/ManjaroLinux",
     "forum": "https://forum.manjaro.org",
-    "google+": "https://plus.google.com/118244873957924966264",
+    "telegram": "https://t.me/manjaro_official",
     "mailling": "https://lists.manjaro.org/cgi-bin/mailman/listinfo",
     "reddit": "https://www.reddit.com/r/ManjaroLinux",
     "twitter": "https://twitter.com/ManjaroLinux",

po/manjaro-hello.pot

@@ -3,12 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-30 16:47+0100\n"
+"POT-Creation-Date: 2020-11-17 22:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,19 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../ui/manjaro-hello.glade:35
-msgid "Home"
-msgstr ""
-
-#: ../ui/manjaro-hello.glade:104 ../ui/manjaro-hello.glade:559
-msgid "About"
-msgstr ""
-
-#: ../ui/manjaro-hello.glade:148
+#: ../ui/manjaro-hello.glade:56
 msgid "Welcome to Manjaro!"
 msgstr ""
 
-#: ../ui/manjaro-hello.glade:164
+#: ../ui/manjaro-hello.glade:72
 msgid ""
 "Thank you for joining our community!\n"
 "\n"
@@ -39,84 +31,100 @@ msgid ""
 "your feedback."
 msgstr ""
 
-#: ../ui/manjaro-hello.glade:182
+#: ../ui/manjaro-hello.glade:90
 msgid "DOCUMENTATION"
 msgstr ""
 
-#: ../ui/manjaro-hello.glade:196
+#: ../ui/manjaro-hello.glade:104
 msgid "SUPPORT"
 msgstr ""
 
-#: ../ui/manjaro-hello.glade:210
+#: ../ui/manjaro-hello.glade:118
 msgid "PROJECT"
 msgstr ""
 
-#: ../ui/manjaro-hello.glade:222
+#: ../ui/manjaro-hello.glade:130
 msgid "Read me"
 msgstr ""
 
-#: ../ui/manjaro-hello.glade:236
+#: ../ui/manjaro-hello.glade:144
 msgid "Release info"
 msgstr ""
 
-#: ../ui/manjaro-hello.glade:251
+#: ../ui/manjaro-hello.glade:159
 msgid "Wiki"
 msgstr ""
 
-#: ../ui/manjaro-hello.glade:256 ../ui/manjaro-hello.glade:287
-#: ../ui/manjaro-hello.glade:304 ../ui/manjaro-hello.glade:321
-#: ../ui/manjaro-hello.glade:338 ../ui/manjaro-hello.glade:355
+#: ../ui/manjaro-hello.glade:164 ../ui/manjaro-hello.glade:195
+#: ../ui/manjaro-hello.glade:212 ../ui/manjaro-hello.glade:229
+#: ../ui/manjaro-hello.glade:246 ../ui/manjaro-hello.glade:263
 msgid "Web resource"
 msgstr ""
 
-#: ../ui/manjaro-hello.glade:268
+#: ../ui/manjaro-hello.glade:176
 msgid "Get involved"
 msgstr ""
 
-#: ../ui/manjaro-hello.glade:282
+#: ../ui/manjaro-hello.glade:190
 msgid "Forums"
 msgstr ""
 
-#: ../ui/manjaro-hello.glade:299
-msgid "Chat room"
+#: ../ui/manjaro-hello.glade:207
+msgid "Discover software"
 msgstr ""
 
-#: ../ui/manjaro-hello.glade:316
+#: ../ui/manjaro-hello.glade:224
 msgid "Mailling lists"
 msgstr ""
 
-#: ../ui/manjaro-hello.glade:333
+#: ../ui/manjaro-hello.glade:241
 msgid "Development"
 msgstr ""
 
-#: ../ui/manjaro-hello.glade:350
+#: ../ui/manjaro-hello.glade:258
 msgid "Donate"
 msgstr ""
 
-#: ../ui/manjaro-hello.glade:469
+#: ../ui/manjaro-hello.glade:377
 msgid "Launch at start"
 msgstr ""
 
-#: ../ui/manjaro-hello.glade:500
+#: ../ui/manjaro-hello.glade:408
 msgid "INSTALLATION"
 msgstr ""
 
-#: ../ui/manjaro-hello.glade:512
+#: ../ui/manjaro-hello.glade:420
 msgid "Launch installer"
 msgstr ""
 
-#: ../ui/manjaro-hello.glade:525
+#: ../ui/manjaro-hello.glade:439
 msgid "Applications"
 msgstr ""
 
-#: ../ui/manjaro-hello.glade:529
+#: ../ui/manjaro-hello.glade:443
 msgid "Common application selection"
 msgstr ""
 
-#: ../ui/manjaro-hello.glade:564
+#: ../ui/manjaro-hello.glade:456
+msgid "Gnome Layouts Manager"
+msgstr ""
+
+#: ../ui/manjaro-hello.glade:460
+msgid "Manjaro Gnone config tool"
+msgstr ""
+
+#: ../ui/manjaro-hello.glade:504
+msgid "Home"
+msgstr ""
+
+#: ../ui/manjaro-hello.glade:515 ../ui/manjaro-hello.glade:586
+msgid "About"
+msgstr ""
+
+#: ../ui/manjaro-hello.glade:591
 msgid "Welcome screen for Manjaro"
 msgstr ""
 
-#: ../src/manjaro_hello.py:245
+#: ../src/manjaro_hello.py:306
 msgid "Can't load page."
 msgstr ""

src/__init__.py

@@ -1,2 +1,2 @@
 __all__ = ["manjaro_hello"]
-__version__ = "0.6.3"
+__version__ = "0.6.6"

src/manjaro_hello.py

@@ -219,7 +219,7 @@ class Hello(Gtk.Window):
             "label": {
                 "autostartlabel",
                 "development",
-                "chat",
+                "discover",
                 "donate",
                 "firstcategory",
                 "forum",
@@ -239,7 +239,7 @@ class Hello(Gtk.Window):
                 "about",
                 "home",
                 "development",
-                "chat",
+                "discover",
                 "donate",
                 "forum",
                 "mailling",