diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc index d6913c1e9..95ef196fc 100644 --- a/src/branding/default/branding.desc +++ b/src/branding/default/branding.desc @@ -9,6 +9,8 @@ strings: versionedName: Generic GNU/Linux 1.0 LTS "Rusty Trombone" shortVersionedName: Generic 1.0 bootloaderEntryName: Generic + productURL: http://calamares.github.io/ + urlText: Known Issues images: productLogo: "squid.png" diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index 997bb59b4..225761552 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * Copyright 2014, Teo Mrnjavac + * Copyright 2014-2015, Teo Mrnjavac * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -52,7 +52,9 @@ QStringList Branding::s_stringEntryStrings = "versionedName", "shortVersionedName", "shortProductName", - "bootloaderEntryName" + "bootloaderEntryName", + "productURL", + "urlText" }; diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h index bddea1b70..8f09c435e 100644 --- a/src/libcalamaresui/Branding.h +++ b/src/libcalamaresui/Branding.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * Copyright 2014, Teo Mrnjavac + * Copyright 2014-2015, Teo Mrnjavac * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -44,7 +44,9 @@ public: VersionedName, ShortVersionedName, ShortProductName, - BootloaderEntryName + BootloaderEntryName, + ProductURL, + UrlText }; enum ImageEntry : short diff --git a/src/modules/greeting/GreetingPage.cpp b/src/modules/greeting/GreetingPage.cpp index 74ba07110..cc4c5492e 100644 --- a/src/modules/greeting/GreetingPage.cpp +++ b/src/modules/greeting/GreetingPage.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * Copyright 2014, Teo Mrnjavac + * Copyright 2014-2015, Teo Mrnjavac * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -123,11 +123,19 @@ GreetingPage::GreetingPage( QWidget* parent ) CALAMARES_RETRANSLATE( ui->mainText->setText( tr( "

Welcome to the %1 installer.


" "This program will ask you some questions and " - "set up %2 on your computer." ) + "set up %2 on your computer." + " Remember, this installer is still in an early stage.
" + "Not implemented yet is LUKS/LVM or RAID and
" + "using one of the automated partitioning options for UEFI installs.
" + "For GPT partioning on BIOS systems and other instructions, read %4 " ) .arg( Calamares::Branding::instance()-> string( Calamares::Branding::VersionedName ) ) .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ProductName ) ) ); + string( Calamares::Branding::ProductName ) ) + .arg( Calamares::Branding::instance()-> + string( Calamares::Branding::ProductURL ) ) + .arg( Calamares::Branding::instance()-> + string( Calamares::Branding::UrlText ) ) ); ) ui->aboutButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Information,