From e9bd626c31cd22a030faed0c0122070ea92987d5 Mon Sep 17 00:00:00 2001 From: Steven Date: Sun, 22 Sep 2024 10:26:06 -0400 Subject: [PATCH] 1551 cleanup (#1580) * cleanup * resx --- OneMore/Commands/Tables/AddFormulaCommand.cs | 2 +- .../Commands/Tables/Formulas/FunctionFactory.cs | 5 ++++- .../Tables/Formulas/GetCellValueHandler.cs | 2 +- OneMore/Commands/Tables/Formulas/Processor.cs | 6 ------ OneMore/Properties/AssemblyInfo.cs | 2 +- OneMore/Properties/Resources.Designer.cs | 10 +++++----- OneMore/Properties/Resources.ar-SA.resx | 16 ++++++++-------- OneMore/Properties/Resources.de-DE.resx | 16 ++++++++-------- OneMore/Properties/Resources.es-ES.resx | 16 ++++++++-------- OneMore/Properties/Resources.fr-FR.resx | 16 ++++++++-------- OneMore/Properties/Resources.he-IL.resx | 16 ++++++++-------- OneMore/Properties/Resources.ja-JP.resx | 16 ++++++++-------- OneMore/Properties/Resources.nl-NL.resx | 14 +++++++------- OneMore/Properties/Resources.pl-PL.resx | 14 +++++++------- OneMore/Properties/Resources.pt-BR.resx | 16 ++++++++-------- OneMore/Properties/Resources.resx | 12 ++++++------ OneMore/Properties/Resources.zh-CN.resx | 16 ++++++++-------- OneMoreCalendar/OneMoreCalendar.csproj | 6 ------ OneMoreCalendar/Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- OneMoreSetup/OneMoreSetup.vdproj | 6 +++--- OneMoreSetupActions/Properties/AssemblyInfo.cs | 2 +- OneMoreTray/OneMoreTray.csproj | 6 ------ OneMoreTray/Properties/AssemblyInfo.cs | 2 +- 24 files changed, 103 insertions(+), 118 deletions(-) diff --git a/OneMore/Commands/Tables/AddFormulaCommand.cs b/OneMore/Commands/Tables/AddFormulaCommand.cs index 8c88a3862e..7ed0d89441 100644 --- a/OneMore/Commands/Tables/AddFormulaCommand.cs +++ b/OneMore/Commands/Tables/AddFormulaCommand.cs @@ -156,7 +156,7 @@ private static void StoreFormula( return; } - var regex = new Regex(Processor.AddressPattern); + var regex = new Regex(@"\b(?[a-zA-Z]{1,3})(?\d{1,3})\b"); int offset = 0; foreach (var cell in cells) diff --git a/OneMore/Commands/Tables/Formulas/FunctionFactory.cs b/OneMore/Commands/Tables/Formulas/FunctionFactory.cs index f391a18b1d..1a9685f0bf 100644 --- a/OneMore/Commands/Tables/Formulas/FunctionFactory.cs +++ b/OneMore/Commands/Tables/Formulas/FunctionFactory.cs @@ -10,6 +10,7 @@ namespace River.OneMoreAddIn.Commands.Tables.Formulas using System.Linq; using Resx = Properties.Resources; + internal class FunctionFactory { private const int CountIfNe = 3; @@ -51,13 +52,15 @@ public Func Find(string name) "countif" => inputs => CountIf(inputs), "exp" => inputs => Math.Exp(inputs.Assert(D)[0]), "floor" => inputs => Math.Floor(inputs.Assert(D)[0]), + "log" => inputs => Math.Log(inputs.Assert(D)[0]), + "log10" => inputs => Math.Log10(inputs.Assert(D)[0]), "max" => inputs => Max(inputs.Assert(D).ToDoubleArray()), "median" => inputs => Median(inputs.Assert(D).ToDoubleArray()), "min" => inputs => Min(inputs.Assert(D).ToDoubleArray()), "mode" => inputs => Mode(inputs.Assert(D).ToDoubleArray()), "pow" => inputs => Math.Pow(inputs.Assert(D)[0], inputs[1]), - "rem" => inputs => Math.IEEERemainder(inputs.Assert(D)[0], inputs[1]), "range" => inputs => Range(inputs.Assert(D).ToDoubleArray()), + "rem" => inputs => Math.IEEERemainder(inputs.Assert(D)[0], inputs[1]), "root" => inputs => Math.Pow(inputs.Assert(D, D)[0], 1 / inputs[1]), "round" => inputs => Math.Round(inputs.Assert(D)[0], MidpointRounding.AwayFromZero), "sign" => inputs => Math.Sign(inputs.Assert(D)[0]), diff --git a/OneMore/Commands/Tables/Formulas/GetCellValueHandler.cs b/OneMore/Commands/Tables/Formulas/GetCellValueHandler.cs index 8879835d86..308157d29a 100644 --- a/OneMore/Commands/Tables/Formulas/GetCellValueHandler.cs +++ b/OneMore/Commands/Tables/Formulas/GetCellValueHandler.cs @@ -1,5 +1,5 @@ //************************************************************************************************ -// Copyright © 2022 Steven M Cohn. All rights reserved. +// Copyright © 2022 Steven M Cohn. All rights reserved. //************************************************************************************************ namespace River.OneMoreAddIn.Commands.Tables.Formulas diff --git a/OneMore/Commands/Tables/Formulas/Processor.cs b/OneMore/Commands/Tables/Formulas/Processor.cs index 03f2e813eb..800332c508 100644 --- a/OneMore/Commands/Tables/Formulas/Processor.cs +++ b/OneMore/Commands/Tables/Formulas/Processor.cs @@ -11,12 +11,6 @@ namespace River.OneMoreAddIn.Commands.Tables.Formulas internal class Processor : Loggable { - /// - /// Regex pattern for matching cell addresses of the form [col-letters][row-number] where - /// row-number is a positive, non-zero integer. Capture groups are named c)ell and r)row. - /// - public const string AddressPattern = @"^(?[a-zA-Z]{1,3})(?\d{1,3})$"; - private readonly Table table; private int maxdec; private List tags; diff --git a/OneMore/Properties/AssemblyInfo.cs b/OneMore/Properties/AssemblyInfo.cs index c4c9e1680c..3579a1e154 100644 --- a/OneMore/Properties/AssemblyInfo.cs +++ b/OneMore/Properties/AssemblyInfo.cs @@ -37,7 +37,7 @@ internal static class AssemblyInfo * NOTE - also update the version in the Setup project * by clicking on the Setup project node in VS and update its properties */ - public const string Version = "6.5.1"; + public const string Version = "6.5.2"; public const string Product = "OneMore"; diff --git a/OneMore/Properties/Resources.Designer.cs b/OneMore/Properties/Resources.Designer.cs index e4c8b2e4c3..84f5a7b839 100644 --- a/OneMore/Properties/Resources.Designer.cs +++ b/OneMore/Properties/Resources.Designer.cs @@ -3223,15 +3223,15 @@ internal static string FormulaDialog_formulaLabel_Text { } /// - /// Looks up a localized string similar to Entered formula should apply to the first selected cell. This formula will be incremented automatically for additional selected cells. + /// Looks up a localized string similar to Formula apply to the first selected cell and are incremented automatically for additional selected cells. /// - ///Functions: abs, acos, asin, atan, atan2, average, ceiling, cos, cosh, countif, exp, floor, log, log10, max, median, min, mode, pow, range, round, sign, sin, sinh, sqrt, stdev, sum, tan, tanh, trunc, variance + ///Functions: abs, acos, arccos, arcsin, arctan, asin, atan, atan2, average, ceil, ceiling, cos, cosh, exp, floor, log, log10, max, median, min, mode, pow, range, rem, root, round, sign, sin, sinh, sqrt, stdev, sum, tan, tanh, trunc, truncate, and variance. /// - ///Operators: + - / * ^ - ///Symbols: PI, E + ///Operators: + - / * ^ % + ///Variables: e, phi, pi, tao, tablecols, tablerows ///Cell reference: A1, A2, ... ZZZ999 ///Cell range: A1:A22 - ///Relative range in a column: A1:A-1. + ///Relative ranges [rest of string was truncated]";. /// internal static string FormulaDialog_helpBox_Text { get { diff --git a/OneMore/Properties/Resources.ar-SA.resx b/OneMore/Properties/Resources.ar-SA.resx index 33258f8d61..1a544097b9 100644 --- a/OneMore/Properties/Resources.ar-SA.resx +++ b/OneMore/Properties/Resources.ar-SA.resx @@ -1210,16 +1210,16 @@ label - يجب أن تنطبق الصيغة المدخلة على الخلية المحددة الأولى. سيتم زيادة هذه الصيغة تلقائيًا للخلايا المحددة الإضافية. + تنطبق الصيغة على الخلية المحددة الأولى ويتم زيادة تلقائيًا للخلايا المحددة الإضافية. -الوظائف: abs، acos، asin، atan، atan2، متوسط، سقف، cos، cosh، countif، exp، Floor، log، log10، max، median، min، mode، pow، range، round،sign، sin، sinh، sqrt، stdev، مجموع، تان، تانه، الجذع، التباين +الوظائف: ABS ، ACOS ، ARCCOS ، Arcsin ، Arctan ، Asin ، Atan ، Atan2 ، MEBERT ، CEIL ، COSH ، COSH ، EXP ، LOGH ، LOG ، MAX ، MIN الجذر ، الجولة ، علامة ، الخطيئة ، sinh ، sqrt ، stdev ، sum ، tan ، tanh ، trunc ، truncate ، والتباين. -المشغلين: + - / * ^ -الرموز: PI، E -مرجع الخلية: A1، A2، ... ZZZ999 -نطاق الخلايا: A1:A22 -النطاق النسبي في عمود: A1:A-1 - +المشغلين: + - / * ^ ٪ +المتغيرات: E ، PHI ، PI ، TAO ، TableCols ، TableRows +مرجع الخلية: A1 ، A2 ، ... zzz999 +نطاق الخلية: A1: A22 +النطاقات النسبية: A1: Cell (0 ، -1) + !EDIT الخلايا المحددة: label diff --git a/OneMore/Properties/Resources.de-DE.resx b/OneMore/Properties/Resources.de-DE.resx index 2e4fd193d6..bda2174f8e 100644 --- a/OneMore/Properties/Resources.de-DE.resx +++ b/OneMore/Properties/Resources.de-DE.resx @@ -1180,16 +1180,16 @@ OneNote-Datei (*.one) label - Die eingegebene Formel sollte für die erste ausgewählte Zelle gelten. Diese Formel wird für weitere ausgewählte Zellen automatisch erhöht. + Die Formel gelten für die erste ausgewählte Zelle und wird für zusätzliche ausgewählte Zellen automatisch erhöht. -Funktionen: abs, acos, asin, atan, atan2, Durchschnitt, Decke, cos, cosh, countif, exp, floor, log, log10, max, median, min, mode, pow, range, rund, sign, sin, sinh, sqrt, stdev, sum, tan, tanh, trunc, Varianz +Funktionen: ABS, ACOS, ARCCOS, Arcsin, Arctan, Asin, Atan, ATAN2, Durchschnitt, CEIL, Decke, COSH, COSH, EXP, FODEN, LOG, LOG10, MAX, MEDIAN, MIN, MODE, POW, REM, REM, REM, REM, REM, REM, Wurzel, Runde, Zeichen, Sünde, Sinh, Sqrt, Stdev, Sum, Tan, Tanh, Trunc, Truncate und Varianz. -Operatoren: + - / * ^ -Symbole: PI, E -Zellreferenz: A1, A2, ... ZZZ999 -Zellbereich: A1:A22 -Relativer Bereich in einer Spalte: A1:A-1 - +Operatoren: + - / * ^ % +Variablen: E, PHI, PI, Tao, Tabellen, Tabllerows +Zellreferenz: A1, A2, ... Zzz999 +Zellbereich: A1: A22 +Verwandte Bereiche: A1: Zelle (0, -1) + !EDIT Ausgewählte Zellen: label diff --git a/OneMore/Properties/Resources.es-ES.resx b/OneMore/Properties/Resources.es-ES.resx index 10f3467f90..93cb3c73ff 100644 --- a/OneMore/Properties/Resources.es-ES.resx +++ b/OneMore/Properties/Resources.es-ES.resx @@ -1210,16 +1210,16 @@ Porcentaje label - La fórmula ingresada debe aplicarse a la primera celda seleccionada. Esta fórmula se incrementará automáticamente para las celdas seleccionadas adicionales. + La fórmula se aplica a la primera celda seleccionada y se incrementa automáticamente para celdas seleccionadas adicionales. -Funciones: abs, acos, asin, atan, atan2, promedio, techo, cos, cosh, countif, exp, piso, log, log10, max, mediana, min, modo, pow, rango, redondo, signo, sin, sinh, sqrt, stdev, suma, bronceado, tanh, trunc, variación +Funciones: ABS, ACOS, Arccos, Arcsin, Arctan, Asin, Atan, Atan2, promedio, techo, techo, cos, cosh, exp, piso, log, log10, max, mediano, mín, modo, rango, REM, REM, raíz, redonda, signo, pecado, sinh, sqrt, stdev, suma, bronceado, tanh, trunc, truncado y varianza. -Operadores: + - / * ^ -Símbolos: PI, E -Referencia de celda: A1, A2, ... ZZZ999 -Rango de celdas: A1:A22 -Rango relativo en una columna: A1:A-1 - +Operadores: + - / * ^ % +Variables: E, Phi, PI, Tao, TableCols, Tablerows +Referencia celular: A1, A2, ... ZZZ999 +Rango de células: A1: A22 +Rangos relativos: A1: Cell (0, -1) + !EDIT Celdas seleccionadas: label diff --git a/OneMore/Properties/Resources.fr-FR.resx b/OneMore/Properties/Resources.fr-FR.resx index 404224c14b..aee2e172b9 100644 --- a/OneMore/Properties/Resources.fr-FR.resx +++ b/OneMore/Properties/Resources.fr-FR.resx @@ -1210,16 +1210,16 @@ Pourcentage label - La formule saisie doit s'appliquer à la première cellule sélectionnée. Cette formule sera incrémentée automatiquement pour les cellules supplémentaires sélectionnées. + La formule s'applique à la première cellule sélectionnée et est incrémentée automatiquement pour des cellules sélectionnées supplémentaires. -Fonctions : abs, acos, asin, atan, atan2, moyenne, plafond, cos, cosh, countif, exp, floor, log, log10, max, median, min, mode, pow, range, round, sign, sin, sinh, sqrt, stdev, somme, tan, tanh, trunc, variance +Fonctions: ABS, ACOS, ARCCOS, ARCSIN, ARCTAN, ASIN, ATAN, ATAN2, Moyenne, CEIL, Plafond, Cos, Cosh, Exp, Floor, Log, Log10, Max, Median, Min, Mode, Pow, Remar, REM, racine, ronde, signe, péché, sinh, sqrt, stdev, sum, tan, tanh, trunc, truncate et variance. -Opérateurs : + - / * ^ -Symboles : PI, E -Référence cellule : A1, A2, ... ZZZ999 -Plage de cellules : A1 : A22 -Plage relative dans une colonne : A1:A-1 - +Opérateurs: + - / * ^% +Variables: E, Phi, Pi, Tao, Tablecols, Tablerows +Référence cellulaire: A1, A2, ... ZZZ999 +Plage cellulaire: A1: A22 +Plages relatives: a1: cellule (0, -1) + !EDIT Cellules sélectionnées: label diff --git a/OneMore/Properties/Resources.he-IL.resx b/OneMore/Properties/Resources.he-IL.resx index 5da3fda6fc..d7e8dcef63 100644 --- a/OneMore/Properties/Resources.he-IL.resx +++ b/OneMore/Properties/Resources.he-IL.resx @@ -1211,16 +1211,16 @@ Total Row Font label - הנוסחה שהוזנה צריכה לחול על התא שנבחר הראשון. נוסחה זו תוגדל אוטומטית עבור תאים נוספים שנבחרו. + הנוסחה חלה על התא שנבחר הראשון ומוגדלים באופן אוטומטי עבור תאים שנבחרו נוספים. -פונקציות: abs, acos, asin, atan, atan2, ממוצע, תקרה, cos, cosh, countif, exp, floor, log, log10, max, mediaan, min, mode, pow, range, round, round, sign, sin, sinh, sqrt, stdev, sum, tan, tanh, trunc, variance +פונקציות: ABS, ACOs, Arccos, Arcsin, Arctan, Asin, Atan, Atan2, הממוצע, התקרה, התקרה, COS, Cosh, Exp, Floor, Log, Log10, Max, Median, Min, Mode, Pow, REM, REM, שורש, עגול, סימן, חטא, sinh, sqrt, stdev, sum, tan, tanh, trunc, truncate ושונות. -אופרטורים: + - / * ^ -סמלים: PI, E -הפניה לתא: A1, A2, ... ZZZ999 -טווח תאים: A1:A22 -טווח יחסי בעמודה: A1:A-1 - +מפעילים: + - / * ^ % +משתנים: E, Phi, Pi, Tao, Tablecols, טבלאות +הפניה לתאים: A1, A2, ... ZZZ999 +טווח תאים: A1: A22 +טווחים יחסית: A1: תא (0, -1) + !EDIT תאים שנבחרו: label diff --git a/OneMore/Properties/Resources.ja-JP.resx b/OneMore/Properties/Resources.ja-JP.resx index 585a58ba10..1127977351 100644 --- a/OneMore/Properties/Resources.ja-JP.resx +++ b/OneMore/Properties/Resources.ja-JP.resx @@ -1213,16 +1213,16 @@ OneNoteファイル (*.one) label - 入力された数式は最初に選択されたセルに適用されます。この数式は追加の選択されたセルに対して自動的に増分されます。 + フォーミュラは、最初に選択されたセルに適用され、追加の選択されたセルのために自動的に増加します。 -関数: abs, acos, asin, atan, atan2, average, ceiling, cos, cosh, countif, exp, floor, log, log10, max, median, min, mode, pow, range, round, sign, sin, sinh, sqrt, stdev, sum, tan, tanh, trunc, variance +関数：ABS、ACOS、ARCCOS、ARCSIN、ARCTAN、ASIN、ATAN、ATAN2、平均、天井、COS、COSH、EXP、床、ログ、ログ、最大、中央値、MIN、モード、POW、範囲、REM、 ルート、ラウンド、サイン、罪、sinh、sqrt、stdev、sum、tan、tanh、trunc、truncate、and分散。 -演算子: + - / * ^ -記号: PI, E -セル参照: A1, A2, ... ZZZ999 -セル範囲: A1:A22 -列内の相対範囲: A1:A-1 - +オペレーター： + - / * ^％ +変数：E、PHI、PI、TAO、テーブルコール、テーブル +セル参照：A1、A2、... ZZZ999 +セル範囲：A1：A22 +相対範囲：A1：セル（0、-1） + !EDIT 選択されたセル: label diff --git a/OneMore/Properties/Resources.nl-NL.resx b/OneMore/Properties/Resources.nl-NL.resx index 017fd28b4d..7da3f8fabb 100644 --- a/OneMore/Properties/Resources.nl-NL.resx +++ b/OneMore/Properties/Resources.nl-NL.resx @@ -1211,16 +1211,16 @@ Percentage label - De ingevoerde formule moet van toepassing zijn op de eerste geselecteerde cel. Deze formule wordt automatisch verhoogd voor extra geselecteerde cellen. + Formule is van toepassing op de eerste geselecteerde cel en worden automatisch verhoogd voor extra geselecteerde cellen. -Functies: abs, acos, asin, atan, atan2, gemiddeld, plafond, cos, cosh, countif, exp, floor, log, log10, max, mediaan, min, mode, pow, bereik, rond, teken, sin, sinh, sqrt, stdev, som, tan, tanh, trunc, variantie +Functies: ABS, ACOS, Arccos, Arcsin, Arctan, Asin, Atan, Atan2, gemiddeld, plafond, plafond, cos, cosh, exp, vloer, log, log10, max, mediaan, min, mode, pow, bereik, rem, Wortel, rond, teken, zonde, sinh, sqrt, stdev, som, tan, tanh, trunc, afknekking en variantie. -Operatoren: + - / * ^ -Symbolen: PI, E +Operators: + - / * ^ % +Variabelen: E, PHI, PI, Tao, Tablecols, Tablerows Celreferentie: A1, A2, ... ZZZ999 -Celbereik: A1:A22 -Relatief bereik in een kolom: A1:A-1 - +Celbereik: A1: A22 +Relatieve bereiken: A1: Cell (0, -1) + !EDIT Geselecteerde cellen: label diff --git a/OneMore/Properties/Resources.pl-PL.resx b/OneMore/Properties/Resources.pl-PL.resx index fd993b4ca2..9559ae4c93 100644 --- a/OneMore/Properties/Resources.pl-PL.resx +++ b/OneMore/Properties/Resources.pl-PL.resx @@ -1211,16 +1211,16 @@ Odsetek label - Wprowadzona formuła powinna dotyczyć pierwszej zaznaczonej komórki. Ta formuła będzie zwiększana automatycznie dla dodatkowych wybranych komórek. + Wzór dotyczy pierwszej wybranej komórki i są automatycznie zwiększane dla dodatkowych wybranych komórek. -Funkcje: abs, acos, asin, atan, atan2, średnia, sufit, cos, cosh, countif, exp, podłoga, log, log10, max, mediana, min, tryb, pow, zakres, okrągły, znak, grzech, sinh, sqrt, stdev, suma, tan, tanh, trunc, wariancja +Funkcje: ABS, ACOS, ARCCOS, Arcsin, Arctan, Asin, Atan, Atan2, średnia, suil, sufit, cos, cosh, exp, floor, log10, max, mediana, min, tryb, pow, rem, rem, root, okrągły, znak, sin, sinh, sqrt, stdev, sum, tan, tanh, trunc, obcięcie i wariancja. -Operatory: + - / * ^ -Symbole: PI, E +Operatorzy: + - / * ^ % +Zmienne: E, Phi, PI, Tao, TableCole, tablerowe Odniesienie do komórki: A1, A2, ... ZZZ999 -Zakres komórek: A1:A22 -Względny zakres w kolumnie: A1:A-1 - +Zakres komórek: A1: A22 +Zakresy względne: A1: komórka (0, -1) + !EDIT Wybrane komórki: label diff --git a/OneMore/Properties/Resources.pt-BR.resx b/OneMore/Properties/Resources.pt-BR.resx index 2da00806b5..15cb70be9a 100644 --- a/OneMore/Properties/Resources.pt-BR.resx +++ b/OneMore/Properties/Resources.pt-BR.resx @@ -1211,16 +1211,16 @@ Percentagem label - A fórmula inserida deve ser aplicada à primeira célula selecionada. Esta fórmula será incrementada automaticamente para células adicionais selecionadas. + A fórmula se aplica à primeira célula selecionada e é incrementada automaticamente para células selecionadas adicionais. -Funções: abs, acos, asin, atan, atan2, média, teto, cos, cosh, countif, exp, floor, log, log10, max, mediana, min, mode, pow, range, round, sign, sin, sinh, sqrt, stdev, soma, tan, tanh, trunc, variância +Funções: ABS, ACOS, ArcCos, Arcsin, Arctan, Asin, Atan, Atan2, Média, teto, teto, cosh, exp, piso, log10, max, mediana, min, modo, pow, alcance, rem, Raiz, redonda, sinal, pecado, sinh, sqrt, stdev, soma, tan, Tanh, trunc, truncado e variação. -Operadores: + - / * ^ -Símbolos: PI, E -Referência de célula: A1, A2, ... ZZZ999 -Intervalo de células: A1:A22 -Intervalo relativo em uma coluna: A1:A-1 - +Operadores: + - / * ^ % +Variáveis: E, Phi, Pi, Tao, Tabels, Tablerows +Referência de células: A1, A2, ... ZZZ999 +Faixa de células: A1: A22 +Intervalos relativos: a1: célula (0, -1) + !EDIT Células selecionadas: label diff --git a/OneMore/Properties/Resources.resx b/OneMore/Properties/Resources.resx index 59523ffb18..1d08124766 100644 --- a/OneMore/Properties/Resources.resx +++ b/OneMore/Properties/Resources.resx @@ -117,7 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - OneMore Add-in smoker dialog title bar @@ -1211,15 +1210,15 @@ Percentage label - Entered formula should apply to the first selected cell. This formula will be incremented automatically for additional selected cells. + Formula apply to the first selected cell and are incremented automatically for additional selected cells. -Functions: abs, acos, asin, atan, atan2, average, ceiling, cos, cosh, countif, exp, floor, log, log10, max, median, min, mode, pow, range, round, sign, sin, sinh, sqrt, stdev, sum, tan, tanh, trunc, variance +Functions: abs, acos, arccos, arcsin, arctan, asin, atan, atan2, average, ceil, ceiling, cos, cosh, exp, floor, log, log10, max, median, min, mode, pow, range, rem, root, round, sign, sin, sinh, sqrt, stdev, sum, tan, tanh, trunc, truncate, and variance. -Operators: + - / * ^ -Symbols: PI, E +Operators: + - / * ^ % +Variables: e, phi, pi, tao, tablecols, tablerows Cell reference: A1, A2, ... ZZZ999 Cell range: A1:A22 -Relative range in a column: A1:A-1 +Relative ranges: A1:cell(0,-1) Selected cells: @@ -5335,6 +5334,7 @@ The Find Hashtags dialog will now open. Word Counts page title + ..\Commands\Tools\sponsor-dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/OneMore/Properties/Resources.zh-CN.resx b/OneMore/Properties/Resources.zh-CN.resx index 216622d464..9b2f43cf54 100644 --- a/OneMore/Properties/Resources.zh-CN.resx +++ b/OneMore/Properties/Resources.zh-CN.resx @@ -1209,16 +1209,16 @@ OneNote 文件 (*.one) label - 输入的公式应应用于第一个选定的单元格。对于其他选定的单元格，此公式将自动递增。 + 公式适用于第一个选定的单元，并自动为其他选定的单元增量。 -函数：abs、acos、asin、atan、atan2、平均值、天花板、cos、cosh、countif、exp、floor、log、log10、max、median、min、mode、pow、range、round、sign、sin、sinh、 sqrt、stdev、总和、tan、tanh、trunc、方差 +函数：ABS，ACOS，ARCCOS，ARCSIN，ARCTAN，ASIN，ATAN，ATAN2，平均，天花板，天花板，COS，COSH，COSH，EXP，FLOOR，LOG10，LOG10，MAX，MAX，中位数，最低，最小，模式，模式，POW，POW，REM，REM， 根，圆形，符号，罪，sinh，sqrt，stdev，sum，tan，tanh，tanh，dunc，截断和方差。 -运算符：+ - / * ^ -符号：PI、E -单元格参考号：A1、A2、...ZZZ999 -单元格范围：A1:A22 -列中的相对范围：A1:A-1 - +操作员： + - / * ^％ +变量：E，Phi，Pi，Tao，Tablecols，Tablerows +细胞参考：A1，A2，... ZZZ999 +细胞范围：A1：A22 +相对范围：A1：单元格（0，-1） + !EDIT 选定的单元格： label diff --git a/OneMoreCalendar/OneMoreCalendar.csproj b/OneMoreCalendar/OneMoreCalendar.csproj index 929a2c3b4e..e50e3ff37b 100644 --- a/OneMoreCalendar/OneMoreCalendar.csproj +++ b/OneMoreCalendar/OneMoreCalendar.csproj @@ -182,12 +182,6 @@ - - - {d874e185-08fe-48c5-bade-0fe84060c978} - OneMore - - diff --git a/OneMoreCalendar/Properties/AssemblyInfo.cs b/OneMoreCalendar/Properties/AssemblyInfo.cs index 1c139d985d..a838aa5e69 100644 --- a/OneMoreCalendar/Properties/AssemblyInfo.cs +++ b/OneMoreCalendar/Properties/AssemblyInfo.cs @@ -27,6 +27,6 @@ namespace OneMoreCalendar { internal static class AssemblyInfo { - public const string Version = "6.5.1"; + public const string Version = "6.5.2"; } } diff --git a/OneMoreProtocolHandler/Properties/AssemblyInfo.cs b/OneMoreProtocolHandler/Properties/AssemblyInfo.cs index befdcccf8c..48be9f6dfe 100644 --- a/OneMoreProtocolHandler/Properties/AssemblyInfo.cs +++ b/OneMoreProtocolHandler/Properties/AssemblyInfo.cs @@ -23,6 +23,6 @@ namespace OneMoreProtocolHandler { internal static class AssemblyInfo { - public const string Version = "6.5.1"; + public const string Version = "6.5.2"; } } diff --git a/OneMoreSetup/OneMoreSetup.vdproj b/OneMoreSetup/OneMoreSetup.vdproj index aa6ae1b52f..6bcbedf394 100644 --- a/OneMoreSetup/OneMoreSetup.vdproj +++ b/OneMoreSetup/OneMoreSetup.vdproj @@ -11011,15 +11011,15 @@ { "Name" = "8:OneMoreAddIn" "ProductName" = "8:OneMoreAddIn" - "ProductCode" = "8:{A78FBB92-2718-40A9-B1D2-54CD73F3B036}" - "PackageCode" = "8:{CD651B6F-0888-44E7-AD1E-254A1627E0CE}" + "ProductCode" = "8:{5484DC58-86DC-43E4-9A58-EC37D9B1EE3B}" + "PackageCode" = "8:{8CCB40C4-2CA3-4FB4-8327-0D101F1DE5EF}" "UpgradeCode" = "8:{058F6D04-E0D0-4984-B6B7-7FE0C581680E}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:6.5.1" + "ProductVersion" = "8:6.5.2" "Manufacturer" = "8:River" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:https://github.com/stevencohn/OneMore" diff --git a/OneMoreSetupActions/Properties/AssemblyInfo.cs b/OneMoreSetupActions/Properties/AssemblyInfo.cs index 81842bf029..e75984f351 100644 --- a/OneMoreSetupActions/Properties/AssemblyInfo.cs +++ b/OneMoreSetupActions/Properties/AssemblyInfo.cs @@ -23,6 +23,6 @@ namespace OneMoreSetupActions { internal static class AssemblyInfo { - public const string Version = "6.5.1"; + public const string Version = "6.5.2"; } } diff --git a/OneMoreTray/OneMoreTray.csproj b/OneMoreTray/OneMoreTray.csproj index f3cc28892d..1a3a234930 100644 --- a/OneMoreTray/OneMoreTray.csproj +++ b/OneMoreTray/OneMoreTray.csproj @@ -111,12 +111,6 @@ - - - {d874e185-08fe-48c5-bade-0fe84060c978} - OneMore - - diff --git a/OneMoreTray/Properties/AssemblyInfo.cs b/OneMoreTray/Properties/AssemblyInfo.cs index e4a7038378..f2dabf15a1 100644 --- a/OneMoreTray/Properties/AssemblyInfo.cs +++ b/OneMoreTray/Properties/AssemblyInfo.cs @@ -27,6 +27,6 @@ namespace OneMoreService { internal static class AssemblyInfo { - public const string Version = "6.5.1"; + public const string Version = "6.5.2"; } }