Adjust studio's translations.

common/modules/automirror/main.py

@@ -111,8 +111,8 @@ def getcountrycode():
             with urllib.request.urlopen(geoipurl, timeout=75) as http_response:
                 localedata = json.loads(http_response.read().decode())
         except HTTPError as http_error:
-            logging.http_error("Data not retrieved because %s - URL: %s",
+            logging.error("Data not retrieved because %s - URL: %s",
-                               http_error, geoipurl)
+                          http_error, geoipurl)
         except URLError as url_error:
             if isinstance(url_error.reason, socket.timeout):
                 logging.error("Socket timed out - URL %s", geoipurl)

debian/calamares-settings-ubuntustudio.install

@@ -1,5 +1,5 @@
 ubuntustudio/branding/ etc/calamares/
 ubuntustudio/calamares-logs-helper usr/bin/
-ubuntustudio/ubuntustudio-calamares.desktop usr/share/applications/
 ubuntustudio/modules/ etc/calamares/
 ubuntustudio/settings.conf etc/calamares/
+ubuntustudio/ubuntustudio-calamares.desktop usr/share/applications/

debian/changelog

@@ -1,10 +1,16 @@
-calamares-settings-ubuntu (1:20.10.0) UNRELEASED; urgency=medium
+calamares-settings-ubuntu (1:20.10.1) groovy; urgency=medium
 
-  [Erich Eickmeyer]
+  [ Erich Eickmeyer ]
   * Added Ubuntu Studio
   * Welcome to the Groovy Gorilla!
 
- -- Erich Eickmeyer <erich@ericheickmeyer.com>  Thu, 14 May 2020 22:32:31 -0700
+  [ apt-ghetto ]
+  * Fix AttributeError in automirror module (LP: #1875476)
+
+  [ Dan Simmons ]
+  * Adjust Ubuntu Studio translations.
+
+ -- Dan Simmons <kc2bez@lubuntu.me>  Wed, 20 May 2020 20:19:54 -0400
 
 calamares-settings-ubuntu (1:20.04.2) focal; urgency=medium
 

debian/control

@@ -3,9 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
 Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
-Build-Depends: debhelper (>= 12),
+Build-Depends: debhelper (>= 12), intltool, qttools5-dev-tools
-               intltool,
-               qttools5-dev-tools
 Standards-Version: 4.5.0
 Homepage: https://code.launchpad.net/ubuntu-calamares-settings
 Vcs-Git: https://git.launchpad.net/ubuntu-calamares-settings
@@ -25,10 +23,7 @@ Description: Lubuntu Calamares Settings and Branding
 
 Package: calamares-settings-ubuntu-common
 Architecture: any
-Depends: calamares (>= 3.2.14~),
+Depends: calamares (>= 3.2.14~), python3, squashfs-tools, ${misc:Depends}
-         squashfs-tools,
-         python3,
-         ${misc:Depends}
 Description: Common Calamares Settings
  This package contains the common Calamares settings for all flavors.
  There is also a automirror Python script to set sources based on
@@ -40,9 +35,8 @@ Depends: calamares-settings-ubuntu-common (>= ${binary:Version}),
          ${misc:Depends}
 Breaks: calamares-settings-lubuntu
 Conflicts: calamares-settings-lubuntu
-Description: Lubuntu Calamares Settings and Branding
+Description: Ubuntu Studio Calamares Settings and Branding
- This package contains the Calamares settings and branding for Lubuntu.
+ This package contains the Calamares settings and branding for Ubuntu Studio.
  As part of the branding the installer slideshow is contained within.
- The settings ensure a proper Lubuntu desktop is installed with the
+ The settings ensure a proper Ubuntu Studio desktop is installed with the
- LXQt desktop environment.
+ KDE Plasma desktop environment.
- 

ubuntustudio/po/Makefile

@@ -5,7 +5,7 @@ POTFILES := $(shell cat POTFILES.in)
 all: generate-po-files
 
 generate-pot: POTFILES.in
-	intltool-update --pot --gettext-package=calamares-settings-lubuntu
+	intltool-update --pot --gettext-package=calamares-settings-ubuntustudio
 
 generate-po-files:
 	for i in $(POTFILES); do \
@@ -16,7 +16,7 @@ generate-po-files:
 update-po:
 	for i in *.po; do \
 		code=$$(echo $$i | sed 's/.po//'); \
-		intltool-update --gettext-package=calamares-settings-lubuntu --dist $$code; \
+		intltool-update --gettext-package=calamares-settings-ubuntustudio --dist $$code; \
 	done
 
 # vim:ts=4

ubuntustudio/po/POTFILES.in

@@ -1 +1 @@
-lubuntu-calamares.desktop.in
+ubuntustudio-calamares.desktop.in

ubuntustudio/po/calamares-settings-lubuntu.pot

@@ -1,4 +1,4 @@
-# Base translation file for Lubuntu's Calamares settings
+# Base translation file for Ubuntu Studio's Calamares settings
 # Copyright (C) 2018 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
 # This file is distributed under the same license as the package.
 # Simon Quigley <tsimonq2@ubuntu.com>, 2018.
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lubuntu-calamares.desktop.in.h:1
+#: ../ubuntustudio-calamares.desktop.in.h:1
-msgid "Install Lubuntu 20.04 LTS"
+msgid "Install Ubuntu Studio 20.10"
 msgstr ""
 
-#: ../lubuntu-calamares.desktop.in.h:2
+#: ../ubuntustudio-calamares.desktop.in.h:2
-msgid "Install Lubuntu"
+msgid "Install Ubuntu Studio"
 msgstr ""
 
 #: ../lubuntu-calamares.desktop.in.h:3