diff --git a/docs/Download.html b/docs/Download.html index a7bce1bcde7..e0550b4c63d 100644 --- a/docs/Download.html +++ b/docs/Download.html @@ -88,6 +88,11 @@

Latest stable release 0.7.6

If you know that you have a 64 bit computer, we suggest you download the 64 Bit version


Other releases (beta)

+

0.7.16

+

+ 32 Bit (.exe 812MB) | + 64 Bit (.exe 950MB) +

0.7.15

32 Bit (.exe 800MB) | diff --git a/instat/Interface/IDataViewGrid.vb b/instat/Interface/IDataViewGrid.vb index 477b359c7a4..fa8914db568 100644 --- a/instat/Interface/IDataViewGrid.vb +++ b/instat/Interface/IDataViewGrid.vb @@ -31,12 +31,25 @@ Public Interface IDataViewGrid Event WorksheetRemoved(worksheet As clsWorksheetAdapter) + Event FindRow() + Sub AddColumns(visiblePage As clsDataFramePage) Sub AddRowData(dataFrame As clsDataFrame) + Sub SearchRowInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, + Optional bApplyToRows As Boolean = False) + + Sub SelectColumnInGrid(strColumn As String) + + Sub AdjustColumnWidthAfterWrapping(strColumn As String, Optional bApplyWrap As Boolean = False) + Function GetSelectedColumns() As List(Of clsColumnHeaderDisplay) + Function GetFirstRowHeader() As String + + Function GetLastRowHeader() As String + Function GetWorksheetCount() As Integer End Interface \ No newline at end of file diff --git a/instat/Model/DataFrame/clsDataFramePage.vb b/instat/Model/DataFrame/clsDataFramePage.vb index 92197905670..e009de5fe92 100644 --- a/instat/Model/DataFrame/clsDataFramePage.vb +++ b/instat/Model/DataFrame/clsDataFramePage.vb @@ -280,6 +280,8 @@ Public Class clsDataFramePage columnHeader.strTypeShortCode = "(LT)" ElseIf strHeaderType.Contains("complex") Then columnHeader.strTypeShortCode = "(CX)" + ElseIf strHeaderType.Contains("sfc_MULTIPOLYGON") OrElse strHeaderType.Contains("sfc") Then + columnHeader.strTypeShortCode = "(G)" ' Types of data for specific Application areas e.g. survival are coded with "(A)" ' No examples implemented yet. 'ElseIf strType.Contains() Then diff --git a/instat/Model/Output/clsOutputLogger.vb b/instat/Model/Output/clsOutputLogger.vb index a0b843a1c04..25e04fc2083 100644 --- a/instat/Model/Output/clsOutputLogger.vb +++ b/instat/Model/Output/clsOutputLogger.vb @@ -77,36 +77,47 @@ Public Class clsOutputLogger Exit Sub End If - Dim outputType As OutputType - If String.IsNullOrEmpty(strOutput) Then - outputType = OutputType.Script - ElseIf Not bAsFile Then - outputType = OutputType.TextOutput - Else - Dim strFileExtension As String = Path.GetExtension(strOutput).ToLower - Select Case strFileExtension - Case ".png" - outputType = OutputType.ImageOutput - Case ".html" - outputType = OutputType.HtmlOutput - Case ".txt" - outputType = OutputType.TextOutput - Case Else - MessageBox.Show("The file type to be added is currently not suported", - "Developer Error", - MessageBoxButtons.OK, - MessageBoxIcon.Error) - Exit Sub - End Select + 'add the R script as an output element + Dim rScriptElement As New clsOutputElement + rScriptElement.SetContent(strScript, OutputType.Script, "") + _outputElements.Add(rScriptElement) + 'raise event for output pages + RaiseEvent NewOutputAdded(rScriptElement, False) + + + If Not String.IsNullOrEmpty(strOutput) Then + Dim outputElement As New clsOutputElement + Dim outputType As OutputType + If bAsFile Then + Dim strFileExtension As String = Path.GetExtension(strOutput).ToLower + Select Case strFileExtension + Case ".png" + outputType = OutputType.ImageOutput + Case ".html" + outputType = OutputType.HtmlOutput + Case ".txt" + outputType = OutputType.TextOutput + Case Else + MessageBox.Show("The file type to be added is currently not suported", + "Developer Error", + MessageBoxButtons.OK, + MessageBoxIcon.Error) + Exit Sub + End Select + Else + outputType = OutputType.TextOutput + End If + + 'add the output with it's R script as another output element + outputElement.SetContent("", outputType, strOutput) + '_outputElements.Add(outputElement) + 'raise event for output pages + RaiseEvent NewOutputAdded(outputElement, bDisplayOutputInExternalViewer) + End If - Dim outputElement As New clsOutputElement - outputElement.SetContent(strScript, outputType, strOutput) - _outputElements.Add(outputElement) - 'raise event for output pages - RaiseEvent NewOutputAdded(outputElement, bDisplayOutputInExternalViewer) End Sub '''

diff --git a/instat/Translations.vb b/instat/Translations.vb index 3b5982a32bc..23a1ee24571 100644 --- a/instat/Translations.vb +++ b/instat/Translations.vb @@ -296,7 +296,7 @@ Public Class Translations strSqlUpdate &= "(" For iListPos As Integer = 0 To lstPatterns.Count - 1 strSqlUpdate &= If(iListPos > 0, " OR ", "") - strSqlUpdate &= "control_name LIKE '" & lstPatterns.Item(iListPos) & "'" + strSqlUpdate &= "control_name LIKE '" & lstPatterns.Item(iListPos) & "' ESCAPE '\'" Next iListPos strSqlUpdate &= ")" End If @@ -306,7 +306,7 @@ Public Class Translations strSqlUpdate &= "NOT (" For iListPos As Integer = 0 To lstPatternNegations.Count - 1 strSqlUpdate &= If(iListPos > 0, " OR ", "") - strSqlUpdate &= "control_name LIKE '" & lstPatternNegations.Item(iListPos) & "'" + strSqlUpdate &= "control_name LIKE '" & lstPatternNegations.Item(iListPos) & "' ESCAPE '\'" Next iListPos strSqlUpdate &= ")" End If diff --git a/instat/UserControl/ucrOutputPage.vb b/instat/UserControl/ucrOutputPage.vb index 1f1612865cd..e1328bbaee6 100644 --- a/instat/UserControl/ucrOutputPage.vb +++ b/instat/UserControl/ucrOutputPage.vb @@ -131,7 +131,12 @@ Public Class ucrOutputPage Public Sub AddNewOutput(outputElement As clsOutputElement, Optional bDisplayOutputInExternalViewer As Boolean = False) 'add the script first. This applies to whether the output has an output or not or 'whether it's just a script output - AddNewScript(outputElement) + + 'todo. temporary fix. Output element should always have an R script + If outputElement.FormattedRScript IsNot Nothing Then + AddNewScript(outputElement) + End If + 'then add the output of the script if there is an output If Not String.IsNullOrEmpty(outputElement.Output) Then @@ -159,15 +164,34 @@ Public Class ucrOutputPage .BorderStyle = BorderStyle.None } + 'if settings are not available or both show commands and comments settings are enabled then just show the whole script + FillRichTextWithRScriptBasedOnSettings(richTextBox, outputElement.FormattedRScript) + + 'if no contents added just exit sub + If richTextBox.TextLength = 0 Then + Exit Sub + End If + + Dim panel As Panel = AddElementPanel(outputElement) + panel.Controls.Add(richTextBox) + panel.Controls.SetChildIndex(richTextBox, 0) + SetRichTextBoxHeight(richTextBox) + AddHandler richTextBox.KeyUp, AddressOf richTextBox_CopySelectedText + AddHandler richTextBox.MouseLeave, AddressOf panelContents_MouseLeave + End Sub + + + 'fills rich textbox with r script provided based on the global options provided + 'if all disabled then richtext will not be filled + Private Sub FillRichTextWithRScriptBasedOnSettings(richTextBox As RichTextBox, formattedRScript As List(Of clsRScriptElement)) 'if settings are not available or both show commands and comments settings are enabled then just show the whole script If frmMain.clsInstatOptions Is Nothing OrElse (frmMain.clsInstatOptions.bIncludeCommentDefault AndAlso frmMain.clsInstatOptions.bCommandsinOutput) Then - FillRichTextBoxWithFormatedRScript(richTextBox, outputElement.FormattedRScript) + FillRichTextBoxWithFormatedRScript(richTextBox, formattedRScript) Else - 'if either show commands or comments settings is enabled show the script that corresponds to either If frmMain.clsInstatOptions.bIncludeCommentDefault Then 'show comments only - For Each line As clsRScriptElement In outputElement.FormattedRScript + For Each line As clsRScriptElement In formattedRScript If line.Type = clsRToken.typToken.RComment Then AddFormatedTextToRichTextBox(richTextBox, line.Text, OutputFont.GetFontForScriptType(line.Type), OutputFont.GetColourForScriptType(line.Type)) End If @@ -175,27 +199,18 @@ Public Class ucrOutputPage ElseIf frmMain.clsInstatOptions.bCommandsinOutput Then 'show command lines that are not comments - For Each line As clsRScriptElement In outputElement.FormattedRScript + For Each line As clsRScriptElement In formattedRScript If Not (line.Type = clsRToken.typToken.RComment) Then AddFormatedTextToRichTextBox(richTextBox, line.Text, OutputFont.GetFontForScriptType(line.Type), OutputFont.GetColourForScriptType(line.Type)) End If Next End If - End If - 'if no contents added just exit sub - If richTextBox.TextLength = 0 Then - Exit Sub End If - - Dim panel As Panel = AddElementPanel(outputElement) - panel.Controls.Add(richTextBox) - panel.Controls.SetChildIndex(richTextBox, 0) - SetRichTextBoxHeight(richTextBox) - AddHandler richTextBox.KeyUp, AddressOf richTextBox_CopySelectedText - AddHandler richTextBox.MouseLeave, AddressOf panelContents_MouseLeave End Sub + + Private Sub AddNewTextOutput(outputElement As clsOutputElement) Dim panel As Panel = AddElementPanel(outputElement) @@ -403,10 +418,17 @@ Public Class ucrOutputPage Private Sub AddElementToRichTextBox(element As clsOutputElement, richText As RichTextBox) Select Case element.OutputType Case OutputType.Script - FillRichTextBoxWithFormatedRScript(richText, element.FormattedRScript) + FillRichTextWithRScriptBasedOnSettings(richText, element.FormattedRScript) Case OutputType.TextOutput - 'todo. check if output is file or not. if file, read the contents of the file - AddFormatedTextToRichTextBox(richText, element.Output, OutputFont.ROutputFont, OutputFont.ROutputColour) + Dim strOutput As String = "" + If element.IsFile Then + For Each strLine As String In IO.File.ReadLines(element.Output) + strOutput = strOutput & strLine & Environment.NewLine + Next strLine + Else + strOutput = element.Output + End If + AddFormatedTextToRichTextBox(richText, strOutput, OutputFont.ROutputFont, OutputFont.ROutputColour) Case OutputType.ImageOutput Clipboard.Clear() 'todo. instead of copy paste, add image to rtf directly from file? @@ -418,11 +440,7 @@ Public Class ucrOutputPage End Sub Private Function GetBitmapFromFile(strFilename As String) As Bitmap - Dim image As Bitmap - Using fs As New IO.FileStream(strFilename, IO.FileMode.Open) - image = New Bitmap(Drawing.Image.FromStream(fs)) - End Using - Return image + Return New Bitmap(strFilename) End Function Private Sub AddFormatedTextToRichTextBox(richTextBox As RichTextBox, text As String, font As Font, colour As Color) diff --git a/instat/UserControl/ucrOutputPages.Designer.vb b/instat/UserControl/ucrOutputPages.Designer.vb index e3b61118732..6ff64206e64 100644 --- a/instat/UserControl/ucrOutputPages.Designer.vb +++ b/instat/UserControl/ucrOutputPages.Designer.vb @@ -37,6 +37,7 @@ Partial Class ucrOutputPages Me.tabControl = New System.Windows.Forms.TabControl() Me.tpMain = New System.Windows.Forms.TabPage() Me.ucrMainOutputPage = New instat.ucrOutputPage() + Me.tbHelp = New System.Windows.Forms.ToolStripButton() Me.TableLayoutPanel1.SuspendLayout() Me.tsButtons.SuspendLayout() Me.tabControl.SuspendLayout() @@ -53,13 +54,13 @@ Partial Class ucrOutputPages Me.TableLayoutPanel1.Controls.Add(Me.tabControl, 0, 1) Me.TableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill Me.TableLayoutPanel1.Location = New System.Drawing.Point(0, 0) - Me.TableLayoutPanel1.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.TableLayoutPanel1.Margin = New System.Windows.Forms.Padding(2) Me.TableLayoutPanel1.Name = "TableLayoutPanel1" Me.TableLayoutPanel1.RowCount = 2 - Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32.0!)) + Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 26.0!)) Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!)) - Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 16.0!)) - Me.TableLayoutPanel1.Size = New System.Drawing.Size(628, 352) + Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 13.0!)) + Me.TableLayoutPanel1.Size = New System.Drawing.Size(471, 286) Me.TableLayoutPanel1.TabIndex = 1 ' 'tsButtons @@ -67,10 +68,10 @@ Partial Class ucrOutputPages Me.tsButtons.AccessibleRole = System.Windows.Forms.AccessibleRole.MenuBar Me.tsButtons.BackColor = System.Drawing.Color.White Me.tsButtons.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.tsButtons.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tdbAddToExisting, Me.tbAddToNew, Me.tbCopy, Me.tbMoveUp, Me.tbMoveDown, Me.tbDelete, Me.ToolStripSeparator1, Me.tbRename, Me.tbSave}) + Me.tsButtons.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tdbAddToExisting, Me.tbAddToNew, Me.tbCopy, Me.tbMoveUp, Me.tbMoveDown, Me.tbDelete, Me.ToolStripSeparator1, Me.tbRename, Me.tbSave, Me.tbHelp}) Me.tsButtons.Location = New System.Drawing.Point(0, 0) Me.tsButtons.Name = "tsButtons" - Me.tsButtons.Size = New System.Drawing.Size(628, 25) + Me.tsButtons.Size = New System.Drawing.Size(471, 25) Me.tsButtons.TabIndex = 11 Me.tsButtons.Text = "ToolStrip1" ' @@ -139,7 +140,7 @@ Partial Class ucrOutputPages Me.tbRename.Image = CType(resources.GetObject("tbRename.Image"), System.Drawing.Image) Me.tbRename.ImageTransparentColor = System.Drawing.Color.Magenta Me.tbRename.Name = "tbRename" - Me.tbRename.Size = New System.Drawing.Size(54, 22) + Me.tbRename.Size = New System.Drawing.Size(54, 19) Me.tbRename.Text = "Rename" ' 'tbSave @@ -148,28 +149,28 @@ Partial Class ucrOutputPages Me.tbSave.Image = CType(resources.GetObject("tbSave.Image"), System.Drawing.Image) Me.tbSave.ImageTransparentColor = System.Drawing.Color.Magenta Me.tbSave.Name = "tbSave" - Me.tbSave.Size = New System.Drawing.Size(35, 22) + Me.tbSave.Size = New System.Drawing.Size(35, 19) Me.tbSave.Text = "Save" ' 'tabControl ' Me.tabControl.Controls.Add(Me.tpMain) Me.tabControl.Dock = System.Windows.Forms.DockStyle.Fill - Me.tabControl.Location = New System.Drawing.Point(3, 34) - Me.tabControl.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.tabControl.Location = New System.Drawing.Point(2, 28) + Me.tabControl.Margin = New System.Windows.Forms.Padding(2) Me.tabControl.Name = "tabControl" Me.tabControl.SelectedIndex = 0 - Me.tabControl.Size = New System.Drawing.Size(622, 316) + Me.tabControl.Size = New System.Drawing.Size(467, 256) Me.tabControl.TabIndex = 1 ' 'tpMain ' Me.tpMain.Controls.Add(Me.ucrMainOutputPage) - Me.tpMain.Location = New System.Drawing.Point(4, 25) - Me.tpMain.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.tpMain.Location = New System.Drawing.Point(4, 22) + Me.tpMain.Margin = New System.Windows.Forms.Padding(2) Me.tpMain.Name = "tpMain" - Me.tpMain.Padding = New System.Windows.Forms.Padding(3, 2, 3, 2) - Me.tpMain.Size = New System.Drawing.Size(614, 287) + Me.tpMain.Padding = New System.Windows.Forms.Padding(2) + Me.tpMain.Size = New System.Drawing.Size(459, 230) Me.tpMain.TabIndex = 0 Me.tpMain.Text = "Main" Me.tpMain.UseVisualStyleBackColor = True @@ -181,21 +182,30 @@ Partial Class ucrOutputPages Me.ucrMainOutputPage.BCanRename = False Me.ucrMainOutputPage.BCanReOrder = False Me.ucrMainOutputPage.Dock = System.Windows.Forms.DockStyle.Fill - Me.ucrMainOutputPage.Location = New System.Drawing.Point(3, 2) - Me.ucrMainOutputPage.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.ucrMainOutputPage.Location = New System.Drawing.Point(2, 2) + Me.ucrMainOutputPage.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.ucrMainOutputPage.Name = "ucrMainOutputPage" - Me.ucrMainOutputPage.Size = New System.Drawing.Size(608, 283) + Me.ucrMainOutputPage.Size = New System.Drawing.Size(455, 226) Me.ucrMainOutputPage.TabIndex = 0 ' + 'tbHelp + ' + Me.tbHelp.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text + Me.tbHelp.Image = CType(resources.GetObject("tbHelp.Image"), System.Drawing.Image) + Me.tbHelp.ImageTransparentColor = System.Drawing.Color.Magenta + Me.tbHelp.Name = "tbHelp" + Me.tbHelp.Size = New System.Drawing.Size(36, 19) + Me.tbHelp.Text = "Help" + ' 'ucrOutputPages ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White Me.Controls.Add(Me.TableLayoutPanel1) - Me.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.Margin = New System.Windows.Forms.Padding(2) Me.Name = "ucrOutputPages" - Me.Size = New System.Drawing.Size(628, 352) + Me.Size = New System.Drawing.Size(471, 286) Me.TableLayoutPanel1.ResumeLayout(False) Me.TableLayoutPanel1.PerformLayout() Me.tsButtons.ResumeLayout(False) @@ -221,4 +231,5 @@ Partial Class ucrOutputPages Friend WithEvents tbRename As ToolStripButton Friend WithEvents tbSave As ToolStripButton Public WithEvents tsButtons As ToolStrip + Friend WithEvents tbHelp As ToolStripButton End Class diff --git a/instat/UserControl/ucrOutputPages.resx b/instat/UserControl/ucrOutputPages.resx index d23f5f5a24d..65c47d1077b 100644 --- a/instat/UserControl/ucrOutputPages.resx +++ b/instat/UserControl/ucrOutputPages.resx @@ -239,6 +239,21 @@ mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== \ No newline at end of file diff --git a/instat/UserControl/ucrOutputPages.vb b/instat/UserControl/ucrOutputPages.vb index c70a13cb346..3be43868659 100644 --- a/instat/UserControl/ucrOutputPages.vb +++ b/instat/UserControl/ucrOutputPages.vb @@ -24,6 +24,7 @@ Public Class ucrOutputPages Private _clsInstatOptions As InstatOptions Private _outputLogger As clsOutputLogger Private _selectedOutputPage As ucrOutputPage + Private _strSaveDirectory As String Public Sub New() ' This call is required by the designer. @@ -57,10 +58,11 @@ Public Class ucrOutputPages dlgSaveFile.Title = "Save Output Window" dlgSaveFile.Filter = "Rich Text Format (*.rtf)|*.rtf" dlgSaveFile.FileName = Path.GetFileName(SelectedTab) - dlgSaveFile.InitialDirectory = _clsInstatOptions.strWorkingDirectory + dlgSaveFile.InitialDirectory = If(String.IsNullOrEmpty(_strSaveDirectory), _clsInstatOptions.strWorkingDirectory, _strSaveDirectory) If DialogResult.OK = dlgSaveFile.ShowDialog() Then Try _selectedOutputPage.Save(dlgSaveFile.FileName) + _strSaveDirectory = Path.GetDirectoryName(dlgSaveFile.FileName) Catch MsgBox("Could not save the output window." & Environment.NewLine & "The file may be in use by another program or you may not have access to write to the specified location.", MsgBoxStyle.Critical) End Try @@ -284,6 +286,10 @@ Public Class ucrOutputPages SaveTab() End Sub + Private Sub tbHelp_Click(sender As Object, e As EventArgs) Handles tbHelp.Click + Help.ShowHelp(frmMain, frmMain.strStaticPath & "/" & frmMain.strHelpFilePath, HelpNavigator.TopicId, "540") + End Sub + Private Sub UpdateTabsInDropDown() tdbAddToExisting.DropDownItems.Clear() For Each list In _outputLogger.FilteredOutputs diff --git a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb index 3242484e946..b899d906312 100644 --- a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb +++ b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb @@ -31,6 +31,8 @@ Public Class ucrDataViewLinuxGrid Public Event EditCell() Implements IDataViewGrid.EditCell + Public Event FindRow() Implements IDataViewGrid.FindRow + Public Event WorksheetChanged() Implements IDataViewGrid.WorksheetChanged Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved @@ -74,6 +76,14 @@ Public Class ucrDataViewLinuxGrid Return tcTabs.SelectedTab.Text End Function + Public Function GetFirstRowHeader() As String Implements IDataViewGrid.GetFirstRowHeader + Return "" + End Function + + Public Function GetLastRowHeader() As String Implements IDataViewGrid.GetLastRowHeader + Return "" + End Function + Public Function GetWorksheetCount() As Integer Implements IDataViewGrid.GetWorksheetCount Return tcTabs.TabPages.Count() End Function @@ -106,6 +116,10 @@ Public Class ucrDataViewLinuxGrid RefreshSingleCell(dataGrid.CurrentCell.ColumnIndex, dataGrid.CurrentCell.RowIndex) End Sub + Public Sub AdjustColumnWidthAfterWrapping(strColumn As String, Optional bApplyWrap As Boolean = False) Implements IDataViewGrid.AdjustColumnWidthAfterWrapping + + End Sub + 'ToDo allow editing Private Sub DataGridView_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) RaiseEvent CellDataChanged() @@ -154,4 +168,12 @@ Public Class ucrDataViewLinuxGrid Dim dataGrid = GetDataGridFromSelectedTab() dataGrid.Rows(iRow).Cells(iColumn).Value = GetCurrentDataFrameFocus.DisplayedData(iRow, iColumn) End Sub + + Public Sub SearchRowInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, + Optional bApplyToRows As Boolean = False) Implements IDataViewGrid.SearchRowInGrid + End Sub + + Public Sub SelectColumnInGrid(strColumn As String) Implements IDataViewGrid.SelectColumnInGrid + + End Sub End Class \ No newline at end of file diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index e48ced3d88c..b7c4c9d77b7 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -30,6 +30,8 @@ Public Class ucrDataViewReoGrid Public Event EditCell() Implements IDataViewGrid.EditCell + Public Event FindRow() Implements IDataViewGrid.FindRow + Public Event WorksheetChanged() Implements IDataViewGrid.WorksheetChanged Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved @@ -100,6 +102,24 @@ Public Class ucrDataViewReoGrid grdData.CurrentWorksheet.RowHeaderWidth = TextRenderer.MeasureText(strLongestRowHeaderText, Me.Font).Width End Sub + Public Sub AdjustColumnWidthAfterWrapping(strColumn As String, Optional bApplyWrap As Boolean = False) Implements IDataViewGrid.AdjustColumnWidthAfterWrapping + Dim iColumnIndex As Integer = GetColumnIndex(strColName:=strColumn) + If iColumnIndex < 0 OrElse grdData.CurrentWorksheet.ColumnHeaders(iColumnIndex).Text.Contains("(G)") Then + MsgBox("Cannot wrap or unwrap this type of variable.") + Exit Sub + End If + + If bApplyWrap Then + grdData.CurrentWorksheet.AutoFitColumnWidth(iColumnIndex) + For i As Integer = 0 To grdData.CurrentWorksheet.RowCount - 1 + grdData.CurrentWorksheet.AutoFitRowHeight(i) + Next + Else + grdData.CurrentWorksheet.SetRowsHeight(1, grdData.CurrentWorksheet.RowCount, 20) + grdData.CurrentWorksheet.SetColumnsWidth(0, grdData.CurrentWorksheet.ColumnCount, 70) + End If + End Sub + Private Sub RefreshSingleCell(iColumn As Integer, iRow As Integer) grdData.CurrentWorksheet(iRow, iColumn) = GetCurrentDataFrameFocus.DisplayedData(iRow, iColumn) End Sub @@ -123,6 +143,14 @@ Public Class ucrDataViewReoGrid Return lstColumns End Function + Public Function GetFirstRowHeader() As String Implements IDataViewGrid.GetFirstRowHeader + Return grdData.CurrentWorksheet.RowHeaders(0).Text + End Function + + Public Function GetLastRowHeader() As String Implements IDataViewGrid.GetLastRowHeader + Return grdData.CurrentWorksheet.RowHeaders(grdData.CurrentWorksheet.RowCount - 1).Text + End Function + Public Function GetWorksheetCount() As Integer Implements IDataViewGrid.GetWorksheetCount Return grdData.Worksheets.Count End Function @@ -181,7 +209,6 @@ Public Class ucrDataViewReoGrid RefreshSingleCell(e.Cell.Column, e.Cell.Row) End Sub - Private Sub Worksheet_BeforePaste(sender As Object, e As BeforeRangeOperationEventArgs) e.IsCancelled = True 'prevents pasted data from being added directly into the data view 'validate columns @@ -211,7 +238,141 @@ Public Class ucrDataViewReoGrid If (e.KeyCode And Not Keys.Modifiers) = Keys.E AndAlso e.Modifiers = Keys.Control Then 'e.IsCancelled = True RaiseEvent EditCell() + ElseIf (e.KeyCode And Not Keys.Modifiers) = Keys.F AndAlso e.Modifiers = Keys.Control Then + RaiseEvent FindRow() + End If + End Sub + + Private Function GetColumnIndex(strColName As String) As Integer + Dim currWorksheet = grdData.CurrentWorksheet + If currWorksheet IsNot Nothing Then + For i As Integer = 0 To currWorksheet.Columns - 1 + Dim strCol As String = currWorksheet.ColumnHeaders(i).Text + If Trim(strCol.Split("(")(0)) = strColName.Replace("""", "") Then + Return i + End If + Next + End If + Return -1 + End Function + + Private Function GetRowIndex(currWorkSheet As Worksheet, strRowName As String) As Integer + If currWorkSheet IsNot Nothing Then + For i As Integer = 0 To currWorkSheet.Rows - 1 + Dim strCol As String = currWorkSheet.RowHeaders(i).Text + If strCol = strRowName Then + Return i + End If + Next + End If + Return -1 + End Function + + Private Function GetRowsIndexes(currWorkSheet As Worksheet, lstRows As List(Of Integer)) As List(Of Integer) + Dim lstRowsIndexes As New List(Of Integer) + If currWorkSheet IsNot Nothing Then + For i As Integer = 0 To lstRows.Count - 1 + For j As Integer = 0 To currWorkSheet.Rows - 1 + Dim strCol As String = currWorkSheet.RowHeaders(j).Text + If strCol = lstRows(i) Then + lstRowsIndexes.Add(j) + End If + Next + Next End If + Return lstRowsIndexes + End Function + + Private Sub ScrollToCellPos(currWorkSheet As Worksheet, iRow As Integer, iCol As Integer, bApplyToRows As Boolean) + + If bApplyToRows Then + currWorkSheet.SelectRows(iRow, 1) + Else + currWorkSheet.FocusPos = currWorkSheet.Cells(row:=iRow, col:=iCol).Position + End If + currWorkSheet.ScrollToCell(currWorkSheet.Cells(row:=iRow, col:=iCol).Address) + End Sub + + Private Sub SetRowOrCellBackgroundColor(currWorkSheet As Worksheet, rowNumbers As List(Of Integer), colIndex As Integer, bApplyToRows As Boolean, color As Color) + ' Create a new style object for the row background color + Dim rowStyle As WorksheetRangeStyle = New WorksheetRangeStyle With { + .Flag = PlainStyleFlag.BackColor, + .BackColor = color + } + + ' Iterate over the row numbers and apply the style to each row + For Each rowNumber As Integer In rowNumbers + ' Check if the row index is within the valid range + If rowNumber >= 0 AndAlso rowNumber < currWorkSheet.RowCount Then + If bApplyToRows Then + ' Apply the row style to the entire row + currWorkSheet.Cells(rowNumber, colIndex).Style.BackColor = color + Else + currWorkSheet.SetRangeStyles(New RangePosition(rowNumber, 0, 1, colIndex), rowStyle) + End If + End If + Next End Sub + Public Sub SearchRowInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, + Optional bApplyToRows As Boolean = False) Implements IDataViewGrid.SearchRowInGrid + Dim currSheet = grdData.CurrentWorksheet + + If currSheet.RowHeaders.Any(Function(x) x.Text = iRow) Then + Dim iRowIndex As Integer = GetRowIndex(currSheet, iRow) + Dim iColIndex As Integer = If(strColumn = Chr(34) & "filter" & Chr(34), 0, GetColumnIndex(strColName:=strColumn)) + + If iRowIndex > -1 AndAlso iColIndex > -1 Then + ScrollToCellPos(currWorkSheet:=currSheet, iRow:=iRowIndex, iCol:=iColIndex, bApplyToRows:=bApplyToRows) + If bApplyToRows Then + SetRowOrCellBackgroundColor(currWorkSheet:=currSheet, rowNumbers:=GetRowsIndexes(currSheet, rowNumbers), + colIndex:=currSheet.ColumnCount, bApplyToRows:=bApplyToRows, color:=Color.LightGreen) + Else + SetRowOrCellBackgroundColor(currWorkSheet:=currSheet, rowNumbers:=GetRowsIndexes(currSheet, rowNumbers), + colIndex:=iColIndex, bApplyToRows:=bApplyToRows, color:=Color.LightGreen) + End If + End If + End If + End Sub + + ''' + ''' This function takes an integer columnNumber as input and returns a string representing the corresponding Reogrid-style column letter. + ''' For example, 1 will be converted to "A", 26 to "Z", 27 to "AA", 28 to "AB", and so on. + ''' + ''' + ''' + Private Function ColumnNumberToAlpha(columnNumber As Integer) As String + Dim dividend As Integer = columnNumber + Dim columnName As String = String.Empty + Dim modulo As Integer + + While dividend > 0 + modulo = (dividend - 1) Mod 26 + columnName = Convert.ToChar(65 + modulo) & columnName + dividend = CInt((dividend - modulo) / 26) + End While + + Return columnName + End Function + + Public Sub SelectColumnInGrid(strColumn As String) Implements IDataViewGrid.SelectColumnInGrid + + If String.IsNullOrEmpty(strColumn) Then + Exit Sub + End If + + Dim currSheet = grdData.CurrentWorksheet + Dim iColumn As Integer = grdData.CurrentWorksheet.ColumnHeaders. + Where(Function(col) col.Text.Split("(")(0).Trim = strColumn). + FirstOrDefault().Index ' Get the correspond index of a column from a column name. + + Dim strOriginalColumnName As String = ColumnNumberToAlpha(iColumn + 1) & "1" + currSheet.ScrollToCell(strOriginalColumnName) + currSheet.SelectColumns(iColumn, 1) + ' Set the background color for the entire column + currSheet.SetRangeStyles(0, iColumn, currSheet.RowCount, 1, New WorksheetRangeStyle With { + .Flag = PlainStyleFlag.BackColor, + .BackColor = Color.LightGreen + }) + End Sub End Class diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrReoGrid.vb index 430226aa941..34ffa33d754 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrReoGrid.vb @@ -213,14 +213,28 @@ Public MustInherit Class ucrReoGrid e.IsCancelled = True End Sub + Private Function GetRowIndex(currWorkSheet As Worksheet, strRowName As String) As Integer + If currWorkSheet IsNot Nothing Then + For i As Integer = 0 To currWorkSheet.Rows - 1 + Dim strCol As String = currWorkSheet.RowHeaders(i).Text + If strCol = strRowName Then + Return i + End If + Next + End If + Return -1 + End Function + Private Function GetCellValue(iRow As Integer, strColumn As String) As String Implements IGrid.GetCellValue For i As Integer = 0 To grdData.CurrentWorksheet.ColumnCount - 1 Dim strColumnHeader As String = grdData.CurrentWorksheet.ColumnHeaders(i).Text If strColumnHeader.Contains("(") Then strColumnHeader = strColumnHeader.Split("(")(0) End If - If strColumnHeader.Trim = strColumn Then - Return grdData.CurrentWorksheet(iRow, i).ToString() + Dim iRowIndex = GetRowIndex(grdData.CurrentWorksheet, iRow) + 1 + If strColumnHeader.Trim = strColumn _ + AndAlso iRowIndex > -1 Then + Return grdData.CurrentWorksheet(iRowIndex, i).ToString() End If Next Return "" diff --git a/instat/UserControls/frmMaximiseOutput.Designer.vb b/instat/UserControls/frmMaximiseOutput.Designer.vb index 1e08ce34c92..ffae5395b5d 100644 --- a/instat/UserControls/frmMaximiseOutput.Designer.vb +++ b/instat/UserControls/frmMaximiseOutput.Designer.vb @@ -25,6 +25,7 @@ Partial Class frmMaximiseOutput Me.MenuStrip1 = New System.Windows.Forms.MenuStrip() Me.FileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.mnuSave = New System.Windows.Forms.ToolStripMenuItem() + Me.cmdHelp = New System.Windows.Forms.ToolStripMenuItem() Me.panelControl = New System.Windows.Forms.Panel() Me.MenuStrip1.SuspendLayout() Me.SuspendLayout() @@ -32,7 +33,7 @@ Partial Class frmMaximiseOutput 'MenuStrip1 ' Me.MenuStrip1.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FileToolStripMenuItem}) + Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FileToolStripMenuItem, Me.cmdHelp}) Me.MenuStrip1.Location = New System.Drawing.Point(0, 0) Me.MenuStrip1.Name = "MenuStrip1" Me.MenuStrip1.Padding = New System.Windows.Forms.Padding(4, 1, 0, 1) @@ -53,6 +54,12 @@ Partial Class frmMaximiseOutput Me.mnuSave.Size = New System.Drawing.Size(98, 22) Me.mnuSave.Text = "Save" ' + 'cmdHelp + ' + Me.cmdHelp.Name = "cmdHelp" + Me.cmdHelp.Size = New System.Drawing.Size(44, 22) + Me.cmdHelp.Text = "Help" + ' 'panelControl ' Me.panelControl.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ @@ -86,4 +93,5 @@ Partial Class frmMaximiseOutput Friend WithEvents FileToolStripMenuItem As ToolStripMenuItem Friend WithEvents mnuSave As ToolStripMenuItem Friend WithEvents panelControl As Panel + Friend WithEvents cmdHelp As ToolStripMenuItem End Class \ No newline at end of file diff --git a/instat/UserControls/frmMaximiseOutput.vb b/instat/UserControls/frmMaximiseOutput.vb index 431034c9d23..d21d0302620 100644 --- a/instat/UserControls/frmMaximiseOutput.vb +++ b/instat/UserControls/frmMaximiseOutput.vb @@ -110,4 +110,9 @@ Public Class frmMaximiseOutput End Using End Sub + + Private Sub cmdHelp_Click(sender As Object, e As EventArgs) Handles cmdHelp.Click + Help.ShowHelp(frmMain, frmMain.strStaticPath & "/" & frmMain.strHelpFilePath, HelpNavigator.TopicId, "590") + End Sub + End Class \ No newline at end of file diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb index e20a868d104..58002ce15bc 100644 --- a/instat/dlgCalculator.vb +++ b/instat/dlgCalculator.vb @@ -119,7 +119,13 @@ Public Class dlgCalculator Private Sub SaveResults() If ucrCalc.ucrSaveResultInto.ucrChkSave.Checked AndAlso ucrCalc.ucrSaveResultInto.IsComplete Then clsRemoveLabelsFunction.AddParameter("col_names", Chr(34) & ucrCalc.ucrSaveResultInto.GetText() & Chr(34), iPosition:=1) - ucrBase.clsRsyntax.SetAssignTo(ucrCalc.ucrSaveResultInto.GetText(), strTempColumn:=ucrCalc.ucrSaveResultInto.GetText(), strTempDataframe:=ucrCalc.ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bAssignToIsPrefix:=ucrBase.clsRsyntax.clsBaseCommandString.bAssignToIsPrefix, bAssignToColumnWithoutNames:=ucrBase.clsRsyntax.clsBaseCommandString.bAssignToColumnWithoutNames, bInsertColumnBefore:=ucrBase.clsRsyntax.clsBaseCommandString.bInsertColumnBefore, bRequireCorrectLength:=ucrBase.clsRsyntax.clsBaseCommandString.bRequireCorrectLength) + ucrBase.clsRsyntax.SetAssignTo(ucrCalc.ucrSaveResultInto.GetText(), strTempColumn:=ucrCalc.ucrSaveResultInto.GetText(), + strTempDataframe:=ucrCalc.ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.Text, + bAssignToIsPrefix:=ucrBase.clsRsyntax.clsBaseCommandString.bAssignToIsPrefix, + bAssignToColumnWithoutNames:=ucrBase.clsRsyntax.clsBaseCommandString.bAssignToColumnWithoutNames, + bInsertColumnBefore:=ucrBase.clsRsyntax.clsBaseCommandString.bInsertColumnBefore, + bRequireCorrectLength:=ucrBase.clsRsyntax.clsBaseCommandString.bRequireCorrectLength, + strAdjacentColumn:=ucrCalc.ucrSaveResultInto.AdjacentColumnName) ucrBase.clsRsyntax.AddToAfterCodes(clsRemoveLabelsFunction, 1) ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = True ucrBase.clsRsyntax.iCallType = 0 diff --git a/instat/dlgCopySheet.Designer.vb b/instat/dlgCopySheet.Designer.vb index 79bd1502d9c..28ccd10419b 100644 --- a/instat/dlgCopySheet.Designer.vb +++ b/instat/dlgCopySheet.Designer.vb @@ -21,7 +21,7 @@ Imports System ''' ''' A strongly-typed resource class, for looking up localized strings, etc. ''' - _ Friend Class dlgCopySheet diff --git a/instat/dlgFindInVariableOrFilter.Designer.vb b/instat/dlgFindInVariableOrFilter.Designer.vb index 368c14eaf18..ac40a27be97 100644 --- a/instat/dlgFindInVariableOrFilter.Designer.vb +++ b/instat/dlgFindInVariableOrFilter.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class dlgFindInVariableOrFilter Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,21 +20,362 @@ Partial Class dlgFindInVariableOrFilter 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + Me.lblMatching = New System.Windows.Forms.Label() + Me.cmdAddkeyboard = New System.Windows.Forms.Button() + Me.grpSelect = New System.Windows.Forms.GroupBox() + Me.rdoRow = New System.Windows.Forms.RadioButton() + Me.rdoCell = New System.Windows.Forms.RadioButton() + Me.ucrPnlSelect = New instat.UcrPanel() + Me.lblLabel = New System.Windows.Forms.Label() + Me.rdoVariable = New System.Windows.Forms.RadioButton() + Me.rdoInFilter = New System.Windows.Forms.RadioButton() + Me.lblPattern = New System.Windows.Forms.Label() + Me.lblVariable = New System.Windows.Forms.Label() + Me.cmdFind = New System.Windows.Forms.Button() + Me.rdoSelect = New System.Windows.Forms.RadioButton() + Me.lblFoundRow = New System.Windows.Forms.Label() + Me.lblVariableFound = New System.Windows.Forms.Label() + Me.lblName = New System.Windows.Forms.Label() + Me.cmdFindNext = New System.Windows.Forms.Button() + Me.ttLabels = New System.Windows.Forms.ToolTip(Me.components) + Me.ucrBase = New instat.ucrButtons() + Me.ucrChkIncludeRegularExpressions = New instat.ucrCheck() + Me.ucrChkIgnoreCase = New instat.ucrCheck() + Me.ucrPnlOptions = New instat.UcrPanel() + Me.ucrSelectorFind = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrReceiverVariable = New instat.ucrReceiverSingle() + Me.ucrInputPattern = New instat.ucrInputComboBox() + Me.grpSelect.SuspendLayout() Me.SuspendLayout() ' + 'lblMatching + ' + Me.lblMatching.AutoSize = True + Me.lblMatching.Location = New System.Drawing.Point(362, 280) + Me.lblMatching.Name = "lblMatching" + Me.lblMatching.Size = New System.Drawing.Size(57, 20) + Me.lblMatching.TabIndex = 69 + Me.lblMatching.Text = "Label1" + ' + 'cmdAddkeyboard + ' + Me.cmdAddkeyboard.Location = New System.Drawing.Point(388, 394) + Me.cmdAddkeyboard.Margin = New System.Windows.Forms.Padding(4) + Me.cmdAddkeyboard.Name = "cmdAddkeyboard" + Me.cmdAddkeyboard.Size = New System.Drawing.Size(150, 34) + Me.cmdAddkeyboard.TabIndex = 68 + Me.cmdAddkeyboard.Text = "Add Keyboard" + Me.cmdAddkeyboard.UseVisualStyleBackColor = True + ' + 'grpSelect + ' + Me.grpSelect.Controls.Add(Me.rdoRow) + Me.grpSelect.Controls.Add(Me.rdoCell) + Me.grpSelect.Controls.Add(Me.ucrPnlSelect) + Me.grpSelect.Location = New System.Drawing.Point(414, 205) + Me.grpSelect.Name = "grpSelect" + Me.grpSelect.Size = New System.Drawing.Size(200, 73) + Me.grpSelect.TabIndex = 64 + Me.grpSelect.TabStop = False + Me.grpSelect.Text = "Selecting Option" + ' + 'rdoRow + ' + Me.rdoRow.AutoSize = True + Me.rdoRow.Location = New System.Drawing.Point(114, 32) + Me.rdoRow.Name = "rdoRow" + Me.rdoRow.Size = New System.Drawing.Size(66, 24) + Me.rdoRow.TabIndex = 2 + Me.rdoRow.TabStop = True + Me.rdoRow.Text = "Row" + Me.rdoRow.UseVisualStyleBackColor = True + ' + 'rdoCell + ' + Me.rdoCell.AutoSize = True + Me.rdoCell.Location = New System.Drawing.Point(15, 32) + Me.rdoCell.Name = "rdoCell" + Me.rdoCell.Size = New System.Drawing.Size(60, 24) + Me.rdoCell.TabIndex = 1 + Me.rdoCell.TabStop = True + Me.rdoCell.Text = "Cell" + Me.rdoCell.UseVisualStyleBackColor = True + ' + 'ucrPnlSelect + ' + Me.ucrPnlSelect.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlSelect.Location = New System.Drawing.Point(9, 20) + Me.ucrPnlSelect.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrPnlSelect.Name = "ucrPnlSelect" + Me.ucrPnlSelect.Size = New System.Drawing.Size(182, 47) + Me.ucrPnlSelect.TabIndex = 0 + ' + 'lblLabel + ' + Me.lblLabel.AutoSize = True + Me.lblLabel.Location = New System.Drawing.Point(413, 198) + Me.lblLabel.Name = "lblLabel" + Me.lblLabel.Size = New System.Drawing.Size(57, 20) + Me.lblLabel.TabIndex = 75 + Me.lblLabel.Text = "Label1" + ' + 'rdoVariable + ' + Me.rdoVariable.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoVariable.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoVariable.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoVariable.FlatAppearance.BorderSize = 2 + Me.rdoVariable.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoVariable.Location = New System.Drawing.Point(124, 14) + Me.rdoVariable.Margin = New System.Windows.Forms.Padding(4) + Me.rdoVariable.Name = "rdoVariable" + Me.rdoVariable.Size = New System.Drawing.Size(127, 40) + Me.rdoVariable.TabIndex = 54 + Me.rdoVariable.Text = "Variable" + Me.rdoVariable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoVariable.UseVisualStyleBackColor = True + ' + 'rdoInFilter + ' + Me.rdoInFilter.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoInFilter.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoInFilter.FlatAppearance.BorderSize = 2 + Me.rdoInFilter.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoInFilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoInFilter.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoInFilter.Location = New System.Drawing.Point(250, 14) + Me.rdoInFilter.Margin = New System.Windows.Forms.Padding(4) + Me.rdoInFilter.Name = "rdoInFilter" + Me.rdoInFilter.Size = New System.Drawing.Size(127, 40) + Me.rdoInFilter.TabIndex = 55 + Me.rdoInFilter.Text = "Filter" + Me.rdoInFilter.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoInFilter.UseVisualStyleBackColor = True + ' + 'lblPattern + ' + Me.lblPattern.AutoSize = True + Me.lblPattern.Location = New System.Drawing.Point(414, 138) + Me.lblPattern.Name = "lblPattern" + Me.lblPattern.Size = New System.Drawing.Size(65, 20) + Me.lblPattern.TabIndex = 59 + Me.lblPattern.Text = "Pattern:" + ' + 'lblVariable + ' + Me.lblVariable.AutoSize = True + Me.lblVariable.Location = New System.Drawing.Point(414, 75) + Me.lblVariable.Name = "lblVariable" + Me.lblVariable.Size = New System.Drawing.Size(71, 20) + Me.lblVariable.TabIndex = 57 + Me.lblVariable.Text = "Variable:" + ' + 'cmdFind + ' + Me.cmdFind.Location = New System.Drawing.Point(414, 306) + Me.cmdFind.Name = "cmdFind" + Me.cmdFind.Size = New System.Drawing.Size(180, 36) + Me.cmdFind.TabIndex = 60 + Me.cmdFind.Text = "Find" + Me.cmdFind.UseVisualStyleBackColor = True + ' + 'rdoSelect + ' + Me.rdoSelect.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoSelect.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoSelect.FlatAppearance.BorderSize = 2 + Me.rdoSelect.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoSelect.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoSelect.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoSelect.Location = New System.Drawing.Point(376, 14) + Me.rdoSelect.Margin = New System.Windows.Forms.Padding(4) + Me.rdoSelect.Name = "rdoSelect" + Me.rdoSelect.Size = New System.Drawing.Size(127, 40) + Me.rdoSelect.TabIndex = 70 + Me.rdoSelect.Text = "Select" + Me.rdoSelect.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoSelect.UseVisualStyleBackColor = True + ' + 'lblFoundRow + ' + Me.lblFoundRow.AutoSize = True + Me.lblFoundRow.Location = New System.Drawing.Point(418, 279) + Me.lblFoundRow.Name = "lblFoundRow" + Me.lblFoundRow.Size = New System.Drawing.Size(57, 20) + Me.lblFoundRow.TabIndex = 72 + Me.lblFoundRow.Text = "Label1" + ' + 'lblVariableFound + ' + Me.lblVariableFound.AutoSize = True + Me.lblVariableFound.Location = New System.Drawing.Point(413, 138) + Me.lblVariableFound.Name = "lblVariableFound" + Me.lblVariableFound.Size = New System.Drawing.Size(57, 20) + Me.lblVariableFound.TabIndex = 73 + Me.lblVariableFound.Text = "Label1" + ' + 'lblName + ' + Me.lblName.AutoSize = True + Me.lblName.Location = New System.Drawing.Point(413, 166) + Me.lblName.Name = "lblName" + Me.lblName.Size = New System.Drawing.Size(57, 20) + Me.lblName.TabIndex = 74 + Me.lblName.Text = "Label1" + ' + 'cmdFindNext + ' + Me.cmdFindNext.Location = New System.Drawing.Point(414, 346) + Me.cmdFindNext.Name = "cmdFindNext" + Me.cmdFindNext.Size = New System.Drawing.Size(180, 36) + Me.cmdFindNext.TabIndex = 61 + Me.cmdFindNext.Text = "Find Next" + Me.cmdFindNext.UseVisualStyleBackColor = True + Me.cmdFindNext.Visible = False + ' + 'ucrBase + ' + Me.ucrBase.AutoSize = True + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(10, 438) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(611, 77) + Me.ucrBase.TabIndex = 71 + ' + 'ucrChkIncludeRegularExpressions + ' + Me.ucrChkIncludeRegularExpressions.AutoSize = True + Me.ucrChkIncludeRegularExpressions.Checked = False + Me.ucrChkIncludeRegularExpressions.Location = New System.Drawing.Point(10, 394) + Me.ucrChkIncludeRegularExpressions.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkIncludeRegularExpressions.Name = "ucrChkIncludeRegularExpressions" + Me.ucrChkIncludeRegularExpressions.Size = New System.Drawing.Size(358, 34) + Me.ucrChkIncludeRegularExpressions.TabIndex = 67 + ' + 'ucrChkIgnoreCase + ' + Me.ucrChkIgnoreCase.AutoSize = True + Me.ucrChkIgnoreCase.Checked = False + Me.ucrChkIgnoreCase.Location = New System.Drawing.Point(10, 345) + Me.ucrChkIgnoreCase.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkIgnoreCase.Name = "ucrChkIgnoreCase" + Me.ucrChkIgnoreCase.Size = New System.Drawing.Size(196, 34) + Me.ucrChkIgnoreCase.TabIndex = 66 + ' + 'ucrPnlOptions + ' + Me.ucrPnlOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlOptions.Location = New System.Drawing.Point(116, 12) + Me.ucrPnlOptions.Margin = New System.Windows.Forms.Padding(9) + Me.ucrPnlOptions.Name = "ucrPnlOptions" + Me.ucrPnlOptions.Size = New System.Drawing.Size(398, 52) + Me.ucrPnlOptions.TabIndex = 53 + ' + 'ucrSelectorFind + ' + Me.ucrSelectorFind.AutoSize = True + Me.ucrSelectorFind.bDropUnusedFilterLevels = False + Me.ucrSelectorFind.bShowHiddenColumns = False + Me.ucrSelectorFind.bUseCurrentFilter = True + Me.ucrSelectorFind.Location = New System.Drawing.Point(10, 65) + Me.ucrSelectorFind.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorFind.Name = "ucrSelectorFind" + Me.ucrSelectorFind.Size = New System.Drawing.Size(320, 274) + Me.ucrSelectorFind.TabIndex = 56 + ' + 'ucrReceiverVariable + ' + Me.ucrReceiverVariable.AutoSize = True + Me.ucrReceiverVariable.frmParent = Me + Me.ucrReceiverVariable.Location = New System.Drawing.Point(414, 98) + Me.ucrReceiverVariable.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverVariable.Name = "ucrReceiverVariable" + Me.ucrReceiverVariable.Selector = Nothing + Me.ucrReceiverVariable.Size = New System.Drawing.Size(191, 30) + Me.ucrReceiverVariable.strNcFilePath = "" + Me.ucrReceiverVariable.TabIndex = 58 + Me.ucrReceiverVariable.ucrSelector = Nothing + ' + 'ucrInputPattern + ' + Me.ucrInputPattern.AddQuotesIfUnrecognised = True + Me.ucrInputPattern.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputPattern.GetSetSelectedIndex = -1 + Me.ucrInputPattern.IsReadOnly = False + Me.ucrInputPattern.Location = New System.Drawing.Point(414, 158) + Me.ucrInputPattern.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputPattern.Name = "ucrInputPattern" + Me.ucrInputPattern.Size = New System.Drawing.Size(191, 32) + Me.ucrInputPattern.TabIndex = 65 + ' 'dlgFindInVariableOrFilter ' Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(800, 450) + Me.ClientSize = New System.Drawing.Size(625, 525) + Me.Controls.Add(Me.lblLabel) + Me.Controls.Add(Me.lblName) + Me.Controls.Add(Me.lblVariableFound) + Me.Controls.Add(Me.lblFoundRow) + Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.rdoSelect) + Me.Controls.Add(Me.lblMatching) + Me.Controls.Add(Me.cmdAddkeyboard) + Me.Controls.Add(Me.ucrChkIncludeRegularExpressions) + Me.Controls.Add(Me.ucrChkIgnoreCase) + Me.Controls.Add(Me.grpSelect) + Me.Controls.Add(Me.cmdFindNext) + Me.Controls.Add(Me.rdoVariable) + Me.Controls.Add(Me.rdoInFilter) + Me.Controls.Add(Me.ucrPnlOptions) + Me.Controls.Add(Me.ucrSelectorFind) + Me.Controls.Add(Me.ucrReceiverVariable) + Me.Controls.Add(Me.lblPattern) + Me.Controls.Add(Me.lblVariable) + Me.Controls.Add(Me.cmdFind) + Me.Controls.Add(Me.ucrInputPattern) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Name = "dlgFindInVariableOrFilter" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Find In Variable Or Filter" + Me.Tag = "Find_Rows_or_Columns" + Me.Text = "Find Rows or Columns" + Me.grpSelect.ResumeLayout(False) + Me.grpSelect.PerformLayout() Me.ResumeLayout(False) + Me.PerformLayout() End Sub + + Friend WithEvents lblMatching As Label + Friend WithEvents cmdAddkeyboard As Button + Friend WithEvents ucrChkIncludeRegularExpressions As ucrCheck + Friend WithEvents ucrChkIgnoreCase As ucrCheck + Friend WithEvents ucrInputPattern As ucrInputComboBox + Friend WithEvents grpSelect As GroupBox + Friend WithEvents rdoRow As RadioButton + Friend WithEvents rdoCell As RadioButton + Friend WithEvents ucrPnlSelect As UcrPanel + Friend WithEvents rdoVariable As RadioButton + Friend WithEvents rdoInFilter As RadioButton + Friend WithEvents ucrPnlOptions As UcrPanel + Friend WithEvents ucrSelectorFind As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrReceiverVariable As ucrReceiverSingle + Friend WithEvents lblPattern As Label + Friend WithEvents lblVariable As Label + Friend WithEvents cmdFind As Button + Friend WithEvents rdoSelect As RadioButton + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents lblFoundRow As Label + Friend WithEvents lblLabel As Label + Friend WithEvents lblName As Label + Friend WithEvents lblVariableFound As Label + Friend WithEvents cmdFindNext As Button + Friend WithEvents ttLabels As ToolTip End Class diff --git a/instat/dlgFindInVariableOrFilter.resx b/instat/dlgFindInVariableOrFilter.resx index 1af7de150c9..c26be3431c6 100644 --- a/instat/dlgFindInVariableOrFilter.resx +++ b/instat/dlgFindInVariableOrFilter.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/instat/dlgFindInVariableOrFilter.vb b/instat/dlgFindInVariableOrFilter.vb index b13624bef80..b4964cbbc12 100644 --- a/instat/dlgFindInVariableOrFilter.vb +++ b/instat/dlgFindInVariableOrFilter.vb @@ -1,3 +1,361 @@ -Public Class dlgFindInVariableOrFilter +' R- Instat +' Copyright (C) 2015-2017 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License +' along with this program. If not, see . +Imports instat.Translations +Imports RDotNet +Public Class dlgFindInVariableOrFilter + Private bFirstLoad As Boolean = True + Private bReset As Boolean = True + Private iCurrentOccurenceIndex As Integer + Private iCountRowClick, iColumnClick As Integer + Private clsDummyFunction As New RFunction + Private clsGetRowsFunction, clsGetRowHeadersFunction, + clsGetFilterRowNamesFunction, clsGetColSelectionNamesFunction As New RFunction + Private clsGetDataFrameFunction As New RFunction + + Private Sub dlgFindInVariableOrFilter_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstLoad Then + InitialiseDialog() + bFirstLoad = False + End If + If bReset Then + SetDefaults() + End If + SetRcodeForControls(bReset) + + bReset = False + TestOkEnabled() + AddToMenu() + autoTranslate(Me) + End Sub + + Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 50 + + ucrSelectorFind.SetParameter(New RParameter("data_name", 0)) + ucrSelectorFind.SetParameterIsString() + + ucrPnlOptions.AddRadioButton(rdoVariable) + ucrPnlOptions.AddRadioButton(rdoInFilter) + ucrPnlOptions.AddRadioButton(rdoSelect) + ucrPnlOptions.SetParameter(New RParameter("check", 0)) + ucrPnlOptions.AddParameterValuesCondition(rdoVariable, "check", "variable") + ucrPnlOptions.AddParameterValuesCondition(rdoInFilter, "check", "filter") + ucrPnlOptions.AddParameterValuesCondition(rdoSelect, "check", "select") + + ucrPnlSelect.AddRadioButton(rdoCell) + ucrPnlSelect.AddRadioButton(rdoRow) + ucrPnlSelect.SetParameter(New RParameter("select", 1)) + ucrPnlSelect.AddParameterValuesCondition(rdoCell, "select", "cell") + ucrPnlSelect.AddParameterValuesCondition(rdoRow, "select", "row") + + ucrReceiverVariable.SetParameter(New RParameter("column", 1)) + ucrReceiverVariable.SetParameterIsString() + ucrReceiverVariable.bUseFilteredData = False + ucrReceiverVariable.Selector = ucrSelectorFind + + ucrInputPattern.SetItems({"NA", "TRUE", "FALSE"}) + + ucrChkIgnoreCase.SetText("Ignore Case") + ucrChkIgnoreCase.SetParameter(New RParameter("ignore_case", 3)) + ucrChkIgnoreCase.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + + ucrChkIncludeRegularExpressions.SetText("Use Regular Expression") + ucrChkIncludeRegularExpressions.SetParameter(New RParameter("use_regex", 4)) + ucrChkIncludeRegularExpressions.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + + ucrPnlOptions.AddToLinkedControls({ucrInputPattern, ucrPnlSelect, ucrChkIgnoreCase, ucrChkIncludeRegularExpressions}, {rdoVariable}, bNewLinkedHideIfParameterMissing:=True) + ucrInputPattern.SetLinkedDisplayControl(lblPattern) + ucrPnlSelect.SetLinkedDisplayControl(grpSelect) + + ucrBase.OKEnabled(False) + ucrBase.cmdReset.Enabled = False + End Sub + + Private Sub SetDefaults() + clsDummyFunction = New RFunction + clsGetRowsFunction = New RFunction + clsGetRowHeadersFunction = New RFunction + clsGetFilterRowNamesFunction = New RFunction + clsGetColSelectionNamesFunction = New RFunction + clsGetDataFrameFunction = New RFunction + + ucrSelectorFind.Reset() + ucrInputPattern.SetName("") + lblMatching.Visible = False + lblFoundRow.Visible = False + iColumnClick = 1 + iCountRowClick = 1 + + clsDummyFunction.AddParameter("check", "variable", iPosition:=0) + clsDummyFunction.AddParameter("select", "cell", iPosition:=1) + + clsGetFilterRowNamesFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_filter_row_names") + + clsGetColSelectionNamesFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_column_selected_column_names") + + clsGetDataFrameFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_data_frame") + + clsGetRowHeadersFunction.SetRCommand("getRowHeadersWithText") + clsGetRowHeadersFunction.AddParameter("data", clsRFunctionParameter:=clsGetDataFrameFunction, iPosition:=0) + clsGetRowHeadersFunction.AddParameter("ignore_case", "TRUE", iPosition:=3) + clsGetRowHeadersFunction.AddParameter("use_regex", "FALSE", iPosition:=4) + + ucrReceiverVariable.SetMeAsReceiver() + cmdFindNext.Enabled = False + End Sub + + Private Sub SetRcodeForControls(bReset As Boolean) + ucrSelectorFind.AddAdditionalCodeParameterPair(clsGetColSelectionNamesFunction, ucrSelectorFind.GetParameter, iAdditionalPairNo:=1) + ucrSelectorFind.AddAdditionalCodeParameterPair(clsGetFilterRowNamesFunction, ucrSelectorFind.GetParameter, iAdditionalPairNo:=2) + ucrReceiverVariable.AddAdditionalCodeParameterPair(clsGetFilterRowNamesFunction, New RParameter("filter_name"), iAdditionalPairNo:=1) + ucrReceiverVariable.AddAdditionalCodeParameterPair(clsGetColSelectionNamesFunction, New RParameter("column_selection_name"), iAdditionalPairNo:=2) + ucrSelectorFind.SetRCode(clsGetDataFrameFunction, bReset) + ucrReceiverVariable.SetRCode(clsGetRowHeadersFunction, bReset) + ucrChkIgnoreCase.SetRCode(clsGetRowHeadersFunction, bReset) + ucrChkIncludeRegularExpressions.SetRCode(clsGetRowHeadersFunction, bReset) + ucrPnlOptions.SetRCode(clsDummyFunction, bReset) + ucrPnlSelect.SetRCode(clsDummyFunction, bReset) + End Sub + + Private Sub TestOkEnabled() + cmdFind.Enabled = (rdoVariable.Checked AndAlso Not ucrReceiverVariable.IsEmpty AndAlso Not ucrInputPattern.IsEmpty) OrElse + ((rdoInFilter.Checked OrElse rdoSelect.Checked) AndAlso Not ucrReceiverVariable.IsEmpty) + End Sub + + Private Function TruncateLabelText(label As Label, strName As String, maximumWidth As Integer) As String + Dim graphics As Graphics = label.CreateGraphics() + Dim font As Font = label.Font + Dim originalWidth As Integer = CInt(graphics.MeasureString(strName, font).Width) + If originalWidth > maximumWidth Then + Dim truncatedText As String = strName + Dim truncatedWidth As Integer = originalWidth + + While truncatedWidth > maximumWidth AndAlso truncatedText.Length > 0 + truncatedText = truncatedText.Substring(0, truncatedText.Length - 1) + truncatedWidth = CInt(graphics.MeasureString(truncatedText & "...", font).Width) + End While + + Return truncatedText & "..." + Else + Return strName + End If + End Function + + Private Sub cmdFind_Click(sender As Object, e As EventArgs) Handles cmdFind.Click + Try + If rdoVariable.Checked OrElse rdoInFilter.Checked Then + Dim lstRowNumbers As New List(Of Integer) + lstRowNumbers = frmMain.clsRLink.RunInternalScriptGetValue(clsGetRowsFunction.ToScript()).AsInteger.ToList + lblMatching.Visible = False + + If lstRowNumbers.Count <= 0 Then + lblMatching.ForeColor = Color.Red + Dim strMAtching As String = "There are no entries matching " + If rdoVariable.Checked Then strMAtching &= ucrInputPattern.GetText + + lblMatching.Text = strMAtching + lblMatching.Visible = True + lblFoundRow.Visible = False + Exit Sub + End If + + Dim iFirstRowOnPageRowNumber As Integer = frmMain.ucrDataViewer.GetFirstRowHeader ' e.g. 1 for first page, 1001, for second page etc. + Dim iCurrentOccurenceRowNumber As Integer = lstRowNumbers(iCurrentOccurenceIndex - 1) ' e.g. if 5 occurences of "Chris", then iCurrentOccurenceIndex is a value between 1 and 5 + ' Iterate over the list of row numbers to find the page where the row is displayed. + For i As Integer = 1 To lstRowNumbers.Count 'loop through occurences + Dim iLoopOccurenceRowNumber As Integer = lstRowNumbers(i - 1) + If iLoopOccurenceRowNumber >= iFirstRowOnPageRowNumber _ 'if row number of loop occurence is on or after current page + AndAlso (iCurrentOccurenceRowNumber < iLoopOccurenceRowNumber OrElse iCountRowClick = 1) Then 'And row number of previous occurence < row number of loop occurence. Or this is the first time we are clicking + iCurrentOccurenceIndex = i 'set the current occurence to be loop occurence + Exit For + End If + Next + + If iCurrentOccurenceRowNumber = lstRowNumbers.Max Then + If iCurrentOccurenceIndex > iCountRowClick Then + iCountRowClick = iCurrentOccurenceIndex + Else + iCountRowClick = 1 + End If + iCurrentOccurenceIndex = 1 + End If + + Dim strColumn As String = ucrReceiverVariable.GetVariableNames + + Dim iRow As Integer = lstRowNumbers(iCurrentOccurenceIndex - 1) + Dim iRowPage As Integer = Math.Ceiling(CDbl(iRow / frmMain.clsInstatOptions.iMaxRows)) + frmMain.ucrDataViewer.GoToSpecificRowPage(iRowPage) + Dim bApplyToRows As Boolean = (rdoVariable.Checked AndAlso rdoRow.Checked) OrElse rdoInFilter.Checked + frmMain.ucrDataViewer.SearchRowInGrid(rowNumbers:=lstRowNumbers, strColumn:=strColumn, + iRow:=iRow, bApplyToRows:=bApplyToRows) + lblFoundRow.Text = "Found Row: " & iRow + lblFoundRow.Visible = True + iCountRowClick += 1 + SetControlsVisible(False) + Else + Dim lstColumnNames As New List(Of String) + lstColumnNames = frmMain.clsRLink.RunInternalScriptGetValue(clsGetRowsFunction.ToScript()).AsCharacter.ToList + If iColumnClick > lstColumnNames.Count Then + iColumnClick = 1 + End If + + Dim strColumn As String = lstColumnNames(iColumnClick - 1) + Dim iColumn As Integer = GetColumnIndex(strColumn) + Dim iColPage As Integer = Math.Ceiling(CDbl(iColumn / frmMain.clsInstatOptions.iMaxCols)) + frmMain.ucrDataViewer.GoToSpecificColumnPage(iColPage) + frmMain.ucrDataViewer.SelectColumnInGrid(strColumn) + + lblVariableFound.Text = "Found Variable: " & GetColumnIndex(strColumn) + 1 + Dim strName = "Name: " & strColumn + lblName.Text = TruncateLabelText(lblName, strName, 135) + Dim strLabel = "Label: " & GetColLabel(strColumn) + lblLabel.Text = TruncateLabelText(lblLabel, strLabel, 135) + SetControlsVisible(True) + lblFoundRow.Visible = False + + ' Create a ToolTip instance. + Dim tooltip As New ToolTip() + + ' Set the tooltip texts for the labels. + tooltip.SetToolTip(lblName, strColumn) + tooltip.SetToolTip(lblLabel, GetColLabel(strColumn)) + iColumnClick += 1 + End If + + Catch ex As Exception + MsgBox(ex.Message) + End Try + End Sub + + Private Function GetColumnIndex(strColumn As String) As Integer + Dim clsGetItems As New RFunction + clsGetItems.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_column_names") + clsGetItems.AddParameter("data_name", Chr(34) & ucrSelectorFind.strCurrentDataFrame & Chr(34)) + Dim lstColumns = frmMain.clsRLink.RunInternalScriptGetValue(clsGetItems.ToScript()).AsCharacter.ToList + + Return lstColumns.IndexOf(strColumn) + End Function + + Private Function GetColLabel(strColumn As String) + Dim strColLabel As String = "" + Dim clsColmnLabelsRFunction = New RFunction + Dim expItems As SymbolicExpression + + clsColmnLabelsRFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_column_labels") + clsColmnLabelsRFunction.AddParameter("data_name", Chr(34) & ucrSelectorFind.strCurrentDataFrame & Chr(34), iPosition:=0) + clsColmnLabelsRFunction.AddParameter("columns", Chr(34) & strColumn & Chr(34), iPosition:=1) + + expItems = frmMain.clsRLink.RunInternalScriptGetValue(clsColmnLabelsRFunction.ToScript(), bSilent:=True) + + If expItems IsNot Nothing AndAlso Not (expItems.Type = Internals.SymbolicExpressionType.Null) Then + Dim strArr As String() = expItems.AsCharacter.ToArray + If strArr IsNot Nothing Then + 'the number of labels for a column expected is 1 + If strArr.Length = 1 Then + strColLabel = strArr(0) + ElseIf strArr.Length > 1 Then + MessageBox.Show(Me, "Developer error: more than one column label found.", "Developer Error", MessageBoxButtons.OK, MessageBoxIcon.Error) + strColLabel = strArr(strArr.Length - 1) + End If + End If + End If + Return strColLabel + End Function + + Private Sub cmdAddkeyboard_Click(sender As Object, e As EventArgs) Handles cmdAddkeyboard.Click + sdgConstructRegexExpression.ShowDialog() + ucrInputPattern.SetName(sdgConstructRegexExpression.ucrReceiverForRegex.GetText()) + End Sub + + Private Sub ucrSelectorFind_DataFrameChanged() Handles ucrSelectorFind.DataFrameChanged + cmdFindNext.Enabled = False + iCountRowClick = 1 + iCurrentOccurenceIndex = 1 + End Sub + + Private Sub ucrInputPattern_TextChanged(sender As Object, e As EventArgs) Handles ucrInputPattern.TextChanged + cmdFindNext.Enabled = False + iCountRowClick = 1 + iCurrentOccurenceIndex = 1 + End Sub + + Private Sub ucrInputPattern_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputPattern.ControlValueChanged, ucrChkIncludeRegularExpressions.ControlValueChanged + Dim strPattern As String = ucrInputPattern.GetText + If ucrInputPattern.GetText <> "NA" Then + strPattern = Chr(34) & strPattern & Chr(34) + End If + clsGetRowHeadersFunction.AddParameter("searchText", strPattern, iPosition:=2) + cmdAddkeyboard.Visible = ucrChkIncludeRegularExpressions.Checked + End Sub + + Private Sub AddToMenu() + If frmMain.clsRecentItems IsNot Nothing Then + frmMain.clsRecentItems.addToMenu(Me) + End If + End Sub + + Private Sub ucrReceiverVariable_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverVariable.ControlValueChanged + iCountRowClick = 1 + iCurrentOccurenceIndex = 1 + End Sub + + Private Sub ucrInputPattern_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverVariable.ControlContentsChanged, ucrInputPattern.ControlContentsChanged + TestOkEnabled() + End Sub + + Private Sub ucrPnlSelect_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlSelect.ControlValueChanged + If rdoCell.Checked Then + clsDummyFunction.AddParameter("select", "cell", iPosition:=1) + Else + clsDummyFunction.AddParameter("select", "row", iPosition:=1) + End If + End Sub + + Private Sub SetControlsVisible(bVisible As Boolean) + lblLabel.Visible = bVisible + lblName.Visible = bVisible + lblVariableFound.Visible = bVisible + End Sub + + Private Sub ucrPnlOptions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOptions.ControlValueChanged + ucrReceiverVariable.Clear() + lblMatching.Visible = False + lblFoundRow.Visible = False + + If rdoVariable.Checked Then + clsGetRowsFunction = clsGetRowHeadersFunction + clsDummyFunction.AddParameter("check", "variable", iPosition:=0) + ucrReceiverVariable.SetItemType("column") + ucrReceiverVariable.strSelectorHeading = "Variables" + lblVariable.Text = "Variable:" + SetControlsVisible(False) + ElseIf rdoInFilter.Checked Then + clsGetRowsFunction = clsGetFilterRowNamesFunction + clsDummyFunction.AddParameter("check", "filter", iPosition:=0) + ucrReceiverVariable.SetItemType("filter") + ucrReceiverVariable.strSelectorHeading = "Filters" + lblVariable.Text = "Filter:" + SetControlsVisible(False) + Else + clsGetRowsFunction = clsGetColSelectionNamesFunction + clsDummyFunction.AddParameter("check", "select", iPosition:=0) + ucrReceiverVariable.SetItemType("column_selection") + ucrReceiverVariable.strSelectorHeading = "Column selections" + lblVariable.Text = "Select:" + End If + End Sub End Class \ No newline at end of file diff --git a/instat/dlgInventoryPlot.vb b/instat/dlgInventoryPlot.vb index 9efde1adbfa..36b10d5af5b 100644 --- a/instat/dlgInventoryPlot.vb +++ b/instat/dlgInventoryPlot.vb @@ -350,14 +350,17 @@ Public Class dlgInventoryPlot End Sub Private Sub ucrChkSummary_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSummary.ControlValueChanged - If ucrChkSummary.Checked Then - ucrBase.clsRsyntax.AddToAfterCodes(clsClimaticMissing, iPosition:=1) - clsClimaticMissing.iCallType = 2 + If rdoMissing.Checked Then + If ucrChkSummary.Checked Then + ucrBase.clsRsyntax.AddToAfterCodes(clsClimaticMissing, iPosition:=1) + clsClimaticMissing.iCallType = 2 + Else + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsClimaticMissing) + End If + AddOrRemoveKeyFunctions() Else ucrBase.clsRsyntax.RemoveFromAfterCodes(clsClimaticMissing) End If - AddOrRemoveKeyFunctions() - End Sub Private Sub ucrChkDetails_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDetails.ControlValueChanged diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index a20398e02e8..33ee631c577 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class dlgRandomSplit Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,15 +20,263 @@ Partial Class dlgRandomSplit 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() + Me.rdoSample = New System.Windows.Forms.RadioButton() + Me.rdoTimeSeries = New System.Windows.Forms.RadioButton() + Me.ucrChkStratifyingFactor = New instat.ucrCheck() + Me.ucrSaveTestingData = New instat.ucrSave() + Me.ucrReceiverRanSplit = New instat.ucrReceiverSingle() + Me.ucrNudBreaks = New instat.ucrNud() + Me.ucrNudPool = New instat.ucrNud() + Me.ucrNudFraction = New instat.ucrNud() + Me.ucrNudLag = New instat.ucrNud() + Me.ucrSaveTrainingData = New instat.ucrSave() + Me.ucrBase = New instat.ucrButtons() + Me.ucrChkLag = New instat.ucrCheck() + Me.ucrPnlRandomSplit = New instat.UcrPanel() + Me.ucrSelectorRandomSplit = New instat.ucrSelectorByDataFrameAddRemove() + Me.lblFraction = New System.Windows.Forms.Label() + Me.lblBreaks = New System.Windows.Forms.Label() + Me.lblPool = New System.Windows.Forms.Label() + Me.ucrChkTest = New instat.ucrCheck() Me.SuspendLayout() ' + 'rdoSample + ' + Me.rdoSample.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoSample.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoSample.FlatAppearance.BorderSize = 2 + Me.rdoSample.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoSample.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoSample.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoSample.Location = New System.Drawing.Point(111, 15) + Me.rdoSample.Name = "rdoSample" + Me.rdoSample.Size = New System.Drawing.Size(100, 28) + Me.rdoSample.TabIndex = 1 + Me.rdoSample.Text = "Sample" + Me.rdoSample.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoSample.UseVisualStyleBackColor = True + ' + 'rdoTimeSeries + ' + Me.rdoTimeSeries.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoTimeSeries.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoTimeSeries.FlatAppearance.BorderSize = 2 + Me.rdoTimeSeries.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoTimeSeries.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoTimeSeries.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoTimeSeries.Location = New System.Drawing.Point(209, 15) + Me.rdoTimeSeries.Name = "rdoTimeSeries" + Me.rdoTimeSeries.Size = New System.Drawing.Size(100, 28) + Me.rdoTimeSeries.TabIndex = 2 + Me.rdoTimeSeries.Text = "Time Series" + Me.rdoTimeSeries.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoTimeSeries.UseVisualStyleBackColor = True + ' + 'ucrChkStratifyingFactor + ' + Me.ucrChkStratifyingFactor.AutoSize = True + Me.ucrChkStratifyingFactor.Checked = False + Me.ucrChkStratifyingFactor.Location = New System.Drawing.Point(280, 77) + Me.ucrChkStratifyingFactor.Margin = New System.Windows.Forms.Padding(2) + Me.ucrChkStratifyingFactor.Name = "ucrChkStratifyingFactor" + Me.ucrChkStratifyingFactor.Size = New System.Drawing.Size(148, 23) + Me.ucrChkStratifyingFactor.TabIndex = 20 + ' + 'ucrSaveTestingData + ' + Me.ucrSaveTestingData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSaveTestingData.Location = New System.Drawing.Point(9, 274) + Me.ucrSaveTestingData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveTestingData.Name = "ucrSaveTestingData" + Me.ucrSaveTestingData.Size = New System.Drawing.Size(300, 23) + Me.ucrSaveTestingData.TabIndex = 14 + ' + 'ucrReceiverRanSplit + ' + Me.ucrReceiverRanSplit.AutoSize = True + Me.ucrReceiverRanSplit.frmParent = Me + Me.ucrReceiverRanSplit.Location = New System.Drawing.Point(281, 102) + Me.ucrReceiverRanSplit.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRanSplit.Name = "ucrReceiverRanSplit" + Me.ucrReceiverRanSplit.Selector = Nothing + Me.ucrReceiverRanSplit.Size = New System.Drawing.Size(120, 21) + Me.ucrReceiverRanSplit.strNcFilePath = "" + Me.ucrReceiverRanSplit.TabIndex = 5 + Me.ucrReceiverRanSplit.ucrSelector = Nothing + ' + 'ucrNudBreaks + ' + Me.ucrNudBreaks.AutoSize = True + Me.ucrNudBreaks.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudBreaks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudBreaks.Location = New System.Drawing.Point(351, 160) + Me.ucrNudBreaks.Margin = New System.Windows.Forms.Padding(6) + Me.ucrNudBreaks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudBreaks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudBreaks.Name = "ucrNudBreaks" + Me.ucrNudBreaks.Size = New System.Drawing.Size(50, 20) + Me.ucrNudBreaks.TabIndex = 9 + Me.ucrNudBreaks.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudPool + ' + Me.ucrNudPool.AutoSize = True + Me.ucrNudPool.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudPool.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudPool.Location = New System.Drawing.Point(351, 188) + Me.ucrNudPool.Margin = New System.Windows.Forms.Padding(6) + Me.ucrNudPool.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudPool.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudPool.Name = "ucrNudPool" + Me.ucrNudPool.Size = New System.Drawing.Size(50, 20) + Me.ucrNudPool.TabIndex = 11 + Me.ucrNudPool.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudFraction + ' + Me.ucrNudFraction.AutoSize = True + Me.ucrNudFraction.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudFraction.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudFraction.Location = New System.Drawing.Point(351, 132) + Me.ucrNudFraction.Margin = New System.Windows.Forms.Padding(6) + Me.ucrNudFraction.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudFraction.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudFraction.Name = "ucrNudFraction" + Me.ucrNudFraction.Size = New System.Drawing.Size(50, 20) + Me.ucrNudFraction.TabIndex = 7 + Me.ucrNudFraction.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudLag + ' + Me.ucrNudLag.AutoSize = True + Me.ucrNudLag.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLag.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLag.Location = New System.Drawing.Point(351, 159) + Me.ucrNudLag.Margin = New System.Windows.Forms.Padding(6) + Me.ucrNudLag.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLag.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLag.Name = "ucrNudLag" + Me.ucrNudLag.Size = New System.Drawing.Size(50, 20) + Me.ucrNudLag.TabIndex = 13 + Me.ucrNudLag.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrSaveTrainingData + ' + Me.ucrSaveTrainingData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSaveTrainingData.Location = New System.Drawing.Point(9, 244) + Me.ucrSaveTrainingData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveTrainingData.Name = "ucrSaveTrainingData" + Me.ucrSaveTrainingData.Size = New System.Drawing.Size(300, 23) + Me.ucrSaveTrainingData.TabIndex = 15 + ' + 'ucrBase + ' + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(9, 303) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 16 + ' + 'ucrChkLag + ' + Me.ucrChkLag.AutoSize = True + Me.ucrChkLag.Checked = False + Me.ucrChkLag.Location = New System.Drawing.Point(291, 160) + Me.ucrChkLag.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkLag.Name = "ucrChkLag" + Me.ucrChkLag.Size = New System.Drawing.Size(143, 23) + Me.ucrChkLag.TabIndex = 12 + ' + 'ucrPnlRandomSplit + ' + Me.ucrPnlRandomSplit.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlRandomSplit.Location = New System.Drawing.Point(105, 7) + Me.ucrPnlRandomSplit.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlRandomSplit.Name = "ucrPnlRandomSplit" + Me.ucrPnlRandomSplit.Size = New System.Drawing.Size(212, 44) + Me.ucrPnlRandomSplit.TabIndex = 0 + ' + 'ucrSelectorRandomSplit + ' + Me.ucrSelectorRandomSplit.AutoSize = True + Me.ucrSelectorRandomSplit.bDropUnusedFilterLevels = False + Me.ucrSelectorRandomSplit.bShowHiddenColumns = False + Me.ucrSelectorRandomSplit.bUseCurrentFilter = True + Me.ucrSelectorRandomSplit.Location = New System.Drawing.Point(9, 53) + Me.ucrSelectorRandomSplit.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorRandomSplit.Name = "ucrSelectorRandomSplit" + Me.ucrSelectorRandomSplit.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorRandomSplit.TabIndex = 3 + ' + 'lblFraction + ' + Me.lblFraction.AutoSize = True + Me.lblFraction.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFraction.Location = New System.Drawing.Point(289, 136) + Me.lblFraction.Name = "lblFraction" + Me.lblFraction.Size = New System.Drawing.Size(48, 13) + Me.lblFraction.TabIndex = 21 + Me.lblFraction.Tag = "" + Me.lblFraction.Text = "Fraction:" + ' + 'lblBreaks + ' + Me.lblBreaks.AutoSize = True + Me.lblBreaks.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblBreaks.Location = New System.Drawing.Point(289, 166) + Me.lblBreaks.Name = "lblBreaks" + Me.lblBreaks.Size = New System.Drawing.Size(43, 13) + Me.lblBreaks.TabIndex = 22 + Me.lblBreaks.Tag = "" + Me.lblBreaks.Text = "Breaks:" + ' + 'lblPool + ' + Me.lblPool.AutoSize = True + Me.lblPool.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblPool.Location = New System.Drawing.Point(289, 194) + Me.lblPool.Name = "lblPool" + Me.lblPool.Size = New System.Drawing.Size(31, 13) + Me.lblPool.TabIndex = 23 + Me.lblPool.Tag = "" + Me.lblPool.Text = "Pool:" + ' + 'ucrChkTest + ' + Me.ucrChkTest.AutoSize = True + Me.ucrChkTest.Checked = False + Me.ucrChkTest.Location = New System.Drawing.Point(9, 274) + Me.ucrChkTest.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkTest.Name = "ucrChkTest" + Me.ucrChkTest.Size = New System.Drawing.Size(143, 23) + Me.ucrChkTest.TabIndex = 24 + ' 'dlgRandomSplit ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(386, 319) + Me.ClientSize = New System.Drawing.Size(432, 363) + Me.Controls.Add(Me.ucrChkTest) + Me.Controls.Add(Me.lblPool) + Me.Controls.Add(Me.lblBreaks) + Me.Controls.Add(Me.lblFraction) + Me.Controls.Add(Me.ucrChkStratifyingFactor) + Me.Controls.Add(Me.ucrSaveTestingData) + Me.Controls.Add(Me.ucrReceiverRanSplit) + Me.Controls.Add(Me.ucrNudBreaks) + Me.Controls.Add(Me.ucrNudPool) + Me.Controls.Add(Me.ucrNudFraction) + Me.Controls.Add(Me.ucrNudLag) + Me.Controls.Add(Me.ucrSaveTrainingData) + Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.ucrChkLag) + Me.Controls.Add(Me.rdoSample) + Me.Controls.Add(Me.rdoTimeSeries) + Me.Controls.Add(Me.ucrPnlRandomSplit) + Me.Controls.Add(Me.ucrSelectorRandomSplit) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -36,6 +284,26 @@ Partial Class dlgRandomSplit Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Random Split" Me.ResumeLayout(False) + Me.PerformLayout() End Sub + + Friend WithEvents rdoSample As RadioButton + Friend WithEvents rdoTimeSeries As RadioButton + Friend WithEvents ucrChkLag As ucrCheck + Friend WithEvents ucrNudPool As ucrNud + Friend WithEvents ucrNudFraction As ucrNud + Friend WithEvents ucrNudLag As ucrNud + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents ucrPnlRandomSplit As UcrPanel + Friend WithEvents ucrNudBreaks As ucrNud + Friend WithEvents ucrSelectorRandomSplit As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrReceiverRanSplit As ucrReceiverSingle + Friend WithEvents ucrSaveTrainingData As ucrSave + Friend WithEvents ucrSaveTestingData As ucrSave + Friend WithEvents ucrChkStratifyingFactor As ucrCheck + Friend WithEvents lblPool As Label + Friend WithEvents lblBreaks As Label + Friend WithEvents lblFraction As Label + Friend WithEvents ucrChkTest As ucrCheck End Class diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index fa52d73db13..7af7a1f3610 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -1,5 +1,236 @@ -Public Class dlgRandomSplit +' R- Instat +' Copyright (C) 2015-2017 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License +' along with this program. If not, see . + +Imports instat.Translations +Public Class dlgRandomSplit + Private bFirstLoad As Boolean = True + Private bReset As Boolean = True + Private clsInitialTimeSplit As New RFunction + Private clsInitialSplit As New RFunction + Private clsTraining As New RFunction + Private clsTesting As New RFunction + Private Sub dlgRandomSplit_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstLoad Then + InitialiseDialog() + bFirstLoad = False + End If + If bReset Then + SetDefaults() + End If + SetRCodeForControls(bReset) + bReset = False + autoTranslate(Me) + TestOkEnabled() + End Sub + + Private Sub InitialiseDialog() + ucrReceiverRanSplit.SetParameter(New RParameter("strata", 2)) + ucrReceiverRanSplit.Selector = ucrSelectorRandomSplit + ucrReceiverRanSplit.SetMeAsReceiver() + ucrReceiverRanSplit.SetDataType("factor") + ucrReceiverRanSplit.SetParameterIsString() + + ucrSelectorRandomSplit.SetParameter(New RParameter("data", 0)) + ucrSelectorRandomSplit.SetParameterIsrfunction() + + ucrNudPool.SetLinkedDisplayControl(lblPool) + ucrNudPool.SetParameter(New RParameter("pool", 5)) + ucrNudPool.DecimalPlaces = 2 + ucrNudPool.SetMinMax(0.01, 1.0) + ucrNudPool.Increment = 0.01 + + ucrChkStratifyingFactor.SetText("Stratifying Variable") + ucrChkStratifyingFactor.AddToLinkedControls(ucrNudBreaks, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=4) + ucrChkStratifyingFactor.SetParameter(ucrNudPool.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) + ucrChkStratifyingFactor.AddToLinkedControls({ucrNudPool, ucrReceiverRanSplit}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedUpdateFunction:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.1) + + ucrNudLag.SetParameter(New RParameter("lag", 3)) + ucrNudLag.SetMinMax(Integer.MinValue, Integer.MaxValue) + + ucrChkLag.SetText("Lag") + ucrChkLag.SetParameter(ucrNudLag.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) + ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) + + ucrChkTest.SetText("Save Test to") + ucrChkTest.AddToLinkedControls(ucrSaveTestingData, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + ucrSaveTrainingData.SetLabelText("Save Train to:") + ucrSaveTrainingData.SetSaveTypeAsDataFrame() + ucrSaveTrainingData.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) + ucrSaveTrainingData.SetPrefix("training_data") + ucrSaveTrainingData.SetIsComboBox() + + ucrSaveTestingData.SetLabelText("Save Test to:") + ucrSaveTestingData.SetSaveTypeAsDataFrame() + ucrSaveTestingData.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) + ucrSaveTestingData.SetPrefix("testing_data") + ucrSaveTestingData.SetIsComboBox() + + ucrNudBreaks.SetLinkedDisplayControl(lblBreaks) + ucrNudBreaks.SetParameter(New RParameter("breaks", 4)) + ucrNudBreaks.SetMinMax(0.1, 10.0) + ucrNudBreaks.DecimalPlaces = 2 + ucrNudBreaks.Increment = 0.1 + + ucrNudFraction.SetLinkedDisplayControl(lblFraction) + ucrNudFraction.SetParameter(New RParameter("prop", 1)) + ucrNudFraction.SetMinMax(0.01, 0.99) + ucrNudFraction.DecimalPlaces = 2 + ucrNudFraction.Increment = 0.01 + + ucrPnlRandomSplit.AddRadioButton(rdoSample) + ucrPnlRandomSplit.AddRadioButton(rdoTimeSeries) + ucrPnlRandomSplit.AddFunctionNamesCondition(rdoSample, {"initial_split", "training", "testing"}) + ucrPnlRandomSplit.AddFunctionNamesCondition(rdoTimeSeries, {"initial_time_split", "training", "testing"}) + ucrPnlRandomSplit.AddToLinkedControls({ucrChkLag}, {rdoTimeSeries}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True) + ucrPnlRandomSplit.AddToLinkedControls({ucrChkStratifyingFactor}, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + End Sub + + Private Sub SetDefaults() + clsInitialTimeSplit = New RFunction + clsInitialSplit = New RFunction + clsTesting = New RFunction + clsTraining = New RFunction + + NewDefaultName() + + ucrSelectorRandomSplit.Reset() + ucrSelectorRandomSplit.Focus() + ucrSaveTrainingData.Reset() + ucrSaveTestingData.Reset() + + clsInitialTimeSplit.SetPackageName("rsample") + clsInitialTimeSplit.SetRCommand("initial_time_split") + clsInitialTimeSplit.AddParameter("prop", "0.75", iPosition:=1) + clsInitialTimeSplit.AddParameter("lag", "0", iPosition:=2) + clsInitialTimeSplit.SetAssignTo("rsample") + clsInitialSplit.SetPackageName("rsample") + clsInitialSplit.SetRCommand("initial_split") + clsInitialSplit.AddParameter("prop", "0.75", iPosition:=1) + clsInitialSplit.AddParameter("strata", "NULL", iPosition:=2) + clsInitialSplit.AddParameter("breaks", "4", iPosition:=4) + clsInitialSplit.SetAssignTo("rsample") + + clsTraining.SetPackageName("rsample") + clsTraining.SetRCommand("training") + + clsTesting.SetPackageName("rsample") + clsTesting.SetRCommand("testing") + ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) + ucrBase.clsRsyntax.AddToAfterCodes(clsTesting, 0) + ucrBase.clsRsyntax.AddToAfterCodes(clsTraining, 1) + End Sub + + Private Sub SetRCodeForControls(bReset As Boolean) + ucrPnlRandomSplit.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) + + ucrSelectorRandomSplit.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("data", ucrSelectorRandomSplit.ucrAvailableDataFrames.clsCurrDataFrame, 0), iAdditionalPairNo:=1) + ucrNudFraction.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("prop", 1), iAdditionalPairNo:=1) + + ucrSelectorRandomSplit.SetRCode(clsInitialSplit, bReset) + ucrNudBreaks.SetRCode(clsInitialSplit, bReset) + ucrNudFraction.SetRCode(clsInitialSplit, bReset) + ucrNudPool.SetRCode(clsInitialSplit, bReset) + ucrSaveTrainingData.SetRCode(clsTraining, bReset) + ucrSaveTestingData.SetRCode(clsTesting, bReset) + ucrNudLag.SetRCode(clsInitialTimeSplit, bReset) + ucrReceiverRanSplit.SetRCode(clsInitialSplit, bReset) + ucrChkStratifyingFactor.SetRCode(clsInitialSplit, bReset) + + If bReset Then + ucrChkTest.SetRCode(clsInitialSplit, bReset) + End If + End Sub + + Private Sub TestOkEnabled() + If Not ucrSaveTrainingData.IsComplete OrElse Not ucrSaveTestingData.IsComplete OrElse ucrNudFraction.IsEmpty Then + ucrBase.OKEnabled(False) + Else + If rdoSample.Checked Then + If ucrChkStratifyingFactor.Checked Then + If Not ucrReceiverRanSplit.IsEmpty AndAlso Not ucrNudBreaks.IsEmpty AndAlso Not ucrNudPool.IsEmpty Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If + Else + ucrBase.OKEnabled(True) + End If + Else + If rdoTimeSeries.Checked Then + If ucrChkLag.Checked Then + If Not ucrNudLag.IsEmpty Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If + Else + ucrBase.OKEnabled(True) + End If + End If + End If + End If + End Sub + + Private Sub SetBaseFunction() + ucrBase.clsRsyntax.ClearCodes() + If rdoSample.Checked Then + If ucrSaveTestingData.IsComplete Then + clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) + End If + If ucrSaveTrainingData.IsComplete Then + clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) + End If + ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) + Else + If ucrSaveTestingData.IsComplete Then + clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) + End If + If ucrSaveTrainingData.IsComplete Then + clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) + End If + ucrBase.clsRsyntax.SetBaseRFunction(clsInitialTimeSplit) + End If + ucrBase.clsRsyntax.AddToAfterCodes(clsTesting, 0) + ucrBase.clsRsyntax.AddToAfterCodes(clsTraining, 1) + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + SetRCodeForControls(True) + TestOkEnabled() + End Sub + + Private Sub NewDefaultName() + If ucrSelectorRandomSplit.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso (Not ucrSaveTrainingData.bUserTyped) Then + ucrSaveTestingData.SetPrefix(ucrSelectorRandomSplit.ucrAvailableDataFrames.cboAvailableDataFrames.Text & "_testing_data") + ucrSaveTrainingData.SetPrefix(ucrSelectorRandomSplit.ucrAvailableDataFrames.cboAvailableDataFrames.Text & "_training_data") + End If End Sub + + Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkStratifyingFactor.ControlContentsChanged, ucrReceiverRanSplit.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, + ucrChkLag.ControlContentsChanged, ucrSaveTrainingData.ControlContentsChanged, ucrSaveTestingData.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged, ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, + ucrNudPool.ControlContentsChanged + TestOkEnabled() + End Sub + + Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged, ucrChkLag.ControlValueChanged, ucrNudBreaks.ControlValueChanged, ucrNudFraction.ControlValueChanged, ucrNudPool.ControlValueChanged + SetBaseFunction() + End Sub + End Class \ No newline at end of file diff --git a/instat/dlgThreeVariablePivotTable.vb b/instat/dlgThreeVariablePivotTable.vb index 2df9b45f54e..21552e2bd31 100644 --- a/instat/dlgThreeVariablePivotTable.vb +++ b/instat/dlgThreeVariablePivotTable.vb @@ -18,7 +18,11 @@ Public Class dlgThreeVariablePivotTable Private bFirstLoad As Boolean = True Private bRcodeSet As Boolean = False Private bReset As Boolean = True - + Private clsConcatenateFunction, clsFlattenFunction, + clsLevelsFunction, clsPasteFunction, + clsRelevelPasteFunction, clsRPivotTableFunction, + clsSelectFunction As New RFunction + Private clsPipeOperator, clsLevelsDollarOperator As New ROperator Public enumPivotMode As PivotMode = PivotMode.Describe Public Enum PivotMode @@ -26,12 +30,6 @@ Public Class dlgThreeVariablePivotTable Climatic End Enum - Private clsConcatenateFunction, clsFlattenFunction, - clsLevelsFunction, clsPasteFunction, - clsRelevelPasteFunction, clsRPivotTableFunction, - clsSelectFunction, clsDummyFunction As New RFunction - Private clsPipeOperator, clsLevelsDollarOperator As New ROperator - Private Sub dlgThreeVariablePivotTable_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then InitialiseDialog() @@ -43,9 +41,9 @@ Public Class dlgThreeVariablePivotTable End If SetRCodeForControls(bReset) bReset = False - AutofillMode() autoTranslate(Me) TestOkEnabled() + AutofillMode() End Sub Private Sub InitialiseDialog() @@ -57,8 +55,6 @@ Public Class dlgThreeVariablePivotTable ucrReceiverInitialRowFactors.SetParameter(New RParameter("rows", iNewPosition:=1)) ucrReceiverInitialRowFactors.SetParameterIsString() - ucrReceiverInitialRowFactors.strSelectorHeading = "Numerics" - ucrReceiverInitialRowFactors.SetIncludedDataTypes({"numeric"}) ucrReceiverInitialRowFactors.Selector = ucrSelectorPivot ucrReceiverInitialColumnFactor.SetParameter(New RParameter("cols", iNewPosition:=2)) @@ -69,12 +65,15 @@ Public Class dlgThreeVariablePivotTable ucrReceiverAdditionalRowFactor.SetParameter(New RParameter("val", iNewPosition:=4)) ucrReceiverAdditionalRowFactor.SetParameterIsString() + ucrReceiverAdditionalRowFactor.SetIncludedDataTypes({"numeric", "Date", "logical"}) ucrReceiverAdditionalRowFactor.Selector = ucrSelectorPivot ucrChkSelectedVariable.AddParameterIsRFunctionCondition(False, "data", True) ucrChkSelectedVariable.AddParameterIsRFunctionCondition(True, "data", False) + ucrReceiverFactorLevels.SetParameter(New RParameter("variable", iNewPosition:=1)) + ucrReceiverFactorLevels.SetDataType("factor") ucrReceiverFactorLevels.SetParameterIsString() ucrReceiverFactorLevels.bWithQuotes = False ucrReceiverFactorLevels.Selector = ucrSelectorPivot @@ -88,12 +87,10 @@ Public Class dlgThreeVariablePivotTable ucrChkIncludeSubTotals.SetText("Subtotals") ucrChkIncludeSubTotals.SetParameter(New RParameter("subtotals", iNewPosition:=3)) ucrChkIncludeSubTotals.SetValuesCheckedAndUnchecked("TRUE", "FALSE") - ucrChkIncludeSubTotals.SetRDefault("FALSE") ucrChkNumericVariable.SetText("Numeric Variable (Optional):") - ucrChkNumericVariable.SetParameter(New RParameter("subtotals", iNewPosition:=0)) - ucrChkNumericVariable.SetValuesCheckedAndUnchecked("TRUE", "FALSE") - ucrChkNumericVariable.SetRDefault("TRUE") + ucrChkNumericVariable.AddParameterPresentCondition(True, "rendererName") + ucrChkNumericVariable.AddParameterPresentCondition(False, "rendererName", False) ucrChkNumericVariable.AddToLinkedControls({ucrReceiverAdditionalRowFactor}, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedUpdateFunction:=True) ucrChkNumericVariable.AddToLinkedControls({ucrInputTableChart}, {True}, bNewLinkedHideIfParameterMissing:=True, @@ -107,7 +104,6 @@ Public Class dlgThreeVariablePivotTable ucrInputTableChart.SetItems({"Table", "Table Barchart", "Heatmap", "Row Heatmap", "Col Heatmap", "Treemap", "Horizontal Bar Chart", "Horizontal Stacked Barchart", "Bar Chart", "Stacked Bar Chart", "Line Chart", "Area chart", "Scatter Chart"}, bAddConditions:=True) - ucrInputTableChart.SetText("Table") ucrInputTableChart.SetLinkedDisplayControl(lblTableChart) ucrInputSummary.SetParameter(New RParameter("aggregatorName", iNewPosition:=6)) @@ -116,7 +112,6 @@ Public Class dlgThreeVariablePivotTable "Maximum", "First", "Last", "Sum over Sum", "80% Upper Bound", "80% Lower Bound", "Sum as Fraction of Totals", "Sum as Fraction of Rows", "Sum as Fraction of Columns", "Count as Fraction of Total", "Count as Fraction of Rows", "Count as Fraction of Columns"}, bAddConditions:=True) - ucrInputSummary.SetText("Average") ucrInputSummary.SetLinkedDisplayControl(lblSummary) ucrSavePivot.SetPrefix("pivot_table") @@ -135,7 +130,6 @@ Public Class dlgThreeVariablePivotTable clsRelevelPasteFunction = New RFunction clsRPivotTableFunction = New RFunction clsSelectFunction = New RFunction - clsDummyFunction = New RFunction clsLevelsDollarOperator = New ROperator clsPipeOperator = New ROperator @@ -144,7 +138,6 @@ Public Class dlgThreeVariablePivotTable ucrSelectorPivot.Reset() ucrSavePivot.Reset() - clsDummyFunction.AddParameter("subtotals", "TRUE", iPosition:=0) clsLevelsDollarOperator.SetOperation("$") @@ -164,11 +157,13 @@ Public Class dlgThreeVariablePivotTable clsFlattenFunction.AddParameter("string", clsRFunctionParameter:=clsPasteFunction, iPosition:=0) clsFlattenFunction.SetAssignTo("survey_levels") + clsRelevelPasteFunction.SetRCommand("paste0") clsRelevelPasteFunction.AddParameter("first_paramete", Chr(34) & "function(attr) { var sortAs = $.pivotUtilities.sortAs; return sortAs([" & Chr(34) & ", survey_levels," & Chr(34) & "]); }" & Chr(34), bIncludeArgumentName:=False, iPosition:=0) clsRelevelPasteFunction.SetAssignTo("relevel_variables") + clsConcatenateFunction.SetRCommand("c") clsSelectFunction.SetPackageName("dplyr") @@ -200,7 +195,7 @@ Public Class dlgThreeVariablePivotTable ucrSelectorPivot.SetRCode(clsPipeOperator, bReset) ucrReceiverInitialColumnFactor.SetRCode(clsRPivotTableFunction, bReset) ucrReceiverFactorLevels.SetRCode(clsLevelsDollarOperator, bReset) - ucrChkNumericVariable.SetRCode(clsDummyFunction, bReset) + ucrChkNumericVariable.SetRCode(clsRPivotTableFunction, bReset) ucrReceiverInitialRowFactors.SetRCode(clsRPivotTableFunction, bReset) ucrSavePivot.SetRCode(clsRPivotTableFunction, bReset) ucrChkSelectedVariable.SetRCode(clsRPivotTableFunction, bReset) @@ -227,7 +222,11 @@ Public Class dlgThreeVariablePivotTable If ucrChkSelectedVariable.Checked Then ucrReceiverSelectedVariable.SetMeAsReceiver() Else - ucrReceiverInitialRowFactors.SetMeAsReceiver() + If ucrChkNumericVariable.Checked Then + ucrReceiverAdditionalRowFactor.SetMeAsReceiver() + Else + ucrReceiverInitialRowFactors.SetMeAsReceiver() + End If End If ChangeDataParameterValue() End Sub @@ -247,7 +246,10 @@ Public Class dlgThreeVariablePivotTable End Sub Private Sub ReceiversChanged(ucrChangedControls As ucrCore) Handles ucrReceiverInitialColumnFactor.ControlValueChanged, ucrReceiverSelectedVariable.ControlValueChanged, - ucrReceiverInitialRowFactors.ControlValueChanged, ucrReceiverAdditionalRowFactor.ControlValueChanged, ucrReceiverFactorLevels.ControlValueChanged, ucrChkNumericVariable.ControlValueChanged + ucrReceiverInitialRowFactors.ControlValueChanged, ucrReceiverAdditionalRowFactor.ControlValueChanged, ucrReceiverFactorLevels.ControlValueChanged + If Not bRcodeSet Then + Exit Sub + End If If ucrChkSelectedVariable.Checked Then Dim lstColumns As New List(Of String) @@ -279,39 +281,18 @@ Public Class dlgThreeVariablePivotTable Not lstColumns.Contains(strFactorLevelsVariable) Then clsConcatenateFunction.AddParameter("factor_level", strFactorLevelsVariable, bIncludeArgumentName:=False, iPosition:=iPosition) - End If End If - If enumPivotMode = PivotMode.Climatic Then - clsRPivotTableFunction.RemoveParameterByName("sorters") - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFlattenFunction) - - Else - ucrBase.clsRsyntax.AddToBeforeCodes(clsFlattenFunction, 0) - clsRPivotTableFunction.AddParameter(strParameterName:="sorters", clsRFunctionParameter:=clsRelevelPasteFunction, iPosition:=3) - End If - - If ucrChkNumericVariable.Checked AndAlso enumPivotMode = PivotMode.Climatic Then - clsRPivotTableFunction.AddParameter("val", ucrReceiverAdditionalRowFactor.GetVariableNames(), iPosition:=3) - clsRPivotTableFunction.AddParameter("rendererName", Chr(34) & ucrInputTableChart.GetText() & Chr(34), iPosition:=4) - clsRPivotTableFunction.AddParameter("aggregatorName", Chr(34) & ucrInputSummary.GetText() & Chr(34), iPosition:=5) - Else - clsRPivotTableFunction.RemoveParameterByName("val") - clsRPivotTableFunction.RemoveParameterByName("rendererName") - clsRPivotTableFunction.RemoveParameterByName("aggregatorName") - End If - End Sub - - Private Sub CheckForDuplication(lstNewColumns As List(Of String), ucrNewReceiver As ucrReceiverMultiple, ByRef iNewposition As Integer) - For Each strColumn In ucrNewReceiver.GetVariableNamesList(bWithQuotes:=False) - If lstNewColumns.Contains(strColumn) Then - Continue For + If ucrChangedControls Is ucrReceiverFactorLevels Then + If ucrReceiverFactorLevels.IsEmpty Then + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFlattenFunction) + clsRPivotTableFunction.RemoveParameterByName("sorters") + Else + ucrBase.clsRsyntax.AddToBeforeCodes(clsFlattenFunction, 0) + clsRPivotTableFunction.AddParameter(strParameterName:="sorters", clsRFunctionParameter:=clsRelevelPasteFunction, iPosition:=3) End If - lstNewColumns.Add(strColumn) - clsConcatenateFunction.AddParameter("col" & iNewposition, strColumn, iPosition:=iNewposition, bIncludeArgumentName:=False) - iNewposition += 1 - Next + End If End Sub Private Sub AutofillMode() @@ -326,6 +307,7 @@ Public Class dlgThreeVariablePivotTable ucrReceiverAdditionalRowFactor.SetIncludedDataTypes({"numeric", "Date", "logical"}) ucrReceiverAdditionalRowFactor.bAutoFill = False + ucrChkNumericVariable.Checked = False Case PivotMode.Climatic Dim strMonthCol As String Dim strDataFrame As String @@ -339,34 +321,49 @@ Public Class dlgThreeVariablePivotTable strYearCol = frmMain.clsRLink.GetClimaticColumnOfType(strDataFrame, "year_label") strDayCol = frmMain.clsRLink.GetClimaticColumnOfType(strDataFrame, "day_label") If Not String.IsNullOrEmpty(strRainCol) Then + ucrChkNumericVariable.Checked = True ucrReceiverAdditionalRowFactor.Add(strRainCol, strDataFrame) + Else + ucrChkNumericVariable.Checked = False End If If Not String.IsNullOrEmpty(strMonthCol) Then ucrReceiverFactorLevels.Add(strMonthCol, strDataFrame) ucrReceiverInitialColumnFactor.Add(strMonthCol, strDataFrame) End If + If ucrSelectorPivot.lstAvailableVariable.Items.Count > 0 AndAlso + Not String.IsNullOrEmpty(strYearCol) AndAlso Not String.IsNullOrEmpty(strDayCol) Then + Dim lstItems(1) As KeyValuePair(Of String, String) + lstItems(0) = New KeyValuePair(Of String, String)(strDataFrame, strYearCol) + lstItems(1) = New KeyValuePair(Of String, String)(strDataFrame, strDayCol) + ucrReceiverInitialRowFactors.AddMultiple(lstItems) + End If End Select End Sub + Private Sub CheckForDuplication(lstNewColumns As List(Of String), ucrNewReceiver As ucrReceiverMultiple, ByRef iNewposition As Integer) + For Each strColumn In ucrNewReceiver.GetVariableNamesList(bWithQuotes:=False) + If lstNewColumns.Contains(strColumn) Then + Continue For + End If + lstNewColumns.Add(strColumn) + clsConcatenateFunction.AddParameter("col" & iNewposition, strColumn, iPosition:=iNewposition, bIncludeArgumentName:=False) + iNewposition += 1 + Next + End Sub + Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverSelectedVariable.ControlContentsChanged, ucrReceiverInitialColumnFactor.ControlContentsChanged, ucrChkSelectedVariable.ControlContentsChanged, ucrSavePivot.ControlContentsChanged TestOkEnabled() End Sub - Private Sub ucrInputSummary_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputSummary.ControlValueChanged - If ucrChkNumericVariable.Checked AndAlso Not ucrInputSummary.IsEmpty Then - clsRPivotTableFunction.AddParameter("aggregatorName", Chr(34) & ucrInputSummary.GetText() & Chr(34), iPosition:=5) - Else - clsRPivotTableFunction.RemoveParameterByName("aggregatorName") - End If - End Sub - - Private Sub ucrInputTableChart_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputTableChart.ControlValueChanged - If ucrChkNumericVariable.Checked AndAlso Not ucrInputTableChart.IsEmpty Then - clsRPivotTableFunction.AddParameter("rendererName", Chr(34) & ucrInputTableChart.GetText() & Chr(34), iPosition:=4) + Private Sub ucrChkNumericVariable_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkNumericVariable.ControlValueChanged + If ucrChkNumericVariable.Checked Then + ucrReceiverAdditionalRowFactor.SetMeAsReceiver() + ElseIf Not ucrChkNumericVariable.Checked AndAlso ucrChkSelectedVariable.Checked Then + ucrReceiverSelectedVariable.SetMeAsReceiver() Else - clsRPivotTableFunction.RemoveParameterByName("rendererName") + ucrReceiverInitialRowFactors.SetMeAsReceiver() End If End Sub End Class \ No newline at end of file diff --git a/instat/dlgWordwrap.Designer.vb b/instat/dlgWordwrap.Designer.vb index c17d97eb78d..cfef366b676 100644 --- a/instat/dlgWordwrap.Designer.vb +++ b/instat/dlgWordwrap.Designer.vb @@ -22,20 +22,173 @@ Partial Class dlgWordwrap 'Do not modify it using the code editor. _ Private Sub InitializeComponent() + Me.grpOptions = New System.Windows.Forms.GroupBox() + Me.rdoUnWrapText = New System.Windows.Forms.RadioButton() + Me.rdoWrapText = New System.Windows.Forms.RadioButton() + Me.ucrPnlTextWrap = New instat.UcrPanel() + Me.ucrBase = New instat.ucrButtons() + Me.ucrNudWidthWrap = New instat.ucrNud() + Me.lblWidthWrap = New System.Windows.Forms.Label() + Me.lblColumnToTransform = New System.Windows.Forms.Label() + Me.ucrReceiverWrapText = New instat.ucrReceiverSingle() + Me.ucrSelectorForWrapText = New instat.ucrSelectorByDataFrameAddRemove() + Me.grpOptions.SuspendLayout() Me.SuspendLayout() ' + 'grpOptions + ' + Me.grpOptions.Controls.Add(Me.rdoUnWrapText) + Me.grpOptions.Controls.Add(Me.rdoWrapText) + Me.grpOptions.Controls.Add(Me.ucrPnlTextWrap) + Me.grpOptions.Location = New System.Drawing.Point(387, 110) + Me.grpOptions.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.grpOptions.Name = "grpOptions" + Me.grpOptions.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.grpOptions.Size = New System.Drawing.Size(261, 88) + Me.grpOptions.TabIndex = 13 + Me.grpOptions.TabStop = False + Me.grpOptions.Text = "Options:" + ' + 'rdoUnWrapText + ' + Me.rdoUnWrapText.AutoSize = True + Me.rdoUnWrapText.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoUnWrapText.Location = New System.Drawing.Point(129, 37) + Me.rdoUnWrapText.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.rdoUnWrapText.Name = "rdoUnWrapText" + Me.rdoUnWrapText.Size = New System.Drawing.Size(89, 24) + Me.rdoUnWrapText.TabIndex = 2 + Me.rdoUnWrapText.TabStop = True + Me.rdoUnWrapText.Text = "Unwrap" + Me.rdoUnWrapText.UseVisualStyleBackColor = True + ' + 'rdoWrapText + ' + Me.rdoWrapText.AutoSize = True + Me.rdoWrapText.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoWrapText.Location = New System.Drawing.Point(18, 35) + Me.rdoWrapText.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.rdoWrapText.Name = "rdoWrapText" + Me.rdoWrapText.Size = New System.Drawing.Size(72, 24) + Me.rdoWrapText.TabIndex = 1 + Me.rdoWrapText.TabStop = True + Me.rdoWrapText.Text = "Wrap" + Me.rdoWrapText.UseVisualStyleBackColor = True + ' + 'ucrPnlTextWrap + ' + Me.ucrPnlTextWrap.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlTextWrap.Location = New System.Drawing.Point(10, 28) + Me.ucrPnlTextWrap.Margin = New System.Windows.Forms.Padding(9) + Me.ucrPnlTextWrap.Name = "ucrPnlTextWrap" + Me.ucrPnlTextWrap.Size = New System.Drawing.Size(234, 46) + Me.ucrPnlTextWrap.TabIndex = 0 + ' + 'ucrBase + ' + Me.ucrBase.AutoSize = True + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(9, 303) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(611, 77) + Me.ucrBase.TabIndex = 16 + ' + 'ucrNudWidthWrap + ' + Me.ucrNudWidthWrap.AutoSize = True + Me.ucrNudWidthWrap.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudWidthWrap.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudWidthWrap.Location = New System.Drawing.Point(473, 207) + Me.ucrNudWidthWrap.Margin = New System.Windows.Forms.Padding(9) + Me.ucrNudWidthWrap.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudWidthWrap.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudWidthWrap.Name = "ucrNudWidthWrap" + Me.ucrNudWidthWrap.Size = New System.Drawing.Size(75, 32) + Me.ucrNudWidthWrap.TabIndex = 15 + Me.ucrNudWidthWrap.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblWidthWrap + ' + Me.lblWidthWrap.AutoSize = True + Me.lblWidthWrap.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblWidthWrap.Location = New System.Drawing.Point(387, 213) + Me.lblWidthWrap.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblWidthWrap.Name = "lblWidthWrap" + Me.lblWidthWrap.Size = New System.Drawing.Size(54, 20) + Me.lblWidthWrap.TabIndex = 14 + Me.lblWidthWrap.Text = "Width:" + ' + 'lblColumnToTransform + ' + Me.lblColumnToTransform.AutoSize = True + Me.lblColumnToTransform.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColumnToTransform.Location = New System.Drawing.Point(387, 30) + Me.lblColumnToTransform.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblColumnToTransform.Name = "lblColumnToTransform" + Me.lblColumnToTransform.Size = New System.Drawing.Size(71, 20) + Me.lblColumnToTransform.TabIndex = 11 + Me.lblColumnToTransform.Text = "Column :" + ' + 'ucrReceiverWrapText + ' + Me.ucrReceiverWrapText.AutoSize = True + Me.ucrReceiverWrapText.frmParent = Me + Me.ucrReceiverWrapText.Location = New System.Drawing.Point(387, 58) + Me.ucrReceiverWrapText.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverWrapText.Name = "ucrReceiverWrapText" + Me.ucrReceiverWrapText.Selector = Nothing + Me.ucrReceiverWrapText.Size = New System.Drawing.Size(202, 40) + Me.ucrReceiverWrapText.strNcFilePath = "" + Me.ucrReceiverWrapText.TabIndex = 12 + Me.ucrReceiverWrapText.ucrSelector = Nothing + ' + 'ucrSelectorForWrapText + ' + Me.ucrSelectorForWrapText.AutoSize = True + Me.ucrSelectorForWrapText.bDropUnusedFilterLevels = False + Me.ucrSelectorForWrapText.bShowHiddenColumns = False + Me.ucrSelectorForWrapText.bUseCurrentFilter = True + Me.ucrSelectorForWrapText.Location = New System.Drawing.Point(9, 12) + Me.ucrSelectorForWrapText.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorForWrapText.Name = "ucrSelectorForWrapText" + Me.ucrSelectorForWrapText.Size = New System.Drawing.Size(363, 285) + Me.ucrSelectorForWrapText.TabIndex = 10 + ' 'dlgWordwrap ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(419, 460) + Me.ClientSize = New System.Drawing.Size(660, 392) + Me.Controls.Add(Me.grpOptions) + Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.ucrNudWidthWrap) + Me.Controls.Add(Me.lblWidthWrap) + Me.Controls.Add(Me.lblColumnToTransform) + Me.Controls.Add(Me.ucrReceiverWrapText) + Me.Controls.Add(Me.ucrSelectorForWrapText) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgWordwrap" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Wordwrap" + Me.Text = "Wrap" + Me.grpOptions.ResumeLayout(False) + Me.grpOptions.PerformLayout() Me.ResumeLayout(False) + Me.PerformLayout() End Sub + + Friend WithEvents grpOptions As GroupBox + Friend WithEvents rdoUnWrapText As RadioButton + Friend WithEvents rdoWrapText As RadioButton + Friend WithEvents ucrPnlTextWrap As UcrPanel + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents ucrNudWidthWrap As ucrNud + Friend WithEvents lblWidthWrap As Label + Friend WithEvents lblColumnToTransform As Label + Friend WithEvents ucrReceiverWrapText As ucrReceiverSingle + Friend WithEvents ucrSelectorForWrapText As ucrSelectorByDataFrameAddRemove End Class diff --git a/instat/dlgWordwrap.vb b/instat/dlgWordwrap.vb index d855e5d28c4..7bf92ad9369 100644 --- a/instat/dlgWordwrap.vb +++ b/instat/dlgWordwrap.vb @@ -18,5 +18,101 @@ Imports instat.Translations Public Class dlgWordwrap + Private bFirstLoad As Boolean = True + Private bReset As Boolean = True + Private clsWrapOrUnwrapFunction As New RFunction + Private Sub dlgWordwrap_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstLoad Then + InitialiseDialog() + bFirstLoad = False + End If + If bReset Then + SetDefaults() + End If + SetRCodeForControls(bReset) + bReset = False + autoTranslate(Me) + TestOkEnabled() + End Sub + + Private Sub InitialiseDialog() + Dim dctInputPad As New Dictionary(Of String, String) + Dim dctInputSeparator As New Dictionary(Of String, String) + + ucrBase.iHelpTopicID = 343 + ucrBase.clsRsyntax.bUseBaseFunction = True + + 'ucrReceiver + ucrReceiverWrapText.SetParameter(New RParameter("column_data", 2)) + ucrReceiverWrapText.SetParameterIsRFunction() + ucrReceiverWrapText.Selector = ucrSelectorForWrapText + ucrReceiverWrapText.bUseFilteredData = False + ucrReceiverWrapText.SetMeAsReceiver() + ucrReceiverWrapText.strSelectorHeading = "Variables" + + 'ucrRdoOptions + ucrPnlTextWrap.SetParameter(New RParameter("wrap", 4)) + ucrPnlTextWrap.AddRadioButton(rdoWrapText, "TRUE") + ucrPnlTextWrap.AddRadioButton(rdoUnWrapText, "FALSE") + + ucrPnlTextWrap.AddParameterValuesCondition(rdoWrapText, "wrap", "TRUE") + ucrPnlTextWrap.AddParameterValuesCondition(rdoUnWrapText, "wrap", "FALSE") + ucrPnlTextWrap.AddToLinkedControls(ucrNudWidthWrap, {rdoWrapText}, bNewLinkedHideIfParameterMissing:=True) + + ucrNudWidthWrap.SetLinkedDisplayControl(lblWidthWrap) + ucrNudWidthWrap.SetMinMax(1, 100) + ucrNudWidthWrap.Increment = 1.0 + End Sub + + Private Sub SetDefaults() + clsWrapOrUnwrapFunction = New RFunction + + ucrSelectorForWrapText.Reset() + ucrNudWidthWrap.SetText("40") + + clsWrapOrUnwrapFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$wrap_or_unwrap_data") + clsWrapOrUnwrapFunction.AddParameter("width", "40", iPosition:=3) + clsWrapOrUnwrapFunction.AddParameter("wrap", "TRUE", iPosition:=4) + + ucrBase.clsRsyntax.SetBaseRFunction(clsWrapOrUnwrapFunction) + End Sub + + Private Sub SetRCodeForControls(bReset As Boolean) + ucrReceiverWrapText.SetRCode(clsWrapOrUnwrapFunction, bReset) + ucrPnlTextWrap.SetRCode(clsWrapOrUnwrapFunction, bReset) + End Sub + + Private Sub TestOkEnabled() + ucrBase.OKEnabled(Not ucrReceiverWrapText.IsEmpty) + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + SetRCodeForControls(True) + TestOkEnabled() + End Sub + + Private Sub ucrReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorForWrapText.ControlValueChanged, ucrReceiverWrapText.ControlValueChanged + clsWrapOrUnwrapFunction.AddParameter("data_name", Chr(34) & ucrSelectorForWrapText.ucrAvailableDataFrames.strCurrDataFrame & Chr(34), iPosition:=0) + clsWrapOrUnwrapFunction.AddParameter("col_name", ucrReceiverWrapText.GetVariableNames(True), iPosition:=1) + End Sub + + Private Sub ucrPnlTextWrap_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlTextWrap.ControlValueChanged, ucrNudWidthWrap.ControlValueChanged + If rdoWrapText.Checked Then + clsWrapOrUnwrapFunction.AddParameter("width", ucrNudWidthWrap.GetText, iPosition:=3) + Else + clsWrapOrUnwrapFunction.AddParameter("width", "NULL", iPosition:=3) + End If + End Sub + + Private Sub ucrReceiverWrapText_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverWrapText.ControlContentsChanged + TestOkEnabled() + End Sub + + Private Sub ucrBase_ClickOk(sender As Object, e As EventArgs) Handles ucrBase.ClickOk + If sender Is ucrBase.cmdOk OrElse sender Is ucrBase.toolStripMenuItemOkClose OrElse sender Is ucrBase.toolStripMenuItemOkKeep Then + frmMain.ucrDataViewer.AdjustColumnWidthAfterWrapping(ucrReceiverWrapText.GetVariableNames(False), rdoWrapText.Checked) + End If + End Sub End Class \ No newline at end of file diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 4e1a362b027..9beca326202 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -66,17 +66,17 @@ Partial Class frmMain Me.ToolStripSeparator26 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeSpecificMapPlot = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificDotPlot = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator27 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeSpecificMosaic = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificCummulativeDistribution = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificParallelCoordinatePlot = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeGraphGraphics = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificTables = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeGeneral = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeGeneralColumnSummaries = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeGeneralPivotTable = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator27 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeGeneralTabulation = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeGeneralGraphics = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator38 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuDescribeGeneralUseSummaries = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeGeneralTables = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeMultivariate = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeMultivariateCorrelations = New System.Windows.Forms.ToolStripMenuItem() @@ -681,6 +681,7 @@ Partial Class frmMain Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator38 = New System.Windows.Forms.ToolStripSeparator() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -827,7 +828,7 @@ Partial Class frmMain ' 'mnuDescribeSpecificTablesGraphs ' - Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.ToolStripSeparator27, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot}) + Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot, Me.ToolStripSeparator38, Me.mnuDescribeGraphGraphics}) Me.mnuDescribeSpecificTablesGraphs.Name = "mnuDescribeSpecificTablesGraphs" Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeSpecificTablesGraphs.Tag = "Graph_Dialogs" @@ -894,11 +895,6 @@ Partial Class frmMain Me.mnuDescribeSpecificDotPlot.Text = "Dot Plot..." Me.mnuDescribeSpecificDotPlot.Visible = False ' - 'ToolStripSeparator27 - ' - Me.ToolStripSeparator27.Name = "ToolStripSeparator27" - Me.ToolStripSeparator27.Size = New System.Drawing.Size(206, 6) - ' 'mnuDescribeSpecificMosaic ' Me.mnuDescribeSpecificMosaic.Name = "mnuDescribeSpecificMosaic" @@ -919,6 +915,12 @@ Partial Class frmMain Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificParallelCoordinatePlot.Text = "Parallel Coordinate Plot..." ' + 'mnuDescribeGraphGraphics + ' + Me.mnuDescribeGraphGraphics.Name = "mnuDescribeGraphGraphics" + Me.mnuDescribeGraphGraphics.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeGraphGraphics.Text = "Graphics..." + ' 'mnuDescribeSpecificTables ' Me.mnuDescribeSpecificTables.Name = "mnuDescribeSpecificTables" @@ -929,24 +931,28 @@ Partial Class frmMain ' 'mnuDescribeGeneral ' - Me.mnuDescribeGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeGeneralColumnSummaries, Me.mnuDescribeGeneralTabulation, Me.mnuDescribeGeneralGraphics, Me.ToolStripSeparator38, Me.mnuDescribeGeneralUseSummaries}) + Me.mnuDescribeGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeGeneralPivotTable, Me.ToolStripSeparator27, Me.mnuDescribeGeneralTabulation, Me.mnuDescribeGeneralGraphics, Me.mnuDescribeGeneralTables}) Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" Me.mnuDescribeGeneral.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeGeneral.Tag = "General" Me.mnuDescribeGeneral.Text = "General" ' - 'mnuDescribeGeneralColumnSummaries + 'mnuDescribeGeneralPivotTable + ' + Me.mnuDescribeGeneralPivotTable.Name = "mnuDescribeGeneralPivotTable" + Me.mnuDescribeGeneralPivotTable.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneralPivotTable.Text = "Pivot Table..." + ' + 'ToolStripSeparator27 ' - Me.mnuDescribeGeneralColumnSummaries.Name = "mnuDescribeGeneralColumnSummaries" - Me.mnuDescribeGeneralColumnSummaries.Size = New System.Drawing.Size(188, 22) - Me.mnuDescribeGeneralColumnSummaries.Tag = "Column_Summaries..." - Me.mnuDescribeGeneralColumnSummaries.Text = "Column Summaries..." + Me.ToolStripSeparator27.Name = "ToolStripSeparator27" + Me.ToolStripSeparator27.Size = New System.Drawing.Size(177, 6) ' 'mnuDescribeGeneralTabulation ' Me.mnuDescribeGeneralTabulation.Enabled = False Me.mnuDescribeGeneralTabulation.Name = "mnuDescribeGeneralTabulation" - Me.mnuDescribeGeneralTabulation.Size = New System.Drawing.Size(188, 22) + Me.mnuDescribeGeneralTabulation.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeGeneralTabulation.Tag = "Tabulation..." Me.mnuDescribeGeneralTabulation.Text = "Tabulation..." Me.mnuDescribeGeneralTabulation.Visible = False @@ -954,20 +960,15 @@ Partial Class frmMain 'mnuDescribeGeneralGraphics ' Me.mnuDescribeGeneralGraphics.Name = "mnuDescribeGeneralGraphics" - Me.mnuDescribeGeneralGraphics.Size = New System.Drawing.Size(188, 22) + Me.mnuDescribeGeneralGraphics.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeGeneralGraphics.Tag = "Graphics..." Me.mnuDescribeGeneralGraphics.Text = "Graphics..." ' - 'ToolStripSeparator38 - ' - Me.ToolStripSeparator38.Name = "ToolStripSeparator38" - Me.ToolStripSeparator38.Size = New System.Drawing.Size(185, 6) + 'mnuDescribeGeneralTables ' - 'mnuDescribeGeneralUseSummaries - ' - Me.mnuDescribeGeneralUseSummaries.Name = "mnuDescribeGeneralUseSummaries" - Me.mnuDescribeGeneralUseSummaries.Size = New System.Drawing.Size(188, 22) - Me.mnuDescribeGeneralUseSummaries.Text = "Use Summaries..." + Me.mnuDescribeGeneralTables.Name = "mnuDescribeGeneralTables" + Me.mnuDescribeGeneralTables.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneralTables.Text = "Tables..." ' 'ToolStripSeparator9 ' @@ -2889,7 +2890,6 @@ Partial Class frmMain ' 'mnuEditFind ' - Me.mnuEditFind.Enabled = False Me.mnuEditFind.Name = "mnuEditFind" Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys) Me.mnuEditFind.Size = New System.Drawing.Size(244, 22) @@ -2966,7 +2966,6 @@ Partial Class frmMain ' 'mnuEditWordwrap ' - Me.mnuEditWordwrap.Enabled = False Me.mnuEditWordwrap.Name = "mnuEditWordwrap" Me.mnuEditWordwrap.Size = New System.Drawing.Size(244, 22) Me.mnuEditWordwrap.Text = "Wordwrap" @@ -4073,7 +4072,6 @@ Partial Class frmMain ' 'mnuPrepareDataReshapeRandomSplit ' - Me.mnuPrepareDataReshapeRandomSplit.Enabled = False Me.mnuPrepareDataReshapeRandomSplit.Name = "mnuPrepareDataReshapeRandomSplit" Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareDataReshapeRandomSplit.Text = "Random Split..." @@ -4958,7 +4956,7 @@ Partial Class frmMain Me.splOverall.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splOverall.Panel2.Controls.Add(Me.splDataOutput) Me.splOverall.Size = New System.Drawing.Size(834, 399) - Me.splOverall.SplitterDistance = 167 + Me.splOverall.SplitterDistance = 166 Me.splOverall.SplitterWidth = 5 Me.splOverall.TabIndex = 10 ' @@ -4978,7 +4976,7 @@ Partial Class frmMain ' Me.splExtraWindows.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splExtraWindows.Panel2.Controls.Add(Me.ucrScriptWindow) - Me.splExtraWindows.Size = New System.Drawing.Size(834, 167) + Me.splExtraWindows.Size = New System.Drawing.Size(834, 166) Me.splExtraWindows.SplitterDistance = 254 Me.splExtraWindows.SplitterWidth = 5 Me.splExtraWindows.TabIndex = 0 @@ -4998,8 +4996,8 @@ Partial Class frmMain ' Me.splMetadata.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splMetadata.Panel2.Controls.Add(Me.ucrDataFrameMeta) - Me.splMetadata.Size = New System.Drawing.Size(254, 167) - Me.splMetadata.SplitterDistance = 71 + Me.splMetadata.Size = New System.Drawing.Size(254, 166) + Me.splMetadata.SplitterDistance = 70 Me.splMetadata.SplitterWidth = 5 Me.splMetadata.TabIndex = 0 ' @@ -5012,7 +5010,7 @@ Partial Class frmMain Me.ucrColumnMeta.Location = New System.Drawing.Point(0, 0) Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrColumnMeta.Name = "ucrColumnMeta" - Me.ucrColumnMeta.Size = New System.Drawing.Size(71, 167) + Me.ucrColumnMeta.Size = New System.Drawing.Size(70, 166) Me.ucrColumnMeta.TabIndex = 0 ' 'ucrDataFrameMeta @@ -5023,7 +5021,7 @@ Partial Class frmMain Me.ucrDataFrameMeta.Location = New System.Drawing.Point(0, 0) Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta" - Me.ucrDataFrameMeta.Size = New System.Drawing.Size(178, 167) + Me.ucrDataFrameMeta.Size = New System.Drawing.Size(179, 166) Me.ucrDataFrameMeta.TabIndex = 0 ' 'ucrScriptWindow @@ -5034,7 +5032,7 @@ Partial Class frmMain Me.ucrScriptWindow.Location = New System.Drawing.Point(0, 0) Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrScriptWindow.Name = "ucrScriptWindow" - Me.ucrScriptWindow.Size = New System.Drawing.Size(575, 167) + Me.ucrScriptWindow.Size = New System.Drawing.Size(575, 166) Me.ucrScriptWindow.strActiveTabText = "" Me.ucrScriptWindow.TabIndex = 2 Me.ucrScriptWindow.Tag = "Script_Window" @@ -5055,7 +5053,7 @@ Partial Class frmMain ' Me.splDataOutput.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splDataOutput.Panel2.Controls.Add(Me.ucrOutput) - Me.splDataOutput.Size = New System.Drawing.Size(834, 227) + Me.splDataOutput.Size = New System.Drawing.Size(834, 228) Me.splDataOutput.SplitterDistance = 384 Me.splDataOutput.SplitterWidth = 5 Me.splDataOutput.TabIndex = 0 @@ -5069,7 +5067,7 @@ Partial Class frmMain Me.ucrDataViewer.Location = New System.Drawing.Point(0, 0) Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrDataViewer.Name = "ucrDataViewer" - Me.ucrDataViewer.Size = New System.Drawing.Size(384, 227) + Me.ucrDataViewer.Size = New System.Drawing.Size(384, 228) Me.ucrDataViewer.TabIndex = 0 Me.ucrDataViewer.Tag = "Data_View" ' @@ -5081,7 +5079,7 @@ Partial Class frmMain Me.ucrOutput.Location = New System.Drawing.Point(0, 0) Me.ucrOutput.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrOutput.Name = "ucrOutput" - Me.ucrOutput.Size = New System.Drawing.Size(445, 227) + Me.ucrOutput.Size = New System.Drawing.Size(445, 228) Me.ucrOutput.TabIndex = 0 ' 'mnuPlotly @@ -5119,6 +5117,11 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' + 'ToolStripSeparator38 + ' + Me.ToolStripSeparator38.Name = "ToolStripSeparator38" + Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -5301,7 +5304,6 @@ Partial Class frmMain Friend WithEvents mnuDescribeTwoVariablesTabulate As ToolStripMenuItem Friend WithEvents mnuDescribeTwoVariablesGraph As ToolStripMenuItem Friend WithEvents mnuDescribeGeneral As ToolStripMenuItem - Friend WithEvents mnuDescribeGeneralColumnSummaries As ToolStripMenuItem Friend WithEvents mnuDescribeGeneralTabulation As ToolStripMenuItem Friend WithEvents mnuDescribeGeneralGraphics As ToolStripMenuItem Friend WithEvents mnuDescribeSpecificTablesGraphs As ToolStripMenuItem @@ -5526,8 +5528,6 @@ Partial Class frmMain Friend WithEvents mnuFileExportExportRWorkspace As ToolStripMenuItem Friend WithEvents mnuFileExportExportGraphAsImage As ToolStripMenuItem Friend WithEvents mnuFileExportExportRObjectsToolStripMenuItem As ToolStripMenuItem - Friend WithEvents mnuDescribeGeneralUseSummaries As ToolStripMenuItem - Friend WithEvents ToolStripSeparator38 As ToolStripSeparator Friend WithEvents mnuClimaticDescribeWindSpeedDirectionWindRose As ToolStripMenuItem Friend WithEvents mnuDescribeSpecificCummulativeDistribution As ToolStripMenuItem Friend WithEvents mnuProcurementUseCRISummariseCRIbyCountry As ToolStripMenuItem @@ -5746,7 +5746,6 @@ Partial Class frmMain Friend WithEvents mnuLastGraph As ToolStripSplitButton Friend WithEvents mnuRViewer As ToolStripMenuItem Friend WithEvents mnuploty As ToolStripMenuItem - Friend WithEvents ToolStripSeparator27 As ToolStripSeparator Friend WithEvents ToolStripSeparator71 As ToolStripSeparator Friend WithEvents mnuEditScript As ToolStripMenuItem Friend WithEvents mnuPrepareDataFrameSelectColumns As ToolStripMenuItem @@ -5813,4 +5812,9 @@ Partial Class frmMain Friend WithEvents mnuExamineEditDataDailyDataEditing As ToolStripMenuItem Friend WithEvents mnuExamineEditDataCompareColumns As ToolStripMenuItem Friend WithEvents mnuStructuredSurvey As ToolStripMenuItem + Friend WithEvents mnuDescribeGraphGraphics As ToolStripMenuItem + Friend WithEvents mnuDescribeGeneralPivotTable As ToolStripMenuItem + Friend WithEvents ToolStripSeparator27 As ToolStripSeparator + Friend WithEvents mnuDescribeGeneralTables As ToolStripMenuItem + Friend WithEvents ToolStripSeparator38 As ToolStripSeparator End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 995e301b3fe..48628286c33 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -915,9 +915,7 @@ Public Class frmMain End Sub Private Sub mnuEditFind_Click(sender As Object, e As EventArgs) Handles mnuEditFind.Click - dlgFind.currWindow = ActiveMdiChild - dlgFind.Owner = Me - dlgFind.Show() + dlgFindInVariableOrFilter.ShowDialog() End Sub Private Sub mnuEditFindNext_Click(sender As Object, e As EventArgs) Handles mnuEditFindNext.Click @@ -1126,7 +1124,6 @@ Public Class frmMain dlgEndOfRainsSeason.ShowDialog() End Sub - Private Sub mnuDescribeSpecificScatterPlot_Click(sender As Object, e As EventArgs) Handles mnuDescribeSpecificPointPlot.Click dlgScatterPlot.ShowDialog() End Sub @@ -1175,10 +1172,6 @@ Public Class frmMain dlgCompareModels.ShowDialog() End Sub - Private Sub mnuDescribeGeneralColumnSummaries_Click(sender As Object, e As EventArgs) Handles mnuDescribeGeneralColumnSummaries.Click - dlgColumnStats.ShowDialog() - End Sub - Private Sub mnuOrganiseColumnUseDate_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnDateUseDate.Click dlgUseDate.ShowDialog() End Sub @@ -1507,9 +1500,6 @@ Public Class frmMain dlgExportRObjects.ShowDialog() End Sub - Private Sub FrequencyTablesToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuDescribeGeneralUseSummaries.Click - dlgSummaryBarOrPieChart.ShowDialog() - End Sub Private Sub mnuClimaticPrepareClimaticSummaries_Click(sender As Object, e As EventArgs) Handles mnuClimaticPrepareClimaticSummaries.Click dlgClimaticSummary.ShowDialog() End Sub @@ -2521,4 +2511,17 @@ Public Class frmMain Private Sub mnuStructuredSurvey_Click(sender As Object, e As EventArgs) Handles mnuStructuredSurvey.Click dlgSurvey.ShowDialog() End Sub + + Private Sub PivotTableToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuDescribeGeneralPivotTable.Click + dlgThreeVariablePivotTable.enumPivotMode = dlgThreeVariablePivotTable.PivotMode.Describe + dlgThreeVariablePivotTable.ShowDialog() + End Sub + + Private Sub mnuDescribeGraphGraphics_Click(sender As Object, e As EventArgs) Handles mnuDescribeGraphGraphics.Click + dlgGeneralForGraphics.ShowDialog() + End Sub + + Private Sub mnuDescribeGeneralTables_Click(sender As Object, e As EventArgs) Handles mnuDescribeGeneralTables.Click + dlgSummaryTables.ShowDialog() + End Sub End Class diff --git a/instat/sdgPlots.Designer.vb b/instat/sdgPlots.Designer.vb index f590d6644df..046a8ff2cd9 100644 --- a/instat/sdgPlots.Designer.vb +++ b/instat/sdgPlots.Designer.vb @@ -62,12 +62,7 @@ Partial Class sdgPlots Me.ucrPlotsAdditionalLayers = New instat.ucrAdditionalLayers() Me.tbpTitles = New System.Windows.Forms.TabPage() Me.lblLegendSize = New System.Windows.Forms.Label() - Me.ucrNudLegendSize = New instat.ucrNud() Me.lblTagSize = New System.Windows.Forms.Label() - Me.ucrNudTagSize = New instat.ucrNud() - Me.ucrChkTag = New instat.ucrCheck() - Me.ucrChkNewLegend = New instat.ucrCheck() - Me.ucrInputGraphCaption = New instat.ucrInputTextBox() Me.lblCaptionSize = New System.Windows.Forms.Label() Me.lblSubTitleSize = New System.Windows.Forms.Label() Me.lblTitleSize = New System.Windows.Forms.Label() @@ -83,6 +78,11 @@ Partial Class sdgPlots Me.rdoLegendTitleCustom = New System.Windows.Forms.RadioButton() Me.rdoLegendTitleAuto = New System.Windows.Forms.RadioButton() Me.ucrPnlLegendTitle = New instat.UcrPanel() + Me.ucrNudLegendSize = New instat.ucrNud() + Me.ucrNudTagSize = New instat.ucrNud() + Me.ucrChkTag = New instat.ucrCheck() + Me.ucrChkNewLegend = New instat.ucrCheck() + Me.ucrInputGraphCaption = New instat.ucrInputTextBox() Me.ucrNudCaptionSize = New instat.ucrNud() Me.ucrNudSubTitleSize = New instat.ucrNud() Me.ucrNudTitleSize = New instat.ucrNud() @@ -230,7 +230,7 @@ Partial Class sdgPlots Me.tbpPlotsOptions.Location = New System.Drawing.Point(7, 3) Me.tbpPlotsOptions.Name = "tbpPlotsOptions" Me.tbpPlotsOptions.SelectedIndex = 0 - Me.tbpPlotsOptions.Size = New System.Drawing.Size(677, 449) + Me.tbpPlotsOptions.Size = New System.Drawing.Size(677, 481) Me.tbpPlotsOptions.TabIndex = 0 ' 'tbpFacet @@ -255,7 +255,7 @@ Partial Class sdgPlots Me.tbpFacet.Location = New System.Drawing.Point(4, 22) Me.tbpFacet.Name = "tbpFacet" Me.tbpFacet.Padding = New System.Windows.Forms.Padding(3) - Me.tbpFacet.Size = New System.Drawing.Size(669, 423) + Me.tbpFacet.Size = New System.Drawing.Size(669, 455) Me.tbpFacet.TabIndex = 3 Me.tbpFacet.Tag = "Facet" Me.tbpFacet.Text = "Facets" @@ -462,12 +462,7 @@ Partial Class sdgPlots 'tbpTitles ' Me.tbpTitles.Controls.Add(Me.lblLegendSize) - Me.tbpTitles.Controls.Add(Me.ucrNudLegendSize) Me.tbpTitles.Controls.Add(Me.lblTagSize) - Me.tbpTitles.Controls.Add(Me.ucrNudTagSize) - Me.tbpTitles.Controls.Add(Me.ucrChkTag) - Me.tbpTitles.Controls.Add(Me.ucrChkNewLegend) - Me.tbpTitles.Controls.Add(Me.ucrInputGraphCaption) Me.tbpTitles.Controls.Add(Me.lblCaptionSize) Me.tbpTitles.Controls.Add(Me.lblSubTitleSize) Me.tbpTitles.Controls.Add(Me.lblTitleSize) @@ -477,6 +472,11 @@ Partial Class sdgPlots Me.tbpTitles.Controls.Add(Me.lblSubTitle) Me.tbpTitles.Controls.Add(Me.Label1) Me.tbpTitles.Controls.Add(Me.grpLegendTitle) + Me.tbpTitles.Controls.Add(Me.ucrNudLegendSize) + Me.tbpTitles.Controls.Add(Me.ucrNudTagSize) + Me.tbpTitles.Controls.Add(Me.ucrChkTag) + Me.tbpTitles.Controls.Add(Me.ucrChkNewLegend) + Me.tbpTitles.Controls.Add(Me.ucrInputGraphCaption) Me.tbpTitles.Controls.Add(Me.ucrNudCaptionSize) Me.tbpTitles.Controls.Add(Me.ucrNudSubTitleSize) Me.tbpTitles.Controls.Add(Me.ucrNudTitleSize) @@ -503,20 +503,6 @@ Partial Class sdgPlots Me.lblLegendSize.TabIndex = 54 Me.lblLegendSize.Text = "Legend Size:" ' - 'ucrNudLegendSize - ' - Me.ucrNudLegendSize.AutoSize = True - Me.ucrNudLegendSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLegendSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLegendSize.Location = New System.Drawing.Point(434, 179) - Me.ucrNudLegendSize.Margin = New System.Windows.Forms.Padding(5) - Me.ucrNudLegendSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudLegendSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLegendSize.Name = "ucrNudLegendSize" - Me.ucrNudLegendSize.Size = New System.Drawing.Size(50, 20) - Me.ucrNudLegendSize.TabIndex = 53 - Me.ucrNudLegendSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'lblTagSize ' Me.lblTagSize.AutoSize = True @@ -527,50 +513,6 @@ Partial Class sdgPlots Me.lblTagSize.TabIndex = 52 Me.lblTagSize.Text = "Tag Size:" ' - 'ucrNudTagSize - ' - Me.ucrNudTagSize.AutoSize = True - Me.ucrNudTagSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudTagSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudTagSize.Location = New System.Drawing.Point(434, 141) - Me.ucrNudTagSize.Margin = New System.Windows.Forms.Padding(5) - Me.ucrNudTagSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudTagSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudTagSize.Name = "ucrNudTagSize" - Me.ucrNudTagSize.Size = New System.Drawing.Size(50, 20) - Me.ucrNudTagSize.TabIndex = 51 - Me.ucrNudTagSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrChkTag - ' - Me.ucrChkTag.AutoSize = True - Me.ucrChkTag.Checked = False - Me.ucrChkTag.Location = New System.Drawing.Point(6, 141) - Me.ucrChkTag.Name = "ucrChkTag" - Me.ucrChkTag.Size = New System.Drawing.Size(104, 23) - Me.ucrChkTag.TabIndex = 50 - ' - 'ucrChkNewLegend - ' - Me.ucrChkNewLegend.AutoSize = True - Me.ucrChkNewLegend.Checked = False - Me.ucrChkNewLegend.Location = New System.Drawing.Point(6, 179) - Me.ucrChkNewLegend.Name = "ucrChkNewLegend" - Me.ucrChkNewLegend.Size = New System.Drawing.Size(125, 23) - Me.ucrChkNewLegend.TabIndex = 49 - ' - 'ucrInputGraphCaption - ' - Me.ucrInputGraphCaption.AddQuotesIfUnrecognised = True - Me.ucrInputGraphCaption.AutoSize = True - Me.ucrInputGraphCaption.IsMultiline = True - Me.ucrInputGraphCaption.IsReadOnly = False - Me.ucrInputGraphCaption.Location = New System.Drawing.Point(126, 72) - Me.ucrInputGraphCaption.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) - Me.ucrInputGraphCaption.Name = "ucrInputGraphCaption" - Me.ucrInputGraphCaption.Size = New System.Drawing.Size(181, 53) - Me.ucrInputGraphCaption.TabIndex = 48 - ' 'lblCaptionSize ' Me.lblCaptionSize.AutoSize = True @@ -728,6 +670,64 @@ Partial Class sdgPlots Me.ucrPnlLegendTitle.Size = New System.Drawing.Size(117, 25) Me.ucrPnlLegendTitle.TabIndex = 12 ' + 'ucrNudLegendSize + ' + Me.ucrNudLegendSize.AutoSize = True + Me.ucrNudLegendSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLegendSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLegendSize.Location = New System.Drawing.Point(434, 179) + Me.ucrNudLegendSize.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudLegendSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLegendSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLegendSize.Name = "ucrNudLegendSize" + Me.ucrNudLegendSize.Size = New System.Drawing.Size(50, 20) + Me.ucrNudLegendSize.TabIndex = 53 + Me.ucrNudLegendSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudTagSize + ' + Me.ucrNudTagSize.AutoSize = True + Me.ucrNudTagSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudTagSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudTagSize.Location = New System.Drawing.Point(434, 141) + Me.ucrNudTagSize.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudTagSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudTagSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudTagSize.Name = "ucrNudTagSize" + Me.ucrNudTagSize.Size = New System.Drawing.Size(50, 20) + Me.ucrNudTagSize.TabIndex = 51 + Me.ucrNudTagSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrChkTag + ' + Me.ucrChkTag.AutoSize = True + Me.ucrChkTag.Checked = False + Me.ucrChkTag.Location = New System.Drawing.Point(6, 141) + Me.ucrChkTag.Name = "ucrChkTag" + Me.ucrChkTag.Size = New System.Drawing.Size(104, 23) + Me.ucrChkTag.TabIndex = 50 + ' + 'ucrChkNewLegend + ' + Me.ucrChkNewLegend.AutoSize = True + Me.ucrChkNewLegend.Checked = False + Me.ucrChkNewLegend.Location = New System.Drawing.Point(6, 179) + Me.ucrChkNewLegend.Name = "ucrChkNewLegend" + Me.ucrChkNewLegend.Size = New System.Drawing.Size(125, 23) + Me.ucrChkNewLegend.TabIndex = 49 + ' + 'ucrInputGraphCaption + ' + Me.ucrInputGraphCaption.AddQuotesIfUnrecognised = True + Me.ucrInputGraphCaption.AutoSize = True + Me.ucrInputGraphCaption.IsMultiline = True + Me.ucrInputGraphCaption.IsReadOnly = False + Me.ucrInputGraphCaption.Location = New System.Drawing.Point(126, 72) + Me.ucrInputGraphCaption.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) + Me.ucrInputGraphCaption.Name = "ucrInputGraphCaption" + Me.ucrInputGraphCaption.Size = New System.Drawing.Size(181, 53) + Me.ucrInputGraphCaption.TabIndex = 48 + ' 'ucrNudCaptionSize ' Me.ucrNudCaptionSize.AutoSize = True @@ -832,7 +832,7 @@ Partial Class sdgPlots Me.ucrXAxis.AutoSize = True Me.ucrXAxis.Location = New System.Drawing.Point(-4, 3) Me.ucrXAxis.Name = "ucrXAxis" - Me.ucrXAxis.Size = New System.Drawing.Size(669, 436) + Me.ucrXAxis.Size = New System.Drawing.Size(669, 463) Me.ucrXAxis.TabIndex = 0 ' 'tbpYAxis @@ -851,7 +851,7 @@ Partial Class sdgPlots Me.ucrYAxis.AutoSize = True Me.ucrYAxis.Location = New System.Drawing.Point(0, 1) Me.ucrYAxis.Name = "ucrYAxis" - Me.ucrYAxis.Size = New System.Drawing.Size(669, 416) + Me.ucrYAxis.Size = New System.Drawing.Size(669, 463) Me.ucrYAxis.TabIndex = 0 ' 'tbpTheme @@ -2037,7 +2037,7 @@ Partial Class sdgPlots 'ucrBaseSubdialog ' Me.ucrBaseSubdialog.AutoSize = True - Me.ucrBaseSubdialog.Location = New System.Drawing.Point(232, 470) + Me.ucrBaseSubdialog.Location = New System.Drawing.Point(232, 490) Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) Me.ucrBaseSubdialog.TabIndex = 1 @@ -2047,7 +2047,7 @@ Partial Class sdgPlots Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(687, 502) + Me.ClientSize = New System.Drawing.Size(687, 529) Me.Controls.Add(Me.ucrBaseSubdialog) Me.Controls.Add(Me.tbpPlotsOptions) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 7ca6a5fd292..8d97db4f870 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -203,12 +203,15 @@ Public Class sdgPlots ucrNudTitleSize.SetParameter(New RParameter("size")) ucrNudTitleSize.SetMinMax(0, Integer.MaxValue) + ucrNudTitleSize.SetRDefault(20) ucrNudSubTitleSize.SetParameter(New RParameter("size")) ucrNudSubTitleSize.SetMinMax(0, Integer.MaxValue) + ucrNudSubTitleSize.SetRDefault(15) ucrNudCaptionSize.SetParameter(New RParameter("size")) ucrNudCaptionSize.SetMinMax(0, Integer.MaxValue) + ucrNudCaptionSize.SetRDefault(8) ucrNudTagSize.SetParameter(New RParameter("size")) ucrNudTagSize.SetMinMax(0, Integer.MaxValue) @@ -216,7 +219,7 @@ Public Class sdgPlots ucrNudLegendSize.SetParameter(New RParameter("size")) ucrNudLegendSize.SetMinMax(0, Integer.MaxValue) - + ucrNudLegendSize.SetRDefault(18) ucrChkTag.SetText("Tag") ucrChkTag.AddToLinkedControls(ucrNudTagSize, {True}, bNewLinkedHideIfParameterMissing:=True) @@ -309,9 +312,10 @@ Public Class sdgPlots 'Theme Tab Checkboxes under grpCommonOptions ucrChkLegendPosition.SetText("Legend Position") - ucrChkLegendPosition.AddToLinkedControls(ucrInputLegendPosition, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkLegendPosition.AddToLinkedControls(ucrInputLegendPosition, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="None") ucrInputLegendPosition.SetDropDownStyleAsNonEditable() ucrInputLegendPosition.SetParameter(New RParameter("legend.position")) + dctLegendPosition.Add("None", Chr(34) & "none" & Chr(34)) dctLegendPosition.Add("Left", Chr(34) & "left" & Chr(34)) dctLegendPosition.Add("Right", Chr(34) & "right" & Chr(34)) dctLegendPosition.Add("Top", Chr(34) & "top" & Chr(34)) @@ -672,28 +676,17 @@ Public Class sdgPlots dctNewThemeFunctions.TryGetValue("axis.title.y", clsYElemetTitle) If dctThemeFunctions.TryGetValue("caption", clsPlotElementCaptionFunction) Then - clsPlotElementCaptionFunction.AddParameter("size", 8) clsThemeFunction.AddParameter("plot.caption", clsRFunctionParameter:=clsPlotElementCaptionFunction) End If If dctThemeFunctions.TryGetValue("title", clsPlotElementTitleFunction) Then - clsPlotElementTitleFunction.AddParameter("size", 20) clsThemeFunction.AddParameter("plot.title", clsRFunctionParameter:=clsPlotElementTitleFunction) End If If dctThemeFunctions.TryGetValue("sub.title", clsPlotElementSubTitleFunction) Then - clsPlotElementSubTitleFunction.AddParameter("size", 15) clsThemeFunction.AddParameter("plot.subtitle", clsRFunctionParameter:=clsPlotElementSubTitleFunction) End If - If dctThemeFunctions.TryGetValue("tag", clsPlotElementTagFunction) Then - clsPlotElementTagFunction.AddParameter("size", 15) - End If - - If dctThemeFunctions.TryGetValue("colour", clsPlotLegendTitleFunction) Then - clsPlotLegendTitleFunction.AddParameter("size", 18) - End If - If clsFacetFunction.ContainsParameter("facets") Then clsTempParam = clsFacetFunction.GetParameter("facets") If clsTempParam.bIsOperator AndAlso clsTempParam.clsArgumentCodeStructure IsNot Nothing Then @@ -1244,7 +1237,7 @@ Public Class sdgPlots End Select End Sub - Private Sub ucrChkTag_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkTag.ControlValueChanged, ucrInputTag.ControlValueChanged, ucrNudTagSize.ControlValueChanged + Private Sub ucrChkTag_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkTag.ControlValueChanged, ucrInputTag.ControlValueChanged If ucrChkTag.Checked AndAlso Not ucrInputTag.IsEmpty Then clsLabsFunction.AddParameter("tag", Chr(34) & ucrInputTag.GetText & Chr(34)) clsThemeFunction.AddParameter("plot.tag", clsRFunctionParameter:=clsPlotElementTagFunction) @@ -1254,7 +1247,7 @@ Public Class sdgPlots End If End Sub - Private Sub ucrChkNewLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkNewLegend.ControlValueChanged, ucrInputLegendTitle.ControlValueChanged, ucrNudLegendSize.ControlValueChanged + Private Sub ucrChkNewLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkNewLegend.ControlValueChanged, ucrInputLegendTitle.ControlValueChanged If ucrChkNewLegend.Checked AndAlso Not ucrInputLegendTitle.IsEmpty Then clsLabsFunction.AddParameter("colour", Chr(34) & ucrInputLegendTitle.GetText & Chr(34)) clsLabsFunction.AddParameter("fill", Chr(34) & ucrInputLegendTitle.GetText & Chr(34)) @@ -1266,4 +1259,23 @@ Public Class sdgPlots End If End Sub + Private Sub ucrNudCaptionSize_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudCaptionSize.ControlValueChanged + clsPlotElementCaptionFunction.AddParameter("size", ucrNudCaptionSize.GetText) + End Sub + + Private Sub ucrNudTitleSize_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudTitleSize.ControlValueChanged + clsPlotElementTitleFunction.AddParameter("size", ucrNudTitleSize.GetText) + End Sub + + Private Sub ucrNudSubTitleSize_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudSubTitleSize.ControlValueChanged + clsPlotElementSubTitleFunction.AddParameter("size", ucrNudSubTitleSize.GetText) + End Sub + + Private Sub ucrNudTagSize_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudTagSize.ControlValueChanged + clsPlotElementTagFunction.AddParameter("size", ucrNudTagSize.GetText) + End Sub + + Private Sub ucrNudLegendSize_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudLegendSize.ControlValueChanged + clsPlotLegendTitleFunction.AddParameter("size", ucrNudLegendSize.GetText) + End Sub End Class \ No newline at end of file diff --git a/instat/sdgSaveColumnPosition.vb b/instat/sdgSaveColumnPosition.vb index 17721b2de29..1928d2df1bd 100644 --- a/instat/sdgSaveColumnPosition.vb +++ b/instat/sdgSaveColumnPosition.vb @@ -29,7 +29,7 @@ Imports instat.Translations Public Class sdgSaveColumnPosition - Private clsColPosFunction As RFunction + Private clsColPosFunction As New RFunction Public bControlsNotInitialised As Boolean = True Public bUserSelected As Boolean = False Public bRcodeFlag As Boolean = False diff --git a/instat/static/InstatObject/R/Backend_Components/summary_functions.R b/instat/static/InstatObject/R/Backend_Components/summary_functions.R index 688a7d4f7d5..25dadf9724d 100644 --- a/instat/static/InstatObject/R/Backend_Components/summary_functions.R +++ b/instat/static/InstatObject/R/Backend_Components/summary_functions.R @@ -782,63 +782,63 @@ summary_quantile <- function(x, na.rm = FALSE, weights = NULL, probs, na_type = } # p10 function -p10 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, ...) { - summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.1) +p10 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, na_max_prop = NULL, ...) { + summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.1, na_max_prop = na_max_prop, ...) } # p20 function -p20 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, ...) { - summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.2) +p20 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, na_max_prop = NULL,...) { + summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.2, na_max_prop = na_max_prop, ...) } # p25 function -p25 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, ...) { - summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.25) +p25 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, na_max_prop = NULL, ...) { + summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.25, na_max_prop = na_max_prop, ...) } # p30 function -p30 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, ...) { - summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.3) +p30 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, na_max_prop = NULL, ...) { + summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.3, na_max_prop = na_max_prop, ...) } # p33 function -p33 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, ...) { - summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.33) +p33 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, na_max_prop = NULL, ...) { + summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.33, na_max_prop = na_max_prop, ...) } # p40 function -p40 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, ...) { - summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.4) +p40 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, na_max_prop = NULL, ...) { + summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.4, na_max_prop = na_max_prop, ...) } # p60 function -p60 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, ...) { - summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.6) +p60 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, na_max_prop = NULL, ...) { + summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.6, na_max_prop = na_max_prop, ...) } # p67 function -p67 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, ...) { - summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.67) +p67 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, na_max_prop = NULL, ...) { + summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.67, na_max_prop = na_max_prop, ...) } # p70 function -p70 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, ...) { - summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.7) +p70 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, na_max_prop = NULL, ...) { + summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.7, na_max_prop = na_max_prop, ...) } # p75 function -p75 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, ...) { - summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.75) +p75 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, na_max_prop = NULL, ...) { + summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.75, na_max_prop = na_max_prop, ...) } # p80 function -p80 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, ...) { - summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.8) +p80 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, na_max_prop = NULL, ...) { + summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.8, na_max_prop = na_max_prop, ...) } # p90 function -p90 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, ...) { - summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.9) +p90 <- function(x, na.rm = FALSE, na_type = "", weights = NULL, na_max_prop = NULL, ...) { + summary_quantile(x = x, na.rm = na.rm, na_type = na_type, weights = weights, probs = 0.9, na_max_prop = na_max_prop, ...) } # Skewness e1071 function diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 9aaf1597fca..ea243646ed2 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -339,7 +339,7 @@ DataSheet$set("public", "get_data_frame", function(convert_to_character = FALSE, for(col_name in names(out)) { for(attr_name in names(attributes(private$data[[col_name]]))) { if(!attr_name %in% c("class", "levels")) { - attr(out[[col_name]], attr_name) <- attr(private$data[[col_name]], attr_name) + attr(out[[col_name]], attr_name) <- attr(private$data[[col_name]][1:nrow(out)], attr_name) } } } @@ -771,7 +771,7 @@ DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", ne warning("Multiple columns have name: '", curr_col_name, "'. All such columns will be renamed.") } # remove key - get_key <- self$get_variables_metadata() %>% dplyr::filter(Name == col_name) + get_key <- self$get_variables_metadata() %>% dplyr::filter(Name == curr_col_name) if (!is.null(get_key$Is_Key)){ if (!is.na(get_key$Is_Key) && get_key$Is_Key){ active_keys <- self$get_keys() @@ -2038,6 +2038,14 @@ DataSheet$set("public", "get_column_selection_column_names", function(name) { return(all_column_names[out]) }) +DataSheet$set("public", "get_column_selected_column_names", function(column_selection_name = "") { + if(column_selection_name != "") { + selected_columns <- self$get_column_selection_column_names(column_selection_name) + return(selected_columns) + } +} +) + DataSheet$set("public", "column_selection_applied", function() { curr_sel <- private$.current_column_selection if (is.null(curr_sel) || length(curr_sel) == 0) { @@ -4382,4 +4390,4 @@ DataSheet$set("public", "has_labels", function(col_names) { if(missing(col_names)) stop("Column name must be specified.") return(!is.null(attr(col_names, "labels"))) } -) \ No newline at end of file +) diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 470529aa2bf..8b0872d3b88 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -780,6 +780,15 @@ DataBook$set("public", "get_current_filter", function(data_name) { } ) +DataBook$set("public", "get_filter_row_names", function(data_name, filter_name) { + row_names <- row.names(self$get_data_frame(data_name, convert_to_character = FALSE, stack_data = FALSE, + include_hidden_columns = TRUE, use_current_filter = TRUE, filter_name = filter_name, + remove_attr = FALSE, retain_attr = FALSE, drop_unused_filter_levels = FALSE)) + + return(row_names) +} +) + DataBook$set("public", "get_current_filter_name", function(data_name) { self$get_data_objects(data_name)$get_current_filter()$name } @@ -844,6 +853,11 @@ DataBook$set("public", "get_column_selection_column_names", function(data_name, } ) +DataBook$set("public", "get_column_selected_column_names", function(data_name, column_selection_name = "") { + return(self$get_data_objects(data_name)$get_column_selected_column_names(column_selection_name)) +} +) + DataBook$set("public", "get_current_column_selection", function(data_name) { self$get_data_objects(data_name)$get_current_column_selection() } @@ -2703,4 +2717,30 @@ DataBook$set("public", "replace_values_with_NA", function(data_name, row_index, DataBook$set("public","has_labels", function(data_name, col_names) { self$get_data_objects(data_name)$has_labels(col_names) } +) + +DataBook$set("public","wrap_or_unwrap_data", function(data_name, col_name, column_data, width, wrap = TRUE) { + # Store the original data type of the column + original_type <- class(column_data) + desired_types <- c("factor", "numeric", "Date", "character", "integer", "list", "double") + if(original_type %in% desired_types){ + # Apply str_replace_all if "\n" is detected in the column_data + if (any(!is.na(stringr::str_detect(column_data, "\n")))) { + column_data <- stringr::str_replace_all(column_data, "\n", " ") + } + + # Apply str_wrap if width is specified + if (!is.null(width) && wrap) { + column_data <- stringr::str_wrap(column_data, width = width) + } + + # Convert back to the original data type if necessary + if (original_type != class(column_data)) { + if (original_type %in% c("factor", "ordered_factor")){ + column_data <- make_factor(column_data) + }else{ column_data <- as(column_data, original_type) } + } + self$add_columns_to_data(data_name=data_name, col_name=col_name, col_data=column_data, before=FALSE) + } +} ) \ No newline at end of file diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 787f05df1e2..9fc96daa1bb 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -2932,5 +2932,18 @@ cumulative_inventory <- function(data, station = NULL, from, to){ return(data) } - - +getRowHeadersWithText <- function(data, column, searchText, ignore_case, use_regex) { + if(use_regex){ + # Find the rows that match the search text using regex + matchingRows <- stringr::str_detect(data[[column]], stringr::regex(searchText, ignore_case = ignore_case)) + }else if (is.na(searchText)){ + matchingRows <- apply(data[, column, drop = FALSE], 1, function(row) any(is.na(row))) + }else{ + matchingRows <- grepl(searchText, data[[column]], ignore.case = ignore_case) + } + # Get the row headers where the search text is found + rowHeaders <- rownames(data)[matchingRows] + + # Return the row headers + return(rowHeaders) +} diff --git a/instat/translations/en/r_instat_not_menus.json b/instat/translations/en/r_instat_not_menus.json index 25652ce9645..8431444dda8 100644 --- a/instat/translations/en/r_instat_not_menus.json +++ b/instat/translations/en/r_instat_not_menus.json @@ -47,22 +47,17 @@ " use ranks to divide into (almost) equal sized groups. For example ntile(c(15,11,13,12,NA,12),2) = (2,1,2,1,NA,1)": " use ranks to divide into (almost) equal sized groups. For example ntile(c(15,11,13,12,NA,12),2) = (2,1,2,1,NA,1)", " | Showing ": " | Showing ", "!is.na detects non-missing values, for example !is.na(c(1,3,NA, 5)) gives TRUE, TRUE, FALSE, TRUE": "!is.na detects non-missing values, for example !is.na(c(1,3,NA, 5)) gives TRUE, TRUE, FALSE, TRUE", - "An order, level, count control to be added later": "An order, level, count control to be added later", "# Code generated by the dialog, Script": "# Code generated by the dialog, Script", - "&Copy": "&Copy", - "&Open": "&Open", - "&Paste": "&Paste", - "&Save": "&Save", "(%in%)is like the match function and returns a logical vector. For example (11:15 %in% c(11,13)) gives TRUE, FALSE, TRUE, FALSE, FALSE": "(%in%)is like the match function and returns a logical vector. For example (11:15 %in% c(11,13)) gives TRUE, FALSE, TRUE, FALSE, FALSE", "(Missing)": "(Missing)", "(blank)": "(blank)", "(natural) logarithm. For example log(512) = 6.238; log(512,2) = 9 (log to base 2, i.e. 2 ^ 9 =512)": "(natural) logarithm. For example log(512) = 6.238; log(512,2) = 9 (log to base 2, i.e. 2 ^ 9 =512)", "(normal probabilities. For example; pnorm(-1.6449) = 0.05; pnorm(130,100,15) = 0.9772.": "(normal probabilities. For example; pnorm(-1.6449) = 0.05; pnorm(130,100,15) = 0.9772.", "(see also %in%)gives the positions of the matching elements. For example match(11:15, c(11,13)) gives (1,NA, 2, NA, NA). match(11:15,c(11,13),nomatch=0) gives 1, 0, 2, 0, 0)": "(see also %in%)gives the positions of the matching elements. For example match(11:15, c(11,13)) gives (1,NA, 2, NA, NA). match(11:15,c(11,13),nomatch=0) gives 1, 0, 2, 0, 0)", - "- to": "- to", ".nc files found to import": ".nc files found to import", + "0 or 1 times. For example, str_count(c(": "0 or 1 times. For example, str_count(c(", + "0 or more times. For example, str_count(c(": "0 or more times. For example, str_count(c(", "1 or more times. For example, str_count(c(": "1 or more times. For example, str_count(c(", - "1/mu^2": "1/mu^2", "10 variables and 50 observations, sampling with replacement and probability 0.3 of TRUE": "10 variables and 50 observations, sampling with replacement and probability 0.3 of TRUE", "10 variables from the Wakefield package": "10 variables from the Wakefield package", "10m u-component of wind": "10m u-component of wind", @@ -80,13 +75,13 @@ "2m dewpoint temperature": "2m dewpoint temperature", "2m temperature": "2m temperature", "2nd Factor (Optional):": "2nd Factor (Optional):", - "2pi": "2pi", "3 variables including both random normal and uniform data": "3 variables including both random normal and uniform data", "3. Mean Sea Level Pressure:": "3. Mean Sea Level Pressure:", "36 = 2(squared)*3(squared) is powerful because for each divisor, here 2 and 3, its square is also a divisor.": "36 = 2(squared)*3(squared) is powerful because for each divisor, here 2 and 3, its square is also a divisor.", "4 Digit": "4 Digit", "4 variables, showing use of seq and rep function": "4 variables, showing use of seq and rep function", "4. Mean Daily Air Temperature:": "4. Mean Daily Air Temperature:", + "4.85": "4.85", "49 variables, illustrating most of the types of data in the Wakefield package": "49 variables, illustrating most of the types of data in the Wakefield package", "5. Total Precipitation:": "5. Total Precipitation:", "6. Mean Daily Max Air Temperature:": "6. Mean Daily Max Air Temperature:", @@ -250,6 +245,7 @@ "Amount:": "Amount:", "An R Command is Running": "An R Command is Running", "An order": "An order", + "An order, level, count control to be added later": "An order, level, count control to be added later", "An order,level,count control to be added later": "An order,level,count control to be added later", "Analysis": "Analysis", "Anderson-Darling test for normality": "Anderson-Darling test for normality", @@ -370,6 +366,7 @@ "Bar Options": "Bar Options", "Bar and Pie Chart": "Bar and Pie Chart", "Bar plot": "Bar plot", + "Bar, Column, Lollipop, Pie, and Donut Charts, plus Treemaps and Wordclouds": "Bar, Column, Lollipop, Pie, and Donut Charts, plus Treemaps and Wordclouds", "BarChart Options": "BarChart Options", "Barometer Height:": "Barometer Height:", "Bartels Rank Test of Randomness": "Bartels Rank Test of Randomness", @@ -427,6 +424,7 @@ "Box Plot": "Box Plot", "Box plot": "Box plot", "Boxplot": "Boxplot", + "Boxplot (including Tufte), Jitter and Violin Plots": "Boxplot (including Tufte), Jitter and Violin Plots", "Boxplot + Jitter": "Boxplot + Jitter", "Boxplot Count Variable": "Boxplot Count Variable", "Boxplot Method": "Boxplot Method", @@ -942,6 +940,7 @@ "Cumulative": "Cumulative", "Cumulative Distribution...": "Cumulative Distribution...", "Cumulative Graph": "Cumulative Graph", + "Cumulative Graph and Exceedance Graph": "Cumulative Graph and Exceedance Graph", "Cumulative exceedance": "Cumulative exceedance", "Cumulative graph": "Cumulative graph", "Cumulative/Exceedance Graph": "Cumulative/Exceedance Graph", @@ -957,6 +956,7 @@ "DF1": "DF1", "DF2": "DF2", "Daily": "Daily", + "Daily Data Editing...": "Daily Data Editing...", "Daily Data Editing/Entry": "Daily Data Editing/Entry", "Daily Data Editing/Entry...": "Daily Data Editing/Entry...", "Daily Data Entry": "Daily Data Entry", @@ -1110,6 +1110,7 @@ "Delete Column": "Delete Column", "Delete Column(s)": "Delete Column(s)", "Delete Columns": "Delete Columns", + "Delete Columns or Rows": "Delete Columns or Rows", "Delete Columns/Rows...": "Delete Columns/Rows...", "Delete Colums or Rows": "Delete Colums or Rows", "Delete Data Frames": "Delete Data Frames", @@ -1178,6 +1179,7 @@ "Dialog: Create Survival Object": "Dialog: Create Survival Object", "Dialog: Cumulative/Exceedance Graph": "Dialog: Cumulative/Exceedance Graph", "Dialog: Daily Data Editing/Entry": "Dialog: Daily Data Editing/Entry", + "Dialog: Delete Columns or Rows": "Dialog: Delete Columns or Rows", "Dialog: Delete Colums or Rows": "Dialog: Delete Colums or Rows", "Dialog: Describe Two Variables": "Dialog: Describe Two Variables", "Dialog: Display Daily Data": "Dialog: Display Daily Data", @@ -1481,6 +1483,7 @@ "Exact Results...": "Exact Results...", "Examine": "Examine", "Examine...": "Examine...", + "Examine/Edit Data": "Examine/Edit Data", "Example List:": "Example List:", "Examples": "Examples", "Exceedance": "Exceedance", @@ -1755,6 +1758,7 @@ "Frequency Tables...": "Frequency Tables...", "Frequency polygon": "Frequency polygon", "Frequency tables": "Frequency tables", + "Frequency tables and Summary tables": "Frequency tables and Summary tables", "Frequency/Summary Tables": "Frequency/Summary Tables", "From": "From", "From Data Frame:": "From Data Frame:", @@ -1846,6 +1850,7 @@ "Greens": "Greens", "Grey": "Grey", "Greys": "Greys", + "Grid Lines": "Grid Lines", "Grid lines": "Grid lines", "Grid square": "Grid square", "Grop Height": "Grop Height", @@ -1887,6 +1892,7 @@ "Heading Border": "Heading Border", "Heat": "Heat", "Heat Map": "Heat Map", + "Heat Map and Chorolopleth Map": "Heat Map and Chorolopleth Map", "Heat Map/Choropleth": "Heat Map/Choropleth", "Heat Sum...": "Heat Sum...", "Heating Degree Days. If the baseline = 15 degrees then HDD is (15 - tmean). HDD = 0 if tmean is more than 15.": "Heating Degree Days. If the baseline = 15 degrees then HDD is (15 - tmean). HDD = 0 if tmean is more than 15.", @@ -1921,6 +1927,7 @@ "Histogram Options": "Histogram Options", "Histogram Plot": "Histogram Plot", "Histogram...": "Histogram...", + "Histograms, Dotplots, Density and Ridge Plots and Frequency Polygons": "Histograms, Dotplots, Density and Ridge Plots and Frequency Polygons", "History and FAQ": "History and FAQ", "Hit Rate": "Hit Rate", "Hjust": "Hjust", @@ -2026,6 +2033,7 @@ "Importing the following sheets:": "Importing the following sheets:", "Imputed:": "Imputed:", "In": "In", + "In Filter": "In Filter", "In Steps Of:": "In Steps Of:", "In Steps of:": "In Steps of:", "In numerical order of the levels (At least one level must be numerical.)": "In numerical order of the levels (At least one level must be numerical.)", @@ -2293,6 +2301,7 @@ "Legend Spacing": "Legend Spacing", "Legend Title": "Legend Title", "Legend Title and Text": "Legend Title and Text", + "Legend Title:": "Legend Title:", "Legend item labels": "Legend item labels", "Legend label": "Legend label", "Legend position": "Legend position", @@ -2340,6 +2349,7 @@ "Line Options": "Line Options", "Line Plot": "Line Plot", "Line Plot...": "Line Plot...", + "Line Plots, Smoothed Plots, Dumbbell and Slope Plots": "Line Plots, Smoothed Plots, Dumbbell and Slope Plots", "Line Type": "Line Type", "Line Type:": "Line Type:", "Line along x axis": "Line along x axis", @@ -2594,6 +2604,7 @@ "Minimum:": "Minimum:", "Minor Grid Lines": "Minor Grid Lines", "Minor Tick Marks": "Minor Tick Marks", + "Minor grid lines ": "Minor grid lines ", "Minute": "Minute", "Minutes": "Minutes", "Minutes:": "Minutes:", @@ -2697,9 +2708,11 @@ "Multiple Response...": "Multiple Response...", "Multiple Spells": "Multiple Spells", "Multiple Variables": "Multiple Variables", + "Multiple Variables or Two Variables": "Multiple Variables or Two Variables", "Multiple columns": "Multiple columns", "Multiply": "Multiply", "Multistate": "Multistate", + "Multivariate": "Multivariate", "Multple Lines...": "Multple Lines...", "Muptiple Response": "Muptiple Response", "N": "N", @@ -2901,6 +2914,7 @@ "One Variable Graph Options": "One Variable Graph Options", "One Variable Graph...": "One Variable Graph...", "One Variable Summarise": "One Variable Summarise", + "One Variable Summarise, Skim and Customised": "One Variable Summarise, Skim and Customised", "One Variable Summarise...": "One Variable Summarise...", "One Variable Use Model": "One Variable Use Model", "One Variable...": "One Variable...", @@ -3079,6 +3093,7 @@ "Partial": "Partial", "Partition Plot": "Partition Plot", "Partitioning": "Partitioning", + "Partitioning or Hierarchical": "Partitioning or Hierarchical", "Partitioning:": "Partitioning:", "Paste": "Paste", "Paste Data to New Column(s)": "Paste Data to New Column(s)", @@ -3813,6 +3828,7 @@ "Selected column": "Selected column", "Selected:": "Selected:", "Selected:0": "Selected:0", + "Selecting Option": "Selecting Option", "Selection": "Selection", "Selection Preview": "Selection Preview", "Selection Preview:": "Selection Preview:", @@ -3859,6 +3875,7 @@ "Sets:": "Sets:", "Settings": "Settings", "Setup For Data Entry": "Setup For Data Entry", + "Setup for Data Editing...": "Setup for Data Editing...", "Setup for Data Entry...": "Setup for Data Entry...", "Shape": "Shape", "Shape (Optional):": "Shape (Optional):", @@ -3969,6 +3986,7 @@ "Skewness (3rd Moment) (W)": "Skewness (3rd Moment) (W)", "Skewness Weight:": "Skewness Weight:", "Skim": "Skim", + "Skim or Two Variables": "Skim or Two Variables", "Skip ngrams": "Skip ngrams", "Slope": "Slope", "Slopes": "Slopes", @@ -4036,6 +4054,7 @@ "Spline interpolation of missing values. For example na.spline(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,2.5,4,7,12)": "Spline interpolation of missing values. For example na.spline(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,2.5,4,7,12)", "Split Geometry": "Split Geometry", "Split Text Column": "Split Text Column", + "Split Text...": "Split Text...", "Split by:": "Split by:", "Split...": "Split...", "Splits the data into groups of at least the specified size.": "Splits the data into groups of at least the specified size.", @@ -4197,6 +4216,7 @@ "Suppl.Numeric:": "Suppl.Numeric:", "Supplementary Individuals": "Supplementary Individuals", "Surface pressure": "Surface pressure", + "Survey": "Survey", "Survival": "Survival", "Survival Object Name:": "Survival Object Name:", "Swap": "Swap", @@ -4221,6 +4241,9 @@ "Table Name:": "Table Name:", "Table Title:": "Table Title:", "Table To Use:": "Table To Use:", + "Table or Graph": "Table or Graph", + "Table or Graph. Also Stem and Leaf Plots": "Table or Graph. Also Stem and Leaf Plots", + "Table, Stacked Graph or Likert Graph": "Table, Stacked Graph or Likert Graph", "Table/Chart :": "Table/Chart :", "Tables": "Tables", "Tables...": "Tables...", @@ -4291,6 +4314,7 @@ "Themes": "Themes", "Themes Sub Dialog": "Themes Sub Dialog", "Themes...": "Themes...", + "There are no entries matching ": "There are no entries matching ", "Thicknes:": "Thicknes:", "Thickness:": "Thickness:", "Third Context:": "Third Context:", @@ -4321,6 +4345,7 @@ "Tidy": "Tidy", "Tidy Daily Data": "Tidy Daily Data", "Tidy Daily Data...": "Tidy Daily Data...", + "Tidy Data": "Tidy Data", "Tidy and Examine": "Tidy and Examine", "Tidy...": "Tidy...", "Ties": "Ties", @@ -4403,6 +4428,7 @@ "Trace Values": "Trace Values", "Transform": "Transform", "Transform Text Column": "Transform Text Column", + "Transform Text...": "Transform Text...", "Transform...": "Transform...", "Transform:": "Transform:", "Transformation": "Transformation", @@ -4528,6 +4554,7 @@ "Use Model ": "Use Model ", "Use Model Keyboard...": "Use Model Keyboard...", "Use Model Keyboards...": "Use Model Keyboards...", + "Use Regular Expression": "Use Regular Expression", "Use Summaries": "Use Summaries", "Use Summaries...": "Use Summaries...", "Use Table": "Use Table", @@ -4800,15 +4827,15 @@ "Yellow": "Yellow", "Yellow-Green": "Yellow-Green", "Yes": "Yes", + "YlGn": "YlGn", + "YlGnBu": "YlGnBu", + "YlOrBr": "YlOrBr", + "YlOrRd": "YlOrRd", + "Ylim": "Ylim", "You have multiple rows with the same dates for one or more stations. Use the Climatic > Tidy and Examine > Duplicates dialog to investigate these issues.": "You have multiple rows with the same dates for one or more stations. Use the Climatic > Tidy and Examine > Duplicates dialog to investigate these issues.", "Zero Values": "Zero Values", "Zplot Plot": "Zplot Plot", - "[^ ] not": "[^ ] not", - "\\ escape": "\\ escape", - "\\d digit": "\\d digit", - "\\s space": "\\s space", - "^": "^", - "^ begin": "^ begin", + "Zseq": "Zseq", "a quantile, given a value between 0 and 1. So quantile(c(1,2,3,4,10), 0.25) = 2 and is the lower quartile.": "a quantile, given a value between 0 and 1. So quantile(c(1,2,3,4,10), 0.25) = 2 and is the lower quartile.", "aapc": "aapc", "abs": "abs", @@ -5439,9 +5466,7 @@ "mse": "mse", "multiply each number in the list by a given value (default 10).": "multiply each number in the list by a given value (default 10).", "murmur32": "murmur32", - "n": "n", "n times. For example, str_count(c(": "n times. For example, str_count(c(", - "n:": "n:", "n_distinct": "n_distinct", "na": "na", "na.rm": "na.rm", @@ -5809,7 +5834,6 @@ "sunh": "sunh", "sunshine hours": "sunshine hours", "swap Parameters": "swap Parameters", - "t": "t", "t quantiles. For example qt(0.05, 5) = -2.015; qt(0.05, 100) = -1.66": "t quantiles. For example qt(0.05, 5) = -2.015; qt(0.05, 100) = -1.66", "table": "table", "tag": "tag", @@ -5872,8 +5896,6 @@ "upper": "upper", "upper (c)": "upper (c)", "uppercase": "uppercase", - "v. ": "v. ", - "v. 1.0.0.0": "v. 1.0.0.0", "v3.0 Daily Rainfall": "v3.0 Daily Rainfall", "v3.0 Dekadal Rainfall": "v3.0 Dekadal Rainfall", "v3.0 Monthly Rainfall": "v3.0 Monthly Rainfall", @@ -5904,7 +5926,6 @@ "wakefield::r_data_theme(n = 100, data_theme = ": "wakefield::r_data_theme(n = 100, data_theme = ", "waller ": "waller ", "ward": "ward", - "wd": "wd", "wday": "wday", "weight:": "weight:", "weighted": "weighted", @@ -5920,21 +5941,7 @@ "wilcoxsign": "wilcoxsign", "winner_country": "winner_country", "winner_name": "winner_name", - "wm": "wm", "word": "word", "wrappednormal": "wrappednormal", - "ws": "ws", - "ww ": "ww ", - "xend :": "xend :", - "xmax :": "xmax :", - "xmin :": "xmin :", - "xxhash32": "xxhash32", - "xxhash64": "xxhash64", - "yday": "yday", - "year": "year", - "yend :": "yend :", - "ymax :": "ymax :", - "ymd": "ymd", - "ymin :": "ymin :", "zoo": "zoo" } \ No newline at end of file diff --git a/instat/translations/es/es_r_instat_not_menus.json b/instat/translations/es/es_r_instat_not_menus.json index 953bf6f5615..8cfde9ed248 100644 --- a/instat/translations/es/es_r_instat_not_menus.json +++ b/instat/translations/es/es_r_instat_not_menus.json @@ -47,22 +47,17 @@ " use ranks to divide into (almost) equal sized groups. For example ntile(c(15,11,13,12,NA,12),2) = (2,1,2,1,NA,1)": " use rangos para dividir en (casi) grupos de igual tamaño. Por ejemplo ntile(c(15,11,13,12,NA,12),2) = (2,1,2,1,NA,1)", " | Showing ": " | Demostración ", "!is.na detects non-missing values, for example !is.na(c(1,3,NA, 5)) gives TRUE, TRUE, FALSE, TRUE": "!is.na detecta valores no faltantes, por ejemplo !is.na(c(1,3,NA, 5)) da VERDADERO, VERDADERO, FALSO, VERDADERO", - "An order, level, count control to be added later": "Un control de orden, nivel y conteo que se agregará más adelante", "# Code generated by the dialog, Script": "# Código generado por el diálogo, Script", - "&Copy": "&Copiar", - "&Open": "&Abrir", - "&Paste": "&Pegar", - "&Save": "&Guardar", "(%in%)is like the match function and returns a logical vector. For example (11:15 %in% c(11,13)) gives TRUE, FALSE, TRUE, FALSE, FALSE": "(%in%) es como la función de coincidencia y devuelve un vector lógico. Por ejemplo (11:15 %in% c(11,13)) da VERDADERO, FALSO, VERDADERO, FALSO, FALSO", - "(Missing)": "(Perdido)", + "(Missing)": "(Faltante)", "(blank)": "(blanco)", "(natural) logarithm. For example log(512) = 6.238; log(512,2) = 9 (log to base 2, i.e. 2 ^ 9 =512)": "logaritmo (natural). Por ejemplo log(512) = 6.238; log(512,2) = 9 (log en base 2, es decir, 2 ^ 9 =512)", "(normal probabilities. For example; pnorm(-1.6449) = 0.05; pnorm(130,100,15) = 0.9772.": "(probabilidades normales. Por ejemplo; pnorm(-1,6449) = 0,05; pnorm(130,100,15) = 0,9772.", "(see also %in%)gives the positions of the matching elements. For example match(11:15, c(11,13)) gives (1,NA, 2, NA, NA). match(11:15,c(11,13),nomatch=0) gives 1, 0, 2, 0, 0)": "(ver también %in%) da las posiciones de los elementos coincidentes. Por ejemplo, match(11:15, c(11,13)) da (1,NA, 2, NA, NA). coincidencia (11:15, c (11,13), no coincidencia = 0) da 1, 0, 2, 0, 0)", - "- to": "- a", ".nc files found to import": "Archivos .nc encontrados para importar", + "0 or 1 times. For example, str_count(c(": "0 o 1 veces. Por ejemplo, str_count(c(", + "0 or more times. For example, str_count(c(": "0 o más veces. Por ejemplo, str_count(c(", "1 or more times. For example, str_count(c(": "1 o más veces. Por ejemplo, str_count(c(", - "1/mu^2": "1/mu^2", "10 variables and 50 observations, sampling with replacement and probability 0.3 of TRUE": "10 variables y 50 observaciones, muestreo con reemplazo y probabilidad 0.3 de VERDADERO", "10 variables from the Wakefield package": "10 variables del paquete Wakefield", "10m u-component of wind": "10m u-componente del viento", @@ -80,13 +75,13 @@ "2m dewpoint temperature": "Temperatura de punto de rocío de 2 m", "2m temperature": "2 m de temperatura", "2nd Factor (Optional):": "2do Factor (Opcional):", - "2pi": "2pi", "3 variables including both random normal and uniform data": "3 variables que incluyen datos aleatorios normales y uniformes", "3. Mean Sea Level Pressure:": "3. Presión Media del Nivel del Mar:", "36 = 2(squared)*3(squared) is powerful because for each divisor, here 2 and 3, its square is also a divisor.": "36 = 2(al cuadrado)*3(al cuadrado) es poderoso porque para cada divisor, aquí 2 y 3, su cuadrado también es un divisor.", "4 Digit": "4 Dígitos", "4 variables, showing use of seq and rep function": "4 variables, que muestran el uso de la función seq y rep", "4. Mean Daily Air Temperature:": "4. Temperatura Media Diaria del Aire:", + "4.85": "4.85", "49 variables, illustrating most of the types of data in the Wakefield package": "49 variables, que ilustran la mayoría de los tipos de datos en el paquete Wakefield", "5. Total Precipitation:": "5. Precipitación Total:", "6. Mean Daily Max Air Temperature:": "6. Temperatura Máxima Diaria Media del Aire:", @@ -250,6 +245,7 @@ "Amount:": "Cantidad:", "An R Command is Running": "Se está ejecutando un comando R", "An order": "Una orden", + "An order, level, count control to be added later": "Un control de orden, nivel y conteo que se agregará más adelante", "An order,level,count control to be added later": "Un control de orden, nivel y conteo que se agregará más adelante", "Analysis": "Análisis", "Anderson-Darling test for normality": "Prueba de normalidad de Anderson-Darling", @@ -370,6 +366,7 @@ "Bar Options": "Opciones de Barra", "Bar and Pie Chart": "Gráfico de Barras y Circular", "Bar plot": "Gráfico de barras", + "Bar, Column, Lollipop, Pie, and Donut Charts, plus Treemaps and Wordclouds": "Gráficos de barras, columnas, piruletas, circulares y de anillos, además de diagramas de árbol y nubes de palabras", "BarChart Options": "Opciones de gráfico de barras", "Barometer Height:": "Altura del Barómetro:", "Bartels Rank Test of Randomness": "Prueba de Aleatoriedad de Rango de Bartels", @@ -423,11 +420,12 @@ "Bottomleft": "Abajo a la izquierda", "Bottomright": "Abajo a la derecha", "Boundary": "Perímetro", - "Box Options": "Opciones de caja", + "Box Options": "Opciones de Caja", "Box Plot": "Diagrama de Caja", "Box plot": "Diagrama de caja", "Boxplot": "Diagrama de caja", - "Boxplot + Jitter": "Diagrama de caja + fluctuación", + "Boxplot (including Tufte), Jitter and Violin Plots": "Boxplot (incluyendo Tufte), Jitter y Violin Plots", + "Boxplot + Jitter": "Diagrama de caja + Fluctuación", "Boxplot Count Variable": "Variable de conteo de diagrama de caja", "Boxplot Method": "Método de diagrama de caja", "Boxplot Options": "Opciones de diagrama de caja", @@ -442,21 +440,21 @@ "Browse File": "Buscar Archivo", "Browse Folder": "Examinar carpeta", "BuGn": "BuGn", - "BuPu": "bupu", + "BuPu": "BuPu", "Buishand": "Compraventa", "Buishand Range Test for Change-Point Detection": "Prueba de rango de mano de obra para la detección de puntos de cambio", "By": "Por", - "By Column": "por columna", + "By Column": "Por columna", "By Factor (Fill):": "Por Factor (Relleno):", "By Factor (Optional):": "Por Factor (Opcional):", "By Factor(s)": "Por Factor(es)", - "By Factors:": "Por factores:", - "By Filter": "Por filtro", - "By Month": "Por mes", - "By Row": "por fila", - "By Value": "Por valor", + "By Factors:": "Por Factores:", + "By Filter": "Por Filtro", + "By Month": "Por Mes", + "By Row": "Por Fila", + "By Value": "Por Valor", "By Variable (Optional):": "Por Variable (Opcional):", - "By Year": "Por año", + "By Year": "Por Año", "By:": "Por:", "ByGroup": "PorGrupo", "C.I band": "banda CI", @@ -474,30 +472,30 @@ "CST": "CST", "CUSUM": "CUSUM", "Calculate Corruption Risk Index (CRI)...": "Calcular el Índice de Riesgo de Corrupción (CRI)...", - "Calculate DIfference Between Options...": "Calcular diferencia entre opciones...", - "Calculate Difference Between Options ": "Calcular diferencia entre opciones ", - "Calculate Difference Between Options...": "Calcular diferencia entre opciones...", - "Calculate Difference Categories": "Calcular categorías de diferencia", - "Calculate Option Differences": "Calcular diferencias de opciones", - "Calculate Proportions": "calcular proporciones", - "Calculate Proportions or Percentages": "Calcular proporciones o porcentajes", - "Calculate Rainfall Value by:": "Calcule el valor de lluvia por:", - "Calculate by Year": "Calcular por año", - "Calculated Columns": "Columnas calculadas", - "Calculated columns": "Columnas calculadas", - "Calculation Name:": "Nombre del cálculo:", + "Calculate DIfference Between Options...": "Calcular Diferencia entre Opciones...", + "Calculate Difference Between Options ": "Calcular Diferencia entre Opciones ", + "Calculate Difference Between Options...": "Calcular Diferencia entre Opciones...", + "Calculate Difference Categories": "Calcular Categorías de Diferencia", + "Calculate Option Differences": "Calcular Diferencias de Opciones", + "Calculate Proportions": "Calcular Proporciones", + "Calculate Proportions or Percentages": "Calcular Proporciones o Porcentajes", + "Calculate Rainfall Value by:": "Calcular Valor de Precipitaciones por:", + "Calculate by Year": "Calcular por Año", + "Calculated Columns": "Columnas Calculadas", + "Calculated columns": "Columnas Calculadas", + "Calculation Name:": "Nombre del Cálculo:", "Calculation...": "Cálculo...", "Calculations": "Cálculos", "Calculations:": "Cálculos:", "Calculator...": "Calculadora...", - "Calm Wind:": "Viento en calma:", + "Calm Wind:": "Viento en Calma:", "Cancel": "Cancelar", "Cannot get package information.": "No se puede obtener la información del paquete.", "Cannot get package information. Check your internet connection.": "No se puede obtener la información del paquete. Comprueba tu conexión a Internet.", "Cannot import this file with the current options. ": "No se puede importar este archivo con las opciones actuales. ", "Cannot show text preview of file:": "No se puede mostrar la vista previa de texto del archivo:", "Canonical Correlations": "Correlaciones Canónicas", - "Canonical Correlations...": "Correlaciones canónicas...", + "Canonical Correlations...": "Correlaciones Canónicas...", "Canonicalmono": "Canonicalmono", "Cantarell": "Cantarell", "Capacity:": "Capacidad:", @@ -505,35 +503,35 @@ "Caption Size:": "Tamaño del subtítulo:", "Caption below the plot (text appearance)": "Leyenda debajo de la trama (aspecto del texto)", "Caption:": "Subtítulo:", - "Caret(^)": "intercalación (^)", + "Caret(^)": "Intercalación (^)", "Carry": "Llevar", - "Carry All Columns": "Llevar todas las columnas", - "Carry Columns": "llevar columnas", - "Carry Columns:": "Llevar columnas:", + "Carry All Columns": "Llevar Todas las Columnas", + "Carry Columns": "Llevar Columnas", + "Carry Columns:": "Llevar Columnas:", "Case": "Caso", - "Case Study Guide": "Guía de estudio de caso", + "Case Study Guide": "Guía de Estudio de Caso", "Case:": "Caso:", "Categorical": "Categórico", "Categorical by Categorical:": "Categórico por Categórico:", "Categorical by Numeric:": "Categórico por Numérico:", "Categorical:": "Categórico:", - "Category Column:": "Columna de categoría:", + "Category Column:": "Columna de Categoría:", "Category:": "Categoría:", "Cauchit": "Cauchit", - "Cauchy": "cauchy", - "Cell": "Célula", - "Cell (%)": "Célula (%)", + "Cauchy": "Cauchy", + "Cell": "Celda", + "Cell (%)": "Celda (%)", "Celsius": "Celsius", "Center": "Centro", "CenterObs": "CenterObs", - "Centimetres": "centímetros", + "Centimetres": "Centímetros", "Centre": "Centro", "Centre Mean on Last Day": "Media central en el último día", "Centred": "Centrado", "CenturySch": "SigloSch", - "Change Format Day Month...": "Cambiar formato Día Mes...", - "Change Limits": "Cambiar límites", - "Change Point Options": "Opciones de cambio de punto", + "Change Format Day Month...": "Cambiar Formato Día Mes...", + "Change Limits": "Cambiar Límites", + "Change Point Options": "Cambiar Opciones de Punto", "Change first letter of each word. For example str_to_title(": "Cambia la primera letra de cada palabra. Por ejemplo str_to_title(", "Change into random order.": "Cambiar en orden aleatorio.", "Change the levels into to alphabetical order.": "Cambie los niveles en orden alfabético.", @@ -542,16 +540,16 @@ "Change type": "Cambiar tipo", "Change...": "Cambio...", "Changes the menu language to English, and from English": "Cambia el idioma del menú a inglés y de inglés", - "Character": "Personaje", - "Character Column:": "Columna de caracteres:", + "Character": "Carácter", + "Character Column:": "Columna de Caracteres:", "Character shingles": "Tejas de caracteres", "Characters": "Caracteres", "Check": "Controlar", - "Check Data": "Comprobar datos", - "Check Duplicates": "Comprobar duplicados", - "Check Station Locations...": "Verifique las ubicaciones de las estaciones...", - "Check Unique": "Comprobar único", - "Check for Updates...": "Buscar actualizaciones...", + "Check Data": "Comprobar Datos", + "Check Duplicates": "Comprobar Duplicados", + "Check Station Locations...": "Verifique las Ubicaciones de las Estaciones...", + "Check Unique": "Comprobar Único", + "Check for Updates...": "Buscar Actualizaciones...", "CheckBox1": "Casilla1", "CheckBox2": "Casilla2", "CheckBox3": "Casilla3", @@ -560,60 +558,60 @@ "Chi-square Test...": "Prueba de chi-cuadrado...", "Chi_Square": "Chi_Cuadrado", "Choice:": "Elección:", - "Choose Columns": "Elija columnas", - "Choose Columns:": "Elija Columnas:", - "Choose File...": "Elija el archivo...", - "Choose Form:": "Elija Formulario:", - "Choose Function": "Elija la función", - "Choose Property": "Elija la propiedad", - "Choose Region": "Elija Región", - "Choose Subset of Columns to Merge": "Elija un subconjunto de columnas para fusionar", - "Choose Summaries...": "Elija resúmenes...", - "Choose different languages": "Elige diferentes idiomas", - "Choose one of the following to proceed": "Elija uno de los siguientes para continuar", + "Choose Columns": "Elegir Columnas", + "Choose Columns:": "Elegir Columnas:", + "Choose File...": "Elegir Archivo...", + "Choose Form:": "Elegir Formulario:", + "Choose Function": "Elegir Función", + "Choose Property": "Elegir Propiedad", + "Choose Region": "Elegir Región", + "Choose Subset of Columns to Merge": "Elegir Subconjunto de Columnas para Combinar", + "Choose Summaries...": "Elegir Resúmenes...", + "Choose different languages": "Elegir diferentes idiomas", + "Choose one of the following to proceed": "Elegir uno de los siguientes para continuar", "Choose...": "Elegir...", - "Chooses a different Random Number Generator. Can usually be ignored.": "Elige un generador de números aleatorios diferente. Por lo general, se puede ignorar.", + "Chooses a different Random Number Generator. Can usually be ignored.": "Elige un Generador de Números Aleatorios Diferentes. Generalmente puede ignorarse.", "Chorolopleth Map": "Mapa de corolopletas", "Cicero": "Cicerón", - "Circle": "Circulo", + "Circle": "Círculo", "Circlize...": "Marcar con un círculo...", "Circular": "Circular", - "Circular Plots": "Parcelas circulares", - "Circular Plots...": "Parcelas Circulares...", + "Circular Plots": "Gráficos Circulares", + "Circular Plots...": "Gráficos Circulares...", "Circular...": "Circular...", "Circular:": "Circular:", "Cividis": "Cividis", "Classic": "Clásico", - "Clean Names": "Limpiar nombres", - "Clear": "Claro", - "Clear All": "Limpiar todo", - "Clear Conditions": "Condiciones claras", - "Clear Output Window...": "Borrar ventana de salida...", - "Clear Script": "Borrar guión", - "Clear Selection": "Selección clara", - "Clear contents": "Contenidos claros", - "Clear the contents of the current tab. (Ctrl+L)": "Limpia el contenido de la pestaña actual. (Ctrl+L)", + "Clean Names": "Limpiar Nombres", + "Clear": "Limpiar", + "Clear All": "Limpiar Todo", + "Clear Conditions": "Limpiar Condiciones", + "Clear Output Window...": "Borrar Ventana de Salida...", + "Clear Script": "Limpiar Guión", + "Clear Selection": "Limpiar Selección", + "Clear contents": "Borrar contenido", + "Clear the contents of the current tab. (Ctrl+L)": "Borrar el contenido de la pestaña actual. (Ctrl+L)", "Clears all data entry.": "Borra toda la entrada de datos.", "CliData": "CLIData", "CliPlot": "ClipPlot", - "Cliboxplot": "Diagrama de clíbox", + "Cliboxplot": "Diagrama de Clíbox", "Cliboxplot...": "Cliboxplot...", - "Click Ok to Confirm the Export": "Haga clic en Aceptar para confirmar la exportación", - "Click Ok to Confirm the Export.": "Haga clic en Aceptar para confirmar la exportación.", + "Click Ok to Confirm the Export": "Haga clic en Aceptar para Confirmar la Exportación", + "Click Ok to Confirm the Export.": "Haga clic en Aceptar para Confirmar la Exportación.", "Click Ok to confirm the save": "Haga clic en Aceptar para confirmar el guardado", "Click Ok to paste data to new columns": "Haga clic en Aceptar para pegar datos en nuevas columnas", "Click Ok to paste data to new data frames.": "Haga clic en Aceptar para pegar datos en nuevos marcos de datos.", "Click to go to a specific window 1-": "Haga clic para ir a una ventana específica 1-", - "Climate Methods": "Métodos climáticos", + "Climate Methods": "Métodos Climáticos", "Climatic": "Climático", "Climatic Boxplot": "Diagrama de caja climático", "Climatic Check Data Rainfall": "Precipitaciones de datos de verificación climática", "Climatic Check Data Temperature": "Temperatura de los datos de verificación climática", - "Climatic Data Entry": "Entrada de datos climáticos", + "Climatic Data Entry": "Entrada de Datos Climáticos", "Climatic Maps": "Mapas Climáticos", "Climatic Menu": "Menú Climático", - "Climatic Summaries...": "Resúmenes climáticos...", - "Climatic Summary": "Resumen climático", + "Climatic Summaries...": "Resúmenes Climáticos...", + "Climatic Summary": "Resumen Climático", "Climatic...": "Climático...", "Climatic_Type": "Climatic_Type", "Climdex Indices": "Índices Climdex", @@ -621,26 +619,26 @@ "Climsoft": "Climsoft", "Cliplot...": "Cliplot...", "Clopper-Pearson": "Clopper Pearson", - "Close": "Cerca", - "Close Data": "Cerrar datos", - "Close Data Book": "Cerrar libro de datos", + "Close": "Cerrar", + "Close Data": "Cerrar Datos", + "Close Data Book": "Cerrar Libro de Datos", "Close R-Instat now": "Cerrar R-Instat ahora", - "Closed On": "Cerrado el", - "Cloud Cover:": "Cubierto de nubes:", - "Cluster Analysis": "Análisis de conglomerados", - "Cluster Analysis...": "Análisis de conglomerados...", + "Closed On": "Cerrado En", + "Cloud Cover:": "Cubierto de Nubes:", + "Cluster Analysis": "Análisis de Grupo", + "Cluster Analysis...": "Análisis de Grupo...", "Cluster:": "Grupo:", - "Clusters:": "Clústeres:", - "Code Missing Values as:": "Codificar valores perdidos como:", + "Clusters:": "Grupos:", + "Code Missing Values as:": "Codificar valores faltantes como:", "Code generated by the dialog": "Código generado por el diálogo", "Code generated by the dialog,": "Código generado por el diálogo,", "Coef:": "Coef:", - "Coeff": "coeficiente", + "Coeff": "Coeficiente", "Coeff:": "Coeficiente:", - "Coefficient Of Variation": "Coeficiente de variación", - "Coefficient Of Variation (W)": "Coeficiente de variación (W)", + "Coefficient Of Variation": "Coeficiente De Variación", + "Coefficient Of Variation (W)": "Coeficiente de Variación (W)", "Coefficient of determination": "Coeficiente de determinación", - "Coefficient of persistence": "coeficiente de persistencia", + "Coefficient of persistence": "Coeficiente de persistencia", "Coefficients": "Coeficientes", "Coin": "Moneda", "Cold Spell Duration Index [15:CSDI]": "Índice de duración de períodos de frío [15:CSDI]", @@ -654,29 +652,29 @@ "Color:": "Color:", "Colour": "Color", "Colour (Optional):": "Color (Opcional):", - "Colour Bar Max:": "Barra de color máx.:", - "Colour Bar Min:": "Mínimo de barra de color:", - "Colour By (Optional):": "Color por (opcional):", - "Colour By:": "Color por:", - "Colour Columns by Structure": "Columnas de color por estructura", + "Colour Bar Max:": "Barra de Color Máx:", + "Colour Bar Min:": "Barra de Color Min:", + "Colour By (Optional):": "Color Por (Opcional):", + "Colour By:": "Color Por:", + "Colour Columns by Structure": "Columnas de Color por Estructura", "Colour Lines by Difference": "Líneas de color por diferencia", - "Colour Palette": "Paleta de colores", - "Colour Palette:": "Paleta de colores:", - "Colour Scale": "Escala de colores", - "Colour by Property": "Color por propiedad", - "Colour by Property...": "Colorea por Propiedad...", - "Colour rainbow": "Arcoiris de colores", + "Colour Palette": "Paleta de Colores", + "Colour Palette:": "Paleta de Colores:", + "Colour Scale": "Escala de Colores", + "Colour by Property": "Color por Propiedad", + "Colour by Property...": "Color por Propiedad...", + "Colour rainbow": "Arcoíris de colores", "Colour:": "Color:", "Colours": "Colores", - "Colours for Summaries": "Colores para resúmenes", + "Colours for Summaries": "Colores para Resúmenes", "Column": "Columna", "Column (%)": "Columna (%)", - "Column (Variable Label):": "Columna (etiqueta de variable):", + "Column (Variable Label):": "Columna (Etiqueta de Variable):", "Column :": "Columna :", "Column Chart Options": "Opciones de gráfico de columnas", - "Column Factor:": "Factor de columna:", - "Column Factors :": "Factores de columna:", - "Column Factors:": "Factores de columna:", + "Column Factor:": "Columna Factor:", + "Column Factors :": "Columna Factores :", + "Column Factors:": "Columna Factores:", "Column Label:": "Etiqueta de columna:", "Column Labels Border": "Borde de etiquetas de columna", "Column Labels Font": "Fuente de etiquetas de columna", @@ -712,43 +710,43 @@ "Column: Factor": "Columna: Factor", "Column: Numeric": "Columna: Numérico", "Column: Text": "Columna: Texto", - "Columns": "columnas", - "Columns ": "columnas ", + "Columns": "Columnas", + "Columns ": "Columnas ", "Columns metadata": "Metadatos de columnas", "Columns to Carry": "Columnas para Llevar", - "Columns to Carry:": "Columnas para llevar:", - "Columns to Combine:": "Columnas para combinar:", - "Columns to Convert:": "Columnas para convertir:", - "Columns to Delete:": "Columnas para eliminar:", - "Columns to Include": "Columnas a incluir", - "Columns to Rank:": "Columnas para clasificar:", - "Columns to Reorder:": "Columnas para reordenar:", + "Columns to Carry:": "Columnas para Llevar:", + "Columns to Combine:": "Columnas para Combinar:", + "Columns to Convert:": "Columnas para Convertir:", + "Columns to Delete:": "Columnas para Eliminar:", + "Columns to Include": "Columnas para Incluir", + "Columns to Rank:": "Columnas para Clasificar:", + "Columns to Reorder:": "Columnas para Reordenar:", "Columns to Sort by:": "Columnas para ordenar por:", - "Columns to Stack:": "Columnas a apilar:", + "Columns to Stack:": "Columnas para Clasificar:", "Columns to Transpose:": "Columnas a Transponer:", - "Columns to Unstack:": "Columnas para desapilar:", - "Columns to be formatted ": "Columnas a formatear ", + "Columns to Unstack:": "Columnas a Despilar:", + "Columns to be formatted ": "Columnas a Formatear ", "Columns:": "Columnas:", "Combine": "Combinar", - "Combine Factors": "Combinar factores", - "Combine Factors...": "Combinar factores...", - "Combine Graphs": "Combinar gráficos", - "Combine Graphs...": "Combinar gráficos...", - "Combine Text Columns": "Combinar columnas de texto", + "Combine Factors": "Combinar Factores", + "Combine Factors...": "Combinar Factores...", + "Combine Graphs": "Combinar Gráficos", + "Combine Graphs...": "Combinar Gráficos...", + "Combine Text Columns": "Combinar Columnas de Texto", "Combine...": "Combinar...", - "Combined Graph": "Gráfico combinado", + "Combined Graph": "Gráfico Combinado", "Combines arguments to form a single vector, e.g. c(1:3 8) is 1, 2, 3, 8.": "Combina argumentos para formar un solo vector, por ejemplo, c(1:3 8) es 1, 2, 3, 8.", - "Combo": "combinado", - "Combo:": "combinación:", + "Combo": "Combinación", + "Combo:": "Combinación:", "Comma": "Coma", "Comma ": "Coma ", - "Comma ,": "coma,", + "Comma ,": "Coma ,", "Comma separated file (*.csv)": "Archivo separado por comas (*.csv)", "Comma(": "Coma(", "Comma(,)": "Coma(,)", "Command": "Dominio", - "Command Examples": "Ejemplos de comandos", - "Command Format:": "Formato de comando:", + "Command Examples": "Ejemplos de Comandos", + "Command Format:": "Formato de Comando:", "Command Ok.": "Comando Ok.", "Command produced an error or no output to display.": "El comando produjo un error o ningún resultado para mostrar.", "Command produced an error.": "El comando produjo un error.", @@ -803,30 +801,30 @@ "Computes the monthly or annual minimum of daily maximum temperature": "Calcula el mínimo mensual o anual de la temperatura máxima diaria", "Computes the monthly or annual minimum of daily minimum temperature": "Calcula el mínimo mensual o anual de la temperatura mínima diaria", "Condition": "Condición", - "Condition Factors (Optional):": "Factores de condición (opcional):", - "Condition for Selection": "Condición para la selección", + "Condition Factors (Optional):": "Factores de Condición (Opcional):", + "Condition for Selection": "Condición para la Selección", "Condition for selection": "Condición para la selección", "Condition:": "Condición:", "Conditional": "Condicional", - "Conditional Eval Options": "Opciones de evaluación condicional", - "Conditional Quantile Options": "Opciones de cuantiles condicionales", - "Conditional Quantile Plot": "Gráfica de cuantiles condicionales", - "Conditional Quantiles...": "Cuantiles condicionales...", + "Conditional Eval Options": "Opciones de Evaluación Condicional", + "Conditional Quantile Options": "Opciones de Cuantiles Condicionales", + "Conditional Quantile Plot": "Gráfica de Cuantiles Condicionales", + "Conditional Quantiles...": "Cuantiles Condicionales...", "Conditions for Start of Rains": "Condiciones para Inicio de Lluvias", "Conf.design": "Conf.diseño", "Conf=0.95": "Conf.=0,95", - "Confidence Interval": "Intervalo de confianza", - "Confidence Interval:": "Intervalo de confianza:", - "Confidence Level:": "Nivel de confianza:", - "Confidence Limit:": "Límite de confianza:", - "Confidence Limits": "Límites de confianza", - "Confidence interval": "Intervalo de confianza", - "Conjugent Gradent (CG)": "Gradiente conjugado (CG)", + "Confidence Interval": "Intervalo de Confianza", + "Confidence Interval:": "Intervalo de Confianza:", + "Confidence Level:": "Nivel de Confianza:", + "Confidence Limit:": "Límite de Confianza:", + "Confidence Limits": "Límites de Confianza", + "Confidence interval": "Intervalo de Confianza", + "Conjugent Gradent (CG)": "Gradiente Conjugado (CG)", "Connect": "Conectar", - "Connect To ClimSoft Database": "Conéctese a la base de datos de ClimSoft", - "Connect to Climsoft Database": "Conéctese a la base de datos de Climasoft", + "Connect To ClimSoft Database": "Conectar a la base de datos ClimSoft", + "Connect to Climsoft Database": "Conectar a la base de datos Climsoft", "Connected": "Conectado", - "Connecting Lines": "Líneas de conexión", + "Connecting Lines": "Líneas de Conexión", "Consecutive": "Consecutivo", "Constant": "Constante", "Construct": "Construir", @@ -839,59 +837,59 @@ "Continuous": "Continuo", "Continuous:": "Continuo:", "Contract Sector:": "Sector de Contrato:", - "Contract Title:": "Título del contrato:", - "Contract Value Categories:": "Categorías de valor del contrato:", - "Contract Value Share Threshold:": "Umbral de participación del valor del contrato:", - "Contract Value:": "Valor del contrato:", + "Contract Title:": "Título del Contrato:", + "Contract Value Categories:": "Categorías de Valor del Contrato:", + "Contract Value Share Threshold:": "Umbral de Participación del Valor del Contrato:", + "Contract Value:": "Valor del Contrato:", "Contrast": "Contraste", - "Contrasts": "contrastes", + "Contrasts": "Contrastes", "Contrasts...": "Contrastes...", - "Control Options": "Opciones de control", - "Control Variables:": "Variables de control:", + "Control Options": "Opciones de Control", + "Control Variables:": "Variables de Control:", "Conversions": "Conversiones", "Conversions...": "Conversiones...", "Convert": "Convertir", "Convert Case": "Convertir Caso", - "Convert Columns": "Convertir columnas", - "Convert Columns...": "Convertir columnas...", - "Convert Strings to Factor Columns": "Convertir cadenas en columnas de factores", + "Convert Columns": "Convertir Columnas", + "Convert Columns...": "Convertir Columnas...", + "Convert Strings to Factor Columns": "Convertir Cadenas en Columnas de Factores", "Convert To": "Convertir a", "Convert To Factor...": "Convertir a Factor...", - "Convert to Character": "Convertir a personaje", + "Convert to Character": "Convertir a Carácter", "Convert to Circular": "Convertir a Circular", - "Convert to Date...": "Convertir a fecha...", + "Convert to Date...": "Convertir a Fecha...", "Convert to Factor": "Convertir a Factor", - "Convert to Logical": "Convertir a lógico", - "Convert to Numeric": "Convertir a numérico", - "Convert to Ordered Factor": "Convertir a factor ordenado", + "Convert to Logical": "Convertir a Lógico", + "Convert to Numeric": "Convertir a Numérico", + "Convert to Ordered Factor": "Convertir a Factor Ordenado", "Convert to Variate": "Convertir a Variar", "Convert to:": "Convertir a:", "Convert...": "Convertir...", - "Cook's Distance": "Distancia del cocinero", + "Cook's Distance": "Distancia de Cook", "Cook's Distance v Leverage": "Distancia de Cook v Apalancamiento", "Coordinates": "Coordenadas", "Copy": "Copiar", - "Copy Data Frame": "Copiar marco de datos", - "Copy Data Frame...": "Copiar marco de datos...", - "Copy Image": "Copiar imagen", - "Copy RichText": "Copiar texto enriquecido", - "Copy Row Names into Column": "Copie los nombres de las filas en la columna", - "Copy Row Numbers or Names into a Colum": "Copie números de fila o nombres en una columna", - "Copy Special": "Copia especial", - "Copy from Below": "Copiar desde abajo", - "Copy the selected text to the clipboard, then delete the text. (Ctrl+X)": "Copie el texto seleccionado al portapapeles, luego elimine el texto. (Ctrl+X)", + "Copy Data Frame": "Copiar Marco de Datos", + "Copy Data Frame...": "Copiar Marco de Datos...", + "Copy Image": "Copiar Imagen", + "Copy RichText": "Copiar Texto Enriquecido", + "Copy Row Names into Column": "Copiar Nombres de Filas en la Columna", + "Copy Row Numbers or Names into a Colum": "Copiar Números de Fila o Nombres en una Columna", + "Copy Special": "Copiar Especial", + "Copy from Below": "Copiar desde Abajo", + "Copy the selected text to the clipboard, then delete the text. (Ctrl+X)": "Copiar el texto seleccionado al portapapeles, luego eliminar el texto. (Ctrl+X)", "Copy the selected text to the clipboard. (Ctrl+C)": "Copia el texto seleccionado al portapapeles. (Ctrl+C)", "Copy to clipboard": "Copiar al portapapeles", "Copy...": "Copiar...", - "Cor": "corazón", + "Cor": "Cor", "Correct": "Correcto", - "Corrected Hue Where Colour Map Begins:": "Tono corregido donde comienza el mapa de colores:", - "Corrected Hue Where Colour Map Ends:": "Tono corregido donde termina el mapa de colores:", + "Corrected Hue Where Colour Map Begins:": "Tono Corregido Donde Comienza el Mapa de Colores:", + "Corrected Hue Where Colour Map Ends:": "Tono Corregido Donde Termina el Mapa de Colores:", "Correlation": "Correlación", "Correlation (plus p value)": "Correlación (más valor p)", - "Correlation Display and Graphics": "Visualización y gráficos de correlación", - "Correlation Matrix": "Matriz de correlación", - "Correlation Plot": "Gráfico de correlación", + "Correlation Display and Graphics": "Visualización y Gráficos de Correlación", + "Correlation Matrix": "Matriz de Correlación", + "Correlation Plot": "Gráfico de Correlación", "Correlations": "Correlaciones", "Correlations (Red Flags or others)...": "Correlaciones (Red Flags u otras)...", "Correlations (W)": "Correlaciones (W)", @@ -904,103 +902,105 @@ "Could not preview data. Cannot be pasted.": "No se pudo obtener una vista previa de los datos. No se puede pegar.", "Could not read time dimension dates from file.": "No se pudieron leer las fechas de dimensión de tiempo del archivo.", "Count": "Contar", - "Count Records Data Frame:": "Marco de datos de registros de recuento:", - "Count Records...": "Contar registros...", - "Count in Factor": "Contar en factor", - "Count in Factor...": "Contar en factor...", + "Count Records Data Frame:": "Marco de Datos de Registros de Recuento:", + "Count Records...": "Contar Registros...", + "Count in Factor": "Contar en Factor", + "Count in Factor...": "Contar en Factor...", "Count words or sentences, rather than characters. For example, str_count(": "Cuente palabras u oraciones, en lugar de caracteres. Por ejemplo, str_count(", - "Counting Process": "Proceso de conteo", + "Counting Process": "Proceso de Conteo", "Countries:": "Países:", - "Country Capitals": "Capitales de países", - "Country Coloured Map": "Mapa de colores del país", + "Country Capitals": "Capitales de Países", + "Country Coloured Map": "Mapa de País Coloreado", "Country ISO2:": "País ISO2:", "Country ISO3:": "País ISO3:", - "Country Level": "Nivel de país", - "Country Level Columns": "Columnas a nivel de país", - "Country Names:": "Nombres de países:", + "Country Level": "Nivel de País", + "Country Level Columns": "Columnas de Nivel de País", + "Country Names:": "Nombres de País:", "Country:": "País:", - "Counts": "cuenta", - "Counts on Y Axis": "Cuenta en el eje Y", + "Counts": "Recuento", + "Counts on Y Axis": "Cuenta en Eje Y", "Counts totals": "Cuenta totales", - "Courier": "mensajero", - "Couriersans": "mensajeros", - "Covariance": "covarianza", + "Courier": "Mensajero", + "Couriersans": "Mensajeros", + "Covariance": "Covarianza", "Covariance (W)": "Covarianza (W)", "Cramer-von Mises test for normality": "Prueba Cramer-von Mises de normalidad", - "Create Climate Object...": "Crear objeto climático...", - "Create Labels": "Crear etiquetas", - "Create Survival Object": "Crear objeto de supervivencia", - "Create an account": "Crea una cuenta", + "Create Climate Object...": "Crear Objeto Climático...", + "Create Labels": "Crear Etiquetas", + "Create Survival Object": "Crear Objeto de Supervivencia", + "Create an account": "Crear una cuenta", "Create subset of non-numeric cases": "Crear subconjunto de casos no numéricos", "Crop": "Cultivo", - "Crop Coefficients...": "Coeficientes de cultivo...", - "Crop Definitions": "Definiciones de cultivos", - "Crop Length Day(s):": "Día(s) de duración del cultivo:", - "Crop Model": "modelo de cultivo", + "Crop Coefficients...": "Coeficientes de Cultivo...", + "Crop Definitions": "Definiciones de Cultivos", + "Crop Length Day(s):": "Día(s) de Duración del Cultivo:", + "Crop Model": "Modelo de Cultivo", "Crops...": "Cultivos...", - "Cummulative Exceedance...": "Superación acumulativa...", + "Cummulative Exceedance...": "Superación Acumulativa...", "Cumulative": "Acumulativo", - "Cumulative Distribution...": "Distribución acumulativa...", - "Cumulative Graph": "Gráfico acumulativo", + "Cumulative Distribution...": "Distribución Acumulativa...", + "Cumulative Graph": "Gráfico Acumulativo", + "Cumulative Graph and Exceedance Graph": "Gráfico acumulativo y gráfico de excedencia", "Cumulative exceedance": "Superación acumulativa", "Cumulative graph": "Gráfico acumulativo", - "Cumulative/Exceedance Graph": "Gráfico acumulativo/de excedencia", - "Cumulative/Exceedance Graph...": "Gráfico acumulativo/de excedencia...", - "Current Name:": "Nombre actual:", - "Current Value:": "Valor actual:", - "Custom": "Disfraz", - "Custom Range": "Rango personalizado", - "Customised": "personalizado", + "Cumulative/Exceedance Graph": "Gráfico Excedencia/Acumulativo", + "Cumulative/Exceedance Graph...": "Gráfico Excedencia/Acumulativo...", + "Current Name:": "Nombre Actual:", + "Current Value:": "Valor Actual:", + "Custom": "Personalizado", + "Custom Range": "Rango Personalizado", + "Customised": "Personalizado", "Cut": "Cortar", "Cutoff for 2000 years:": "Corte para 2000 años:", "DF": "DF", "DF1": "DF1", "DF2": "DF2", "Daily": "Diariamente", - "Daily Data Editing/Entry": "Edición/entrada de datos diarios", - "Daily Data Editing/Entry...": "Edición/entrada de datos diarios...", - "Daily Data Entry": "Entrada de datos diarios", - "Daily Data Entry...": "Entrada de datos diarios...", - "Daily Precipitation 0.05 degree": "Precipitación diaria 0,05 grados", - "Daily Precipitation 0.25 degree": "Precipitación diaria 0,25 grados", - "Dark Theme": "Tema oscuro", - "Dark2": "oscuro2", + "Daily Data Editing...": "Edición de datos diarios...", + "Daily Data Editing/Entry": "Edición/Entrada de Datos Diarios", + "Daily Data Editing/Entry...": "Edición/Entrada de Datos Diarios...", + "Daily Data Entry": "Entrada de Datos Diarios", + "Daily Data Entry...": "Entrada de Datos Diarios...", + "Daily Precipitation 0.05 degree": "Precipitación Diaria 0,05 grados", + "Daily Precipitation 0.25 degree": "Precipitación Diaria 0,25 grados", + "Dark Theme": "Tema Oscuro", + "Dark2": "Oscuro2", "Dash": "Estrellarse", "Dashed": "punteado", "Data": "Datos", "Data (Optional):": "Datos (Opcional):", - "Data Book": "Libro de datos", - "Data Column and Factor Column": "Columna de datos y columna de factores", - "Data Column:": "Columna de datos:", - "Data Columns": "Columnas de datos", - "Data Frame": "Marco de datos", - "Data Frame Label:": "Etiqueta de marco de datos:", - "Data Frame Metadata": "Metadatos del marco de datos", - "Data Frame Metadata...": "Metadatos del marco de datos...", - "Data Frame Name": "Nombre del marco de datos", - "Data Frame Name:": "Nombre del marco de datos:", - "Data Frame Preview:": "Vista previa del marco de datos:", - "Data Frame(s):": "Marco(s) de datos:", - "Data Frame/Matrix": "Matriz/marco de datos", - "Data Frame/Matrix ": "Matriz/marco de datos ", - "Data Frame:": "Marco de datos:", - "Data Frames": "Marcos de datos", - "Data Frames to Reorder:": "Marcos de datos para reordenar:", - "Data Frames:": "Marcos de datos:", - "Data From Row:": "Datos de la fila:", + "Data Book": "Libro de Datos", + "Data Column and Factor Column": "Columna de Datos y Columna de Factores", + "Data Column:": "Columna de Datos:", + "Data Columns": "Columnas de Datos", + "Data Frame": "Marco de Datos", + "Data Frame Label:": "Etiqueta de Marco de Datos:", + "Data Frame Metadata": "Metadatos del Marco de Datos", + "Data Frame Metadata...": "Metadatos del Marco de Datos...", + "Data Frame Name": "Nombre del Marco de Datos", + "Data Frame Name:": "Nombre del Marco de Datos:", + "Data Frame Preview:": "Vista Previa del Marco de Datos:", + "Data Frame(s):": "Marco(s) de Datos:", + "Data Frame/Matrix": "Matriz/Marco de Datos", + "Data Frame/Matrix ": "Matriz/Marco de Datos ", + "Data Frame:": "Marco de Datos:", + "Data Frames": "Marco de Datos", + "Data Frames to Reorder:": "Marcos de datos para Reordenar:", + "Data Frames:": "Marco de Datos:", + "Data From Row:": "Datos de la Fila:", "Data From:": "Datos de:", - "Data Manipulation": "Manipulación de datos", - "Data Object": "Objeto de datos", - "Data Options": "Opciones de datos", - "Data Period": "Período de datos", - "Data Period Label": "Etiqueta de período de datos", - "Data Period label": "Etiqueta de período de datos", - "Data Reshape": "Reforma de datos", + "Data Manipulation": "Manipulación de Datos", + "Data Object": "Objeto de Datos", + "Data Options": "Opciones de Datos", + "Data Period": "Periodo de Datos", + "Data Period Label": "Etiqueta de Periodo de Datos", + "Data Period label": "Etiqueta de Periodo de datos", + "Data Reshape": "Reforma de Datos", "Data To:": "Datos a:", - "Data View": "Vista de datos", - "Data View (Spreadsheet)": "Vista de datos (hoja de cálculo)", + "Data View": "Vista de Datos", + "Data View (Spreadsheet)": "Vista de Datos (hoja de cálculo)", "Data checking facilities not yet implemented": "Facilidades de verificación de datos aún no implementadas", - "Data column": "columna de datos", + "Data column": "Columna de datos", "Data frame": "Marco de datos", "Data frame Metadata": "Marco de datos Metadatos", "Data frame metadata": "Metadatos del marco de datos", @@ -1010,202 +1010,204 @@ "Database Name:": "Nombre de la base de datos:", "Dataframe Name:": "Nombre del marco de datos:", "Dataset Name:": "Nombre del conjunto de datos:", - "Datasets": "conjuntos de datos", + "Datasets": "Conjuntos de datos", "Date": "Fecha", - "Date Format:": "Formato de fecha:", + "Date Format:": "Formato de Fecha:", "Date From:": "Fecha de:", - "Date Order": "Orden de fecha", - "Date Plot": "Gráfico de fecha", - "Date Range": "Rango de fechas", - "Date Scales": "Escalas de fecha", - "Date To:": "Fecha hasta:", - "Date and Time": "Fecha y hora", - "Date labels": "Etiquetas de fecha", + "Date Order": "Orden de Fecha", + "Date Plot": "Gráfico de Fecha", + "Date Range": "Rango de Fecha", + "Date Scales": "Escalas de Fecha", + "Date To:": "Fecha Hasta:", + "Date and Time": "Fecha y Hora", + "Date labels": "Etiquetas de Fecha", "Date modified": "Fecha modificada", "Date:": "Fecha:", - "Dates": "fechas", + "Dates": "Fechas", "Dates/Times": "Fechas/Horas", "Day": "Día", - "Day Columns (31/62)": "Columnas de día (31/62)", + "Day Columns (31/62)": "Columnas de Día (31/62)", "Day Columns (31/62):": "Columnas de día (31/62):", - "Day Length": "Dia largo", - "Day Month": "Día del mes", + "Day Length": "Duración del Día", + "Day Month": "Día del Mes", "Day Month (1 Jan)": "Día Mes (1 de enero)", "Day Month Full (1 January)": "Día Mes Completo (1 de enero)", - "Day Month...": "Día del mes...", + "Day Month...": "Día del Mes...", "Day Number (1-366)": "Número de día (1-366)", - "Day Of Month:": "Dia del mes:", - "Day Range": "Intervalo de días", + "Day Of Month:": "Día del Mes:", + "Day Range": "Intervalo de Días", "Day in": "Día en", "Day in Month": "Día en Mes", - "Day in Year (365)": "Día en el año (365)", - "Day in Year (366)": "Día en el año (366)", - "Day in Year:": "Día en el año:", - "Day of Month:": "Dia del mes:", - "Day of Year": "día del año", - "Day of Year:": "Día del año:", - "Day-Month(Full Name)-Year(4-digit)": "Día-Mes (Nombre completo)-Año (4 dígitos)", + "Day in Year (365)": "Día en el Año (365)", + "Day in Year (366)": "Día en el Año (366)", + "Day in Year:": "Día en el Año:", + "Day of Month:": "Día del Mes:", + "Day of Year": "Día del Año", + "Day of Year:": "Día del Año:", + "Day-Month(Full Name)-Year(4-digit)": "Día-Mes (Nombre Completo)-Año (4 dígitos)", "Day-Month(abbr)-Year(4-digit)": "Día-Mes (abbr)-Año (4 dígitos)", "Day-Month-Year(4-digit)": "Día-Mes-Año (4 dígitos)", - "Day/Month(Full Name)/Year(4-digit)": "Día/Mes (Nombre completo)/Año (4 dígitos)", + "Day/Month(Full Name)/Year(4-digit)": "Día/Mes(Nombre Completo)-Año (4 dígitos)", "Day/Month(abbr)/Year(4-digit)": "Día/Mes (abbr)/Año (4 dígitos)", "Day/Month/Year(4-digit)": "Día/Mes/Año (4 dígitos)", "Day:": "Día:", "Days": "Días", - "Days for Quantiles:": "Días para cuantiles:", + "Days for Quantiles:": "Días para Cuantiles:", "Days in Month": "Días en Mes", "Days:": "Días:", "December": "Diciembre", "Deciles && Quintiles": "Deciles && Quintiles", "Decimal": "Decimal", - "Decimal Places for Percentages:": "Lugares decimales para porcentajes:", - "Decimal Places:": "Lugares decimales:", + "Decimal Places for Percentages:": "Lugares Decimales para Porcentajes:", + "Decimal Places:": "Pocisiones Decimales:", "Decimal:": "Decimal:", "Decimals:": "Decimales:", "Declustering": "Desagrupamiento", "Decorate:": "Decorar:", "Decreasing": "Decreciente", "Default": "Defecto", - "Default Format": "Formato predeterminado", - "Default Value:": "Valor por defecto:", + "Default Format": "Formato Predeterminado", + "Default Value:": "Valor por Defecto:", "Default value for missing values": "Valor predeterminado para valores faltantes", - "Default value for missing values.": "Valor predeterminado para los valores perdidos.", - "Defaults": "valores predeterminados", + "Default value for missing values.": "Valor predeterminado para valores faltantes.", + "Defaults": "Valores predeterminados", "Define": "Definir", - "Define As Factor": "Definir como factor", + "Define As Factor": "Definir Como Factor", "Define CRI": "Definir IRC", - "Define Climatic Data": "Definir datos climáticos", - "Define Climatic Data...": "Definir datos climáticos...", - "Define Contract Value Categories...": "Definir categorías de valor de contrato...", - "Define Contrasts:": "Definir contrastes:", - "Define Corruption Indicators": "Definir indicadores de corrupción", + "Define Climatic Data": "Definir Datos Climáticos", + "Define Climatic Data...": "Definir Datos Climáticos...", + "Define Contract Value Categories...": "Definir Categorías de Valor de Contrato...", + "Define Contrasts:": "Definir Contrastes:", + "Define Corruption Indicators": "Definir Indicadores de Corrupción", "Define Corruption Indicators...": "Definir Indicadores de Corrupción...", - "Define Corruption Outputs": "Definir productos de corrupción", + "Define Corruption Outputs": "Definir Indicadores de Corrupción", "Define Corruption Risk Index (CRI)": "Definir el Índice de Riesgo de Corrupción (CRI)", "Define Corruption Risk Index (CRI)...": "Definir Índice de Riesgo de Corrupción (CRI)...", - "Define Corruption Risk Output Variables...": "Definir las variables de salida del riesgo de corrupción...", - "Define New Column Selection": "Definir nueva selección de columna", - "Define New Filter": "Definir nuevo filtro", - "Define New Property": "Definir nueva propiedad", - "Define New Selection": "Definir nueva selección", - "Define Options By Context Data": "Definir opciones por datos de contexto", - "Define Options by Context Data...": "Definir opciones por datos de contexto...", - "Define Procurement Data": "Definir datos de adquisición", - "Define Procurement Data...": "Definir datos de compras...", - "Define Red Flag Variables...": "Definir variables de bandera roja...", - "Define Red Flags": "Definir banderas rojas", - "Define Survival Data": "Definir datos de supervivencia", - "Define a Contrast:": "Definir un contraste:", + "Define Corruption Risk Output Variables...": "Definir las Variables de Salida del Riesgo de Corrupción...", + "Define New Column Selection": "Definir Nueva Selección de Columna", + "Define New Filter": "Definir Nuevo Filtro", + "Define New Property": "Definir Nueva Propiedad", + "Define New Selection": "Definir Nueva Selección", + "Define Options By Context Data": "Definir Opciones Por Datos de Contexto", + "Define Options by Context Data...": "Definir Opciones por Datos de Contexto...", + "Define Procurement Data": "Definir Datos de Adquisición", + "Define Procurement Data...": "Definir Datos de Compras...", + "Define Red Flag Variables...": "Definir Variables de Bandera Roja...", + "Define Red Flags": "Definir Banderas Rojas", + "Define Survival Data": "Definir Datos de Supervivencia", + "Define a Contrast:": "Definir un Contraste:", "Define a character variable, e.g. as.character(c(3, 5, ": "Defina una variable de carácter, por ejemplo, as.character(c(3, 5, ", "Define...": "Definir...", - "Degree:": "La licenciatura:", + "Degree:": "Grado:", "Degrees": "Grados", "Degrees of freedom:": "Grados de libertad:", "Degrees:": "Grados:", - "Dekad": "Década", + "Dekad": "Período de lluvia de diez días", "Dekad Precipitation 0.05 degree": "Precipitación decádica 0,05 grados", "Del": "Supr", "Delete": "Borrar", - "Delete Cell(s)": "Eliminar celda(s)", - "Delete Column": "Eliminar columna", - "Delete Column(s)": "Eliminar columna(s)", - "Delete Columns": "Eliminar columnas", - "Delete Columns/Rows...": "Eliminar columnas/filas...", - "Delete Colums or Rows": "Eliminar columnas o filas", - "Delete Data Frames": "Eliminar marcos de datos", - "Delete Data Frames...": "Eliminar marcos de datos...", + "Delete Cell(s)": "Eliminar Celda(s)", + "Delete Column": "Eliminar Columna", + "Delete Column(s)": "Eliminar Columna(s)", + "Delete Columns": "Eliminar Columnas", + "Delete Columns or Rows": "Eliminar columnas o filas", + "Delete Columns/Rows...": "Eliminar Columnas/Filas...", + "Delete Colums or Rows": "Eliminar Columnas o Filas", + "Delete Data Frames": "Eliminar Marcos de Datos", + "Delete Data Frames...": "Eliminar Marcos de Datos...", "Delete From:": "Eliminar de:", - "Delete Key": "Eliminar clave", - "Delete Labels": "Eliminar etiquetas", - "Delete Link": "Eliminar enlace", - "Delete Metadata": "Eliminar metadatos", - "Delete Metadata...": "Eliminar metadatos...", - "Delete Objects": "Eliminar objetos", - "Delete Row(s)": "Eliminar fila(s)", + "Delete Key": "Eliminar Clave", + "Delete Labels": "Eliminar Etiquetas", + "Delete Link": "Eliminar Enlace", + "Delete Metadata": "Eliminar Metadatos", + "Delete Metadata...": "Eliminar Metadatos...", + "Delete Objects": "Eliminar Objetos", + "Delete Row(s)": "Eliminar Fila(s)", "Delete Rows/Columns": "Eliminar Filas/Columnas", - "Delete Selected": "Eliminar seleccionado", - "Delete Theme": "Eliminar tema", - "Delete Value Labels": "Eliminar etiquetas de valor", + "Delete Selected": "Eliminar Seleccionado", + "Delete Theme": "Eliminar Tema", + "Delete Value Labels": "Eliminar Etiquetas de Valor", "Delete the current tab.": "Eliminar la pestaña actual.", "Delete...": "Borrar...", "Deletes excess white space For example, str_squish(": "Elimina el exceso de espacio en blanco Por ejemplo, str_squish(", "Deletes white space round a text. For example, str_trim(": "Elimina el espacio en blanco alrededor de un texto. Por ejemplo, str_trim(", "Density": "Densidad", - "Density Options": "Opciones de densidad", - "Density Plot": "Gráfico de densidad", - "Density Plot...": "Gráfica de densidad...", - "Density Ridges": "Crestas de densidad", - "Density Ridges Options": "Opciones de crestas de densidad", - "Density plot": "Gráfico de densidad", + "Density Options": "Opciones de Densidad", + "Density Plot": "Gráfico de Densidad", + "Density Plot...": "Gráfico de Densidad...", + "Density Ridges": "Crestas de Densidad", + "Density Ridges Options": "Opciones de Density Ridges", + "Density plot": "Gráfico de Densidad", "Density/Ridges": "Densidad/Crestas", "DescTools": "DescHerramientas", "Descending": "Descendente", "Descending Frequencies": "Frecuencias Descendentes", "Describe": "Describir", - "Describe Display Options": "Describir las opciones de visualización", - "Describe Survival": "describir la supervivencia", - "Describe Two Variables": "Describir dos variables", + "Describe Display Options": "Describir las Opciones de Visualización", + "Describe Survival": "Describir Supervivencia", + "Describe Two Variables": "Describir Dos Variables", "Description": "Descripción", - "Deselect All": "Deseleccionar todo", - "Deselect All Levels": "Deseleccionar todos los niveles", + "Deselect All": "Deseleccionar Todo", + "Deselect All Levels": "Deseleccionar Todos los Niveles", "Details": "Detalles", "Details Options": "Detalles Opciones", "Detect": "Detectar", - "Detect Options": "Opciones de detección", + "Detect Options": "Opciones de Detección", "Diagonal": "Diagonal", "Dialog:": "Diálogo:", - "Dialog: Add Comment": "Diálogo: Agregar comentario", + "Dialog: Add Comment": "Diálogo: Agregar Comentario", "Dialog: Augment": "Diálogo: Aumentar", - "Dialog: Bar Chart": "Diálogo: Gráfico de barras", - "Dialog: Boxplot Options": "Cuadro de diálogo: Opciones de diagrama de caja", + "Dialog: Bar Chart": "Diálogo: Gráfico de Barras", + "Dialog: Boxplot Options": "Diálogo: Opciones de Diagrama de Caja", "Dialog: Canonical Correlations": "Diálogo: Correlaciones Canónicas", - "Dialog: Circular Plots": "Diálogo: Gráficos circulares", - "Dialog: Climatic Boxplot": "Diálogo: Diagrama de caja climático", - "Dialog: Climatic Check Data Temperature": "Diálogo: temperatura de datos de verificación climática", + "Dialog: Circular Plots": "Diálogo: Gráficos Circulares", + "Dialog: Climatic Boxplot": "Diálogo: Diagrama de Caja Climático", + "Dialog: Climatic Check Data Temperature": "Diálogo: Temperatura de Datos de Verificación Climática", "Dialog: Climatic Summary": "Diálogo: Resumen Climático", "Dialog: Climdex Indices": "Diálogo: Índices Climdex", - "Dialog: Cluster Analysis": "Diálogo: Análisis de conglomerados", - "Dialog: Column Selection": "Diálogo: Selección de columna", + "Dialog: Cluster Analysis": "Diálogo: Análisis de Conglomerados", + "Dialog: Column Selection": "Diálogo: Selección de Columna", "Dialog: Compare Columns": "Diálogo: Comparar Columnas", - "Dialog: Compare Satellite Data": "Diálogo: Comparar datos de satélite", - "Dialog: Compare Two Options": "Diálogo: Comparar dos opciones", - "Dialog: Conditional Quantile Plot": "Diálogo: Gráfica de cuantiles condicionales", + "Dialog: Compare Satellite Data": "Diálogo: Comparar Datos de Satélite", + "Dialog: Compare Two Options": "Diálogo: Comparar Dos Opciones", + "Dialog: Conditional Quantile Plot": "Diálogo: Gráfica de Cuantiles Condicionales", "Dialog: Conversions": "Diálogo: Conversiones", - "Dialog: Convert Columns": "Diálogo: Convertir columnas", + "Dialog: Convert Columns": "Diálogo: Convertir Columnas", "Dialog: Convert to Circular": "Diálogo: Convertir a Circular", - "Dialog: Copy Data Frame": "Diálogo: Copiar marco de datos", + "Dialog: Copy Data Frame": "Diálogo: Copiar Marco de Datos", "Dialog: Correlation": "Diálogo: Correlación", - "Dialog: Create Survival Object": "Diálogo: Crear objeto de supervivencia", - "Dialog: Cumulative/Exceedance Graph": "Diálogo: Gráfico acumulativo/de excedencia", - "Dialog: Daily Data Editing/Entry": "Diálogo: Edición/Entrada de datos diarios", - "Dialog: Delete Colums or Rows": "Cuadro de diálogo: eliminar columnas o filas", - "Dialog: Describe Two Variables": "Diálogo: Describe dos variables", + "Dialog: Create Survival Object": "Diálogo: Crear Objeto de Supervivencia", + "Dialog: Cumulative/Exceedance Graph": "Diálogo: Gráfico Excedencia/Acumulativo", + "Dialog: Daily Data Editing/Entry": "Diálogo: Edición/Entrada de Datos Diarios", + "Dialog: Delete Columns or Rows": "Diálogo: Eliminar columnas o filas", + "Dialog: Delete Colums or Rows": "Diálogo: Eliminar Columnas o Filas", + "Dialog: Describe Two Variables": "Diálogo: Describir Dos Variables", "Dialog: Display Daily Data": "Diálogo: Mostrar datos diarios", "Dialog: Display Top N": "Diálogo: Mostrar arriba N", - "Dialog: Dot Plot": "Diálogo: Diagrama de puntos", - "Dialog: Dummy Variables": "Diálogo: Variables ficticias", - "Dialog: Duplicate Column": "Diálogo: Columna duplicada", - "Dialog: Duplicate Rows": "Diálogo: Filas duplicadas", + "Dialog: Dot Plot": "Diálogo: Diagrama de Puntos", + "Dialog: Dummy Variables": "Diálogo: Variables Ficticias", + "Dialog: Duplicate Column": "Diálogo: Columna Duplicada", + "Dialog: Duplicate Rows": "Diálogo: Filas Duplicadas", "Dialog: End of Rains/Season": "Diálogo: Fin de las Lluvias/Temporada", "Dialog: Evapotranspiration": "Diálogo: Evapotranspiración", "Dialog: Export to CPT": "Diálogo: Exportar a CPT", "Dialog: Extremes ": "Diálogo: Extremos ", "Dialog: Find/Replace": "Diálogo: Buscar/Reemplazar", "Dialog: Frequencies": "Diálogo: Frecuencias", - "Dialog: Frequency/Summary Tables": "Diálogo: Tablas de frecuencia/resumen", + "Dialog: Frequency/Summary Tables": "Diálogo: Tablas de Frecuencia/Resumen", "Dialog: Glance": "Diálogo: Mirada", "Dialog: Heat Map/Choropleth": "Diálogo: Mapa de calor/Coropletas", "Dialog: Hide/Unhide Data Frame(s)": "Diálogo: Ocultar/Mostrar marco(s) de datos", - "Dialog: Histogram Plot": "Diálogo: Gráfico de histograma", + "Dialog: Histogram Plot": "Diálogo: Gráfico de Histograma", "Dialog: Homogenization (Change Point)": "Diálogo: Homogeneización (punto de cambio)", - "Dialog: Import Dataset": "Cuadro de diálogo: Importar conjunto de datos", + "Dialog: Import Dataset": "Diálogo: Importar Conjunto de Datos", "Dialog: Import From IRI (Internet connection needed)": "Diálogo: Importar desde IRI (se necesita conexión a Internet)", "Dialog: Import From Library": "Diálogo: Importar desde biblioteca", "Dialog: Import NetCDF File": "Diálogo: Importar archivo NetCDF", "Dialog: Import from CDS (Climate Data Store)": "Diálogo: Importar desde CDS (Almacén de datos climáticos)", "Dialog: Import from ODK": "Diálogo: Importar desde ODK", "Dialog: Import from RapidPro": "Diálogo: Importar desde RapidPro", - "Dialog: Insert Columns/Rows": "Cuadro de diálogo: Insertar columnas/filas", + "Dialog: Insert Columns/Rows": "Diálogo: Insertar Columnas/Filas", "Dialog: Inventory": "Diálogo: Inventario", "Dialog: Jitter": "Diálogo: fluctuación", "Dialog: Line": "Diálogo: Línea", @@ -1216,13 +1218,13 @@ "Dialog: One Variable Fit Model": "Diálogo: Modelo de ajuste de una variable", "Dialog: One Variable Graph": "Diálogo: Gráfico de una variable", "Dialog: One Variable Summarise": "Diálogo: Resumen de una variable", - "Dialog: Options by Context Boxplot": "Cuadro de diálogo: Diagrama de cuadro de opciones por contexto", - "Dialog: Other Rose Plots": "Diálogo: Otras parcelas de rosas", + "Dialog: Options by Context Boxplot": "Diálogo: Diagrama de cuadro de opciones por contexto", + "Dialog: Other Rose Plots": "Diálogo: Otros Gráficos de Rose", "Dialog: Packages Documenation": "Diálogo: Paquetes Documentación", "Dialog: Polynomials": "Diálogo: Polinomios", "Dialog: Rating Data": "Diálogo: Datos de calificación", "Dialog: Recode Factor": "Diálogo: Factor de recodificación", - "Dialog: Recode Numeric": "Diálogo: Recodificar numérico", + "Dialog: Recode Numeric": "Diálogo: Recodificar Numérico", "Dialog: Regular Sequence": "Diálogo: Secuencia Regular", "Dialog: Rename Columns": "Diálogo: Cambiar el nombre de las columnas", "Dialog: Reorder Levels": "Diálogo: Reordenar niveles", @@ -1231,36 +1233,36 @@ "Dialog: Row Summaries": "Diálogo: Resúmenes de fila", "Dialog: SPI/SPEI": "Diálogo: SPI/SPEI", "Dialog: Scale/Distance": "Diálogo: Escala/Distancia", - "Dialog: Script": "Diálogo: Guión", - "Dialog: Setup For Data Entry": "Cuadro de diálogo: Configuración para la entrada de datos", + "Dialog: Script": "Diálogo: Guion", + "Dialog: Setup For Data Entry": "Diálogo: Configuración para la entrada de datos", "Dialog: Show Model": "Diálogo: Mostrar modelo", "Dialog: Sort": "Diálogo: Ordenar", - "Dialog: Spells": "Diálogo: Hechizos", + "Dialog: Spells": "Diálogo: Eventos", "Dialog: Split Text Column": "Diálogo: Dividir columna de texto", "Dialog: Stack (Pivot Longer)": "Diálogo: Apilar (Pivotar por más tiempo)", "Dialog: Start of Rains": "Diálogo: Comienzo de las lluvias", "Dialog: String Distance": "Diálogo: Distancia de cadena", - "Dialog: Three Variable Frequencies": "Diálogo: tres frecuencias variables", - "Dialog: Tidy": "Diálogo: ordenado", - "Dialog: Tidy Daily Data": "Diálogo: Datos diarios ordenados", + "Dialog: Three Variable Frequencies": "Diálogo: Tres Frecuencias Variables", + "Dialog: Tidy": "Diálogo: Ordenado", + "Dialog: Tidy Daily Data": "Diálogo: Datos Diarios Ordenados", "Dialog: Transform": "Diálogo: Transformar", - "Dialog: Transform Text Column": "Diálogo: Transformar columna de texto", - "Dialog: Treemap": "Diálogo: Diagrama de árbol", + "Dialog: Transform Text Column": "Diálogo: Transformar Columna de Texto", + "Dialog: Treemap": "Diálogo: Diagrama de Árbol", "Dialog: Two Plus Variable Graph": "Diálogo: Gráfico de dos variables más", "Dialog: Two Variable Fit Model": "Diálogo: Modelo de ajuste de dos variables", - "Dialog: Two Way Frequencies": "Diálogo: Frecuencias bidireccionales", + "Dialog: Two Way Frequencies": "Diálogo: Frecuencias Bidireccionales", "Dialog: Unstack (Pivot Wider)": "Diálogo: Desapilar (girar más ancho)", - "Dialog: Use Summaries": "Diálogo: Usar resúmenes", + "Dialog: Use Summaries": "Diálogo: Usar Resúmenes", "Dialog: Use Table": "Diálogo: Usar Tabla", - "Dialog: Variable Sets": "Diálogo: Conjuntos de variables", - "Dialog: Verification Summaries": "Diálogo: Resúmenes de verificación", - "Dialog: View Data": "Diálogo: Ver datos", - "Dialog: View Graph": "Diálogo: Ver gráfico", - "Dialog: View Object": "Diálogo: Ver objeto", - "Dialog: View and Remove Keys": "Cuadro de diálogo: Ver y eliminar claves", - "Dialog: View and Remove Links": "Cuadro de diálogo: Ver y eliminar enlaces", - "Dialog: View/Delete Labels": "Diálogo: Ver/Eliminar etiquetas", - "Dialog: Visualise Data": "Diálogo: Visualizar datos", + "Dialog: Variable Sets": "Diálogo: Conjuntos de Variables", + "Dialog: Verification Summaries": "Diálogo: Resúmenes de Verificación", + "Dialog: View Data": "Diálogo: Ver Datos", + "Dialog: View Graph": "Diálogo: Ver Gráfico", + "Dialog: View Object": "Diálogo: Ver Objeto", + "Dialog: View and Remove Keys": "Diálogo: Ver y Eliminar Claves", + "Dialog: View and Remove Links": "Diálogo: Ver y Eliminar Enlaces", + "Dialog: View/Delete Labels": "Diálogo: Ver/Eliminar Etiquetas", + "Dialog: Visualise Data": "Diálogo: Visualizar Datos", "Did you know: Importing data from many other statistics packages is easy. Go to 'File > Open From File...' and choose your file.": "¿Sabía que? Importar datos de muchos otros paquetes de estadísticas es fácil. Vaya a 'Archivo > Abrir desde archivo...' y elija su archivo.", "Did you know: R-Instat started as a crowd funding campaign in 2015 by partners working across Africa.": "¿Sabía que: R-Instat comenzó como una campaña de financiación colectiva en 2015 por parte de socios que trabajan en África?", "Did you know: R-Instat stores metadata on columns and data frames which you can edit. Go to View > Column Metadata... or Data Frame Metadata... to view and edit metadata.": "¿Sabía que: R-Instat almacena metadatos en columnas y marcos de datos que puede editar? Vaya a Ver > Metadatos de columna... o Metadatos de marco de datos... para ver y editar metadatos.", @@ -1268,69 +1270,69 @@ "Did you know: You can easily view a whole data frame in a separate window.": "¿Sabía que: puede ver fácilmente un marco de datos completo en una ventana separada?", "Dida": "Dida", "Difference": "Diferencia", - "Difference Column:": "Columna de diferencia:", + "Difference Column:": "Columna de Diferencia:", "Difference:": "Diferencia:", - "Differences": "diferencias", + "Differences": "Diferencias", "Digit (0 to 9), For example, str_replace_all(c(": "Dígito (0 a 9), por ejemplo, str_replace_all(c(", - "Digits:": "dígitos:", - "Dimensions to Plot:": "Dimensiones para trazar:", + "Digits:": "Dígitos:", + "Dimensions to Plot:": "Dimensiones para Trazar:", "Direction (N/S E/W):": "Dirección (N/SE/O):", "Direction:": "Dirección:", "Disconnect": "Desconectar", "Discrete": "Discreto", "Discrete:": "Discreto:", - "Discrete_Empirical": "Discreto_Empirico", - "Dispaly Daily Options": "Opciones diarias de visualización", + "Discrete_Empirical": "Discreto_Empírico", + "Dispaly Daily Options": "Opciones Diarias de Visualización", "Display": "Monitor", - "Display As Data Frame": "Mostrar como marco de datos", - "Display As DataFrame": "Mostrar como trama de datos", - "Display Chi-Square Breakpoints": "Mostrar puntos de ruptura de chi-cuadrado", - "Display Column Factors": "Mostrar factores de columna", - "Display DOY of Year...": "Mostrar DOY del año...", - "Display Daily Data": "Mostrar datos diarios", - "Display Daily...": "Mostrar diario...", - "Display Format:": "Desplegar formato:", - "Display From:": "Mostrar desde:", - "Display Graph Results": "Mostrar resultados de gráficos", - "Display HTML in Output Window": "Mostrar HTML en la ventana de salida", - "Display In Output": "Pantalla en salida", - "Display Margins": "Mostrar márgenes", - "Display Missing": "Pantalla faltante", - "Display Model": "Modelo de pantalla", + "Display As Data Frame": "Mostrar Como Marco de Datos", + "Display As DataFrame": "Mostrar como marco de datos", + "Display Chi-Square Breakpoints": "Mostrar Puntos de Ruptura de Chi-cuadrado", + "Display Column Factors": "Mostrar Factores de Columna", + "Display DOY of Year...": "Mostrar DOY del Año...", + "Display Daily Data": "Mostrar Datos Diarios", + "Display Daily...": "Mostrar Diario...", + "Display Format:": "Desplegar Formato:", + "Display From:": "Mostrar Desde:", + "Display Graph Results": "Mostrar Resultados de Gráficos", + "Display HTML in Output Window": "Mostrar HTML en la Ventana de Salida", + "Display In Output": "Mostrar en Salida", + "Display Margins": "Mostrar Márgenes", + "Display Missing": "Pantalla Faltante", + "Display Model": "Modelo de Pantalla", "Display NA as:": "Mostrar NA como:", - "Display Objects...": "Mostrar objetos...", - "Display On Diagonal:": "Mostrar en diagonal:", - "Display Options": "Opciones de pantalla", - "Display Options...": "Opciones de pantalla...", - "Display Outer Margins": "Mostrar márgenes exteriores", - "Display Rain Days": "Mostrar días de lluvia", - "Display Rain Running Total...": "Mostrar total de lluvia en curso...", - "Display Spell Length...": "Mostrar duración del hechizo...", - "Display Summaries As Rows": "Mostrar resúmenes como filas", - "Display Summaries As Rows": "Mostrar resúmenes como filas", - "Display Summary": "Resumen de visualización", + "Display Objects...": "Mostrar Objetos...", + "Display On Diagonal:": "Mostrar En Diagonal:", + "Display Options": "Opciones de Pantalla", + "Display Options...": "Opciones de Pantalla...", + "Display Outer Margins": "Mostrar Márgenes Exteriores", + "Display Rain Days": "Mostrar Días de Lluvia", + "Display Rain Running Total...": "Mostrar Total de Lluvia en Curso...", + "Display Spell Length...": "Mostrar Duración del Evento...", + "Display Summaries As Rows": "Mostrar Resúmenes Como Filas", + "Display Summaries As Rows": "Mostrar Resúmenes Como Filas", + "Display Summary": "Resumen de Visualización", "Display Summary_Variables As Rows": "Mostrar Summary_Variables como filas", "Display Summary_Variables As Rows": "Mostrar Summary_Variables como filas", "Display Top N": "Mostrar parte superior N", - "Display Top N...": "Pantalla superior N...", - "Display Values As": "Mostrar valores como", - "Display Variables As Rows": "Mostrar variables como filas", - "Display Variables As Rows": "Mostrar variables como filas", - "Display as Decimal": "Mostrar como decimal", + "Display Top N...": "Mostrar parte superior N...", + "Display Values As": "Mostrar Valores Como", + "Display Variables As Rows": "Mostrar Variables Como Filas", + "Display Variables As Rows": "Mostrar Variables Como Filas", + "Display as Decimal": "Mostrar como Decimal", "Display as Dotplot": "Mostrar como diagrama de puntos", "Display as decimal": "Mostrar como decimal", "Display details of warnings and errors": "Mostrar detalles de advertencias y errores", "Display dialog's selected data frame in grid": "Mostrar el marco de datos seleccionado del cuadro de diálogo en la cuadrícula", "Display in Interactive Viewer": "Mostrar en visor interactivo", "Display in Output Window": "Mostrar en la ventana de salida", - "Display in R Viewer": "Mostrar en R Viewer", - "Display in R-Viewer": "Mostrar en R-Viewer", - "Display in Separate Window": "Mostrar en ventana separada", - "Display in Separate Windows": "Mostrar en ventanas separadas", - "Display summary": "Mostrar resumen", + "Display in R Viewer": "Mostrar en Visor R", + "Display in R-Viewer": "Mostrar en Visor-R", + "Display in Separate Window": "Mostrar en Ventana Separada", + "Display in Separate Windows": "Mostrar en Ventanas Separadas", + "Display summary": "Mostrar Resumen", "Display the Script Window help information.": "Muestra la información de ayuda de la ventana de secuencias de comandos.", - "Display:": "Monitor:", - "DisplayChi": "DisplayChi", + "Display:": "Mostrar:", + "DisplayChi": "MostrarChi", "Distance": "Distancia", "Distance based on Soundex Encoding": "Distancia basada en la codificación Soundex", "Distance...": "Distancia...", @@ -1339,8 +1341,8 @@ "Distribution Parameters:": "Parámetros de distribución:", "Distribution:": "Distribución:", "Diurnal Range is the difference between Tmax And Tmin, (Tmax - Tmin)": "El rango diurno es la diferencia entre Tmax y Tmin, (Tmax - Tmin)", - "Diurnal Range:": "Rango diurno:", - "Diverging": "divergente", + "Diurnal Range:": "Rango Diurno:", + "Diverging": "Divergente", "Divide": "Dividir", "DoY average": "Promedio del año", "Dodge": "Esquivar", @@ -1353,58 +1355,58 @@ "Donut ": "Rosquilla ", "Dot": "Punto", "Dot ": "Punto ", - "Dot Plot": "Gráfica de puntos", - "Dot Plot Options...": "Opciones de gráfico de puntos...", - "Dot Plot...": "Gráfica de puntos...", - "Dot plot": "Gráfica de puntos", + "Dot Plot": "Gráfico de Puntos", + "Dot Plot Options...": "Opciones de Gráfico de Puntos...", + "Dot Plot...": "Gráfico de Puntos...", + "Dot plot": "Gráfico de puntos", "Dot-dash": "Punto guión", "Dotplot": "Gráfica de puntos", - "Dotplot Options": "Opciones de diagrama de puntos", + "Dotplot Options": "Opciones de gráfica de puntos", "Dotted": "Punteado", - "Double Decker": "De dos pisos", + "Double Decker": "Decker Doble", "Down": "Abajo", "Doy:": "Doy:", "Droid Sans": "Droide Sans", - "Drop": "Gota", + "Drop": "Soltar", "Drop Empty Rows and Columns": "Soltar filas y columnas vacías", - "Drop Missing Combinations": "Elimina las combinaciones que faltan", + "Drop Missing Combinations": "Soltar las combinaciones faltantes", "Drop Missing Values": "Soltar valores faltantes", - "Drop Prefix:": "Soltar prefijo:", + "Drop Prefix:": "Soltar Prefijo:", "Drop Unused Levels": "Soltar niveles no utilizados", - "Drop Variable(s):": "Soltar variable(s):", - "Drop Variables": "Soltar variables", + "Drop Variable(s):": "Soltar Variable(s):", + "Drop Variables": "Soltar Variables", "Drop empty factor levels": "Eliminar niveles de factor vacío", - "Dry Month": "mes seco", - "Dry Period": "Periodo seco", - "Dry Spell": "Período seco", - "Dumbbell": "Pesa", + "Dry Month": "Mes Seco", + "Dry Period": "Periodo Seco", + "Dry Spell": "Periodo seco", + "Dumbbell": "Mancuerna", "Dumbbell options": "Opciones de mancuernas", "Dummy Variables": "Variables ficticias", "Dummy Variables...": "Variables ficticias...", "Duplicate": "Duplicar", - "Duplicate Column": "Columna duplicada", - "Duplicate Column...": "Columna duplicada...", - "Duplicate Rows": "filas duplicadas", - "Duplicate Rows...": "Filas duplicadas...", + "Duplicate Column": "Columna Duplicada", + "Duplicate Column...": "Columna Duplicada...", + "Duplicate Rows": "Filas Duplicadas", + "Duplicate Rows...": "Filas Duplicadas...", "Duplicate dates for station(s) were found": "Se encontraron fechas duplicadas para la(s) estación(es)", "Duplicates": "Duplicados", - "Duplicates Only": "Solo duplicados", + "Duplicates Only": "Solo Duplicados", "Duplicates...": "Duplicados...", - "E": "mi", + "E": "E", "EAT": "COMER", "ECT": "TEC", "EET": "EET", "ERA5 hourly data (single levels)": "Datos horarios de ERA5 (niveles únicos)", - "EST": "est", + "EST": "EST", "Edit": "Editar", - "Edit Cell": "Editar celda", - "Edit Cell...": "Editar celda...", - "Edit Condition": "Editar condición", - "Edit Filter": "Editar filtro", - "Editor Window": "Ventana del editor", - "Eigenvalue": "valor propio", + "Edit Cell": "Editar Celda", + "Edit Cell...": "Editar Celda...", + "Edit Condition": "Editar Condición", + "Edit Filter": "Editar Filtro", + "Editor Window": "Ventana del Editor", + "Eigenvalue": "Valor propio", "Eigenvalues": "Valores propios", - "Eigenvectors": "vectores propios", + "Eigenvectors": "Vectores propios", "Element": "Elemento", "Element Abbreviation": "Abreviatura de elemento", "Element IDs": "ID de elemento", @@ -1414,7 +1416,7 @@ "Element Order": "Orden de elementos", "Element Text ": "Texto del elemento ", "Element Types": "Tipos de elementos", - "Element(s):": "Elementos):", + "Element(s):": "Elemento(s):", "Element1 (Tmax):": "Elemento1 (Tmax):", "Element2 (Tmin):": "Elemento2 (Tmin):", "Element:": "Elemento:", @@ -1432,10 +1434,10 @@ "End Date:": "Fecha final:", "End Day": "Día final", "End Value:": "Valor final:", - "End Year for Climatological Period:": "Año de finalización del período climatológico:", + "End Year for Climatological Period:": "Año de finalización del periodo climatológico:", "End Year for Region Average:": "Año de finalización para el promedio de la región:", "End Year for Station Trend:": "Fin de año para la tendencia de la estación:", - "End Year for Variogram Period:": "Año de finalización del período de variograma:", + "End Year for Variogram Period:": "Año de finalización del periodo de variograma:", "End date:": "Fecha final:", "End of Rain...": "Fin de la lluvia...", "End of Rains": "Fin de las lluvias", @@ -1443,24 +1445,24 @@ "End of Rains/Season": "Fin de Lluvias/Temporada", "End of Season": "Final de temporada", "End of the string. For example, str_count(c(": "Fin de la cadena. Por ejemplo, str_count(c(", - "End(L):": "Fin (L):", + "End(L):": "Fin(L):", "End:": "Final:", "Ends": "Finaliza", - "English": "inglés", + "English": "Inglés", "Ensure complete years": "Asegurar años completos", "Enter": "Ingresar", "Enter Data": "Introducir datos", - "Enter Result Into:": "Ingrese el resultado en:", - "Enter value(s)": "Introduzca valor(es)", - "Enter window number": "Ingrese el número de la ventana", + "Enter Result Into:": "Introducir resultado en:", + "Enter value(s)": "Introducir valor(es)", + "Enter window number": "Introducir número de ventana", "Enter...": "Ingresar...", "Entire Range": "Toda la gama", "Entry Time:": "Hora de entrada:", "Equal To": "Igual a", "Equitable Threat Score": "Puntaje de amenaza equitativa", "Escape (with +*.? etc). For example, str_detect(c(": "Escape (con +*.? etc). Por ejemplo, str_detect(c(", - "Establish Connection..": "Establecer conexión..", - "Establish Connection...": "Establecer conexión...", + "Establish Connection..": "Establecer Conexión..", + "Establish Connection...": "Establecer Conexión...", "Estimate": "Estimar", "Estimate:": "Estimar:", "Estimated:": "Estimado:", @@ -1478,19 +1480,20 @@ "Event:": "Evento:", "Every": "Cada", "Exact": "Exacto", - "Exact Results...": "Resultados exactos...", + "Exact Results...": "Resultados Exactos...", "Examine": "Examinar", "Examine...": "Examinar...", + "Examine/Edit Data": "Examinar/Editar datos", "Example List:": "Lista de ejemplo:", "Examples": "Ejemplos", - "Exceedance": "excedencia", + "Exceedance": "Excedencia", "Excel (1899/12/30)": "Excel (30/12/1899)", "Exclude": "Excluir", - "Exclude Missing": "Excluir faltante", + "Exclude Missing": "Excluir Faltante", "Exclude/Separate:": "Excluir/Separar:", "Exit": "Salida", "Exit Preview and Print": "Salir de Vista previa e Imprimir", - "Exit Time:": "Hora de salida:", + "Exit Time:": "Hora de Salida:", "Expand": "Expandir", "Experiments": "Experimentos", "Explanatory Model for Location or Scale": "Modelo explicativo de ubicación o escala", @@ -1499,21 +1502,21 @@ "Explanatory Variables:": "Variables explicativas:", "Exponential": "Exponencial", "Export": "Exportar", - "Export CPT to Tabular...": "Exportar CPT a tabular...", + "Export CPT to Tabular...": "Exportar CPT a Tabular...", "Export Dataset...": "Exportar conjunto de datos...", "Export Datasets": "Exportar conjuntos de datos", - "Export File(s):": "Exportar archivo(s):", - "Export File:": "Exportar archivo:", + "Export File(s):": "Exportar Archivo(s):", + "Export File:": "Exportar Archivo:", "Export For Climsoft": "Exportar para Climsoft", - "Export Graph As Image": "Exportar gráfico como imagen", - "Export Graph As Image...": "Exportar gráfico como imagen...", - "Export R Objects": "Exportar objetos R", - "Export R Objects...": "Exportar objetos R...", - "Export R Workspace": "Exportar espacio de trabajo R", - "Export R Workspace...": "Exportar espacio de trabajo R...", - "Export Table Object As:": "Exportar objeto de tabla como:", + "Export Graph As Image": "Exportar Gráfico Como Imagen", + "Export Graph As Image...": "Exportar Gráfico Como Imagen...", + "Export R Objects": "Exportar Objetos R", + "Export R Objects...": "Exportar Objetos R...", + "Export R Workspace": "Exportar Espacio de trabajo de R", + "Export R Workspace...": "Exportar Espacio de trabajo de R...", + "Export Table Object As:": "Exportar Objeto de Tabla Como:", "Export To OpenRefine...": "Exportar a OpenRefine...", - "Export To World Weather Record": "Exportar a récord meteorológico mundial", + "Export To World Weather Record": "Exportar a Registros Meteorológicos Mundiales", "Export for PICSA": "Exportar para PICSA", "Export for PICSA...": "Exportar para PICSA...", "Export to CM SAF R Toolbox...": "Exportar a CM SAF R Toolbox...", @@ -1522,120 +1525,120 @@ "Export to CPT...": "Exportar a CPT...", "Export to Climsoft...": "Exportar a Climasoft...", "Export to OpenRefine": "Exportar a OpenRefine", - "Export to World Weather Records...": "Exportar a registros meteorológicos mundiales...", + "Export to World Weather Records...": "Exportar a Registros Meteorológicos Mundiales...", "Export...": "Exportar...", "Expression": "Expresión", "Expression:": "Expresión:", - "Exremal Dependency Index": "Índice de dependencia extrema", + "Exremal Dependency Index": "Índice de Dependencia Extrema", "Extend Fill": "Extender Relleno", "Extended": "Extendido", - "Extra Rows": "filas adicionales", - "Extra Variables": "Variables adicionales", + "Extra Rows": "Filas Adicionales", + "Extra Variables": "Variables Adicionales", "Extract": "Extracto", - "Extract a matching string. For example, str_extract(c(": "Extraiga una cadena coincidente. Por ejemplo, str_extract(c(", - "Extract all matching strings. For example, str_extract_all(c(": "Extraiga todas las cadenas coincidentes. Por ejemplo, str_extract_all(c(", + "Extract a matching string. For example, str_extract(c(": "Extraer una cadena coincidente. Por ejemplo, str_extract(c(", + "Extract all matching strings. For example, str_extract_all(c(": "Extraer todas las cadenas coincidentes. Por ejemplo, str_extract_all(c(", "Extract substring. For example, str_replace(c(": "Extraer subcadena. Por ejemplo, str_replace(c(", "Extract substring. For example,str_sub(": "Extraer subcadena. Por ejemplo, str_sub(", "Extreme": "Extremo", - "Extreme Dependency Score": "Puntaje de dependencia extrema", - "Extreme Events": "Eventos extremos", - "Extreme Events...": "Eventos extremos...", - "Extreme Maximum": "Máximo extremo", - "Extreme Minimum": "mínimo extremo", + "Extreme Dependency Score": "Puntaje de Dependencia Extrema", + "Extreme Events": "Eventos Extremos", + "Extreme Events...": "Eventos Extremos...", + "Extreme Maximum": "Máximo Extremo", + "Extreme Minimum": "Mínimo Extremo", "Extreme_Value": "Valor extremo", - "Extremes": "extremos", + "Extremes": "Extremos", "Extremes ": "extremos ", - "Extremes Display Options": "Opciones de visualización de extremos", - "Extremes Method": "Método de los extremos", + "Extremes Display Options": "Opciones de Visualización de Extremos", + "Extremes Method": "Método de los Extremos", "Extremes...": "Extremos...", "F": "F", - "F probabilities. For example pf(2,1,10) = 0.8123; pf(2,50,50) = 0.9921": "probabilidades F. Por ejemplo pf(2,1,10) = 0,8123; pf(2,50,50) = 0,9921", + "F probabilities. For example pf(2,1,10) = 0.8123; pf(2,50,50) = 0.9921": "Probabilidades F. Por ejemplo pf(2,1,10) = 0,8123; pf(2,50,50) = 0,9921", "F quantiles. For example qf(0.95,1,10) = 4.965; qf(0.95, 50,50)= 1.599": "F cuantiles. Por ejemplo qf(0.95,1,10) = 4.965; qf(0.95, 50,50)= 1.599", "F1": "F1", "FALSE": "FALSO", "FAQ": "Preguntas más frecuentes", - "FIt Model": "Modelo de ajuste", - "Face": "Cara", + "FIt Model": "Modelo de Ajuste", + "Face": "Face", "Facet": "Faceta", - "Facet (Optional):": "Faceta (opcional):", - "Facet 2 (Optional):": "Faceta 2 (opcional):", - "Facet By (Optional):": "Faceta por (opcional):", - "Facet By (Station):": "Faceta por (estación):", - "Facet By:": "Faceta por:", - "Facet Column(s):": "Columna(s) de facetas:", - "Facet Label Background ": "Fondo de etiqueta de faceta ", - "Facet Labels": "Etiquetas de facetas", - "Facet by Column Factor": "Factor de faceta por columna", + "Facet (Optional):": "Faceta (Opcional):", + "Facet 2 (Optional):": "Faceta 2 (Opcional):", + "Facet By (Optional):": "Faceta Por (Opcional):", + "Facet By (Station):": "Faceta Por (Estación):", + "Facet By:": "Faceta Por:", + "Facet Column(s):": "Columna(s) de Facetas:", + "Facet Label Background ": "Fondo de Etiqueta de Faceta ", + "Facet Labels": "Etiquetas de Facetas", + "Facet by Column Factor": "Faceta por Factor de Columna", "Facet labels": "Etiquetas de facetas", "Facet labels along horizontal direction": "Etiquetas de faceta a lo largo de la dirección horizontal", "Facet labels along vertical direction": "Etiquetas de faceta a lo largo de la dirección vertical", - "Facet2 (Optional):": "Faceta2 (opcional):", + "Facet2 (Optional):": "Faceta2 (Opcional):", "Facet:": "Faceta:", - "Facets": "facetas", + "Facets": "Facetas", "Facets:": "Facetas:", "Factor": "Factor", "Factor (Optional) :": "Factor (Opcional) :", "Factor (Optional):": "Factor (Opcional):", - "Factor Data Frame": "Marco de datos de factores", - "Factor Data Frame...": "Cuadro de datos de factores...", + "Factor Data Frame": "Marco de Datos de Factores", + "Factor Data Frame...": "Cuadro de Datos de Factores...", "Factor Into:": "Factorizar en:", - "Factor Level": "Nivel de factor", - "Factor Levels:": "Niveles de factores:", - "Factor Options": "Opciones de factores", + "Factor Level": "Nivel de Factor", + "Factor Levels:": "Niveles de Factores:", + "Factor Options": "Opciones de Factores", "Factor Selected:": "Factor Seleccionado:", "Factor Values for Selection": "Valores de los factores para la selección", - "Factor Variable": "Variable de factor", - "Factor Variable:": "Factor variable:", - "Factor to Unstack by:": "Factor para desapilar por:", + "Factor Variable": "Variable de Factor", + "Factor Variable:": "Factor Variable:", + "Factor to Unstack by:": "Factor para Desapilar por:", "Factor(s):": "Factor(es):", "Factor:": "Factor:", - "Factors": "factores", - "Factors :": "factores :", - "Factors Selected:": "Factores seleccionados:", - "Factors as Percentage:": "Factores como porcentaje:", + "Factors": "Factores", + "Factors :": "Factores :", + "Factors Selected:": "Factores Seleccionados:", + "Factors as Percentage:": "Factores como Porcentaje:", "Factors:": "Factores:", - "Factory Reset": "Restablecimiento de fábrica", + "Factory Reset": "Restablecimiento de Fábrica", "Fahrenheit": "Fahrenheit", - "False": "FALSO", - "False Alarm Ratio": "Proporción de falsas alarmas", + "False": "Falso", + "False Alarm Ratio": "Proporción de Falsas Alarmas", "Family": "Familia", "Family:": "Familia:", "February": "Febrero", "Feet per second (ftps)": "Pies por segundo (ftps)", "File": "Archivo", "File with the same name will be overwritten.": "Se sobrescribirá el archivo con el mismo nombre.", - "File:": "Expediente:", + "File:": "Archivo:", "Files with the same names will be overwritten.": "Los archivos con los mismos nombres se sobrescribirán.", "Fill": "Llenar", "Fill (Optional):": "Relleno (Opcional):", "Fill Color": "Color de relleno", - "Fill Colour (Optional):": "Color de relleno (opcional):", + "Fill Colour (Optional):": "Color de relleno (Opcional):", "Fill Colour:": "Color de relleno:", - "Fill Date Gaps": "Rellenar espacios en blanco", - "Fill Date Gaps...": "Rellenar espacios en blanco...", - "Fill Missing Values...": "Completar valores faltantes...", - "Fill Missing Values:": "Rellene los valores que faltan:", + "Fill Date Gaps": "Rellenar Espacios en Blanco", + "Fill Date Gaps...": "Rellenar Espacios en Blanco...", + "Fill Missing Values...": "Completar Valores Faltantes...", + "Fill Missing Values:": "Completar Valores Faltantes:", "Fill Scale": "Escala de relleno", "Fill date gaps": "Rellenar espacios en blanco", "Fill in reverse": "Rellenar al revés", "Fill/Colour:": "Relleno/Color:", - "Fill:": "Llenar:", + "Fill:": "Rellenar:", "Filter": "Filtrar", - "Filter By:": "Filtrado por:", - "Filter From Factors": "Filtrar por factores", - "Filter Rows...": "Filtrar filas...", + "Filter By:": "Filtrar Por:", + "Filter From Factors": "Filtrar Por Factores", + "Filter Rows...": "Filtrar Filas...", "Filter by Country (or other)...": "Filtrar por País (u otro)...", "Filter...": "Filtrar...", "Filter:": "Filtrar:", - "Filters": "filtros", - "Filters From Factor": "Filtros de factor", + "Filters": "Filtros", + "Filters From Factor": "Filtros de Factor", "Finally": "Finalmente", "Find": "Encontrar", - "Find Forms": "Buscar formularios", + "Find Forms": "Buscar Formularios", "Find In Variable Or Filter": "Buscar en variable o filtro", - "Find Next": "Buscar siguiente", + "Find Next": "Buscar Siguiente", "Find Non-Numeric Values": "Buscar valores no numéricos", - "Find Options": "Buscar opciones", + "Find Options": "Buscar Opciones", "Find all": "Encuentra todos", "Find next": "Buscar siguiente", "Find what": "Encontrar que", @@ -1643,221 +1646,223 @@ "Find/Replace": "Buscar/Reemplazar", "Find/Replace...": "Buscar/Reemplazar...", "Finish": "Finalizar", - "Fira Sans": "fira sans", + "Fira Sans": "Fira Sans", "First": "Primero", - "First Column:": "Primera columna:", + "First Column:": "Primera Columna:", "First Context:": "Primer Contexto:", "First Data Frame": "Primer marco de datos", "First Data Frame:": "Primer marco de datos:", - "First Explanatory Variable": "Primera variable explicativa", - "First Explanatory Variable:": "Primera variable explicativa:", - "First Factor:": "primer factor:", - "First Line is Column Headers:": "La primera línea son encabezados de columna:", - "First Occurence": "Primera ocurrencia", - "First Row is Column Headers": "La primera fila son encabezados de columna", - "First Variable(s):": "Primera(s) variable(s):", - "First Variable:": "Primera variable:", + "First Explanatory Variable": "Primera Variable Explicativa", + "First Explanatory Variable:": "Primera Variable Explicativa:", + "First Factor:": "Primer Factor:", + "First Line is Column Headers:": "La primera línea es Encabezados de Columna:", + "First Occurence": "Primera Ocurrencia", + "First Row is Column Headers": "La primera línea es Encabezados de Columna", + "First Variable(s):": "Primera(s) Variable(s):", + "First Variable:": "Primera Variable:", "First Variables:": "Primeras Variables:", - "First Word:": "Primera palabra:", + "First Word:": "Primera Palabra:", "First row is header": "La primera fila es el encabezado", - "Fiscal Year:": "Año fiscal:", + "Fiscal Year:": "Año Fiscal:", "Fit": "Adaptar", - "Fit Method": "Método de ajuste", - "Fit Model": "Modelo de ajuste", + "Fit Method": "Método de Ajuste", + "Fit Model": "Modelo de Ajuste", "Fit Model Keyboard...": "Se ajusta al modelo de teclado...", "Fit Model Keyboards...": "Compatible con teclados modelo...", "Fit Model and Bootstrap Options": "Ajustar modelo y opciones de Bootstrap", - "Fit Model...": "Modelo de ajuste...", - "Fit Multiple": "Ajuste múltiple", - "Fit Single": "Ajuste individual", - "Fit a Gamma Distribution": "Ajustar una distribución gamma", - "Fit an Extreme Distribution": "Ajuste una distribución extrema", - "Fitted Model": "Modelo ajustado", - "Fitted Model:": "Modelo ajustado:", - "Fitted Values": "Valores ajustados", - "Fitting Method": "Método de montaje", - "Fitting Options": "Opciones de montaje", + "Fit Model...": "Modelo de Ajuste...", + "Fit Multiple": "Ajustar Múltiple", + "Fit Single": "Ajustar individual", + "Fit a Gamma Distribution": "Ajustar una Distribución Gamma", + "Fit an Extreme Distribution": "Ajustar una Distribución Gamma", + "Fitted Model": "Modelo Ajustado", + "Fitted Model:": "Modelo Ajustado:", + "Fitted Values": "Valores Ajustados", + "Fitting Method": "Método de Ajuste", + "Fitting Options": "Opciones de Ajuste", "Fixed": "Fijado", - "Fixed Day": "día fijo", - "Fixed Number of Columns": "Número fijo de columnas", - "Fixed Number of Components": "Número fijo de componentes", - "Fixed Number of Rows": "Número fijo de filas", - "Fixed width": "Ancho fijo", - "Flag Variables:": "Variables de bandera:", - "Flat Frequency Table": "Tabla de frecuencia plana", + "Fixed Day": "Día Fijo", + "Fixed Number of Columns": "Número Fijo de Columnas", + "Fixed Number of Components": "Número Fijo de Componentes", + "Fixed Number of Rows": "Número Fijo de Filas", + "Fixed width": "Ancho Fijo", + "Flag Variables:": "Variables de Bandera:", + "Flat Frequency Table": "Tabla de Frecuencia Plana", "Flatten": "Aplanar", "Flip": "Voltear", - "Flip Coordinates": "Voltear coordenadas", + "Flip Coordinates": "Voltear Coordenadas", "Flip coordinates": "Voltear coordenadas", - "Fliter Preview:": "Vista previa del filtro:", - "Flow Data": "Datos de flujo", - "Font Color": "Color de fuente", - "Font Color:": "Color de fuente:", - "Font Names": "Nombres de fuente", - "Font Size": "Tamaño de fuente", - "Font Size:": "Tamaño de fuente:", - "Font Style": "Estilo de fuente", - "Font Weight": "Peso de fuente", - "Font Weight:": "Peso de la fuente:", - "Font Weights": "Pesos de fuente", + "Fliter Preview:": "Vista Previa del Filtro:", + "Flow Data": "Datos de Flujo", + "Font Color": "Color de Fuente", + "Font Color:": "Color de Fuente:", + "Font Names": "Nombres de Fuente", + "Font Size": "Tamaño de Fuente", + "Font Size:": "Tamaño de Fuente:", + "Font Style": "Estilo de Fuente", + "Font Weight": "Peso de Fuente", + "Font Weight:": "Peso de Fuente:", + "Font Weights": "Pesos de Fuente", "Font:": "Fuente:", "Footnote Border": "Borde de nota al pie", - "Footnote:": "Nota:", - "Footnotes": "notas al pie", - "Footnotes Marks": "Notas al pie Marcas", - "Footnotes Multiline": "Notas al pie multilínea", + "Footnote:": "Nota al pie:", + "Footnotes": "Notas al pie", + "Footnotes Marks": "Marcas de notas al pie", + "Footnotes Multiline": "Multilínea de notas al pie", "Footnotes Separator": "Separador de notas al pie", "For All Dialogs": "Para todos los diálogos", "For This Dialog Only": "Solo para este cuadro de diálogo", "For a value of 4, splits the data so 4 groups are produced of (roughly) equal size.": "Para un valor de 4, divide los datos para que se produzcan 4 grupos de (aproximadamente) el mismo tamaño.", "For scientific notation, e.g. 1.5E-1 = 0.15.": "Para notación científica, por ejemplo, 1.5E-1 = 0.15.", "Force positive": "Fuerza positiva", - "Foreign Winner:": "Ganador extranjero:", + "Foreign Winner:": "Ganador Extranjero:", "Format Current or Selected Columns": "Dar formato a las columnas actuales o seleccionadas", - "Format Data": "Formatear datos", - "Format Description": "Descripción del formato", + "Format Data": "Formatear Datos", + "Format Description": "Descripción del Formato", "Format Field": "Campo de formato", "Format Font:": "Formato de fuente:", "Format Options": "Opciones de formato", "Format Summary Table": "Formato de tabla de resumen", "Format Table...": "Formato de tabla...", - "Format and combine strings with glue. For example, (with survey data) str_glue(": "Formatee y combine cadenas con pegamento. Por ejemplo, (con datos de encuestas) str_glue(", + "Format and combine strings with glue. For example, (with survey data) str_glue(": "Formatear y combinar cadenas con pegamento. Por ejemplo, (con datos de encuestas) str_glue(", "Format:": "Formato:", "Formula": "Fórmula", "Four Variable Modelling": "Modelado de cuatro variables", - "Four Variables...": "cuatro variables...", - "Four variables including monthly dates. Or use Prepare > Column: Date > Generate Dates to include a date variable.": "Cuatro variables que incluyen fechas mensuales. O utilice Preparar > Columna: Fecha > Generar fechas para incluir una variable de fecha.", + "Four Variables...": "Cuatro Variables...", + "Four variables including monthly dates. Or use Prepare > Column: Date > Generate Dates to include a date variable.": "Cuatro variables que incluyen fechas mensuales. O utilice Preparar > Columna: Fecha > Generar Fechas para incluir una variable de fecha.", "Fourth Context:": "Cuarto Contexto:", - "Fraction Trimmed:": "Fracción recortada:", - "Fractions": "fracciones", + "Fraction Trimmed:": "Fracción Recortada:", + "Fractions": "Fracciones", "Free": "Libre", "Free Scale Axis for Facets": "Eje de escala libre para facetas", "Free Scale Y Axis": "Eje Y de escala libre", - "Free Scales X": "Balanzas libres X", - "Free Scales Y": "Escalas libres Y", - "Free Space": "Espacio libre", + "Free Scales X": "Escalas Libres X", + "Free Scales Y": "Escalas Libres Y", + "Free Space": "Espacio Libre", "Free_x": "Libre_x", - "Free_y": "Gratis_y", - "Freeze Columns": "Congelar columnas", - "Freeze Columns...": "Congelar columnas...", - "Freeze Columns:": "Congelar columnas:", + "Free_y": "Libre_y", + "Freeze Columns": "Congelar Columnas", + "Freeze Columns...": "Congelar Columnas...", + "Freeze Columns:": "Congelar Columnas:", "Freeze to Here": "Congelar hasta aquí", "French": "Francés", - "Frequencies": "frecuencias", - "Frequencies Options": "Opciones de frecuencias", + "Frequencies": "Frecuencias", + "Frequencies Options": "Opciones de Frecuencias", "Frequencies...": "Frecuencias...", "Frequencies:": "Frecuencias:", "Frequency": "Frecuencia", - "Frequency Polygon": "Polígono de frecuencia", - "Frequency Polygon Options": "Opciones de polígono de frecuencia", - "Frequency Table & Graph Options": "Tabla de frecuencias y opciones de gráficos", - "Frequency Tables": "Tablas de frecuencia", + "Frequency Polygon": "Polígono de Frecuencia", + "Frequency Polygon Options": "Opciones de Polígono de Frecuencia", + "Frequency Table & Graph Options": "Tabla de Frecuencias y Opciones de Gráficos", + "Frequency Tables": "Tablas de Frecuencia", "Frequency Tables...": "Tablas de Frecuencia...", "Frequency polygon": "Polígono de frecuencia", "Frequency tables": "Tablas de frecuencia", - "Frequency/Summary Tables": "Tablas de frecuencia/resumen", - "From": "De", + "Frequency tables and Summary tables": "Tablas de frecuencia y tablas de resumen", + "Frequency/Summary Tables": "Tablas de Frecuencia/Resumen", + "From": "Desde", "From Data Frame:": "Desde el marco de datos:", - "From Library": "De la biblioteca", - "From Package:": "Del paquete:", - "From:": "De:", - "Frost Days [1:FD]": "Días de heladas [1:FD]", + "From Library": "Desde Biblioteca", + "From Package:": "Desde Paquete:", + "From:": "Desde:", + "Frost Days [1:FD]": "Días de Heladas [1:FD]", "Full Damerau-Levenshtein Distance": "Distancia completa de Damerau-Levenshtein", - "Full Join": "Unión completa", - "Full Name": "Nombre completo", - "Function Name:": "Nombre de la función:", + "Full Join": "Unión Completa", + "Full Name": "Nombre Completo", + "Function Name:": "Nombre de la Función:", "Function...": "Función...", "Function:": "Función:", "GDD:": "GDD:", "GEV": "GEV", "GMT": "GMT", - "GP": "médico de cabecera", + "GP": "Médico de Cabecera", "Gamma": "Gama", - "Gamma_With_Shape_and_Mean": "Gamma_con_forma_y_media", - "Gamma_With_Shape_and_Rate": "Gamma_con_forma_y_velocidad", - "Gamma_With_Shape_and_Scale": "Gamma_con_forma_y_escala", - "Gamma_With_Zeros": "gamma_con_ceros", - "Gaussian": "gaussiano", + "Gamma_With_Shape_and_Mean": "Gamma_Con_Forma_y_Media", + "Gamma_With_Shape_and_Rate": "Gamma_Con_Forma_y_Velocidad", + "Gamma_With_Shape_and_Scale": "Gamma_Con_Forma_y_Escala", + "Gamma_With_Zeros": "Gamma_Con_Ceros", + "Gaussian": "Gaussiano", "General": "General", - "General ANOVA": "ANOVA generales", - "General ANOVA Options...": "Opciones generales de ANOVA...", - "General Case": "Caso general", - "General Fit Model...": "Modelo de ajuste general...", - "General Graph...": "Gráfica general...", - "General Maximum Likelihood Estimator(GMLE)": "Estimador general de máxima verosimilitud (GMLE)", - "General Summaries": "Resúmenes generales", - "General Summaries...": "Resúmenes generales...", + "General ANOVA": "ANOVA General", + "General ANOVA Options...": "Opciones Generales de ANOVA...", + "General Case": "Caso General", + "General Fit Model...": "Modelo de Ajuste General...", + "General Graph...": "Gráfica General...", + "General Maximum Likelihood Estimator(GMLE)": "Estimador General Máximo de Probabilidad (GMLE)", + "General Summaries": "Resúmenes Generales", + "General Summaries...": "Resúmenes Generales...", "General...": "General...", - "Generalized Linear Models": "Modelos lineales generalizados", - "Generate Dates...": "Generar fechas...", - "Generate Random Sample": "Generar muestra aleatoria", - "Geom": "geom", - "Geom :": "Geoma:", + "Generalized Linear Models": "Modelos Lineales Generalizados", + "Generate Dates...": "Generar Fechas...", + "Generate Random Sample": "Generar Muestra Aleatoria", + "Geom": "Geom", + "Geom :": "Geom :", "Geom Aesthetics:": "Estética Geom:", - "Geom:": "Geoma:", + "Geom:": "Geom:", "Geometric": "Geométrico", "Geometry": "Geometría", "Geometry:": "Geometría:", "Gerrity Score": "Puntuación de Gerrity", - "Get Data": "Obtener datos", + "Get Data": "Obtener Datos", "Get Data Frame:": "Obtener marco de datos:", - "Get Package:": "Obtener paquete:", + "Get Package:": "Obtener Paquete:", "Getting Started": "Empezando", "Give numeric order. For exampled, str_order(c(": "Dar orden numérico. Por ejemplo, str_order(c(", "Gives 300, 450, 600 then repeated for the data frame.": "Da 300, 450, 600 y luego se repite para el marco de datos.", "Gives Apr, Apr, May, Jun, Jun, Jul, NA, NA, NA.": "Da abril, abril, mayo, junio, junio, julio, NA, NA, NA.", "Gives D, D, D, D, C, C, C, B, A as a factor.": "Da D, D, D, D, C, C, C, B, A como factor.", "Glance": "Vistazo", - "Glance...": "Mirada...", - "Globalminmax": "globalminmax", + "Glance...": "Vistazo...", + "Globalminmax": "Globalminmax", "Glossary": "Glosario", - "Gmp": "gmp", + "Gmp": "Gmp", "GnBu": "GnBu", - "Goodness of Fit (MGE)": "Bondad de ajuste (MGE)", - "Goodness of Fit...": "Bondad de ajuste...", - "Graph": "Grafico", - "Graph Caption": "Leyenda del gráfico", - "Graph Caption:": "Leyenda del gráfico:", - "Graph Columns:": "Columnas del gráfico:", - "Graph Display": "Visualización de gráficos", - "Graph Frequencies": "Frecuencias gráficas", - "Graph Name:": "Nombre del gráfico:", - "Graph Options": "Opciones de gráfico", - "Graph Sub Title": "Subtítulo del gráfico", - "Graph Sub Title:": "Subtítulo del gráfico:", - "Graph Subtitle:": "Subtítulo del gráfico:", - "Graph Title": "Título del gráfico", - "Graph Title:": "Título del gráfico:", - "Graph and Display Options": "Opciones de gráfico y visualización", - "Graph by Year": "Gráfico por año", - "Graph to Use:": "Gráfico a usar:", - "Graph to View:": "Gráfico para ver:", + "Goodness of Fit (MGE)": "Bondad de Ajuste (MGE)", + "Goodness of Fit...": "Bondad de Ajuste...", + "Graph": "Gráfico", + "Graph Caption": "Leyenda de Gráfico", + "Graph Caption:": "Leyenda de Gráfico:", + "Graph Columns:": "Columnas de Gráfico:", + "Graph Display": "Visualización de Gráfico", + "Graph Frequencies": "Frecuencias de Gráfico", + "Graph Name:": "Nombre de Gráfico:", + "Graph Options": "Opciones de Gráfico", + "Graph Sub Title": "Subtítulo de Gráfico", + "Graph Sub Title:": "Subtítulo de Gráfico:", + "Graph Subtitle:": "Subtítulo de Gráfico:", + "Graph Title": "Título de Gráfico", + "Graph Title:": "Título de Gráfico:", + "Graph and Display Options": "Opciones de Gráfico y Visualización", + "Graph by Year": "Gráfico por Año", + "Graph to Use:": "Gráfico a Usar:", + "Graph to View:": "Gráfico para Ver:", "Graph...": "Grafico...", "Graph:": "Grafico:", "Graphics": "Gráficos", - "Graphics Options": "Opciones gráficas", + "Graphics Options": "Opciones Gráficas", "Graphics...": "Gráficos...", - "Graphs": "gráficos", + "Graphs": "Gráficos", "Graphs GUI": "Interfaz gráfica de usuario de gráficos", - "Graphs To Combine:": "Gráficos para combinar:", - "Greater Than": "Mas grande que", - "Greater than": "Mas grande que", + "Graphs To Combine:": "Gráficos Para Combinar:", + "Greater Than": "Más grande que", + "Greater than": "Mayor que", "Green": "Verde", - "Greens": "Verduras", + "Greens": "Verdes", "Grey": "Gris", - "Greys": "grises", - "Grid lines": "Líneas de cuadrícula", + "Greys": "Grises", + "Grid Lines": "Líneas de cuadrícula", + "Grid lines": "Líneas de Cuadrícula", "Grid square": "Cuadrícula", - "Grop Height": "Altura de corte", - "Grop Width": "Ancho de corte", + "Grop Height": "Altura de Corte", + "Grop Width": "Ancho Superior", "Group (Optional):": "Grupo (Opcional):", - "Group Data": "Datos de grupo", - "Group to Connect": "Grupo para conectar", + "Group Data": "Datos de Grupo", + "Group to Connect": "Grupo para Conectar", "Group/ID:": "Identificación del grupo:", "Group:": "Grupo:", "GroupBox1": "GroupBox1", - "Grouping Factor (Optional):": "Factor de agrupación (opcional):", - "Grouping Factor:": "Factor de agrupación:", + "Grouping Factor (Optional):": "Factor de Agrupación (Opcional):", + "Grouping Factor:": "Factor de Agrupación:", "Groups": "Grupos", "Growing (or Cooling) Degree Days. If the baseline = 15 degrees, then GDD = (tmean - 15), or 0 if tmean is less than 15": "Grados Día de Crecimiento (o Enfriamiento). Si la línea base = 15 grados, entonces GDD = (tmean - 15), o 0 si tmean es menor que 15", "Growing Season Length [5:GSL]": "Duración de la temporada de crecimiento [5:GSL]", @@ -1865,11 +1870,11 @@ "Guess": "Adivinar", "Guides": "Guías", "Gumbel": "Gumbel", - "H Line Options": "Opciones de línea H", + "H Line Options": "Opciones de Línea H", "HC": "HC", - "HDD:": "disco duro:", + "HDD:": "Disco Duro:", "HTML": "HTML", - "HTML (Browser)": "HTML (navegador)", + "HTML (Browser)": "HTML (Navegador)", "HTML Table": "Tabla HTML", "Hamming Distance": "Distancia de Hamming", "Hand": "Mano", @@ -1877,17 +1882,18 @@ "Hargreaves Samani": "Hargreaves Samani", "Hargreaves- Samani": "Hargreaves - Samani", "Harmonics:": "Armónicos:", - "Hash #": "hash #", - "Have you tried: Boxplots by a factor.": "¿Has probado: diagramas de caja por un factor?", - "Have you tried: Describing all your variables at once.": "Has probado: Describiendo todas tus variables a la vez.", - "Have you tried: Using the library datasets.": "¿Ha intentado: Usar los conjuntos de datos de la biblioteca?", + "Hash #": "Hash #", + "Have you tried: Boxplots by a factor.": "¿Has probado: Diagramas de caja por un factor?", + "Have you tried: Describing all your variables at once.": "¿Has probado: Describiendo todas tus variables a la vez?", + "Have you tried: Using the library datasets.": "¿Has probado: Usar los conjuntos de datos de la biblioteca?", "He&lp": "Ayuda", "Header": "Encabezamiento", "Header :": "Encabezado:", - "Heading Border": "Borde de rumbo", + "Heading Border": "Borde de Encabezado", "Heat": "Calor", - "Heat Map": "Mapa de calor", - "Heat Map/Choropleth": "Mapa de calor/coropletas", + "Heat Map": "Mapa de Calor", + "Heat Map and Chorolopleth Map": "Mapa de Calor y Mapa de Corolopletas", + "Heat Map/Choropleth": "Mapa de Calor/Coropletas", "Heat Sum...": "Suma de Calor...", "Heating Degree Days. If the baseline = 15 degrees then HDD is (15 - tmean). HDD = 0 if tmean is more than 15.": "Grados Días de Calefacción. Si la línea de base = 15 grados, HDD es (15 - tmean). HDD = 0 si tmean es mayor que 15.", "Heatmap...": "Mapa de calor...", @@ -1897,40 +1903,41 @@ "Help ": "Ayuda ", "Help...": "Ayuda...", "Helvetica - Narrow": "Helvética - Estrecho", - "Helvetica Neue": "helvética nueva", + "Helvetica Neue": "Helvética Nueva", "Helveticaserif": "Helveticaserif", - "Hidden Column(s):": "Columna(s) oculta(s):", + "Hidden Column(s):": "Columna(s) Oculta(s):", "Hidden Data Frame(s):": "Marcos de datos ocultos:", "Hide": "Ocultar", "Hide (future) commands": "Ocultar (futuros) comandos", - "Hide Details <<": "Ocultar detalles <<", - "Hide/Show Columns...": "Ocultar/Mostrar columnas...", + "Hide Details <<": "Ocultar Detalles <<", + "Hide/Show Columns...": "Ocultar/Mostrar Columnas...", "Hide/Show Data Frames...": "Ocultar/Mostrar marcos de datos...", - "Hide/Unhide Column(s)": "Ocultar/mostrar columna(s)", - "Hide/Unhide Data Frame(s)": "Ocultar/mostrar marcos de datos", - "Hierarch Plot": "Gráfico jerárquico", + "Hide/Unhide Column(s)": "Ocultar/Mostrar Columna(s)", + "Hide/Unhide Data Frame(s)": "Ocultar/Mostrar marco(s) de dato(s)", + "Hierarch Plot": "Gráfico Jerárquico", "Hierarchical": "Jerárquico", "High Ascending": "Alto Ascendente", "High Descending": "Alto Descendente", - "Highlight Alternate Rows": "Resaltar filas alternativas", - "Hist Plot": "Trama Histórica", + "Highlight Alternate Rows": "Resaltar Filas Alternativas", + "Hist Plot": "Gráfica Histórica", "Histogram": "Histograma", - "Histogram (Rose Plot)": "Histograma (diagrama de rosas)", - "Histogram Bins:": "Contenedores de histograma:", - "Histogram Method": "Método de histograma", - "Histogram Options": "Opciones de histograma", - "Histogram Plot": "Gráfico de histograma", + "Histogram (Rose Plot)": "Histograma (Diagrama de Rosa)", + "Histogram Bins:": "Contenedores de Histograma:", + "Histogram Method": "Método de Histograma", + "Histogram Options": "Opciones de Histograma", + "Histogram Plot": "Gráfico de Histograma", "Histogram...": "Histograma...", - "History and FAQ": "Historia y preguntas frecuentes", - "Hit Rate": "Tasa de aciertos", + "Histograms, Dotplots, Density and Ridge Plots and Frequency Polygons": "Histogramas, diagramas de puntos, diagramas de densidad y cresta y polígonos de frecuencia", + "History and FAQ": "Historia y Preguntas Frecuentes", + "Hit Rate": "Tasa de Aciertos", "Hjust": "Justo", - "Homogenization (Change Point)": "Homogeneización (punto de cambio)", + "Homogenization (Change Point)": "Homogeneización (Punto de Cambio)", "Homogenization...": "Homogeneización...", "Horizontal": "Horizontal", - "Horizontal Label Position:": "Posición de etiqueta horizontal:", - "Horizontal Padding": "Acolchado Horizontal", - "Horizontal Plot": "Parcela horizontal", - "Horizontal Plot (coord-flip)": "Gráfico horizontal (volteo de coordenadas)", + "Horizontal Label Position:": "Posición de Etiqueta Horizontal:", + "Horizontal Padding": "Relleno Horizontal", + "Horizontal Plot": "Gráfico Horizontal", + "Horizontal Plot (coord-flip)": "Gráfico Horizontal (volteo de coordenadas)", "Horizontal bars": "Barras horizontales", "Horizontal major grid lines ": "Líneas de cuadrícula principales horizontales ", "Horizontal minor grid lines": "Líneas de cuadrícula menores horizontales", @@ -1940,72 +1947,72 @@ "Host:": "Anfitrión:", "Hour": "Hora", "Hour:": "Hora:", - "How to Display": "Cómo mostrar", - "Html": "html", - "Humidity Max:": "Humedad máxima:", - "Humidity Min:": "Humedad mínima:", + "How to Display": "Cómo Mostrar", + "Html": "Html", + "Humidity Max:": "Humedad Máxima:", + "Humidity Min:": "Humedad Mínima:", "HydroGOF": "HidroGOF", "Hypergeometric": "Hipergeométrico", "Hyphen -": "Guión -", - "Hypothesis Tests": "Pruebas de hipótesis", + "Hypothesis Tests": "Pruebas de Hipótesis", "Hypothesis Tests Keyboard...": "Teclado de Pruebas de Hipótesis...", "Hypothesis Tests Keyboards...": "Pruebas de Hipótesis Teclados...", "I()": "YO()", - "ID Column Name:": "Nombre de la columna de ID:", - "ID Column:": "Columna de identificación:", + "ID Column Name:": "Nombre de Columna de ID:", + "ID Column:": "Columna de Identificación:", "ID plus 10 categorical variables (as factors) and 10% of missing values": "ID más 10 variables categóricas (como factores) y 10% de valores faltantes", "ID plus 10 categorical variables each with 5 levels": "ID más 10 variables categóricas cada una con 5 niveles", "ID, plus 12 variables. 6 are indicator (dummy) variables, 3 Likert and 3 grades": "ID, más 12 variables. 6 son variables indicadoras (ficticias), 3 Likert y 3 calificaciones", "ID/Station:": "Identificación/Estación:", "ID:": "IDENTIFICACIÓN:", - "IDs": "identificaciones", + "IDs": "Identificaciones", "IQR": "IQR", "Icing Days [3:ID]": "Días de formación de hielo [3: ID]", - "Identifier": "identificador", + "Identifier": "Identificador", "Identifier (Optional):": "Identificador (Opcional):", "Identifier:": "Identificador:", "Identity": "Identidad", - "Ignore Case": "Ignorar caso", - "Ignore Global Aesthetics": "Ignorar la estética global", - "Ignore Labels": "Ignorar etiquetas", - "Ignore Missing Values": "Ignorar valores faltantes", + "Ignore Case": "Ignorar Caso", + "Ignore Global Aesthetics": "Ignorar Estética Global", + "Ignore Labels": "Ignorar Etiquetas", + "Ignore Missing Values": "Ignorar Valores Faltantes", "Ignore values on invalid dates": "Ignorar valores en fechas no válidas", - "Illustrates the gl function and generates data for a simple experiment on 12 plots": "Ilustra la función gl y genera datos para un experimento simple en 12 parcelas", + "Illustrates the gl function and generates data for a simple experiment on 12 plots": "Ilustra la función gl y genera datos para un experimento simple en 12 gráficos", "Import": "Importar", - "Import Apsimx/Apsim Examples": "Importar ejemplos de Apsimx/Apsim", - "Import CSV Options": "Importar opciones de CSV", - "Import Data Settings": "Ajustes de importación de datos", - "Import Dataset": "Importar conjunto de datos", - "Import Excel Options": "Importar opciones de Excel", + "Import Apsimx/Apsim Examples": "Importar Ejemplos Apsimx/Apsim", + "Import CSV Options": "Importar Opciones de CSV", + "Import Data Settings": "Ajustes de Importación de Datos", + "Import Dataset": "Importar Conjunto de datos", + "Import Excel Options": "Importar Opciones de Excel", "Import From CLIDATA...": "Importar desde CLIDATA...", "Import From CSPRO": "Importar desde CSPRO", "Import From CSPRO...": "Importar desde CSPRO...", "Import From Climsoft": "Importar desde Climsoft", "Import From Climsoft Wizard": "Importar desde el asistente de Climasoft", - "Import From Databases": "Importar desde bases de datos", - "Import From Databases...": "Importar desde bases de datos...", - "Import From File ...": "Importar desde archivo...", - "Import From File...": "Importar desde archivo...", + "Import From Databases": "Importar desde Bases de datos", + "Import From Databases...": "Importar desde Base de datos...", + "Import From File ...": "Importar Desde Archivo...", + "Import From File...": "Importar Desde Archivo...", "Import From IRI (Internet connection needed)": "Importar desde IRI (se necesita conexión a Internet)", - "Import From Library": "Importar desde biblioteca", - "Import From Library ...": "Importar desde la biblioteca...", - "Import From Library...": "Importar desde la biblioteca...", + "Import From Library": "Importar desde Biblioteca", + "Import From Library ...": "Importar desde Biblioteca...", + "Import From Library...": "Importar desde Biblioteca...", "Import From ODK...": "Importar desde ODK...", "Import From OpenRefine...": "Importar desde OpenRefine...", "Import From Postgres": "Importar desde Postgres", "Import From RapidPro": "Importar desde RapidPro", "Import NetCDF File": "Importar archivo NetCDF", - "Import Options": "Opciones de importación", - "Import RDS Options": "Importar opciones de RDS", + "Import Options": "Opciones de Importación", + "Import RDS Options": "Importar Opciones de RDS", "Import SST...": "Importar SST...", - "Import Shapefiles": "Importar archivos de forma", - "Import Text Options": "Opciones de importación de texto", + "Import Shapefiles": "Importar Archivos de forma", + "Import Text Options": "Opciones de Importación de Texto", "Import and Tidy NetCDF File": "Importar y ordenar archivo NetCDF", "Import and Tidy NetCDF File...": "Importar y ordenar el archivo NetCDF...", "Import and Tidy NetCDF...": "Importar y ordenar NetCDF...", - "Import and Tidy Shapefile...": "Importar y ordenar Shapefile...", - "Import and Tidy Shapefiles": "Importar y ordenar Shapefiles", - "Import calculations": "Importar cálculos", + "Import and Tidy Shapefile...": "Importar y Ordenar Shapefile...", + "Import and Tidy Shapefiles": "Importar y Ordenar Shapefile", + "Import calculations": "Importar Cálculos", "Import changes log": "Importar registro de cambios", "Import csv Options": "Importar opciones csv", "Import daily Data...": "Importar datos diarios...", @@ -2016,7 +2023,7 @@ "Import from Climsoft Wizard...": "Importar desde el Asistente de Climasoft...", "Import from Climsoft...": "Importar desde Climsoft...", "Import from IRI Data Library...": "Importar desde la biblioteca de datos IRI...", - "Import from Library": "Importar desde la biblioteca", + "Import from Library": "Importar desde Biblioteca", "Import from ODK": "Importar desde ODK", "Import from OpenRefine": "Importar desde OpenRefine", "Import from RapidPro": "Importar desde RapidPro", @@ -2024,48 +2031,49 @@ "Import metadata": "Importar metadatos", "Import objects": "Importar objetos", "Importing the following sheets:": "Importando las siguientes hojas:", - "Imputed:": "imputado:", + "Imputed:": "Imputado:", "In": "En", - "In Steps Of:": "en pasos de:", + "In Filter": "en filtro", + "In Steps Of:": "En Pasos de:", "In Steps of:": "En Pasos de:", "In numerical order of the levels (At least one level must be numerical.)": "En orden numérico de los niveles (Al menos un nivel debe ser numérico).", "In steps of:": "En pasos de:", "In the order of the relative frequencies of each level.": "En el orden de las frecuencias relativas de cada nivel.", "Inches": "Pulgadas", "Include": "Incluir", - "Include Arguments": "Incluir argumentos", - "Include Boxplot": "Incluir diagrama de caja", - "Include Comments by Default": "Incluir comentarios por defecto", - "Include Contexts": "Incluir contextos", + "Include Arguments": "Incluir Argumentos", + "Include Boxplot": "Incluir Diagrama de caja", + "Include Comments by Default": "Incluir Comentarios por Defecto", + "Include Contexts": "Incluir Contextos", "Include Default Parameter Values in R Commands": "Incluir valores de parámetros predeterminados en los comandos R", "Include Elements Information": "Incluir información de elementos", - "Include Facets": "Incluir facetas", + "Include Facets": "Incluir Facetas", "Include First Date of Occurrence": "Incluir la primera fecha de ocurrencia", - "Include Graph": "Incluir gráfico", - "Include Graphs": "Incluir gráficos", - "Include Horizontal Line": "Incluir línea horizontal", - "Include ID Column": "Incluir columna de ID", + "Include Graph": "Incluir Gráfico", + "Include Graphs": "Incluir Gráficos", + "Include Horizontal Line": "Incluir Línea Horizontal", + "Include ID Column": "Incluir Columna de ID", "Include Last Date of Occurrence": "Incluir la última fecha de ocurrencia", "Include Level Numbers": "Incluir números de nivel", "Include Lines of Best Fit": "Incluir líneas de mejor ajuste", "Include Major Grid Lines": "Incluir líneas de cuadrícula principales", - "Include Mean Line": "Incluir línea media", - "Include Mean Lines": "Incluir líneas medias", - "Include Metadata": "Incluir metadatos", + "Include Mean Line": "Incluir Línea Media", + "Include Mean Lines": "Incluir Líneas Medias", + "Include Metadata": "Incluir Metadatos", "Include Minor Grid Lines": "Incluir líneas de cuadrícula menores", - "Include Missing Values": "Incluir valores faltantes", - "Include Models": "Incluir modelos", + "Include Missing Values": "Incluir Valores Faltantes", + "Include Models": "Incluir Modelos", "Include N Occurances": "Incluir N Ocurrencias", "Include Observation Data": "Incluir datos de observación", "Include Observation Flags": "Incluir banderas de observación", - "Include Old Names": "Incluir nombres antiguos", - "Include P-Values": "Incluir valores P", - "Include Percentages": "Incluir porcentajes", - "Include Points": "Incluir puntos", - "Include Regular Expressions": "Incluir expresiones regulares", - "Include Smooth Line": "Incluir línea suave", - "Include Variable Labels": "Incluir etiquetas de variables", - "Include Variable Name in Labels": "Incluir nombre de variable en etiquetas", + "Include Old Names": "Incluir Nombres Antiguos", + "Include P-Values": "Incluir Valores P", + "Include Percentages": "Incluir Porcentajes", + "Include Points": "Incluir Puntos", + "Include Regular Expressions": "Incluir Expresiones Regulares", + "Include Smooth Line": "Incluir Línea Suave", + "Include Variable Labels": "Incluir Etiquetas de Variables", + "Include Variable Name in Labels": "Incluir Nombre de Variable en Etiquetas", "Include first of the next month": "Incluir el primero del próximo mes", "Include in Original Data": "Incluir en datos originales", "Include requested points in data (if specified)": "Incluir los puntos solicitados en los datos (si se especifica)", @@ -2075,12 +2083,12 @@ "Including": "Incluido", "Increase size": "Aumentar tamaño", "Increment": "Incremento", - "Indent Length": "Longitud de sangría", - "Indent:": "Sangrar:", + "Indent Length": "Longitud de Sangría", + "Indent:": "Sangría:", "Index": "Índice", "Index Components:": "Componentes del índice:", "Index Number of Duplicates": "Número de índice de duplicados", - "Index of agreement": "índice de acuerdo", + "Index of agreement": "Índice de acuerdo", "Indicators:": "Indicadores:", "Indices": "Índices", "Indices selected out of": "Índices seleccionados de", @@ -2088,15 +2096,15 @@ "Indices Help": "Ayuda de Índices", "Indices...": "Índices...", "Individual": "Individual", - "Individual Plots": "Parcelas Individuales", - "Individual Summaries": "Resúmenes individuales", + "Individual Plots": "Gráficas Individuales", + "Individual Summaries": "Resúmenes Individuales", "Individuals": "Individuos", - "Individuals Plot": "Parcela de Individuos", + "Individuals Plot": "Gráficas Individuales", "Inferno": "Infierno", "Initial Column Factor:": "Factor de columna inicial:", "Initial Row Factor(s) :": "Factor(es) de fila inicial:", - "Initial Values:": "Valores iniciales:", - "Inner Join": "Unir internamente", + "Initial Values:": "Valores Iniciales:", + "Inner Join": "Unir Internamente", "Input relative values separated by commas, For example 3,2,1.": "Ingrese valores relativos separados por comas, por ejemplo 3,2,1.", "Insert": "Insertar", "Insert ": "Insertar ", @@ -2104,16 +2112,16 @@ "Insert 1 Column Before": "Insertar 1 columna antes", "Insert Column(s) After": "Insertar columna(s) después", "Insert Column(s) Before": "Insertar columna(s) antes", - "Insert Columns": "Insertar columnas", - "Insert Columns/Rows": "Insertar columnas/filas", - "Insert Columns/Rows...": "Insertar columnas/filas...", - "Insert Row(s) After": "Insertar fila(s) después", - "Insert Row(s) Before": "Insertar fila(s) antes", - "Insert Rows": "Insertar filas", - "Insert Values": "Insertar valores", + "Insert Columns": "Insertar Columnas", + "Insert Columns/Rows": "Insertar Columnas/Filas", + "Insert Columns/Rows...": "Insertar Columnas/Filas...", + "Insert Row(s) After": "Insertar Fila(s) Después", + "Insert Row(s) Before": "Insertar Fila(s) Antes", + "Insert Rows": "Insertar Filas", + "Insert Values": "Insertar Valores", "Insert at Position:": "Insertar en la posición:", "Insert...": "Insertar...", - "Inspect Values": "Inspeccionar valores", + "Inspect Values": "Insertar Valores", "Install Missing Packages (Online)": "Instalar paquetes faltantes (en línea)", "Install R Package...": "Instalar paquete R...", "Instructional videos": "Vídeos instructivos", @@ -2122,86 +2130,86 @@ "Interactive viewer(Plotly)": "Visor interactivo (Plotly)", "Interested Variable": "Variable Interesada", "Interested variable": "Variable interesada", - "Internal parsing": "análisis interno", + "Internal parsing": "Análisis interno", "Interpolate": "Interpolar", - "Interpolate Missing Days": "Interpolar días faltantes", - "Interpolate Missing Entries": "Interpolar entradas faltantes", + "Interpolate Missing Days": "Interpolar Días Faltantes", + "Interpolate Missing Entries": "Interpolar Entradas Faltantes", "Interval": "Intervalo", - "Interval Size:": "Tamaño del intervalo:", + "Interval Size:": "Tamaño del Intervalo:", "Interval2": "Intervalo2", "Interval:": "Intervalo:", "Into": "Dentro", - "Into Binary Columns": "en columnas binarias", - "Into Text Components": "En componentes de texto", + "Into Binary Columns": "En Columnas Binarias", + "Into Text Components": "En Componentes de Texto", "Introduction": "Introducción", "Inventory": "Inventario", - "Inventory Plot": "Parcela de inventario", + "Inventory Plot": "Gráfica de Inventario", "Inventory Plot Options": "Opciones de trazado de inventario", "Inventory...": "Inventario...", "Inverse": "Inverso", "Inverse.gaussian": "Gaussiana inversa", "Inverse_Gaussian": "Inverse_Gaussian", "Inward": "Interior", - "Is Currency": "es moneda", - "Is_Element": "es_elemento", - "Italian": "italiano", + "Is Currency": "Es Moneda", + "Is_Element": "Es_elemento", + "Italian": "Italiano", "Italic": "Itálico", "J:": "J:", "Jaccard Distance between q-Gram Profiles": "Distancia Jaccard entre perfiles q-Gram", "Jan": "Ene", - "January": "enero", + "January": "Enero", "Jaro or Jaro-Winker Distance": "Distancia Jaro o Jaro-Winker", "Jet": "Chorro", - "Jitter": "Estar nervioso", - "Jitter Options": "Opciones de fluctuación", - "Jitter Plot": "Diagrama de fluctuación", - "Jitter dodge": "Esquivar el nerviosismo", - "Jitter...": "Estar nervioso...", - "Jitter:": "Estar nervioso:", - "Join By:": "Unirse por:", - "Join Options": "Opciones de unión", - "Join Type:": "Tipo de unión:", - "Join by:": "Únete por:", - "Join multiple strings. For example, :str_c(": "Une varias cadenas. Por ejemplo, :str_c(", - "Joining By:": "Unirse por:", - "Joining Columns": "Unión de columnas", + "Jitter": "Fluctuación", + "Jitter Options": "Opciones de Fluctuación", + "Jitter Plot": "Diagrama de Fluctuación", + "Jitter dodge": "Esquivar fluctuación", + "Jitter...": "Fluctuación...", + "Jitter:": "Fluctuación:", + "Join By:": "Unir por:", + "Join Options": "Opciones de Unión", + "Join Type:": "Tipo de Unión:", + "Join by:": "Unir por:", + "Join multiple strings. For example, :str_c(": "Unir varias cadenas. Por ejemplo, :str_c(", + "Joining By:": "Unir por:", + "Joining Columns": "Unión de Columnas", "July": "Julio", "Jump (Element1)": "Saltar (Elemento1)", - "Jump:": "Salto:", + "Jump:": "Saltar:", "June": "Junio", "Justify Legend Box": "Justificar cuadro de leyenda", "KGE": "KGE", "Kappa": "Kappa", "Keep": "Mantener", - "Keep Attributes": "Mantener atributos", - "Keep Raw Time": "Mantener el tiempo bruto", - "Keep as Missing": "Mantener como desaparecido", + "Keep Attributes": "Mantener Atributos", + "Keep Raw Time": "Mantener Tiempo Bruto", + "Keep as Missing": "Mantener como Faltante", "Keep existing data frames": "Mantener marcos de datos existentes", - "Keep existing position": "Mantener la posición actual", - "Keep the current order of levels and labels. Use Reverse checkbox to invert the order.": "Mantenga el orden actual de niveles y etiquetas. Utilice la casilla de verificación Invertir para invertir el orden.", + "Keep existing position": "Mantener posición actual", + "Keep the current order of levels and labels. Use Reverse checkbox to invert the order.": "Mantener el orden actual de niveles y etiquetas. Utilizar casilla de verificación Invertir para invertir el orden.", "Kelvin": "Kelvin", "Kendall": "Kendall", "Kernel": "Núcleo", "Kernel :": "Núcleo :", - "Key Check:": "Verificación clave:", - "Key Columns": "Columnas clave", - "Key Columns:": "Columnas clave:", + "Key Check:": "Verificación Clave:", + "Key Columns": "Columnas Clave", + "Key Columns:": "Columnas Clave:", "Key Name:": "Nombre clave:", "Key background height": "Altura de fondo clave", "Key background width": "Ancho de fondo clave", "Key:": "Llave:", "Keys and Links": "Claves y enlaces", - "Keys:": "Llaves:", + "Keys:": "Claves:", "Kilometres per hour (kmph)": "Kilómetros por hora (kmph)", "Kisumu": "Kisumu", "Kiswahili": "Kiswahili", "Kling-Gupta efficiency": "Eficiencia de Kling-Gupta", - "Knots": "nudos", + "Knots": "Nudos", "Knuth-TAOCP": "Knuth-TAOCP", "Knuth-TAOCP-2002": "Knuth-TAOCP-2002", - "Kobo": "kobo", - "Kurtose": "kurose", - "Kurtosis": "curtosis", + "Kobo": "Kobo", + "Kurtose": "Curtosis", + "Kurtosis": "Curtosis", "Kurtosis (W)": "Curtosis (W)", "L'Ecuyer-CMRG": "L'Ecuyer-CMRG", "L-Moments": "Momentos L", @@ -2210,17 +2218,17 @@ "LSD": "LSD", "LaTex": "Látex", "Label": "Etiqueta", - "Label All": "Etiquetar todo", - "Label Cities": "Etiquetar ciudades", + "Label All": "Etiquetar Todo", + "Label Cities": "Etiquetar Ciudades", "Label Groups with Means": "Etiquetar grupos con medias", - "Label Options:": "Opciones de etiqueta:", - "Label Repel Options": "Opciones de rechazo de etiquetas", - "Label Text (Lower):": "Texto de etiqueta (inferior):", - "Label Text (Upper):": "Texto de la etiqueta (superior):", - "Label Text:": "Texto de la etiqueta:", - "Label Transparency:": "Transparencia de la etiqueta:", - "Label Type:": "Tipo de etiqueta:", - "Label Variable (Optional):": "Variable de etiqueta (opcional):", + "Label Options:": "Opciones de Etiqueta:", + "Label Repel Options": "Opciones de Rechazo de Etiquetas", + "Label Text (Lower):": "Texto de Etiqueta (Inferior):", + "Label Text (Upper):": "Texto de Etiqueta (Superior):", + "Label Text:": "Texto de Etiqueta:", + "Label Transparency:": "Transparencia de Etiqueta:", + "Label Type:": "Tipo de Etiqueta:", + "Label Variable (Optional):": "Variable de Etiqueta (Opcional):", "Label X:": "Etiqueta X:", "Label Y:": "Etiqueta Y:", "Label of axes": "Etiqueta de ejes", @@ -2235,7 +2243,7 @@ "Label8": "Etiqueta8", "Label9": "Etiqueta9", "Label:": "Etiqueta:", - "Labelled Convert": "Conversión etiquetada", + "Labelled Convert": "Conversión Etiquetada", "Labels": "Etiquetas", "Labels (": "Etiquetas (", "Labels (Optional):": "Etiquetas (Opcional):", @@ -2243,17 +2251,17 @@ "Labels:": "Etiquetas:", "Lag": "Retraso", "Lag:": "Retraso:", - "Lang": "idioma", + "Lang": "Idioma", "Language": "Idioma", "Language :": "Idioma :", "Languages": "Idiomas", "Large": "Largo", - "Last": "Ultimo", - "Last Word:": "Ultima palabra:", + "Last": "Último", + "Last Word:": "Última Palabra:", "Latex": "Látex", "Latin-1": "Latín-1", "Latitude": "Latitud", - "Latitude Offset:": "Compensación de latitud:", + "Latitude Offset:": "Compensación de Latitud:", "Latitude:": "Latitud:", "Latitute:": "Latitud:", "Layer Dimensions (Aesthetics)": "Dimensiones de capa (estética)", @@ -2266,15 +2274,15 @@ "Layout incomplete: layout must contain all graphs.": "Diseño incompleto: el diseño debe contener todos los gráficos.", "Layout of data": "Diseño de datos", "Layout:": "Diseño:", - "Lead": "Plomo", + "Lead": "Guiar", "Leading Zeros": "Ceros a la izquierda", "Leap Year": "Año bisiesto", "Learning Statistics": "Estadísticas de aprendizaje", - "Leave as Missing": "Dejar como desaparecido", + "Leave as Missing": "Dejar como faltante", "Lebelled Convert": "Conversión etiquetada", "Left": "Izquierda", "Left Color": "Color izquierdo", - "Left Join": "Unirse a la izquierda", + "Left Join": "Unir a la izquierda", "Left Style": "Estilo izquierdo", "Left Width": "Ancho izquierdo", "Left:": "Izquierda:", @@ -2293,6 +2301,7 @@ "Legend Spacing": "Espaciado de leyenda", "Legend Title": "Título de la leyenda", "Legend Title and Text": "Título y texto de la leyenda", + "Legend Title:": "Título de la leyenda:", "Legend item labels": "Etiquetas de elementos de leyenda", "Legend label": "Etiqueta de leyenda", "Legend position": "Posición de la leyenda", @@ -2318,11 +2327,11 @@ "Levels: ": "Niveles: ", "Levenshtein Distance": "Distancia de Levenstein", "Leverage": "Aprovechar", - "Lexical Order": "orden léxico", + "Lexical Order": "Orden Léxico", "Licence": "Licencia", "Licence...": "Licencia...", "Light-Blue": "Azul claro", - "Lighter": "Encendedor", + "Lighter": "Luminoso", "Likelihood": "Probabilidad", "Likert Graph": "Gráfico de Likert", "Likert Options": "Opciones de Likert", @@ -2335,11 +2344,12 @@ "Line Colour:": "Color de línea:", "Line End": "Fin de línea", "Line Format": "Formato de línea", - "Line Graph": "Gráfico de líneas", + "Line Graph": "Gráfico de línea", "Line Height": "Altura de la línea", "Line Options": "Opciones de línea", "Line Plot": "Gráfico de línea", "Line Plot...": "Gráfico de línea...", + "Line Plots, Smoothed Plots, Dumbbell and Slope Plots": "Gráficos de líneas, gráficos suavizados, gráficos con mancuernas y pendientes", "Line Type": "Tipo de línea", "Line Type:": "Tipo de línea:", "Line along x axis": "Línea a lo largo del eje x", @@ -2350,23 +2360,23 @@ "Line:": "Línea:", "Linear": "Lineal", "Lines": "Líneas", - "Lines To Skip:": "Líneas para saltar:", + "Lines To Skip:": "Líneas a omitir:", "Lines along axes": "Líneas a lo largo de los ejes", "Lines to Preview:": "Líneas para la vista previa:", "Link Function": "Función de enlace", "Link Name:": "Nombre del enlace:", "Links": "Enlaces", "Links:": "Enlaces:", - "Lists": "Liza", + "Lists": "Listas", "Lists:": "Liza:", - "Load": "Carga", + "Load": "Cargar", "Load Backup Data": "Cargar datos de copia de seguridad", "Load Options...": "Cargar opciones...", "Load Script from File...": "Cargar secuencia de comandos desde archivo...", - "Load a script from file into the current tab.": "Cargue un script desde un archivo en la pestaña actual.", + "Load a script from file into the current tab.": "Cargar script desde un archivo en la pestaña actual.", "Load from Instat collection": "Cargar desde la colección Instat", "Load from R": "Cargar desde R", - "Load script from file into the current tab.": "Cargue el script desde el archivo en la pestaña actual.", + "Load script from file into the current tab.": "Cargar script desde un archivo en la pestaña actual.", "Local Capitals": "Capitales locales", "Locate": "Localizar", "Locating Points in Shape File": "Ubicar puntos en el archivo de forma", @@ -2377,12 +2387,12 @@ "Location Selection": "Selección de ubicación", "Location:": "Ubicación:", "Lock": "Cerrar", - "Lock and Unlock": "Trabar y destrabar", + "Lock and Unlock": "Trabar y Destrabar", "Lock and unlock": "Trabar y destrabar", - "Log": "Tronco", + "Log": "Registro", "Log (Base 10)": "Registro (Base 10)", - "Log (Natual)": "Registro (natural)", - "Log (Natural)": "Tronco (Natural)", + "Log (Natual)": "Registro (Natural)", + "Log (Natural)": "Registro (Natural)", "Log Base 10": "Base logarítmica 10", "Log Linear...": "Registro lineal...", "Log Window": "Ventana de registro", @@ -2396,14 +2406,14 @@ "Login to CDS": "Iniciar sesión en CDS", "Logit": "registro", "Lognormal": "Lognormal", - "Lollipop": "Chupete", - "Lollipop Options": "Opciones de piruletas", + "Lollipop": "Paleta", + "Lollipop Options": "Opciones de paleta", "Long": "Largo", - "Long-dash": "guión largo", + "Long-dash": "Guion largo", "Longest Common Substring Distance": "Distancia de subcadena común más larga", "Longitude:": "Longitud:", - "Looking for free statistics textbooks?": "¿Busca libros de texto de estadística gratuitos?", - "Looking for interesting case studies for teaching?": "¿Busca estudios de casos interesantes para la enseñanza?", + "Looking for free statistics textbooks?": "¿Buscando libros de texto de estadística gratuitos?", + "Looking for interesting case studies for teaching?": "¿Buscando estudios de casos interesantes para la enseñanza?", "Looking for training materials?": "¿Está buscando materiales de capacitación?", "Low Ascending": "Bajo Ascendente", "Low Descending": "Bajo Descendente", @@ -2420,7 +2430,7 @@ "MBIC": "MBIC", "MDS": "SMD", "ME": "YO", - "MET": "REUNIÓ", + "MET": "MET", "Machine Learning (Caret)...": "Aprendizaje automático (intercalación)...", "Machine Learning (caret) ": "Aprendizaje automático (intercalación) ", "Magma": "Magma", @@ -2438,9 +2448,9 @@ "Make Date": "Hacer fecha", "Make Date...": "Hacer fecha...", "Make Factor...": "Hacer factor...", - "Make Row a Key for the Data Frame:": "Haga de la fila una clave para el marco de datos:", + "Make Row a Key for the Data Frame:": "Hacer de la fila una clave para el marco de datos:", "Make Time...": "Hacer tiempo...", - "Make string a fixed width. For example, str_pad(": "Haz que la cuerda tenga un ancho fijo. Por ejemplo, str_pad(", + "Make string a fixed width. For example, str_pad(": "Hacer que la cuerda tenga un ancho fijo. Por ejemplo, str_pad(", "Make the Column a Key for the Data Frame": "Hacer de la columna una clave para el marco de datos", "Man": "Hombre", "Manipulations": "Manipulaciones", @@ -2457,7 +2467,7 @@ "March": "Marzo", "Margin": "Margen", "Margin Name :": "Nombre del margen:", - "Margin around entire plot": "Margen alrededor de toda la parcela", + "Margin around entire plot": "Margen alrededor de toda la trama", "Margins": "Márgenes", "Margins to Dispaly": "Márgenes para mostrar", "Markov Chains": "Cadenas de Markov", @@ -2465,28 +2475,28 @@ "Markov Type:": "Tipo de Markov:", "Marsaglia-Multicarry": "Marsaglia-Multicarry", "Match Case": "Caso de coincidencia", - "Match...": "Fósforo...", + "Match...": "Combinar...", "Matched With": "Combinado con", - "Matches any character. For example,str_count(c(": "Coincide con cualquier carácter. Por ejemplo, str_count(c(", - "Matching Column (Optional)": "Columna coincidente (opcional)", - "Matching Column:": "Columna correspondiente:", - "Matching column": "columna coincidente", + "Matches any character. For example,str_count(c(": "Combinados con cualquier carácter. Por ejemplo, str_count(c(", + "Matching Column (Optional)": "Columna Coincidente (Opcional)", + "Matching Column:": "Columna Coincidente:", + "Matching column": "Columna coincidente", "Maths": "Matemáticas", - "Max": "máx.", + "Max": "Máx.", "Max Missing Data": "Máximo de datos faltantes", "Max Break Point:": "Punto de ruptura máximo:", "Max Duration Missing Data": "Duración máxima de datos faltantes", - "Max Labels": "Etiquetas máximas", + "Max Labels": "Etiquetas máxima", "Max Latitude:": "Latitud máxima:", "Max Longitude:": "Longitud máxima:", - "Max Missing Days": "Máximo de días perdidos", - "Max:": "máx.:", + "Max Missing Days": "Máximo de días faltantes", + "Max:": "Máx:", "Maximise": "Maximizar", "Maximised Output": "Salida maximizada", - "Maximised window": "ventana maximizada", + "Maximised window": "Ventana maximizada", "Maximum": "Máximo", "Maximum Distance from 0": "Distancia máxima desde 0", - "Maximum Dry Days:": "Máximo de Días Secos:", + "Maximum Dry Days:": "Máximo de días secos:", "Maximum Factor Levels Shown:": "Niveles máximos de factor mostrados:", "Maximum Gap:": "Brecha máxima:", "Maximum Latitude": "Latitud máxima", @@ -2495,39 +2505,39 @@ "Maximum Likelihood (MLE)": "Máxima probabilidad (MLE)", "Maximum Likelihood(MLE)": "Máxima probabilidad (MLE)", "Maximum Logitude": "Logitud máxima", - "Maximum Missing Days": "Máximo de días perdidos", + "Maximum Missing Days": "Máximo de días faltantes", "Maximum Number of Columns to Display:": "Número máximo de columnas para mostrar:", "Maximum Number of Components": "Número máximo de componentes", "Maximum Number of Rows to Display:": "Número máximo de filas para mostrar:", "Maximum RH (%):": "Humedad relativa máxima (%):", "Maximum Rain:": "Lluvia Máxima:", - "Maximum Rows To Import": "Número máximo de filas para importar", + "Maximum Rows To Import": "Máximo de filas a importar", "Maximum Size:": "Talla máxima:", "Maximum Temperature:": "Temperatura máxima:", "Maximum Temperatures": "Temperaturas máximas", "Maximum Values": "Valores máximos", - "Maximum likelihood": "Máxima verosimilitud", + "Maximum likelihood": "Probabilidad máxima", "Maximum mean bias:": "Sesgo medio máximo:", - "Maximum number of consecutive missing allowed": "Número máximo de desaparecidos consecutivos permitidos", + "Maximum number of consecutive missing allowed": "Número máximo de faltantes consecutivos permitidos", "Maximum number of days when precipitation is greater than 1mm": "Número máximo de días en que la precipitación es superior a 1 mm", "Maximum number of days when precipitation is less than 1mm.": "Número máximo de días en que la precipitación es inferior a 1 mm.", - "Maximum number of missing allowed": "Número máximo de desaparecidos permitido", + "Maximum number of missing allowed": "Número máximo de faltantes permitido", "Maximum percentage of missing allowed": "Porcentaje máximo de faltantes permitido", "Maximum stdev bias:": "Desviación estándar máxima:", "Maximum:": "Máximo:", "May": "Mayo", - "Mean": "Significar", + "Mean": "Media", "Mean (W)": "Media (W)", "Mean Diurnal Temperature Range [16:DTR]": "Rango de temperatura media diurna [16:DTR]", - "Mean absolute error": "Error absoluto medio", + "Mean absolute error": "Error absoluto media", "Mean and Variance": "Media y varianza", - "Mean error": "error medio", + "Mean error": "Error media", "Mean for each:": "Media para cada uno:", "Mean residual life": "Vida residual media", "Mean sea level pressure": "Presión media a nivel del mar", - "Mean squared error": "Error medio cuadrado", + "Mean squared error": "Error media cuadrado", "Mean wave direction": "Dirección de onda media", - "Mean wave period": "Período medio de onda", + "Mean wave period": "Período media de onda", "Mean(t-interval)": "Media (intervalo t)", "Meanlog": "Meanlog", "Means": "Medio", @@ -2544,22 +2554,22 @@ "Medium": "Medio", "MenuStrip1": "MenuStrip1", "Menu_strip": "Menu_strip", - "Menus and Dialogs": "Menús y Diálogos", + "Menus and Dialogs": "Menúes y Diálogos", "Merge": "Unir", - "Merge (Join)": "Fusionar (Unirse)", - "Merge (Join)...": "Fusionar (Unirse)...", + "Merge (Join)": "Fusionar (Unir)", + "Merge (Join)...": "Fusionar (Unir)...", "Merge Additional Data": "Combinar datos adicionales", "Merge Additional Data...": "Fusionar datos adicionales...", "Merge...": "Unir...", "Mersenne-Twister": "Mersenne Twister", - "Meta Data": "metadatos", - "Metadata": "metadatos", + "Meta Data": "Meta Datos", + "Metadata": "Metadatos", "Metadata Columns:": "Columnas de metadatos:", "Metadata Property:": "Propiedad de metadatos:", "Metadata to Delete": "Metadatos para eliminar", "Metadata...": "Metadatos...", "Method": "Método", - "Method of moments": "método de momentos", + "Method of moments": "Método de momentos", "Method:": "Método:", "Methods": "Métodos", "Metres per second (mps)": "Metros por segundo (mps)", @@ -2568,14 +2578,14 @@ "Miles per hour (mph)": "Millas por hora (mph)", "Millimetres": "Milímetros", "Million Data Points": "Millones de puntos de datos", - "Min": "mínimo", + "Min": "Mínimo", "Min Break Point:": "Punto de ruptura mínimo:", "Min Frequency": "Frecuencia mínima", "Min Latitude:": "Latitud mínima:", "Min Longitude:": "Longitud mínima:", "Min.bin can also be length of two e.g. min.bin = c(10,20)": "Min.bin también puede tener una longitud de dos, por ejemplo, min.bin = c(10,20)", - "Min/Max": "Mínimo máximo", - "Min10": "min10", + "Min/Max": "Min/Máx", + "Min10": "Min10", "Min:": "Mínimo:", "MinSegLen:": "MinSegLen:", "Minimum": "Mínimo", @@ -2584,7 +2594,7 @@ "Minimum Longitude": "Longitud mínima", "Minimum Number of Points:": "Número mínimo de puntos:", "Minimum RH (%):": "Humedad relativa mínima (%):", - "Minimum Size:": "Talla minima:", + "Minimum Size:": "Tamaño mínimo:", "Minimum Temperature": "Temperatura mínima", "Minimum Temperature:": "Temperatura mínima:", "Minimum Temperatures": "Temperaturas Mínimas", @@ -2594,21 +2604,22 @@ "Minimum:": "Mínimo:", "Minor Grid Lines": "Líneas de cuadrícula menores", "Minor Tick Marks": "Marcas de graduación menores", + "Minor grid lines ": "Líneas de cuadrícula menores ", "Minute": "Minuto", "Minutes": "Minutos", "Minutes:": "Minutos:", - "Missing": "Perdido", + "Missing": "Faltante", "Missing Colour:": "Color faltante:", - "Missing Data": "Datos perdidos", + "Missing Data": "Datos faltantes", "Missing Data Options": "Opciones de datos faltantes", "Missing Data Table": "Tabla de datos faltantes", "Missing Data Table...": "Tabla de datos faltantes...", - "Missing Data...": "Datos perdidos...", - "Missing Last": "último faltante", + "Missing Data...": "Datos faltantes...", + "Missing Last": "Último faltante", "Missing Method": "Método faltante", - "Missing Options": "Opciones que faltan", + "Missing Options": "Opciones faltantes", "Missing Options Evapotranspiration": "Opciones faltantes Evapotranspiración", - "Missing Value": "Valor que falta", + "Missing Value": "Valor faltante", "Missing Value String:": "Cadena de valor faltante:", "Missing Values": "Valores faltantes", "Missing Values...": "Valores faltantes...", @@ -2616,7 +2627,7 @@ "Missing values as the mean (usually) overall or with a factor. For example na.aggregate(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,3.75,4,7,3.75)": "Valores faltantes como la media (normalmente) global o con un factor. Por ejemplo na.aggregate(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,3.75 ,4,7,3.75)", "Missing values shown as NA": "Los valores faltantes se muestran como NA", "Missing/Default value:": "Valor faltante/predeterminado:", - "Missing:": "Perdido:", + "Missing:": "Faltante:", "Mixed": "Mezclado", "Mode": "Modo", "Model": "Modelo", @@ -2641,7 +2652,7 @@ "Modified Nash-Sutcliffe efficiency": "Eficiencia de Nash-Sutcliffe modificada", "Modified Nash-Sutcliffe effieciency": "Eficiencia de Nash-Sutcliffe modificada", "Modified index of agreement": "Índice de concordancia modificado", - "Modifier": "modificador", + "Modifier": "Modificador", "Modifiers": "Modificadores", "Modify": "Modificar", "Modify Event": "Modificar evento", @@ -2674,37 +2685,38 @@ "Months": "Meses", "More": "Más", "More ...": "Más ...", - "More Options": "Mas opciones", + "More Options": "Más opciones", "More...": "Más...", "Mosaic Options": "Opciones de mosaico", - "Mosaic Plot": "Parcela de mosaico", + "Mosaic Plot": "Gráfico de Mosaico", "Mosaic Plot Options": "Opciones de trazado de mosaico", - "Mosaic Plot...": "Parcela de mosaico...", + "Mosaic Plot...": "Gráfico de Mosaico...", "Most Frequent": "Más frecuente", "Move Down": "Mover hacia abajo", - "Move Up": "Ascender", + "Move Up": "Mover hacia arriba", "Move the levels down: Example: If 1, levels a, b, c, become b, c, a. Use -1 to move up.": "Mover los niveles hacia abajo: Ejemplo: Si 1, los niveles a, b, c, se convierten en b, c, a. Usa -1 para subir.", "Moving": "Moviente", - "Moving Average": "Media móvil", + "Moving Average": "Media Móvil", "Moving average": "Media móvil", - "Multi-Plot": "Multiparcela", - "Multiline": "multilínea", - "Multinomial": "multinomial", + "Multi-Plot": "Multi-Gráfico", + "Multiline": "Multilínea", + "Multinomial": "Multinomial", "Multiple": "Múltiple", "Multiple Columns": "Varias columnas", "Multiple Data Columns": "Múltiples columnas de datos", "Multiple Response": "Respuesta múltiple", "Multiple Response...": "Respuesta múltiple...", - "Multiple Spells": "Múltiples hechizos", + "Multiple Spells": "Múltiples eventos", "Multiple Variables": "Múltiples Variables", + "Multiple Variables or Two Variables": "Varias variables o dos variables", "Multiple columns": "Múltiples columnas", "Multiply": "Multiplicar", "Multistate": "Multiestado", - "Multivariate": "multivariante", + "Multivariate": "multivariado", "Multple Lines...": "Líneas Múltiples...", "Muptiple Response": "Respuesta Múltiple", "N": "norte", - "N Missing": "N Falta", + "N Missing": "N faltante", "N Non Missing": "N no faltante", "N Total": "N totales", "NA": "N / A", @@ -2729,7 +2741,7 @@ "Name of the country, county or ward in the shapefile": "Nombre del país, condado o distrito en el shapefile", "Name of the country, county or ward, if available in the station file": "Nombre del país, condado o distrito, si está disponible en el archivo de la estación", "Name:": "Nombre:", - "Names To:": "Nombres a:", + "Names To:": "Nombres A:", "Names to:": "Nombres a:", "Nash-Sutcliffe efficiency": "Eficiencia de Nash-Sutcliffe", "Native": "Nativo", @@ -2760,16 +2772,16 @@ "New Name:": "Nuevo nombre:", "New Names (Optional):": "Nuevos nombres (opcional):", "New Selection Name:": "Nuevo nombre de selección:", - "New Theme Name": "Nuevo nombre del tema", + "New Theme Name": "Nuevo nombre de tema", "New Value:": "Nuevo valor:", "New Worksheet...": "Nueva hoja de trabajo...", "New Zealand": "Nueva Zelanda", "New column name:": "Nuevo nombre de columna:", - "New column will be at the: ": "La nueva columna estará en: ", + "New column will be at the: ": "La nueva columna estará en el: ", "New column will be at:": "La nueva columna estará en:", "New column will be: ": "La nueva columna será: ", "NewCenturySchoolbook": "Libro de texto del nuevo siglo", - "Next": "próximo", + "Next": "Próximo", "Ngrams": "Ngramas", "NimbusMonURWHelvetica": "NimbusMonURWHelvetica", "NimbusRom": "Nimbus Rom", @@ -2779,11 +2791,11 @@ "No Backup Data File Detected": "No se detectó ningún archivo de datos de copia de seguridad", "No Backup Debugging Log File Detected": "No se detectó ningún archivo de registro de depuración de copia de seguridad", "No Backup Log File Detected": "No se detectó ningún archivo de registro de copia de seguridad", - "No Capitals": "sin mayúsculas", + "No Capitals": "Sin mayúsculas", "No Column Factor": "Sin factor de columna", "No Connection": "Sin conexión", "No Data Loaded": "Sin datos cargados", - "No Decimal": "sin decimales", + "No Decimal": "Sin decimales", "No Facets": "Sin facetas", "No Files found": "No se encontraron archivos", "No Plot": "Sin trama", @@ -2809,7 +2821,7 @@ "Non Parameteric One Way ANOVA...": "ANOVA no paramétrico de una vía...", "Non Parametric Two Samples...": "Dos muestras no paramétricas...", "Non Parametric Two Way ANOVA...": "ANOVA no paramétrico de dos vías...", - "Non Parametric...": "no paramétrico...", + "Non Parametric...": "No paramétrico...", "Non-Centrality": "No centralidad", "Non-Negative": "No negativo", "Non-Numeric Values": "Valores no numéricos", @@ -2845,7 +2857,7 @@ "Number of Components:": "Número de componentes:", "Number of Digits to Display:": "Número de dígitos para mostrar:", "Number of Iterations:": "Número de iteraciones:", - "Number of Missing": "Número de desaparecidos", + "Number of Missing": "Número de faltantes", "Number of Pieces to Return:": "Número de piezas a devolver:", "Number of Preview Rows:": "Número de filas de vista previa:", "Number of Quantiles:": "Número de Cuantiles:", @@ -2893,15 +2905,16 @@ "On - Station...": "En - Estación...", "Ona": "En un", "One Data Frame": "Un marco de datos", - "One Sample": "una muestra", - "One Variable": "una variable", + "One Sample": "Una muestra", + "One Variable": "Una Variable", "One Variable Compare Models": "Modelos de comparación de una variable", "One Variable Fit Model": "Un modelo de ajuste variable", - "One Variable Frequencies...": "Una frecuencias variables...", + "One Variable Frequencies...": "Unas frecuencias variables...", "One Variable Graph": "Gráfico de una variable", "One Variable Graph Options": "Opciones de gráfico de una variable", "One Variable Graph...": "Gráfica de una variable...", "One Variable Summarise": "Resumen de una variable", + "One Variable Summarise, Skim and Customised": "Una variable resumida, descremada y personalizada", "One Variable Summarise...": "Resumen de una variable...", "One Variable Use Model": "Modelo de uso de una variable", "One Variable...": "Una Variable...", @@ -2916,43 +2929,43 @@ "One-Sided (y1>y2)": "Unilateral (y1>y2)", "Only Include Data Variables": "Incluir solo variables de datos", "Only My Countries": "Solo mis países", - "Open": "Abierto", - "Open Browser": "Navegador abierto", - "Open Dataset from Library": "Abrir conjunto de datos desde la biblioteca", + "Open": "Abrir", + "Open Browser": "Abrir navegador", + "Open Dataset from Library": "Abrir conjunto de datos desde biblioteca", "Open From CSPRO...": "Abrir desde CSPRO...", "Open From File...": "Abrir desde archivo...", - "Open From Library...": "Abrir desde la biblioteca...", + "Open From Library...": "Abrir desde biblioteca...", "Open From ODK...": "Abrir desde ODK...", "Open Log File": "Abrir archivo de registro", "Open SST": "SST abierto", "Open SST...": "Abrir SST...", "Open Script as File": "Abrir guión como archivo", "Open from file...": "Abrir desde archivo...", - "Open from library...": "Abrir desde la biblioteca...", + "Open from library...": "Abrir desde biblioteca...", "Operation": "Operación", "Operator:": "Operador:", "Optimal String Alignment": "Alineación óptima de cuerdas", "Optimisation": "Mejoramiento", "Option 1:": "Opción 1:", - "Option 2:": "Opcion 2:", + "Option 2:": "Opción 2:", "Option:": "Opción:", "Options": "Opciones", "Options by Context Boxplot": "Opciones por diagrama de caja de contexto", "Options by Context...": "Opciones por contexto...", - "Options for Missing Values": "Opciones para valores perdidos", + "Options for Missing Values": "Opciones para valores faltantes", "Options...": "Opciones...", "Options:": "Opciones:", "Or": "O", - "Or Column": "o columna", + "Or Column": "O columna", "OrRd": "OrRd", "Orange": "Naranja", - "Oranges": "naranjas", + "Oranges": "Naranjas", "Ord.": "Ord.", "Order": "Ordenar", "Order By:": "Ordenar por:", "Order by another variable": "Ordenar por otra variable", "Order:": "Ordenar:", - "Ordered Factor": "factor ordenado", + "Ordered Factor": "Factor ordenado", "Ordered Factor:": "Factor ordenado:", "Ordered_Logistic": "Ordenado_Logística", "Ordinal ": "Ordinal ", @@ -2964,11 +2977,11 @@ "Original Level": "Nivel original", "Orthogonal": "Ortogonal", "Other": "Otro", - "Other (General)": "Otros (generales)", - "Other (One Variable)": "Otro (una variable)", - "Other (Three Variable)": "Otro (tres variables)", - "Other (Two Variables)": "Otro (Dos Variables)", - "Other Axis (Optional):": "Otro Eje (Opcional):", + "Other (General)": "Otros (general)", + "Other (One Variable)": "Otros (una variable)", + "Other (Three Variable)": "Otros (tres variables)", + "Other (Two Variables)": "Otros (dos variables)", + "Other Axis (Optional):": "Otro Eje (opcional):", "Other Blocking Variables:": "Otras variables de bloqueo:", "Other Contexts:": "Otros contextos:", "Other IDs:": "Otras identificaciones:", @@ -2976,7 +2989,7 @@ "Other Observed Variables:": "Otras variables observadas:", "Other Options:": "Otras opciones:", "Other Predicted Variables:": "Otras variables previstas:", - "Other Rose Plots": "Otras parcelas de rosas", + "Other Rose Plots": "Otros gráficos de Rosa", "Out": "Afuera", "Out of Days:": "Fuera de los días:", "Outer": "Exterior", @@ -3022,13 +3035,13 @@ "PBIB": "PBIB", "PCA": "PCA", "PCA Options": "Opciones de PCA", - "PELT": "PIEL", + "PELT": "PELT", "PICSA": "PICSA", "PICSA Crops": "PICSA Cultivos", "PICSA General Graphs": "Gráficas generales de PICSA", "PICSA Options": "Opciones de PICSA", - "PICSA Rainfall Graph": "Gráfico de lluvia PICSA", - "PICSA Rainfall Graphs": "Gráficos de lluvia PICSA", + "PICSA Rainfall Graph": "Gráfico de Precipitaciones PICSA", + "PICSA Rainfall Graphs": "Gráficos de Precipitaciones PICSA", "PICSA Temperature": "Temperatura", "PICSA Temperature Graphs": "Gráficos de temperatura PICSA", "PP": "PÁGINAS", @@ -3065,21 +3078,22 @@ "Panel Spacing": "Espaciado de paneles", "Panel and Background ": "Panel y Fondo ", "Panel background": "Fondo de paneles", - "Panel border": "borde del panel", + "Panel border": "Borde del panel", "Panel.ontop": "Panel.ontop", "Paragraphs": "Párrafos", "Parallel Coordinate Plot": "Gráfico de coordenadas paralelas", "Parallel Coordinate Plot...": "Gráfico de coordenadas paralelas...", - "Parallel Plots": "Parcelas Paralelas", + "Parallel Plots": "Gráficos Paralelas", "Parameter:": "Parámetro:", "Parametric": "Paramétrico", "Parcoord Options": "Opciones de acuerdo", - "Pars": "pares", - "Parse": "Analizar gramaticalmente", - "Parsed": "analizado", + "Pars": "Pares", + "Parse": "Para analizar", + "Parsed": "Analizado", "Partial": "Parcial", "Partition Plot": "Parcela de partición", "Partitioning": "Fraccionamiento", + "Partitioning or Hierarchical": "Particionamiento o Jerárquico", "Partitioning:": "Fraccionamiento:", "Paste": "Pegar", "Paste Data to New Column(s)": "Pegar datos en nuevas columnas", @@ -3088,8 +3102,8 @@ "Paste New Data Frame": "Pegar nuevo marco de datos", "Paste Special": "Pegado especial", "Paste the contents of the clipboard into the current tab. (Ctrl+V)": "Pegue el contenido del portapapeles en la pestaña actual. (Ctrl+V)", - "Pastel1": "pastel1", - "Pastel2": "pastel2", + "Pastel1": "Pastel1", + "Pastel2": "Pastel2", "Path": "Camino", "Path or Step": "Camino o Paso", "Path:": "Sendero:", @@ -3097,7 +3111,7 @@ "Pattern:": "Patrón:", "Peaks": "picos", "Pearson": "Pearson", - "Pearson Correlation": "correlación de Pearson", + "Pearson Correlation": "Correlación de Pearson", "Pearson chi-square test for normality": "Prueba de chi-cuadrado de Pearson para la normalidad", "Pen.Value:": "Valor de pluma:", "Penalty:": "Multa:", @@ -3105,8 +3119,8 @@ "Penman...": "Escritor...", "PenmanMonteith": "PenmanMonteith", "Penn treebank": "banco de árboles de penn", - "Pentad": "pentad", - "Perc": "perc", + "Pentad": "Pentad", + "Perc": "Perc", "Percent": "Por ciento", "Percent Correct": "Porcentaje correcto", "Percent bias": "Sesgo porcentual", @@ -3117,10 +3131,10 @@ "Percentage of factor": "Porcentaje de factor", "Percentages": "Porcentajes", "Percentages of overall total": "Porcentajes del total general", - "Percentile": "percentil", - "Percentile Rose": "percentil rosa", - "Percentile:": "percentil:", - "Percents": "porcentajes", + "Percentile": "Percentil", + "Percentile Rose": "Percentil rosa", + "Percentile:": "Percentil:", + "Percents": "Porcentajes", "Performes a non-parametric test after Pettitt in order to test for a shift in the central tendency of a time series. The H0-hypothesis, no change, is tested against the HA-Hypothesis, change": "Realiza una prueba no paramétrica según Pettitt para probar un cambio en la tendencia central de una serie de tiempo. La hipótesis H0, sin cambio, se contrasta con la hipótesis HA, cambio", "Performes the Buishand range test for change-point detection of a normal variate.": "Realiza la prueba de rango de Buishand para la detección de puntos de cambio de una variable normal.", "Performes the Standard Normal Homogeinity Test (SNHT) for change-point detection of a normal variate.": "Realiza la prueba de homogeneidad normal estándar (SNHT) para la detección de puntos de cambio de una variable normal.", @@ -3131,10 +3145,10 @@ "Permute Columns...": "Permutar columnas...", "Permute/Sample Rows": "Permutar/filas de muestra", "Permute/Sample Rows...": "Permutar/filas de muestra...", - "Pettitt": "petittt", + "Pettitt": "Petittt", "Pettitt’s test for change-point detection": "Prueba de Pettitt para la detección de puntos de cambio", "PiYG": "PiYG", - "Picas": "picas", + "Picas": "Picas", "Pie": "Tarta", "Pie ": "Tarta ", "Pie ": "Tarta ", @@ -3176,7 +3190,7 @@ "Plot character": "Personaje de la trama", "Plot subtitle (text appearance)": "Subtítulo de la trama (aspecto del texto)", "Plot title (text appearance)": "Título de la trama (aspecto del texto)", - "Plot type": "tipo de parcela", + "Plot type": "Tipo de parcela", "Plot window": "Ventana de trazado", "Plotly...": "Plotly...", "Plots": "Parcelas", @@ -3184,7 +3198,7 @@ "Plus4": "Plus4", "Plus:": "Más:", "Point": "Punto", - "Point Jitter:": "Jitter de punto:", + "Point Jitter:": "Fluctuación de punto:", "Point Options": "Opciones de punto", "Point Options ": "Opciones de punto ", "Point Plot": "Gráfico de puntos", @@ -3192,8 +3206,8 @@ "Point plot": "Gráfico de puntos", "Points": "Puntos", "Points (Optional):": "Puntos (Opcional):", - "Poisson": "veneno", - "Poisson probabilities. For example ppois(8, 5) = 0.93": "Probabilidades de veneno. Por ejemplo ppois(8, 5) = 0.93", + "Poisson": "Poisson", + "Poisson probabilities. For example ppois(8, 5) = 0.93": "Probabilidades de poisson. Por ejemplo ppois(8, 5) = 0.93", "Poisson quantiles. For example qpois(0.9, 5) = 8": "Cuantiles de Poisson. Por ejemplo qpois(0.9, 5) = 8", "Polar": "Polar", "Polar Annulus": "Anillo polar", @@ -3203,18 +3217,18 @@ "Polar Cordinates": "Coordinadas polares", "Polar Frequency": "Frecuencia polar", "Polar Plot": "Gráfico polar", - "Polar frequency": "frecuencia polar", + "Polar frequency": "Frecuencia polar", "Pollutant (Optional):": "Contaminante (Opcional):", "Pollutant:": "Contaminante:", "Polygon Options": "Opciones de polígono", "Polynomial:": "Polinomio:", - "Polynomials": "polinomios", + "Polynomials": "Polinomios", "Polynomials...": "Polinomios...", "Population Pyramids": "Pirámides de población", "Population_Failures": "Población_fallas", "Population_Successes": "Población_éxitos", "Port:": "Puerto:", - "Portuguese": "portugués", + "Portuguese": "Portugués", "Position": "Posición", "Position - Estimates:": "Posición - Estimaciones:", "Position - Reference:": "Posición - Referencia:", @@ -3222,7 +3236,7 @@ "Positions:": "Posiciones:", "Positive integer giving the minimum segment length (no. of observations between changes), default is the minimum allowed by theory.": "Entero positivo que da la longitud mínima del segmento (cantidad de observaciones entre cambios), el valor predeterminado es el mínimo permitido por la teoría.", "Postion:": "Puesto:", - "Power": "Poder", + "Power": "Energía", "Power Option:": "Opción de energía:", "Precipitation": "Precipitación", "Precipitation >= 10mm Per Day [20:R10mm]": "Precipitación >= 10 mm por día [20:R10 mm]", @@ -3295,7 +3309,7 @@ "Property": "Propiedad", "Property:": "Propiedad:", "Proportion": "Proporción", - "Proportion count": "conteo de proporciones", + "Proportion count": "Conteo de proporciones", "Proportion mean": "Proporción media", "Proportions": "Dimensiones", "Proportions or Percentages": "Proporciones o Porcentajes", @@ -3370,9 +3384,9 @@ "Rain Column:": "Columna de lluvia:", "Rain Count...": "Contador de lluvia...", "Rain:": "Lluvia:", - "Rainfall": "Lluvia", + "Rainfall": "Precipitaciones", "Rainfall Graph...": "Gráfico de precipitaciones...", - "Rainfall...": "Lluvia...", + "Rainfall...": "Precipitaciones...", "Rains Statistics...": "Estadísticas de lluvias...", "Random": "Aleatorio", "Random Bernoulli (0 or 1) sample. Use say rbinom(n,1,1/6) for a random sample of a given dice value.": "Muestra aleatoria de Bernoulli (0 o 1). Usa say rbinom(n,1,1/6) para una muestra aleatoria de un valor de dado dado.", @@ -3399,7 +3413,7 @@ "Range:": "Rango:", "Rank": "Rango", "Rank...": "Rango...", - "Ranks": "rangos", + "Ranks": "Rangos", "Raster": "Ráster", "Rate": "Velocidad", "Rates": "Tarifas", @@ -3414,7 +3428,7 @@ "RdYlGn": "RdYlGn", "Rearrange": "Reorganizar", "Recent": "Reciente", - "Recode": "recodificar", + "Recode": "Recodificar", "Recode Factor": "Factor de recodificación", "Recode Factor...": "Factor de recodificación...", "Recode Numeric": "Recodificar numérico", @@ -3426,7 +3440,7 @@ "Red": "Rojo", "Red Flags:": "Banderas rojas:", "Redo": "Rehacer", - "Redo the last change. (Ctrl+Y)": "Rehace el último cambio. (Ctrl+Y)", + "Redo the last change. (Ctrl+Y)": "Rehacer el último cambio. (Ctrl+Y)", "Reds": "Rojos", "Reference Level": "Nivel de referencia", "Reference Level...": "Nivel de referencia...", @@ -3459,13 +3473,13 @@ "Remove Missing Values": "Eliminar valores faltantes", "Remove Objects": "Eliminar objetos", "Remove Selected Pair": "Eliminar par seleccionado", - "Remove Tab": "Quitar pestaña", + "Remove Tab": "Eliminar pestaña", "Remove Unused Labels": "Eliminar etiquetas no utilizadas", "Remove Unused Levels": "Eliminar niveles no utilizados", "Remove all occurrences of pattern. For example, str_remove_all(c(": "Eliminar todas las apariciones de patrón. Por ejemplo, str_remove_all(c(", - "Remove pattern . For example, str_remove(c(": "Quitar patrón. Por ejemplo, str_remove(c(", + "Remove pattern . For example, str_remove(c(": "Eliminar patrón. Por ejemplo, str_remove(c(", "Remove rows with any missing values": "Eliminar filas con valores faltantes", - "Rename": "Rebautizar", + "Rename": "Renombrar", "Rename Column": "Cambiar nombre de columna", "Rename Column...": "Cambiar el nombre de la columna...", "Rename Columns": "Cambiar el nombre de las columnas", @@ -3477,7 +3491,7 @@ "Rename Objects": "Renombrar objetos", "Rename Options": "Opciones de cambio de nombre", "Rename With": "Renombrar con", - "Rename...": "Rebautizar...", + "Rename...": "Renombrar...", "ReoGridControl1": "ReoGridControl1", "Reoder Metadata": "Reordenar metadatos", "Reorder": "Reordenar", @@ -3548,7 +3562,7 @@ "Right, bottom and left": "Derecha, abajo e izquierda", "Right:": "Derecha:", "Rl Plot": "Parcela Rl", - "Roboto": "roboto", + "Roboto": "Roboto", "Robust": "Robusto", "Robustbase": "base robusta", "Rolling Contract Number Issuer:": "Emisor del número de contrato móvil:", @@ -3573,8 +3587,8 @@ "Row Variable (Factor):": "Fila Variable (Factor):", "Row Variable(s):": "Variable(s) de fila:", "Row:": "Fila:", - "Rows": "filas", - "Rows ": "filas ", + "Rows": "Filas", + "Rows ": "Filas ", "Rows to Count Over:": "Filas para contar:", "Rows to Skip:": "Filas para saltar:", "Rows to Summarise:": "Filas para resumir:", @@ -3591,7 +3605,7 @@ "Rug colour:": "Color de la alfombra:", "Rugs": "Alfombras", "Run": "Correr", - "Run All": "ejecutar todo", + "Run All": "Ejecutar todo", "Run All Text": "Ejecutar todo el texto", "Run Backup Log": "Ejecutar registro de copia de seguridad", "Run Current Line": "Ejecutar línea actual", @@ -3601,7 +3615,7 @@ "Run Selected Text": "Ejecutar texto seleccionado", "Run all the text in the tab. (Ctrl+Alt+R)": "Ejecute todo el texto en la pestaña. (Ctrl+Alt+R)", "Run the current line or selection. (Ctrl+Enter)": "Ejecutar la línea o selección actual. (Ctrl+Intro)", - "Russian": "ruso", + "Russian": "Ruso", "S": "S", "SANN": "SANN", "SDlog": "SDlog", @@ -3625,12 +3639,12 @@ "Sample Size:": "Tamaño de la muestra:", "Sample_Size": "Tamaño de la muestra", "Sampling Fraction:": "Fracción de muestreo:", - "Sans-serif": "sans-serif", + "Sans-serif": "Sans-serif", "Satelite": "Satélite", "Satelite Anomalies": "Anomalías satelitales", "Satelite Anomalies:": "Anomalías de satélites:", "Satelite Element:": "Elemento Satélite:", - "Save": "Ahorrar", + "Save": "Guardar", "Save As": "Guardar como", "Save As Data Frame": "Guardar como marco de datos", "Save As Table": "Guardar como tabla", @@ -3653,7 +3667,7 @@ "Save Details": "Guardar detalles", "Save Downloaded File To:": "Guardar el archivo descargado en:", "Save Downloaded File to:": "Guardar el archivo descargado en:", - "Save Dummy:": "Guardar maniquí:", + "Save Dummy:": "Guardar ficticias:", "Save Estimate": "Guardar presupuesto", "Save File As:": "Guardar archivo como:", "Save Fit": "Guardar ajuste", @@ -3692,11 +3706,11 @@ "Save file(s) to:": "Guardar archivo(s) en:", "Save result for second column:": "Guardar resultado para la segunda columna:", "Save test object": "Guardar objeto de prueba", - "Save the script in the current tab to a file.": "Guarde el script en la pestaña actual en un archivo.", + "Save the script in the current tab to a file.": "Guardar el script en la pestaña actual en un archivo.", "Save values": "Guardar valores", - "Save...": "Ahorrar...", + "Save...": "Guardar...", "Saving Options": "Opciones de guardado", - "Saving at:": "Ahorro en:", + "Saving at:": "Guardado en:", "Scale": "Escala", "Scale Data": "Datos de escala", "Scale Numeric Variables": "Variables numéricas de escala", @@ -3705,9 +3719,9 @@ "Scale/Distance": "Escala/Distancia", "Scale/Distance...": "Escala/Distancia...", "Scale:": "Escala:", - "Scaled Fractions": "fracciones escaladas", + "Scaled Fractions": "Fracciones escaladas", "Scaled Points": "Puntos escalados", - "Scales": "Escamas", + "Scales": "Escalas", "Scatter Matrix": "Matriz de dispersión", "Scatter Plot": "Gráfico de dispersión", "Scatter Plot Options": "Opciones de diagrama de dispersión", @@ -3715,26 +3729,26 @@ "Scatter and line plot": "Gráfico de dispersión y línea", "Scatter plot": "Gráfico de dispersión", "Scatterplot...": "Gráfico de dispersión...", - "Scol": "escuela", + "Scol": "Scol", "Score": "Puntaje", "Screaming snake": "serpiente gritando", "Scree Plot": "Gráfico de sedimentación", "Script": "Guion", - "Script Window": "Ventana de guión", + "Script Window": "Ventana de guion", "Script Window...": "Ventana de guiones...", "Script:": "Guion:", "Sd": "Dakota del Sur", "Sd_Pop:": "Sd_pop:", "Sea surface temperature": "Temperatura de la superficie del mar", "Search": "Buscar", - "Search in ": "Busca en ", + "Search in ": "Buscar en ", "Search to end only": "Buscar solo para finalizar", "Search...": "Buscar...", "Season Dates": "Fechas de temporada", "Seasonal Comparisons": "Comparaciones estacionales", "Seasonal Forecast Support": "Soporte de pronóstico estacional", "Seasonal Mann-Kendall trend test (Hirsch-Slack test)": "Prueba de tendencia estacional de Mann-Kendall (prueba de Hirsch-Slack)", - "Seasonal Plot...": "Parcela de temporada...", + "Seasonal Plot...": "Gráfico de temporada...", "Seasonal Summary": "Resumen estacional", "Seasonal Summary Rain...": "Resumen estacional Lluvia...", "Seasonal Summary...": "Resumen de temporada...", @@ -3747,7 +3761,7 @@ "Second Data Frame:": "Segundo marco de datos:", "Second Explanatory Variable": "Segunda variable explicativa", "Second Explanatory Variable:": "Segunda Variable Explicativa:", - "Second Factor": "segundo factor", + "Second Factor": "Segundo factor", "Second Factor (Optional) :": "Segundo Factor (Opcional) :", "Second Factor (Optional):": "Segundo Factor (Opcional):", "Second Factor:": "Segundo factor:", @@ -3784,7 +3798,7 @@ "Select all the contents of the current tab. (Ctrl+A)": "Selecciona todo el contenido de la pestaña actual. (Ctrl+A)", "Select by condition": "Seleccionar por condición", "Select by factor values": "Seleccionar por valores de factor", - "Select default value for missing values": "Seleccione el valor predeterminado para los valores que faltan", + "Select default value for missing values": "Seleccione el valor predeterminado para los valores faltantes", "Selected Column": "Columna seleccionada", "Selected Column(s):": "Columna(s) seleccionada(s):", "Selected Column:": "Columna seleccionada:", @@ -3811,14 +3825,15 @@ "Selected Variable:": "Variable Seleccionada:", "Selected Variables": "Variables seleccionadas", "Selected Variables:": "Variables seleccionadas:", - "Selected column": "columna seleccionada", + "Selected column": "Columnas seleccionadas", "Selected:": "Seleccionado:", "Selected:0": "Seleccionado:0", + "Selecting Option": "Selección de opción", "Selection": "Selección", "Selection Preview": "Vista previa de selección", "Selection Preview:": "Vista previa de selección:", "Selection:": "Selección:", - "Semi Join": "Semi-unirse", + "Semi Join": "Semi-unir", "Semi-Colon(;)": "Punto y coma(;)", "Semi-colon ": "Punto y coma ", "Semicolon ;": "punto y coma;", @@ -3827,7 +3842,7 @@ "Sentence": "Oración", "Sentences": "Oraciones", "Sen’s slope for linear rate of change and corresponding confidence interval": "Pendiente de Sen para tasa de cambio lineal e intervalo de confianza correspondiente", - "Separate Tables": "Mesas Separadas", + "Separate Tables": "Tablas Separadas", "Separate values by commas. For example 20, 30, 40, 50 gives 3 groups. If minimum is less than 20 then a 4th group is added. Similarly with a maximum more than 50.": "Separe los valores por comas. Por ejemplo, 20, 30, 40, 50 da 3 grupos. Si el mínimo es inferior a 20, se añade un cuarto grupo. Del mismo modo con un máximo de más de 50.", "Separator": "Separador", "Separator:": "Separador:", @@ -3860,12 +3875,13 @@ "Sets:": "Conjuntos:", "Settings": "Ajustes", "Setup For Data Entry": "Configuración para la entrada de datos", + "Setup for Data Editing...": "Configuración para la edición de datos...", "Setup for Data Entry...": "Configuración para la entrada de datos...", "Shape": "Forma", "Shape (Optional):": "Forma (Opcional):", "Shape File": "Archivo de forma", "Shape1": "Forma1", - "Shape2": "forma2", + "Shape2": "Forma2", "Shape:": "Forma:", "Shapiro-Francia test for normality": "Prueba de normalidad de Shapiro-Francia", "Shave": "Afeitar", @@ -3876,7 +3892,7 @@ "Shift:": "Cambio:", "Shifted": "Desplazado", "Short": "Corto", - "Show": "Espectáculo", + "Show": "Mostrar", "Show Arguments": "Mostrar argumentos", "Show Calculator": "Mostrar calculadora", "Show Climatic Menu": "Mostrar menú climático", @@ -3931,7 +3947,7 @@ "Signature Period Categories:": "Categorías del período de firma:", "Signature Period Corrected:": "Período de firma corregido:", "Signature Period:": "Período de firma:", - "Signif Fig": "higo significativo", + "Signif Fig": "Fig significativa", "Significance Level": "Nivel significativo", "Significance Level:": "Nivel significativo:", "Significance Stars": "Estrellas de significado", @@ -3951,7 +3967,7 @@ "Single Graphs": "Gráficos individuales", "Single Point": "Punto único", "Single Value:": "Valor único:", - "Single Variable": "variable única", + "Single Variable": "Variable única", "Single column": "Una sola columna", "Site": "Sitio", "Site...": "Sitio...", @@ -3965,21 +3981,22 @@ "Size Y-Axis Label": "Etiqueta del eje Y de tamaño", "Size of legend keys": "Tamaño de las claves de la leyenda", "Size:": "Tamaño:", - "Skewness": "Oblicuidad", + "Skewness": "Asimetría", "Skewness (3rd Moment)": "Asimetría (3er Momento)", - "Skewness (3rd Moment) (W)": "Sesgo (3.er momento) (W)", + "Skewness (3rd Moment) (W)": "Asimetría (3er Momento) (W)", "Skewness Weight:": "Peso de asimetría:", - "Skim": "Desnatar", + "Skim": "Quitar", + "Skim or Two Variables": "Skim o dos variables", "Skip ngrams": "Saltar ngramas", "Slope": "Pendiente", - "Slopes": "Pistas", + "Slopes": "Pendientes", "Small": "Pequeño", "Small State:": "Estado pequeño:", "Small camel": "camello pequeño", - "Smooth": "Suave", - "Smooth Options": "Opciones suaves", + "Smooth": "Liso", + "Smooth Options": "Opciones lisas", "Smoothing Curves": "Suavizado de curvas", - "Sn": "sn", + "Sn": "Sn", "Snake": "Serpiente", "Solar": "Solar", "Solar:": "Solar:", @@ -3992,7 +4009,7 @@ "Sort by Name": "Ordenar por nombre", "Sort by Row Names": "Ordenar por nombres de fila", "Sort by:": "Ordenar por:", - "Sort the strings. For example, str_sort(c(": "Ordena las cuerdas. Por ejemplo, str_sort(c(", + "Sort the strings. For example, str_sort(c(": "Ordenar las cuerdas. Por ejemplo, str_sort(c(", "Sort values": "Ordenar valores", "Sort...": "Clasificar...", "Source:": "Fuente:", @@ -4008,10 +4025,10 @@ "Spacing between legends": "Espaciado entre leyendas", "Span": "Lapso", "Span:": "Lapso:", - "Spanish": "español", + "Spanish": "Español", "Spearman": "Lancero", "Specific": "Específico", - "Specifiy": "especificar", + "Specifiy": "Especificar", "Specify": "Especificar", "Specify Breaks": "Especificar descansos", "Specify Decimals (from Numeric)": "Especificar decimales (desde numérico)", @@ -4027,17 +4044,18 @@ "Specify the encoding of a string": "Especificar la codificación de una cadena", "Spectral": "Espectral", "Speed Cuts:": "Cortes de velocidad:", - "Spell": "Deletrear", - "Spell Can Span Years": "El hechizo puede abarcar años", - "Spell Length": "Duración del hechizo", - "Spells": "Hechizos", - "Spells...": "Hechizos...", + "Spell": "Evento", + "Spell Can Span Years": "El evento puede abarcar años", + "Spell Length": "Duración del evento", + "Spells": "Eventos", + "Spells...": "Eventos...", "Spline": "Ranura", "Spline d.f.": "df spline", "Spline interpolation of missing values. For example na.spline(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,2.5,4,7,12)": "Interpolación spline de valores faltantes. Por ejemplo na.spline(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,2.5 ,4,7,12)", "Split Geometry": "Dividir geometría", "Split Text Column": "Columna de texto dividido", - "Split by:": "Dividido por:", + "Split Text...": "Dividir texto...", + "Split by:": "Dividir por:", "Split...": "Dividir...", "Splits the data into groups of at least the specified size.": "Divide los datos en grupos de al menos el tamaño especificado.", "Sqrt": "Sqrt", @@ -4045,7 +4063,7 @@ "Square Root": "Raíz cuadrada", "Squarified": "escuadrado", "Squish": "Chapotear", - "Srow": "srow", + "Srow": "Srow", "Stack": "Pila", "Stack (Pivot Longer)": "Pila (pivote más largo)", "Stack (Pivot Longer)...": "Pila (pivote más largo)...", @@ -4055,18 +4073,18 @@ "Stack Daily data...": "Apilar datos diarios...", "Stack Data Into:": "Apilar datos en:", "Stack Multiple Column Sets": "Apilar conjuntos de varias columnas", - "Stack in reverse": "apilar al revés", - "Stack...": "Pila...", + "Stack in reverse": "Apilar al revés", + "Stack...": "Apilar...", "Stacked Graph": "Gráfico apilado", - "Stand:": "Estar de pie:", + "Stand:": "Soporte:", "Standard": "Estándar", "Standard Deviation": "Desviación Estándar", - "Standard Error of the Mean": "Error estandar de la media", + "Standard Error of the Mean": "Error estándar de la media", "Standard Normal Homogeinity Test (SNHT) for Change-Point Detection": "Prueba de homogeneidad normal estándar (SNHT) para la detección de puntos de cambio", "Standard_deviation": "Desviación Estándar", "Standardise Country Names": "Estandarizar nombres de países", "Standardize": "Estandarizar", - "Start": "comienzo", + "Start": "Iniciar", "Start Date": "Fecha de inicio", "Start Date (From)": "Fecha de inicio (Desde)", "Start Date:": "Fecha de inicio:", @@ -4086,7 +4104,7 @@ "Start of the Rains...": "Comienzo de las Lluvias...", "Start of the string. For example, str_count(c(": "Inicio de la cadena. Por ejemplo, str_count(c(", "Start(L):": "Inicio (L):", - "Start:": "Comienzo:", + "Start:": "Iniciar:", "Starting Angle:": "Ángulo de inicio:", "Starting Month:": "Mes de inicio:", "Starting from:": "Empezando desde:", @@ -4140,10 +4158,10 @@ "Structured": "Estructurado", "Structured Menu": "Menú estructurado", "Stub": "Talón", - "Stub Border": "Borde de trozo", - "Stub Font": "Fuente de trozo", + "Stub Border": "Borde de talón", + "Stub Font": "Fuente de talón", "Stub Row Group Border": "Borde de grupo de filas auxiliares", - "Stud": "Semental", + "Stud": "Stud", "Students_t": "Estudiantes_t", "Style": "Estilo", "Style:": "Estilo:", @@ -4154,24 +4172,24 @@ "Sub-Calculations:": "Subcálculos:", "Subset": "Subconjunto", "Subset...": "Subconjunto...", - "Substring": "subcadena", + "Substring": "Subcadena", "Subtitle Size:": "Tamaño del subtítulo:", "Subtitle:": "Subtitular:", - "Subtotals": "subtotales", + "Subtotals": "Subtotales", "Subtract": "Sustraer", "Success:": "Éxito:", "Successive Values": "Valores sucesivos", "Sum": "Suma", "Sum (W)": "Suma (W)", "Sum of squared residuals": "Suma de residuos al cuadrado", - "Sum to Zero": "suma a cero", - "Summaries": "resúmenes", - "Summaries...": "resúmenes...", + "Sum to Zero": "Suma a cero", + "Summaries": "Resúmenes", + "Summaries...": "Resúmenes...", "Summaries:": "Resúmenes:", "Summarise By:": "Resumir por:", - "Summarise CRI by Country (or other)...": "Resuma el CRI por país (u otro)...", - "Summarise Red Flags by Country (or other)...": "Resuma las banderas rojas por país (u otro)...", - "Summarise Red Flags by Country and Year (or other)...": "Resuma las banderas rojas por país y año (u otro)...", + "Summarise CRI by Country (or other)...": "Resumir el CRI por País (u otro)...", + "Summarise Red Flags by Country (or other)...": "Resumir Banderas Rojas por País (u otro)...", + "Summarise Red Flags by Country and Year (or other)...": "Resumir Banderas Rojas por País y Año (u otro)...", "Summarise...": "Resumir...", "Summary": "Resumen", "Summary : ": "Resumen : ", @@ -4190,7 +4208,7 @@ "Summary:": "Resumen:", "Summary_mean": "Summary_mean", "Summer Days [2:SU]": "Días de verano [2:SU]", - "Sunshine": "Brillo Solar", + "Sunshine": "Luz Solar", "Sunshine Hours:": "Horas de sol:", "Sunshine/Radiation...": "Sol/Radiación...", "Super-Duper": "Super-Duper", @@ -4198,13 +4216,14 @@ "Suppl.Numeric:": "Numérico suplementario:", "Supplementary Individuals": "Individuos Suplementarios", "Surface pressure": "Presión superficial", + "Survey": "Encuesta", "Survival": "Supervivencia", "Survival Object Name:": "Nombre del objeto de supervivencia:", - "Swap": "Intercambio", + "Swap": "Intercambiar", "Swap Data and Metadata": "Intercambiar datos y metadatos", "Swap x and y": "Intercambiar x e y", "Symbol:": "Símbolo:", - "Symbols": "simbolos", + "Symbols": "Símbolos", "Symmetric Extremal Dependence Index": "Índice de Dependencia Extrema Simétrica", "Symmetric Extreme Dependency Score": "Puntuación de dependencia extrema simétrica", "Symmetry": "Simetría", @@ -4215,16 +4234,19 @@ "TRMM 3B42 Daily Precipitation": "TRMM 3B42 Precipitación Diaria", "TRUE": "CIERTO", "TabPage1": "TabPage1", - "Table": "Mesa", - "Table Border": "borde de la tabla", - "Table Font": "Fuente de la tabla", + "Table": "Tabla", + "Table Border": "Borde de tabla", + "Table Font": "Fuente de tabla", "Table Frequencies": "Tabla de frecuencias", "Table Name:": "Nombre de la tabla:", "Table Title:": "Título de la tabla:", - "Table To Use:": "Mesa a utilizar:", + "Table To Use:": "Tabla a utilizar:", + "Table or Graph": "Tabla o Gráfico", + "Table or Graph. Also Stem and Leaf Plots": "Tabla o Gráfico. También diagramas de tallo y hoja", + "Table, Stacked Graph or Likert Graph": "Tabla, gráfico apilado o gráfico de Likert", "Table/Chart :": "Tabla/Gráfico:", - "Tables": "Mesas", - "Tables...": "Mesas...", + "Tables": "Tablas", + "Tables...": "Tablas...", "Tabulation...": "Tabulación...", "Tag": "Etiqueta", "Tag Size:": "Tamaño de la etiqueta:", @@ -4236,8 +4258,8 @@ "Tax Haven:": "Paraíso fiscal:", "Taylor Diagram": "Diagrama de Taylor", "Taylor Diagram Options": "Opciones de diagrama de Taylor", - "Taylor Diagram...": "diagrama de taylor...", - "Temperature": "La temperatura", + "Taylor Diagram...": "Diagrama de Taylor...", + "Temperature": "Temperatura", "Temperature Graph...": "Gráfico de temperatura...", "Temperature Quantiles:": "Cuantiles de temperatura:", "Temperature...": "Temperatura...", @@ -4292,6 +4314,7 @@ "Themes": "Temas", "Themes Sub Dialog": "Subdiálogo Temas", "Themes...": "Temas...", + "There are no entries matching ": "No hay entradas que coincidan ", "Thicknes:": "Espesores:", "Thickness:": "Espesor:", "Third Context:": "Tercer Contexto:", @@ -4306,9 +4329,9 @@ "Three Summaries...": "Tres resúmenes...", "Three Variable Frequencies": "Tres frecuencias variables", "Three Variable Modelling": "Modelado de tres variables", - "Three Variables": "tres variables", - "Three Variables...": "tres variables...", - "Three variables": "tres variables", + "Three Variables": "Tres variables", + "Three Variables...": "Tres variables...", + "Three variables": "Tres variables", "Three-Way Frequencies...": "Frecuencias de tres vías...", "Threshold": "Límite", "Threshold ": "Límite ", @@ -4318,16 +4341,17 @@ "Tick Mark Labels ": "Etiquetas de marca de verificación ", "Tick marks along axes": "Marcas de graduación a lo largo de los ejes", "Tick marks label along axes": "Etiqueta de marcas de graduación a lo largo de los ejes", - "TickMarkers": "Marcadores de garrapatas", - "Tidy": "Ordenado", + "TickMarkers": "Marcadores de verificación", + "Tidy": "Ordenar", "Tidy Daily Data": "Datos diarios ordenados", "Tidy Daily Data...": "Datos diarios ordenados...", - "Tidy and Examine": "ordenar y examinar", - "Tidy...": "Ordenado...", - "Ties": "Corbatas", + "Tidy Data": "Datos ordenados", + "Tidy and Examine": "Ordenar y examinar", + "Tidy...": "Ordenar...", + "Ties": "Lazos", "Ties method": "Método de lazos", - "Tile": "Teja", - "Tile colour:": "Color del azulejo:", + "Tile": "Mosaico", + "Tile colour:": "Color del mosaico:", "Time (X axis):": "Tiempo (eje X):", "Time Period": "Periodo de tiempo", "Time Point:": "Punto de tiempo:", @@ -4336,9 +4360,9 @@ "Time Series": "Series de tiempo", "Time Series Comparisons": "Comparaciones de series temporales", "Time Series Plot...": "Gráfico de serie temporal...", - "Time Step": "Hora de caminar", + "Time Step": "Intervalo de tiempo", "Time interval:": "Intervalo de tiempo:", - "Time(s)": "Veces)", + "Time(s)": "Tiempo (s)", "Times Roman": "Times Roman", "Timeseries...": "Series de tiempo...", "Timezone:": "Zona horaria:", @@ -4369,22 +4393,22 @@ "Toggle Log/Script window open and closed": "Alternar ventana de registro/secuencia de comandos abierta y cerrada", "Toggle Metadata windows open and closed": "Alternar ventanas de metadatos abiertas y cerradas", "Toggle Output window open and closed": "Alternar ventana de salida abierta y cerrada", - "Token:": "Simbólico:", + "Token:": "Código:", "Tolerance": "Tolerancia", "Tolerance:": "Tolerancia:", "Tolerance: ": "Tolerancia: ", "Tool": "Herramienta", - "ToolStrip1": "tira de herramientas1", + "ToolStrip1": "ToolStrip1", "ToolStripSplitButton2": "ToolStripSplitButton2", "ToolStripSplitButton3": "ToolStripSplitButton3", "Tools": "Herramientas", "Top": "Parte superior", "Top Color": "Color superior", - "Top Style": "Estilo máximo", + "Top Style": "Estilo superior", "Top Width": "Ancho superior", "Top and bottom": "Arriba y abajo", "Top and left": "Arriba e izquierda", - "Top and right": "arriba y a la derecha", + "Top and right": "Arriba y a la derecha", "Top levels displayed:": "Niveles superiores mostrados:", "Top, bottom and left": "Arriba, abajo e izquierda", "Top, right and bottom": "Arriba, derecha y abajo", @@ -4404,6 +4428,7 @@ "Trace Values": "Valores de rastreo", "Transform": "Transformar", "Transform Text Column": "Transformar columna de texto", + "Transform Text...": "Transformar texto...", "Transform...": "Transformar...", "Transform:": "Transformar:", "Transformation": "Transformación", @@ -4437,7 +4462,7 @@ "Tufte Box Options": "Opciones de caja Tufte", "Tufte Boxplot": "Diagrama de caja de Tufte", "Tufte Boxplots": "Gráficos de caja de Tufte", - "Tweets": "tuits", + "Tweets": "Tuits", "Two Columns": "Dos columnas", "Two Columns in Same Data Frame": "Dos columnas en el mismo marco de datos", "Two Columns in Separate Data Frames": "Dos columnas en marcos de datos separados", @@ -4445,21 +4470,21 @@ "Two Data Frames Wide": "Dos marcos de datos de ancho", "Two Plus Variable Graph": "Gráfico de dos variables más", "Two Sample Non parametric Tests": "Pruebas no paramétricas de dos muestras", - "Two Samples...": "dos muestras...", + "Two Samples...": "Dos Muestras...", "Two Variable Fit Model": "Modelo de ajuste de dos variables", "Two Variable Frequencies by Sector (or other)...": "Dos Frecuencias Variables por Sector (u otro)...", "Two Variable Graph": "Gráfico de dos variables", "Two Variable Use Model": "Modelo de uso de dos variables", - "Two Variables": "dos variables", - "Two Variables...": "dos variables...", + "Two Variables": "Dos variables", + "Two Variables...": "Dos variables...", "Two Way Frequencies": "Frecuencias bidireccionales", "Two sided": "Dos caras", "Two variables with daily dates and rainfall, ready for climatic data entry.": "Dos variables con fechas diarias y pluviometría, listas para el ingreso de datos climáticos.", - "Two-Dash": "dos guiones", - "Two-Sided": "dos caras", + "Two-Dash": "Dos guiones", + "Two-Sided": "Dos caras", "Two-Way Frequencies...": "Frecuencias bidireccionales...", "Two/Three Variables": "Dos/Tres Variables", - "Type": "Escribe", + "Type": "Tipo", "Type Levels by separating them with comma e.g A,B,C": "Escriba los niveles separándolos con una coma, por ejemplo, A,B,C", "Type Of Dispaly": "Tipo de pantalla", "Type \\n where you would like a new-line": "Escriba \\n donde le gustaría una nueva línea", @@ -4469,7 +4494,7 @@ "Type of Palette": "Tipo de paleta", "Type of Test": "Tipo de prueba", "Type of test": "Tipo de prueba", - "Type:": "Escribe:", + "Type:": "Tipo:", "Types": "Tipos", "Typical": "Típico", "UCSB CHIRPS": "CHIRPS UCSB", @@ -4481,7 +4506,7 @@ "URWPalladioURWTimes": "URWPalladioURWTimes", "UTC": "UTC", "UTF-8": "UTF-8", - "Ubuntu": "ubuntu", + "Ubuntu": "Ubuntu", "UnTransform": "DesTransformar", "Underscore _": "Guion bajo _", "Undo": "Deshacer", @@ -4495,9 +4520,9 @@ "Uniminmax": "Uniminmax", "Units": "Unidades", "Units:": "Unidades:", - "Unlock": "desbloquear", - "Unnest": "anidar", - "Unselect all": "Deselecciona todo", + "Unlock": "Desbloquear", + "Unnest": "Desanidar", + "Unselect all": "Deseleccionar todo", "Unstack (Pivot Wider)": "Desapilar (girar más ancho)", "Unstack (Pivot Wider)...": "Desapilar (girar más ancho)...", "Unstack Columns": "Desapilar columnas", @@ -4512,30 +4537,31 @@ "Up to previous folder step 1.": "Hasta la carpeta anterior paso 1.", "Update": "Actualizar", "Upper": "Superior", - "Upper Limit": "Limite superior", - "Upper Limit :": "Limite superior :", + "Upper Limit": "Límite superior", + "Upper Limit :": "Límite superior:", "Upper camel": "camello superior", "Upper lower": "Superior inferior", "Uppercase": "Mayúsculas", - "Use Award Date (or other)...": "Utilice la fecha de adjudicación (u otra)...", + "Use Award Date (or other)...": "Utilizar fecha de adjudicación (u otra)...", "Use Date": "Fecha de uso", "Use Date...": "Fecha de uso...", "Use Factor Sheet": "Hoja de factores de uso", "Use Graph": "Usar gráfico", "Use Graph...": "Usar gráfico...", - "Use Great Circle (WGS84 ellipsoid) distance for nearest points": "Use la distancia del gran círculo (elipsoide WGS84) para los puntos más cercanos", + "Use Great Circle (WGS84 ellipsoid) distance for nearest points": "Usar la distancia del gran círculo (elipsoide WGS84) para los puntos más cercanos", "Use Max and Min": "Usar Máx. y Mín.", "Use Model": "Modelo de uso", "Use Model ": "Modelo de uso ", "Use Model Keyboard...": "Usar modelo de teclado...", "Use Model Keyboards...": "Utilizar teclados modelo...", + "Use Regular Expression": "Usar expresión regular", "Use Summaries": "Usar resúmenes", "Use Summaries...": "Usar resúmenes...", "Use Table": "Tabla de uso", - "Use Table...": "Usar tabla...", - "Use Time...": "Usar el tiempo...", - "Use unique values for comparison": "Utilice valores únicos para la comparación", - "Use(Slightly) at your peril.": "Use (ligeramente) bajo su propio riesgo.", + "Use Table...": "Tabla de uso...", + "Use Time...": "Usar tiempo...", + "Use unique values for comparison": "Utilizar valores únicos para la comparación", + "Use(Slightly) at your peril.": "Usar (ligeramente) bajo su propio riesgo.", "User Data": "Datos del usuario", "User Define": "Definido por el usuario", "User Defined": "Usuario definido", @@ -4582,13 +4608,13 @@ "Variance": "Diferencia", "Variate:": "Variar:", "Variogram Data Frame:": "Marco de datos de variograma:", - "Variogram...": "variograma...", + "Variogram...": "Variograma...", "Verification": "Verificación", "Verification Summaries": "Resúmenes de verificación", "Vertcal-Line(|)": "Línea vertical (|)", "Vertical": "Vertical", "Vertical Label Position:": "Posición de etiqueta vertical:", - "Vertical Padding": "Acolchado Vertical", + "Vertical Padding": "Relleno vertical", "Vertical X Tick Markers": "Marcadores verticales X Tick", "Vertical major grid lines ": "Líneas de cuadrícula principales verticales ", "Vertical minor grid lines": "Líneas de cuadrícula menores verticales", @@ -4612,17 +4638,17 @@ "View and Remove Keys...": "Ver y eliminar claves...", "View and Remove Links": "Ver y eliminar enlaces", "View and Remove Links...": "Ver y eliminar enlaces...", - "View html file": "ver archivo html", + "View html file": "Ver archivo html", "View...": "Vista...", "View/Delete Labels": "Ver/Eliminar etiquetas", "View/Delete Labels...": "Ver/Eliminar etiquetas...", "View/Edit Last Dialogue": "Ver/Editar último diálogo", "Viewer...": "Espectador...", - "Vignettes": "viñetas", + "Vignettes": "Viñetas", "Violet": "Violeta", "Violin": "Violín", - "Violin + Boxplot": "Violín + diagrama de caja", - "Violin + Jitter": "Violín + Jitter", + "Violin + Boxplot": "Violín + Diagrama de caja", + "Violin + Jitter": "Violín + Fluctuación", "Violin Options": "Opciones de violín", "Violin Plot": "Trama de violín", "Violin Plot Options": "Opciones de trama de violín", @@ -4641,7 +4667,7 @@ "WIGOS Station Identifier:": "Identificador de la estación WIGOS:", "WMO Number": "Número de la OMM", "WMO Number:": "Número de la OMM:", - "Wakefield": "wakefield", + "Wakefield": "Wakefield", "Wald": "Wald", "Warm Spell Duration Index [14:WSDI]": "Índice de duración de periodos cálidos [14:WSDI]", "Warm spell is defined as a sequence of 6 or more days in which the daily maximum temperature exceeds the 90th percentile of daily maximum temperature for a 5-day running window surrounding this day during the baseline period": "El período cálido se define como una secuencia de 6 o más días en los que la temperatura máxima diaria excede el percentil 90 de la temperatura máxima diaria durante una ventana de 5 días consecutivos que rodea este día durante el período de referencia", @@ -4666,7 +4692,7 @@ "When interval-censored, the 'Event' variable takes 0=right censored, 1=event at time, 2=left censored, 3=interval censored.": "Cuando se censura por intervalo, la variable 'Evento' toma 0 = censura por la derecha, 1 = evento en el tiempo, 2 = censura por la izquierda, 3 = censura por intervalo.", "When strips are switched (Grid)": "Cuando se cambian las tiras (Cuadrícula)", "When the year is shifted, this gives the starting year, for example 1984-1985 is given as 1984": "Cuando se cambia el año, esto da el año de inicio, por ejemplo, 1984-1985 se da como 1984", - "While you're waiting...": "Mientras esperas...", + "While you're waiting...": "Mientras espera...", "Whisk Line Type": "Tipo de línea de batidor", "Whisker Colour": "Color del bigote", "Whisklty": "whisky", @@ -4679,7 +4705,7 @@ "Width": "Ancho", "Width:": "Ancho:", "Wilcoxon": "Wilcoxon", - "Wilson": "wilson", + "Wilson": "Wilson", "Wind": "Viento", "Wind Direction 2:": "Dirección del viento 2:", "Wind Direction:": "Dirección del viento:", @@ -4693,7 +4719,7 @@ "Wind/Pollution Rose...": "Rosa viento/contaminación...", "WindSpeed:": "Velocidad del viento:", "Window Number": "Número de ventana", - "Windows": "ventanas", + "Windows": "Ventanas", "Windrose Options": "Opciones de rosa de los vientos", "Windrose...": "Rosa de los vientos...", "Winner Country ISO2:": "Ganador País ISO2:", @@ -4701,10 +4727,10 @@ "Winner Country:": "País ganador:", "Winner ID:": "Identificación del ganador:", "Winner Name:": "Nombre del ganador:", - "With Replacement": "con reemplazo", + "With Replacement": "Con reemplazo", "With Standard Error": "Con error estándar", "With X Variable": "Con variable X", - "With column": "con columna", + "With column": "Con columna", "With more than one condition, e.g. (sunhrs >14) | (sunhrs <0) then just one need be TRUE.": "Con más de una condición, por ejemplo (sunhrs >14) | (sunhrs <0) entonces solo uno debe ser VERDADERO.", "With more than one condition, e.g. (year > 1990) & (year < 2021) they have all to be TRUE.": "Con más de una condición, p. ej. (año > 1990) y (año < 2021) todas tienen que ser VERDADERAS.", "Within Year": "Dentro del año", @@ -4742,15 +4768,15 @@ "X-Axis": "eje X", "X-Axis Labels": "Etiquetas del eje X", "X-Axis Line": "Línea del eje X", - "X-Axis Tick Markers": "Marcadores de garrapatas del eje X", + "X-Axis Tick Markers": "Marcadores de marca del eje Y", "X-Axis Title": "Título del eje X", "X-Lab Title": "Título de X-Lab", - "X-axis": "eje x", + "X-axis": "Eje X", "X-axis Options:": "Opciones del eje X:", "X:": "X:", "XY-Axes": "Ejes XY", "Xlim": "Xlim", - "Xml": "xml", + "Xml": "Xml", "Y Label": "Etiqueta Y", "Y TextSize:": "Tamaño de texto Y:", "Y Value": "Valor Y", @@ -4759,9 +4785,9 @@ "Y Variable:": "Variable Y:", "Y Variables": "Variables Y", "Y Variables:": "Variables Y:", - "Y Variate:": "Y Variar:", + "Y Variate:": "Variar Y:", "Y axis Label Size": "Tamaño de la etiqueta del eje Y", - "Y axis Tick Mark Label Size": "Eje Y Marca de graduación Tamaño de etiqueta", + "Y axis Tick Mark Label Size": "Tamaño de etiqueta de marca de graduación del eje X", "Y axis labels": "Etiquetas del eje Y", "Y axis labels on right axis": "Etiquetas del eje Y en el eje derecho", "Y axis tick labels": "Etiquetas de marca del eje Y", @@ -4769,7 +4795,7 @@ "Y axis tick marks": "Marcas de graduación del eje Y", "Y label": "etiqueta Y", "Y variable": "Yvariable", - "Y-Axis": "eje Y", + "Y-Axis": "Eje Y", "Y-Axis Labels": "Etiquetas del eje Y", "Y-Axis Line": "Línea del eje Y", "Y-Axis Tick Markers": "Marcadores de marca del eje Y", @@ -4781,7 +4807,7 @@ "Year": "Año", "Year - DOY Plot": "Año - Parcela DOY", "Year - Month - Day": "Año mes dia", - "Year As Factor": "año como factor", + "Year As Factor": "Año como factor", "Year Columns": "Columnas de año", "Year Columns:": "Columnas de año:", "Year Month Day": "Año mes dia", @@ -4801,23 +4827,23 @@ "Yellow": "Amarillo", "Yellow-Green": "Amarillo verde", "Yes": "Sí", + "YlGn": "YlGn", + "YlGnBu": "YlGnBu", + "YlOrBr": "ylorbr", + "YlOrRd": "ylorrd", + "Ylim": "Ylim", "You have multiple rows with the same dates for one or more stations. Use the Climatic > Tidy and Examine > Duplicates dialog to investigate these issues.": "Tiene varias filas con las mismas fechas para una o más estaciones. Utilice el cuadro de diálogo Climatic > Ordenar y Examinar > Duplicados para investigar estos problemas.", "Zero Values": "Valores cero", "Zplot Plot": "Parcela Zplot", - "[^ ] not": "[^] no", - "\\ escape": "\\ escapar", - "\\d digit": "\\d dígito", - "\\s space": "\\s espacio", - "^": "^", - "^ begin": "^ comenzar", + "Zseq": "Zseq", "a quantile, given a value between 0 and 1. So quantile(c(1,2,3,4,10), 0.25) = 2 and is the lower quartile.": "un cuantil, dado un valor entre 0 y 1. Por lo tanto, cuantil (c (1,2,3,4,10), 0.25) = 2 y es el cuartil inferior.", "aapc": "aapc", - "abs": "abdominales", + "abs": "abs", "abundant": "abundante", "achilles": "Aquiles", "acos": "acos", "add a value (default 10) to each number in the list": "agregue un valor (predeterminado 10) a cada número en la lista", - "add the option to omit missing values in the summaries": "agregue la opción para omitir valores faltantes en los resúmenes", + "add the option to omit missing values in the summaries": "agregar la opción para omitir valores faltantes en los resúmenes", "add_na": "añadir_na", "adjust": "ajustar", "age": "años", @@ -4828,7 +4854,7 @@ "alpha:": "alfa:", "also called Regular or Hamming or 5-smooth numbers. Numbers for which the factors are only 2, or 3 or 5.": "también llamados números Regulares o Hamming o 5-lisos. Números para los cuales los factores son solo 2, o 3 o 5.", "also called mutually prime, for example coprime(30,77) = TRUE. (30 = 235, 77 = 7*11)": "también llamados mutuamente primos, por ejemplo coprime(30,77) = TRUE. (30 = 235, 77 = 7*11)", - "am": "soy", + "am": "am", "and": "y", "ang.dev": "ang.dev", "ang.var": "ang.var", @@ -4837,10 +4863,10 @@ "angle corresponding to a given sine (in the range (0 to pi). For example asin(1) = 1.57 = pi/2.": "ángulo correspondiente a un seno dado (en el rango (0 a pi). Por ejemplo asin(1) = 1.57 = pi/2.", "angle corresponding to a given tangent (in the range 0 to pi). For example atan(1) = 0..7854 (= pi/4); deg(atan(1)) = 45.": "ángulo correspondiente a una tangente dada (en el rango de 0 a pi). Por ejemplo atan(1) = 0..7854 (= pi/4); grado(atan(1)) = 45.", "angle:": "ángulo:", - "animal (f)": "animales", + "animal (f)": "animal (f)", "animals": "animales", "annual": "anual", - "anon": "luego", + "anon": "anon", "anova": "anova", "ansari": "Ansari", "answer (f)": "respuesta (f)", @@ -4861,7 +4887,7 @@ "asn": "como", "aspect.ratio": "relación de aspecto", "asymptotic ": "asintótico ", - "atan": "un bronceado", + "atan": "atan", "atan2": "atan2", "atanh": "atanh", "augment_dataframe": "aumentar_marco_de_datos", @@ -4895,7 +4921,7 @@ "beta": "beta", "beta function. For example beta(6,2) = gamma(6)gamma(2)/gamma(8) = 0.02381": "función beta. Por ejemplo beta(6,2) = gamma(6)gamma(2)/gamma(8) = 0.02381", "beta probabilities. For example pbeta(0.8,1,1) = 0.8 (Uniform); pbeta(0.8,10,10) = 0.9984": "probabilidades beta. Por ejemplo pbeta(0.8,1,1) = 0.8 (Uniforme); pbeta(0.8,10,10) = 0.9984", - "between": "Entre", + "between": "entre", "between two values, for example between(1:5, 3,4) is FALSE, FALSE, TRUE, TRUE, FALSE": "entre dos valores, por ejemplo entre (1:5, 3,4) es FALSO, FALSO, VERDADERO, VERDADERO, FALSO", "between. For example, str_count(c(": "entre. Por ejemplo, str_count(c(", "bigq": "grande", @@ -4909,14 +4935,14 @@ "binwidth": "ancho de papelera", "birds_antarctica": "aves_antártida", "blank": "blanco", - "bold": "atrevido", - "bolder": "más audaz", + "bold": "negrita", + "bolder": "negrita", "boot": "bota", "bottom": "abajo", - "boundary": "Perímetro", + "boundary": "perímetro", "box_no_facet": "box_no_facet", "boxcox": "boxcox", - "br": "hermano", + "br": "br", "br2": "br2", "break-spaces": "espacios de descanso", "broken": "roto", @@ -4941,7 +4967,7 @@ "centre and scale the data - usually by producing (x - xbar)/s": "centrar y escalar los datos, generalmente produciendo (x - xbar)/s", "change from degrees to radians. For example rad(90) = 2*pi * 90/360 = 1.57 ( = pi/2)": "cambio de grados a radianes. Por ejemplo rad(90) = 2*pi * 90/360 = 1,57 ( = pi/2)", "changes decimal data into a character variable with fractions. So 1.5 becomes 3/2, 0.25 becomes 1/4 etc.": "cambia datos decimales en una variable de carácter con fracciones. Así que 1,5 se convierte en 3/2, 0,25 se convierte en 1/4, etc.", - "character": "personaje", + "character": "carácter", "checks if the number is prime and returns 0 or 2, 0= False, 2= True. For example, is.prime(10) returns 0": "comprueba si el número es primo y devuelve 0 o 2, 0= Falso, 2= Verdadero. Por ejemplo, is.prime(10) devuelve 0", "chi square probabilities. For example pchisq(5,1) = 0.9747; pchisq(5,10) = 0.1088": "probabilidades de chi cuadrado. Por ejemplo pchisq(5,1) = 0.9747; pchisq(5,10) = 0.1088", "chi square quantiles. For example qchisq(0.95, 1) = 3.841; qchisq(0.95, 10) = 18.31": "cuantiles chi cuadrado. Por ejemplo qchisq(0.95, 1) = 3.841; qchisq(0.95, 10) = 18.31", @@ -4969,7 +4995,7 @@ "collapse": "colapsar", "collate": "cotejar", "colon is from:to(:). For example 3:6 is 3, 4, 5, 6. 6:3 is 6, 5, 4, 3 (It is the seq function with a step-length of 1 or -1.)": "dos puntos es de: a (:). Por ejemplo, 3:6 es 3, 4, 5, 6. 6:3 es 6, 5, 4, 3 (es la función seq con una longitud de paso de 1 o -1).", - "color (f)": "color", + "color (f)": "color (f)", "color:": "color:", "colour": "color", "colour :": "color :", @@ -4998,10 +5024,10 @@ "converts an integer into an octal number. For example, as.octmode(intToOct(c(2,5,12,17)))= 02,05,14,21": "convierte un número entero en un número octal. Por ejemplo, como.modooct(intToOct(c(2,5,12,17)))= 02,05,14,21", "converts an integer into an octal number. For example, intToOct(c(2,5,12,17))= 02,05,14,21": "convierte un número entero en un número octal. Por ejemplo, intToOct(c(2,5,12,17))= 02,05,14,21", "coprime": "coprime", - "cor": "corazón", + "cor": "cor", "correlation between 2 variables. It is a value between -1 and +1.": "correlación entre 2 variables. Es un valor entre -1 y +1.", - "cos": "porque", - "cosh": "aporrear", + "cos": "cos", + "cosh": "cosh", "cosine of angle in radians. For example cos(pi) = -1, cos(rad(90)) = (almost) 0.": "coseno del ángulo en radianes. Por ejemplo cos(pi) = -1, cos(rad(90)) = (casi) 0.", "count": "contar", "country": "país", @@ -5018,13 +5044,13 @@ "csv": "CSV", "cumdist": "cumdista", "cummax": "cummax", - "cummean": "semen", - "cummin": "comino", + "cummean": "cummean", + "cummin": "cummin", "cumprod": "Cumprod", "cumsum": "cumsum", "cumulative maxima. For example cummax(c(3,2,1,4,0)) = (3,3,3,4,4)": "máximos acumulativos. Por ejemplo cummax(c(3,2,1,4,0)) = (3,3,3,4,4)", "cumulative means. For example cummean(c(3,2,1,4,0)) = (3,2.5,2,2.5,2)": "medios acumulativos. Por ejemplo cummean(c(3,2,1,4,0)) = (3,2.5,2,2.5,2)", - "cumulative minima. For example cummin(c(3,2,1,4,0)) = (3,2.,1,1,0)": "mínimos acumulativos. Por ejemplo comino(c(3,2,1,4,0)) = (3,2.,1,1,0)", + "cumulative minima. For example cummin(c(3,2,1,4,0)) = (3,2.,1,1,0)": "mínimos acumulativos. Por ejemplo cummin(c(3,2,1,4,0)) = (3,2.,1,1,0)", "cumulative products. For example cumprod(c(2,3,5,7)) = (2,6,30,210)": "productos acumulativos. Por ejemplo cumprod(c(2,3,5,7)) = (2,6,30,210)", "cumulative sum of elements in each list. (replace by cummin, cummax, cumprod, or dplyr::cummean for other cumulative functions).": "suma acumulada de elementos en cada lista. (reemplace por cummin, cummax, cumprod o dplyr::cummean para otras funciones acumulativas).", "cumulative sums. For example cumsum(c(3,2,1,4,0)) = (3,5,6,10,10)": "sumas acumulativas. Por ejemplo cumsum(c(3,2,1,4,0)) = (3,5,6,10,10)", @@ -5033,7 +5059,7 @@ "cv": "CV", "d": "d", "d_in_m": "d_en_m", - "d_rank": "bebió", + "d_rank": "d_rank", "daily": "diariamente", "data": "datos", "data.frame(data=matrix(data=NA": "data.frame(datos=matriz(datos=NA", @@ -5102,16 +5128,16 @@ "e1071": "e1071", "eccentricity": "excentricidad", "education (f)": "educación (f)", - "ela": "ella", + "ela": "ela", "employment (f)": "empleo (f)", "encode": "codificar", "encode ": "codificar ", - "encodes arbitrarily large integers": "codifica números enteros arbitrariamente grandes", - "encodes rationals encoded as ratios or arbitrarily large integers": "codifica racionales codificados como proporciones o números enteros arbitrariamente grandes", + "encodes arbitrarily large integers": "codificar números enteros arbitrariamente grandes", + "encodes rationals encoded as ratios or arbitrarily large integers": "codificar racionales codificados como proporciones o números enteros arbitrariamente grandes", "end": "final", "end_rains": "fin_lluvias", "end_rains_date": "fecha_de_lluvias_final", - "end_rains_status": "end_rains_status", + "end_rains_status": "estado_de_lluvias_final", "end_season": "final_temporada", "end_season_date": "fecha_fin_temporada", "end_season_status": "estado_final_temporada", @@ -5149,7 +5175,7 @@ "fill": "llenar", "fill :": "llenar :", "fill:": "llenar:", - "fills missing values at the start, middle and end. For example na.fill(c(NA,2,NA,4,5,NA),fill=": "rellena los valores que faltan al principio, en el medio y al final. Por ejemplo na.fill(c(NA,2,NA,4,5,NA),fill=", + "fills missing values at the start, middle and end. For example na.fill(c(NA,2,NA,4,5,NA),fill=": "rellenar los valores faltantes al principio, en el medio y al final. Por ejemplo na.fill(c(NA,2,NA,4,5,NA),fill=", "filter_levels": "niveles_de_filtro", "findpars": "encontrarpars", "first": "primero", @@ -5160,15 +5186,15 @@ "flexible": "flexible", "fligner": "aviador", "floor": "piso", - "forcats": "gatos forzados", + "forcats": "forcats", "formula": "fórmula", "frLabels:": "frEtiquetas:", "fractions": "fracciones", "frequency": "frecuencia", - "friedman": "hombre frito", + "friedman": "friedman", "frugal": "frugal", "fullrange": "Rango completo", - "gam": "juego", + "gam": "gam", "gamma": "gama", "gamma function. For example gamma(8) = fact(7) = 5040": "función gamma. Por ejemplo gamma(8) = fact(7) = 5040", "gamma probabilities. For example pgamma(2,1,1) = 0.8647; (Exponential) pgamma(2,10,10) = 0.995": "probabilidades gamma. Por ejemplo pgamma(2,1,1) = 0.8647; (Exponencial) pgamma(2,10,10) = 0,995", @@ -5211,7 +5237,7 @@ "hair (f)": "pelo (f)", "happy": "feliz", "height": "altura", - "hex": "maleficio", + "hex": "hex", "hexmode": "modo hexadecimal", "hms": "mmm", "hoffset": "hoffset", @@ -5270,20 +5296,20 @@ "language (f)": "lenguaje (f)", "lanzante": "lanzador", "large": "grande", - "last": "ultimo", + "last": "último", "last_cluster": "último_cluster", "last_details": "últimos_detalles", "last_graph": "último_gráfico", "last_model": "último modelo", "last_summary": "último_resumen", - "last_table": "última_mesa", + "last_table": "última_tabla", "layout": "diseño", "lbeta": "lbeta", "lbl": "libras", "lblPossibleSolutions.Text": "lblPossibleSolutions.Texto", "lchoose": "elijo", "lda": "lda", - "lead": "Plomo", + "lead": "guiar", "leap": "salto", "left": "izquierda", "legend bty": "leyenda bty", @@ -5307,12 +5333,12 @@ "less than or equals(<=). For example (2 <= 3) is TRUE, (2 <=2) is TRUE, (2 <= 1) is FALSE": "menor que o igual (<=). Por ejemplo (2 <= 3) es VERDADERO, (2 <= 2) es VERDADERO, (2 <= 1) es FALSO", "less than(<). For example (2 < 3) is TRUE. (2 < 2) is FALSE, (2 < 1) is FALSE": "menos que (<). Por ejemplo (2 < 3) es VERDADERO. (2 < 2) es FALSO, (2 < 1) es FALSO", "letters": "letras", - "levd": "nivel", + "levd": "levd", "level": "nivel", "lfact": "hecho", "lgamma": "lgamma", "light": "luz", - "lighter": "encendedor", + "lighter": "luminoso", "like collate, but only if all strings are ASCII characters.": "como intercalar, pero solo si todas las cadenas son caracteres ASCII.", "like factorize, but with simpler layout of results and much slower for large data sets.": "como factorizar, pero con un diseño de resultados más simple y mucho más lento para grandes conjuntos de datos.", "likert (o.f)": "likert (de)", @@ -5329,7 +5355,7 @@ "linetype :": "tipo de línea :", "linetype:": "tipo de línea:", "linkert7 (o.f)": "linkert7 (de)", - "lm": "estoy", + "lm": "lm", "lme4": "lme4", "lmer": "lmer", "locate": "localizar", @@ -5357,13 +5383,13 @@ "lowess": "más bajo", "lqs": "lqs", "lr.Test": "lr.Prueba", - "lubridate": "lubricar", + "lubridate": "lubridate", "lucas": "lucas", "lump": "bulto", "m": "metro", "mNSE": "mNSE", "m_rank": "rango_m", - "mad": "enojado", + "mad": "mad", "mae": "mae", "magma": "magma", "manhattan": "manhattan", @@ -5372,7 +5398,7 @@ "mariadb_climsoft_test_db_v4": "mariadb_climsoft_test_db_v4", "mariadb_escalade_db_v4": "mariadb_escalada_db_v4", "marital (f)": "marital (f)", - "match": "juego", + "match": "combinar", "math": "Matemáticas", "mauchly": "mauchly", "max": "máximo", @@ -5384,7 +5410,7 @@ "md": "Maryland", "md5": "md5", "mdy": "mdy", - "me": "yo", + "me": "me", "mean": "significar", "median": "mediana", "median couple. A robust measure of skewness, between -1 and +1. mc(c(1,1,4,4,5)) = -0.5, while mc(c(2,3,3,4,10)) = 0.375.": "pareja mediana. Una medida robusta de asimetría, entre -1 y +1. mc(c(1,1,4,4,5)) = -0,5, mientras que mc(c(2,3,3,4,10)) = 0,375.", @@ -5402,8 +5428,8 @@ "minkowski": "minkowski", "minute (00-59)": "minuto (00-59)", "minutes": "minutos", - "miss": "señorita", - "missing": "desaparecido", + "miss": "perder", + "missing": "faltante", "mk": "mk", "mm": "milímetro", "mm(Large or negative Value)": "mm (valor grande o negativo)", @@ -5422,8 +5448,8 @@ "monthly": "mensual", "monthly average": "promedio mensual", "months ": "meses ", - "mood": "estado animico", - "moving": "Moviente", + "mood": "estado anímico", + "moving": "moviente", "moving (or rolling) maxima. For example rollmax(x=c(3,2,1,4,0) ,3,fill=NA, align=": "máximos móviles (o rodantes). Por ejemplo rollmax(x=c(3,2,1,4,0) ,3,fill=NA, align=", "moving (or rolling) mean. For example rollmean(c(3,2,1,6,2) ,3,fill=NA) = (NA,2,3,3,NA)": "media móvil (o rodante). Por ejemplo rollmean(c(3,2,1,6,2) ,3,fill=NA) = (NA,2,3,3,NA)", "moving (or rolling) medians. For example rollmedian(c(3,2,1,6,2) ,3,fill=NA) = (NA,2,2,2,NA)": "medianas móviles (o rodantes). Por ejemplo rollmedian(c(3,2,1,6,2) ,3,fill=NA) = (NA,2,2,2,NA)", @@ -5433,27 +5459,25 @@ "moving sum of elements in each list (replace by rollmax, rollmean or rollmedian for others).": "suma móvil de elementos en cada lista (reemplazar por rollmax, rollmean o rollmedian por otros).", "movmax": "movmax", "movmean": "media de movimiento", - "movmed": "movido", + "movmed": "movmed", "movmin": "movmin", "movprod": "movprod", "movsum": "movsum", "mse": "mse", "multiply each number in the list by a given value (default 10).": "multiplique cada número en la lista por un valor dado (predeterminado 10).", "murmur32": "murmur32", - "n": "norte", "n times. For example, str_count(c(": "n veces Por ejemplo, str_count(c(", - "n:": "norte:", "n_distinct": "n_distinto", - "na": "n / A", + "na": "na", "na.rm": "na.rm", "naDiag": "naDiag", "naapprox": "aproximadamente", "naest": "naest", "nafill": "nafill", - "name (c)": "nombre", + "name (c)": "nombre (c)", "names": "nombres", "nasa": "nasa", - "nasplin": "Nasplina", + "nasplin": "nasplin", "nbinomial": "nbinomial", "ncvTest": "Prueba ncv", "near": "cerca", @@ -5468,9 +5492,9 @@ "nlmer": "nlmer", "nls": "nls", "no. of Days in a Year:": "no. de días en un año:", - "no_bids_considered": "no_bids_considered", + "no_bids_considered": "no_ofertas_consideradas", "no_bids_received": "ninguna_oferta_recibida", - "non miss": "no te pierdas", + "non miss": "no perder", "nonadditivity ": "no aditivo ", "none": "ninguno", "normal": "normal", @@ -5479,21 +5503,21 @@ "notch": "muesca", "notchwidth": "ancho de muesca", "nowrap": "ahora rap", - "nrmse": "nmero", + "nrmse": "nrmse", "nth": "enésimo", "nth_prime": "nth_prime", "ntile": "ntil", "nudge_x": "empujar_x", "nudge_y": "empujar_y", "number of objects in a triangle, so 0, 1, 3, 6, 10...": "número de objetos en un triángulo, entonces 0, 1, 3, 6, 10...", - "number of observations: For example length(c(1,2,3,4,NA)) = 5 ": "número de observaciones: por ejemplo, longitud (c (1,2,3,4, NA)) = 5 ", + "number of observations: For example length(c(1,2,3,4,NA)) = 5 ": "número de observaciones: Por ejemplo, longitud (c (1,2,3,4, NA)) = 5 ", "numeric value, with the exponent to be used in the computation of the modified index of agreement. The default value is j=1": "valor numérico, con el exponente a utilizar en el cálculo del índice de concordancia modificado. El valor predeterminado es j=1", "oblique": "oblicuo", "octal": "octales", "octmode": "modo octava", "omit.na": "omitir.na", "one_way_freq": "frecuencia_unidireccional", - "oneway": "de una sola mano", + "oneway": "una sola vía", "opposite to lag, so NA is last value.": "opuesto al retraso, por lo que NA es el último valor.", "or Named Region:": "o Región nombrada:", "or matching values 1 to n": "o valores coincidentes de 1 a n", @@ -5505,7 +5529,7 @@ "outlier.colour": "color atípico", "outlier.shape": "atípico.forma", "outlier.size": "tamaño atípico", - "outlier.stroke": "accidente cerebrovascular", + "outlier.stroke": "outlier.stroke", "outlierTest": "prueba de valores atípicos", "overline": "superposición", "pad": "almohadilla", @@ -5527,7 +5551,7 @@ "panel.spacing.x": "panel.espaciado.x", "panel.spacing.y": "panel.espaciado.y", "parameter": "parámetro", - "parse": "analizar gramaticalmente", + "parse": "para analizar", "pascal": "pascal", "pbeta": "pbeta", "pbias": "pbias", @@ -5535,19 +5559,19 @@ "pbinom": "pbinom", "pbirth": "pnacimiento", "pchisq": "pchisq", - "pcor ": "decoración ", + "pcor ": "pcor ", "percent": "por ciento", "percent of each value in the list, rounded to a default of 2 decimal places.": "porcentaje de cada valor de la lista, redondeado a un valor predeterminado de 2 decimales.", "percent2": "porcentaje2", "percentages": "porcentajes", "percentrank": "rango porcentual", "perfect": "perfecto", - "pet (f)": "mascota (f)", - "pettitt ": "pequeña ", - "pf": "por favor", + "pet (f)": "pet (f)", + "pettitt ": "petittt ", + "pf": "pf", "pgamma": "pgamma", "phi": "fi", - "pi": "Pi", + "pi": "pi", "pi = 3.14159": "pi = 3.14159", "plasma": "plasma", "plot ": "gráfico ", @@ -5566,10 +5590,10 @@ "pnorm": "norma", "pointrange": "rango de puntos", "points": "puntos", - "poisson": "veneno", - "political (f)": "político", - "polr": "pol", - "poly": "escuela politécnica", + "poisson": "poisson", + "political (f)": "político (f)", + "polr": "polr", + "poly": "poly", "position": "posición", "power (^)": "poder (^)", "power(^)or exponent and can also be given as **. For example 2^3 = 8": "potencia (^) o exponente y también se puede dar como **. Por ejemplo 2^3 = 8", @@ -5590,35 +5614,35 @@ "primes": "números primos", "primorial": "primordial", "princomp": "princomp", - "print": "impresión", + "print": "imprimir", "print.fevd": "imprimir.fevd", "probability": "probabilidad", "probit": "probit", "procurement_category": "categoría_adquisiciones", "procuring_authority": "autoridad_contratación", - "prod": "pinchar", - "prop": "apuntalar", + "prod": "producción", + "prop": "prop", "prop.test": "prop.test", "prop.trend": "prop.tendencia", "property": "propiedad", - "propn": "Propón", + "propn": "propn", "proportion": "proporción", "proportion of values less than or equal to the current rank. For example cume_dist(c(2,4,6,8,3)) = (0.2, 0.6, 0.8, 1.0, 0.4)": "proporción de valores menores o iguales al rango actual. Por ejemplo cume_dist(c(2,4,6,8,3)) = (0.2, 0.6, 0.8, 1.0, 0.4)", "proportion of variable less than (or more than) a specified value. So prop(c(0,1,1,4,10) <=1) = 0.6.": "proporción de la variable menor que (o mayor que) un valor especificado. Entonces prop(c(0,1,1,4,10) <=1) = 0.6.", "pscore": "puntuación", - "pt": "punto", + "pt": "pt", "q-Gram Distance": "q-Gramo Distancia", "q1": "q1", "q3": "q3", "qbeta": "qbeta", "qbinom": "qbinom", - "qbirth": "qnacimiento", + "qbirth": "qbirth", "qchisq": "qchisq", "qda": "qda", "qf": "qf", "qgamma": "qgamma", "qnbin": "qnbin", - "qnorm": "norma", + "qnorm": "qnorma", "qnormal quantiles. For example qnorm(0.05) = -1.6449; qnorm(0.9772, 100,15) = 130": "cuantiles qnormales. Por ejemplo qnorm(0.05) = -1.6449; qnorma(0.9772, 100,15) = 130", "qpois": "qpois", "qq": "qq", @@ -5629,10 +5653,10 @@ "quantile": "cuantil", "quarter": "cuarto", "rNSE": "rNSE", - "rPearson": "Pearson", + "rPearson": "rPearson", "rSD": "RSD", "r_rank": "r_rank", - "race (f)": "raza (f)", + "race (f)": "carrera (f)", "racine": "racine", "rad": "radical", "radians": "radianes", @@ -5648,7 +5672,7 @@ "reciprocal": "recíproco", "recode": "recodificar", "rect": "rectificar", - "regex": "expresiones regulares", + "regex": "regex", "region": "región", "regular sequence of dates. Alternatively use Prepare > Column: Date > Generate Dates": "secuencia regular de fechas. También puede usar Preparar > Columna: Fecha > Generar fechas", "relevel": "renivelar", @@ -5659,20 +5683,20 @@ "rep": "reps", "rep repeats one or more values as shown here. Try also rep(1:5, each =6) and rep((1:5,length = 30)": "rep repite uno o más valores como se muestra aquí. Prueba también rep(1:5, cada =6) y rep((1:5,longitud = 30)", "replace": "reemplazar", - "replace the condition and the TRUE, FALSE values with those of your choice.": "reemplace la condición y los valores VERDADERO, FALSO con los de su elección.", + "replace the condition and the TRUE, FALSE values with those of your choice.": "reemplazar la condición y los valores VERDADERO, FALSO con los de su elección.", "replace2": "reemplazar2", "rescale of minimum ranks to [0,1]. For example percent_rank(c(15,11,13,12,NA,12)) = (1,0,0.75,0.25,NA,0.25)": "cambiar la escala de rangos mínimos a [0,1]. Por ejemplo, percent_rank(c(15,11,13,12,NA,12)) = (1,0,0.75,0.25,NA,0.25)", - "residuals": "derechos residuales de autor", + "residuals": "residuales", "return.level": "retorno.nivel", - "returns the divisors of x. For example, Divisors(21)= c(1,3,7)": "devuelve los divisores de x. Por ejemplo, Divisores(21)= c(1,3,7)", - "returns the percentile that the number correspods to. For example, PercentRank(c(1,2,5,11,15)) = 0.2,0.4,0.6,0.8,1.0": "devuelve el percentil al que corresponde el número. Por ejemplo, Rango Porcentual(c(1,2,5,11,15)) = 0.2,0.4,0.6,0.8,1.0", - "rev": "Rdo", + "returns the divisors of x. For example, Divisors(21)= c(1,3,7)": "devolver los divisores de x. Por ejemplo, Divisores(21)= c(1,3,7)", + "returns the percentile that the number correspods to. For example, PercentRank(c(1,2,5,11,15)) = 0.2,0.4,0.6,0.8,1.0": "devolver el percentil al que corresponde el número. Por ejemplo, Rango Porcentual(c(1,2,5,11,15)) = 0.2,0.4,0.6,0.8,1.0", + "rev": "rev", "reverse": "reverso", "reverse a variable. For example rev(c(1,2,3,4,5)) =(5,4,3,2,1)": "invertir una variable. Por ejemplo rev(c(1,2,3,4,5)) =(5,4,3,2,1)", "reverse the data in each list.": "invertir los datos en cada lista.", - "rho": "ro", - "right": "bien", - "rlm": "RLM", + "rho": "rho", + "right": "derecha", + "rlm": "rlm", "rm_outside": "rm_fuera", "rmse": "rmse", "roman": "romano", @@ -5681,18 +5705,18 @@ "round(x) to round to whole numbers, round(x,2) to round to 2 decimal places, round(x,-2) to round to the nearest 100": "round(x) para redondear a números enteros, round(x,2) para redondear a 2 decimales, round(x,-2) para redondear al 100 más cercano", "row numbers as ranks. For example :row_number(c(15,11,13,12,NA,12)) = (5,1,3,2,NA,3)": "números de fila como rangos. Por ejemplo: número_fila(c(15,11,13,12,NA,12)) = (5,1,3,2,NA,3)", "row(s)": "fila(s)", - "rrod ": "rodar ", + "rrod ": "rrod ", "rsd": "RSD", "rsr": "rsr", "rstanam": "Rstanam", "sample": "muestra", - "sat": "se sentó", + "sat": "sat", "savage": "salvaje", "scale": "escala", "scale each list, by subtracting the mean and dividing by the sd.": "escala cada lista, restando la media y dividiendo por la sd.", "scheffe": "esquema", "scm": "scm", - "sd": "Dakota del Sur", + "sd": "sd", "sdgFitCorruptionModelDisplay": "sdgFitCorruptionModelDisplay", "se": "se", "seasonal average": "promedio estacional", @@ -5704,7 +5728,7 @@ "selected variable": "variable seleccionada", "semi-condensed": "semi-condensado", "semi-expanded": "semi-expandido", - "sens ": "sentidos ", + "sens ": "sens ", "sentence": "oración", "sentence (c)": "oración (c)", "seq": "secuencia", @@ -5724,44 +5748,44 @@ "shift a variable down. For example lag(1:5) = (NA,1,2,3,4); lag(1:5,3) = (NA,NA,NA, 1,2)": "desplazar una variable hacia abajo. Por ejemplo lag(1:5) = (NA,1,2,3,4); retraso (1: 5,3) = (NA, NA, NA, 1,2)", "shift a variable up. For example lead(1:5) = (2,3,4,5,NA); lead(1:5;3) = (4,5, NA,NA,NA)": "desplazar una variable hacia arriba. Por ejemplo plomo(1:5) = (2,3,4,5,NA); ventaja(1:5;3) = (4,5, NA, NA, NA)", "short": "corto", - "show.legend": "Mostrar leyenda", + "show.legend": "mostrar.leyenda", "show_boxes": "mostrar_cajas", "shuffle": "barajar", - "siginf": "firmando", + "siginf": "siginf", "sign": "señal", "signature_date": "fecha de firma", "signif": "significado", "signif(x,3) to round to 3 significant figures": "signif(x,3) para redondear a 3 cifras significativas", "simultaneous birthday probabilities. For example pbirthday(10) = 0.1169 ; pbirthday(50) = 0.97": "probabilidades de cumpleaños simultáneas. Por ejemplo pcumpleaños(10) = 0.1169 ; pcumpleaños(50) = 0.97", "simultaneous birthday quantiles. For example qbirthday(0.5) = 23, qbirthday(0.99) = 57": "cuantiles de cumpleaños simultáneos. Por ejemplo qcumpleaños(0.5) = 23, qcumpleaños(0.99) = 57", - "sin": "pecado", + "sin": "sen", "sine of angle in radians. For example sin(pi/2) = sin(rad(90)) = 1.": "seno del ángulo en radianes. Por ejemplo sin(pi/2) = sin(rad(90)) = 1.", - "single": "soltero", - "sinh": "pecado", - "size": "Talla", + "single": "único", + "sinh": "senh", + "size": "tamaño", "size :": "tamaño :", - "size:": "Talla:", + "size:": "tamaño:", "size_x": "tamaño_x", "size_xend": "tamaño_xend", "skew": "sesgar", "skewness defined as third central moment/sd^3. For skew(c(1,1,4,4,5)) = -0.18, while skew(2,3,3,4,10) = 0.95.": "asimetría definida como tercer momento central/sd^3. Para sesgo (c (1,1,4,4,5)) = -0,18, mientras que sesgo (2,3,3,4,10) = 0,95.", - "slope": "Pendiente", + "slope": "pendiente", "small": "pequeño", "smallest common multiple, for example scm(18,42) = 126 (= 718 & 342)": "mínimo común múltiplo, por ejemplo scm(18,42) = 126 (= 718 y 342)", "smk ": "smk ", - "smokes (L)": "fuma (L)", + "smokes (L)": "humos (L)", "snh ": "snh ", "sort": "clasificar", - "sort values into ascending order. (Change FALSE to TRUE for descending).": "ordena los valores en orden ascendente. (Cambiar FALSO a VERDADERO para descender).", + "sort values into ascending order. (Change FALSE to TRUE for descending).": "ordenar los valores en orden ascendente. (Cambiar FALSO a VERDADERO para descender).", "sorts a vector into ascending or descending order. For example sort(c(5,7,4,4,3)) = (3,4,4,5,7)": "ordena un vector en orden ascendente o descendente. Por ejemplo ordenar(c(5,7,4,4,3)) = (3,4,4,5,7)", "space. For example. str_remove_all(c(": "espacio. Por ejemplo. str_remove_all(c(", - "span": "lapso", + "span": "span", "spearman": "lancero", "specify1": "especificar1", "specify2": "especificar2", "specify3": "especificar3", "speed": "velocidad", - "spells": "hechizos", + "spells": "eventos", "spline": "ranura", "split": "separar", "sqrt": "sqrt", @@ -5771,29 +5795,29 @@ "squares of each integer, so 1, 4, 9, 16.": "cuadrados de cada número entero, por lo que 1, 4, 9, 16.", "squish": "chapotear", "squish ": "chapotear ", - "ssens ": "sentidos ", + "ssens ": "ssens ", "ssq": "ssq", - "stanglm": "estrangular", - "stanpolr": "Estanpolr", + "stanglm": "stanglm", + "stanpolr": "stanpolr", "start": "comienzo", "start_rain": "comienzo_lluvia", "start_rain_date": "fecha_inicio_lluvia", - "start_rain_status": "start_rain_status", + "start_rain_status": "estado_inicio_lluvia", "starts": "empieza", "stat": "estadística", "state (f)": "estado (f)", - "statip": "punta de la estatuilla", + "statip": "statip", "stats": "estadísticas", - "statsr": "estadísticas", - "string (c)": "cuerda (c)", + "statsr": "estadísticasr", + "string (c)": "cadena (c)", "strip.background": "tira.fondo", "strip.placement": "tira.colocación", - "strip.switch.pad.grid": "tira.interruptor.almohadilla.rejilla", + "strip.switch.pad.grid": "tira.interruptor.almohadilla.cuadrícula", "strip.switch.pad.wrap": "tira.interruptor.almohadilla.envoltura", "strip.text": "tira.texto", "strip.text.x": "tira.texto.x", "strip.text.y": "tira.texto.y", - "stroke": "carrera", + "stroke": "trazo", "sub": "sub", "sub.title": "subtitular", "subgroup2:": "subgrupo2:", @@ -5804,21 +5828,20 @@ "sum": "suma", "sum (+)": "suma (+)", "sum of last but 1 and last but 2 values. So from ...7, 9, 12, next is 7+9 = 16.": "suma de penúltimo pero 1 y penúltimo pero 2 valores. Así que de...7, 9, 12, el siguiente es 7+9 = 16.", - "sumd": "suma", + "sumd": "sumad", "summary": "resumen", "summary.fevd": "resumen.fevd", - "sunh": "sol", + "sunh": "solh", "sunshine hours": "horas de sol", "swap Parameters": "intercambiar parámetros", - "t": "t", "t quantiles. For example qt(0.05, 5) = -2.015; qt(0.05, 100) = -1.66": "t cuantiles. Por ejemplo qt(0.05, 5) = -2.015; qt(0.05, 100) = -1.66", - "table": "mesa", + "table": "tabla", "tag": "etiqueta", "taha": "taha", "tall": "alto", - "tampon": "tampón", - "tan": "broncearse", - "tanh": "bronceado", + "tampon": "tampon", + "tan": "tan", + "tanh": "tanh", "text": "texto", "the average, usually sum/length. So mean(c(1,2,3,4,10)) = 4": "el promedio, generalmente suma/longitud. Así que media(c(1,2,3,4,10)) = 4", "the first mode. So mode1(c(10,2,2,3,3)) = 2": "el primer modo. Entonces modo1(c(10,2,2,3,3)) = 2", @@ -5827,27 +5850,27 @@ "the inverse of the fractions key. So 3/2 becomes 1.5, 1/4 becomes 0.25 etc.": "el inverso de la tecla de fracciones. Así que 3/2 se convierte en 1,5, 1/4 se convierte en 0,25, etc.", "the largest value: So max(c(4,3,10,1,2)) = 10": "el valor más grande: Entonces max(c(4,3,10,1,2)) = 10", "the last value in each list.": "el último valor de cada lista.", - "the median of the absolute deviations from the median. So mad(c(1,2,3,4,10)) = median of (2,1,0,1,7). Median = 1 and multiplied by 1.483 to be like the sd for normally distributed data.": "la mediana de las desviaciones absolutas de la mediana. Tan enojado (c (1,2,3,4,10)) = mediana de (2,1,0,1,7). Mediana = 1 y multiplicada por 1,483 para ser como la sd para datos normalmente distribuidos.", + "the median of the absolute deviations from the median. So mad(c(1,2,3,4,10)) = median of (2,1,0,1,7). Median = 1 and multiplied by 1.483 to be like the sd for normally distributed data.": "la mediana de las desviaciones absolutas de la mediana. Entonces mad(c (1,2,3,4,10)) = mediana de (2,1,0,1,7). Mediana = 1 y multiplicada por 1,483 para ser como la sd para datos normalmente distribuidos.", "the most popular value. So mode(c(10,2,2,3,3) = 2 and 3": "el valor más popular. Así modo(c(10,2,2,3,3) = 2 y 3", "the nth value in each list, (default = 2, the second value).": "el valor n en cada lista, (predeterminado = 2, el segundo valor).", - "the number of different values in the variable. So distinct(c(1,2,3,3,NA,NA)) = 4": "el número de valores diferentes en la variable. Tan distinto(c(1,2,3,3,NA,NA)) = 4", - "the number of different values in the variable. So distinct(c(1,2,3,3,NA,NA)) = 4.": "el número de valores diferentes en la variable. Tan distinto(c(1,2,3,3,NA,NA)) = 4.", + "the number of different values in the variable. So distinct(c(1,2,3,3,NA,NA)) = 4": "el número de valores diferentes en la variable. Entonces distinto(c(1,2,3,3,NA,NA)) = 4", + "the number of different values in the variable. So distinct(c(1,2,3,3,NA,NA)) = 4.": "el número de valores diferentes en la variable. Entonces distinto(c(1,2,3,3,NA,NA)) = 4.", "the number of missing values. So miss(c( NA,2,3,4,NA)) = 2": "el número de valores faltantes. Entonces miss(c(NA,2,3,4,NA)) = 2", - "the number of non-missing values. So nonmiss(c(1,2,3,4,NA)) = 4": "el número de valores no perdidos. Así que no se pierda (c (1,2,3,4, NA)) = 4", + "the number of non-missing values. So nonmiss(c(1,2,3,4,NA)) = 4": "el número de valores no faltantes. Entonces nonmiss(c (1,2,3,4, NA)) = 4", "the observation number of the first duplicated value, or 0 if no duplicates. So anydup(c(1,2,3,3,10) = 4.": "el número de observación del primer valor duplicado, o 0 si no hay duplicados. Entonces anydup(c(1,2,3,3,10) = 4.", "the row number of the first duplicated value, or 0 if no duplicates. So anydup(c(1,2,3,3,10) = 4.": "el número de fila del primer valor duplicado, o 0 si no hay duplicados. Entonces anydup(c(1,2,3,3,10) = 4.", "the smallest value: So min(c(4,3,10,1,2)) = 1 ": "el valor más pequeño: Entonces min(c(4,3,10,1,2)) = 1 ", "the standard deviation. A typical distance from the mean. Often roughly a quarter of the range of the data.": "la desviación estándar. Una distancia típica de la media. A menudo, aproximadamente una cuarta parte del rango de los datos.", "the sum or total: So sum(c(1,2,3,4,10)) = 20 ": "la suma o el total: Entonces sum(c(1,2,3,4,10)) = 20 ", "the value halfway up the values in order. So median(c(1,2,3,4,10) = 3": "el valor a la mitad de los valores en orden. Entonces mediana (c (1, 2, 3, 4, 10) = 3", - "the variance. The average of the squared deviations from the mean - dividing by (n-1).": "la varianza El promedio de las desviaciones al cuadrado de la media, dividido por (n-1).", + "the variance. The average of the squared deviations from the mean - dividing by (n-1).": "la varianza. El promedio de las desviaciones al cuadrado de la media, dividido por (n-1).", "third": "tercero", "third cousin primes, for example third(0,100) gives (89,97)": "primos primos terceros, por ejemplo tercero (0,100) da (89,97)", "time": "tiempo", "times (*)": "veces (*)", "title": "título", "tmax": "tmáx", - "tmin": "tmin", + "tmin": "tmín", "to": "a", "top": "arriba", "tr": "tr", @@ -5873,18 +5896,16 @@ "upper": "superior", "upper (c)": "superior (c)", "uppercase": "mayúscula", - "v. ": "v. ", - "v. 1.0.0.0": "versión 1.0.0.0", - "v3.0 Daily Rainfall": "v3.0 Lluvia diaria", - "v3.0 Dekadal Rainfall": "v3.0 Lluvia decadal", - "v3.0 Monthly Rainfall": "Precipitación mensual v3.0", - "v3.0 Monthly Rainfall (Calculated)": "v3.0 Lluvia Mensual (Calculada)", - "v3.1 Daily Rainfall": "v3.1 Lluvia diaria", - "v3.1 Daily Rainfall Complete (Filled)": "v3.1 Lluvia diaria completa (completa)", - "v3.1 Dekadal Rainfall": "v3.1 Lluvia decadal", - "v3.1 Dekadal Rainfall Complete (Filled)": "v3.1 Dekadal Rainfall completa (completa)", - "v3.1 Monthly Rainfall": "v3.1 Lluvia Mensual", - "v3.1 Monthly Rainfall Complete (Filled)": "v3.1 Lluvia mensual completa (completa)", + "v3.0 Daily Rainfall": "v3.0 Precipitación diaria", + "v3.0 Dekadal Rainfall": "v3.0 Precipitación decadal", + "v3.0 Monthly Rainfall": "v3.0 Precipitación mensual", + "v3.0 Monthly Rainfall (Calculated)": "v3.0 Precipitación mensual (Calculada)", + "v3.1 Daily Rainfall": "v3.1 Precipitación diaria", + "v3.1 Daily Rainfall Complete (Filled)": "v3.1 Precipitación diaria completa (Completa)", + "v3.1 Dekadal Rainfall": "v3.1 Precipitación decadal", + "v3.1 Dekadal Rainfall Complete (Filled)": "v3.1 Precipitación decadal completa (Completa)", + "v3.1 Monthly Rainfall": "v3.1 Precipitación mensual", + "v3.1 Monthly Rainfall Complete (Filled)": "v3.1 Precipitación mensual completa (Completa)", "valid (L)": "válido (L)", "value": "valor", "value in nth row, So nth(c(NA,7,8,9,10)) = 8. Also nth(c(NA,7,7,9,10),3,order=c(2,3,0,1,2))= NA.": "valor en la n-ésima fila, entonces n-ésimo(c(NA,7,8,9,10)) = 8. También n-ésimo(c(NA,7,7,9,10),3,orden=c(2,3, 0,1,2))= NA.", @@ -5905,10 +5926,9 @@ "wakefield::r_data_theme(n = 100, data_theme = ": "wakefield::r_data_theme(n = 100, data_theme = ", "waller ": "empapelador ", "ward": "pabellón", - "wd": "wd", - "wday": "miercoles", + "wday": "wday", "weight:": "peso:", - "weighted": "ponderado", + "weighted": "peso", "when": "cuando", "when divisors sum to more than the number. So 12 is less than 1+2+3+4+6 = 16. Opposite is Deficient": "cuando los divisores suman más que el número. Entonces 12 es menor que 1+2+3+4+6 = 16. Lo opuesto es Deficiente", "when is multiple ifelse, for example case_when(1:5>320,1:5>110) gives NA, 10, 10, 20, 20": "when es múltiple ifelse, por ejemplo case_when(1:5>320,1:5>110) da NA, 10, 10, 20, 20", @@ -5921,21 +5941,7 @@ "wilcoxsign": "wilcoxsign", "winner_country": "país_ganador", "winner_name": "nombre_ganador", - "wm": "wm", "word": "palabra", "wrappednormal": "envueltonormal", - "ws": "ws", - "ww ": "wow ", - "xend :": "xend:", - "xmax :": "xmáx:", - "xmin :": "xmín:", - "xxhash32": "xhash32", - "xxhash64": "xhash64", - "yday": "yday", - "year": "año", - "yend :": "yend:", - "ymax :": "ymax :", - "ymd": "ymd", - "ymin :": "ymín:", "zoo": "zoo" } \ No newline at end of file diff --git a/instat/translations/fr/fr_r_instat_not_menus.json b/instat/translations/fr/fr_r_instat_not_menus.json index 23b25a209a7..86ac0d16112 100644 --- a/instat/translations/fr/fr_r_instat_not_menus.json +++ b/instat/translations/fr/fr_r_instat_not_menus.json @@ -47,22 +47,17 @@ " use ranks to divide into (almost) equal sized groups. For example ntile(c(15,11,13,12,NA,12),2) = (2,1,2,1,NA,1)": " utilisez des rangs pour diviser en groupes de taille (presque) égale. Par exemple ntile(c(15,11,13,12,NA,12),2) = (2,1,2,1,NA,1)", " | Showing ": " | Affichage ", "!is.na detects non-missing values, for example !is.na(c(1,3,NA, 5)) gives TRUE, TRUE, FALSE, TRUE": "!is.na détecte les valeurs non manquantes, par exemple !is.na(c(1,3,NA, 5)) donne VRAI, VRAI, FAUX, VRAI", - "An order, level, count control to be added later": "Un contrôle d'ordre, de niveau, de comptage à ajouter ultérieurement", "# Code generated by the dialog, Script": "# Code généré par la boîte de dialogue, Script", - "&Copy": "&Copie", - "&Open": "&Ouvrir", - "&Paste": "&Pâte", - "&Save": "&Sauvegarder", "(%in%)is like the match function and returns a logical vector. For example (11:15 %in% c(11,13)) gives TRUE, FALSE, TRUE, FALSE, FALSE": "(%in%) est comme la fonction match et renvoie un vecteur logique. Par exemple (11:15 %in% c(11,13)) donne VRAI, FAUX, VRAI, FAUX, FAUX", "(Missing)": "(Manquant)", "(blank)": "(blanc)", "(natural) logarithm. For example log(512) = 6.238; log(512,2) = 9 (log to base 2, i.e. 2 ^ 9 =512)": "logarithme (naturel). Par exemple log(512) = 6.238; log(512,2) = 9 (log à base 2, i.e. 2 ^ 9 =512)", "(normal probabilities. For example; pnorm(-1.6449) = 0.05; pnorm(130,100,15) = 0.9772.": "(probabilités normales. Par exemple ; pnorm(-1,6449) = 0,05 ; pnorm(130,100,15) = 0,9772.", "(see also %in%)gives the positions of the matching elements. For example match(11:15, c(11,13)) gives (1,NA, 2, NA, NA). match(11:15,c(11,13),nomatch=0) gives 1, 0, 2, 0, 0)": "(voir aussi %in%) donne les positions des éléments correspondants. Par exemple match(11:15, c(11,13)) donne (1,NA, 2, NA, NA). match(11:15,c(11,13),nomatch=0) donne 1, 0, 2, 0, 0)", - "- to": "- pour", ".nc files found to import": "fichiers .nc trouvés à importer", + "0 or 1 times. For example, str_count(c(": "0 ou 1 fois. Par exemple, str_count(c(", + "0 or more times. For example, str_count(c(": "0 fois ou plus. Par exemple, str_count(c(", "1 or more times. For example, str_count(c(": "1 ou plusieurs fois. Par exemple, str_count(c(", - "1/mu^2": "1/mu^2", "10 variables and 50 observations, sampling with replacement and probability 0.3 of TRUE": "10 variables et 50 observations, échantillonnage avec remise et probabilité 0,3 de VRAI", "10 variables from the Wakefield package": "10 variables du package Wakefield", "10m u-component of wind": "10m composante u du vent", @@ -80,13 +75,13 @@ "2m dewpoint temperature": "2m de température du point de rosée", "2m temperature": "2m de température", "2nd Factor (Optional):": "2e facteur (facultatif):", - "2pi": "2pi", "3 variables including both random normal and uniform data": "3 variables incluant des données aléatoires normales et uniformes", "3. Mean Sea Level Pressure:": "3. Moyenne pression du niveau de la mer:", "36 = 2(squared)*3(squared) is powerful because for each divisor, here 2 and 3, its square is also a divisor.": "36 = 2(carré)*3(carré) est puissant car pour chaque diviseur, ici 2 et 3, son carré est aussi un diviseur.", "4 Digit": "4 chiffres", "4 variables, showing use of seq and rep function": "4 variables, montrant l'utilisation de la fonction seq et rep", "4. Mean Daily Air Temperature:": "4. Température moyenne quotidienne de l'air:", + "4.85": "4,85", "49 variables, illustrating most of the types of data in the Wakefield package": "49 variables, illustrant la plupart des types de données du package Wakefield", "5. Total Precipitation:": "5. Précipitation totale:", "6. Mean Daily Max Air Temperature:": "6. Température maximale quotidienne moyenne de l'air:", @@ -250,6 +245,7 @@ "Amount:": "Montant:", "An R Command is Running": "Une commande R est en cours d'exécution", "An order": "Un ordre", + "An order, level, count control to be added later": "Un contrôle d'ordre, de niveau, de comptage à ajouter ultérieurement", "An order,level,count control to be added later": "Un ordre, niveau, contrôle du nombre à ajouter plus tard", "Analysis": "Analyse", "Anderson-Darling test for normality": "Test Anderson-Darling pour la normalité", @@ -370,6 +366,7 @@ "Bar Options": "Options de barre", "Bar and Pie Chart": "Diagramme à barres et camembert", "Bar plot": "Diagramme à barres", + "Bar, Column, Lollipop, Pie, and Donut Charts, plus Treemaps and Wordclouds": "Graphiques à barres, à colonnes, à sucettes, à secteurs et en anneau, ainsi que des cartes arborescentes et des nuages de mots", "BarChart Options": "Options de Graphique à Barres", "Barometer Height:": "Hauteur du baromètre:", "Bartels Rank Test of Randomness": "Rang de Bartels Test de Aléatoire", @@ -427,6 +424,7 @@ "Box Plot": "Graphique en Boîtes", "Box plot": "Graphique en boîtes", "Boxplot": "Graphique à boite", + "Boxplot (including Tufte), Jitter and Violin Plots": "Boxplot (y compris Tufte), Jitter et Violin Plots", "Boxplot + Jitter": "Boîte a moustaches + gigue", "Boxplot Count Variable": "Variable du nombre de boîtes à moustaches", "Boxplot Method": "Méthode de diagramme en boîte", @@ -942,6 +940,7 @@ "Cumulative": "Cumulatif", "Cumulative Distribution...": "Distribution cumulative...", "Cumulative Graph": "Graphique cumulatif", + "Cumulative Graph and Exceedance Graph": "Graphique cumulatif et graphique de dépassement", "Cumulative exceedance": "Dépassement cummulatif", "Cumulative graph": "Graphique cumulatif", "Cumulative/Exceedance Graph": "Graphique cumulatif/dépassement", @@ -957,6 +956,7 @@ "DF1": "DF1", "DF2": "DF2", "Daily": "Quotidien", + "Daily Data Editing...": "Édition quotidienne des données...", "Daily Data Editing/Entry": "Édition/saisie quotidienne des données", "Daily Data Editing/Entry...": "Édition/saisie quotidienne des données...", "Daily Data Entry": "Saisie de données quotidiennes", @@ -1110,6 +1110,7 @@ "Delete Column": "Supprimer la colonne", "Delete Column(s)": "Supprimer la ou les colonnes", "Delete Columns": "Supprimer les colonnes", + "Delete Columns or Rows": "Supprimer des colonnes ou des lignes", "Delete Columns/Rows...": "Supprimer les colonnes/lignes...", "Delete Colums or Rows": "Supprimer Colonnes ou Lignes", "Delete Data Frames": "Supprimer les tableaux de données", @@ -1178,6 +1179,7 @@ "Dialog: Create Survival Object": "Boîte de dialogue : Créer un objet de survie", "Dialog: Cumulative/Exceedance Graph": "Boîte de dialogue : Graphique Cumulatif/Dépassement", "Dialog: Daily Data Editing/Entry": "Boîte de dialogue : édition/saisie de données quotidiennes", + "Dialog: Delete Columns or Rows": "Boîte de dialogue : Supprimer des colonnes ou des lignes", "Dialog: Delete Colums or Rows": "Boîte de dialogue : Supprimer des colonnes ou des lignes", "Dialog: Describe Two Variables": "Boîte de dialogue : décrire deux variables", "Dialog: Display Daily Data": "Boîte de dialogue : Afficher les données quotidiennes", @@ -1481,6 +1483,7 @@ "Exact Results...": "Résultats exacts...", "Examine": "Examiner", "Examine...": "Examiner...", + "Examine/Edit Data": "Examiner/Modifier les données", "Example List:": "Exemple de liste :", "Examples": "Exemples", "Exceedance": "Dépassement", @@ -1755,6 +1758,7 @@ "Frequency Tables...": "Tableaux de fréquences...", "Frequency polygon": "Polygone de fréquence", "Frequency tables": "Tableaux de fréquence", + "Frequency tables and Summary tables": "Tableaux de fréquences et tableaux récapitulatifs", "Frequency/Summary Tables": "Fréquence/Tableaux récapitulatifs", "From": "De", "From Data Frame:": "De Tableau de Données:", @@ -1846,6 +1850,7 @@ "Greens": "Verts", "Grey": "Gris", "Greys": "Gris", + "Grid Lines": "Lignes de grille", "Grid lines": "Lignes de grille", "Grid square": "Grille carrée", "Grop Height": "Grop Hauteur", @@ -1887,6 +1892,7 @@ "Heading Border": "Bordure d'en-tête", "Heat": "Chaleur", "Heat Map": "Carte de chaleur", + "Heat Map and Chorolopleth Map": "Carte thermique et carte chorolopleth", "Heat Map/Choropleth": "Carte thermique/Choroplèthe", "Heat Sum...": "Somme de chaleur...", "Heating Degree Days. If the baseline = 15 degrees then HDD is (15 - tmean). HDD = 0 if tmean is more than 15.": "Degrés-jours de chauffage. Si la ligne de base = 15 degrés, alors le disque dur est (15 - tmean). HDD = 0 si tmean est supérieur à 15.", @@ -1921,6 +1927,7 @@ "Histogram Options": "Options de l’histogramme", "Histogram Plot": "Graphique histogramme", "Histogram...": "Histogramme...", + "Histograms, Dotplots, Density and Ridge Plots and Frequency Polygons": "Histogrammes, diagrammes de points, diagrammes de densité et de crête et polygones de fréquence", "History and FAQ": "Historique et FAQ", "Hit Rate": "Taux de clics", "Hjust": "Hjust", @@ -2026,6 +2033,7 @@ "Importing the following sheets:": "Importation des feuilles suivantes:", "Imputed:": "Imputé:", "In": "Dans", + "In Filter": "Dans le filtre", "In Steps Of:": "Dans les étapes de:", "In Steps of:": "Dans les étapes de :", "In numerical order of the levels (At least one level must be numerical.)": "Dans l'ordre numérique des niveaux (Au moins un niveau doit être numérique.)", @@ -2293,6 +2301,7 @@ "Legend Spacing": "Espacement de légende", "Legend Title": "Titre de la légende", "Legend Title and Text": "Texte et titre de légende", + "Legend Title:": "Titre de la légende :", "Legend item labels": "Étiquettes d'élément légendes", "Legend label": "Étiquette de légende", "Legend position": "Position de la légende", @@ -2340,6 +2349,7 @@ "Line Options": "Options de ligne", "Line Plot": "Diagramme en ligne", "Line Plot...": "Graphique linéaire...", + "Line Plots, Smoothed Plots, Dumbbell and Slope Plots": "Tracés linéaires, tracés lissés, tracés en haltères et en pente", "Line Type": "Type de ligne", "Line Type:": "Type de ligne:", "Line along x axis": "Ligne le long de l'axe x", @@ -2594,6 +2604,7 @@ "Minimum:": "Minimal:", "Minor Grid Lines": "Lignes mineures de la grille", "Minor Tick Marks": "Marques de tick mineures", + "Minor grid lines ": "Lignes de grille mineures ", "Minute": "Minute", "Minutes": "Minutes", "Minutes:": "Minutes:", @@ -2697,6 +2708,7 @@ "Multiple Response...": "Réponse multiple...", "Multiple Spells": "Plusieurs périodes", "Multiple Variables": "Variables multiples", + "Multiple Variables or Two Variables": "Variables multiples ou deux variables", "Multiple columns": "Plusieurs colonnes", "Multiply": "Multiplier", "Multistate": "Multiétats", @@ -2902,6 +2914,7 @@ "One Variable Graph Options": "Options de graphique d'une variable", "One Variable Graph...": "Un graphique variable...", "One Variable Summarise": "Résumer une variable", + "One Variable Summarise, Skim and Customised": "Un résumé variable, écrémé et personnalisé", "One Variable Summarise...": "Un résumé variable...", "One Variable Use Model": "Modèle d'utilisation d'une variable", "One Variable...": "Une Variable...", @@ -3080,6 +3093,7 @@ "Partial": "Partiel", "Partition Plot": "Partition graphique", "Partitioning": "Partitionnement", + "Partitioning or Hierarchical": "Partitionnement ou Hiérarchique", "Partitioning:": "Partitionnement:", "Paste": "Pâte", "Paste Data to New Column(s)": "Coller les données dans de nouvelles colonnes", @@ -3814,6 +3828,7 @@ "Selected column": "Colonne sélectionnée", "Selected:": "Choisi:", "Selected:0": "Sélectionné :0", + "Selecting Option": "Sélection d'options", "Selection": "Sélection", "Selection Preview": "Aperçu de la sélection", "Selection Preview:": "Aperçu de la sélection :", @@ -3860,6 +3875,7 @@ "Sets:": "Ensembles:", "Settings": "Paramètres", "Setup For Data Entry": "Configuration Pour l'Entrée de Données", + "Setup for Data Editing...": "Configuration de l'édition des données...", "Setup for Data Entry...": "Configuration pour la saisie de données...", "Shape": "Forme", "Shape (Optional):": "Forme (facultative): ", @@ -3970,6 +3986,7 @@ "Skewness (3rd Moment) (W)": "Skewness (3ème Moment) (W)", "Skewness Weight:": "Poids de coefficient d’asymétrie:", "Skim": "Parcourir", + "Skim or Two Variables": "Écrémage ou deux variables", "Skip ngrams": "Ignorer les ngrammes", "Slope": "Pente", "Slopes": "Pentes", @@ -4037,6 +4054,7 @@ "Spline interpolation of missing values. For example na.spline(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,2.5,4,7,12)": "Interpolation spline des valeurs manquantes. Par exemple na.spline(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,2.5 ,4,7,12)", "Split Geometry": "Diviser la géométrie", "Split Text Column": "Diviser la colonne de texte", + "Split Text...": "Fractionner le texte...", "Split by:": "Diviser par:", "Split...": "Diviser...", "Splits the data into groups of at least the specified size.": "Divise les données en groupes d'au moins la taille spécifiée.", @@ -4198,6 +4216,7 @@ "Suppl.Numeric:": "Numérique.Suppl:", "Supplementary Individuals": "Particuliers supplémentaires", "Surface pressure": "Pression de surface", + "Survey": "Enquête", "Survival": "Survie", "Survival Object Name:": "Nom de l'objet de survie:", "Swap": "Échanger", @@ -4222,6 +4241,9 @@ "Table Name:": "Nom de la table:", "Table Title:": "Titre du tableau:", "Table To Use:": "Tableau à utiliser :", + "Table or Graph": "Tableau ou graphique", + "Table or Graph. Also Stem and Leaf Plots": "Tableau ou graphique. Aussi diagrammes à tiges et à feuilles", + "Table, Stacked Graph or Likert Graph": "Tableau, graphique empilé ou graphique de Likert", "Table/Chart :": "Tableau/Graphique :", "Tables": "Tableaux", "Tables...": "Les tables...", @@ -4292,6 +4314,7 @@ "Themes": "Thèmes", "Themes Sub Dialog": "Sous-boîte de dialogue Thèmes", "Themes...": "Thèmes...", + "There are no entries matching ": "Il n'y a pas d'entrées correspondant ", "Thicknes:": "Épaisseurs :", "Thickness:": "Épaisseur:", "Third Context:": "Troisième contexte:", @@ -4322,6 +4345,7 @@ "Tidy": "Bien rangé", "Tidy Daily Data": "Données quotidiennes bien rangées", "Tidy Daily Data...": "Des données quotidiennes bien rangées...", + "Tidy Data": "Des données bien rangées", "Tidy and Examine": "Ranger et examiner", "Tidy...": "Rangé...", "Ties": "Liens", @@ -4404,6 +4428,7 @@ "Trace Values": "Valeurs de Trace", "Transform": "Transformer", "Transform Text Column": "Transformer la colonne de texte", + "Transform Text...": "Transformer le texte...", "Transform...": "Transformer...", "Transform:": "Transformer:", "Transformation": "Transformation", @@ -4529,6 +4554,7 @@ "Use Model ": "Utiliser le modèle ", "Use Model Keyboard...": "Utiliser le modèle de clavier...", "Use Model Keyboards...": "Utiliser des modèles de claviers...", + "Use Regular Expression": "Utiliser l'expression régulière", "Use Summaries": "Utiliser les résumés", "Use Summaries...": "Utiliser les résumés...", "Use Table": "Utiliser le tableau", @@ -4801,15 +4827,15 @@ "Yellow": "Jaune", "Yellow-Green": "Jaune-vert", "Yes": "Oui", + "YlGn": "YlGn", + "YlGnBu": "YlGnBu", + "YlOrBr": "YlOrBr", + "YlOrRd": "YlOrRd", + "Ylim": "Ylim", "You have multiple rows with the same dates for one or more stations. Use the Climatic > Tidy and Examine > Duplicates dialog to investigate these issues.": "Vous avez plusieurs lignes avec les mêmes dates pour une ou plusieurs stations. Utilisez la boîte de dialogue Climatique > Ranger et Examiner > Doublons pour étudier ces problèmes.", "Zero Values": "Zéro valeurs", "Zplot Plot": "Graphique Zplot", - "[^ ] not": "[^] non", - "\\ escape": "\\ s'échapper", - "\\d digit": "\\d chiffre", - "\\s space": "\\s espace", - "^": "^", - "^ begin": "^ commencer", + "Zseq": "Zséq", "a quantile, given a value between 0 and 1. So quantile(c(1,2,3,4,10), 0.25) = 2 and is the lower quartile.": "un quantile, étant donné une valeur comprise entre 0 et 1. Donc quantile(c(1,2,3,4,10), 0,25) = 2 et est le quartile inférieur.", "aapc": "aapc", "abs": "abs", @@ -5440,9 +5466,7 @@ "mse": "eqm", "multiply each number in the list by a given value (default 10).": "multiplier chaque nombre de la liste par une valeur donnée (10 par défaut).", "murmur32": "murmur32", - "n": "n", "n times. For example, str_count(c(": "n fois. Par exemple, str_count(c(", - "n:": "n:", "n_distinct": "n_distincts", "na": "n / A", "na.rm": "na.rm", @@ -5810,7 +5834,6 @@ "sunh": "soleilh", "sunshine hours": "heures de soleil", "swap Parameters": "changer les paramètres", - "t": "t", "t quantiles. For example qt(0.05, 5) = -2.015; qt(0.05, 100) = -1.66": "t quantiles. Par exemple qt(0.05, 5) = -2.015 ; qt(0,05, 100) = -1,66", "table": "tableau", "tag": "étiqueter", @@ -5873,8 +5896,6 @@ "upper": "supérieur", "upper (c)": "supérieur (c)", "uppercase": "majuscule", - "v. ": "v. ", - "v. 1.0.0.0": "version 1.0.0.0", "v3.0 Daily Rainfall": "v3.0 Pluie Journalière", "v3.0 Dekadal Rainfall": "v3.0 Pluie de Dekadal", "v3.0 Monthly Rainfall": "v3.0 Pluie mensuelle", @@ -5905,7 +5926,6 @@ "wakefield::r_data_theme(n = 100, data_theme = ": "wakefield::r_data_theme(n = 100, data_theme = ", "waller ": "waller ", "ward": "salle", - "wd": "wd", "wday": "wjour", "weight:": "lester:", "weighted": "pondéré", @@ -5921,21 +5941,7 @@ "wilcoxsign": "wilcoxsign", "winner_country": "pays_gagnant", "winner_name": "nom_gagnant", - "wm": "wm", "word": "mot", "wrappednormal": "enveloppénormal", - "ws": "ws", - "ww ": "ww ", - "xend :": "xend :", - "xmax :": "xmax :", - "xmin :": "xmin :", - "xxhash32": "xxhash32", - "xxhash64": "xxhash64", - "yday": "ajour", - "year": "année", - "yend :": "yend :", - "ymax :": "ymax :", - "ymd": "jjm", - "ymin :": "ymin :", "zoo": "zoo" } \ No newline at end of file diff --git a/instat/translations/it/it_r_instat_not_menus.json b/instat/translations/it/it_r_instat_not_menus.json index bde012d6dcb..47b54e69f86 100644 --- a/instat/translations/it/it_r_instat_not_menus.json +++ b/instat/translations/it/it_r_instat_not_menus.json @@ -47,22 +47,17 @@ " use ranks to divide into (almost) equal sized groups. For example ntile(c(15,11,13,12,NA,12),2) = (2,1,2,1,NA,1)": " usa i ranghi per dividere in gruppi di dimensioni (quasi) uguali. Ad esempio ntile(c(15,11,13,12,NA,12),2) = (2,1,2,1,NA,1)", " | Showing ": " | Mostrando ", "!is.na detects non-missing values, for example !is.na(c(1,3,NA, 5)) gives TRUE, TRUE, FALSE, TRUE": "!is.na rileva i valori non mancanti, ad esempio !is.na(c(1,3,NA, 5)) restituisce VERO, VERO, FALSO, VERO", - "An order, level, count control to be added later": "Un ordine, livello, controllo di conteggio da aggiungere successivamente", "# Code generated by the dialog, Script": "# Codice generato dalla finestra di dialogo, Script", - "&Copy": "&Copia", - "&Open": "&Aprire", - "&Paste": "&Impasto", - "&Save": "&Salva", "(%in%)is like the match function and returns a logical vector. For example (11:15 %in% c(11,13)) gives TRUE, FALSE, TRUE, FALSE, FALSE": "(%in%) è come la funzione match e restituisce un vettore logico. Ad esempio (11:15 %in% c(11,13)) restituisce VERO, FALSO, VERO, FALSO, FALSO", "(Missing)": "(Mancante)", "(blank)": "(vuoto)", "(natural) logarithm. For example log(512) = 6.238; log(512,2) = 9 (log to base 2, i.e. 2 ^ 9 =512)": "(logaritmo naturale. Ad esempio log(512) = 6.238; log(512,2) = 9 (log in base 2, cioè 2 ^ 9 =512)", "(normal probabilities. For example; pnorm(-1.6449) = 0.05; pnorm(130,100,15) = 0.9772.": "(probabilità normali. Ad esempio; pnorm(-1.6449) = 0.05; pnorm(130,100,15) = 0.9772.", "(see also %in%)gives the positions of the matching elements. For example match(11:15, c(11,13)) gives (1,NA, 2, NA, NA). match(11:15,c(11,13),nomatch=0) gives 1, 0, 2, 0, 0)": "(vedi anche %in%)dà le posizioni degli elementi corrispondenti. Ad esempio match(11:15, c(11,13)) restituisce (1,NA, 2, NA, NA). match(11:15,c(11,13),nomatch=0) restituisce 1, 0, 2, 0, 0)", - "- to": "- A", ".nc files found to import": "File .nc trovati da importare", + "0 or 1 times. For example, str_count(c(": "0 o 1 volta. Ad esempio, str_count(c(", + "0 or more times. For example, str_count(c(": "0 o più volte. Ad esempio, str_count(c(", "1 or more times. For example, str_count(c(": "1 o più volte. Ad esempio, str_count(c(", - "1/mu^2": "1/mu^2", "10 variables and 50 observations, sampling with replacement and probability 0.3 of TRUE": "10 variabili e 50 osservazioni, campionamento con sostituzione e probabilità 0,3 di TRUE", "10 variables from the Wakefield package": "10 variabili dal pacchetto Wakefield", "10m u-component of wind": "10 m componente u del vento", @@ -80,13 +75,13 @@ "2m dewpoint temperature": "2 m di temperatura del punto di rugiada", "2m temperature": "temperatura 2 m", "2nd Factor (Optional):": "2° fattore (facoltativo):", - "2pi": "2 pi", "3 variables including both random normal and uniform data": "3 variabili che includono sia dati casuali normali che uniformi", "3. Mean Sea Level Pressure:": "3. Pressione media a livello del mare:", "36 = 2(squared)*3(squared) is powerful because for each divisor, here 2 and 3, its square is also a divisor.": "36 = 2(quadrato)*3(quadrato) è potente perché per ogni divisore, qui 2 e 3, anche il suo quadrato è un divisore.", "4 Digit": "4 cifre", "4 variables, showing use of seq and rep function": "4 variabili, che mostrano l'uso della funzione seq e rep", "4. Mean Daily Air Temperature:": "4. Temperatura media giornaliera dell'aria:", + "4.85": "4.85", "49 variables, illustrating most of the types of data in the Wakefield package": "49 variabili, che illustrano la maggior parte dei tipi di dati nel pacchetto Wakefield", "5. Total Precipitation:": "5. Precipitazioni totali:", "6. Mean Daily Max Air Temperature:": "6. Temperatura massima giornaliera media dell'aria:", @@ -250,6 +245,7 @@ "Amount:": "Quantità:", "An R Command is Running": "Un comando R è in esecuzione", "An order": "Un ordine", + "An order, level, count control to be added later": "Un ordine, livello, controllo di conteggio da aggiungere successivamente", "An order,level,count control to be added later": "Un ordine, livello, controllo di conteggio da aggiungere successivamente", "Analysis": "Analisi", "Anderson-Darling test for normality": "Test di Anderson-Darling per la normalità", @@ -370,6 +366,7 @@ "Bar Options": "Opzioni barra", "Bar and Pie Chart": "Grafico a barre e torta", "Bar plot": "Trama della barra", + "Bar, Column, Lollipop, Pie, and Donut Charts, plus Treemaps and Wordclouds": "Grafici a barre, a colonne, lecca-lecca, a torta e ad anello, oltre a mappe ad albero e wordcloud", "BarChart Options": "Opzioni del grafico a barre", "Barometer Height:": "Altezza del barometro:", "Bartels Rank Test of Randomness": "Bartels Rank Test di casualità", @@ -427,6 +424,7 @@ "Box Plot": "Trama a scatola", "Box plot": "Trama a scatola", "Boxplot": "Grafico a scatola", + "Boxplot (including Tufte), Jitter and Violin Plots": "Boxplot (incluso Tufte), Jitter e Violin Plots", "Boxplot + Jitter": "Grafico a scatole + Jitter", "Boxplot Count Variable": "Boxplot Count variabile", "Boxplot Method": "Metodo boxplot", @@ -942,6 +940,7 @@ "Cumulative": "Cumulativo", "Cumulative Distribution...": "Distribuzione cumulativa...", "Cumulative Graph": "Grafico cumulativo", + "Cumulative Graph and Exceedance Graph": "Grafico cumulativo e grafico di superamento", "Cumulative exceedance": "Superamento cumulativo", "Cumulative graph": "Grafico cumulativo", "Cumulative/Exceedance Graph": "Grafico cumulativo/superamento", @@ -957,6 +956,7 @@ "DF1": "DF1", "DF2": "DF2", "Daily": "Quotidiano", + "Daily Data Editing...": "Modifica dei dati giornalieri...", "Daily Data Editing/Entry": "Modifica/Inserimento giornaliero dei dati", "Daily Data Editing/Entry...": "Modifica/inserimento dati giornalieri...", "Daily Data Entry": "Inserimento giornaliero dei dati", @@ -1110,6 +1110,7 @@ "Delete Column": "Elimina colonna", "Delete Column(s)": "Elimina colonna/e", "Delete Columns": "Elimina colonne", + "Delete Columns or Rows": "Elimina colonne o righe", "Delete Columns/Rows...": "Elimina colonne/righe...", "Delete Colums or Rows": "Elimina colonne o righe", "Delete Data Frames": "Elimina frame di dati", @@ -1178,6 +1179,7 @@ "Dialog: Create Survival Object": "Finestra di dialogo: Crea oggetto di sopravvivenza", "Dialog: Cumulative/Exceedance Graph": "Finestra di dialogo: Grafico cumulativo/superamento", "Dialog: Daily Data Editing/Entry": "Finestra di dialogo: modifica/inserimento dati giornalieri", + "Dialog: Delete Columns or Rows": "Finestra di dialogo: elimina colonne o righe", "Dialog: Delete Colums or Rows": "Finestra di dialogo: Elimina colonne o righe", "Dialog: Describe Two Variables": "Finestra di dialogo: Descrivi due variabili", "Dialog: Display Daily Data": "Finestra di dialogo: Visualizza dati giornalieri", @@ -1481,6 +1483,7 @@ "Exact Results...": "Risultati esatti...", "Examine": "Esaminare", "Examine...": "Esaminare...", + "Examine/Edit Data": "Esamina/modifica dati", "Example List:": "Elenco di esempio:", "Examples": "Esempi", "Exceedance": "Superamento", @@ -1755,6 +1758,7 @@ "Frequency Tables...": "Tabelle di frequenza...", "Frequency polygon": "Poligono di frequenza", "Frequency tables": "Tabelle di frequenza", + "Frequency tables and Summary tables": "Tabelle di frequenza e tabelle di riepilogo", "Frequency/Summary Tables": "Frequenza/Tabelle di riepilogo", "From": "A partire dal", "From Data Frame:": "Dal frame dati:", @@ -1846,6 +1850,7 @@ "Greens": "Verdi", "Grey": "Grigio", "Greys": "Grigi", + "Grid Lines": "Linee della griglia", "Grid lines": "Linee della griglia", "Grid square": "Piazza della griglia", "Grop Height": "Altezza groppa", @@ -1887,6 +1892,7 @@ "Heading Border": "Confine di intestazione", "Heat": "Calore", "Heat Map": "Mappa di calore", + "Heat Map and Chorolopleth Map": "Mappa termica e mappa corolopletica", "Heat Map/Choropleth": "Mappa termica/coropletica", "Heat Sum...": "Calore somma...", "Heating Degree Days. If the baseline = 15 degrees then HDD is (15 - tmean). HDD = 0 if tmean is more than 15.": "Riscaldamento Gradi Giorni. Se la linea di base = 15 gradi, l'HDD è (15 - tmean). HDD = 0 se tmean è maggiore di 15.", @@ -1921,6 +1927,7 @@ "Histogram Options": "Opzioni dell'istogramma", "Histogram Plot": "Grafico dell'istogramma", "Histogram...": "Istogramma...", + "Histograms, Dotplots, Density and Ridge Plots and Frequency Polygons": "Istogrammi, Dotplot, Density and Ridge Plots e Frequency Polygons", "History and FAQ": "Cronologia e domande frequenti", "Hit Rate": "Tasso di successo", "Hjust": "Hjust", @@ -2026,6 +2033,7 @@ "Importing the following sheets:": "Importazione dei seguenti fogli:", "Imputed:": "imputato:", "In": "In", + "In Filter": "Nel filtro", "In Steps Of:": "A passi di:", "In Steps of:": "A passi di:", "In numerical order of the levels (At least one level must be numerical.)": "In ordine numerico dei livelli (almeno un livello deve essere numerico).", @@ -2293,6 +2301,7 @@ "Legend Spacing": "Spaziatura legenda", "Legend Title": "Titolo della leggenda", "Legend Title and Text": "Legenda Titolo e testo", + "Legend Title:": "Titolo legenda:", "Legend item labels": "Etichette degli elementi della legenda", "Legend label": "Etichetta leggenda", "Legend position": "Posizione della leggenda", @@ -2340,6 +2349,7 @@ "Line Options": "Opzioni linea", "Line Plot": "Trama di linee", "Line Plot...": "Trama linea...", + "Line Plots, Smoothed Plots, Dumbbell and Slope Plots": "Trame lineari, grafici levigati, grafici con manubri e pendenze", "Line Type": "Modello di linea", "Line Type:": "Modello di linea:", "Line along x axis": "Linea lungo l'asse x", @@ -2594,6 +2604,7 @@ "Minimum:": "Minimo:", "Minor Grid Lines": "Linee della griglia minori", "Minor Tick Marks": "Segni di spunta minori", + "Minor grid lines ": "Linee della griglia minori ", "Minute": "Minuto", "Minutes": "Minuti", "Minutes:": "Minuti:", @@ -2697,6 +2708,7 @@ "Multiple Response...": "Risposta multipla...", "Multiple Spells": "Incantesimi multipli", "Multiple Variables": "Più variabili", + "Multiple Variables or Two Variables": "Più variabili o due variabili", "Multiple columns": "Più colonne", "Multiply": "Moltiplicare", "Multistate": "Multistato", @@ -2902,6 +2914,7 @@ "One Variable Graph Options": "Opzioni di un grafico variabile", "One Variable Graph...": "Un grafico variabile...", "One Variable Summarise": "Riepilogo di una variabile", + "One Variable Summarise, Skim and Customised": "Una variabile riepilogativa, scremata e personalizzata", "One Variable Summarise...": "Riepilogo di una variabile...", "One Variable Use Model": "Un modello di utilizzo variabile", "One Variable...": "Una variabile...", @@ -3080,6 +3093,7 @@ "Partial": "Parziale", "Partition Plot": "Trama di partizione", "Partitioning": "Partizionamento", + "Partitioning or Hierarchical": "Partizionamento o gerarchico", "Partitioning:": "Partizionamento:", "Paste": "Impasto", "Paste Data to New Column(s)": "Incolla i dati in nuove colonne", @@ -3814,6 +3828,7 @@ "Selected column": "Colonna selezionata", "Selected:": "Selezionato:", "Selected:0": "Selezionato:0", + "Selecting Option": "Selezionando Opzione", "Selection": "Selezione", "Selection Preview": "Anteprima selezione", "Selection Preview:": "Anteprima selezione:", @@ -3860,6 +3875,7 @@ "Sets:": "Imposta:", "Settings": "Impostazioni", "Setup For Data Entry": "Configurazione per l'immissione dei dati", + "Setup for Data Editing...": "Configurazione per la modifica dei dati...", "Setup for Data Entry...": "Configurazione per l'immissione dei dati...", "Shape": "Forma", "Shape (Optional):": "Forma (opzionale):", @@ -3970,6 +3986,7 @@ "Skewness (3rd Moment) (W)": "Asimmetria (3° momento) (W)", "Skewness Weight:": "Peso dell'asimmetria:", "Skim": "Scremare", + "Skim or Two Variables": "Skim o due variabili", "Skip ngrams": "Salta ngrammi", "Slope": "Pendenza", "Slopes": "Piste", @@ -4037,6 +4054,7 @@ "Spline interpolation of missing values. For example na.spline(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,2.5,4,7,12)": "Interpolazione spline dei valori mancanti. Ad esempio na.spline(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,2.5 ,4,7,12)", "Split Geometry": "Geometria divisa", "Split Text Column": "Colonna di testo divisa", + "Split Text...": "Dividi testo...", "Split by:": "Diviso per:", "Split...": "Diviso...", "Splits the data into groups of at least the specified size.": "Divide i dati in gruppi almeno della dimensione specificata.", @@ -4198,6 +4216,7 @@ "Suppl.Numeric:": "Suppl.Numerico:", "Supplementary Individuals": "Individui supplementari", "Surface pressure": "Pressione superficiale", + "Survey": "Sondaggio", "Survival": "Sopravvivenza", "Survival Object Name:": "Sopravvivenza Nome oggetto:", "Swap": "Scambio", @@ -4222,6 +4241,9 @@ "Table Name:": "Nome tavolo:", "Table Title:": "Titolo della tabella:", "Table To Use:": "Tabella da utilizzare:", + "Table or Graph": "Tabella o grafico", + "Table or Graph. Also Stem and Leaf Plots": "Tabella o grafico. Anche trame a stelo e foglia", + "Table, Stacked Graph or Likert Graph": "Tabella, grafico in pila o grafico Likert", "Table/Chart :": "Tabella/grafico :", "Tables": "Tabelle", "Tables...": "Tavoli...", @@ -4292,6 +4314,7 @@ "Themes": "Temi", "Themes Sub Dialog": "Sottofinestra Temi", "Themes...": "Temi...", + "There are no entries matching ": "Non ci sono voci corrispondenti ", "Thicknes:": "Spessori:", "Thickness:": "Spessore:", "Third Context:": "Terzo contesto:", @@ -4322,6 +4345,7 @@ "Tidy": "Ordinato", "Tidy Daily Data": "Dati giornalieri ordinati", "Tidy Daily Data...": "Dati giornalieri ordinati...", + "Tidy Data": "Dati ordinati", "Tidy and Examine": "Riordina ed esamina", "Tidy...": "Ordinato...", "Ties": "Cravatte", @@ -4404,6 +4428,7 @@ "Trace Values": "Traccia valori", "Transform": "Trasformare", "Transform Text Column": "Trasforma colonna di testo", + "Transform Text...": "Trasforma testo...", "Transform...": "Trasformare...", "Transform:": "Trasformare:", "Transformation": "Trasformazione", @@ -4529,6 +4554,7 @@ "Use Model ": "Usa modello ", "Use Model Keyboard...": "Usa tastiera modello...", "Use Model Keyboards...": "Usa tastiere modello...", + "Use Regular Expression": "Usa l'espressione regolare", "Use Summaries": "Usa i riepiloghi", "Use Summaries...": "Usa i riepiloghi...", "Use Table": "Usa la tabella", @@ -4801,15 +4827,15 @@ "Yellow": "Giallo", "Yellow-Green": "Giallo verde", "Yes": "sì", + "YlGn": "YlGn", + "YlGnBu": "YlGnBu", + "YlOrBr": "YlOrBr", + "YlOrRd": "YlOrRd", + "Ylim": "Ylim", "You have multiple rows with the same dates for one or more stations. Use the Climatic > Tidy and Examine > Duplicates dialog to investigate these issues.": "Hai più righe con le stesse date per una o più stazioni. Utilizzare la finestra di dialogo Clima > Riordina ed esamina > Duplicati per esaminare questi problemi.", "Zero Values": "Zero valori", "Zplot Plot": "Zplot Trama", - "[^ ] not": "[^ ] no", - "\\ escape": "\\ fuga", - "\\d digit": "\\d cifra", - "\\s space": "\\s spazio", - "^": "^", - "^ begin": "^ iniziare", + "Zseq": "Zseq", "a quantile, given a value between 0 and 1. So quantile(c(1,2,3,4,10), 0.25) = 2 and is the lower quartile.": "un quantile, dato un valore compreso tra 0 e 1. Quindi quantile(c(1,2,3,4,10), 0.25) = 2 ed è il quartile inferiore.", "aapc": "aapc", "abs": "addominali", @@ -5440,9 +5466,7 @@ "mse": "mse", "multiply each number in the list by a given value (default 10).": "moltiplicare ciascun numero nell'elenco per un determinato valore (predefinito 10).", "murmur32": "mormorio32", - "n": "n", "n times. For example, str_count(c(": "n volte. Ad esempio, str_count(c(", - "n:": "n:", "n_distinct": "n_distinto", "na": "n / a", "na.rm": "na.rm", @@ -5810,7 +5834,6 @@ "sunh": "sole", "sunshine hours": "ore di sole", "swap Parameters": "scambiare i parametri", - "t": "t", "t quantiles. For example qt(0.05, 5) = -2.015; qt(0.05, 100) = -1.66": "t quantili. Ad esempio qt(0.05, 5) = -2.015; qt(0,05; 100) = -1,66", "table": "tavolo", "tag": "etichetta", @@ -5873,8 +5896,6 @@ "upper": "superiore", "upper (c)": "superiore (c)", "uppercase": "maiuscolo", - "v. ": "v. ", - "v. 1.0.0.0": "v.1.0.0.0", "v3.0 Daily Rainfall": "v3.0 Precipitazioni giornaliere", "v3.0 Dekadal Rainfall": "v3.0 Pioggia di Dekadal", "v3.0 Monthly Rainfall": "v3.0 Precipitazioni mensili", @@ -5905,7 +5926,6 @@ "wakefield::r_data_theme(n = 100, data_theme = ": "wakefield::r_data_theme(n = 100, data_theme = ", "waller ": "waller ", "ward": "reparto", - "wd": "wd", "wday": "wday", "weight:": "peso:", "weighted": "ponderato", @@ -5921,21 +5941,7 @@ "wilcoxsign": "wilcoxsign", "winner_country": "vincitore_paese", "winner_name": "nome_vincitore", - "wm": "wm", "word": "parola", "wrappednormal": "wrapnormal", - "ws": "ws", - "ww ": "ww ", - "xend :": "fine :", - "xmax :": "xmax :", - "xmin :": "xmin :", - "xxhash32": "xxhash32", - "xxhash64": "xxhash64", - "yday": "yday", - "year": "anno", - "yend :": "yend :", - "ymax :": "ymax :", - "ymd": "ymd", - "ymin :": "ymin :", "zoo": "zoo" } \ No newline at end of file diff --git a/instat/translations/pt/pt_r_instat_menus.json b/instat/translations/pt/pt_r_instat_menus.json index 876bd33562a..dcfac0c429b 100644 --- a/instat/translations/pt/pt_r_instat_menus.json +++ b/instat/translations/pt/pt_r_instat_menus.json @@ -233,7 +233,7 @@ "More...": "Mais...", "Mosaic Plot...": "Plotagem mosaica...", "Multiple Response...": "Resposta Múltipla...", - "Multivariate": "Multariar", + "Multivariate": "Multivariada", "Multple Lines...": "Múltiplas linhas...", "NCMP": "NCMP", "New Data Frame...": "Nova Estrutura de Dados...", diff --git a/instat/translations/pt/pt_r_instat_not_menus.json b/instat/translations/pt/pt_r_instat_not_menus.json index fdc4a979b19..fcfaf2ba521 100644 --- a/instat/translations/pt/pt_r_instat_not_menus.json +++ b/instat/translations/pt/pt_r_instat_not_menus.json @@ -47,22 +47,17 @@ " use ranks to divide into (almost) equal sized groups. For example ntile(c(15,11,13,12,NA,12),2) = (2,1,2,1,NA,1)": " use as classificações para dividir em grupos de tamanhos (quase) iguais. Por exemplo ntile(c(15,11,13,12,NA,12),2) = (2,1,2,1,NA,1)", " | Showing ": " Mostrando ", "!is.na detects non-missing values, for example !is.na(c(1,3,NA, 5)) gives TRUE, TRUE, FALSE, TRUE": "!is.na detecta valores não omissos, por exemplo !is.na(c(1,3,NA, 5)) dá TRUE, TRUE, FALSE, TRUE", - "An order, level, count control to be added later": "Um controle de ordem, nível e contagem a ser adicionado posteriormente", "# Code generated by the dialog, Script": "# Código gerado pelo diálogo, Script", - "&Copy": "&Cópia de", - "&Open": "&Abrir", - "&Paste": "&Colar", - "&Save": "&Salvar", "(%in%)is like the match function and returns a logical vector. For example (11:15 %in% c(11,13)) gives TRUE, FALSE, TRUE, FALSE, FALSE": "(%in%) é como a função match e retorna um vetor lógico. Por exemplo (11:15 %in% c(11,13)) dá VERDADEIRO, FALSO, VERDADEIRO, FALSO, FALSO", "(Missing)": "(Ausente)", "(blank)": "(em branco)", "(natural) logarithm. For example log(512) = 6.238; log(512,2) = 9 (log to base 2, i.e. 2 ^ 9 =512)": "(Logaritmo natural. Por exemplo log(512) = 6.238; log(512,2) = 9 (log na base 2, ou seja, 2 ^ 9 =512)", "(normal probabilities. For example; pnorm(-1.6449) = 0.05; pnorm(130,100,15) = 0.9772.": "(probabilidades normais. Por exemplo; pnorm(-1,6449) = 0,05; pnorm(130,100,15) = 0,9772.", "(see also %in%)gives the positions of the matching elements. For example match(11:15, c(11,13)) gives (1,NA, 2, NA, NA). match(11:15,c(11,13),nomatch=0) gives 1, 0, 2, 0, 0)": "(veja também %in%) dá as posições dos elementos correspondentes. Por exemplo match(11:15, c(11,13)) dá (1,NA, 2, NA, NA). match(11:15,c(11,13),nomatch=0) dá 1, 0, 2, 0, 0)", - "- to": "- para", ".nc files found to import": "Arquivos .nc encontrados para importar", + "0 or 1 times. For example, str_count(c(": "0 ou 1 vezes. Por exemplo, str_count(c(", + "0 or more times. For example, str_count(c(": "0 ou mais vezes. Por exemplo, str_count(c(", "1 or more times. For example, str_count(c(": "1 ou mais vezes. Por exemplo, str_count(c(", - "1/mu^2": "1/mu^2", "10 variables and 50 observations, sampling with replacement and probability 0.3 of TRUE": "10 variáveis e 50 observações, amostragem com reposição e probabilidade 0,3 de VERDADEIRO", "10 variables from the Wakefield package": "10 variáveis do pacote Wakefield", "10m u-component of wind": "10m u-componente do vento", @@ -80,13 +75,13 @@ "2m dewpoint temperature": "Temperatura do orvalho 2m", "2m temperature": "Temperatura 2m", "2nd Factor (Optional):": "Fator 2 (Opcional):", - "2pi": "2pi", "3 variables including both random normal and uniform data": "3 variáveis, incluindo dados aleatórios normais e uniformes", "3. Mean Sea Level Pressure:": "3. Pressão Média do Nível do Mar:", "36 = 2(squared)*3(squared) is powerful because for each divisor, here 2 and 3, its square is also a divisor.": "36 = 2(quadrado)*3(quadrado) é poderoso porque para cada divisor, aqui 2 e 3, seu quadrado também é um divisor.", "4 Digit": "4 Digit", "4 variables, showing use of seq and rep function": "4 variáveis, mostrando o uso da função seq e rep", "4. Mean Daily Air Temperature:": "4. Temperatura do ar diária média:", + "4.85": "4,85", "49 variables, illustrating most of the types of data in the Wakefield package": "49 variáveis, ilustrando a maioria dos tipos de dados no pacote Wakefield", "5. Total Precipitation:": "5. Precipitação Total:", "6. Mean Daily Max Air Temperature:": "6. Média de Temperatura do Ar Máxima:", @@ -250,6 +245,7 @@ "Amount:": "Quantia:", "An R Command is Running": "Um Comando R está Executando", "An order": "Um pedido", + "An order, level, count control to be added later": "Um controle de ordem, nível e contagem a ser adicionado posteriormente", "An order,level,count control to be added later": "Um controle de ordem, nível e contagem a ser adicionado posteriormente", "Analysis": "Análise", "Anderson-Darling test for normality": "Teste de Anderson-Darling para normalidade", @@ -370,6 +366,7 @@ "Bar Options": "Opções de barra", "Bar and Pie Chart": "Gráfico de Barras e Pie", "Bar plot": "Gráfico de barras", + "Bar, Column, Lollipop, Pie, and Donut Charts, plus Treemaps and Wordclouds": "Gráficos de barras, colunas, pirulitos, tortas e rosquinhas, além de mapas de árvores e nuvens de palavras", "BarChart Options": "Opções de gráfico de barras", "Barometer Height:": "Altura do barômetro:", "Bartels Rank Test of Randomness": "Teste de Aleatoriedade de Bartels Rank", @@ -427,6 +424,7 @@ "Box Plot": "Gráfico de caixa", "Box plot": "Gráfico da caixa", "Boxplot": "Caixa", + "Boxplot (including Tufte), Jitter and Violin Plots": "Boxplot (incluindo Tufte), Jitter e Violin Plots", "Boxplot + Jitter": "Boxplot + Jitter", "Boxplot Count Variable": "Variável de Caixa", "Boxplot Method": "Método Boxplot", @@ -605,7 +603,7 @@ "Click Ok to paste data to new data frames.": "Clique em Ok para colar os dados em novos quadros de dados.", "Click to go to a specific window 1-": "Clique para ir para uma janela específica 1-", "Climate Methods": "Métodos climáticos", - "Climatic": "climático", + "Climatic": "Climático", "Climatic Boxplot": "Caixa Climática", "Climatic Check Data Rainfall": "Chuva de Dados da verificação climática", "Climatic Check Data Temperature": "Temperatura dos dados de verificação climática", @@ -845,7 +843,7 @@ "Contract Value:": "Valor do Contrato:", "Contrast": "Contrast", "Contrasts": "Contraste", - "Contrasts...": "contrastes...", + "Contrasts...": "Contrastes...", "Control Options": "Opções de Controle", "Control Variables:": "Variáveis de controle:", "Conversions": "Conversões", @@ -870,7 +868,7 @@ "Cook's Distance": "Distância do Cozinheiro", "Cook's Distance v Leverage": "Alavancagem de Nv Distância do cookie", "Coordinates": "Coordenadas", - "Copy": "cópia de", + "Copy": "Cópia de", "Copy Data Frame": "Copiar quadro de dados", "Copy Data Frame...": "Copiar quadro de dados...", "Copy Image": "Copiar imagem", @@ -942,6 +940,7 @@ "Cumulative": "Cumulative", "Cumulative Distribution...": "Distribuição cumulativa...", "Cumulative Graph": "Gráfico cumulativo", + "Cumulative Graph and Exceedance Graph": "Gráfico cumulativo e gráfico de excedência", "Cumulative exceedance": "Exceção acumulada", "Cumulative graph": "Gráfico acumulado", "Cumulative/Exceedance Graph": "Gráfico Cumulativo/Excesso", @@ -957,6 +956,7 @@ "DF1": "DF1", "DF2": "DF2", "Daily": "Diariamente", + "Daily Data Editing...": "Edição diária de dados...", "Daily Data Editing/Entry": "Edição/entrada de dados diários", "Daily Data Editing/Entry...": "Edição/entrada de dados diários...", "Daily Data Entry": "Entrada de dados diários", @@ -1023,7 +1023,7 @@ "Date labels": "Rótulos da data", "Date modified": "Data modificada", "Date:": "Data:", - "Dates": "datas", + "Dates": "Datas", "Dates/Times": "Dados/Tempos", "Day": "dia", "Day Columns (31/62)": "Colunas do Dia (31/62)", @@ -1110,6 +1110,7 @@ "Delete Column": "Excluir coluna", "Delete Column(s)": "Excluir coluna(s)", "Delete Columns": "Excluir colunas", + "Delete Columns or Rows": "Excluir colunas ou linhas", "Delete Columns/Rows...": "Excluir colunas/linhas...", "Delete Colums or Rows": "Excluir colunas ou linhas", "Delete Data Frames": "Excluir molduras de dados", @@ -1178,6 +1179,7 @@ "Dialog: Create Survival Object": "Caixa de Diálogo: Criar Objeto de Sobrevivência", "Dialog: Cumulative/Exceedance Graph": "Caixa de Diálogo: Gráfico Cumulativo/Excedente", "Dialog: Daily Data Editing/Entry": "Caixa de Diálogo: Edição/Inserção de Dados Diários", + "Dialog: Delete Columns or Rows": "Diálogo: Excluir colunas ou linhas", "Dialog: Delete Colums or Rows": "Diálogo: Excluir colunas ou linhas", "Dialog: Describe Two Variables": "Diálogo: Descreva Duas Variáveis", "Dialog: Display Daily Data": "Caixa de Diálogo: Exibir Dados Diários", @@ -1481,6 +1483,7 @@ "Exact Results...": "Resultados exatos...", "Examine": "Examinar", "Examine...": "Examinar...", + "Examine/Edit Data": "Examinar/editar dados", "Example List:": "Lista de Exemplo:", "Examples": "Exemplos", "Exceedance": "Excesso", @@ -1755,6 +1758,7 @@ "Frequency Tables...": "Tabelas de frequência...", "Frequency polygon": "Polígono de frequência", "Frequency tables": "Tabelas de frequência", + "Frequency tables and Summary tables": "Tabelas de frequência e tabelas de resumo", "Frequency/Summary Tables": "Tabelas de frequência/resumo", "From": "De", "From Data Frame:": "Do quadro de dados:", @@ -1846,6 +1850,7 @@ "Greens": "Verdes", "Grey": "Cinza", "Greys": "Cinzas", + "Grid Lines": "Linhas de Grade", "Grid lines": "Linhas de grelha", "Grid square": "Quadrado em grade", "Grop Height": "Altura de mercearia", @@ -1887,6 +1892,7 @@ "Heading Border": "Borda do título", "Heat": "Aquecer", "Heat Map": "Mapa de calor", + "Heat Map and Chorolopleth Map": "Mapa de Calor e Mapa Coroloplético", "Heat Map/Choropleth": "Mapa de Calor/Coroplet", "Heat Sum...": "Soma de Calor...", "Heating Degree Days. If the baseline = 15 degrees then HDD is (15 - tmean). HDD = 0 if tmean is more than 15.": "Graus Dias de Aquecimento. Se a linha de base = 15 graus, então o HDD é (15 - tmean). HDD = 0 se tmean for maior que 15.", @@ -1921,6 +1927,7 @@ "Histogram Options": "Opções de Histograma", "Histogram Plot": "Histograma de lote", "Histogram...": "Histograma...", + "Histograms, Dotplots, Density and Ridge Plots and Frequency Polygons": "Histogramas, Dotplots, Densidade e Ridge Plots e Polígonos de Frequência", "History and FAQ": "Histórico e perguntas frequentes", "Hit Rate": "Taxa de acerto", "Hjust": "Hjust", @@ -2026,6 +2033,7 @@ "Importing the following sheets:": "Importando as seguintes folhas:", "Imputed:": "Importado:", "In": "Em", + "In Filter": "No Filtro", "In Steps Of:": "Em Passos De:", "In Steps of:": "Em passos de:", "In numerical order of the levels (At least one level must be numerical.)": "Em ordem numérica dos níveis (Pelo menos um nível deve ser numérico.)", @@ -2293,6 +2301,7 @@ "Legend Spacing": "Espaçamento da Legenda", "Legend Title": "Título da Legenda", "Legend Title and Text": "Título e Texto da Legenda", + "Legend Title:": "Título da legenda:", "Legend item labels": "Rótulos dos itens de legenda", "Legend label": "Rótulo de legenda", "Legend position": "Posição da legenda", @@ -2340,6 +2349,7 @@ "Line Options": "Opções de Linha", "Line Plot": "Gráfico de linhas", "Line Plot...": "Plotagem de linha...", + "Line Plots, Smoothed Plots, Dumbbell and Slope Plots": "Plotagens de linhas, plotagens suavizadas, plotagens de halteres e inclinações", "Line Type": "Tipo Linha", "Line Type:": "Tipo de linha:", "Line along x axis": "Linha ao longo do eixo x", @@ -2594,6 +2604,7 @@ "Minimum:": "Mínimo:", "Minor Grid Lines": "Linhas de Grade Menores", "Minor Tick Marks": "Marcas secundárias", + "Minor grid lines ": "Linhas de grade menores ", "Minute": "minuto", "Minutes": "minutos", "Minutes:": "Minutos:", @@ -2697,6 +2708,7 @@ "Multiple Response...": "Resposta Múltipla...", "Multiple Spells": "Feitiços Múltiplos", "Multiple Variables": "Várias variáveis", + "Multiple Variables or Two Variables": "Múltiplas Variáveis ou Duas Variáveis", "Multiple columns": "Múltiplas colunas", "Multiply": "Multiplicar", "Multistate": "Multiestado", @@ -2894,7 +2906,7 @@ "Ona": "Ona", "One Data Frame": "Um quadro de dados", "One Sample": "Um Exemplo", - "One Variable": "uma variável", + "One Variable": "Uma Variável", "One Variable Compare Models": "Uma Variável Comparar Modelos", "One Variable Fit Model": "Um Modelo de Ajuste Variável", "One Variable Frequencies...": "Uma frequência variável...", @@ -2902,6 +2914,7 @@ "One Variable Graph Options": "Uma Variável de Opções Gráficas", "One Variable Graph...": "Um gráfico de variável...", "One Variable Summarise": "Uma Variável Resumo", + "One Variable Summarise, Skim and Customised": "Resumo de uma variável, skim e customizado", "One Variable Summarise...": "Resumo de uma variável...", "One Variable Use Model": "Um Modelo de Uso Variável", "One Variable...": "Uma Variável...", @@ -3080,6 +3093,7 @@ "Partial": "Parcial", "Partition Plot": "Gráfico de Partição", "Partitioning": "Particionamento", + "Partitioning or Hierarchical": "Particionado ou Hierárquico", "Partitioning:": "Particionando:", "Paste": "Colar", "Paste Data to New Column(s)": "Colar Dados para Nova Coluna", @@ -3814,6 +3828,7 @@ "Selected column": "Coluna selecionada", "Selected:": "Selecionado:", "Selected:0": "Selecionado: 0", + "Selecting Option": "Selecionando a opção", "Selection": "Seleção", "Selection Preview": "Visualização da seleção", "Selection Preview:": "Visualização da seleção:", @@ -3860,6 +3875,7 @@ "Sets:": "Configurações:", "Settings": "Confirgurações", "Setup For Data Entry": "Configuração para entrada de dados", + "Setup for Data Editing...": "Configuração para edição de dados...", "Setup for Data Entry...": "Configuração para entrada de dados...", "Shape": "Forma", "Shape (Optional):": "Forma (opcional)", @@ -3970,6 +3986,7 @@ "Skewness (3rd Moment) (W)": "Distorção (3º Momento) (W)", "Skewness Weight:": "Peso da Vigilância:", "Skim": "Desnatar", + "Skim or Two Variables": "Skim ou Duas Variáveis", "Skip ngrams": "Pular ngramas", "Slope": "Inclinação", "Slopes": "Encostas", @@ -4037,6 +4054,7 @@ "Spline interpolation of missing values. For example na.spline(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,2.5,4,7,12)": "Interpolação spline de valores ausentes. Por exemplo na.spline(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,2,5 ,4,7,12)", "Split Geometry": "Separar geometria", "Split Text Column": "Dividir Coluna de Texto", + "Split Text...": "Dividir texto...", "Split by:": "Dividir por:", "Split...": "Dividir...", "Splits the data into groups of at least the specified size.": "Divide os dados em grupos de pelo menos o tamanho especificado.", @@ -4198,6 +4216,7 @@ "Suppl.Numeric:": "Supl. Numérico:", "Supplementary Individuals": "Indivíduos complementares", "Surface pressure": "Pressão de superfície", + "Survey": "Enquete", "Survival": "Sobrevivência", "Survival Object Name:": "Nome do Objeto Sobrevivente:", "Swap": "Trocar", @@ -4222,6 +4241,9 @@ "Table Name:": "Nome da tabela:", "Table Title:": "Título da Tabela:", "Table To Use:": "Tabela para usar:", + "Table or Graph": "Tabela ou Gráfico", + "Table or Graph. Also Stem and Leaf Plots": "Tabela ou Gráfico. Também Gráficos de caule e folha", + "Table, Stacked Graph or Likert Graph": "Tabela, Gráfico Empilhado ou Gráfico Likert", "Table/Chart :": "Tabela/Gráfico:", "Tables": "Tabelas", "Tables...": "Tabelas...", @@ -4292,6 +4314,7 @@ "Themes": "Temas", "Themes Sub Dialog": "Subdiálogo de Temas", "Themes...": "Temas...", + "There are no entries matching ": "Não há entradas correspondentes ", "Thicknes:": "Espessuras:", "Thickness:": "Espessura:", "Third Context:": "Terceiro contexto:", @@ -4322,6 +4345,7 @@ "Tidy": "Divisor", "Tidy Daily Data": "Dados diários de maré", "Tidy Daily Data...": "Dados diários arrumados...", + "Tidy Data": "dados organizados", "Tidy and Examine": "Arrume e Examine", "Tidy...": "Limpo...", "Ties": "Gravatas", @@ -4404,6 +4428,7 @@ "Trace Values": "Valores de rastreamento", "Transform": "Transformar", "Transform Text Column": "Transformar Coluna de Texto", + "Transform Text...": "Transformar Texto...", "Transform...": "Transformar...", "Transform:": "Transformar:", "Transformation": "Modificação", @@ -4529,6 +4554,7 @@ "Use Model ": "Usar modelo ", "Use Model Keyboard...": "Usar teclado de modelo...", "Use Model Keyboards...": "Usar teclados modelo...", + "Use Regular Expression": "Usar Expressão Regular", "Use Summaries": "Usar resumos", "Use Summaries...": "Usar resumos...", "Use Table": "Tabela de uso", @@ -4801,15 +4827,15 @@ "Yellow": "Amarelo", "Yellow-Green": "Amarelo-Verde", "Yes": "sim", + "YlGn": "YlGn", + "YlGnBu": "YlGnBu", + "YlOrBr": "YlOrBr", + "YlOrRd": "YlOrRd", + "Ylim": "Ylim", "You have multiple rows with the same dates for one or more stations. Use the Climatic > Tidy and Examine > Duplicates dialog to investigate these issues.": "Você tem várias linhas com as mesmas datas para uma ou mais estações. Use a caixa de diálogo Climatic > Arrumar e examinar > Duplicatas para investigar esses problemas.", "Zero Values": "Sem Valores", "Zplot Plot": "Gráfico de Zplot", - "[^ ] not": "[^] não", - "\\ escape": "\\ escapar", - "\\d digit": "\\d dígito", - "\\s space": "\\s espaço", - "^": "^", - "^ begin": "^ começar", + "Zseq": "Zseq", "a quantile, given a value between 0 and 1. So quantile(c(1,2,3,4,10), 0.25) = 2 and is the lower quartile.": "um quantil, dado um valor entre 0 e 1. Portanto, quantile(c(1,2,3,4,10), 0,25) = 2 e é o quartil inferior.", "aapc": "aapc", "abs": "abdominais", @@ -5440,9 +5466,7 @@ "mse": "minguação", "multiply each number in the list by a given value (default 10).": "multiplique cada número na lista por um determinado valor (padrão 10).", "murmur32": "murmur32", - "n": "n", "n times. For example, str_count(c(": "n vezes. Por exemplo, str_count(c(", - "n:": "n:", "n_distinct": "n_distinto", "na": "n / D", "na.rm": "na.rm", @@ -5810,7 +5834,6 @@ "sunh": "sol", "sunshine hours": "horas de sol", "swap Parameters": "trocar parâmetros", - "t": "t", "t quantiles. For example qt(0.05, 5) = -2.015; qt(0.05, 100) = -1.66": "t quantis. Por exemplo qt(0,05, 5) = -2,015; qt(0,05, 100) = -1,66", "table": "mesa", "tag": "marcação", @@ -5873,8 +5896,6 @@ "upper": "superior", "upper (c)": "superior (c)", "uppercase": "maiúsculo", - "v. ": "v. ", - "v. 1.0.0.0": "v. 1.0.0.0", "v3.0 Daily Rainfall": "v3.0 Chuva Diária", "v3.0 Dekadal Rainfall": "v3.0 Dekadal Rainfall", "v3.0 Monthly Rainfall": "v3.0 Chuva Mensal", @@ -5905,7 +5926,6 @@ "wakefield::r_data_theme(n = 100, data_theme = ": "wakefield::r_data_theme(n = 100, data_theme = ", "waller ": "carteira ", "ward": "ala", - "wd": "wd", "wday": "no", "weight:": "peso:", "weighted": "pesada", @@ -5921,21 +5941,7 @@ "wilcoxsign": "wilcoxsign", "winner_country": "país_vencedor", "winner_name": "nome_vencedor", - "wm": "wm", "word": "palavra", "wrappednormal": "embrulhado", - "ws": "ws", - "ww ": "ww ", - "xend :": "xend:", - "xmax :": "xmáx:", - "xmin :": "xmin:", - "xxhash32": "xxhash32", - "xxhash64": "xxhash64", - "yday": "bom dia", - "year": "ano", - "yend :": "Yend:", - "ymax :": "ymax:", - "ymd": "sim", - "ymin :": "ymin:", "zoo": "jardim zoológico" } \ No newline at end of file diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index 45c64630a6d..67cdf4b691d 100644 Binary files a/instat/translations/rInstatTranslations.db and b/instat/translations/rInstatTranslations.db differ diff --git a/instat/translations/ru/ru_r_instat_not_menus.json b/instat/translations/ru/ru_r_instat_not_menus.json index 5c54af9e65e..6a0ac314682 100644 --- a/instat/translations/ru/ru_r_instat_not_menus.json +++ b/instat/translations/ru/ru_r_instat_not_menus.json @@ -47,22 +47,17 @@ " use ranks to divide into (almost) equal sized groups. For example ntile(c(15,11,13,12,NA,12),2) = (2,1,2,1,NA,1)": " используйте ранги, чтобы разделить на группы (почти) одинакового размера. Например, ntile(c(15,11,13,12,NA,12),2) = (2,1,2,1,NA,1)", " | Showing ": " | Показаны ", "!is.na detects non-missing values, for example !is.na(c(1,3,NA, 5)) gives TRUE, TRUE, FALSE, TRUE": "!is.na обнаруживает непропущенные значения, например !is.na(c(1,3,NA, 5)) дает ИСТИНА, ИСТИНА, ЛОЖЬ, ИСТИНА", - "An order, level, count control to be added later": "Порядок, уровень, контроль количества будут добавлены позже", "# Code generated by the dialog, Script": "# Код, сгенерированный диалогом, Скрипт", - "&Copy": "&Копировать", - "&Open": "&Открыть", - "&Paste": "&Вставить", - "&Save": "&Сохранять", "(%in%)is like the match function and returns a logical vector. For example (11:15 %in% c(11,13)) gives TRUE, FALSE, TRUE, FALSE, FALSE": "(%in%) похож на функцию сопоставления и возвращает логический вектор. Например, (11:15 %in% c(11,13)) дает ИСТИНА, ЛОЖЬ, ИСТИНА, ЛОЖЬ, ЛОЖЬ", "(Missing)": "(Отсутствующий)", "(blank)": "(пустой)", "(natural) logarithm. For example log(512) = 6.238; log(512,2) = 9 (log to base 2, i.e. 2 ^ 9 =512)": "(натуральный) логарифм. Например, log(512) = 6,238; log(512,2) = 9 (логарифм по основанию 2, т.е. 2 ^ 9 = 512)", "(normal probabilities. For example; pnorm(-1.6449) = 0.05; pnorm(130,100,15) = 0.9772.": "(нормальные вероятности. Например, pnorm(-1,6449) = 0,05; pnorm(130,100,15) = 0,9772.", "(see also %in%)gives the positions of the matching elements. For example match(11:15, c(11,13)) gives (1,NA, 2, NA, NA). match(11:15,c(11,13),nomatch=0) gives 1, 0, 2, 0, 0)": "(см. также %in%) дает позиции совпадающих элементов. Например, match(11:15, c(11,13)) дает (1, NA, 2, NA, NA). match(11:15,c(11,13),nomatch=0) дает 1, 0, 2, 0, 0)", - "- to": "- к", ".nc files found to import": "Найдены файлы .nc для импорта", + "0 or 1 times. For example, str_count(c(": "0 или 1 раз. Например, str_count(c(", + "0 or more times. For example, str_count(c(": "0 и более раз. Например, str_count(c(", "1 or more times. For example, str_count(c(": "1 и более раз. Например, str_count(c(", - "1/mu^2": "1/му^2", "10 variables and 50 observations, sampling with replacement and probability 0.3 of TRUE": "10 переменных и 50 наблюдений, выборка с заменой и вероятностью 0,3 ИСТИНА", "10 variables from the Wakefield package": "10 переменных из пакета Wakefield", "10m u-component of wind": "10м u-составляющая ветра", @@ -80,13 +75,13 @@ "2m dewpoint temperature": "2 м температура точки росы", "2m temperature": "2м температура", "2nd Factor (Optional):": "2-й фактор (необязательно):", - "2pi": "2pi", "3 variables including both random normal and uniform data": "3 переменные, включая как случайные нормальные, так и однородные данные", "3. Mean Sea Level Pressure:": "3. Среднее давление на уровне моря:", "36 = 2(squared)*3(squared) is powerful because for each divisor, here 2 and 3, its square is also a divisor.": "36 = 2(в квадрате)*3(в квадрате) мощно, потому что для каждого делителя, здесь 2 и 3, его квадрат также является делителем.", "4 Digit": "4 цифры", "4 variables, showing use of seq and rep function": "4 переменные, показывающие использование функций seq и rep", "4. Mean Daily Air Temperature:": "4. Среднесуточная температура воздуха:", + "4.85": "4,85", "49 variables, illustrating most of the types of data in the Wakefield package": "49 переменных, иллюстрирующих большинство типов данных в пакете Wakefield.", "5. Total Precipitation:": "5. Общее количество осадков:", "6. Mean Daily Max Air Temperature:": "6. Среднесуточная максимальная температура воздуха:", @@ -250,6 +245,7 @@ "Amount:": "Количество:", "An R Command is Running": "Выполняется команда R", "An order": "Заказ", + "An order, level, count control to be added later": "Порядок, уровень, контроль количества будут добавлены позже", "An order,level,count control to be added later": "Порядок, уровень, контроль количества будут добавлены позже", "Analysis": "Анализ", "Anderson-Darling test for normality": "Тест Андерсона-Дарлинга на нормальность", @@ -370,6 +366,7 @@ "Bar Options": "Опции бара", "Bar and Pie Chart": "Гистограмма и круговая диаграмма", "Bar plot": "Барный участок", + "Bar, Column, Lollipop, Pie, and Donut Charts, plus Treemaps and Wordclouds": "Гистограммы, столбцы, леденцы, круговые и кольцевые диаграммы, а также карты деревьев и облака слов", "BarChart Options": "Параметры гистограммы", "Barometer Height:": "Высота барометра:", "Bartels Rank Test of Randomness": "Ранговый критерий случайности Бартельса", @@ -427,6 +424,7 @@ "Box Plot": "Коробка Сюжет", "Box plot": "Коробчатый сюжет", "Boxplot": "Блочная диаграмма", + "Boxplot (including Tufte), Jitter and Violin Plots": "Boxplot (включая Tufte), Jitter и Violin Plots", "Boxplot + Jitter": "Блочная диаграмма + джиттер", "Boxplot Count Variable": "Переменная счетчика ящичковой диаграммы", "Boxplot Method": "Метод ящичной диаграммы", @@ -942,6 +940,7 @@ "Cumulative": "кумулятивный", "Cumulative Distribution...": "Кумулятивное распространение...", "Cumulative Graph": "Совокупный график", + "Cumulative Graph and Exceedance Graph": "Кумулятивный график и график превышения", "Cumulative exceedance": "Совокупное превышение", "Cumulative graph": "Совокупный график", "Cumulative/Exceedance Graph": "Кумулятивный график/график превышения", @@ -957,6 +956,7 @@ "DF1": "DF1", "DF2": "ДФ2", "Daily": "Повседневная", + "Daily Data Editing...": "Ежедневное редактирование данных...", "Daily Data Editing/Entry": "Ежедневное редактирование/ввод данных", "Daily Data Editing/Entry...": "Ежедневное редактирование/ввод данных...", "Daily Data Entry": "Ежедневный ввод данных", @@ -1110,6 +1110,7 @@ "Delete Column": "Удалить столбец", "Delete Column(s)": "Удалить столбцы", "Delete Columns": "Удалить столбцы", + "Delete Columns or Rows": "Удалить столбцы или строки", "Delete Columns/Rows...": "Удалить столбцы/строки...", "Delete Colums or Rows": "Удалить столбцы или строки", "Delete Data Frames": "Удалить фреймы данных", @@ -1178,6 +1179,7 @@ "Dialog: Create Survival Object": "Диалог: Создать объект выживания", "Dialog: Cumulative/Exceedance Graph": "Диалог: кумулятивный график/график превышения", "Dialog: Daily Data Editing/Entry": "Диалог: редактирование/ввод ежедневных данных", + "Dialog: Delete Columns or Rows": "Диалоговое окно: Удалить столбцы или строки", "Dialog: Delete Colums or Rows": "Диалоговое окно: Удалить столбцы или строки", "Dialog: Describe Two Variables": "Диалог: Опишите две переменные", "Dialog: Display Daily Data": "Диалоговое окно: отображение ежедневных данных", @@ -1481,6 +1483,7 @@ "Exact Results...": "Точные результаты...", "Examine": "Исследовать", "Examine...": "Исследовать...", + "Examine/Edit Data": "Изучить/редактировать данные", "Example List:": "Пример списка:", "Examples": "Примеры", "Exceedance": "Превышение", @@ -1755,6 +1758,7 @@ "Frequency Tables...": "Таблицы частот...", "Frequency polygon": "Полигон частот", "Frequency tables": "Таблицы частот", + "Frequency tables and Summary tables": "Таблицы частот и сводные таблицы", "Frequency/Summary Tables": "Частота/Сводные таблицы", "From": "Из", "From Data Frame:": "Из фрейма данных:", @@ -1846,6 +1850,7 @@ "Greens": "Зелень", "Grey": "Серый", "Greys": "Серые", + "Grid Lines": "Линии сетки", "Grid lines": "Линии сетки", "Grid square": "Сетка квадратная", "Grop Height": "Высота роста", @@ -1887,6 +1892,7 @@ "Heading Border": "Граница направления", "Heat": "Нагревать", "Heat Map": "Тепловая карта", + "Heat Map and Chorolopleth Map": "Тепловая карта и карта хороплет", "Heat Map/Choropleth": "Тепловая карта/картограмма", "Heat Sum...": "Тепловая сумма...", "Heating Degree Days. If the baseline = 15 degrees then HDD is (15 - tmean). HDD = 0 if tmean is more than 15.": "Градусо-дни отопления. Если базовая линия = 15 градусов, то жесткий диск равен (15 - tmean). HDD = 0, если tmean больше 15.", @@ -1921,6 +1927,7 @@ "Histogram Options": "Параметры гистограммы", "Histogram Plot": "График гистограммы", "Histogram...": "Гистограмма...", + "Histograms, Dotplots, Density and Ridge Plots and Frequency Polygons": "Гистограммы, точечные диаграммы, графики плотности и хребта и полигоны частот", "History and FAQ": "История и часто задаваемые вопросы", "Hit Rate": "Частота попаданий", "Hjust": "Просто", @@ -2026,6 +2033,7 @@ "Importing the following sheets:": "Импорт следующих листов:", "Imputed:": "Вмененный:", "In": "В", + "In Filter": "В фильтре", "In Steps Of:": "По шагам:", "In Steps of:": "По шагам:", "In numerical order of the levels (At least one level must be numerical.)": "В порядке нумерации уровней (по крайней мере, один уровень должен быть числовым).", @@ -2293,6 +2301,7 @@ "Legend Spacing": "Расстояние между легендами", "Legend Title": "Название легенды", "Legend Title and Text": "Название легенды и текст", + "Legend Title:": "Название легенды:", "Legend item labels": "Ярлыки элементов легенды", "Legend label": "Ярлык легенды", "Legend position": "Положение легенды", @@ -2340,6 +2349,7 @@ "Line Options": "Параметры линии", "Line Plot": "Линейный график", "Line Plot...": "Линейный сюжет...", + "Line Plots, Smoothed Plots, Dumbbell and Slope Plots": "Линейные графики, сглаженные графики, графики гантелей и наклонов", "Line Type": "Тип линии", "Line Type:": "Тип линии:", "Line along x axis": "Линия вдоль оси x", @@ -2594,6 +2604,7 @@ "Minimum:": "Минимум:", "Minor Grid Lines": "Второстепенные линии сетки", "Minor Tick Marks": "Незначительные деления", + "Minor grid lines ": "Второстепенные линии сетки ", "Minute": "Минута", "Minutes": "Минуты", "Minutes:": "Минуты:", @@ -2697,6 +2708,7 @@ "Multiple Response...": "Множественный ответ...", "Multiple Spells": "Несколько заклинаний", "Multiple Variables": "Несколько переменных", + "Multiple Variables or Two Variables": "Несколько переменных или две переменные", "Multiple columns": "Несколько столбцов", "Multiply": "Умножить", "Multistate": "мультигосударственный", @@ -2902,6 +2914,7 @@ "One Variable Graph Options": "Параметры графика с одной переменной", "One Variable Graph...": "График одной переменной...", "One Variable Summarise": "Суммирование одной переменной", + "One Variable Summarise, Skim and Customised": "Одна переменная суммирует, просматривает и настраивает", "One Variable Summarise...": "Обобщение одной переменной...", "One Variable Use Model": "Одна переменная модель использования", "One Variable...": "Одна переменная...", @@ -3080,6 +3093,7 @@ "Partial": "Частичный", "Partition Plot": "Раздел участка", "Partitioning": "Разделение", + "Partitioning or Hierarchical": "Разделение или иерархия", "Partitioning:": "Разделение:", "Paste": "Вставить", "Paste Data to New Column(s)": "Вставить данные в новый столбец (столбцы)", @@ -3814,6 +3828,7 @@ "Selected column": "Выбранный столбец", "Selected:": "Выбрано:", "Selected:0": "Выбрано:0", + "Selecting Option": "Выбор варианта", "Selection": "Выбор", "Selection Preview": "Предварительный просмотр выбора", "Selection Preview:": "Предварительный просмотр выбора:", @@ -3860,6 +3875,7 @@ "Sets:": "Наборы:", "Settings": "Настройки", "Setup For Data Entry": "Настройка для ввода данных", + "Setup for Data Editing...": "Настройка редактирования данных...", "Setup for Data Entry...": "Настройка ввода данных...", "Shape": "Форма", "Shape (Optional):": "Форма (необязательно):", @@ -3970,6 +3986,7 @@ "Skewness (3rd Moment) (W)": "Перекос (3-й момент) (клавиша W)", "Skewness Weight:": "Вес асимметрии:", "Skim": "Обезжирить", + "Skim or Two Variables": "Skim or Two Variables", "Skip ngrams": "Пропустить нграммы", "Slope": "Склон", "Slopes": "Склон/уклон", @@ -4037,6 +4054,7 @@ "Spline interpolation of missing values. For example na.spline(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,2.5,4,7,12)": "Сплайн-интерполяция отсутствующих значений. Например, na.spline(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,2.5 ,4,7,12)", "Split Geometry": "Разделить геометрию", "Split Text Column": "Разделить текстовую колонку", + "Split Text...": "Разделить текст...", "Split by:": "Разделить по:", "Split...": "Расколоть...", "Splits the data into groups of at least the specified size.": "Разбивает данные на группы не менее указанного размера.", @@ -4198,6 +4216,7 @@ "Suppl.Numeric:": "Доп.Число:", "Supplementary Individuals": "Дополнительные лица", "Surface pressure": "Поверхностное давление", + "Survey": "Опрос", "Survival": "Выживание", "Survival Object Name:": "Название объекта выживания:", "Swap": "Менять", @@ -4222,6 +4241,9 @@ "Table Name:": "Имя таблицы:", "Table Title:": "Название таблицы:", "Table To Use:": "Таблица для использования:", + "Table or Graph": "Таблица или график", + "Table or Graph. Also Stem and Leaf Plots": "Таблица или график. Также участки стеблей и листьев", + "Table, Stacked Graph or Likert Graph": "Таблица, диаграмма с накоплением или диаграмма Лайкерта", "Table/Chart :": "Таблица/Диаграмма:", "Tables": "Столы", "Tables...": "Таблицы...", @@ -4292,6 +4314,7 @@ "Themes": "Темы", "Themes Sub Dialog": "Поддиалог Темы", "Themes...": "Темы...", + "There are no entries matching ": "Нет записей, соответствующих ", "Thicknes:": "Толщина:", "Thickness:": "Толщина:", "Third Context:": "Третий контекст:", @@ -4322,6 +4345,7 @@ "Tidy": "Аккуратный", "Tidy Daily Data": "Аккуратные ежедневные данные", "Tidy Daily Data...": "Аккуратные ежедневные данные...", + "Tidy Data": "Аккуратные данные", "Tidy and Examine": "Аккуратно и осмотри", "Tidy...": "Аккуратный...", "Ties": "Галстуки", @@ -4404,6 +4428,7 @@ "Trace Values": "Значения трассировки", "Transform": "Трансформировать", "Transform Text Column": "Преобразовать текстовую колонку", + "Transform Text...": "Преобразовать текст...", "Transform...": "Трансформировать...", "Transform:": "Преобразование:", "Transformation": "Трансформация", @@ -4529,6 +4554,7 @@ "Use Model ": "Использовать модель ", "Use Model Keyboard...": "Использовать клавиатуру модели...", "Use Model Keyboards...": "Использовать модельные клавиатуры...", + "Use Regular Expression": "Используйте регулярное выражение", "Use Summaries": "Используйте сводки", "Use Summaries...": "Используйте резюме...", "Use Table": "Использовать таблицу", @@ -4801,15 +4827,15 @@ "Yellow": "Желтый", "Yellow-Green": "Желтый зеленый", "Yes": "Да", + "YlGn": "YlGn", + "YlGnBu": "YlGnBu", + "YlOrBr": "YlOrBr", + "YlOrRd": "ИлОрРд", + "Ylim": "Илим", "You have multiple rows with the same dates for one or more stations. Use the Climatic > Tidy and Examine > Duplicates dialog to investigate these issues.": "У вас есть несколько строк с одинаковыми датами для одной или нескольких станций. Используйте диалоговое окно Climatic > Tidy and Examine > Duplicates, чтобы исследовать эти проблемы.", "Zero Values": "Нулевые значения", "Zplot Plot": "Земельный участок", - "[^ ] not": "[^] нет", - "\\ escape": "\\ побег", - "\\d digit": "\\d цифра", - "\\s space": "\\s пробел", - "^": "^", - "^ begin": "^ начать", + "Zseq": "Zseq", "a quantile, given a value between 0 and 1. So quantile(c(1,2,3,4,10), 0.25) = 2 and is the lower quartile.": "квантиль, заданный значением от 0 до 1. Таким образом, квантиль (c (1,2,3,4,10), 0,25) = 2 и является нижним квартилем.", "aapc": "аапс", "abs": "пресс", @@ -5440,9 +5466,7 @@ "mse": "мсэ", "multiply each number in the list by a given value (default 10).": "умножить каждое число в списке на заданное значение (по умолчанию 10).", "murmur32": "бормотание32", - "n": "н", "n times. For example, str_count(c(": "n раз. Например, str_count(c(", - "n:": "н:", "n_distinct": "n_отличный", "na": "нет", "na.rm": "на.рм", @@ -5810,7 +5834,6 @@ "sunh": "солнце", "sunshine hours": "солнечные часы", "swap Parameters": "поменять местами параметры", - "t": "т", "t quantiles. For example qt(0.05, 5) = -2.015; qt(0.05, 100) = -1.66": "t квантилей. Например, qt(0,05, 5) = -2,015; кварта (0,05, 100) = -1,66", "table": "стол", "tag": "ярлык", @@ -5873,8 +5896,6 @@ "upper": "верхний", "upper (c)": "верхний (в)", "uppercase": "верхний регистр", - "v. ": "в. ", - "v. 1.0.0.0": "версия 1.0.0.0", "v3.0 Daily Rainfall": "v3.0 Ежедневный дождь", "v3.0 Dekadal Rainfall": "v3.0 Десятилетнее количество осадков", "v3.0 Monthly Rainfall": "v3.0 Ежемесячное количество осадков", @@ -5905,7 +5926,6 @@ "wakefield::r_data_theme(n = 100, data_theme = ": "wakefield::r_data_theme(n = 100, data_theme = ", "waller ": "Уоллер ", "ward": "сторожить", - "wd": "wd", "wday": "рабочий день", "weight:": "масса:", "weighted": "взвешенный", @@ -5921,21 +5941,7 @@ "wilcoxsign": "Уилкокссин", "winner_country": "победитель_страна", "winner_name": "имя_победителя", - "wm": "мм", "word": "слово", "wrappednormal": "завернутыйнормальный", - "ws": "ws", - "ww ": "вв ", - "xend :": "хэнд:", - "xmax :": "хмакс :", - "xmin :": "хмин :", - "xxhash32": "ххэш32", - "xxhash64": "хххеш64", - "yday": "день", - "year": "год", - "yend :": "выход:", - "ymax :": "умакс :", - "ymd": "ммд", - "ymin :": "Юмин:", "zoo": "зоопарк" } \ No newline at end of file diff --git a/instat/translations/sw/sw_r_instat_not_menus.json b/instat/translations/sw/sw_r_instat_not_menus.json index 5fe408e6338..8539a1b12d5 100644 --- a/instat/translations/sw/sw_r_instat_not_menus.json +++ b/instat/translations/sw/sw_r_instat_not_menus.json @@ -47,22 +47,17 @@ " use ranks to divide into (almost) equal sized groups. For example ntile(c(15,11,13,12,NA,12),2) = (2,1,2,1,NA,1)": " tumia safu kugawanya katika (karibu) vikundi vya ukubwa sawa. Kwa mfano tile(c(15,11,13,12,NA,12),2) = (2,1,2,1,NA,1)", " | Showing ": " | Kuonesha ", "!is.na detects non-missing values, for example !is.na(c(1,3,NA, 5)) gives TRUE, TRUE, FALSE, TRUE": "!is.na hutambua thamani zisizokosekana, kwa mfano !is.na(c(1,3,NA, 5)) inatoa TRUE, TRUE, FALSE, TRUE", - "An order, level, count control to be added later": "Agizo, kiwango, udhibiti wa kuhesabu kuongezwa baadaye", "# Code generated by the dialog, Script": "# Nambari inayotokana na mazungumzo, Hati", - "&Copy": "&Nakili", - "&Open": "&Fungua", - "&Paste": "&Bandika", - "&Save": "&Hifadhi", "(%in%)is like the match function and returns a logical vector. For example (11:15 %in% c(11,13)) gives TRUE, FALSE, TRUE, FALSE, FALSE": "(%in%)ni kama kitendakazi cha mechi na inarudisha kivekta kimantiki. Kwa mfano (11:15 %in% c(11,13)) inatoa KWELI, UONGO, KWELI, UONGO, UONGO.", "(Missing)": "(Haipo)", "(blank)": "(tupu)", "(natural) logarithm. For example log(512) = 6.238; log(512,2) = 9 (log to base 2, i.e. 2 ^ 9 =512)": "(asili) logarithm. Kwa mfano logi(512) = 6.238; log(512,2) = 9 (logi hadi msingi 2, yaani 2 ^ 9 =512)", "(normal probabilities. For example; pnorm(-1.6449) = 0.05; pnorm(130,100,15) = 0.9772.": "(uwezekano wa kawaida. Kwa mfano; pnorm(-1.6449) = 0.05; pnorm(130,100,15) = 0.9772.", "(see also %in%)gives the positions of the matching elements. For example match(11:15, c(11,13)) gives (1,NA, 2, NA, NA). match(11:15,c(11,13),nomatch=0) gives 1, 0, 2, 0, 0)": "(tazama pia %in%) inatoa nafasi za vipengele vinavyolingana. Kwa mfano mechi (11:15, c(11,13)) inatoa (1,NA, 2, NA, NA). mechi(11:15,c(11,13),nomatch=0) inatoa 1, 0, 2, 0, 0)", - "- to": "-kwa", ".nc files found to import": "Faili za.nc zilizopatikana kuingiza", + "0 or 1 times. For example, str_count(c(": "0 au mara 1. Kwa mfano, str_count(c(", + "0 or more times. For example, str_count(c(": "Mara 0 au zaidi. Kwa mfano, str_count(c(", "1 or more times. For example, str_count(c(": "Mara 1 au zaidi. Kwa mfano, str_count(c(", - "1/mu^2": "1/mu^2", "10 variables and 50 observations, sampling with replacement and probability 0.3 of TRUE": "Vigezo 10 na uchunguzi 50, sampuli na uingizwaji na uwezekano 0.3 wa TRUE", "10 variables from the Wakefield package": "Vigezo 10 kutoka kwa kifurushi cha Wakefield", "10m u-component of wind": "10m u-sehemu ya upepo", @@ -80,13 +75,13 @@ "2m dewpoint temperature": "Joto la umande wa 2m", "2m temperature": "Joto la 2m", "2nd Factor (Optional):": "Nambari kamilifu ya pili (Hiari):", - "2pi": "2pi", "3 variables including both random normal and uniform data": "Vigezo 3 pamoja na data ya kawaida na sare ya nasibu", "3. Mean Sea Level Pressure:": "3. Wastani wa Shinikizo la Kiwango cha Bahari:", "36 = 2(squared)*3(squared) is powerful because for each divisor, here 2 and 3, its square is also a divisor.": "36 = 2(mraba)*3(mraba) ina nguvu kwa sababu kwa kila kigawanyo, hapa 2 na 3, mraba wake pia ni kigawanyo.", "4 Digit": "Ya Tarakimu 4", "4 variables, showing use of seq and rep function": "Vigezo 4, vinavyoonyesha matumizi ya seq na kitendakazi cha rep", "4. Mean Daily Air Temperature:": "4. Wastani wa Joto la Kila siku la Hewa:", + "4.85": "4.85", "49 variables, illustrating most of the types of data in the Wakefield package": "49, inayoonyesha aina nyingi za data kwenye kifurushi cha Wakefield", "5. Total Precipitation:": "5. Jumla ya Mvua:", "6. Mean Daily Max Air Temperature:": "6. Wastani wa Joto la kiwango cha juu la kila siku la Hewa:", @@ -250,6 +245,7 @@ "Amount:": "Kiasi:", "An R Command is Running": "Amri ya R inaendeshwa", "An order": "Amri", + "An order, level, count control to be added later": "Agizo, kiwango, udhibiti wa kuhesabu kuongezwa baadaye", "An order,level,count control to be added later": "Agizo, kiwango, udhibiti wa kuhesabu kuongezwa baadaye", "Analysis": "Uchambuzi", "Anderson-Darling test for normality": "Mtihani wa Anderson-Darling kwa hali ya kawaida", @@ -370,6 +366,7 @@ "Bar Options": "Chaguzi za Baa", "Bar and Pie Chart": "Chati pau na chati duara", "Bar plot": "Bar plot", + "Bar, Column, Lollipop, Pie, and Donut Charts, plus Treemaps and Wordclouds": "Baa, Safu wima, Lollipop, Pai, na Chati za Donati, pamoja na Treemaps na Wordclouds", "BarChart Options": "Chaguzi za BarChart", "Barometer Height:": "Urefu wa Kipimahewa:", "Bartels Rank Test of Randomness": "Mtihani wa Cheo cha Bartels wa Kubahatisha", @@ -427,6 +424,7 @@ "Box Plot": "Mpangilio wa Sanduku", "Box plot": "Box plot", "Boxplot": "Boxplot", + "Boxplot (including Tufte), Jitter and Violin Plots": "Boxplot (pamoja na Tufte), Viwanja vya Jitter na Violin", "Boxplot + Jitter": "Boxplot + Jitter", "Boxplot Count Variable": "Hesabu ya vigezo vya Boxplot", "Boxplot Method": "Njia ya Boxplot", @@ -942,6 +940,7 @@ "Cumulative": "Ya Kijumla", "Cumulative Distribution...": "Usambazaji Jumbe...", "Cumulative Graph": "Mkusanyiko wa Grafu", + "Cumulative Graph and Exceedance Graph": "Grafu Jumuishi na Grafu ya Ubora", "Cumulative exceedance": "Kuzidi ya Kijumla", "Cumulative graph": "Grafu ya Kijumla", "Cumulative/Exceedance Graph": "Grafu ya Kijumla / Kuzidi", @@ -957,6 +956,7 @@ "DF1": "DF1", "DF2": "DF2", "Daily": "Kila siku", + "Daily Data Editing...": "Uhariri wa Data ya Kila Siku...", "Daily Data Editing/Entry": "Uhariri / Uingizaji wa Takwimu za Kila Siku", "Daily Data Editing/Entry...": "Kuhariri/Kuingiza Data ya Kila Siku...", "Daily Data Entry": "Uingizaji wa Data za Kila siku", @@ -1110,6 +1110,7 @@ "Delete Column": "Futa Safu wima", "Delete Column(s)": "Futa Safu wima", "Delete Columns": "Futa Safu Wima", + "Delete Columns or Rows": "Futa Safu wima au Safu", "Delete Columns/Rows...": "Futa Safu/Safu...", "Delete Colums or Rows": "Futa Safu au Safu", "Delete Data Frames": "Delete Data Frames", @@ -1178,6 +1179,7 @@ "Dialog: Create Survival Object": "Mazungumzo: Unda Kitu cha Kuishi", "Dialog: Cumulative/Exceedance Graph": "Mazungumzo: Grafu Jumuishi/Ufanisi", "Dialog: Daily Data Editing/Entry": "Mazungumzo: Kuhariri/Kuingiza Data ya Kila Siku", + "Dialog: Delete Columns or Rows": "Kidirisha: Futa Safu wima au Safu", "Dialog: Delete Colums or Rows": "Mazungumzo: Futa Safu wima au Safu", "Dialog: Describe Two Variables": "Mazungumzo: Eleza Vigezo Viwili", "Dialog: Display Daily Data": "Kidirisha: Onyesha Data ya Kila Siku", @@ -1481,6 +1483,7 @@ "Exact Results...": "Matokeo Halisi...", "Examine": "Chunguza", "Examine...": "Chunguza...", + "Examine/Edit Data": "Chunguza/Hariri Data", "Example List:": "Orodha ya Mfano:", "Examples": "Mifano", "Exceedance": "Kuzidi", @@ -1755,6 +1758,7 @@ "Frequency Tables...": "Majedwali ya Mara kwa Mara...", "Frequency polygon": "Frequency Polygon", "Frequency tables": "Frequency Tables", + "Frequency tables and Summary tables": "Majedwali ya mara kwa mara na majedwali ya muhtasari", "Frequency/Summary Tables": "Majedwali ya Mara kwa Mara/Muhtasari", "From": "Kutoka", "From Data Frame:": "Kutoka kwa Mfumo wa Data:", @@ -1846,6 +1850,7 @@ "Greens": "Kijani", "Grey": "Kijivu", "Greys": "Kijivu", + "Grid Lines": "Mistari ya Gridi", "Grid lines": "Grid lines", "Grid square": "Grid square", "Grop Height": "Urefu wa Grop", @@ -1887,6 +1892,7 @@ "Heading Border": "Mpaka wa Kuelekea", "Heat": "Joto", "Heat Map": "Ramani ya joto", + "Heat Map and Chorolopleth Map": "Ramani ya Joto na Ramani ya Chorolopleth", "Heat Map/Choropleth": "Ramani ya joto / Choropleth", "Heat Sum...": "Jumla ya joto...", "Heating Degree Days. If the baseline = 15 degrees then HDD is (15 - tmean). HDD = 0 if tmean is more than 15.": "Siku za Shahada ya Kupokanzwa. Ikiwa msingi = digrii 15 basi HDD ni (15 - tmean). HDD = 0 ikiwa tmean ni zaidi ya 15.", @@ -1921,6 +1927,7 @@ "Histogram Options": "Histogram Options", "Histogram Plot": "Histogram Plot", "Histogram...": "Histogram...", + "Histograms, Dotplots, Density and Ridge Plots and Frequency Polygons": "Histograms, Dotplots, Density na Ridge Plots na Frequency Polygons", "History and FAQ": "Historia na Maswali Yanayoulizwa Mara kwa Mara", "Hit Rate": "Hit Rate", "Hjust": "Hjust", @@ -2026,6 +2033,7 @@ "Importing the following sheets:": "Kuingiza kurasa zifuatazo:", "Imputed:": "Imebadilishwa:", "In": "Katika", + "In Filter": "Katika Kichujio", "In Steps Of:": "Katika Hatua za:", "In Steps of:": "Katika Hatua za:", "In numerical order of the levels (At least one level must be numerical.)": "Kwa mpangilio wa nambari za viwango (Angalau ngazi moja lazima iwe nambari.)", @@ -2293,6 +2301,7 @@ "Legend Spacing": "Legend Spacing", "Legend Title": "Legend Title", "Legend Title and Text": "Kichwa cha Hadithi na Nakala", + "Legend Title:": "Kichwa cha Hadithi:", "Legend item labels": "Legend item Labels", "Legend label": "Legend Label", "Legend position": "Legend Position", @@ -2340,6 +2349,7 @@ "Line Options": "Chaguzi za Mstari", "Line Plot": "Line plot", "Line Plot...": "Kiwanja cha mstari...", + "Line Plots, Smoothed Plots, Dumbbell and Slope Plots": "Viwanja vya Line, Viwanja Vilivyolaini, Viwanja vya Dumbbell na Mteremko", "Line Type": "Aina ya Mstari", "Line Type:": "Aina ya Mstari:", "Line along x axis": "Mstari kando ya mhimili wa x", @@ -2594,6 +2604,7 @@ "Minimum:": "Kiwango cha chini:", "Minor Grid Lines": "Minor Grid Lines", "Minor Tick Marks": "Minor Tick Marks", + "Minor grid lines ": "Mistari ndogo ya gridi ya taifa ", "Minute": "Dakika", "Minutes": "Dakika", "Minutes:": "Dakika:", @@ -2697,6 +2708,7 @@ "Multiple Response...": "Majibu Mengi...", "Multiple Spells": "Misimu nyingi", "Multiple Variables": "Vigezo anuwai", + "Multiple Variables or Two Variables": "Vigezo vingi au Vigezo viwili", "Multiple columns": "Safu wima nyingi", "Multiply": "Zidisha", "Multistate": "Wingi", @@ -2902,6 +2914,7 @@ "One Variable Graph Options": "Chaguzi za Grafu Yenye Kigezo Kimoja", "One Variable Graph...": "Grafu Moja Inayobadilika...", "One Variable Summarise": "One Variable Summarise", + "One Variable Summarise, Skim and Customised": "Muhtasari Mmoja Unaobadilika, Skim na Uliobinafsishwa", "One Variable Summarise...": "Muhtasari Mmoja Unaobadilika...", "One Variable Use Model": "One Variable Use Model", "One Variable...": "Tofauti Moja...", @@ -3080,6 +3093,7 @@ "Partial": "Sehemu", "Partition Plot": "Kiwanja cha kugawa", "Partitioning": "Kugawanya", + "Partitioning or Hierarchical": "Kugawanya au Hierarkia", "Partitioning:": "Kugawanya:", "Paste": "Bandika", "Paste Data to New Column(s)": "Bandika Data kwenye Safu wima Mpya", @@ -3814,6 +3828,7 @@ "Selected column": "Safu wima iliyochaguliwa", "Selected:": "Imechaguliwa:", "Selected:0": "Imechaguliwa:0", + "Selecting Option": "Chaguo la kuchagua", "Selection": "Uchaguzi", "Selection Preview": "Onyesho la Kuchungulia la Uteuzi", "Selection Preview:": "Onyesho la Kuchungulia la Uteuzi:", @@ -3860,6 +3875,7 @@ "Sets:": "Seti:", "Settings": "Mipangilio", "Setup For Data Entry": "Sanidi Kwa Uingizaji Data", + "Setup for Data Editing...": "Sanidi kwa Uhariri wa Data...", "Setup for Data Entry...": "Sanidi kwa Uingizaji Data...", "Shape": "Umbo", "Shape (Optional):": "Umbo (Hiari):", @@ -3970,6 +3986,7 @@ "Skewness (3rd Moment) (W)": "Usemi (Tatu ya 3) (W)", "Skewness Weight:": "Skewness Weight:", "Skim": "Skim", + "Skim or Two Variables": "Skim au Vigezo viwili", "Skip ngrams": "Ruka nggrams", "Slope": "Mteremko", "Slopes": "Miteremko", @@ -4037,6 +4054,7 @@ "Spline interpolation of missing values. For example na.spline(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,2.5,4,7,12)": "Ufafanuzi wa Spline wa thamani zinazokosekana. Kwa mfano na.spline(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,2.5) ,4,7,12)", "Split Geometry": "Kugawanyika Jiometri", "Split Text Column": "Gawanya safu wima ya maandishi", + "Split Text...": "Gawanya Maandishi...", "Split by:": "Kugawanywa na:", "Split...": "Gawanya...", "Splits the data into groups of at least the specified size.": "Hugawanya data katika vikundi vya angalau saizi maalum.", @@ -4198,6 +4216,7 @@ "Suppl.Numeric:": "Nambari ya Suppl:", "Supplementary Individuals": "Supplementary Individuals", "Surface pressure": "Surface pressure", + "Survey": "Utafiti", "Survival": "Kuishi", "Survival Object Name:": "Survival Object Name:", "Swap": "Badili", @@ -4222,6 +4241,9 @@ "Table Name:": "Jina la Jedwali:", "Table Title:": "Kichwa cha Jedwali:", "Table To Use:": "Jedwali la kutumia:", + "Table or Graph": "Jedwali au Grafu", + "Table or Graph. Also Stem and Leaf Plots": "Jedwali au Grafu. Pia Viwanja vya Shina na Majani", + "Table, Stacked Graph or Likert Graph": "Jedwali, Grafu Iliyopangwa au Grafu ya Likert", "Table/Chart :": "Jedwali/Chati :", "Tables": "Jedwali", "Tables...": "Majedwali...", @@ -4292,6 +4314,7 @@ "Themes": "Mandhari", "Themes Sub Dialog": "Kidirisha Ndogo cha Mandhari", "Themes...": "Mandhari...", + "There are no entries matching ": "Hakuna maingizo yanayolingana ", "Thicknes:": "Unene:", "Thickness:": "Unene:", "Third Context:": "Muktadha wa tatu:", @@ -4322,6 +4345,7 @@ "Tidy": "Nadhifisha", "Tidy Daily Data": "Safisha Takwimu ya Kila Siku", "Tidy Daily Data...": "Data Nadhifu ya Kila Siku...", + "Tidy Data": "Data Nadhifu", "Tidy and Examine": "Nadhifu na Chunguza", "Tidy...": "Nadhifu...", "Ties": "Mahusiano", @@ -4404,6 +4428,7 @@ "Trace Values": "Fuatilia Thamani", "Transform": "Kubadilisha", "Transform Text Column": "Badilisha safu wima ya maandishi", + "Transform Text...": "Badilisha Maandishi...", "Transform...": "Badilisha...", "Transform:": "Badilisha:", "Transformation": "Mabadiliko", @@ -4529,6 +4554,7 @@ "Use Model ": "Tumia Mfano ", "Use Model Keyboard...": "Tumia Kibodi ya Muundo...", "Use Model Keyboards...": "Tumia Kibodi za Muundo...", + "Use Regular Expression": "Tumia Usemi wa Kawaida", "Use Summaries": "Tumia Muhtasari", "Use Summaries...": "Tumia Muhtasari...", "Use Table": "Tumia Jedwali", @@ -4801,15 +4827,15 @@ "Yellow": "Njano", "Yellow-Green": "Njano-Kijani", "Yes": "Ndio", + "YlGn": "YlGn", + "YlGnBu": "YlGnBu", + "YlOrBr": "YlOrBr", + "YlOrRd": "YlOrRd", + "Ylim": "Ylim", "You have multiple rows with the same dates for one or more stations. Use the Climatic > Tidy and Examine > Duplicates dialog to investigate these issues.": "Una safu mlalo nyingi zenye tarehe sawa za stesheni moja au zaidi. Tumia kidirisha cha Hali ya Hewa > Nadhifu na Chunguza > Nakala kidirisha ili kuchunguza masuala haya.", "Zero Values": "Thamani sufuri", "Zplot Plot": "Zplot Plot", - "[^ ] not": "[^ ] hapana", - "\\ escape": "\\ kutoroka", - "\\d digit": "\\d tarakimu", - "\\s space": "\\s nafasi", - "^": "^", - "^ begin": "^ kuanza", + "Zseq": "Zseq", "a quantile, given a value between 0 and 1. So quantile(c(1,2,3,4,10), 0.25) = 2 and is the lower quartile.": "quantile, iliyopewa thamani kati ya 0 na 1. Kwa hivyo quantile(c(1,2,3,4,10), 0.25) = 2 na ni robo ya chini.", "aapc": "aapc", "abs": "abs", @@ -5440,9 +5466,7 @@ "mse": "mse", "multiply each number in the list by a given value (default 10).": "zidisha kila nambari kwenye orodha kwa thamani fulani (chaguo-msingi 10).", "murmur32": "murmur32", - "n": "n", "n times. For example, str_count(c(": "n mara. Kwa mfano, str_count(c(", - "n:": "n:", "n_distinct": "n_distinct", "na": "na", "na.rm": "na.rm", @@ -5810,7 +5834,6 @@ "sunh": "juah", "sunshine hours": "masaa ya jua", "swap Parameters": "wabadilishane Vigezo", - "t": "t", "t quantiles. For example qt(0.05, 5) = -2.015; qt(0.05, 100) = -1.66": "t quantiles. Kwa mfano qt(0.05, 5) = -2.015; qt(0.05, 100) = -1.66", "table": "meza", "tag": "tagi", @@ -5873,8 +5896,6 @@ "upper": "juu", "upper (c)": "juu (c)", "uppercase": "herufi kubwa", - "v. ": "v. ", - "v. 1.0.0.0": "v. 1.0.0.0", "v3.0 Daily Rainfall": "v3.0 Mvua za kila siku", "v3.0 Dekadal Rainfall": "v3.0 Mvua ya Dekadal", "v3.0 Monthly Rainfall": "v3.0 Mvua ya kila mwezi", @@ -5905,7 +5926,6 @@ "wakefield::r_data_theme(n = 100, data_theme = ": "wakefield::r_data_theme(n = 100, data_theme = ", "waller ": "waller ", "ward": "kata", - "wd": "wd", "wday": "wday", "weight:": "uzito:", "weighted": "yenye uzito", @@ -5921,21 +5941,7 @@ "wilcoxsign": "wilcoxsign", "winner_country": "nchi_mshindi", "winner_name": "mshindi_jina", - "wm": "wm", "word": "neno", "wrappednormal": "imefungwa kawaida", - "ws": "ws", - "ww ": "ww ", - "xend :": "xend :", - "xmax :": "xmax :", - "xmin :": "xmin :", - "xxhash32": "xxhash32", - "xxhash64": "xxhash64", - "yday": "siku", - "year": "mwaka", - "yend :": "ndio :", - "ymax :": "ymax :", - "ymd": "ymd", - "ymin :": "ymin :", "zoo": "zoo" } \ No newline at end of file diff --git a/instat/translations/translateDynamic.txt b/instat/translations/translateDynamic.txt index 2b3f6c78e26..e11e87a1c57 100644 --- a/instat/translations/translateDynamic.txt +++ b/instat/translations/translateDynamic.txt @@ -15,8 +15,8 @@ # # - A group of controls. The group is specified using SQLite pattern matching # (see https://www.sqlite.org/lang_expr.html). Examples: -# - 'dlgAugment_%' any of the controls in the 'dlgAugment' dialog -# - '%_txtReceiverSingle' any text in single receivers +# - 'dlgAugment\_%' any of the controls in the 'dlgAugment' dialog +# - '%\_txtReceiverSingle' any text in single receivers # # - An exclamation point ('!') at the start of the line negates the pattern. Any control in that # pattern that was previously matched, is excluded from the pattern. @@ -25,8 +25,8 @@ # Negation can be useful if you want to specify a group of controls with a few exceptions. # For example, the lines below match all the controls in the 'dlgBarChart' dialog apart from # the 'lblTitle' label: -# 'dlgBarChart_%' -# '!dlgBarChart_%_lblTitle' +# 'dlgBarChart\_%' +# '!dlgBarChart\_%\_lblTitle' # # - Blank lines are ignored, they can be used as separators for readability # @@ -40,330 +40,337 @@ # # For example, if this file contains: # -# %_lblModels -# %_lblModelpreview -# !dlgGlance_% -# !dlgTidy_% +# %\_lblModels +# %\_lblModelpreview +# !dlgGlance\_% +# !dlgTidy\_% # -# then these lines will be used to construct the following SQL command: +# then these lines will be used to construct an SQL command similar to (for conciseness ESCAPE +# specifications not shown): # # UPDATE form_controls SET id_text = 'ReplaceWithDynamicTranslation' WHERE -# (control_name LIKE '%_lblModels' OR control_name like '%_lblModelpreview') +# (control_name LIKE '%\_lblModels' OR control_name like '%\_lblModelpreview') # AND NOT -# (control_name LIKE 'dlgGlance_%' OR control_name LIKE 'dlgTidy_%') -# +# (control_name LIKE 'dlgGlance\_%' OR control_name LIKE 'dlgTidy\_%') #################################################################################################### # Used in Themes subdialogs, see issue #6659 -%_grpAxisLabels% -%_grpElementRect% -%_grpTickLength% -%_grpTickMarks% -%_grpUnits% +%\_grpAxisLabels% +%\_grpElementRect% +%\_grpTickLength% +%\_grpTickMarks% +%\_grpUnits% # 'Code generated by' comment in dialogs -%_ucrBase_txtComment% +%\_ucrBase\_txtComment% # This check box is missed when creating form_controls CSV file -sdgSaveColumnPosition_ucrChkKeepExistingPos% +sdgSaveColumnPosition\_ucrChkKeepExistingPos% # List generated by script that searches source code for controls where text (re)set during runtime -%_Return% -%_TreeNode1% -%_TreeNode2% -%_TreeNode3% -%_TreeNode4% -%_TreeNode5% -%_TreeNode6% -%_btnConnect% -%_btnDetails% -%_btnExample% -%_btnMoreComment% -%_btnSelectAll% -%_btnViewMore% -%_cboExpression% -%_cboLayoutOfData% -%_cboModels% -%_cboParameters% -%_clsBernouliDist% -%_clsBetaDist% -%_clsBinomialDist% -%_clsCategoricalDist% -%_clsCauchyDist% -%_clsChiSqDist% -%_clsEmpiricalDist% -%_clsExponentialDist% -%_clsFDist% -%_clsGamma% -%_clsGammaWithShapeandMean% -%_clsGammaWithShapeandRate% -%_clsGammaWithShapeandScale% -%_clsGammaWithZerosDist% -%_clsGeometricDist% -%_clsGlmNegativeBinomialDist% -%_clsHyperGeoDist% -%_clsInverseGaussianDist% -%_clsLogNormDist% -%_clsMultinomDist% -%_clsNegBinomDist% -%_clsNormalDist% -%_clsPoissonDist% -%_clsPolarDist% -%_clsQuasiDist% -%_clsQuasibinomialDist% -%_clsQuasipoissonDist% -%_clsStudentsTDist% -%_clsTriangularDist% -%_clsUniformDist% -%_clsVonnMisesDist% -%_clsWeibullDist% -%_cmdBoxPlotOptions% -%_cmdCombineWithAndOr% -%_cmdDetails% -%_cmdLabelledConvert% -%_cmdPlotOptions% -%_cmdTransform% -%_cmdVariables% -%_frmMain% -%_grdCurrentWorkSheet% -%_grpCSV% -%_grpColumnPosition% -%_lblBackupDataDetected% -%_lblBackupInternalLogDetected% -%_lblBackupLogDetected% -%_lblColDisplay% -%_lblColumnstoStack% -%_lblConfirm% -%_lblConfirmText% -%_lblConnection% -%_lblDeleteNumber% -%_lblFirstType% -%_lblFirstVariableType% -%_lblGet% -%_lblGraphName% -%_lblHiddenNumber% -%_lblIdentifier% -%_lblImportingSheets% -%_lblKeys% -%_lblLabels% -%_lblLevelNumber% -%_lblMenuItemPath% -%_lblMessage% -%_lblNColumns% -%_lblNFiles% -%_lblNaValue% -%_lblNbCommentEntered% -%_lblNbRowsChanged1% -%_lblNoPreview% -%_lblOrderedFactor% -%_lblPages% -%_lblPositionReference% -%_lblReceiverLabel% -%_lblRowDisplay% -%_lblSecondType% -%_lblSecondVariableType% -%_lblSelected% -%_lblSummaryName% -%_lblTextFilePreview% -%_lblType% -%_lblUnHiddenNumber% -%_lblWeightBy% -%_linkLabel% -%_linkMenuItem% -%_lstAesParameterLabels(i)% -%_lstAxesLabels(i)% -%_lversion% -%_mnuDeleteCol% -%_mnuInsertColsAfter% -%_mnuInsertColsBefore% -%_mnuViewColumnMetadata% -%_mnuViewDataView% -%_parentControls% -%_rdoSummaryVariable% -%_tabPageAdded% -%_tstatus% -%_txtColumnWidth% -%_txtLayoutMessage% -%_txtPreview% -%_txtReceiverSingle% -%_txtScript% -%_txtTextFilePreview% -%_txtValidation% -%_ucRdoCoordinated% -%_ucrBase% -%_ucrCalc% -%_ucrCalcSummary% -%_ucrDataFrameGet% -%_ucrFirstDataFrame% -%_ucrFromDataFrame% -%_ucrInputAddNa% -%_ucrInputChooseForm% -%_ucrInputCommand% -%_ucrInputFacetBy% -%_ucrInputFormula% -%_ucrInputInStepsOf% -%_ucrInputLanguage% -%_ucrInputLogicOperations% -%_ucrInputMarginName% -%_ucrInputMax% -%_ucrInputMessage% -%_ucrInputMin% -%_ucrInputNewColName% -%_ucrInputOther% -%_ucrInputPreview% -%_ucrInputSelectThemes% -%_ucrInputSpecify1% -%_ucrInputSpecify2% -%_ucrInputSpecify3% -%_ucrInputTest% -%_ucrInputThresholdforLocation% -%_ucrLegendBackground% -%_ucrLegendBoxBackground% -%_ucrLegendBoxSpacing% -%_ucrLegendKey% -%_ucrLegendKeyHeight% -%_ucrLegendKeySize% -%_ucrLegendKeyWidth% -%_ucrLegendSpacing% -%_ucrLegendSpacingXAxis% -%_ucrLegendSpacingYAxis% -%_ucrLegendText% -%_ucrLegendTitle% -%_ucrModelName% -%_ucrNewColName% -%_ucrNewColumnName% -%_ucrNewDFName% -%_ucrNewDataFrame% -%_ucrNewDataFrameName% -%_ucrNewDataframe% -%_ucrNudColumnFactors% -%_ucrNudNumberOfColumns% -%_ucrPanelBackGround% -%_ucrPanelBackground% -%_ucrPanelBorder% -%_ucrPanelGrid% -%_ucrPanelGridMajor% -%_ucrPanelGridMajorXAxis% -%_ucrPanelGridMajorYAxis% -%_ucrPanelGridMinor% -%_ucrPanelGridMinorXAxis% -%_ucrPanelGridMinorYAxis% -%_ucrPanelSpacing% -%_ucrPanelSpacingXAxis% -%_ucrPanelSpacingYAxis% -%_ucrPlotBackground% -%_ucrPlotCaption% -%_ucrPlotMargin% -%_ucrPlotSubTitle% -%_ucrPlotTitle% -%_ucrSave% -%_ucrSaveAnonymisedColumn% -%_ucrSaveBar% -%_ucrSaveBoxplot% -%_ucrSaveCRI% -%_ucrSaveCircularColumn% -%_ucrSaveCluster% -%_ucrSaveColumn% -%_ucrSaveConversions% -%_ucrSaveCorrelation% -%_ucrSaveCorruptionModel% -%_ucrSaveCountRecords% -%_ucrSaveCumDist% -%_ucrSaveDataFrame% -%_ucrSaveDataframeName% -%_ucrSaveDate% -%_ucrSaveDeclusteredPlot% -%_ucrSaveDensity% -%_ucrSaveDetails% -%_ucrSaveDisplay% -%_ucrSaveDisplayChi% -%_ucrSaveDistance% -%_ucrSaveDotPlot% -%_ucrSaveEnterResultInto% -%_ucrSaveExtremes% -%_ucrSaveFile% -%_ucrSaveFirstCol% -%_ucrSaveFittedColumnName% -%_ucrSaveGOF% -%_ucrSaveGraph% -%_ucrSaveHist% -%_ucrSaveIndex% -%_ucrSaveIndices% -%_ucrSaveKey% -%_ucrSaveLeverageColumnName% -%_ucrSaveLikelihood% -%_ucrSaveLink% -%_ucrSaveLogical% -%_ucrSaveMap% -%_ucrSaveMerge% -%_ucrSaveModel% -%_ucrSaveModels% -%_ucrSaveMosaicPlot% -%_ucrSaveMrlPlot% -%_ucrSaveNew% -%_ucrSaveNewColumn% -%_ucrSaveNewColumnName% -%_ucrSaveNewDFName% -%_ucrSaveNewDataFrame% -%_ucrSaveNewDataName% -%_ucrSaveObject% -%_ucrSavePermute% -%_ucrSavePivot% -%_ucrSavePlot% -%_ucrSavePlots% -%_ucrSavePoly% -%_ucrSaveRandomSample% -%_ucrSaveRecode% -%_ucrSaveResidualsColumnName% -%_ucrSaveResult% -%_ucrSaveResults% -%_ucrSaveScatterPlot% -%_ucrSaveSecondCol% -%_ucrSaveStdResidualsColumnName% -%_ucrSaveStringDistance% -%_ucrSaveStringHandling% -%_ucrSaveSummary% -%_ucrSaveSummaryBar% -%_ucrSaveTable% -%_ucrSaveTheme% -%_ucrSaveThresholdPlot% -%_ucrSaveTreemap% -%_ucrSaveVariogram% -%_ucrSecondDataFrame% -%_ucrSelectorA2% -%_ucrSelectorA4% -%_ucrSelectorA6% -%_ucrSelectorFirstDF% -%_ucrSelectorForA2% -%_ucrSelectorForA3% -%_ucrSelectorForA4% -%_ucrSelectorSecondDF% -%_ucrSelectorVariogram% -%_ucrStripBackGround% -%_ucrStripText% -%_ucrStripTextXAxis% -%_ucrStripTextYAxis% -%_ucrStripsSpaceGrid% -%_ucrStripsSpaceWrap% -%_ucrThemeAxesLines% -%_ucrThemeAxesTickLabels% -%_ucrThemeAxesTitle% -%_ucrThemeBottomXAxis% -%_ucrThemeLeftYAxis% -%_ucrThemeTitleXAxis% -%_ucrThemeTitleXTopAxis% -%_ucrThemeTitleYAxis% -%_ucrThemeTitleYRightAxis% -%_ucrThemeTopXAxis% -%_ucrThemeYRightAxis% -%_ucrTickLength% -%_ucrTickMarksAxes% -%_ucrTickMarksXAxis% -%_ucrTickMarksYAxis% -%_ucrToDataFrame% -%_ucrXAxisLines% -%_ucrYAxisLines% -%_ucrrdoSpecific% -%_urChkLegendBoxJust% -%_urChkLegendPosition% -%_urChkSelectTheme% +%\_cmdTransform% +%\_ucrNewDataFrameName% +%\_ucrSaveObjects% +%\_Me% +%\_Return% +%\_TreeNode1% +%\_TreeNode2% +%\_TreeNode3% +%\_TreeNode4% +%\_TreeNode5% +%\_TreeNode6% +%\_btnConnect% +%\_btnDetails% +%\_btnExample% +%\_btnMoreComment% +%\_btnSelectAll% +%\_btnViewMore% +%\_cboExpression% +%\_cboLayoutOfData% +%\_cboModels% +%\_cboParameters% +%\_clsBernouliDist% +%\_clsBetaDist% +%\_clsBinomialDist% +%\_clsCategoricalDist% +%\_clsCauchyDist% +%\_clsChiSqDist% +%\_clsEmpiricalDist% +%\_clsExponentialDist% +%\_clsFDist% +%\_clsGamma% +%\_clsGammaWithShapeandMean% +%\_clsGammaWithShapeandRate% +%\_clsGammaWithShapeandScale% +%\_clsGammaWithZerosDist% +%\_clsGeometricDist% +%\_clsGlmNegativeBinomialDist% +%\_clsHyperGeoDist% +%\_clsInverseGaussianDist% +%\_clsLogNormDist% +%\_clsMultinomDist% +%\_clsNegBinomDist% +%\_clsNormalDist% +%\_clsPoissonDist% +%\_clsPolarDist% +%\_clsQuasiDist% +%\_clsQuasibinomialDist% +%\_clsQuasipoissonDist% +%\_clsStudentsTDist% +%\_clsTriangularDist% +%\_clsUniformDist% +%\_clsVonnMisesDist% +%\_clsWeibullDist% +%\_cmdBoxPlotOptions% +%\_cmdCombineWithAndOr% +%\_cmdDetails% +%\_cmdLabelledConvert% +%\_cmdPlotOptions% +%\_cmdTransform% +%\_cmdVariables% +dlgPICSARainfall +%\_frmMain% +%\_grdCurrentWorkSheet% +%\_grpCSV% +%\_grpColumnPosition% +%\_lblBackupDataDetected% +%\_lblBackupInternalLogDetected% +%\_lblBackupLogDetected% +%\_lblColDisplay% +%\_lblColumnstoStack% +%\_lblConfirm% +%\_lblConfirmText% +%\_lblConnection% +%\_lblDeleteNumber% +%\_lblFirstType% +%\_lblFirstVariableType% +%\_lblGet% +%\_lblGraphName% +%\_lblHiddenNumber% +%\_lblIdentifier% +%\_lblImportingSheets% +%\_lblKeys% +%\_lblLabels% +%\_lblLevelNumber% +%\_lblMatching% +%\_lblMenuItemPath% +%\_lblMessage% +%\_lblNColumns% +%\_lblNFiles% +%\_lblNaValue% +%\_lblNbCommentEntered% +%\_lblNbRowsChanged1% +%\_lblNoPreview% +%\_lblOrderedFactor% +%\_lblPages% +%\_lblPositionReference% +%\_lblReceiverLabel% +%\_lblRowDisplay% +%\_lblSecondType% +%\_lblSecondVariableType% +%\_lblSelected% +%\_lblSummaryName% +%\_lblTextFilePreview% +%\_lblType% +%\_lblUnHiddenNumber% +%\_lblWeightBy% +%\_linkLabel% +%\_linkMenuItem% +%\_lstAesParameterLabels(i)% +%\_lstAxesLabels(i)% +%\_lversion% +%\_mnuDeleteCol% +%\_mnuInsertColsAfter% +%\_mnuInsertColsBefore% +%\_mnuViewColumnMetadata% +%\_mnuViewDataView% +%\_parentControls% +%\_rdoSummaryVariable% +%\_tabPageAdded% +%\_tstatus% +%\_txtColumnWidth% +%\_txtLayoutMessage% +%\_txtPreview% +%\_txtReceiverSingle% +%\_txtScript% +%\_txtTextFilePreview% +%\_txtValidation% +%\_ucRdoCoordinated% +%\_ucrBase% +%\_ucrCalc% +%\_ucrCalcSummary% +%\_ucrDataFrameGet% +%\_ucrFirstDataFrame% +%\_ucrFromDataFrame% +%\_ucrInputAddNa% +%\_ucrInputChooseForm% +%\_ucrInputCommand% +%\_ucrInputFacetBy% +%\_ucrInputFormula% +%\_ucrInputInStepsOf% +%\_ucrInputLanguage% +%\_ucrInputLogicOperations% +%\_ucrInputMarginName% +%\_ucrInputMax% +%\_ucrInputMessage% +%\_ucrInputMin% +%\_ucrInputNewColName% +%\_ucrInputOther% +%\_ucrInputPreview% +%\_ucrInputSelectThemes% +%\_ucrInputSpecify1% +%\_ucrInputSpecify2% +%\_ucrInputSpecify3% +%\_ucrInputTest% +%\_ucrInputThresholdforLocation% +%\_ucrLegendBackground% +%\_ucrLegendBoxBackground% +%\_ucrLegendBoxSpacing% +%\_ucrLegendKey% +%\_ucrLegendKeyHeight% +%\_ucrLegendKeySize% +%\_ucrLegendKeyWidth% +%\_ucrLegendSpacing% +%\_ucrLegendSpacingXAxis% +%\_ucrLegendSpacingYAxis% +%\_ucrLegendText% +%\_ucrLegendTitle% +%\_ucrModelName% +%\_ucrNewColName% +%\_ucrNewColumnName% +%\_ucrNewDFName% +%\_ucrNewDataFrame% +%\_ucrNewDataFrameName% +%\_ucrNewDataframe% +%\_ucrNudColumnFactors% +%\_ucrNudNumberOfColumns% +%\_ucrPanelBackGround% +%\_ucrPanelBackground% +%\_ucrPanelBorder% +%\_ucrPanelGrid% +%\_ucrPanelGridMajor% +%\_ucrPanelGridMajorXAxis% +%\_ucrPanelGridMajorYAxis% +%\_ucrPanelGridMinor% +%\_ucrPanelGridMinorXAxis% +%\_ucrPanelGridMinorYAxis% +%\_ucrPanelSpacing% +%\_ucrPanelSpacingXAxis% +%\_ucrPanelSpacingYAxis% +%\_ucrPlotBackground% +%\_ucrPlotCaption% +%\_ucrPlotMargin% +%\_ucrPlotSubTitle% +%\_ucrPlotTitle% +%\_ucrSave% +%\_ucrSaveAnonymisedColumn% +%\_ucrSaveBar% +%\_ucrSaveBoxplot% +%\_ucrSaveCRI% +%\_ucrSaveCircularColumn% +%\_ucrSaveCluster% +%\_ucrSaveColumn% +%\_ucrSaveConversions% +%\_ucrSaveCorrelation% +%\_ucrSaveCorruptionModel% +%\_ucrSaveCountRecords% +%\_ucrSaveCumDist% +%\_ucrSaveDataFrame% +%\_ucrSaveDataframeName% +%\_ucrSaveDate% +%\_ucrSaveDeclusteredPlot% +%\_ucrSaveDensity% +%\_ucrSaveDetails% +%\_ucrSaveDisplay% +%\_ucrSaveDisplayChi% +%\_ucrSaveDistance% +%\_ucrSaveDotPlot% +%\_ucrSaveEnterResultInto% +%\_ucrSaveExtremes% +%\_ucrSaveFile% +%\_ucrSaveFirstCol% +%\_ucrSaveFittedColumnName% +%\_ucrSaveFreq% +%\_ucrSaveGOF% +%\_ucrSaveGraph% +%\_ucrSaveHist% +%\_ucrSaveIndex% +%\_ucrSaveIndices% +%\_ucrSaveKey% +%\_ucrSaveLeverageColumnName% +%\_ucrSaveLikelihood% +%\_ucrSaveLink% +%\_ucrSaveLogical% +%\_ucrSaveMap% +%\_ucrSaveMerge% +%\_ucrSaveModel% +%\_ucrSaveModels% +%\_ucrSaveMosaicPlot% +%\_ucrSaveMrlPlot% +%\_ucrSaveNew% +%\_ucrSaveNewColumn% +%\_ucrSaveNewColumnName% +%\_ucrSaveNewDFName% +%\_ucrSaveNewDataFrame% +%\_ucrSaveNewDataName% +%\_ucrSaveObject% +%\_ucrSavePermute% +%\_ucrSavePivot% +%\_ucrSavePlot% +%\_ucrSavePlots% +%\_ucrSavePoly% +%\_ucrSaveRandomSample% +%\_ucrSaveRecode% +%\_ucrSaveResidualsColumnName% +%\_ucrSaveResult% +%\_ucrSaveResults% +%\_ucrSaveScatterPlot% +%\_ucrSaveSecondCol% +%\_ucrSaveStdResidualsColumnName% +%\_ucrSaveStringDistance% +%\_ucrSaveStringHandling% +%\_ucrSaveSummary% +%\_ucrSaveSummaryBar% +%\_ucrSaveTable% +%\_ucrSaveTheme% +%\_ucrSaveThresholdPlot% +%\_ucrSaveTreemap% +%\_ucrSaveVariogram% +%\_ucrSecondDataFrame% +%\_ucrSelectorA2% +%\_ucrSelectorA4% +%\_ucrSelectorA6% +%\_ucrSelectorFirstDF% +%\_ucrSelectorForA2% +%\_ucrSelectorForA3% +%\_ucrSelectorForA4% +%\_ucrSelectorSecondDF% +%\_ucrSelectorVariogram% +%\_ucrStripBackGround% +%\_ucrStripText% +%\_ucrStripTextXAxis% +%\_ucrStripTextYAxis% +%\_ucrStripsSpaceGrid% +%\_ucrStripsSpaceWrap% +%\_ucrThemeAxesLines% +%\_ucrThemeAxesTickLabels% +%\_ucrThemeAxesTitle% +%\_ucrThemeBottomXAxis% +%\_ucrThemeLeftYAxis% +%\_ucrThemeTitleXAxis% +%\_ucrThemeTitleXTopAxis% +%\_ucrThemeTitleYAxis% +%\_ucrThemeTitleYRightAxis% +%\_ucrThemeTopXAxis% +%\_ucrThemeYRightAxis% +%\_ucrTickLength% +%\_ucrTickMarksAxes% +%\_ucrTickMarksXAxis% +%\_ucrTickMarksYAxis% +%\_ucrToDataFrame% +%\_ucrXAxisLines% +%\_ucrYAxisLines% +%\_ucrrdoSpecific% +%\_urChkLegendBoxJust% +%\_urChkLegendPosition% +%\_urChkSelectTheme% diff --git a/instat/translations/translateIgnore.txt b/instat/translations/translateIgnore.txt index ba932708528..d67683ab514 100644 --- a/instat/translations/translateIgnore.txt +++ b/instat/translations/translateIgnore.txt @@ -20,9 +20,10 @@ # (e.g. 'dlgAugment_ucrModelReceiver_txtReceiverSingle') # # - A group of controls to ignore. The group is specified using SQLite pattern matching -# (see https://www.sqlite.org/lang_expr.html). Examples: -# - 'dlgAugment_%' do not translate any of the controls in the 'dlgAugment' dialog -# - '%_txtReceiverSingle' do not translate any text in single receivers +# (see https://www.sqlite.org/lang_expr.html). Examples (note that the '_' character must be +# escaped because otherwise it acts as a wild card): +# - 'dlgAugment\_%' do not translate any of the controls in the 'dlgAugment' dialog +# - '%\_txtReceiverSingle' do not translate any text in single receivers # # - An exclamation point ('!') at the start of the line negates the pattern. Any control in that # pattern that was previously excluded (ignored) becomes included again. @@ -31,8 +32,8 @@ # Negation can be useful if you want to ignore a group of controls with a few specific exceptions. # For example, the lines below ignore all the controls in the 'dlgBarChart' dialog apart from # the 'lblTitle' label: -# 'dlgBarChart_%' -# '!dlgBarChart_%_lblTitle' +# 'dlgBarChart\_%' +# '!dlgBarChart\_%\_lblTitle' # # - Blank lines are ignored, they can be used as separators for readability # @@ -46,17 +47,18 @@ # # For example, if this file contains: # -# %_lblModels -# %_lblModelpreview -# !dlgGlance_% -# !dlgTidy_% +# %\_lblModels +# %\_lblModelpreview +# !dlgGlance\_% +# !dlgTidy\_% # -# then these lines will be used to construct the following SQL command: +# then these lines will be used to construct an SQL command similar to (for conciseness ESCAPE +# specifications not shown): # # UPDATE form_controls SET id_text = 'DoNotTranslate' WHERE -# (control_name LIKE '%_lblModels' OR control_name like '%_lblModelpreview') +# (control_name LIKE '%\_lblModels' OR control_name LIKE '%\_lblModelpreview') # AND NOT -# (control_name LIKE 'dlgGlance_%' OR control_name LIKE 'dlgTidy_%') +# (control_name LIKE 'dlgGlance\_%' OR control\_name LIKE 'dlgTidy\_%') # #################################################################################################### @@ -65,57 +67,57 @@ frmMain # Single receivers normally contain column names, and these should not be translated # Fixes issue 6519 -%_txtReceiverSingle +%\_txtReceiverSingle # In the 'New data Frame' dialog, the user may enter the 'New Data Frame Name'. # This is a literal that should not be translated. # Fixes issue #6581 # TODO Can we assume that the name the user specifies for saving should never be translated # in any dialog (e.g. '%_ucrInputTextSave%')? -dlgNewDataFrame_%_ucrInputTextSave% +dlgNewDataFrame\_%\_ucrInputTextSave% # In the 'Split Text' dialog, the user may specify how to split the column (by space, comma, # period etc.). This string should not be translated. # Fixes issue #6532 -dlgSplitText_ucrInputPattern% +dlgSplitText\_ucrInputPattern% # In the 'Filter' dialog, the 'Selected Filter Preview' should not be translated. # Fixes issue #6949, related to PR #6956 -dlgRestrict_ucrInputFilterPreview% +dlgRestrict\_ucrInputFilterPreview% # In the 'Evapotranspiration' dialog, the 'Penman-Monteith' and 'Hargreaves-Samani' buttons should not be translated. # Partially fixes issue #7026, related to PR #7035 -dlgEvapotranspiration_%_rdoPenmanMonteith -dlgEvapotranspiration_%_rdoHargreavesSamani +dlgEvapotranspiration\_%\_rdoPenmanMonteith +dlgEvapotranspiration\_%\_rdoHargreavesSamani # In the 'Boxplot' dialog, the selected 'Facet' either for Station, Year or Within Year should not be translated # Fixes issue #6185, item a), related to PR #7058 -dlgClimaticBoxPlot_ucrInputStation% -dlgClimaticBoxPlot_ucrInputYear% -dlgClimaticBoxPlot_ucrInputWithinYear% +dlgClimaticBoxPlot\_ucrInputStation% +dlgClimaticBoxPlot\_ucrInputYear% +dlgClimaticBoxPlot\_ucrInputWithinYear% # In the 'InventoryPlot' dialog, the selected 'Facet' should not be translated # Partially fixes issue #6989, related to PR #7070 -dlgInventoryPlot_ucrInputFacetBy% +dlgInventoryPlot\_ucrInputFacetBy% # In any dialog, input text should not be translated # Fixes issue #8275 # TODO If by 2024, this line has not caused any problems, then delete ucrInput controls specified above (already covered by this pattern) -%_ucrInput% +%\_ucrInput% # Shows a dynamically created range of page numbers -%sdgWindowNumber_lblPages +%sdgWindowNumber\_lblPages # Contain variable dates -sdgOpenNetCDF_tbNetCDF_tbSubset_dtpMinT% -sdgOpenNetCDF_tbNetCDF_tbSubset_dtpMaxT% +sdgOpenNetCDF\_tbNetCDF\_tbSubset\_dtpMinT% +sdgOpenNetCDF\_tbNetCDF\_tbSubset\_dtpMaxT% # Mathematical symbols -sdgConstructRegexExpression_grpSymbols_cmdNumbers% -sdgCalculationsSummmary_tbSummaryCalcs_tbMain_ucrCalcSummary_grpSymbols_cmdNumbers% -dlgCalculator_ucrCalc_grpSymbols_cmdNumbers% +sdgConstructRegexExpression\_grpSymbols\_cmdNumbers% +sdgCalculationsSummmary\_tbSummaryCalcs\_tbMain\_ucrCalcSummary\_grpSymbols\_cmdNumbers% +dlgCalculator\_ucrCalc\_grpSymbols\_cmdNumbers% # Tab headings in Log/Script window -ucrScriptWindow_tlpTableContainer_TabControl -ucrScriptWindow_tlpTableContainer_TabControl_TabPageAdded -ucrScriptWindow_tlpTableContainer_TabControl_TabPageAdded_txtScriptAdded +ucrScriptWindow\_tlpTableContainer\_TabControl +ucrScriptWindow\_tlpTableContainer\_TabControl\_TabPageAdded +ucrScriptWindow\_tlpTableContainer\_TabControl\_TabPageAdded\_txtScriptAdded diff --git a/instat/ucrAxes.Designer.vb b/instat/ucrAxes.Designer.vb index 43a7f7632d1..2c76ec33bbc 100644 --- a/instat/ucrAxes.Designer.vb +++ b/instat/ucrAxes.Designer.vb @@ -101,11 +101,24 @@ Partial Class ucrAxes Me.grpMinorBreaks = New System.Windows.Forms.GroupBox() Me.lblMinorBreaksFrom = New System.Windows.Forms.Label() Me.rdoMinorBreaksNone = New System.Windows.Forms.RadioButton() + Me.grpSecondAxis = New System.Windows.Forms.GroupBox() + Me.ucrInputOffset = New instat.ucrInputComboBox() + Me.ucrChkOffset = New instat.ucrCheck() + Me.rdoSecondAxisSpecifyTitle = New System.Windows.Forms.RadioButton() + Me.rdoSecondAxisNoTitle = New System.Windows.Forms.RadioButton() + Me.rdoSecondAxisTitleAuto = New System.Windows.Forms.RadioButton() + Me.ucrPnlSecondAxisTitle = New instat.UcrPanel() + Me.lblTitleSA = New System.Windows.Forms.Label() + Me.ucrInputTextNameSAxis = New instat.ucrInputTextBox() + Me.ucrInputSecondaryAxis = New instat.ucrInputComboBox() + Me.ucrChkSecondaryAxis = New instat.ucrCheck() + Me.ucrInputTrans = New instat.ucrInputComboBox() Me.grpAxisTitle.SuspendLayout() Me.grpMajorBreaks.SuspendLayout() Me.grpScales.SuspendLayout() Me.grpScaleXDate.SuspendLayout() Me.grpMinorBreaks.SuspendLayout() + Me.grpSecondAxis.SuspendLayout() Me.SuspendLayout() ' 'grpAxisTitle @@ -126,7 +139,7 @@ Partial Class ucrAxes 'lblTitle ' Me.lblTitle.AutoSize = True - Me.lblTitle.Location = New System.Drawing.Point(6, 51) + Me.lblTitle.Location = New System.Drawing.Point(4, 51) Me.lblTitle.Name = "lblTitle" Me.lblTitle.Size = New System.Drawing.Size(30, 13) Me.lblTitle.TabIndex = 20 @@ -135,7 +148,7 @@ Partial Class ucrAxes 'rdoSpecifyTitle ' Me.rdoSpecifyTitle.AutoSize = True - Me.rdoSpecifyTitle.Location = New System.Drawing.Point(93, 21) + Me.rdoSpecifyTitle.Location = New System.Drawing.Point(94, 21) Me.rdoSpecifyTitle.Name = "rdoSpecifyTitle" Me.rdoSpecifyTitle.Size = New System.Drawing.Size(83, 17) Me.rdoSpecifyTitle.TabIndex = 3 @@ -146,7 +159,7 @@ Partial Class ucrAxes 'rdoNoTitle ' Me.rdoNoTitle.AutoSize = True - Me.rdoNoTitle.Location = New System.Drawing.Point(214, 21) + Me.rdoNoTitle.Location = New System.Drawing.Point(215, 21) Me.rdoNoTitle.Name = "rdoNoTitle" Me.rdoNoTitle.Size = New System.Drawing.Size(62, 17) Me.rdoNoTitle.TabIndex = 3 @@ -157,7 +170,7 @@ Partial Class ucrAxes 'rdoTitleAuto ' Me.rdoTitleAuto.AutoSize = True - Me.rdoTitleAuto.Location = New System.Drawing.Point(6, 21) + Me.rdoTitleAuto.Location = New System.Drawing.Point(7, 21) Me.rdoTitleAuto.Name = "rdoTitleAuto" Me.rdoTitleAuto.Size = New System.Drawing.Size(47, 17) Me.rdoTitleAuto.TabIndex = 2 @@ -803,10 +816,143 @@ Partial Class ucrAxes Me.rdoMinorBreaksNone.Text = "None" Me.rdoMinorBreaksNone.UseVisualStyleBackColor = True ' + 'grpSecondAxis + ' + Me.grpSecondAxis.Controls.Add(Me.ucrInputTrans) + Me.grpSecondAxis.Controls.Add(Me.ucrInputOffset) + Me.grpSecondAxis.Controls.Add(Me.rdoSecondAxisSpecifyTitle) + Me.grpSecondAxis.Controls.Add(Me.rdoSecondAxisNoTitle) + Me.grpSecondAxis.Controls.Add(Me.rdoSecondAxisTitleAuto) + Me.grpSecondAxis.Controls.Add(Me.ucrPnlSecondAxisTitle) + Me.grpSecondAxis.Controls.Add(Me.lblTitleSA) + Me.grpSecondAxis.Controls.Add(Me.ucrInputTextNameSAxis) + Me.grpSecondAxis.Controls.Add(Me.ucrInputSecondaryAxis) + Me.grpSecondAxis.Controls.Add(Me.ucrChkSecondaryAxis) + Me.grpSecondAxis.Controls.Add(Me.ucrChkOffset) + Me.grpSecondAxis.Location = New System.Drawing.Point(3, 324) + Me.grpSecondAxis.Name = "grpSecondAxis" + Me.grpSecondAxis.Size = New System.Drawing.Size(384, 109) + Me.grpSecondAxis.TabIndex = 35 + Me.grpSecondAxis.TabStop = False + Me.grpSecondAxis.Text = "Secondary Axis" + ' + 'ucrInputOffset + ' + Me.ucrInputOffset.AddQuotesIfUnrecognised = True + Me.ucrInputOffset.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputOffset.GetSetSelectedIndex = -1 + Me.ucrInputOffset.IsReadOnly = False + Me.ucrInputOffset.Location = New System.Drawing.Point(325, 16) + Me.ucrInputOffset.Name = "ucrInputOffset" + Me.ucrInputOffset.Size = New System.Drawing.Size(40, 23) + Me.ucrInputOffset.TabIndex = 35 + ' + 'ucrChkOffset + ' + Me.ucrChkOffset.AutoSize = True + Me.ucrChkOffset.Checked = False + Me.ucrChkOffset.Location = New System.Drawing.Point(267, 17) + Me.ucrChkOffset.Name = "ucrChkOffset" + Me.ucrChkOffset.Size = New System.Drawing.Size(93, 23) + Me.ucrChkOffset.TabIndex = 36 + ' + 'rdoSecondAxisSpecifyTitle + ' + Me.rdoSecondAxisSpecifyTitle.AutoSize = True + Me.rdoSecondAxisSpecifyTitle.Location = New System.Drawing.Point(94, 53) + Me.rdoSecondAxisSpecifyTitle.Name = "rdoSecondAxisSpecifyTitle" + Me.rdoSecondAxisSpecifyTitle.Size = New System.Drawing.Size(83, 17) + Me.rdoSecondAxisSpecifyTitle.TabIndex = 32 + Me.rdoSecondAxisSpecifyTitle.TabStop = True + Me.rdoSecondAxisSpecifyTitle.Text = "Specify Title" + Me.rdoSecondAxisSpecifyTitle.UseVisualStyleBackColor = True + ' + 'rdoSecondAxisNoTitle + ' + Me.rdoSecondAxisNoTitle.AutoSize = True + Me.rdoSecondAxisNoTitle.Location = New System.Drawing.Point(215, 53) + Me.rdoSecondAxisNoTitle.Name = "rdoSecondAxisNoTitle" + Me.rdoSecondAxisNoTitle.Size = New System.Drawing.Size(62, 17) + Me.rdoSecondAxisNoTitle.TabIndex = 33 + Me.rdoSecondAxisNoTitle.TabStop = True + Me.rdoSecondAxisNoTitle.Text = "No Title" + Me.rdoSecondAxisNoTitle.UseVisualStyleBackColor = True + ' + 'rdoSecondAxisTitleAuto + ' + Me.rdoSecondAxisTitleAuto.AutoSize = True + Me.rdoSecondAxisTitleAuto.Location = New System.Drawing.Point(7, 53) + Me.rdoSecondAxisTitleAuto.Name = "rdoSecondAxisTitleAuto" + Me.rdoSecondAxisTitleAuto.Size = New System.Drawing.Size(47, 17) + Me.rdoSecondAxisTitleAuto.TabIndex = 31 + Me.rdoSecondAxisTitleAuto.TabStop = True + Me.rdoSecondAxisTitleAuto.Text = "Auto" + Me.rdoSecondAxisTitleAuto.UseVisualStyleBackColor = True + ' + 'ucrPnlSecondAxisTitle + ' + Me.ucrPnlSecondAxisTitle.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlSecondAxisTitle.Location = New System.Drawing.Point(6, 50) + Me.ucrPnlSecondAxisTitle.Name = "ucrPnlSecondAxisTitle" + Me.ucrPnlSecondAxisTitle.Size = New System.Drawing.Size(290, 23) + Me.ucrPnlSecondAxisTitle.TabIndex = 34 + ' + 'lblTitleSA + ' + Me.lblTitleSA.AutoSize = True + Me.lblTitleSA.Location = New System.Drawing.Point(4, 83) + Me.lblTitleSA.Name = "lblTitleSA" + Me.lblTitleSA.Size = New System.Drawing.Size(30, 13) + Me.lblTitleSA.TabIndex = 30 + Me.lblTitleSA.Text = "Title:" + ' + 'ucrInputTextNameSAxis + ' + Me.ucrInputTextNameSAxis.AddQuotesIfUnrecognised = True + Me.ucrInputTextNameSAxis.AutoSize = True + Me.ucrInputTextNameSAxis.IsMultiline = False + Me.ucrInputTextNameSAxis.IsReadOnly = False + Me.ucrInputTextNameSAxis.Location = New System.Drawing.Point(62, 80) + Me.ucrInputTextNameSAxis.Name = "ucrInputTextNameSAxis" + Me.ucrInputTextNameSAxis.Size = New System.Drawing.Size(131, 21) + Me.ucrInputTextNameSAxis.TabIndex = 29 + ' + 'ucrInputSecondaryAxis + ' + Me.ucrInputSecondaryAxis.AddQuotesIfUnrecognised = True + Me.ucrInputSecondaryAxis.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputSecondaryAxis.GetSetSelectedIndex = -1 + Me.ucrInputSecondaryAxis.IsReadOnly = False + Me.ucrInputSecondaryAxis.Location = New System.Drawing.Point(107, 15) + Me.ucrInputSecondaryAxis.Name = "ucrInputSecondaryAxis" + Me.ucrInputSecondaryAxis.Size = New System.Drawing.Size(40, 23) + Me.ucrInputSecondaryAxis.TabIndex = 27 + ' + 'ucrChkSecondaryAxis + ' + Me.ucrChkSecondaryAxis.AutoSize = True + Me.ucrChkSecondaryAxis.Checked = False + Me.ucrChkSecondaryAxis.Location = New System.Drawing.Point(9, 17) + Me.ucrChkSecondaryAxis.Name = "ucrChkSecondaryAxis" + Me.ucrChkSecondaryAxis.Size = New System.Drawing.Size(124, 23) + Me.ucrChkSecondaryAxis.TabIndex = 24 + ' + 'ucrInputTrans + ' + Me.ucrInputTrans.AddQuotesIfUnrecognised = True + Me.ucrInputTrans.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputTrans.GetSetSelectedIndex = -1 + Me.ucrInputTrans.IsReadOnly = False + Me.ucrInputTrans.Location = New System.Drawing.Point(170, 15) + Me.ucrInputTrans.Name = "ucrInputTrans" + Me.ucrInputTrans.Size = New System.Drawing.Size(78, 23) + Me.ucrInputTrans.TabIndex = 37 + ' 'ucrAxes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi + Me.Controls.Add(Me.grpSecondAxis) Me.Controls.Add(Me.grpScales) Me.Controls.Add(Me.grpScaleXDate) Me.Controls.Add(Me.grpMinorBreaks) @@ -814,7 +960,7 @@ Partial Class ucrAxes Me.Controls.Add(Me.grpMajorBreaks) Me.Controls.Add(Me.grpAxisTitle) Me.Name = "ucrAxes" - Me.Size = New System.Drawing.Size(667, 334) + Me.Size = New System.Drawing.Size(670, 489) Me.grpAxisTitle.ResumeLayout(False) Me.grpAxisTitle.PerformLayout() Me.grpMajorBreaks.ResumeLayout(False) @@ -825,6 +971,8 @@ Partial Class ucrAxes Me.grpScaleXDate.PerformLayout() Me.grpMinorBreaks.ResumeLayout(False) Me.grpMinorBreaks.PerformLayout() + Me.grpSecondAxis.ResumeLayout(False) + Me.grpSecondAxis.PerformLayout() Me.ResumeLayout(False) End Sub @@ -893,4 +1041,16 @@ Partial Class ucrAxes Friend WithEvents ucrInputComboDateBreak As ucrInputComboBox Friend WithEvents ucrChkDateLabels As ucrCheck Friend WithEvents ucrInputComboDateLabel As ucrInputComboBox + Friend WithEvents grpSecondAxis As GroupBox + Friend WithEvents ucrInputSecondaryAxis As ucrInputComboBox + Friend WithEvents ucrChkSecondaryAxis As ucrCheck + Friend WithEvents ucrInputTextNameSAxis As ucrInputTextBox + Friend WithEvents lblTitleSA As Label + Friend WithEvents rdoSecondAxisSpecifyTitle As RadioButton + Friend WithEvents rdoSecondAxisNoTitle As RadioButton + Friend WithEvents rdoSecondAxisTitleAuto As RadioButton + Friend WithEvents ucrPnlSecondAxisTitle As UcrPanel + Friend WithEvents ucrChkOffset As ucrCheck + Friend WithEvents ucrInputOffset As ucrInputComboBox + Friend WithEvents ucrInputTrans As ucrInputComboBox End Class diff --git a/instat/ucrAxes.vb b/instat/ucrAxes.vb index bcd2d86a966..6ee738d7e59 100644 --- a/instat/ucrAxes.vb +++ b/instat/ucrAxes.vb @@ -27,6 +27,8 @@ Public Class ucrAxes Public clsMinorBreaksSeqFunction As New RFunction Public clsXYScaleDateBreakOperator As New ROperator Public clsXYScaleDateLimitFunction As New RFunction + Public clsXYSecondaryAxisFunction As New RFunction + Public clsDummyFunction As New RFunction Public strAxis As String 'e.g. discrete, continuous Public strAxisType As String @@ -38,6 +40,9 @@ Public Class ucrAxes Public Sub InitialiseControl() Dim dctTickMarkers As New Dictionary(Of String, String) Dim dctDateFormat As New Dictionary(Of String, String) + Dim dctTempSecondaryAxis As New Dictionary(Of String, String) + Dim dctOffset As New Dictionary(Of String, String) + Dim dctTransValue As New Dictionary(Of String, String) 'Axis Section ucrPnlAxisTitle.AddRadioButton(rdoTitleAuto) @@ -190,6 +195,68 @@ Public Class ucrAxes ucrChkExpand.AddToLinkedControls(ucrInputExpand, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="0.05,0") ucrInputExpand.SetValidationTypeAsNumericList() + 'secondary axis' + ucrPnlSecondAxisTitle.SetParameter(New RParameter("name", iNewPosition:=1)) + ucrPnlSecondAxisTitle.AddRadioButton(rdoSecondAxisTitleAuto) + ucrPnlSecondAxisTitle.AddRadioButton(rdoSecondAxisNoTitle) + ucrPnlSecondAxisTitle.AddRadioButton(rdoSecondAxisSpecifyTitle) + ucrPnlSecondAxisTitle.AddParameterValuesCondition(rdoSecondAxisTitleAuto, "name", "auto") + ucrPnlSecondAxisTitle.AddParameterValuesCondition(rdoSecondAxisNoTitle, "name", "notitle") + ucrPnlSecondAxisTitle.AddParameterValuesCondition(rdoSecondAxisSpecifyTitle, "name", "title") + ucrPnlSecondAxisTitle.AddToLinkedControls(ucrInputTextNameSAxis, {rdoSecondAxisSpecifyTitle}, bNewLinkedHideIfParameterMissing:=True) + + ucrChkSecondaryAxis.SetText("Transformation") + ucrChkSecondaryAxis.AddParameterPresentCondition(True, True) + ucrChkSecondaryAxis.AddParameterPresentCondition(False, False) + ucrChkSecondaryAxis.AddToLinkedControls(ucrInputSecondaryAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="*") + ucrChkSecondaryAxis.AddToLinkedControls(ucrInputTrans, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="1") + ucrChkSecondaryAxis.AddToLinkedControls(ucrPnlSecondAxisTitle, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkSecondaryAxis.AddToLinkedControls(ucrChkOffset, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + ucrInputSecondaryAxis.SetParameter(New RParameter("trans", bNewIncludeArgumentName:=False)) + dctTempSecondaryAxis.Add("*", "*") + dctTempSecondaryAxis.Add("/", "/") + dctTempSecondaryAxis.Add("+", "+") + dctTempSecondaryAxis.Add("-", "-") + ucrInputSecondaryAxis.SetItems(dctTempSecondaryAxis) + ucrInputSecondaryAxis.SetDropDownStyleAsNonEditable() + + ucrChkOffset.SetText("Offset") + ucrChkOffset.AddParameterPresentCondition(True, True) + ucrChkOffset.AddParameterPresentCondition(False, False) + ucrChkOffset.AddToLinkedControls(ucrInputOffset, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="0") + + ucrInputOffset.SetParameter(New RParameter("signe", bNewIncludeArgumentName:=False)) + dctOffset.Add("0", "0") + dctOffset.Add("32", "32") + dctOffset.Add("-32", "-32") + ucrInputOffset.SetItems(dctOffset) + ucrInputOffset.SetDropDownStyleAsNonEditable() + + ucrInputTrans.SetParameter(New RParameter("number", bNewIncludeArgumentName:=False)) + dctTransValue.Add("1", "1") + dctTransValue.Add("1.09361", "1.09361") + dctTransValue.Add("1.34", "1.34") + dctTransValue.Add("1.8", "1.8") + dctTransValue.Add("2.20462", "2.20462") + dctTransValue.Add("2.54", "2.54") + dctTransValue.Add("7", "7") + dctTransValue.Add("9.632", "9.632") + dctTransValue.Add("10.15", "10.15") + dctTransValue.Add("13", "13") + dctTransValue.Add("20", "20") + dctTransValue.Add("25.0128", "25.0128") + dctTransValue.Add("100", "100") + dctTransValue.Add("30.6682", "30.6682") + dctTransValue.Add("40", "40") + dctTransValue.Add("600.26", "600.26") + dctTransValue.Add("1000", "1000") + ucrInputTrans.SetItems(dctTransValue) + ucrInputTrans.SetDropDownStyleAsNonEditable() + ucrInputTrans.SetDropDownStyleAsEditable(True) + + ucrInputTextNameSAxis.SetLinkedDisplayControl(lblTitleSA) + 'Date X Scale dctDateFormat.Add("Year, with century (0000-9999)", Chr(34) & "%Y" & Chr(34)) dctDateFormat.Add("Year, without century (00-99)", Chr(34) & "%y" & Chr(34)) @@ -215,13 +282,10 @@ Public Class ucrAxes dctDateFormat.Add("Day-Month(Full Name)-Year(4-digit)", Chr(34) & "%d-%B-%Y" & Chr(34)) dctDateFormat.Add("Day/Month(Full Name)/Year(4-digit)", Chr(34) & "%d/%B/%Y" & Chr(34)) - ucrInputComboDateLabel.SetParameter(New RParameter("date_labels", 3)) ucrInputComboDateLabel.SetItems(dctDateFormat) ucrInputComboDateLabel.SetDropDownStyleAsEditable(bAdditionsAllowed:=True) - - ucrChkDateLabels.SetText("Date labels") ucrChkDateLabels.SetParameter(New RParameter("date_labels"), bNewChangeParameterValue:=False) @@ -254,7 +318,7 @@ Public Class ucrAxes bControlsInitialised = True End Sub - Public Sub SetRCodeForControl(bIsXAxis As Boolean, Optional strNewAxisType As String = "continuous", Optional clsNewXYScaleContinuousFunction As RFunction = Nothing, Optional clsNewXYlabTitleFunction As RFunction = Nothing, Optional clsNewXYScaleDateFunction As RFunction = Nothing, Optional clsNewBaseOperator As ROperator = Nothing, Optional bReset As Boolean = False, Optional bCloneIfNeeded As Boolean = False) + Public Sub SetRCodeForControl(bIsXAxis As Boolean, Optional strNewAxisType As String = "continuous", Optional clsNewXYScaleContinuousFunction As RFunction = Nothing, Optional clsNewXYlabTitleFunction As RFunction = Nothing, Optional clsNewXYSecondaryAxisFunction As RFunction = Nothing, Optional clsNewXYScaleDateFunction As RFunction = Nothing, Optional clsNewBaseOperator As ROperator = Nothing, Optional bReset As Boolean = False, Optional bCloneIfNeeded As Boolean = False) Dim clsTempBreaksParam As RParameter Dim clsTempMinorBreaksParam As RParameter @@ -293,6 +357,12 @@ Public Class ucrAxes clsXYScaleDateBreakOperator.bSpaceAroundOperation = False clsXYScaleDateBreakOperator.bToScriptAsRString = True + clsDummyFunction = New RFunction + clsDummyFunction.AddParameter("name", "auto", iPosition:=1) + + clsXYSecondaryAxisFunction = New RFunction + clsXYSecondaryAxisFunction.SetRCommand("sec_axis") + clsXYlabTitleFunction = clsNewXYlabTitleFunction clsXYScaleDateFunction = clsNewXYScaleDateFunction clsXYScaleContinuousFunction = clsNewXYScaleContinuousFunction @@ -345,6 +415,12 @@ Public Class ucrAxes ucrPnlAxisTitle.SetRCode(clsXYlabTitleFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) ucrInputTitle.SetRCode(clsXYlabTitleFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) + If bReset Then + ucrPnlSecondAxisTitle.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) + ucrChkSecondaryAxis.SetRCode(clsXYSecondaryAxisFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) + ucrInputSecondaryAxis.SetRCode(clsXYSecondaryAxisFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) + End If + 'scales functions ucrPnlScales.SetRCode(clsXYScaleContinuousFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) ucrInputLowerLimit.SetRCode(clsLimitsFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) @@ -445,7 +521,7 @@ Public Class ucrAxes Private Sub ucrInputAxisType_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputAxisType.ControlValueChanged SetAxisTypeControls() AddRemoveScaleFunctions() - + SecondaryAxis() End Sub Private Sub SetAxisTypeControls() @@ -455,11 +531,14 @@ Public Class ucrAxes grpMinorBreaks.Hide() grpScales.Hide() grpScaleXDate.Hide() + grpSecondAxis.Hide() + If strAxisType.ToLower = "continuous" Then 'show continous panels 'TODO put controls in panels so group boxes can be used for multiple cases grpMajorBreaks.Show() grpMinorBreaks.Show() + grpSecondAxis.Show() grpScales.Show() ElseIf strAxisType.ToLower = "discrete" Then 'show discrete panels @@ -537,6 +616,29 @@ Public Class ucrAxes AddRemoveContinuousXYScales() End Sub + Private Sub SecondaryAxis() + If ucrChkSecondaryAxis.Checked Then + If ucrChkOffset.Checked Then + If ucrInputOffset.GetText = "0" Then + clsXYSecondaryAxisFunction.AddParameter("trans", "~." & ucrInputSecondaryAxis.GetText & ucrInputTrans.GetText, bIncludeArgumentName:=False, iPosition:=0) + clsXYScaleContinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsXYSecondaryAxisFunction, bIncludeArgumentName:=True) + ElseIf ucrInputOffset.GetText = "-32" Then + clsXYSecondaryAxisFunction.AddParameter("trans", "~." & ucrInputSecondaryAxis.GetText & ucrInputTrans.GetText & ucrInputOffset.GetText, bIncludeArgumentName:=False, iPosition:=0) + clsXYScaleContinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsXYSecondaryAxisFunction, bIncludeArgumentName:=True) + ElseIf ucrInputOffset.GetText = "32" Then + clsXYSecondaryAxisFunction.AddParameter("trans", "~." & ucrInputSecondaryAxis.GetText & ucrInputTrans.GetText & "+" & ucrInputOffset.GetText, bIncludeArgumentName:=False, iPosition:=0) + clsXYScaleContinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsXYSecondaryAxisFunction, bIncludeArgumentName:=True) + End If + Else + clsXYSecondaryAxisFunction.AddParameter("trans", "~." & ucrInputSecondaryAxis.GetText & ucrInputTrans.GetText, bIncludeArgumentName:=False, iPosition:=0) + clsXYScaleContinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsXYSecondaryAxisFunction, bIncludeArgumentName:=True) + End If + Else + clsXYScaleContinuousFunction.RemoveParameterByName("sec.axis") + End If + AddRemoveContinuousXYScales() + End Sub + Private Sub ScaleDateFunction_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLimits.ControlValueChanged, ucrChkBreaks.ControlValueChanged If bRCodeSet Then If ucrChkLimits.Checked Then @@ -547,4 +649,18 @@ Public Class ucrAxes End If End If End Sub + + Private Sub SetNameSecondaryAxis() + clsXYSecondaryAxisFunction.RemoveParameterByName("name") + If rdoSecondAxisNoTitle.Checked Then + clsXYSecondaryAxisFunction.AddParameter("name", Chr(34) & Chr(34), iPosition:=1) + ElseIf rdoSecondAxisSpecifyTitle.Checked AndAlso Not ucrInputTextNameSAxis.IsEmpty Then + clsXYSecondaryAxisFunction.AddParameter("name", Chr(34) & ucrInputTextNameSAxis.GetText() & Chr(34), iPosition:=1) + End If + End Sub + + Private Sub ucrChkSecondaryAxis_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSecondaryAxis.ControlValueChanged, ucrInputSecondaryAxis.ControlValueChanged, ucrPnlSecondAxisTitle.ControlValueChanged, ucrInputTextNameSAxis.ControlValueChanged, ucrInputTrans.ControlValueChanged, ucrChkOffset.ControlValueChanged, ucrInputOffset.ControlValueChanged + SetNameSecondaryAxis() + SecondaryAxis() + End Sub End Class \ No newline at end of file diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 6dd5c4f4d53..b0e2760b91b 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -89,6 +89,7 @@ Public Class ucrDataView AddHandler _grid.CellDataChanged, AddressOf CellDataChanged AddHandler _grid.DeleteValuesToDataframe, AddressOf DeleteCell_Click AddHandler _grid.EditCell, AddressOf EditCell + AddHandler _grid.FindRow, AddressOf FindRow End Sub Private Sub RefreshWorksheet(fillWorkSheet As clsWorksheetAdapter, dataFrame As clsDataFrame) @@ -245,10 +246,22 @@ Public Class ucrDataView RefreshDisplayInformation() End Sub + Public Function GetFirstRowHeader() As String + Return _grid.GetFirstRowHeader + End Function + + Public Function GetLastRowHeader() As String + Return _grid.GetLastRowHeader + End Function + Public Function GetWorkSheetCount() As Integer Return _grid.GetWorksheetCount End Function + Public Sub AdjustColumnWidthAfterWrapping(strColumn As String, Optional bApplyWrap As Boolean = False) + _grid.AdjustColumnWidthAfterWrapping(strColumn, bApplyWrap) + End Sub + Private Sub RefreshDisplayInformation() If GetWorkSheetCount() <> 0 AndAlso _clsDataBook IsNot Nothing AndAlso GetCurrentDataFrameFocus() IsNot Nothing Then frmMain.tstatus.Text = _grid.CurrentWorksheet.Name @@ -908,6 +921,11 @@ Public Class ucrDataView Help.ShowHelp(frmMain, frmMain.strStaticPath & "/" & frmMain.strHelpFilePath, HelpNavigator.TopicId, "134") End Sub + Public Sub GoToSpecificRowPage(iPage As Integer) + GetCurrentDataFrameFocus().clsVisibleDataFramePage.GoToSpecificRowPage(iPage) + RefreshWorksheet(_grid.CurrentWorksheet, GetCurrentDataFrameFocus()) + End Sub + Private Sub lblRowDisplay_Click(sender As Object, e As EventArgs) Handles lblRowDisplay.Click If lblRowNext.Enabled OrElse lblRowBack.Enabled Then sdgWindowNumber.enumWINNUMBERMode = sdgWindowNumber.WINNUMBERMode.Row @@ -921,11 +939,15 @@ Public Class ucrDataView sdgWindowNumber.iEndRowOrColumn = GetCurrentDataFrameFocus().clsVisibleDataFramePage.intEndRow sdgWindowNumber.ShowDialog() - GetCurrentDataFrameFocus().clsVisibleDataFramePage.GoToSpecificRowPage(sdgWindowNumber.iPage) - RefreshWorksheet(_grid.CurrentWorksheet, GetCurrentDataFrameFocus()) + GoToSpecificRowPage(sdgWindowNumber.iPage) End If End Sub + Public Sub GoToSpecificColumnPage(iPage As Integer) + GetCurrentDataFrameFocus().clsVisibleDataFramePage.GoToSpecificColumnPage(iPage) + RefreshWorksheet(_grid.CurrentWorksheet, GetCurrentDataFrameFocus()) + End Sub + Private Sub lblColDisplay_Click(sender As Object, e As EventArgs) Handles lblColDisplay.Click If lblColNext.Enabled OrElse lblColBack.Enabled Then sdgWindowNumber.enumWINNUMBERMode = sdgWindowNumber.WINNUMBERMode.Col @@ -938,8 +960,7 @@ Public Class ucrDataView sdgWindowNumber.iTotalRowOrColumn = iTotalCol sdgWindowNumber.iEndRowOrColumn = GetCurrentDataFrameFocus().clsVisibleDataFramePage.intEndColumn sdgWindowNumber.ShowDialog() - GetCurrentDataFrameFocus().clsVisibleDataFramePage.GoToSpecificColumnPage(sdgWindowNumber.iPage) - RefreshWorksheet(_grid.CurrentWorksheet, GetCurrentDataFrameFocus()) + GoToSpecificColumnPage(sdgWindowNumber.iPage) End If End Sub @@ -982,4 +1003,18 @@ Public Class ucrDataView Private Sub mnuEditCell_Click(sender As Object, e As EventArgs) Handles mnuEditCell.Click EditCell() End Sub + + Private Sub FindRow() + dlgFindInVariableOrFilter.ShowDialog() + End Sub + + Public Sub SearchRowInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, + Optional bApplyToRows As Boolean = False) + _grid.SearchRowInGrid(rowNumbers, strColumn, iRow, bApplyToRows) + End Sub + + Public Sub SelectColumnInGrid(strColumn As String) + _grid.SelectColumnInGrid(strColumn) + End Sub + End Class \ No newline at end of file diff --git a/instat/ucrGeom.vb b/instat/ucrGeom.vb index 3892065a33e..04ee0044d59 100644 --- a/instat/ucrGeom.vb +++ b/instat/ucrGeom.vb @@ -864,6 +864,8 @@ Public Class ucrGeom 'adding layer parameters clsgeom_density_ridges.AddLayerParameter("stat", "list", Chr(34) & "density_ridges" & Chr(34), lstParameterStrings:={Chr(34) & "density_ridges" & Chr(34), Chr(34) & "binline" & Chr(34)}) clsgeom_density_ridges.AddLayerParameter("position", "list", Chr(34) & "points_sina" & Chr(34), lstParameterStrings:={Chr(34) & "points_sina" & Chr(34), Chr(34) & "points_jitter" & Chr(34), Chr(34) & "raincloud" & Chr(34)}) + clsgeom_density_ridges.AddLayerParameter("colour", "colour", Chr(34) & "black" & Chr(34)) + clsgeom_density_ridges.AddLayerParameter("fill", "colour", Chr(34) & "white" & Chr(34)) clsgeom_density_ridges.AddLayerParameter("panel_scaling", "list", "TRUE", lstParameterStrings:={"TRUE", "FALSE"}) clsgeom_density_ridges.AddLayerParameter("na.rm", "list", "FALSE", lstParameterStrings:={"TRUE", "FALSE"}) clsgeom_density_ridges.AddLayerParameter("show.legend", "list", "TRUE", lstParameterStrings:={"NA", "TRUE", "FALSE"}) @@ -1689,6 +1691,7 @@ Public Class ucrGeom 'optional clsgeom_ribbon.AddAesParameter("alpha") clsgeom_ribbon.AddAesParameter("colour") + clsgeom_ribbon.AddAesParameter("fill") clsgeom_ribbon.AddAesParameter("group") clsgeom_ribbon.AddAesParameter("linetype") clsgeom_ribbon.AddAesParameter("size") @@ -1699,6 +1702,8 @@ Public Class ucrGeom clsgeom_ribbon.AddLayerParameter("position", "editablelist", Chr(34) & "identity" & Chr(34), lstParameterStrings:={Chr(34) & "identity" & Chr(34)}) clsgeom_ribbon.AddLayerParameter("size", "numeric", "1") clsgeom_ribbon.AddLayerParameter("colour", "colour", Chr(34) & "black" & Chr(34)) + clsgeom_ribbon.AddLayerParameter("fill", "colour", Chr(34) & "white" & Chr(34)) + clsgeom_ribbon.AddLayerParameter("alpha", "numeric", "1", lstParameterStrings:={2, 0, 1}) clsgeom_ribbon.AddLayerParameter("show.legend", "list", "TRUE", lstParameterStrings:={"NA", "TRUE", "FALSE"}) clsgeom_ribbon.AddLayerParameter("orientation", "list", "NA", lstParameterStrings:={"NA", "x", "y"}) clsgeom_ribbon.AddLayerParameter("na.rm", "list", "FALSE", lstParameterStrings:={"TRUE", "FALSE"}) diff --git a/instat/ucrInputComboBox.vb b/instat/ucrInputComboBox.vb index 2bebec68f59..02e3d485ea5 100644 --- a/instat/ucrInputComboBox.vb +++ b/instat/ucrInputComboBox.vb @@ -225,7 +225,7 @@ Public Class ucrInputComboBox End Sub Private Sub cboInput_KeyPress(sender As Object, e As KeyPressEventArgs) Handles cboInput.KeyPress - bUserTyped = True + bUserTyped = False End Sub 'Public Sub SetEditable(bEditable As Boolean) diff --git a/instat/ucrInputTextBox.vb b/instat/ucrInputTextBox.vb index f911cce9ee3..9b98ebc4e35 100644 --- a/instat/ucrInputTextBox.vb +++ b/instat/ucrInputTextBox.vb @@ -31,7 +31,7 @@ Public Class ucrInputTextBox End Sub Private Sub txtInput_KeyPress(sender As Object, e As KeyPressEventArgs) Handles txtInput.KeyPress - bUserTyped = True + bUserTyped = False End Sub Private Sub txtInput_Validating(sender As Object, e As CancelEventArgs) Handles txtInput.Validating diff --git a/instat/ucrSave.vb b/instat/ucrSave.vb index 5cd56cbc3d7..c48672c9a02 100644 --- a/instat/ucrSave.vb +++ b/instat/ucrSave.vb @@ -775,6 +775,14 @@ Public Class ucrSave End If End Function '''-------------------------------------------------------------------------------------------- + ''' Gets the adjacent column name from the Save Column Position Sub Dialogue. + ''' + ''' The adjacent column name from the Save Column Position Sub Dialogue. + '''-------------------------------------------------------------------------------------------- + Public Function AdjacentColumnName() As String + Return sdgSaveColumnPosition.AdjacentColumn + End Function + '''-------------------------------------------------------------------------------------------- ''' True if the user has entered text into the text/combo box, else false. ''' ''' True if the user has entered text into the text/combo box, else false. diff --git a/instat/ucrScript.Designer.vb b/instat/ucrScript.Designer.vb index 4a6fe02212d..8721a9711a3 100644 --- a/instat/ucrScript.Designer.vb +++ b/instat/ucrScript.Designer.vb @@ -271,7 +271,7 @@ Partial Class ucrScript Me.cmdAddTab.Name = "cmdAddTab" Me.cmdAddTab.Size = New System.Drawing.Size(75, 23) Me.cmdAddTab.TabIndex = 4 - Me.cmdAddTab.Text = "Add" + Me.cmdAddTab.Text = "New" Me.cmdAddTab.UseVisualStyleBackColor = True ' 'cmdHelp diff --git a/instat/ucrVariablename.vb b/instat/ucrVariablename.vb index f722270326e..45e801dfca5 100644 --- a/instat/ucrVariablename.vb +++ b/instat/ucrVariablename.vb @@ -24,7 +24,7 @@ Public Class ucrVariableName Public Event NameChanged() 'TODO this has a bug if using for setting default values in textbox if user does not use keyboard Private Sub txtValidation_KeyPress(sender As Object, e As KeyPressEventArgs) Handles txtValidation.KeyPress - bUserTyped = True + bUserTyped = False End Sub