[rkward-cvs] [rkward] /: Adjust more urls
Thomas Friedrichsmeier
thomas.friedrichsmeier at ruhr-uni-bochum.de
Tue Jan 20 15:10:06 UTC 2015
Git commit ef0e4bb13c615f4f86f35324e1267902a56c1b47 by Thomas Friedrichsmeier.
Committed on 20/01/2015 at 15:09.
Pushed by tfry into branch 'master'.
Adjust more urls
M +1 -1 macports/README.MacOSX
M +1 -1 rkward/dialogs/rkerrordialog.cpp
M +1 -1 rkward/pages/rkward_trouble_shooting.rkh
M +2 -2 rkward/rbackend/rkrbackend.cpp
M +1 -1 rkward/rkward.cpp
M +1 -1 rkward/windows/rkwindowcatcher.cpp
M +1 -1 windows_nsis/installer.nsi
http://commits.kde.org/rkward/ef0e4bb13c615f4f86f35324e1267902a56c1b47
diff --git a/macports/README.MacOSX b/macports/README.MacOSX
index 55aeb30..2b9ba23 100644
--- a/macports/README.MacOSX
+++ b/macports/README.MacOSX
@@ -96,4 +96,4 @@ Source code for all portions of this bundle should be available from the same so
o For KDE, the main page is http://www.kde.org. Technical documentation is available from http://techbase.kde.org. Information specifically about the Mac port of KDE is at http://mac.kde.org. At the time of this writing, the recommended way to obtain and build sources for KDE on Mac OSX is using MacPorts (http://www.macports.org).
o For R, the main project page is http://www.r-project.org. Current and historical sources are linked from that page. For up-to-date instructions on installing or compiling R on Mac OSX, refer to http://cran.r-project.org/bin/macosx/RMacOSX-FAQ.html.
- o For RKWard, the official source releases are linked from http://p.sf.net/rkward/downloads. This page also contains links to up-to-date instructions on compiling on various systems, as well as instructions on retrieving the most recent development sources.
+ o For RKWard, the official source releases are linked from http://rkward.kde.org/downloads. This page also contains links to up-to-date instructions on compiling on various systems, as well as instructions on retrieving the most recent development sources.
diff --git a/rkward/dialogs/rkerrordialog.cpp b/rkward/dialogs/rkerrordialog.cpp
index 5fa092f..fda90bf 100644
--- a/rkward/dialogs/rkerrordialog.cpp
+++ b/rkward/dialogs/rkerrordialog.cpp
@@ -103,7 +103,7 @@ void RKErrorDialog::reportBug (QWidget* parent_widget, const QString& message_in
dialog->setMainWidget (vbox);
QLabel *label = new QLabel (i18n ("<p><b>Where should I report bugs or wishes?</b></p><p>Please submit your bug reports or wishes at <a href=\"%1\">%1</a> or send email to <a href=\"mailto:%2\">%2</a>.</p>"
"<p><b>What information should I provide?</b></p><p>Please copy the information shown below, and fill in the details to the questions.</p>"
- , QString ("http://p.sf.net/rkward/bugs"), QString ("rkward-devel at kde.org")), vbox);
+ , QString ("http://rkward.kde.org/bugs"), QString ("rkward-devel at kde.org")), vbox);
label->setWordWrap (true);
label->setOpenExternalLinks (true);
QTextEdit *details = new QTextEdit (vbox);
diff --git a/rkward/pages/rkward_trouble_shooting.rkh b/rkward/pages/rkward_trouble_shooting.rkh
index f846ba3..33dc06c 100644
--- a/rkward/pages/rkward_trouble_shooting.rkh
+++ b/rkward/pages/rkward_trouble_shooting.rkh
@@ -2,7 +2,7 @@
<document>
<title>Trouble Shooting</title>
<summary>
- RKWard is far from complete and certainly there are many issues that need to be fixed. However, some of the things you notice are not due to the nature of RKWard but R or something else. This section will try to cover some common issues. See also <link href="http://p.sf.net/rkward/faq">the online FAQ</link>.
+ RKWard is far from complete and certainly there are many issues that need to be fixed. However, some of the things you notice are not due to the nature of RKWard but R or something else. This section will try to cover some common issues. See also <link href="http://rkward.kde.org/faq">the online FAQ</link>.
</summary>
<section title="The "Analysis" menu is missing, or shows up as "(no label)"" shorttitle="Missing menu items" id="missing_menu_items">
This problem will often occur, when moving an RKWard installation to a different path, esp. on Windows and Mac. You may have to visit
diff --git a/rkward/rbackend/rkrbackend.cpp b/rkward/rbackend/rkrbackend.cpp
index 2656a04..d25bb97 100644
--- a/rkward/rbackend/rkrbackend.cpp
+++ b/rkward/rbackend/rkrbackend.cpp
@@ -1555,11 +1555,11 @@ void RKRBackend::initialize (const char *locale_dir) {
QString error_messages;
if (lib_load_fail) {
error_messages.append (i18n ("</p>\t- The 'rkward' R-library either could not be loaded at all, or not in the correct version. This may lead to all sorts of errors, from single missing features to complete failure to function. The most likely cause is that the last installation did not place all files in the correct place. However, in some cases, left-overs from a previous installation that was not cleanly removed may be the cause.</p>\
- <p><b>You should quit RKWard, now, and fix your installation</b>. For help with that, see <a href=\"http://p.sf.net/rkward/compiling\">http://p.sf.net/rkward/compiling</a>.</p>\n"));
+ <p><b>You should quit RKWard, now, and fix your installation</b>. For help with that, see <a href=\"http://rkward.kde.org/compiling\">http://rkward.kde.org/compiling</a>.</p>\n"));
}
if (sink_fail) {
error_messages.append (i18n ("<p>\t-There was a problem setting up the communication with R. Most likely this indicates a broken installation.</p>\
- <p><b>You should quit RKWard, now, and fix your installation</b>. For help with that, see <a href=\"http://p.sf.net/rkward/compiling\">http://p.sf.net/rkward/compiling</a>.</p></p>\n"));
+ <p><b>You should quit RKWard, now, and fix your installation</b>. For help with that, see <a href=\"http://rkward.kde.org/compiling\">http://rkward.kde.org/compiling</a>.</p></p>\n"));
}
RBackendRequest req (true, RBackendRequest::Started);
diff --git a/rkward/rkward.cpp b/rkward/rkward.cpp
index e62dff1..2810f22 100644
--- a/rkward/rkward.cpp
+++ b/rkward/rkward.cpp
@@ -194,7 +194,7 @@ void RKWardMainWindow::doPostInit () {
// Check installation first
QFile resource_ver (RKCommonFunctions::getRKWardDataDir () + "resource.ver");
if (!(resource_ver.open (QIODevice::ReadOnly) && (resource_ver.read (100).trimmed () == RKWARD_VERSION))) {
- KMessageBox::error (this, i18n ("<p>RKWard either could not find its resource files at all, or only an old version of those files. The most likely cause is that the last installation failed to place the files in the correct place. This can lead to all sorts of problems, from single missing features to complete failure to function.</p><p><b>You should quit RKWard, now, and fix your installation</b>. For help with that, see <a href=\"http://p.sf.net/rkward/compiling\">http://p.sf.net/rkward/compiling</a>.</p>"), i18n ("Broken installation"), KMessageBox::Notify | KMessageBox::AllowLink);
+ KMessageBox::error (this, i18n ("<p>RKWard either could not find its resource files at all, or only an old version of those files. The most likely cause is that the last installation failed to place the files in the correct place. This can lead to all sorts of problems, from single missing features to complete failure to function.</p><p><b>You should quit RKWard, now, and fix your installation</b>. For help with that, see <a href=\"http://rkward.kde.org/compiling\">http://rkward.kde.org/compiling</a>.</p>"), i18n ("Broken installation"), KMessageBox::Notify | KMessageBox::AllowLink);
}
QVariantList open_urls = RKGlobals::startup_options.take ("initial_urls").toList ();
diff --git a/rkward/windows/rkwindowcatcher.cpp b/rkward/windows/rkwindowcatcher.cpp
index c79a52c..d0fa9e1 100644
--- a/rkward/windows/rkwindowcatcher.cpp
+++ b/rkward/windows/rkwindowcatcher.cpp
@@ -68,7 +68,7 @@ void RKWindowCatcher::stop (int new_cur_device) {
#endif
} else {
#if defined Q_WS_MAC
- KMessageBox::information (0, i18n ("You have tried to embed a new R graphics device window in RKWard. However, this is not currently supported in this build of RKWard on Mac OS X. See http://p.sf.net/rkward/mac for more information."), i18n ("Could not embed R X11 window"), "embed_x11_device_not_supported");
+ KMessageBox::information (0, i18n ("You have tried to embed a new R graphics device window in RKWard. However, this is not currently supported in this build of RKWard on Mac OS X. See http://rkward.kde.org/mac for more information."), i18n ("Could not embed R X11 window"), "embed_x11_device_not_supported");
#else
RKErrorDialog::reportableErrorMessage (0, i18n ("You have tried to embed a new R graphics device window in RKWard. However, either no window was created, or RKWard failed to detect the new window. If you think RKWard should have done better, consider reporting this as a bug. Alternatively, you may want to adjust Settings->Configure RKWard->Onscreen Graphics."), QString (), i18n ("Could not embed R X11 window"), "failure_to_detect_x11_device");
#endif
diff --git a/windows_nsis/installer.nsi b/windows_nsis/installer.nsi
index 02c66bb..baab9e6 100644
--- a/windows_nsis/installer.nsi
+++ b/windows_nsis/installer.nsi
@@ -155,7 +155,7 @@ Function WelcomeCreate
${NSD_CreateLabel} 0 0 100% 20u "Welcome to the RKWard on Windows installer."
${NSD_CreateLabel} 0 21u 100% 32u "RKWard on Windows is still young, and installation is a bit cumbersome, but we'll talk you through the needed steps.$\r$\nNote that you need to install R and KDE _before_ you can install RKWard.$\r$\nPlease DO read these instructions, first:"
- !insertmacro MakeExternalLink 62u "READ ME: Installing RKWard on Windows" "http://p.sf.net/rkward/windows"
+ !insertmacro MakeExternalLink 62u "READ ME: Installing RKWard on Windows" "http://rkward.kde.org/windows"
${NSD_CreateLabel} 0 86u 100% 16u "These links to R and KDE, may also be helpful:"
!insertmacro MakeExternalLink 102u "Download R installer" ${R_DOWNLOAD_URL}
------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
http://p.sf.net/sfu/gigenet
_______________________________________________
rkward-cvs mailing list
rkward-cvs at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rkward-cvs
More information about the rkward-tracker
mailing list