July 2009 - Wine-Commits - list.winehq.org

Alexander Nicolaysen Sørnes : commentview.php: Don't allow unset or 0 versionId
by Alexander Nicolaysen Sørnes July 30, 2009

July 30, 2009

Module: appdb Branch: master Commit: b8be6a22ce6e76489a745877fcc8c160143ac776 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b8be6a22ce6e76489a745877… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 30 21:53:49 2009 +0200 commentview.php: Don't allow unset or 0 versionId --- commentview.php | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/commentview.php b/commentview.php index 7f2e87f..e25774d 100644 --- a/commentview.php +++ b/commentview.php @@ -12,9 +12,15 @@ require("path.php"); require(BASE."include/incl.php"); require_once(BASE."include/comment.php"); +$iVersionId = getInput('iVersionId', $aClean); +$iThreadId = getInput('iThreadId', $aClean); + +if(!$iVersionId) + util_show_error_page_and_exit('No versionId defined'); + apidb_header("Comments"); -Comment::view_app_comments($aClean['iVersionId'], $aClean['iThreadId']); +Comment::view_app_comments($iVersionId, $iThreadId); apidb_footer(); ?>

1 0

Alexander Nicolaysen Sørnes : objectManager: Prevent accessing an undefined variable
by Alexander Nicolaysen Sørnes July 30, 2009

July 30, 2009

Module: appdb Branch: master Commit: b8ac180e11b97701d3976401cc85f043255802cb URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b8ac180e11b97701d3976401… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 30 18:28:50 2009 +0200 objectManager: Prevent accessing an undefined variable --- include/objectManager.php | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 3af090c..6b324f7 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -104,13 +104,12 @@ class ObjectManager public function setSortInfo($aClean = null) { + $this->oSortInfo = new TableSortInfo($this->makeUrl().'&'); + /* No use to continue if there are no sortable fields */ if(!$this->getOptionalSetting("objectGetSortableFields", FALSE)) return; - $this->oSortInfo = null; - $this->oSortInfo = new TableSortInfo($this->makeUrl().'&'); - if($aClean) $this->oSortInfo->ParseArray($aClean, $this->getObject()->objectGetSortableFields()); }

1 0

Alexander Nicolaysen Sørnes : bug: Correct casing for an SQL column
by Alexander Nicolaysen Sørnes July 30, 2009

July 30, 2009

Module: appdb Branch: master Commit: 5cce3b1c5f5252209c5707d66785928a1a6be372 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5cce3b1c5f5252209c5707d6… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 30 18:22:10 2009 +0200 bug: Correct casing for an SQL column --- include/bugs.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index 45a3887..4318c46 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -36,7 +36,7 @@ class Bug if(!$oRow) { $sQuery = "SELECT * FROM buglinks - WHERE linkid = '?'"; + WHERE linkId = '?'"; if($hResult = query_parameters($sQuery, $iLinkId)) { $oRow = query_fetch_object($hResult);

1 0

Alexander Nicolaysen Sørnes : bug: Prevent duplicates when moving bug links
by Alexander Nicolaysen Sørnes July 30, 2009

July 30, 2009

Module: appdb Branch: master Commit: 68d43b73d24f51839efd3d3d97323507e11ff3ea URL: http://source.winehq.org/git/appdb.git/?a=commit;h=68d43b73d24f51839efd3d3d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 30 16:58:53 2009 +0200 bug: Prevent duplicates when moving bug links --- include/bugs.php | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index 9c38fa8..45a3887 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -181,6 +181,11 @@ class Bug { $oBug = new bug($this->iLinkId); + // There is no need to have two links to a bug. The update is still + // considered successful + if($this->isDuplicate()) + return $this->delete(); + if($this->iVersionId && $this->iVersionId != $oBug->iVersionId) { $hResult = query_parameters("UPDATE buglinks SET versionId = '?'

1 0

Alexander Nicolaysen Sørnes : bug: Move duplicate detection to a separate function
by Alexander Nicolaysen Sørnes July 30, 2009

July 30, 2009

Module: appdb Branch: master Commit: 8e9122b6f5ae4cb35359b0569fdf96ae674e0692 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8e9122b6f5ae4cb35359b056… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 30 16:52:42 2009 +0200 bug: Move duplicate detection to a separate function --- include/bugs.php | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index ed22aaf..9c38fa8 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -106,21 +106,11 @@ class Bug return false; } - /* Check for Duplicates */ - - $sQuery = "SELECT * - FROM buglinks - WHERE versionId = '?'"; - if($hResult = query_parameters($sQuery, $this->iVersionId)) + /* Check for duplicates */ + if($this->isDuplicate()) { - while($oRow = query_fetch_object($hResult)) - { - if($oRow->bug_id == $this->iBug_id) - { - addmsg("The Bug link has already been submitted.", "red"); - return false; - } - } + addmsg("The Bug link has already been submitted.", "red"); + return false; } /* passed the checks so lets insert the puppy! */ @@ -204,6 +194,23 @@ class Bug return true; } + /* Checks whether the version already has a link for this bug */ + public function isDuplicate() + { + $sQuery = "SELECT COUNT(linkId) as count + FROM buglinks + WHERE versionId = '?' + AND bug_id = '?'"; + if($hResult = query_parameters($sQuery, $this->iVersionId, $this->iBug_id)) + { + if(($oRow = query_fetch_object($hResult))) + { + return $oRow->count > 0; + } + } + return false; + } + function mailSubmitter($bRejected=false) { global $aClean;

1 0

Alexander Nicolaysen Sørnes : testData: Remove the 'test data modified' screen message
by Alexander Nicolaysen Sørnes July 30, 2009

July 30, 2009

Module: appdb Branch: master Commit: a083c9eb0e576fb0a5330b0894891e0e134afd5e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a083c9eb0e576fb0a5330b08… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 30 16:44:45 2009 +0200 testData: Remove the 'test data modified' screen message --- include/testData.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/include/testData.php b/include/testData.php index d2d4b36..33661b1 100644 --- a/include/testData.php +++ b/include/testData.php @@ -501,7 +501,6 @@ class testData{ case "edit": $sSubject = "Test Results modified for version ".$oVersion->sName." of ".$oApp->sName." by ".$_SESSION['current']->sRealname; $sMsg .= $sBacklink; - addmsg("test data modified.", "green"); break; case "reject": $sSubject = "Test Results rejected for version ".$oVersion->sName." of ".$oApp->sName." by ".$_SESSION['current']->sRealname;

1 0

Alexander Nicolaysen Sørnes : Only show 'create new parent' link for applications
by Alexander Nicolaysen Sørnes July 30, 2009

July 30, 2009

Module: appdb Branch: master Commit: 8fbe27e679793f29c99bd581d10f7562fb65c74b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8fbe27e679793f29c99bd581… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 30 16:06:15 2009 +0200 Only show 'create new parent' link for applications --- include/application.php | 5 +++++ include/objectManager.php | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/include/application.php b/include/application.php index 4112c0b..2a1a704 100644 --- a/include/application.php +++ b/include/application.php @@ -1439,6 +1439,11 @@ class Application { return $iCount; } + public static function objectAllowMovingToNewParent() + { + return TRUE; + } + public static function allowAnonymousSubmissions() { return FALSE; diff --git a/include/objectManager.php b/include/objectManager.php index 4235279..3af090c 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -921,7 +921,8 @@ class ObjectManager $sClassDisplayName = $oParentOM->GetOptionalSetting('objectGetClassDisplayName', 'parent entry'); - echo '<p><a href="'.$this->makeUrl('moveToNewParent', $this->iId)."\">Create and move to a new $sClassDisplayName</a></p>\n"; + if($this->GetOptionalSetting('objectAllowMovingToNewParent', false)) + echo '<p><a href="'.$this->makeUrl('moveToNewParent', $this->iId)."\">Create and move to a new $sClassDisplayName</a></p>\n"; /* Display some help text */ echo "<p>Move ".$oObject->objectMakeLink()." to the $sClassDisplayName ";

1 0

Alexander Nicolaysen Sørnes : note: Allow moving from app to version, fix some mail texts
by Alexander Nicolaysen Sørnes July 30, 2009

July 30, 2009

Module: appdb Branch: master Commit: 6f1de3983796ec23dcc29e79b77aab26c2bdc5b3 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6f1de3983796ec23dcc29e79… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Thu Jul 30 00:51:52 2009 +0200 note: Allow moving from app to version, fix some mail texts --- include/note.php | 68 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 57 insertions(+), 11 deletions(-) diff --git a/include/note.php b/include/note.php index 3be1b94..57f92a4 100644 --- a/include/note.php +++ b/include/note.php @@ -10,6 +10,7 @@ require_once(BASE."include/version.php"); define('APPNOTE_SHOW_FOR_ALL', -1); define('APPNOTE_SHOW_FOR_VERSIONS', -2); define('APPNOTE_SHOW_FOR_APP', -3); +define('DISPLAYMODE_COUNT', 3); /** * Note class for handling notes @@ -121,17 +122,28 @@ class Note { $this->iVersionId, $this->iNoteId)) return false; - if(!$this->iAppId) + if(!$this->iAppId && !$oNote->iAppId) // Changed version only { $sVersionBefore = Version::lookup_name($oNote->iVersionId); $sVersionAfter = Version::lookup_name($this->iVersionId); $sWhatChanged .= "Version was changed from ".$sVersionBefore." to ".$sVersionAfter.".\n\n"; - } else + } else if(!$this->iAppId) // Moved from app to version + { + $sVersionAfter = Version::fullName($this->iVersionId); + $oApp = new application($oNote->iAppId); + $sOldApp = $oApp->sName; + $sWhatChanged .= "Moved from application $sOldApp to version $sVersionAfter.\n\n"; + } else if($oNote->hasRealVersionId()) // Moved from version to app { $oApp = new application($this->iAppId); $sNewApp = $oApp->sName; $sVersionBefore = version::fullName($oNote->iVersionId); $sWhatChanged .= "Moved from version $sVersionBefore to application $sNewApp.\n\n"; + } else // Change display mode for app note + { + $sOldMode = $oNote->getDisplayModeName(); + $sNewMode = $this->getDisplayModeName(); + $sWhatChanged .= "Display mode was changed from '$sOldMode' to '$sNewMode'.\n\n"; } } if (($this->iAppId || $this->iVersionId) && $this->iAppId!=$oNote->iAppId) @@ -336,6 +348,34 @@ class Note { return note::isRealVersionId($this->iVersionId); } + public static function getDisplayModeIds() + { + return array(APPNOTE_SHOW_FOR_ALL, APPNOTE_SHOW_FOR_VERSIONS, APPNOTE_SHOW_FOR_APP); + } + + public static function getDisplayModeNames() + { + return array('Show on both application and version pages', 'Show on all version pages only', 'Show on application page only'); + } + + public function getDisplayModeName($iModeId = null) + { + if(!$iModeId) + $iModeId = $this->iVersionId; + + $aNames = note::getDisplayModeNames(); + $iIndex = 0; + + foreach(note::getDisplayModeIds() as $iId) + { + if($iId == $iModeId) + return $aNames[$iIndex]; + $iIndex++; + } + + return ''; + } + function outputEditor($aValues = null) { if($aValues) @@ -377,21 +417,27 @@ class Note { echo '</p>'; echo '</td></tr>'."\n"; - if($this->iAppId); - $oApp = new application($this->iAppId); if($this->iAppId || $oApp->canEdit()) { + $oApp = new application($this->iAppId); + $aIds = $this->getDisplayModeIds(); + $aOptions = $this->getDisplayModeNames(); + + echo '<tr><td class="color1">Display mode</td>'."\n"; + echo '<td class="color0">'.html_radiobuttons($aIds, $aOptions, 'iVersionId', $this->iVersionId); + + /* Allow the note to be moved to a single version */ $aIds = array(); $aOptions = array(); - if($this->isRealVersionId($this->iVersionId)) + echo 'Show on one of the following version pages only:<br />'; + foreach($oApp->getVersions(true) as $oAppVersion) // Only accepted versions { - $aIds[] = $this->iVersionId; - $aOptions[] = 'Show for this version only'; + + $aIds[] = $oAppVersion->objectGetId(); + $aOptions[] = $oAppVersion->objectMakeLink(); } - $aIds = array_merge($aIds, array(APPNOTE_SHOW_FOR_ALL, APPNOTE_SHOW_FOR_VERSIONS, APPNOTE_SHOW_FOR_APP)); - $aOptions = array_merge($aOptions, array('Show on both application and version pages', 'Show on all version pages only', 'Show on application page only'));; - echo '<tr><td class="color1">Display mode</td>'."\n"; - echo '<td class="color0">'.html_radiobuttons($aIds, $aOptions, 'iVersionId', $this->iVersionId); + echo html_radiobuttons($aIds, $aOptions, 'iVersionId', $this->iVersionId); + echo '</td></tr>'; } else if(!$this->iAppId) {

1 0

Alexander Nicolaysen Sørnes : Misc. capitalization changes
by Alexander Nicolaysen Sørnes July 29, 2009

July 29, 2009

Module: appdb Branch: master Commit: 295ff345ba456dc0a7b92fe4aad9752e13521fcc URL: http://source.winehq.org/git/appdb.git/?a=commit;h=295ff345ba456dc0a7b92fe4… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 29 21:21:11 2009 +0200 Misc. capitalization changes --- include/bugs.php | 10 +++++----- include/comment.php | 4 ++-- include/note.php | 2 +- include/testData.php | 4 ++-- include/version.php | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index 48fbb4e..ed22aaf 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -587,12 +587,12 @@ function view_version_bugs($iVersionId = null, $aBuglinkIds) echo " <td>Description</td>\n"; echo " <td align=center width=\"80\">Status</td>\n"; echo " <td align=center width=\"80\">Resolution</td>\n"; - echo " <td align=center width=\"80\">Other Apps affected</td>\n"; + echo " <td align=center width=\"80\">Other apps affected</td>\n"; if($bCanEdit == true) { - echo " <td align=center width=\"80\">delete</td>\n"; - echo " <td align=center width=\"80\">checked</td>\n"; + echo " <td align=center width=\"80\">Delete</td>\n"; + echo " <td align=center width=\"80\">Checked</td>\n"; } echo "</tr>\n\n"; @@ -658,13 +658,13 @@ function view_version_bugs($iVersionId = null, $aBuglinkIds) if ( isset( $aClean['sAllBugs'] ) ) { $sURL = str_replace( '&sAllBugs', '', $_SERVER['REQUEST_URI'] ); - $sLink = '<a href="' . htmlentities($sURL) . '">Show Open Bugs</a>'; + $sLink = '<a href="' . htmlentities($sURL) . '">Show open bugs</a>'; } // show all link else { $sURL = $_SERVER['REQUEST_URI'] . '&sAllBugs'; - $sLink = '<a href="' . htmlentities($sURL) . '">Show All Bugs</a>'; + $sLink = '<a href="' . htmlentities($sURL) . '">Show all bugs</a>'; } echo '<div style="text-align:right;">' . $sLink .'</div>'; diff --git a/include/comment.php b/include/comment.php index 6a1716a..a999e41 100644 --- a/include/comment.php +++ b/include/comment.php @@ -617,8 +617,8 @@ class Comment { $sel[$_SESSION['current']->getPref("comments:mode", "threaded")] = 'selected'; echo '<td><form method="post" name="sMode" action="'. $oVersion->objectMakeUrl().'">',"\n"; - echo "<b>Application Comments</b> $messageCount total comments "; - echo '<b>Mode</b> <select name="sCmode" onchange="document.sMode.submit();">',"\n"; + echo "<b>Application comments:</b> $messageCount total comments "; + echo '<b>Mode:</b> <select name="sCmode" onchange="document.sMode.submit();">',"\n"; echo ' <option value="flat" '.$sel['flat'].'>Flat</option>',"\n"; echo ' <option value="threaded" '.$sel['threaded'].'>Threaded</option>',"\n"; echo ' <option value="nested" '.$sel['nested'].'>Nested</option>',"\n"; diff --git a/include/note.php b/include/note.php index 4233ac3..3be1b94 100644 --- a/include/note.php +++ b/include/note.php @@ -270,7 +270,7 @@ class Note { { $shOutput .= "<tr class=\"color1\" align=\"center\" valign=\"top\"><td>"; $shOutput .= "<form method=\"post\" name=\"message\" action=\"objectManager.php?sClass=note&sAction=edit&iId=".$this->iNoteId."&sReturnTo=".urlencode($shReturnTo)."\">"; - $shOutput .= '<input type="submit" value="Edit Note" class="button">'; + $shOutput .= '<input type="submit" value="Edit note" class="button">'; $shOutput .= '</form></td></tr>'; } diff --git a/include/testData.php b/include/testData.php index 23aff30..d2d4b36 100644 --- a/include/testData.php +++ b/include/testData.php @@ -696,10 +696,10 @@ class testData{ if($rowsUsed >= $iDisplayLimit && $bShowAll) { - $sShowButtonText = "Limit to $iDisplayLimit Tests"; + $sShowButtonText = "Limit to $iDisplayLimit tests"; } else { - $sShowButtonText = "Show All Tests"; + $sShowButtonText = "Show all tests"; echo '<input type="hidden" name="bShowAll" value="true">'; } diff --git a/include/version.php b/include/version.php index 4e3ecd2..5afa0b5 100644 --- a/include/version.php +++ b/include/version.php @@ -1111,7 +1111,7 @@ class version { echo "<div class='info_container'>\n"; echo "\t<div class='title_class'>\n"; - echo "\t\tSelected test results <small><small>(selected in 'Test Results' table below)</small></small>\n"; + echo "\t\tSelected Test Results <small><small>(selected in 'Test Results' table below)</small></small>\n"; echo "\t</div>\n"; echo "<div class='info_contents'>\n";

1 0

Alexander Nicolaysen Sørnes : version: Use consistent capitalizatin of button texxts
by Alexander Nicolaysen Sørnes July 29, 2009

July 29, 2009

Module: appdb Branch: master Commit: 6c1f52c7644699fc6c16570f1901f4fcfcbefbd9 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6c1f52c7644699fc6c16570f… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 29 21:10:37 2009 +0200 version: Use consistent capitalizatin of button texxts --- include/version.php | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/version.php b/include/version.php index f54eeb2..4e3ecd2 100644 --- a/include/version.php +++ b/include/version.php @@ -958,8 +958,8 @@ class version { echo "</form>\n"; } else /* nope */ { - echo '<form method="post" name="sMessage" action="objectManager.php?sClass=maintainer&sAction=add&iVersionId='.$this->iVersionId.'&sTitle='.urlencode("Be a Maintainer of ".version::fullName($this->iVersionId)).'&sReturnTo='.urlencode($this->objectMakeUrl()).'">'."\n"; - echo "\t".'<input type="submit" value="Be a Maintainer of This Version" class="button" title="Click here to know more about maintainers.">'."\n"; + echo '<form method="post" name="sMessage" action="objectManager.php?sClass=maintainer&sAction=add&iVersionId='.$this->iVersionId.'&sTitle='.urlencode("Be a maintainer of ".version::fullName($this->iVersionId)).'&sReturnTo='.urlencode($this->objectMakeUrl()).'">'."\n"; + echo "\t".'<input type="submit" value="Be a maintainer of this version" class="button" title="Click here to know more about maintainers.">'."\n"; echo "\t"."<input type=hidden name=\"iAppId\" value=\"".$oApp->iAppId."\">\n"; echo "\t"."<input type=hidden name=\"iVersionId\" value=\"".$this->iVersionId."\">\n"; echo "</form>\n"; @@ -977,7 +977,7 @@ class version { echo "\t<input type=\"hidden\" name=\"sClass\" value=\"monitor\" >\n"; echo "\t<input type=\"hidden\" name=\"sReturnTo\" value=\"". $this->objectMakeUrl()."\" >\n"; - echo "\t".'<input type=submit value="Monitor Changes" class="button">'."\n"; + echo "\t".'<input type=submit value="Monitor changes" class="button">'."\n"; echo "</form>\n"; } } @@ -1000,20 +1000,20 @@ class version { echo '<form method="post" name="sMessage" action="admin/editAppVersion.php">'."\n"; echo "\t".'<input type="hidden" name="iAppId" value="'.$oApp->iAppId.'">'."\n"; echo "\t".'<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'">'."\n"; - echo "\t".'<input type=submit value="Edit Version" class="button">'."\n"; + echo "\t".'<input type=submit value="Edit version" class="button">'."\n"; echo '</form>'."\n"; $url = BASE."objectManager.php?sClass=version&sAction=delete&bQueued=false&iId=".$this->iVersionId; echo "<form method=\"post\" name=\"sDelete\" action=\"javascript:self.location = '".$url."'\">\n"; - echo "\t".'<input type=submit value="Delete Version" class="button">'."\n"; + echo "\t".'<input type=submit value="Delete version" class="button">'."\n"; echo '</form>'."\n"; echo $shAdd.'" />'; - echo "\t".'<input type="submit" value="Add Note" class="button">'."\n"; + echo "\t".'<input type="submit" value="Add note" class="button">'."\n"; echo '</form>'."\n"; echo $shAdd.'&sNoteTitle=HOWTO" />'; - echo "\t".'<input type=submit value="Add How To" class="button">'."\n"; + echo "\t".'<input type=submit value="Add how-to" class="button">'."\n"; echo '</form>'."\n"; echo $shAdd.'&sNoteTitle=WARNING" />'; - echo "\t".'<input type=submit value="Add Warning" class="button">'."\n"; + echo "\t".'<input type=submit value="Add warning" class="button">'."\n"; echo '</form>'; echo "</td></tr>"; } @@ -1031,7 +1031,7 @@ class version { echo "\t<input type=\"hidden\" name=\"sClass\" value=\"monitor\">\n"; echo "\t<input type=\"hidden\" name=\"sReturnTo\" value=\"". $this->objectMakeUrl()."\">\n"; - echo '<input type=submit value="Stop Monitoring Version" class="button" >'."\n"; + echo '<input type=submit value="Stop monitoring version" class="button" >'."\n"; echo "</form>\n"; echo "</td></tr>\n"; } @@ -1158,7 +1158,7 @@ class version { 'sClass=testData_queue&sAction=add&iVersionId='.$this->iVersionId. '&sTitle=Add+Test+Data&sReturnTo='. urlencode($this->objectMakeUrl()).'>'."\n"; - echo "\t".'<input type=submit value="Add Test Data" class="button" >'."\n"; + echo "\t".'<input type=submit value="Add test data" class="button" >'."\n"; echo '</form>'."\n"; } else {

1 0

Alexander Nicolaysen Sørnes : application: Use consistent capitalization for buttons
by Alexander Nicolaysen Sørnes July 29, 2009

July 29, 2009

Module: appdb Branch: master Commit: fefb74d1acde3d1d71260ced9b5d379ed80cce2c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=fefb74d1acde3d1d71260ced… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 29 20:53:29 2009 +0200 application: Use consistent capitalization for buttons --- include/application.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/application.php b/include/application.php index 06ef247..4112c0b 100644 --- a/include/application.php +++ b/include/application.php @@ -834,7 +834,7 @@ class Application { if($_SESSION['current']->isSuperMaintainer($this->iAppId) || $_SESSION['current']->hasPriv("admin")) { - echo ' <form method="post" name="sEdit" action="admin/editAppFamily.php"><input type="hidden" name="iAppId" value="'.$this->iAppId.'"><input type="submit" value="Edit Application" class="button"></form>'; + echo ' <form method="post" name="sEdit" action="admin/editAppFamily.php"><input type="hidden" name="iAppId" value="'.$this->iAppId.'"><input type="submit" value="Edit application" class="button"></form>'; echo '<form method="post" action="objectManager.php?sClass=note&sAction=add&sTitle=Add+note&iAppId='.$this->iAppId.'&sNoteTitle=HOWTO&sReturnTo='.urlencode($this->objectMakeUrl()).'">'; echo '<input type="submit" value="Add note/how-to" />'; echo '</form>'; @@ -850,8 +850,8 @@ class Application { if($_SESSION['current']->hasPriv("admin")) { $url = BASE."objectManager.php?sClass=application&bIsQueue=false&sAction=delete&iId=".$this->iAppId; - echo " <form method=\"post\" name=\"sEdit\" action=\"javascript:self.location = '".$url."'\"><input type=\"submit\" value=\"Delete App\" class=\"button\"></form>"; - echo ' <form method="post" name="sEdit" action="admin/editBundle.php"><input type="hidden" name="iBundleId" value="'.$this->iAppId.'"><input type="submit" value="Edit Bundle" class="button"></form>'; + echo " <form method=\"post\" name=\"sEdit\" action=\"javascript:self.location = '".$url."'\"><input type=\"submit\" value=\"Delete app\" class=\"button\"></form>"; + echo ' <form method="post" name="sEdit" action="admin/editBundle.php"><input type="hidden" name="iBundleId" value="'.$this->iAppId.'"><input type="submit" value="Edit bundle" class="button"></form>'; } } else {

1 0

Alexander Nicolaysen Sørnes : note: Improve logic in object{Get, Set}Parent
by Alexander Nicolaysen Sørnes July 29, 2009

July 29, 2009

Module: appdb Branch: master Commit: e07acae8d9bbf4506058be3e67cbab90eda95ec2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e07acae8d9bbf4506058be3e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 29 20:47:42 2009 +0200 note: Improve logic in object{Get,Set}Parent --- include/note.php | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/note.php b/include/note.php index 754e585..4233ac3 100644 --- a/include/note.php +++ b/include/note.php @@ -331,6 +331,11 @@ class Note { return $iVersionId > 0; } + public function hasRealVersionId() + { + return note::isRealVersionId($this->iVersionId); + } + function outputEditor($aValues = null) { if($aValues) @@ -493,7 +498,7 @@ class Note { public function objectGetParent($sClass = '') { - if($this->iVersionId) + if($this->hasRealVersionId()) return new version($this->iVersionId); else return new application($this->iAppId); @@ -501,7 +506,7 @@ class Note { public function objectSetParent($iNewId, $sClass = '') { - if($this->iVersionId) + if($this->hasRealVersionId()) $this->iVersionId = $iNewId; else $this->iAppId = $iNewId;

1 0

Maik Schulz : Website: fixes to german translation of the about page
by Maik Schulz July 29, 2009

July 29, 2009

Module: website Branch: master Commit: 95d8820546700005f5c9d1700783246a954dd658 URL: http://source.winehq.org/git/website.git/?a=commit;h=95d8820546700005f5c9d1… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Wed Jul 29 19:14:00 2009 +0200 Website: fixes to german translation of the about page --- templates/de/about.template | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/de/about.template b/templates/de/about.template index 245eace..3a89d7f 100644 --- a/templates/de/about.template +++ b/templates/de/about.template @@ -11,14 +11,14 @@ <p>Wine wird immer <a href="" title="Wine-Lizensierung">Freie Software</a> sein. Ungefähr die Hälfte des Quellcodes von Wine wird von Freiwilligen geschrieben. Der Rest wird von Firmen gesponsort, insbesondere <a href="http://www.codeweavers.com/products/" title="Codeweavers Crossover Office">Codeweavers</a>, die eine eigene Version von Wine mit Unterstützung verkaufen.</p> -<p>Wine ist stark von seinen Anwendern abhängig. Tests von Anwendern bevölkern unsere <a href="http://appdb.winehq.org/" title="Wine Anwendungsdatenbank">Anwendungsdatenbank (en)<a/> zur Dokumentation davon, wie gut einzelne Programme funktionieren und sämtliche Antworten in den <a href="http://forums.winehq.org/" title="WineHQ Foren">Foren</a> kommen von Freiwilligen.</p> +<p>Wine ist stark von seinen Anwendern abhängig. Tests von Anwendern bevölkern unsere <a href="http://appdb.winehq.org/" title="Wine Anwendungsdatenbank">Anwendungsdatenbank (en)</a> zur Dokumentation davon, wie gut einzelne Programme funktionieren, und sämtliche Antworten in den <a href="http://forums.winehq.org/" title="WineHQ Foren">Foren</a> kommen von Freiwilligen.</p> <h2>Erfahre mehr:</h2> <ul> <li><a href="http://wiki.winehq.org/ImportanceOfWine">Warum Wine so wichtig ist (en)</a></li> <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Wine-Mythen entlarvt (en)</a></li> - <li><a href="http://wiki.winehq.org/WineHistory">Geschichte des Wine-Projekts</a></li> - <li><a href="http://wiki.winehq.org/ProjectOrganization">Organisation und Leitung</a></li> + <li><a href="http://wiki.winehq.org/WineHistory">Geschichte des Wine-Projekts (en)</a></li> + <li><a href="http://wiki.winehq.org/ProjectOrganization">Organisation und Leitung (en)</a></li> </ul> <hr />

1 0

Maik Schulz : Website: update german translations based on Scott's changes
by Maik Schulz July 29, 2009

July 29, 2009

Module: website Branch: master Commit: bf62e9e87678f53992ad8d5ffbb50c7daeea70a9 URL: http://source.winehq.org/git/website.git/?a=commit;h=bf62e9e87678f53992ad8d… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Wed Jul 29 19:06:52 2009 +0200 Website: update german translations based on Scott's changes --- templates/de/about.template | 60 +++++++++------------------------ templates/de/acknowledgement.template | 7 ---- templates/de/home.template | 16 ++++---- 3 files changed, 24 insertions(+), 59 deletions(-) diff --git a/templates/de/about.template b/templates/de/about.template index c79e903..245eace 100644 --- a/templates/de/about.template +++ b/templates/de/about.template @@ -1,52 +1,24 @@  - + <h1 class="title">Über Wine</h1> -<p>Wine ist eine Übersetzungsschicht (ein Programm Loader), die in -der Lage ist, Windows-Anwendungen unter Linux und anderen POSIX-kompatiblen -Betriebssystemen laufen zu lassen. Windows-Anwendungen verhalten sich unter -Wine so wie native Programme: ohne die Geschwindigkeitseinbußen oder -erhöhten Speicheranforderungen eines Emulators und mit einem Look & Feel, -das mit anderen Anwendungen auf Deinem Desktop vergleichbar ist.</p> - -<p>Das Wine-Projekt wurde 1993 mit dem Ziel, Windows 3.1 Anwendungen unter -Linux laufen zu lassen, begonnen. Bob Amstadt war der ursprüngliche -Koordinator. Er übergab das Projekt jedoch recht früh an Alexandre -Julliard, der es seitdem führt. Im Laufe der Jahre wurden Umsetzungen -für andere Unix-Varianten hinzugefügt; darüberhinaus -Unterstützung für Win32 als Win32-Anwendungen populär wurden. -</p> - -<p>Wine ist immernoch in Entwicklung und ist noch nicht für den -generellen Gebrauch geeignet. Unabhängig davon finden es viele Leute -nützlich um eine steigende Zahl von Windows-Programmen zu verwenden. -In der <a href="http://appdb.winehq.org/">AppDB (en)</a> -findest Du Erfolgs- und Misserfolgsmeldungen für hunderte von -Windows-Anwendungen, in <a href="http://bugs.winhq.org/">Bugzilla -(en)</a> eine Liste der bekannten Probleme und auf der <a -href="{$root}/status">Status</a>-Seite einen Überblick über den -Entwicklungsfortschritt von Wine.</p> - -<p>Eine große Gruppe von Wine-Entwicklern kannst Du in den <a -href="{$root}/forums">Wine-Foren</a> erreichen. Kommentare zur winehq.org -Website können an <a -href="mailto:web-admin_at_winehq.org">web-admin_at_winehq.org</a> gemailt -werden. Alexandre Julliard ist der Leiter des Wine-Projekts und kann per -E-Mail unter <a -href="mailto:julliard_at_winehq.org">julliard_at_winehq.org</a> -erreicht werden.</p> - -<p>Wir haben außerdem eine kurze Übersicht zusammengestellt, -die Dir hilft, das Projekt besser zu verstehen:</p> +<p>Wine ermöglicht es, Windows-Programme unter anderen Betriebssystemen laufen lassen. Mit Wine kannst Du diese Programme genauso installieren und laufen lassen, wie unter Windows.</p> + +<p>Wine wird aktiv weiterentwickelt. Noch läuft nicht jedes Programm, aber <a href="http://wiki.winehq.org/UsageStatistics" title="Statistik zur Wine-Benutzung">mehrere Millionen Anwender</a> nutzen Wine, um ihre Programme zu verwenden.</p> + +<h2>Open Source und benutzergetrieben</h2> + +<p>Wine wird immer <a href="" title="Wine-Lizensierung">Freie Software</a> sein. Ungefähr die Hälfte des Quellcodes von Wine wird von Freiwilligen geschrieben. Der Rest wird von Firmen gesponsort, insbesondere <a href="http://www.codeweavers.com/products/" title="Codeweavers Crossover Office">Codeweavers</a>, die eine eigene Version von Wine mit Unterstützung verkaufen.</p> + +<p>Wine ist stark von seinen Anwendern abhängig. Tests von Anwendern bevölkern unsere <a href="http://appdb.winehq.org/" title="Wine Anwendungsdatenbank">Anwendungsdatenbank (en)<a/> zur Dokumentation davon, wie gut einzelne Programme funktionieren und sämtliche Antworten in den <a href="http://forums.winehq.org/" title="WineHQ Foren">Foren</a> kommen von Freiwilligen.</p> + +<h2>Erfahre mehr:</h2> <ul> - <li><a href="{$root}/history">Die Geschichte von Wine</a></li> - <li><a href="{$root}/why">Warum Wine so wichtig ist</a></li> - <li><a href="{$root}/myths">Wine-Mythen entlarvt</a></li> - <li><a href="{$root}/wine_features">Wines Features</a></li> - <li><a href="{$root}/acknowledgement">Danksagungen</a></li> - <li><a href="{$root}/wwn">World Wine News (en)</a></li> - <li><a href="{$root}/interview">Interviews</a></li> + <li><a href="http://wiki.winehq.org/ImportanceOfWine">Warum Wine so wichtig ist (en)</a></li> + <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Wine-Mythen entlarvt (en)</a></li> + <li><a href="http://wiki.winehq.org/WineHistory">Geschichte des Wine-Projekts</a></li> + <li><a href="http://wiki.winehq.org/ProjectOrganization">Organisation und Leitung</a></li> </ul> <hr /> diff --git a/templates/de/acknowledgement.template b/templates/de/acknowledgement.template index 9b94aba..cd8e4b9 100644 --- a/templates/de/acknowledgement.template +++ b/templates/de/acknowledgement.template @@ -207,10 +207,3 @@ haben, die schwierige Probleme angehen... wir schon.</p> <p>Eine vollständige Liste der <a href="http://source.winehq.org/git/?p=wine.git;a=blob_plain;f=AUTHORS">Autoren</a> kann im Quellcode Repository gefunden werden.</p> -<hr /> - -<div class="link-container"> - <p class="left-link"><a href="{$root}/wine_features">Zurück</a>: Wine Features</p> - <p class="right-link">World Wine News (en): <a href="{$root}/wwn">Weiter</a></p> -</div> - diff --git a/templates/de/home.template b/templates/de/home.template index 95bc384..fd17c03 100644 --- a/templates/de/home.template +++ b/templates/de/home.template @@ -10,23 +10,23 @@ <ul class="winehq_menu"> <li class="info" onClick="document.location='{$root}/about/';"> - <div class="title"><a href="{$root}/about/">Information</a></div> - <div class="subtitle">Überblick über Wines Features.</div> + <div class="title"><a href="{$root}/about/">Über</a></div> + <div class="subtitle">Erfahre mehr über das Wine-Projekt.</div> </li> <li class="dl" onClick="document.location='{$root}/download/';"> - <div class="title"><a href="{$root}/download/">Download</a></div> - <div class="subtitle">Hol Dir Wine!</div> + <div class="title"><a href="{$root}/download/">Hol Dir Wine</a></div> + <div class="subtitle">Installiere die aktuellste Wine-Version.</div> </li> <li class="help" onClick="document.location='{$root}/help/';"> - <div class="title"><a href="{$root}/help/">Hilfe!</a></div> - <div class="subtitle">Dokumentation, Unterstützung und Wiki.</div> + <div class="title"><a href="{$root}/help/">Unterstützung</a></div> + <div class="subtitle">Hol Dir Hilfe zum Benutzen von Wine.</div> </li> <li class="devel" onClick="document.location='{$root}/devel/';"> <div class="title"><a href="{$root}/devel/">Entwicklung</a></div> - <div class="subtitle">Wine Quellcode, Bug Tracking, usw.</div> + <div class="subtitle">Werde ein Wine-Entwickler.</div> </li> <li class="donate" onClick="document.donateForm.submit();"> @@ -36,7 +36,7 @@ <input type="hidden" name="business" value="donate(a)winehq.org"> <input type="hidden" name="item_name" value="Wine donation"> </form> - <div class="subtitle">Spende für Wine.</div> + <div class="subtitle">Spende dem Wine-Projekt.</div> </li> </ul>

1 0

Alexander Nicolaysen Sørnes : note: Show app notes above version notes
by Alexander Nicolaysen Sørnes July 29, 2009

July 29, 2009

Module: appdb Branch: master Commit: b5e4093097c36f92e3404fbeee6b61fae552f3a2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b5e4093097c36f92e3404fbe… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 29 17:54:18 2009 +0200 note: Show app notes above version notes --- include/note.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/note.php b/include/note.php index 315d627..754e585 100644 --- a/include/note.php +++ b/include/note.php @@ -286,7 +286,7 @@ class Note { { $oVersion = new version($iVersionId); $oApp = $oVersion->objectGetParent(); - $hResult = query_parameters("SELECT noteId FROM appNotes WHERE versionId = '?' OR (appId = '?' AND (versionId = '?' OR versionId = '?'))", $iVersionId, $oApp->objectGetId(), APPNOTE_SHOW_FOR_ALL, APPNOTE_SHOW_FOR_VERSIONS); + $hResult = query_parameters("SELECT noteId FROM appNotes WHERE versionId = '?' OR (appId = '?' AND (versionId = '?' OR versionId = '?')) ORDER BY versionId,noteId", $iVersionId, $oApp->objectGetId(), APPNOTE_SHOW_FOR_ALL, APPNOTE_SHOW_FOR_VERSIONS); } else if($iAppId) { $hResult = query_parameters("SELECT noteId FROM appNotes WHERE appId = '?' AND (versionId = '?' OR versionId = '?')", $iAppId, APPNOTE_SHOW_FOR_ALL, APPNOTE_SHOW_FOR_APP);

1 0

Alexander Nicolaysen Sørnes : note: Add missing parentheses to SQL query
by Alexander Nicolaysen Sørnes July 29, 2009

July 29, 2009

Module: appdb Branch: master Commit: 46e3f876cf90effc0f01c81e034a16513fa5fd3b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=46e3f876cf90effc0f01c81e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 29 17:41:20 2009 +0200 note: Add missing parentheses to SQL query --- include/note.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/note.php b/include/note.php index 5074bb9..315d627 100644 --- a/include/note.php +++ b/include/note.php @@ -289,7 +289,7 @@ class Note { $hResult = query_parameters("SELECT noteId FROM appNotes WHERE versionId = '?' OR (appId = '?' AND (versionId = '?' OR versionId = '?'))", $iVersionId, $oApp->objectGetId(), APPNOTE_SHOW_FOR_ALL, APPNOTE_SHOW_FOR_VERSIONS); } else if($iAppId) { - $hResult = query_parameters("SELECT noteId FROM appNotes WHERE appId = '?' AND versionId = '?' OR versionId = '?'", $iAppId, APPNOTE_SHOW_FOR_ALL, APPNOTE_SHOW_FOR_APP); + $hResult = query_parameters("SELECT noteId FROM appNotes WHERE appId = '?' AND (versionId = '?' OR versionId = '?')", $iAppId, APPNOTE_SHOW_FOR_ALL, APPNOTE_SHOW_FOR_APP); } if(!$hResult)

1 0

Alexander Nicolaysen Sørnes : note: Fix e-mail test when moving from version to app
by Alexander Nicolaysen Sørnes July 29, 2009

July 29, 2009

Module: appdb Branch: master Commit: bb050bc04045e830ca1c63d2fceaad943a1c004a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=bb050bc04045e830ca1c63d2… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 29 17:33:41 2009 +0200 note: Fix e-mail test when moving from version to app --- include/note.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/note.php b/include/note.php index 0161b73..5074bb9 100644 --- a/include/note.php +++ b/include/note.php @@ -121,17 +121,17 @@ class Note { $this->iVersionId, $this->iNoteId)) return false; - $sVersionBefore = Version::lookup_name($oNote->iVersionId); - if(!$this->iAppId) { + $sVersionBefore = Version::lookup_name($oNote->iVersionId); $sVersionAfter = Version::lookup_name($this->iVersionId); $sWhatChanged .= "Version was changed from ".$sVersionBefore." to ".$sVersionAfter.".\n\n"; } else { $oApp = new application($this->iAppId); $sNewApp = $oApp->sName; - $sWhatChanged .= "Moved from version $shVersionBefore to application $sNewApp"; + $sVersionBefore = version::fullName($oNote->iVersionId); + $sWhatChanged .= "Moved from version $sVersionBefore to application $sNewApp.\n\n"; } } if (($this->iAppId || $this->iVersionId) && $this->iAppId!=$oNote->iAppId)

1 0

Alexander Nicolaysen Sørnes : note: Remove reference to undefined variable
by Alexander Nicolaysen Sørnes July 29, 2009

July 29, 2009

Module: appdb Branch: master Commit: 9b9d3378aa45140c8da3e9128c68cae5fee3343c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9b9d3378aa45140c8da3e912… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 29 16:34:02 2009 +0200 note: Remove reference to undefined variable --- include/note.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/note.php b/include/note.php index 9b0e8fb..0161b73 100644 --- a/include/note.php +++ b/include/note.php @@ -356,7 +356,7 @@ class Note { HtmlAreaLoaderScript(array("editor")); - echo html_frame_start("Edit Application Note {$aClean['noteId']}", "90%","",0); + echo html_frame_start("Edit Application Note", "90%","",0); echo html_table_begin("width='100%' border=0 align=left cellpadding=6 cellspacing=0 class='box-body'"); echo '<input type="hidden" name="bEditing" value="true">';

1 0

Alexander Nicolaysen Sørnes : note: Fix a warning when editing notes
by Alexander Nicolaysen Sørnes July 29, 2009

July 29, 2009

Module: appdb Branch: master Commit: c3beccd38dcb2c13b27ebb4166a4c03a8b4f11c3 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c3beccd38dcb2c13b27ebb41… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 29 16:32:37 2009 +0200 note: Fix a warning when editing notes --- include/note.php | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/note.php b/include/note.php index fec4edf..9b0e8fb 100644 --- a/include/note.php +++ b/include/note.php @@ -333,11 +333,17 @@ class Note { function outputEditor($aValues = null) { - if(!$this->iVersionId) - $this->iVersionId = getInput('iVersionId', $aValues); + if($aValues) + { + if(!$this->iVersionId) + $this->iVersionId = getInput('iVersionId', $aValues); - if(!$this->iAppId) - $this->iAppId = getInput('iAppId', $aValues); + if(!$this->iAppId) + $this->iAppId = getInput('iAppId', $aValues); + + if(!$this->sTitle) + $this->sTitle = getInput('sNoteTitle', $aValues); + } if($this->iAppId && !$this->iVersionId) $this->iVersionId = APPNOTE_SHOW_FOR_ALL; @@ -348,9 +354,6 @@ class Note { $this->iAppId = $oVersion->iAppId; } - if(!$this->sTitle) - $this->sTitle = getInput('sNoteTitle', $aValues); - HtmlAreaLoaderScript(array("editor")); echo html_frame_start("Edit Application Note {$aClean['noteId']}", "90%","",0);

1 0

Alexander Nicolaysen Sørnes : note: Allow moving from version to app
by Alexander Nicolaysen Sørnes July 29, 2009

July 29, 2009

Module: appdb Branch: master Commit: b4bae2f9fe749ee8288307ec0876d7e33048681d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b4bae2f9fe749ee8288307ec… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Wed Jul 29 03:10:00 2009 +0200 note: Allow moving from version to app --- include/note.php | 79 +++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 60 insertions(+), 19 deletions(-) diff --git a/include/note.php b/include/note.php index bde0e77..fec4edf 100644 --- a/include/note.php +++ b/include/note.php @@ -115,14 +115,30 @@ class Note { $sWhatChanged .= "Description was changed from\n ".$oNote->shDescription."\n to \n".$this->shDescription.".\n\n"; } - if ($this->iVersionId && $this->iVersionId!=$oNote->iVersionId) + if (($this->iVersionId || $this->iAppId) && $this->iVersionId!=$oNote->iVersionId) { if (!query_parameters("UPDATE appNotes SET versionId = '?' WHERE noteId = '?'", $this->iVersionId, $this->iNoteId)) return false; + $sVersionBefore = Version::lookup_name($oNote->iVersionId); - $sVersionAfter = Version::lookup_name($this->iVersionId); - $sWhatChanged .= "Version was changed from ".$sVersionBefore." to ".$sVersionAfter.".\n\n"; + + if(!$this->iAppId) + { + $sVersionAfter = Version::lookup_name($this->iVersionId); + $sWhatChanged .= "Version was changed from ".$sVersionBefore." to ".$sVersionAfter.".\n\n"; + } else + { + $oApp = new application($this->iAppId); + $sNewApp = $oApp->sName; + $sWhatChanged .= "Moved from version $shVersionBefore to application $sNewApp"; + } + } + if (($this->iAppId || $this->iVersionId) && $this->iAppId!=$oNote->iAppId) + { + if(!query_parameters("UPDATE appNotes SET appId = '?' WHERE noteId = '?'", + $this->iAppId, $this->iNoteId)) + return false; } if($sWhatChanged) $this->SendNotificationMail("edit",$sWhatChanged); @@ -310,23 +326,31 @@ class Note { } } + public static function isRealVersionId($iVersionId) + { + return $iVersionId > 0; + } + function outputEditor($aValues = null) { - if($aValues) - { - if(!$this->iVersionId) - $this->iVersionId = $aValues['iVersionId']; + if(!$this->iVersionId) + $this->iVersionId = getInput('iVersionId', $aValues); - if(!$this->iAppId) - $this->iAppId = getInput('iAppId', $aValues); + if(!$this->iAppId) + $this->iAppId = getInput('iAppId', $aValues); - if($this->iAppId && !$this->iVersionId) - $this->iVersionId = APPNOTE_SHOW_FOR_ALL; + if($this->iAppId && !$this->iVersionId) + $this->iVersionId = APPNOTE_SHOW_FOR_ALL; - if(!$this->sTitle) - $this->sTitle = $aValues['sNoteTitle']; + if(!$this->iAppId) + { + $oVersion = new version($this->iVersionId); + $this->iAppId = $oVersion->iAppId; } + if(!$this->sTitle) + $this->sTitle = getInput('sNoteTitle', $aValues); + HtmlAreaLoaderScript(array("editor")); echo html_frame_start("Edit Application Note {$aClean['noteId']}", "90%","",0); @@ -334,8 +358,7 @@ class Note { echo '<input type="hidden" name="bEditing" value="true">'; echo '<input type="hidden" name="iNoteId" value="'.$this->iNoteId.'">'; - if(!$this->iAppId) - echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'">'; + echo '<input type="hidden" name="iAppId" value="'.$this->iAppId.'">'; echo '<tr><td class=color1>Title</td>'."\n"; @@ -345,14 +368,28 @@ class Note { echo '<textarea cols="80" rows="20" id="editor" name="shNoteDesc">'.$this->shDescription.'</textarea>',"\n"; echo '</p>'; echo '</td></tr>'."\n"; - if($this->iAppId) + + if($this->iAppId); + $oApp = new application($this->iAppId); + if($this->iAppId || $oApp->canEdit()) { - $aIds = array(APPNOTE_SHOW_FOR_ALL, APPNOTE_SHOW_FOR_VERSIONS, APPNOTE_SHOW_FOR_APP); - $aOptions = array('Show on both application and version pages', 'Show on version pages only', 'Show on application page only'); + $aIds = array(); + $aOptions = array(); + if($this->isRealVersionId($this->iVersionId)) + { + $aIds[] = $this->iVersionId; + $aOptions[] = 'Show for this version only'; + } + $aIds = array_merge($aIds, array(APPNOTE_SHOW_FOR_ALL, APPNOTE_SHOW_FOR_VERSIONS, APPNOTE_SHOW_FOR_APP)); + $aOptions = array_merge($aOptions, array('Show on both application and version pages', 'Show on all version pages only', 'Show on application page only'));; echo '<tr><td class="color1">Display mode</td>'."\n"; echo '<td class="color0">'.html_radiobuttons($aIds, $aOptions, 'iVersionId', $this->iVersionId); echo '</td></tr>'; + } else if(!$this->iAppId) + { + echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'">'; } + echo '<tr><td colspan="2" align="center" class="color3">',"\n"; echo html_table_end(); @@ -364,7 +401,11 @@ class Note { function GetOutputEditorValues($aValues) { $this->iVersionId = getInput('iVersionId', $aValues); - $this->iAppId = getInput('iAppId', $aValues); + + if(!$this->isRealVersionId($this->iVersionId)) + $this->iAppId = getInput('iAppId', $aValues); + else + $this->iAppId = 0; $this->sTitle = $aValues['sNoteTitle']; $this->shDescription = $aValues['shNoteDesc']; }

1 0

Jeremy Newman : clean up HTML
by Jeremy Newman July 28, 2009

July 28, 2009

Module: website Branch: master Commit: ba985b68fb417487002c3c223d63966e374eba5a URL: http://source.winehq.org/git/website.git/?a=commit;h=ba985b68fb417487002c3c… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 28 12:13:55 2009 -0500 clean up HTML --- news/pl/2009071701.xml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/news/pl/2009071701.xml b/news/pl/2009071701.xml index 23ed12f..db743cf 100644 --- a/news/pl/2009071701.xml +++ b/news/pl/2009071701.xml @@ -2,15 +2,15 @@ <date>Lipiec 17, 2009</date> <title>Wydano Wine 1.1.26</title> <body> -<p> Wydanie rozwojowe Wine 1.1.26 jest już dostępne.</p> -<p> <a href="{$root}/announce/1.1.26">Co nowego</a> w tym wydaniu: +<p>Wydanie rozwojowe Wine 1.1.26 jest już dostępne.</p> +<p><a href="{$root}/announce/1.1.26">Co nowego</a> w tym wydaniu:</p> <ul> <li>Nadal więcej aktualizacji plików językowych.</li> <li>Szybsze rozciąganie bitmap używających XRender.</li> <li>Wsparcie dla Proxy w WinHTTP.</li> <li>Dużo więcej funkcji JScript.</li> <li>Rozmaite poprawki błędów.</li> -</ul></p> -<p><p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.26.tar.bz2">już dostępne</a>. +</ul> +<p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.26.tar.bz2">już dostępne</a>. Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. </p></body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.1.26
by Jeremy Newman July 28, 2009

July 28, 2009

Module: website Branch: master Commit: b624507f7ebf73d26b690de870dd99d4e92217df URL: http://source.winehq.org/git/website.git/?a=commit;h=b624507f7ebf73d26b690d… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Jul 19 10:13:44 2009 +0200 Polish translation for release 1.1.26 --- news/pl/2009071701.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pl/2009071701.xml b/news/pl/2009071701.xml new file mode 100644 index 0000000..23ed12f --- /dev/null +++ b/news/pl/2009071701.xml @@ -0,0 +1,16 @@ +<news> +<date>Lipiec 17, 2009</date> +<title>Wydano Wine 1.1.26</title> +<body> +<p> Wydanie rozwojowe Wine 1.1.26 jest już dostępne.</p> +<p> <a href="{$root}/announce/1.1.26">Co nowego</a> w tym wydaniu: +<ul> + <li>Nadal więcej aktualizacji plików językowych.</li> + <li>Szybsze rozciąganie bitmap używających XRender.</li> + <li>Wsparcie dla Proxy w WinHTTP.</li> + <li>Dużo więcej funkcji JScript.</li> + <li>Rozmaite poprawki błędów.</li> +</ul></p> +<p><p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.26.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</p></body></news>

1 0

André Hentschel : more valid HTML
by Jeremy Newman July 28, 2009

July 28, 2009

1 0

Scott Ritchie : Redo about page Learn More menu, point entries towards wiki
by Jeremy Newman July 28, 2009

July 28, 2009

Module: website Branch: master Commit: e191c65f01e9ead7b5c39172012da3fabfee8b0a URL: http://source.winehq.org/git/website.git/?a=commit;h=e191c65f01e9ead7b5c391… Author: Scott Ritchie <scott(a)open-vote.org> Date: Tue Jul 28 03:26:31 2009 -0700 Redo about page Learn More menu, point entries towards wiki --- templates/en/about.template | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/en/about.template b/templates/en/about.template index 9a5cf00..a46466e 100644 --- a/templates/en/about.template +++ b/templates/en/about.template @@ -15,10 +15,10 @@ <h2>Learn more:</h2> <ul> - <li><a href="{$root}/history">Wine's History</a></li> - <li><a href="{$root}/why">Why Wine is so important</a></li> - <li><a href="{$root}/myths">Debunking Wine Myths</a></li> - <li><a href="{$root}/acknowledgement">Acknowledgements</a></li> + <li><a href="http://wiki.winehq.org/ImportanceOfWine">Why Wine is so Important</a></li> + <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Common Myths about Wine</a></li> + <li><a href="http://wiki.winehq.org/WineHistory">History of the Wine Project</a></li> + <li><a href="http://wiki.winehq.org/ProjectOrganization">Organization and Leadership</a></li> </ul> <hr />

1 0

Scott Ritchie : Rewrite About page to be much less wordy
by Jeremy Newman July 28, 2009

July 28, 2009

Module: website Branch: master Commit: 403e18b89ed573e529f4ec62998adad392597ccb URL: http://source.winehq.org/git/website.git/?a=commit;h=403e18b89ed573e529f4ec… Author: Scott Ritchie <scott(a)open-vote.org> Date: Tue Jul 28 03:26:25 2009 -0700 Rewrite About page to be much less wordy --- templates/en/about.template | 43 +++++++++++-------------------------------- 1 files changed, 11 insertions(+), 32 deletions(-) diff --git a/templates/en/about.template b/templates/en/about.template index 5e87e14..9a5cf00 100644 --- a/templates/en/about.template +++ b/templates/en/about.template @@ -3,38 +3,17 @@ <h1 class="title">About Wine</h1> -<p>Wine is a translation layer (a program loader) capable of running -Windows applications on Linux and other POSIX compatible operating -systems. Windows programs running in Wine act as native programs would, -running without the performance or memory usage penalties of an emulator, -with a similar look and feel to other applications on your desktop.</p> - -<p>The Wine project started in 1993 as a way to support running -Windows 3.1 programs on Linux. Bob Amstadt was the original -coordinator, but turned it over fairly early on to Alexandre -Julliard, who has run it ever since. Over the years, ports -for other Unixes have been added, along with support for Win32 -as Win32 applications became popular.</p> - -<p>Wine is still under development, and it is not yet suitable for -general use. Nevertheless, many people find it useful in running -a growing number of Windows programs. Please see the -<a href="http://appdb.winehq.org/">Application Database</a> -for success and failure reports for hundreds of Windows -programs, as well as the <a href="http://bugs.winehq.org/">Bug -Tracking Database</a> for a list of known issues, and the -<a href="{$root}/status">Status</a> page for a global view on Wine's -implementation progress.</p> - -<p>A broad spectrum of Wine developers can be reached in the -<a href="{$root}/forums">Wine forums</a>. Comments about the winehq.org -website can be emailed to <a -href="mailto:web-admin_at_winehq.org">web-admin_at_winehq.org</a>. Alexandre -Julliard leads the Wine project, and may be reached by email at -<a href="mailto:julliard_at_winehq.org">julliard_at_winehq.org</a>.</p> - -<p>We've also assembled a short list of resources to help you understand -the project:</p> +<p>Wine lets you run Windows software on other operating systems. With Wine, you can install and run these applications just like you would in Windows.</p> + +<p>Wine is still under active development. Not every program works yet, however there are already <a href="http://wiki.winehq.org/UsageStatistics" title="Wine Usage Statistics">several million people</a> using Wine to run their software.</p> + +<h2>Open Source and User Driven</h2> + +<p>Wine will always be <a href="" title="Wine licensing">free software</a>. Approximately half of Wine's source code is written by volunteers. The rest is sponsored by commercial interests, especially <a href="http://www.codeweavers.com/products/" title="Codeweavers Crossover Office">Codeweavers</a> who sell a supported version of Wine.</p> + +<p>Wine is heavily reliant on its user community. User tests fill our <a href="http://appdb.winehq.org/" title="Wine Application Database">Application Database</a> to track how well programs work, and all the answers in the <a href="http://forums.winehq.org/" title="WineHQ Forums">forums</a> come from volunteers.</p> + +<h2>Learn more:</h2> <ul> <li><a href="{$root}/history">Wine's History</a></li> <li><a href="{$root}/why">Why Wine is so important</a></li>

1 0

Scott Ritchie : Change About page subtitle to Explaining the Wine project
by Jeremy Newman July 28, 2009

July 28, 2009

Module: website Branch: master Commit: b9e2e91e15bafc4137bcf8d21b0aaf5e3e985392 URL: http://source.winehq.org/git/website.git/?a=commit;h=b9e2e91e15bafc4137bcf8… Author: Scott Ritchie <scott(a)open-vote.org> Date: Tue Jul 28 03:26:17 2009 -0700 Change About page subtitle to Explaining the Wine project --- templates/en/about.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/en/about.template b/templates/en/about.template index 86666e3..5e87e14 100644 --- a/templates/en/about.template +++ b/templates/en/about.template @@ -1,5 +1,5 @@  - + <h1 class="title">About Wine</h1>

1 0

Scott Ritchie : Replace the links on the front page with affirmative verbs
by Jeremy Newman July 28, 2009

July 28, 2009

Module: website Branch: master Commit: a521b8427738e2b42146be39bfef04cce110eaf6 URL: http://source.winehq.org/git/website.git/?a=commit;h=a521b8427738e2b42146be… Author: Scott Ritchie <scott(a)open-vote.org> Date: Mon Jul 27 04:44:16 2009 -0700 Replace the links on the front page with affirmative verbs --- templates/en/home.template | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/en/home.template b/templates/en/home.template index bad2f62..df2b261 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -10,23 +10,23 @@ <ul class="winehq_menu"> <li class="info" onClick="document.location='{$root}/about/';"> - <div class="title"><a href="{$root}/about/">Information</a></div> - <div class="subtitle">Overview of Wine features.</div> + <div class="title"><a href="{$root}/about/">About</a></div> + <div class="subtitle">Learn about the Wine project.</div> </li> <li class="dl" onClick="document.location='{$root}/download/';"> <div class="title"><a href="{$root}/download/">Download</a></div> - <div class="subtitle">Get Wine now!</div> + <div class="subtitle">Install the latest Wine.</div> </li> <li class="help" onClick="document.location='{$root}/help/';"> - <div class="title"><a href="{$root}/help/">Help!</a></div> - <div class="subtitle">Documentation, Support, and Wiki.</div> + <div class="title"><a href="{$root}/help/">Support</a></div> + <div class="subtitle">Get help using Wine.</div> </li> <li class="devel" onClick="document.location='{$root}/devel/';"> <div class="title"><a href="{$root}/devel/">Development</a></div> - <div class="subtitle">Wine source, Bug Tracking, etc.</div> + <div class="subtitle">Become a Wine developer.</div> </li> <li class="donate" onClick="document.donateForm.submit();"> @@ -36,7 +36,7 @@ <input type="hidden" name="business" value="donate(a)winehq.org"> <input type="hidden" name="item_name" value="Wine donation"> </form> - <div class="subtitle">Donate to Wine.</div> + <div class="subtitle">Donate to the Wine project.</div> </li> </ul>

1 0

Scott Ritchie : Remove links to old interviews and wwn archive on about page
by Jeremy Newman July 28, 2009

July 28, 2009

Module: website Branch: master Commit: efb1bf64b3db3ecd9380e4e19b54ab97e77696f8 URL: http://source.winehq.org/git/website.git/?a=commit;h=efb1bf64b3db3ecd9380e4… Author: Scott Ritchie <scott(a)open-vote.org> Date: Mon Jul 27 04:44:05 2009 -0700 Remove links to old interviews and wwn archive on about page --- templates/en/about.template | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/templates/en/about.template b/templates/en/about.template index 430e7f6..86666e3 100644 --- a/templates/en/about.template +++ b/templates/en/about.template @@ -40,8 +40,6 @@ the project:</p> <li><a href="{$root}/why">Why Wine is so important</a></li> <li><a href="{$root}/myths">Debunking Wine Myths</a></li> <li><a href="{$root}/acknowledgement">Acknowledgements</a></li> - <li><a href="{$root}/wwn">World Wine News</a></li> - <li><a href="{$root}/interview">Interviews</a></li> </ul> <hr />

1 0

Scott Ritchie : Remove static sending patches page and change links to wiki
by Jeremy Newman July 28, 2009

July 28, 2009

Module: website Branch: master Commit: e40f6c66e67c087b624b6406f39da5ab48d5770e URL: http://source.winehq.org/git/website.git/?a=commit;h=e40f6c66e67c087b624b64… Author: Scott Ritchie <scott(a)open-vote.org> Date: Mon Jul 27 02:31:46 2009 -0700 Remove static sending patches page and change links to wiki --- templates/de/devel.template | 2 +- templates/en/devel.template | 2 +- templates/en/sending_patches.template | 113 --------------------------------- 3 files changed, 2 insertions(+), 115 deletions(-) diff --git a/templates/de/devel.template b/templates/de/devel.template index 096ba13..41542bf 100644 --- a/templates/de/devel.template +++ b/templates/de/devel.template @@ -81,7 +81,7 @@ Hilfsmittel, die wir unseren Entwicklern zur Verfügung stellen.</p> <tr bgcolor="#ffffff"> <td> - <a href="{$root}/sending_patches">Patches schicken</a> + <a href="http://wiki.winehq.org/SubmittingPatches">Patches schicken</a> </td> <td valign="top"> Anleitungen zur Formatierung und zum Senden Deiner Patches. diff --git a/templates/en/devel.template b/templates/en/devel.template index dd1e4ca..2a2146c 100644 --- a/templates/en/devel.template +++ b/templates/en/devel.template @@ -81,7 +81,7 @@ various resources available for our developers.</p> <tr bgcolor="#ffffff"> <td> - <a href="{$root}/sending_patches">Sending Patches</a> + <a href="http://wiki.winehq.org/SubmittingPatches">Sending Patches</a> </td> <td valign="top"> Guidelines on how to format and send your patches. diff --git a/templates/en/sending_patches.template b/templates/en/sending_patches.template deleted file mode 100644 index d4b2ac6..0000000 --- a/templates/en/sending_patches.template +++ /dev/null @@ -1,113 +0,0 @@ - - -<h1>Generating and Submitting Patches</h1> - -<p><b>Note</b>: this is a quick reference on how to send us patches. -For detailed instructions please see the -<a href="{$root}/site/docs/winedev-guide/codingpractice">Coding Practice</a> -chapter in our online documentation.</p> - -<p>Please submit patches to the Wine patches mailing list, -<a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a>. -(Note that if you're not <a href="{$root}/site/forums">subscribed</a> to the mailing -list, the mailing list administrators must first check your submission -to make sure it's not spam before they can let it through. -There is no attempt to apply patches that appear in the newsgroup -or anywhere else to the Git tree.) -</p> - -<p>When submitting patches, please:</p> -<ul> - <li>Include a ChangeLog entry with your <b>real</b> name, email address and - a description of what your patch does. - - <li>Keep the patch small and the point of the change clear. - - <li>Submit one fix or group of related changes per patch. - - <li>Generate your patch against the latest version of Wine from the WineHQ Git tree (see below). - - <li>Test your patch, and if possible write a test case demonstrating it is correct. - - <li>Be careful to not corrupt the patch through line-wrapping. - - <li>Avoid unnecessarily changing the formatting of the code. - - <li>Don't mix tabs and spaces because it makes the diff output unreadable, use consistent indentation. - - <li>Use standard C, avoid C++ comments and inline variable declarations. - - <li>Read the diff and make sure it contains only what you want in it. - - <li>Register an account on the Wine bugzilla with the email address you use to send patches. -</ul> - -<p>Accepted patches will appear in the <a href="{$root}/site/forums">wine-cvs</a> mailing list. - -<p>Patches with obvious problems may receive a response on wine-devel. - -<p>Some patches may not receive any response. In this case, your patch - maybe considered <i>Not Obviously Correct</i>, and you can: - -<ul> - <li> Check the patch over yourself, and think about what can be done to - clarify the patch (hints in the list above). - - <li> Write a mail to wine-devel, explain your patch and request it be - reviewed by anybody that cares to review it. - - <li> Ask for advice about your patch on #winehackers. - - <li> Unless one already exists, open a bug in bugzilla describing the - problem you are trying to solve (eg. ./configure fails on Solaris, - etc) and attach your patch. -</ul> - -<p> - If your patch didn't receive a response for 3 days of WineHQ Git commits - your patch has a high chance of being in this category. - <br/> - You may find it difficult to solicit feedback, - so think carefully about the comments you receive. - <br/> - Just do not give up! -</p> - -<hr> - -<h2>Generating a patch for WineHQ with Git</h2> - -<p>It's best to send small patches against the current tree using Git. -First, make sure your tree is up to date, as described on the -<a href="http://wiki.winehq.org/GitWine">Git</a> page. - -<p>Check in your patches to your Git tree using -<a href="http://www.kernel.org/pub/software/scm/git/docs/git-commit.html">git commit</a>.</p> - -<p>If you're going to use -<a href="http://www.kernel.org/pub/software/scm/git/docs/git-imap-send.html">git imap-send</a> -make sure that you've set up the proper options in your Git config file, then run:</p> - - <table width="700" border=0 cellpadding=10><tr><td class=black> - <span class=inverse> - git format-patch --stdout --keep-subject --attach origin | git imap-send<br> - </span> - </td></tr> - </table> - -<p>That should upload your patches into your IMAP drafts folder, and allow you to check and -send them. In Mozilla Thunderbird, that is as simple as clicking "Edit Draft..." then "Send" -if you have setup the mail headers in the Git config file correctly. - -<p>If you can't use IMAP, use the following command to generate patchs:</p> - - <table width="700" border=0 cellpadding=10><tr><td class=black> - <span class=inverse> - git format-patch --keep-subject origin<br> - </span> - </td></tr> - </table> - -<p>That should generate a number of txt files, which you can send manually.</p> - -<p> </p>

1 0

Scott Ritchie : Remove Features page (content is on the wiki)
by Jeremy Newman July 28, 2009

July 28, 2009

Module: website Branch: master Commit: 95b76049b2fad6872585975a9cb8205b38471754 URL: http://source.winehq.org/git/website.git/?a=commit;h=95b76049b2fad687258597… Author: Scott Ritchie <scott(a)open-vote.org> Date: Mon Jul 27 02:31:37 2009 -0700 Remove Features page (content is on the wiki) --- templates/en/wine_features.template | 68 ----------------------------------- 1 files changed, 0 insertions(+), 68 deletions(-) diff --git a/templates/en/wine_features.template b/templates/en/wine_features.template deleted file mode 100644 index e5ac159..0000000 --- a/templates/en/wine_features.template +++ /dev/null @@ -1,68 +0,0 @@ - - - -<a href="{$root}/images/shots/full/wine_1.png"><img src="{$root}/images/shots/wine_1.png" -width=200 height=150 hspace=20 vspace=20 border=0 align=right -alt="Wine in action"></a> - -<h1 class="title">Wine Features</h1> - -<h3> Binary Compatibility </h3> -<ul> - <li> Loads Windows 9x/NT/2000/XP, Windows 3.x and DOS programs and libraries - <li> Win32 compatible memory layout, exception handling, threads and processes - <li> Designed for POSIX compatible operatings systems (eg. Linux and FreeBSD) - <li> "bug-for-bug" compatibility with Windows -</ul> -<h3> Graphics </h3> -<ul> - <li> X11-based graphics allows remote display to any X terminal - <li> X11, TrueType (.ttf/.ttc) and Windows Bitmap (.fon) Fonts - <li> DirectX support for games (limited Direct3D support) - <li> Support for OpenGL based games and applications - <li> Printing via PostScript driver or legacy native Win16 printer drivers - <li> Enhanced Metafile (EMF) and Windows Metafile (WMF) driver - <li> Desktop-in-a-box or mixable windows - <li> Windows MultiMedia (WinMM) layer support with builtin codecs -</ul> -<h3> Allows Windows program to interface with: </h3> -<ul> - <li> Sound devices via ALSA, OSS, ARTS, JACK, and libaudio etc - <li> Multi-lingual keyboards and CJK input method support via XIM - <li> Modems, serial devices - <li> Networks (TCP/IP and IPX) - <li> ASPI Scanners - <li> Windows Tablets via XInput (eg. Wacom) -</ul> -<h3> Wine API </h3> -<ul> - <li> Designed for source and binary compatibility with Win32 code - <li> Win32 API test suite to ensure compatibility - <li> Compilable on a wide range of C compilers - <li> Permits mixing of Win32 and POSIX code - <li> Permits mixing of ELF (.so) and PE (.dll/.exe) binaries in one address space - <li> Win32 compatible header files - <li> Automatically generated API documentation - <li> Resource compiler - <li> Message compiler - <li> IDL compiler - <li> Extensive Unicode support - <li> Internationalization -- Wine supports 16 languages - <li> Built-in debugger and configurable trace messages - <li> External memory checker support using Valgrind - <li> Sample programs -</ul> - -<hr /> -<table width="100%" border=0 cellpadding=0 cellspacing=0> -<tr valign=top> - <td width="50%" align=left> - <a href="{$root}/myths">Previous</a>: Debunking Wine Myths - </td> - <td width="50%" align=right> - Acknowledgements :<a href="{$root}/acknowledgement">Next</a> - </td> -</tr> -</table> - -<p> </p>

1 0

Scott Ritchie : Remove links to Features page
by Jeremy Newman July 28, 2009

July 28, 2009

Module: website Branch: master Commit: a92b07baba1f1abb032870b8cc67f08012da3d64 URL: http://source.winehq.org/git/website.git/?a=commit;h=a92b07baba1f1abb032870… Author: Scott Ritchie <scott(a)open-vote.org> Date: Mon Jul 27 02:31:31 2009 -0700 Remove links to Features page --- templates/en/about.template | 1 - templates/en/acknowledgement.template | 5 ----- templates/en/myths.template | 1 - 3 files changed, 0 insertions(+), 7 deletions(-) diff --git a/templates/en/about.template b/templates/en/about.template index edc73fe..430e7f6 100644 --- a/templates/en/about.template +++ b/templates/en/about.template @@ -39,7 +39,6 @@ the project:</p> <li><a href="{$root}/history">Wine's History</a></li> <li><a href="{$root}/why">Why Wine is so important</a></li> <li><a href="{$root}/myths">Debunking Wine Myths</a></li> - <li><a href="{$root}/wine_features">Wine's Features</a></li> <li><a href="{$root}/acknowledgement">Acknowledgements</a></li> <li><a href="{$root}/wwn">World Wine News</a></li> <li><a href="{$root}/interview">Interviews</a></li> diff --git a/templates/en/acknowledgement.template b/templates/en/acknowledgement.template index bebb49f..4399145 100644 --- a/templates/en/acknowledgement.template +++ b/templates/en/acknowledgement.template @@ -203,10 +203,5 @@ enough to have paid staff tackling tough problems.. we are.</p> <p>A complete list of <a href="http://source.winehq.org/git/?p=wine.git;a=blob_plain;f=AUTHORS">authors</a> can be found in the source code repository.</p> -<hr /> -<div class="link-container"> - <p class="left-link"><a href="{$root}/wine_features">Previous</a>: Wine's Features</p> - <p class="right-link">World Wine News: <a href="{$root}/wwn">Next</a></p> -</div> diff --git a/templates/en/myths.template b/templates/en/myths.template index 685d3ae..2880489 100644 --- a/templates/en/myths.template +++ b/templates/en/myths.template @@ -263,7 +263,6 @@ like Safedisc. Once ntoskrnl.exe is implemented Wine will have full support for <a href="{$root}/why">Previous</a>: Why Wine is so important </td> <td width="50%" align=right> - Wine's Features :<a href="{$root}/wine_features">Next</a> </td> </tr> </table>

1 0

Scott Ritchie : Add link to World Wine News Archive at bottom of News page.
by Jeremy Newman July 28, 2009

July 28, 2009

Module: website Branch: master Commit: 32c1d18319024193821248c39696dbdf1ea94bfe URL: http://source.winehq.org/git/website.git/?a=commit;h=32c1d18319024193821248… Author: Scott Ritchie <scott(a)open-vote.org> Date: Mon Jul 27 02:31:27 2009 -0700 Add link to World Wine News Archive at bottom of News page. --- templates/en/news.template | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/templates/en/news.template b/templates/en/news.template index 0cf7916..38aabe1 100644 --- a/templates/en/news.template +++ b/templates/en/news.template @@ -5,6 +5,11 @@  +<hr /> + +<div class="link-container"> + <p><a href="{$root}/wwn/">World Wine News Archive</a></p> +</div> <ul class="rss"> <li><a href="{$root}/news/rss/">WineHQ News RSS Feed</a></li> </ul>

1 0

Scott Ritchie : Remove "Link to us" from Polish download page as well
by Jeremy Newman July 28, 2009

July 28, 2009

Module: website Branch: master Commit: 5a93000294c31e2dd16b7f9aa9d2decbdbfe4fb9 URL: http://source.winehq.org/git/website.git/?a=commit;h=5a93000294c31e2dd16b7f… Author: Scott Ritchie <scott(a)open-vote.org> Date: Mon Jul 27 02:31:16 2009 -0700 Remove "Link to us" from Polish download page as well --- templates/pl/download.template | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/templates/pl/download.template b/templates/pl/download.template index af79a84..9c50525 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -194,13 +194,3 @@ stronę wiki</a> w poszukiwaniu aplikacji osób trzecich.</p> <div style="margin: 10px; padding: 5px; border: 1px solid #C0C0C0; background-color: #F0F0F0;"><b>Notka:</b> Zobacz <a href="http://wiki.winehq.org/Recommended_Packages">zalecane paczki</a> aby uzyskać pomoc przy konfiguracji i kompilacji Wine.</div> - -<h2><a name="link2us"></a>Link do nas</h2> - -<p> - <a href="http://www.winehq.org/download" target="_blank"><img - src="{$root}/images/download_wine.png" border="1" width="88" height="31" vspace="0" hspace="5" align="left" - alt="Download Wine"></a> - Użyj tego obrazka jeżeli chcesz utworzyć dowiązanie do naszej pobieralni. -</p> -

1 0

Scott Ritchie : Remove "link to us" from German Download page as well
by Jeremy Newman July 28, 2009

July 28, 2009

Module: website Branch: master Commit: 41b8ebfbdcbec0ca9a3a8bc4eb8f9457decc7fd7 URL: http://source.winehq.org/git/website.git/?a=commit;h=41b8ebfbdcbec0ca9a3a8b… Author: Scott Ritchie <scott(a)open-vote.org> Date: Mon Jul 27 02:31:09 2009 -0700 Remove "link to us" from German Download page as well --- templates/de/download.template | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 054b250..9f9daef 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -217,12 +217,3 @@ erbeten hat, dass sie die Wine-Website hosten.</p> Hinweise zur Konfiguration und zum Kompilieren von Wine.</div> -<h2><a name="link2us"></a>Verlinke uns</h2> - -<p> - <a href="http://www.winehq.org/download" target="_blank"><img - src="{$root}/images/download_wine.png" border="1" width="88" height="31" vspace="0" hspace="5" align="left" - alt="Download Wine"></a> - Benutze dieses Bild, wenn Du zu unserer Download-Seite verlinken willst. -</p> -

1 0

Scott Ritchie : Remove "link to us" and old graphic from downloads page
by Jeremy Newman July 28, 2009

July 28, 2009

Module: website Branch: master Commit: b2ce96d384e5061a91cd06c56b2fc0427c881c81 URL: http://source.winehq.org/git/website.git/?a=commit;h=b2ce96d384e5061a91cd06… Author: Scott Ritchie <scott(a)open-vote.org> Date: Mon Jul 27 02:30:55 2009 -0700 Remove "link to us" and old graphic from downloads page --- templates/en/download.template | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index ceb91ad..490d719 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -190,13 +190,3 @@ requested in exchange for hosting the Wine web site.</p> <div style="margin: 10px; padding: 5px; border: 1px solid #C0C0C0; background-color: #F0F0F0;"><b>Note:</b> See the <a href="http://wiki.winehq.org/Recommended_Packages">recommended packages</a> for help on configuring and building Wine.</div> - -<h2><a name="link2us"></a>Link to Us</h2> - -<p> - <a href="http://www.winehq.org/download" target="_blank"><img - src="{$root}/images/download_wine.png" border="1" width="88" height="31" vspace="0" hspace="5" align="left" - alt="Download Wine"></a> - Use this image if you want to link to our download page. -</p> -

1 0

Scott Ritchie : Remove obsolete options page and its only link (resend)
by Jeremy Newman July 28, 2009

July 28, 2009

Module: website Branch: master Commit: 45b894680a5351096ddc37b9247d4f83763942fd URL: http://source.winehq.org/git/website.git/?a=commit;h=45b894680a5351096ddc37… Author: Scott Ritchie <scott(a)open-vote.org> Date: Mon Jul 27 02:30:42 2009 -0700 Remove obsolete options page and its only link (resend) --- templates/en/status.template | 5 - templates/en/status/options.template | 198 ---------------------------------- 2 files changed, 0 insertions(+), 203 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=45b894680a5351096d…

1 0

Alexander Nicolaysen Sørnes : Add support for application-wide notes
by Alexander Nicolaysen Sørnes July 28, 2009

July 28, 2009

Module: appdb Branch: master Commit: c37fbc62950dd3ca68a549c42ee2a61fcda61d67 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c37fbc62950dd3ca68a549c4… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 28 17:48:52 2009 +0200 Add support for application-wide notes --- include/application.php | 5 ++ include/html.php | 17 +++++++ include/note.php | 107 +++++++++++++++++++++++++++++++++++++--------- include/version.php | 10 +---- tables/appdb_tables.sql | 1 + 5 files changed, 110 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=c37fbc62950dd3ca68a5…

1 0

Alexander Nicolaysen Sørnes : testData: Use TESTDATA_AGED_THRESHOLD instead of hard-coded number
by Alexander Nicolaysen Sørnes July 27, 2009

July 27, 2009

Module: appdb Branch: master Commit: 7682b4ae67294de2786423adda23d07e7eef499f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7682b4ae67294de2786423ad… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jul 27 03:24:17 2009 +0200 testData: Use TESTDATA_AGED_THRESHOLD instead of hard-coded number --- include/testData.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/testData.php b/include/testData.php index 6861e18..23aff30 100644 --- a/include/testData.php +++ b/include/testData.php @@ -1421,7 +1421,7 @@ class testData{ if(!$this->iTestingId) return false; - return ((mktime() - mysqltimestamp_to_unixtimestamp($this->sSubmitTime)) > (60 * 60 * 24 * 175)); + return ((mktime() - mysqltimestamp_to_unixtimestamp($this->sSubmitTime)) > (60 * 60 * 24 * TESTDATA_AGED_THRESHOLD)); } public function objectSetParent($iNewId, $sClass = 'version')

1 0

Alexander Nicolaysen Sørnes : testData: Prevent accessing an undefined variable
by Alexander Nicolaysen Sørnes July 24, 2009

July 24, 2009

Module: appdb Branch: master Commit: a23e72c7cb7a9730ba5bae5cf038a2e90cb9d5e5 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a23e72c7cb7a9730ba5bae5c… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.site> Date: Fri Jul 24 00:21:18 2009 +0200 testData: Prevent accessing an undefined variable --- include/testData.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/testData.php b/include/testData.php index 18169da..6861e18 100644 --- a/include/testData.php +++ b/include/testData.php @@ -775,7 +775,7 @@ class testData{ if($hResult) { - $iPrevVersion = 0; + $iPrevRelease = 0; $iIndex = -1; for($i = 0; $oRow = mysql_fetch_object($hResult); $i++) {

1 0

Alexander Nicolaysen Sørnes : comment: Prevent accessing some undefined variables
by Alexander Nicolaysen Sørnes July 24, 2009

July 24, 2009

Module: appdb Branch: master Commit: e641db3d6c60b71f7dfeaced8778dc05b6282819 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e641db3d6c60b71f7dfeaced… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.site> Date: Fri Jul 24 00:20:41 2009 +0200 comment: Prevent accessing some undefined variables --- include/comment.php | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/include/comment.php b/include/comment.php index 09c2ab3..6a1716a 100644 --- a/include/comment.php +++ b/include/comment.php @@ -47,14 +47,9 @@ class Comment { $this->iCommentId = $oRow->commentId; $this->iParentId = $oRow->parentId; - if($oRow->appId) - { - $this->iAppId = $oRow->appId; - } else - { - $oVersion = new version($this->iVersionId); - $this->iAppId = $oApp->iAppId; - } + $oVersion = new version($this->iVersionId); + $this->iAppId = $oVersion->iAppId; + $this->iVersionId = $oRow->versionId; $this->sSubject = $oRow->subject; $this->sBody = $oRow->body;

1 0

Huw Davies : include: Remote parameter should be a pointer not an array.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: fe9d36005fb7450177719f826ebabb895c71a5f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe9d36005fb7450177719f826… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 24 12:27:13 2009 +0100 include: Remote parameter should be a pointer not an array. --- include/dbprop.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/dbprop.idl b/include/dbprop.idl index 088cf8c..77ceab0 100644 --- a/include/dbprop.idl +++ b/include/dbprop.idl @@ -30,7 +30,7 @@ interface IDBProperties : IUnknown { [call_as(GetProperties)] HRESULT RemoteGetProperties( [in] ULONG cPropertyIDSets, - [in, unique, size_is(cPropertyIDSets)] const DBPROPIDSET rgPropertyIDSets[], + [in, unique, size_is(cPropertyIDSets)] const DBPROPIDSET *rgPropertyIDSets, [in, out] ULONG *pcPropertySets, [out, size_is(,*pcPropertySets)] DBPROPSET **prgPropertySets, [out] IErrorInfo **ppErrorInfoRem);

1 0

Vladimir Pankratov : mshtml: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: fcf5d031dce682798551ac2bee9849a19c19c863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf5d031dce682798551ac2be… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Jul 24 14:17:29 2009 +0500 mshtml: Convert the Russian resources to UTF-8. --- dlls/mshtml/Ru.rc | 35 +++++++++++++++++++---------------- 1 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/Ru.rc b/dlls/mshtml/Ru.rc index d6fbc2b..7638d9b 100644 --- a/dlls/mshtml/Ru.rc +++ b/dlls/mshtml/Ru.rc @@ -18,39 +18,42 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_HTMLDISABLED "� �� HTML ��." - IDS_HTMLDOCUMENT "�� HTML" - IDS_DOWNLOADING "��..." - IDS_INSTALLING "��..." + IDS_HTMLDISABLED "В настоящее время отображение HTML выключенно." + IDS_HTMLDOCUMENT "Документ HTML" + IDS_DOWNLOADING "Загрузка..." + IDS_INSTALLING "Установка..." } ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 261, 85 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "�� Wine Gecko" +CAPTION "Установка Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "�� HTML ��. �� Wine �� " \ - "�� Gecko (Mozilla HTML engine). �� , �� Wine " \ - "�� Gecko.", ID_DWL_STATUS, 10, 10, 240, 33, SS_LEFT - CONTROL "��", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 46, 240, 12 - DEFPUSHBUTTON "&��", ID_DWL_INSTALL, 200, 63, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&��", IDCANCEL, 140, 63, 50, 15, WS_GROUP | WS_TABSTOP + LTEXT "Эта программа пытается отобразить HTML страницу. Для её отображения Wine необходимо " \ + "установить Gecko (Mozilla HTML engine). Нажмите кнопку установить если вы хотите, что бы Wine " \ + "автоматически загрузил и установил Gecko.", ID_DWL_STATUS, 10, 10, 240, 33, SS_LEFT + CONTROL "Прогресс", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 46, 240, 12 + DEFPUSHBUTTON "&Установить", ID_DWL_INSTALL, 200, 63, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Отмена", IDCANCEL, 140, 63, 50, 15, WS_GROUP | WS_TABSTOP } IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "��" +CAPTION "Ссылка" FONT 8, "MS Shell Dlg" { - GROUPBOX "�� ", -1, 5, 5, 190, 55 - LTEXT "&��:", -1, 10, 22, 20, 10 + GROUPBOX "Информация о ссылке", -1, 5, 5, 190, 55 + LTEXT "&Тип:", -1, 10, 22, 20, 10 COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS - LTEXT "&��:", -1, 10, 42, 20, 10 + LTEXT "&Адрес:", -1, 10, 42, 20, 10 EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "��", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Отмена", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP }

1 0

Vladimir Pankratov : credui: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 852ed3a8f9bc4dd55c9204a87b88a5c7e8935609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=852ed3a8f9bc4dd55c9204a87… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Jul 24 14:16:26 2009 +0500 credui: Convert the Russian resources to UTF-8. --- dlls/credui/credui_Ru.rc | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/credui/credui_Ru.rc b/dlls/credui/credui_Ru.rc index a990525..9e0a2d2 100644 --- a/dlls/credui/credui_Ru.rc +++ b/dlls/credui/credui_Ru.rc @@ -20,6 +20,9 @@ #include "credui_resources.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 @@ -30,23 +33,23 @@ BEGIN CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, 0,213,37 LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "��&��:",-1,8,62,72,12,SS_CENTERIMAGE + LTEXT "По&льзователь:",-1,8,62,72,12,SS_CENTERIMAGE CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&��:",-1,8,80,72,12,SS_CENTERIMAGE + LTEXT "&Пароль:",-1,8,80,72,12,SS_CENTERIMAGE EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "��&�� ",IDC_SAVE,"Button", + CONTROL "Со&хранить пароль",IDC_SAVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "��",IDOK,97,128,50,14 - PUSHBUTTON "��",IDCANCEL,156,128,50,14 + DEFPUSHBUTTON "ОК",IDOK,97,128,50,14 + PUSHBUTTON "Отмена",IDCANCEL,156,128,50,14 END STRINGTABLE DISCARDABLE { - IDS_TITLEFORMAT "�� %s" - IDS_MESSAGEFORMAT "�� %s" - IDS_INCORRECTPASSWORDTITLE "�� " - IDS_INCORRECTPASSWORD "��, �� \n� �� ." - IDS_CAPSLOCKONTITLE "Caps Lock ��" - IDS_CAPSLOCKON "�� -�� Caps Lock.\n\n�� Caps Lock �� , �� ." + IDS_TITLEFORMAT "Подключение к %s" + IDS_MESSAGEFORMAT "Подключение к %s" + IDS_INCORRECTPASSWORDTITLE "Вход не был произведён" + IDS_INCORRECTPASSWORD "Убедитесь, что имя пользователя\nи пароль верны." + IDS_CAPSLOCKONTITLE "Caps Lock включен" + IDS_CAPSLOCKON "Пароль может быть введён неправильно из-за нажатой клавиши Caps Lock.\n\nОтключите Caps Lock перед тем, как вводить пароль." }

1 0

Vladimir Pankratov : msacm32: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: d8992c45e44b82bb988390aac245bad23c80f960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8992c45e44b82bb988390aac… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Jul 24 14:17:21 2009 +0500 msacm32: Convert the Russian resources to UTF-8. --- dlls/msacm32/msacm_Ru.rc | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/msacm32/msacm_Ru.rc b/dlls/msacm32/msacm_Ru.rc index ea2a889..a777034 100644 --- a/dlls/msacm32/msacm_Ru.rc +++ b/dlls/msacm32/msacm_Ru.rc @@ -20,28 +20,31 @@ #include "wineacm.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "�� " +CAPTION "Выбор звука" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&��:", -1, 5, 5, 115, 8, NOT WS_GROUP + LTEXT "&Имя:", -1, 5, 5, 115, 8, NOT WS_GROUP COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&�� ...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&��", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "&Сохранить как...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&Удалить", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - LTEXT "&��:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Формат:", -1, 5, 41, 44, 8, NOT WS_GROUP COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&��:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Свойства:", -1, 5, 59, 44, 8, NOT WS_GROUP #if 0 COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, @@ -52,7 +55,7 @@ BEGIN CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP #endif DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "��", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&��", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "Отмена", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "&Помощь", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 END

1 0

Vladimir Pankratov : mpr: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 267e305b479f4184b8f37c17726e8fc25f21faec URL: http://source.winehq.org/git/wine.git/?a=commit;h=267e305b479f4184b8f37c177… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Jul 24 14:17:14 2009 +0500 mpr: Convert the Russian resources to UTF-8. --- dlls/mpr/mpr_Ru.rc | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/mpr/mpr_Ru.rc b/dlls/mpr/mpr_Ru.rc index 5995b49..3d17a0a 100644 --- a/dlls/mpr/mpr_Ru.rc +++ b/dlls/mpr/mpr_Ru.rc @@ -20,29 +20,32 @@ #include "mprres.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_ENTIRENETWORK "�� " + IDS_ENTIRENETWORK "Вся сеть" } IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "�� " +CAPTION "Введите сетевой пароль" FONT 8, "MS Shell Dlg" { - LTEXT "�� :", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "��", -1, 40, 26, 50, 10 + LTEXT "Введите ваши имя и пароль пользователя:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Прокси", -1, 40, 26, 50, 10 /* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "��", -1, 40, 66, 50, 10 - LTEXT "��", -1, 40, 86, 50, 10 + LTEXT "Имя", -1, 40, 66, 50, 10 + LTEXT "Пароль", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&�� (��!)", IDC_SAVEPASSWORD, + CHECKBOX "&Сохранить этот пароль (небезопасно!)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "��", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Отмена", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP }

1 0

Vladimir Pankratov : gphoto2.ds: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: c6dc860edda67764418efde96682290771336b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6dc860edda67764418efde96… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Jul 24 14:16:35 2009 +0500 gphoto2.ds: Convert the Russian resources to UTF-8. --- dlls/gphoto2.ds/gphoto2_Ru.rc | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Ru.rc b/dlls/gphoto2.ds/gphoto2_Ru.rc index ad03a35..563b0af 100644 --- a/dlls/gphoto2.ds/gphoto2_Ru.rc +++ b/dlls/gphoto2.ds/gphoto2_Ru.rc @@ -20,35 +20,38 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "�� " +CAPTION "Файлы в камере" MENU 20545 FONT 8, "MS Sans Serif" BEGIN - CONTROL "��1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | WS_TABSTOP,7,7,358,229 - DEFPUSHBUTTON "�� ",IDC_IMPORT,152,252,72,14 - PUSHBUTTON "��",IDC_FETCH,7,252,64,14 - PUSHBUTTON "�� ",IDC_IMPORTALL,80,252,64,14 - CONTROL "�� ",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 - PUSHBUTTON "��",IDC_EXIT,315,252,50,14 + CONTROL "Список1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | WS_TABSTOP,7,7,358,229 + DEFPUSHBUTTON "Загрузить выбранные",IDC_IMPORT,152,252,72,14 + PUSHBUTTON "Просмотр",IDC_FETCH,7,252,64,14 + PUSHBUTTON "Загрузить все",IDC_IMPORTALL,80,252,64,14 + CONTROL "Больше не спрашивать",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + PUSHBUTTON "Выход",IDC_EXIT,315,252,50,14 END IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND -CAPTION "��" +CAPTION "Загрузка" FONT 8, "MS Sans Serif" BEGIN - LTEXT "��... ��",IDC_STATIC,5,19,176,8, SS_CENTER + LTEXT "Загрузка... Ждите",IDC_STATIC,5,19,176,8, SS_CENTER END IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER -CAPTION "�� " +CAPTION "Подключение к камере" FONT 8, "MS Sans Serif" BEGIN CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 - LTEXT "�� ... ��",IDC_STATIC,128,58,116,8 + LTEXT "Подключение к камере... Ждите",IDC_STATIC,128,58,116,8 END

1 0

Vladimir Pankratov : localui: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 36f01f6f7188af35001588f34ce34a1c11151d33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36f01f6f7188af35001588f34… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Jul 24 14:17:06 2009 +0500 localui: Convert the Russian resources to UTF-8. --- dlls/localui/ui_Ru.rc | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/localui/ui_Ru.rc b/dlls/localui/ui_Ru.rc index 3402f37..04f87b6 100644 --- a/dlls/localui/ui_Ru.rc +++ b/dlls/localui/ui_Ru.rc @@ -20,37 +20,40 @@ #include "localui.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "�� " +CAPTION "Добавить локальный порт" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "�� &�� :", -1, 7, 13, 194, 13, WS_VISIBLE + LTEXT "Введите &название локального порта:", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "��", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + PUSHBUTTON "Отменить", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE END LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "�� " +CAPTION "Установки параллельного порта" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "��-�� (��)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "&�� :", -1, 14, 22, 90, 13, WS_VISIBLE + GROUPBOX "Тайм-аут (секунд)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&Попыток пересылки:", -1, 14, 22, 90, 13, WS_VISIBLE EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "��", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE + PUSHBUTTON "Отмена", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END STRINGTABLE DISCARDABLE { - IDS_LOCALPORT "�� " - IDS_INVALIDNAME "�� '%s'" - IDS_PORTEXISTS "�� '%s' �� " - IDS_NOTHINGTOCONFIG "�� " + IDS_LOCALPORT "Локальный порт" + IDS_INVALIDNAME "Не правильное название порта '%s'" + IDS_PORTEXISTS "Порт '%s' уже существует" + IDS_NOTHINGTOCONFIG "Этот порт не имеет настроек" }

1 0

Vladimir Pankratov : hhctrl.ocx: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: dddbfcdeda238946ccd79876e862a6e3d1a3a2a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dddbfcdeda238946ccd79876e… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Jul 24 14:16:44 2009 +0500 hhctrl.ocx: Convert the Russian resources to UTF-8. --- dlls/hhctrl.ocx/Ru.rc | 59 +++++++++++++++++++++++++----------------------- 1 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/hhctrl.ocx/Ru.rc b/dlls/hhctrl.ocx/Ru.rc index 9d16db1..0634c39 100644 --- a/dlls/hhctrl.ocx/Ru.rc +++ b/dlls/hhctrl.ocx/Ru.rc @@ -21,40 +21,43 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_CONTENTS "&��" - IDS_INDEX "&��" - IDS_SEARCH "&��" - IDS_FAVORITES "&��" + IDS_CONTENTS "&Содержание" + IDS_INDEX "&Оглавление" + IDS_SEARCH "&Поиск" + IDS_FAVORITES "&Избранное" END STRINGTABLE BEGIN - IDTB_EXPAND "��" - IDTB_CONTRACT "��" - IDTB_STOP "��" - IDTB_REFRESH "��" - IDTB_BACK "��" - IDTB_HOME "� ��" - IDTB_SYNC "��" - IDTB_PRINT "��" - IDTB_OPTIONS "��" - IDTB_FORWARD "��" - IDTB_NOTES "��" - IDTB_BROWSE_FWD "�� " - IDTB_BROWSE_BACK "�� " - IDTB_CONTENTS "��" - IDTB_INDEX "��" - IDTB_SEARCH "��" - IDTB_HISTORY "��" - IDTB_FAVORITES "��" - IDTB_JUMP1 "�� 1" - IDTB_JUMP2 "�� 2" - IDTB_CUSTOMIZE "��" - IDTB_ZOOM "��" - IDTB_TOC_NEXT "�� " - IDTB_TOC_PREV "�� " + IDTB_EXPAND "Показать" + IDTB_CONTRACT "Спрятать" + IDTB_STOP "Остановить" + IDTB_REFRESH "Обновить" + IDTB_BACK "Назад" + IDTB_HOME "В начало" + IDTB_SYNC "Синхронизировать" + IDTB_PRINT "Печать" + IDTB_OPTIONS "Настройки" + IDTB_FORWARD "Вперёд" + IDTB_NOTES "Записки" + IDTB_BROWSE_FWD "Просмотр вперёд" + IDTB_BROWSE_BACK "Просмотр назад" + IDTB_CONTENTS "Содержание" + IDTB_INDEX "Оглавление" + IDTB_SEARCH "Поиск" + IDTB_HISTORY "История" + IDTB_FAVORITES "Избранное" + IDTB_JUMP1 "Переход 1" + IDTB_JUMP2 "Переход 2" + IDTB_CUSTOMIZE "Персонализовать" + IDTB_ZOOM "Масштаб" + IDTB_TOC_NEXT "Следующая глава" + IDTB_TOC_PREV "Предыдущая глава" END

1 0

Vladimir Pankratov : localspl: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: ab2a719c3a93c7d7738e7c3df499a4cf73d3ff13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab2a719c3a93c7d7738e7c3df… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Jul 24 14:16:59 2009 +0500 localspl: Convert the Russian resources to UTF-8. --- dlls/localspl/spl_Ru.rc | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/spl_Ru.rc b/dlls/localspl/spl_Ru.rc index fb51446..085488d 100644 --- a/dlls/localspl/spl_Ru.rc +++ b/dlls/localspl/spl_Ru.rc @@ -20,10 +20,13 @@ #include "localspl_private.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_LOCALPORT "�� " - IDS_LOCALMONITOR "�� " + IDS_LOCALPORT "Локальный порт" + IDS_LOCALMONITOR "Локальный монитор" }

1 0

Vladimir Pankratov : iccvid: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 14a391b8bb413ece215571ddd522b3584ef1e220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a391b8bb413ece215571ddd… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Jul 24 14:16:52 2009 +0500 iccvid: Convert the Russian resources to UTF-8. --- dlls/iccvid/iccvid_Ru.rc | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/iccvid/iccvid_Ru.rc b/dlls/iccvid/iccvid_Ru.rc index 01bbec0..7a77b34 100644 --- a/dlls/iccvid/iccvid_Ru.rc +++ b/dlls/iccvid/iccvid_Ru.rc @@ -18,10 +18,13 @@ #include "iccvid_private.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_NAME "�� -�� Cinepak" - IDS_DESCRIPTION "�� -�� Cinepak" + IDS_NAME "Видео кодер-декодер Cinepak" + IDS_DESCRIPTION "Видео кодер-декодер Cinepak" }

1 0