diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-01-20 01:32:38 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-01-20 01:32:38 +0100 |
| commit | 222d3c0dc5a8b8a9e93b9368e964cda7becc7f02 (patch) | |
| tree | 9ab4538f2e80847874a7c9a5c7c2dbc099cb8cae /logic/NagUtils.cpp | |
| parent | 48b587e7b6b96b5c3ac17dc8b67a7b0ab9c2c4f0 (diff) | |
| parent | 3a3c9ac9515447941d383f2c4fe4b0225fdd8252 (diff) | |
| download | PrismLauncher-222d3c0dc5a8b8a9e93b9368e964cda7becc7f02.tar.gz PrismLauncher-222d3c0dc5a8b8a9e93b9368e964cda7becc7f02.tar.bz2 PrismLauncher-222d3c0dc5a8b8a9e93b9368e964cda7becc7f02.zip | |
Merge branch 'release-0.2'
Diffstat (limited to 'logic/NagUtils.cpp')
| -rw-r--r-- | logic/NagUtils.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/logic/NagUtils.cpp b/logic/NagUtils.cpp index 6f81b3c7..c963a98a 100644 --- a/logic/NagUtils.cpp +++ b/logic/NagUtils.cpp @@ -23,15 +23,15 @@ void checkJVMArgs(QString jvmargs, QWidget *parent) if (jvmargs.contains("-XX:PermSize=") || jvmargs.contains(QRegExp("-Xm[sx]"))) { CustomMessageBox::selectable( - parent, parent->tr("JVM arguments warning"), - parent->tr("You tried to manually set a JVM memory option (using " - " \"-XX:PermSize\", \"-Xmx\" or \"-Xms\") - there" - " are dedicated boxes for these in the settings (Java" - " tab, in the Memory group at the top).\n" - "Your manual settings will be overridden by the" - " dedicated options.\n" - "This message will be displayed until you remove them" - " from the JVM arguments."), + parent, QObject::tr("JVM arguments warning"), + QObject::tr("You tried to manually set a JVM memory option (using " + " \"-XX:PermSize\", \"-Xmx\" or \"-Xms\") - there" + " are dedicated boxes for these in the settings (Java" + " tab, in the Memory group at the top).\n" + "Your manual settings will be overridden by the" + " dedicated options.\n" + "This message will be displayed until you remove them" + " from the JVM arguments."), QMessageBox::Warning)->exec(); } } |