Merge remote-tracking branch 'upstream/master'

manjaro/kde/Packages-Desktop

@@ -150,11 +150,11 @@ breeze
 breeze-gtk
 gnome-icon-theme
 gnome-themes-standard
-gtk-theme-breath
+#gtk-theme-breath
 >extra oxygen
 >extra oxygen-kde4
 >extra oxygen-icons
-plasma5-themes-breath  # Default
+#plasma5-themes-breath  # Default
 sddm-breath-theme  # Default
 
 ## Better systray/notifications support

manjaro/kde/live-overlay/etc/xdg/kdeglobals

@@ -95,7 +95,7 @@ ForegroundVisited=145,61,136
 shadeSortColumn=true
 BrowserApplication=firefox
 ColorScheme=Breath
-Name=Breath
+Name=AdaptaBreath
 fixed=Noto Mono,9,-1,0,50,0,0,0,0,0
 font=Noto Sans,10,-1,5,50,0,0,0,0,0
 menuFont=Noto Sans,10,-1,5,50,0,0,0,0,0
@@ -106,13 +106,13 @@ XftHintStyle=hintmedium
 XftSubPixel=none
 
 [Icons]
-Theme=breath
+Theme=Papirus-Adapta-Maia
 
 [KDE]
 ChangeCursor=true
 ColorScheme=Breath
 contrast=7
-LookAndFeelPackage=org.kde.breath.desktop
+LookAndFeelPackage=org.kde.adaptabreath.desktop
 widgetStyle=breeze
 
 [WM]

shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc

@@ -4,10 +4,10 @@ componentName:  manjaro
 strings:
     productName:         Manjaro Linux
     shortProductName:    Manjaro
-    version:             18.0-beta1
-    shortVersion:        18.0-beta1
-    versionedName:       Manjaro Linux 18.0-beta1 "Illyria"
-    shortVersionedName:  Manjaro 18.0-beta1
+    version:             18.0-beta-2
+    shortVersion:        18.0-beta-2
+    versionedName:       Manjaro Linux 18.0-beta-2 "Illyria"
+    shortVersionedName:  Manjaro 18.0-beta-2
     bootloaderEntryName: Manjaro
 
 images: