← Back to branch summary

~keithsalisbury/mixxx/features_key_preferences

« back to all changes in this revision

Viewing changes to mixxx/src/mixxx.cpp

  • Committer: RJ Ryan
  • Date: 2012-01-07 06:23:03 UTC
  • mfrom: (2837.3.6 mixxx-1.10)
  • Revision ID: rryan@mit.edu-20120107062303-t3frj9pvngzu6chn
Merging from lp:mixxx/1.10

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/src/mixxx.cpp
1183
1183
    }
1184
1184
    about->version_label->setText(version.join(" "));
1185
1185
 
 
1186
    QString s_devTeam=QString(tr("Mixxx %1 Development Team")).arg(VERSION);
 
1187
    QString s_contributions=tr("With contributions from:");
 
1188
    QString s_specialThanks=tr("And special thanks to:");
 
1189
    QString s_pastDevs=tr("Past Developers");
 
1190
    QString s_pastContribs=tr("Past Contributors");
 
1191
 
1186
1192
    QString credits =
1187
 
    QString("<p align=\"center\"><b>Mixxx %1 Development Team</b></p>"
 
1193
    QString("<p align=\"center\"><b>%1</b></p>"
1188
1194
"<p align=\"center\">"
1189
1195
"Adam Davison<br>"
1190
1196
"Albert Santoni<br>"
1199
1205
"Vittorio Colao<br>"
1200
1206
 
1201
1207
"</p>"
1202
 
"<p align=\"center\"><b>With contributions from:</b></p>"
 
1208
"<p align=\"center\"><b>%2</b></p>"
1203
1209
"<p align=\"center\">"
1204
1210
"Mark Hills<br>"
1205
1211
"Andre Roth<br>"
1248
1254
"Jonathan Costers<br>"
1249
1255
 
1250
1256
"</p>"
1251
 
"<p align=\"center\"><b>And special thanks to:</b></p>"
 
1257
"<p align=\"center\"><b>%3</b></p>"
1252
1258
"<p align=\"center\">"
1253
1259
"Vestax<br>"
1254
1260
"Stanton<br>"
1266
1272
"Joseph Mattiello<br>"
1267
1273
"</p>"
1268
1274
 
1269
 
"<p align=\"center\"><b>Past Developers</b></p>"
 
1275
"<p align=\"center\"><b>%4</b></p>"
1270
1276
"<p align=\"center\">"
1271
1277
"Tue Haste Andersen<br>"
1272
1278
"Ken Haste Andersen<br>"
1286
1292
"Ryan Baker<br>"
1287
1293
"</p>"
1288
1294
 
1289
 
"<p align=\"center\"><b>Past Contributors</b></p>"
 
1295
"<p align=\"center\"><b>%5</b></p>"
1290
1296
"<p align=\"center\">"
1291
1297
"Ludek Hor&#225;cek<br>"
1292
1298
"Svein Magne Bang<br>"
1320
1326
"Michael Pujos<br>"
1321
1327
"Claudio Bantaloukas<br>"
1322
1328
"Pavol Rusnak<br>"
1323
 
    "</p>").arg(VERSION);
 
1329
    "</p>").arg(s_devTeam,s_contributions,s_specialThanks,s_pastDevs,s_pastContribs);
1324
1330
 
1325
1331
    about->textBrowser->setHtml(credits);
1326
1332
    about->show();