applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-26 08:58:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

implement http://calamares.io/bugs/browse/CAL-185

Browse source
This commit is contained in:
demmm 2015-03-31 13:13:55 -04:00 • committed by Teo Mrnjavac
parent cff7fbef1f
commit 4088d9bd3b
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/branding/default/branding.desc
View file

@ -9,6 +9,8 @@ strings:
versionedName: Generic GNU/Linux 1.0 LTS "Rusty Trombone" versionedName: Generic GNU/Linux 1.0 LTS "Rusty Trombone"
shortVersionedName: Generic 1.0 shortVersionedName: Generic 1.0
bootloaderEntryName: Generic bootloaderEntryName: Generic
productURL: http://calamares.github.io/
urlText: Known Issues
images: images:
productLogo: "squid.png" productLogo: "squid.png"

11
src/modules/greeting/GreetingPage.cpp
View file

@ -1,6 +1,6 @@
/* === This file is part of Calamares - <http://github.com/calamares> === /* === This file is part of Calamares - <http://github.com/calamares> ===
* *
* Copyright 2014, Teo Mrnjavac <teo@kde.org> * Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -123,11 +123,16 @@ GreetingPage::GreetingPage( QWidget* parent )
CALAMARES_RETRANSLATE( CALAMARES_RETRANSLATE(
ui->mainText->setText( tr( "<h1>Welcome to the %1 installer.</h1><br/>" ui->mainText->setText( tr( "<h1>Welcome to the %1 installer.</h1><br/>"
"This program will ask you some questions and " "This program will ask you some questions and "
"set up %2 on your computer." ) "set up %2 on your computer."
"<a href=\"%3\"> %4 </a>" )
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::VersionedName ) ) string( Calamares::Branding::VersionedName ) )
.arg( Calamares::Branding::instance()-> .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, ui->aboutButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Information,