| Application name | ',"\n"; + echo '||||||||
| OS name | ',"\n"; echo '||||||||
| Keywords | ',"\n"; echo '||||||||
| Application description (In your own words) | ',"\n"; + echo '||||||||
| OS description (In your own words) | ',"\n"; echo '
| Application Name | \n"; + echo "OS Name | \n"; echo "Description | \n"; echo "
| Application Version | ',"\n"; + echo 'OS Version | ',"\n"; echo 'Submitter | ',"\n"; echo 'Date Submitted | ',"\n"; - echo 'Wine version | ',"\n"; + echo 'QEMU version | ',"\n"; echo 'Installs? | ',"\n"; echo 'Runs? | ',"\n"; echo 'Rating | ',"\n"; diff --git a/include/form_new.php b/include/form_new.php index 1906225..da6989f 100644 --- a/include/form_new.php +++ b/include/form_new.php @@ -23,7 +23,7 @@ The password will be sent to your e-mailWine version | "; + echo " |
| QEMU version | "; echo make_bugzilla_version_list("sWineRelease", isset($aClean['sWineRelease']) ? $aClean['sWineRelease'] : ''); echo " |
| "; - echo 'Application | '.$oApp->sName; + echo 'OS | '.$oApp->sName; echo ' |
| Why you want to and should be an application super maintainer | ||
| Why you want to and should be an OS super maintainer | ||
| Why you want to and should be an application maintainer | ||
| Why you want to and should be an OS maintainer |
You do not maintain any apps
'; + echo 'You do not maintain any OSes
'; else - echo "{$oUser->sRealname} does not maintain any apps
"; + echo "{$oUser->sRealname} does not maintain any OSes
"; return; } if($this->bViewingSelf) - echo 'Viewing your maintained apps
'; + echo 'Viewing your maintained OSes:
'; else - echo "Viewing {$oUser->sRealname}'s maintained apps
"; + echo "Viewing {$oUser->sRealname}'s maintained OSes:
"; $oTable = new Table(); $oTableRow = new TableRow(); $oTableRow->setClass('color4'); $oTable->setCellSpacing(0); $oTable->setCellPadding(3); - $oTableRow->AddTextCell('Application'); + $oTableRow->AddTextCell('OS'); $oTableRow->AddTextCell('Version'); $oTableRow->AddTextCell('Current Rating'); $oTableRow->AddTextCell('Current Version'); diff --git a/include/objectManager.php b/include/objectManager.php index e345020..c9c92b7 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -148,7 +148,7 @@ class ObjectManager "problem you have with this app, if there are not bugs filed already". " at http://bugs.winehq.org. If you want some advice or guidance on". " this, please visit http://forum.winehq.org"; - $this->aCommonResponses[] = "Please do not paste debug output in the AppDB,". + $this->aCommonResponses[] = "Please do not paste debug output in the OS DB,". " it belongs only as an attachment on bugzilla."; $this->aCommonResponses[] = "We appreciate your submission but it". " needs to be more detailed before it will be most useful to other users of". diff --git a/include/query.php b/include/query.php index 0c45496..8fd0b6a 100644 --- a/include/query.php +++ b/include/query.php @@ -155,7 +155,7 @@ function query_error($sQuery, $sComment, $hLink) "mysql_error(): '".mysql_error($hLink)."' ". "comment: '".$sComment."'"); - $sStatusMessage = "An internal error has occurred and has been logged and reported to appdb admins
"; + $sStatusMessage = "An internal error has occurred and has been logged and reported to OS DB admins
"; addmsg($sStatusMessage); $bInQueryError = false; // clear variable upon exit diff --git a/include/screenshot.php b/include/screenshot.php index a48b375..fc9878c 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -409,7 +409,7 @@ class screenshot $sMsg = "The screenshot you submitted for ".$sAppName." has been rejected."; } $sMsg .= $aClean['sReplyText']."\n"; - $sMsg .= "We appreciate your help in making the Application Database better for all users."; + $sMsg .= "We appreciate your help in making the Operating Systems Database better for all users."; mail_appdb($oSubmitter->sEmail, $sSubject ,$sMsg); } diff --git a/include/testData.php b/include/testData.php index 33661b1..a41122b 100644 --- a/include/testData.php +++ b/include/testData.php @@ -454,7 +454,7 @@ class testData{ break; } $sMsg .= $aClean['sReplyText']."\n"; - $sMsg .= "We appreciate your help in making the Application ". + $sMsg .= "We appreciate your help in making the Operating Systems ". "Database better for all users."; mail_appdb($oSubmitter->sEmail, $sSubject ,$sMsg); @@ -485,7 +485,7 @@ class testData{ } if($aClean['sReplyText']) { - $sMsg .= "Appdb admin reply text:\n"; + $sMsg .= "OS DB admin reply text:\n"; $sMsg .= $aClean['sReplyText']."\n"; // append the reply text, if there is any } addmsg("The test data was successfully added into the database.", "green"); @@ -550,7 +550,7 @@ class testData{ $oTableRowHeader->AddTextCell(""); $oTableRowHeader->AddTextCell("Distribution"); $oTableRowHeader->AddTextCell("Test date"); - $oTableRowHeader->AddTextCell("Wine version"); + $oTableRowHeader->AddTextCell("QEMU version"); $oTableRowHeader->AddTextCell("Installs?"); $oTableRowHeader->AddTextCell("Runs?"); $oTableRowHeader->AddTextCell("Rating"); @@ -915,13 +915,13 @@ class testData{ echo 'This is the screen for inputing test information so that others "; echo "looking at the database will know \n"; - echo "what was working on a particular release of Wine.
\n"; - echo "Please DO NOT include crash or Wine debug output.\n"; - echo " Instead report the crash as a bug in the Wine bugzilla at \n"; - echo "http://bugs.winehq.org.\n"; + echo "what was working on a particular release of QEMU.
\n"; + echo "Please DO NOT include crash or QEMU debug output.\n"; +/* + echo " Instead report the crash as a bug in the QEMU bugzilla at \n"; + echo "http://bugs.claunia.com.\n"; echo "We ask that you use bugzilla because developers do not monitor the AppDB \n"; echo "for bugs.
\n"; +*/ + echo " Instead report the crash as a bug to the qemu-devel mailing list at \n"; + echo "qemu-devel@nongnu.org. We ask that you use the mailing list because \n"; + echo "developers do not monitor the OS DB for bugs.\n"; + echo "Please be as detailed as you can but do not paste large \n"; echo "chunks of output from the terminal. Type out your report \n"; echo "clearly and in proper English so that it is easily readable.
\n"; diff --git a/include/url.php b/include/url.php index 0419168..6996d11 100644 --- a/include/url.php +++ b/include/url.php @@ -182,7 +182,7 @@ class Url { return false; $oAppBefore = new Application($this->iAppId); $oAppAfter = new Application($iAppId); - $sWhatChanged .= "Application was changed from ".$oAppBefore->sName." to ".$oAppAfter->sName.".\n\n"; + $sWhatChanged .= "OS was changed from ".$oAppBefore->sName." to ".$oAppAfter->sName.".\n\n"; $this->iAppId = $iAppId; } if($sWhatChanged && !$bSilent) @@ -209,7 +209,7 @@ class Url { $sMsg = "The url you submitted for ".$sAppName." has been rejected."; } $sMsg .= $aClean['sReplyText']."\n"; - $sMsg .= "We appreciate your help in making the Application Database better for all users."; + $sMsg .= "We appreciate your help in making the Operating Systems Database better for all users."; mail_appdb($oSubmitter->sEmail, $sSubject ,$sMsg); } diff --git a/include/user.php b/include/user.php index 73d47eb..531e866 100644 --- a/include/user.php +++ b/include/user.php @@ -425,13 +425,13 @@ class User { if($this->isMaintainer()) { $sSubject = "Warning: inactivity detected"; - $sMsg = "You didn't log in in the past six months to the AppDB.\r\n"; + $sMsg = "You didn't log in in the past six months to the OS DB.\r\n"; $sMsg .= "As a maintainer we would be pleased to see you once in a while.\r\n"; $sMsg .= "Please log in or you will lose your maintainer's abilities in one month.\r\n"; } else { $sSubject = "Warning: inactivity detected"; - $sMsg = "You didn't log in in the past six months to the AppDB.\r\n"; + $sMsg = "You didn't log in in the past six months to the OS DB.\r\n"; $sMsg .= "Please log in or your account will automatically be deleted in one month.\r\n"; } $sMsg .= APPDB_ROOT."account.php?sCmd=login\r\n"; diff --git a/include/version.php b/include/version.php index 60ea45c..876895a 100644 --- a/include/version.php +++ b/include/version.php @@ -219,7 +219,7 @@ class version { $this->iAppId, $this->sState, $this->iVersionId)) return false; - $sWhatChanged .= "Version was moved from application ".$oAppBefore->sName." to application ".$oAppAfter->sName.".\n\n"; + $sWhatChanged .= "Version was moved from OS ".$oAppBefore->sName." to OS ".$oAppAfter->sName.".\n\n"; } if ($this->sLicense && ($this->sLicense!=$oVersion->sLicense)) @@ -476,14 +476,14 @@ class version { $sSubject = "Submitted version rejected"; $sMsg = "The version you submitted (".$oApp->sName." ".$this->sName.") has been rejected by ".$_SESSION['current']->sRealname."."; $sMsg .= "Clicking on the link in this email will allow you to modify and resubmit the version. "; - $sMsg .= "A link to your queue of applications and versions will also show up on the left hand side of the Appdb site once you have logged in. "; + $sMsg .= "A link to your queue of OSes and versions will also show up on the left hand side of the OS DB site once you have logged in. "; $sMsg .= APPDB_ROOT."objectManager.php?sClass=version_queue". "&bIsQueue=true&bIsRejected=true&iId=".$this->iVersionId."&". "sTitle=Edit+Version\n"; break; } $sMsg .= $aClean['sReplyText']."\n"; - $sMsg .= "We appreciate your help in making the Version Database better for all users."; + $sMsg .= "We appreciate your help in making the Application Database better for all users."; mail_appdb($oSubmitter->sEmail, $sSubject ,$sMsg); } @@ -513,7 +513,7 @@ class version { } if($aClean['sReplyText']) { - $sMsg .= "Appdb admin reply text:\n"; + $sMsg .= "OS DB admin reply text:\n"; $sMsg .= $aClean['sReplyText']."\n"; // append the reply text, if there is any } @@ -634,7 +634,7 @@ class version { $oTableRow = new TableRow(); $oTableRow->SetValign("top"); - $oTableCell = new TableCell("Application"); + $oTableCell = new TableCell("OS"); $oTableCell->SetBold(true); $oTableRow->AddCell($oTableCell); @@ -744,7 +744,7 @@ class version { $errors = ""; if (empty($aValues['sVersionName'])) - $errors .= "