More removal of Logitech references

LMS-Community · Mar 28, 2024 · 416743f · 416743f
1 parent cb7deb0
commit 416743f
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 23 deletions.
diff --git a/HTML/Classic/pageheader.html b/HTML/Classic/pageheader.html
@@ -49,7 +49,7 @@
 
 <div id="topGraphicBox">
 	<div id="sdi_logo">
-		<a href="https://www.lyrion.org/" target="sdi"><img src="[% webroot %]html/images/slimdevices_logo.gif" alt="Logitech" width="150" height="17"></a>
+		<a href="https://www.lyrion.org/" target="sdi"><img src="[% webroot %]html/images/slimdevices_logo.gif" alt="Lyrion" width="150" height="17"></a>
 	</div>
 	<div id="topGraphicMenu1">
 		<div class="largeAttribute">[% pagetitle | html %][% IF artwork && (levelName == 'album' || levelName == 'age')%] [% "GALLERY" | string %][% END %]</div>

diff --git a/HTML/Default/html/docs/help.html b/HTML/Default/html/docs/help.html
@@ -26,7 +26,7 @@
 
 		<div id="header">
 			<span><img src="[% webroot %]html/images/spacer.gif" id="squeezeboxLogo"></span>
-			<span><a href="https://www.lyrion.org" target="_blank"><img src="[% webroot %]html/images/spacer.gif" id="logitechLogo"></a></span>
+			<span><a href="https://www.lyrion.org" target="_blank"><img src="[% webroot %]html/images/spacer.gif" id="lyrionLogo"></a></span>
 		</div>
 
 		<div id="inner_header">

diff --git a/HTML/Default/index.html b/HTML/Default/index.html
@@ -124,7 +124,7 @@
 		<div id="header">
 				<span><a href="[% webroot %]"><img src="[% webroot %]html/images/spacer.gif" id="squeezeboxLogo"></a></span>
 				<span id="playerChooser"></span>
-				<span><a href="https://www.lyrion.org" target="_blank"><img src="[% webroot %]html/images/spacer.gif" id="logitechLogo"></a></span>
+				<span><a href="https://www.lyrion.org" target="_blank"><img src="[% webroot %]html/images/spacer.gif" id="lyrionLogo"></a></span>
 		</div>
 
 

diff --git a/HTML/Default/settings/index.html b/HTML/Default/settings/index.html
@@ -61,7 +61,7 @@
 
 		<div id="header">
 			<span><a href="[% webroot %]" target="sc_main"><img src="[% webroot %]html/images/spacer.gif" id="squeezeboxLogo"></a></span>
-			<span><a href="https://www.lyrion.org" target="_blank"><img src="[% webroot %]html/images/spacer.gif" id="logitechLogo"></a></span>
+			<span><a href="https://www.lyrion.org" target="_blank"><img src="[% webroot %]html/images/spacer.gif" id="lyrionLogo"></a></span>
 		</div>
 
 		<div id="inner_header">

diff --git a/HTML/Default/skin.css b/HTML/Default/skin.css
diff --git a/HTML/Default/slimserver.css b/HTML/Default/slimserver.css
@@ -151,7 +151,7 @@ div#background {
 	background: url(html/images/logitech_media_server.png) no-repeat;
 }
 
-#logitechLogo {
+#lyrionLogo {
 	position: absolute;
 	top: 0px;
 	right: 20px;

diff --git a/HTML/EN/html/docs/remotestreaming.html.de b/HTML/EN/html/docs/remotestreaming.html.de
@@ -21,7 +21,7 @@
 </ul>
 <h2>Passwort Sicherheit:</h2>
 <ul>
- <li>Wenn Sie ein Passwort f&uuml;r die Lyrion Music Server Software eingerichtet haben, m&uuml;ssen Sie die Web Adresse f&uuml;r den Zugang zum Logitechmedia Server anpassen: http://benutzername:passwort@localhost:9000/stream.mp3
+ <li>Wenn Sie ein Passwort f&uuml;r die Lyrion Music Server Software eingerichtet haben, m&uuml;ssen Sie die Web Adresse f&uuml;r den Zugang zum Lyrion Music Server anpassen: http://benutzername:passwort@localhost:9000/stream.mp3
  <li>Bitte benutzen Sie nur eigene Ger&auml;te, wenn Sie die Passwort Sicherheit f&uuml;r den Lyrion Music Server Software eingerichtet haben, oder l&ouml;schen nach Gebrauch die den Verlauf, da andernfalls Ihre Zugangsdaten in fremde H&auml;nde gelangen.
 </ul>
 <h2>Erweiterte Funktionen nutzen:</h2>

diff --git a/HTML/EN/settings/server/wizard.html b/HTML/EN/settings/server/wizard.html
@@ -279,7 +279,7 @@
 					</select>
 					<input name="saveLanguage" type="hidden" value="1">
 				</form>
-				<a href="https://www.lyrion.org" target="_blank"><img src="[% webroot %]html/images/spacer.gif" id="logitechLogo"></a>
+				<a href="https://www.lyrion.org" target="_blank"><img src="[% webroot %]html/images/spacer.gif" id="lyrionLogo"></a>
 			</span>
 		</div>
 

diff --git a/HTML/README.txt b/HTML/README.txt
@@ -5,15 +5,15 @@ They are written using Template Toolkit - https://www.tt2.org/
 ---------
 
 Classic:
-	Owner: Logitech Inc.
+	Owner: The Lyrion Community.
 	Description: This is the previous Official skin for Lyrion Music Server
 
 Default:
-	Owner: Logitech Inc.
+	Owner: The Lyrion Community.
 	Description: This is the Official skin for Lyrion Music Server
 
 EN:
-	Owner: Logitech Inc.
+	Owner: The Lyrion Community.
 	Description: Base template elements and generic fallback HTML for other skins.
 
 Previously available skins (Fishbone, Handheld, Nokia770, ScreenReader, Touch)

diff --git a/Slim/Plugin/UPnP/Discovery.pm b/Slim/Plugin/UPnP/Discovery.pm
@@ -47,7 +47,7 @@ sub init {
 
 	# Construct Server header for later use
 	my $details = Slim::Utils::OSDetect::details();
-	$SERVER = $details->{os} . '/' . $details->{osArch} . ' UPnP/1.0 DLNADOC/1.50 LogitechMediaServer/' . $::VERSION . '/' . $::REVISION;
+	$SERVER = $details->{os} . '/' . $details->{osArch} . ' UPnP/1.0 DLNADOC/1.50 LyrionMusicServer/' . $::VERSION . '/' . $::REVISION;
 
 	# Test if we can use ReusePort
 	my $hasReusePort = eval {

diff --git a/Slim/Utils/Light.pm b/Slim/Utils/Light.pm
@@ -230,7 +230,7 @@ sub checkForUpdate {
 
 		chomp;
 
-		if (/(?:LogitechMediaServer|Squeezebox|SqueezeCenter).*/i) {
+		if (/LyrionMusicServer.*/i) {
 			$installer = $_;
 			last;
 		}

diff --git a/Slim/Utils/Update.pm b/Slim/Utils/Update.pm
@@ -28,9 +28,6 @@ my $versionFile;
 sub checkVersion {
 	my $cb = shift;
 
-	# clean up old download location
-	Slim::Utils::Misc::deleteFiles($prefs->get('cachedir'), qr/^(?:Squeezebox|SqueezeCenter|LogitechMediaServer).*\.(pkg|dmg|exe)(\.tmp)?$/i);
-
 	Slim::Utils::Timers::killTimers(0, \&checkVersion);
 
 	# don't check for updates when running from the source
@@ -317,7 +314,7 @@ sub getUpdateInstaller {
 
 		chomp;
 
-		if (/(?:LogitechMediaServer|Squeezebox|SqueezeCenter).*/) {
+		if (/LyrionMusicServer.*/) {
 			$updateInstaller = $_;
 			last;
 		}
@@ -344,7 +341,7 @@ sub cleanup {
 
 	my $ext = $os->installerExtension() . ($additionalExt ? "\.$additionalExt" : '');
 
-	Slim::Utils::Misc::deleteFiles($path, qr/^(?:LogitechMediaServer|Squeezebox|SqueezeCenter).*\.$ext$/i);
+	Slim::Utils::Misc::deleteFiles($path, qr/^LyrionMusicServer.*\.$ext$/i);
 }
 
 1;
diff --git a/strings.txt b/strings.txt
@@ -12070,22 +12070,22 @@ NO_TITLE
 
 THOUSANDS_SEP
 # SLT: this is the separator used to separate thousands as in 10'000'000.00 ([[http://en.wikipedia.org/wiki/Thousands_separator]])
-	CS
+	CS	 
 	DA	,
 	DE	.
 	EN	,
 	ES	.
-	FI
-	FR
+	FI	 
+	FR	 
 	HE	,
 	IT	.
 	JA	,
 	NL	,
 	NO	.
-	PL
+	PL	 
 	PT	.
 	RU	,
-	SV
+	SV	 
 	ZH_CN	,
 
 BYTES