From ac13ba1f72c792fd42145997bc656118ca00ae7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sat, 18 Mar 2023 18:04:32 +0000 Subject: [PATCH 01/15] App strings reworked --- app/src/main/res/values/strings.xml | 155 ++++++++++++++-------------- 1 file changed, 78 insertions(+), 77 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 83f09cc5..8efef05d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,12 +1,12 @@ LibreSudoku - Statistics + Stats Home More New game Game in progress - You have an unfinished game, do you really want to start a new one? + End unfinished game to start a new one? Start new Cancel Yes @@ -40,40 +40,40 @@ Cell first Value first Clear all statistics - This action will delete all your statistics, saved games and records. It can\'t be undone + Deletes stats, saved games and records permanetly. Deleted - App theme + Theme Dynamic Green Peach Yellow Lavender Black and white - Pure black dark theme + Black Gameplay - Mistakes limit + Mistake limit 3 mistakes and you\'re done - Disable hints - Don\'t like hints? Just remove them! + No hints + Turns off helpful hints Show timer Reset the timer on game reset Assistance - Mistakes checking + Mistake checking Off - Rules violations + Rule violations With final solution Highlight identical values Selection of a value on the board highlights cells with the same value Remaining uses The number of remaining uses of a value is displayed on the keyboard - Position lines + Positional lines The row and column of the selected cell are highlighted Auto erase notes Other Keep screen awake - Reset all tip cards - Tip cards was reset! - App language + Reset all tips + Tips reset + Language Default Version Project on GitHub @@ -88,46 +88,46 @@ Show mine Welcome A classic sudoku looks as follows - The goal of the game is to fill all the cells with numbers from 1 to 9. So that the values do not repeat in any column, row or smaller box (3x3) - We recommend that you have a look at the settings tab so that you can customize the application for your needs + Use 1–9 to fill all cells—without repetition in any column, row or smaller (3x3) box. + Go through the settings to adjust the game Start Undo. Just undo Activates the note mode (pencil marks) - Inserts the correct value in the selected cell. Can be disabled in settings - Removes a value or all notes from the selected cell + Solves the selected cell. Can be turned off in settings + Removes a number or all notes from the selected cell Quick tour Got it Exit Stay - Mistakes %1$d/%2$d - Want to reset the current puzzle? - Do you want to give up? If you give up, you will be able to see the final solution + %1$d/%2$d mistakes + Reset the current puzzle? + Give up to know the final solution Game completed - You have completed the game. You can stay or return to the main menu + Stay or return to the main menu. Game over You have made 3 mistakes Generating… Solving… - Statistics + Stats Games started Games completed Win rate Win streak - Current streak - Best streak + Current + Streak %1$d best games Games Time Delete? - Do you want to delete the #%1$d record? It can\'t be undone + Delete the #%1$d record permanently? All Average time Best time %1$d%% - A win streak will be reset if you lose (reach the mistakes limit), give up, or start a new game without finishing the previous one, so be careful + A loss (reaching the mistake limit), giving up, or leaving a game resets the win streak. List of records - This list contains up to 5 of your best records. You can delete a record that you don\'t like with a long press on the entry - You have no records yet + Your 5 of your best records. Long-press to remove entries. + No records yet History You haven\'t played yet Time: %1$s @@ -138,65 +138,65 @@ Initial Progress %1$d/%2$d Progress %1$d%% - Oops, something went wrong… + Something went wrong… Difficulty: %1$s Type: %1$s Time: %1$s - The game was completed - The game was not completed, you gave up + Game completed. + Uncompleted game. You gave up. In progress - The game has not been completed, you have exceeded the mistakes limit + Uncompleted game. Mistake limit exceeded. Learn Sudoku App Toolbar A panel under the keyboard - You can press and hold the Notes button to open the Notes menu, where you can clear or compute notes and toggle their visibility - Sudoku rules - There is a mistake here, can you spot it? Maybe even two + Press and hold the \"Notes\" button to compute clear, or hide/show notes. + Rules + Spot the mistake(s) here Highlight mistakes - The first mistake is two 2s in the sixth box. Remember the rule that there can\'t be double values in a box? The second mistake is the number 6 in row 2, column 8 (R2C8), because there is already a 6 in that column in R5C8 + There can not be two 2s in the sixth box, as that repeats values in a (3x3) box? 6 can not be in row two, column eight (R2C8), as it is in that column (R5C8) already. Naked pairs - There are two cells that share the same two pencil marks. Right now, we can\'t tell which one is the 2 and which one is the 3.\nBut since the Sudoku rules tell us that each box can have only one "2" and only one "3", we can assume that one of them is the 2 and the other is the 3 - Now, this wouldn\'t help us if there weren\'t any other "2" or "3" pencil marks in that box. But since there are, we can remove them! The other cells in the box cannot be 2 or 3 + Two cells share the same two pencil marks. Knowing values in boxen (3x3) must be unique, one must be 2 and the other 3. + This helps remove any pencil marks indicating 2 or 3 elsewhere in the (3x3) box. Basic - Let\'s select box number 7. There are already four cells filled - Now let\'s take a look at the number 8. The number 8 in row 4, column 3 (R4C3) blocks the entire column in our box. So the number 8 can\'t stand there - Also, the number 8 in R7C5 blocks the entire row in our box - And we are left with only one cell in which the number 8 can stand - The same logic applies to rows and columns. Look at the first row. The number 4 in R7C3 blocks the third column in our row. The number 4 in R3C5 blocks two columns at once (4 and 6), because there can be no other fours in the same box. R6C7 blocks column 7 - As a result, we are left with only one cell that can contain the number 4. This is cell R1C3 + Selecting box seven, one finds it has four cells pre-filled + 8 in row four, column three (R4C3) blocks the entire column in our (3x3) box, sp 8 must go elsewhere. + 8 (in R7C5) blocks the entire row in our box + Thus, only one cell can hold 8 + Rows and columns work the same way. 4 in the first row (R7C3) blocks the third column in the row. 4 (R3C5) blocks two columns at once (four and six), as no other fours can fit in the same box. R6C7 blocks column seven. + Thus, only one cell (R1C3) can be 4. Hidden pairs - Hidden pairs are almost the same as naked pairs, the only difference being that they are hidden among the others. These two cells have something in common, they can hold the numbers 6 and 9, and these are the only two squares here where they can stand on - You can conclude that these two cells contain only these two numbers and not the others. So you can remove unnecessary markers from these cells. As with naked pairs, this works the same way with columns and rows + Hidden pairs are almost the same as naked ones, but are hidden among the others. These two cells have something in common, they can hold 6 and 9, and these are the only two squares here where they can stand on + Thus, these two cells contain only these two numbers and not the others. Unnecessary markers can be removed from these cells. As with naked pairs, the same applies to columns and rows. Previous Next -- - Open Source Licenses + Libre Licenses Can continue - Custom sudoku - Create a sudoku + Custom + Create new Set from a string OK Save - Enter a puzzle in string form. Empty cells are indicated by a "." or a "0" + Enter a puzzle in string form. Empty cells are indicated by a \".\" or a \"0\". Puzzle Incorrect puzzle - This puzzle has more than one solution. The correct sudoku puzzle must have a unique solution - This puzzle has no solutions + More than one solution. Proper sudokus must have a unique solution. + No solutions Set - You haven\'t added any sudokus yet + No sudokus adde yet. Delete selected - Are you sure you want to delete the selected sudokus? This action cannot be undone + Delete the selected sudokus permanently? Not started - Select text from the text field or simply click the copy button + Select text from the text field, or click the \"Copy\" button. Export as string Copy Copied Error All Completed - In progress + Underway Not started Ascending Descending @@ -228,44 +228,45 @@ Export Folder name Import - Folder named %1$s will be deleted + The \"%1$s\" folder will be deleted Help - Here you can manage your folder and import sudoku from a file - The following file types are supported:\n.sdm (or .txt with the same structure)\n.opensudoku\n.1gsudoku - Failed to import + Manage your folder and import sudokus from a file here. + Supported filetypes:\n.sdm (or .txt with the same structure)\n.opensudoku\n.1gsudoku + Could not import sudoku From a file - Saving + Saving… Save Edit - This folder is empty + + Empty folder Delete selected Add sudoku Edit sudoku - Are you sure you want to delete %1$d game? - Are you sure you want to delete %1$d games? - Are you sure you want to delete %1$d games? - Are you sure you want to delete %1$d games - Are you sure you want to delete %1$d games? + Delete %1$d game? + Delete %1$d games? + Delete %1$d games? + Delete %1$d games + Delete %1$d games? Game #%1$d Add to folder Create new Import from a file - Recently played games + Recently played Apply accent colors - Make your sudoku board more colorful - Sudoku board theme + Colorize your sudoku + Board theme Customize the look of the sudoku board Board theme Move selected - Select the folder to which you want to move the selected games - Highlight some boxes on the board + Select a folder to move the selected games to + Highlight some boxen on the board Cross highlight - Oops, LibreSudoku just crashed. Do you want to send a crash report to the developers? + LibreSudoku crashed. Send a report to the developers? Crash reporting - Help us fix bugs. App doesn\'t send logs by itself, you will be prompted to send a crash report by email + Help us fix bugs. No logs leave the device unless sent by e-mail. Function panel over the values - Place the function panel above the values keyboard + Place the function panel above the value keyboard Date format - \ No newline at end of file + From 8def53f6d674d2a006628f3001addb870a28edc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sun, 19 Mar 2023 22:04:50 +0000 Subject: [PATCH 02/15] Corrections and improvements --- app/src/main/res/values/strings.xml | 72 ++++++++++++++--------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8efef05d..717a1eb1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,17 +6,17 @@ More New game Game in progress - End unfinished game to start a new one? + Postpone this game and start a new one? Start new Cancel Yes - Play + Start Continue Delete Unspecified Simple Easy - Moderate + Medium Hard Challenge Custom @@ -39,8 +39,8 @@ Input method Cell first Value first - Clear all statistics - Deletes stats, saved games and records permanetly. + Delete all activity? + Removes stats, saved games and records permanetly. Deleted Theme Dynamic @@ -49,7 +49,7 @@ Yellow Lavender Black and white - Black + Black theme Gameplay Mistake limit 3 mistakes and you\'re done @@ -63,12 +63,12 @@ Rule violations With final solution Highlight identical values - Selection of a value on the board highlights cells with the same value + Selection of a value on the board highlights cells with the same value. Remaining uses - The number of remaining uses of a value is displayed on the keyboard + The number of each unplaced value is displayed on the keyboard. Positional lines The row and column of the selected cell are highlighted - Auto erase notes + Auto-erase notes Other Keep screen awake Reset all tips @@ -76,7 +76,7 @@ Language Default Version - Project on GitHub + Source code Give up Reset the game Yes @@ -87,25 +87,25 @@ Show solution Show mine Welcome - A classic sudoku looks as follows - Use 1–9 to fill all cells—without repetition in any column, row or smaller (3x3) box. - Go through the settings to adjust the game + A classic sudoku + Fill cells using 1–9 without repetition in any column, row, or smaller (3x3) box. + Adjust the settings to your liking. Start - Undo. Just undo - Activates the note mode (pencil marks) - Solves the selected cell. Can be turned off in settings - Removes a number or all notes from the selected cell + Undo. Just undo. + Note mode (pencil marks) + Solves the selected cell. (Can be turned off.) + Clears a placed value or notes from a cell. Quick tour - Got it + OK Exit Stay %1$d/%2$d mistakes - Reset the current puzzle? + Reset this sudoku? Give up to know the final solution Game completed Stay or return to the main menu. Game over - You have made 3 mistakes + You have made three mistakes Generating… Solving… Stats @@ -132,7 +132,7 @@ You haven\'t played yet Time: %1$s Game ID: %1$d - You can continue this game + Can be continued Game #%1$d Current Initial @@ -168,7 +168,7 @@ Thus, only one cell (R1C3) can be 4. Hidden pairs Hidden pairs are almost the same as naked ones, but are hidden among the others. These two cells have something in common, they can hold 6 and 9, and these are the only two squares here where they can stand on - Thus, these two cells contain only these two numbers and not the others. Unnecessary markers can be removed from these cells. As with naked pairs, the same applies to columns and rows. + Thus, these two cells contain only these two values and not the others. Unnecessary markers can be removed from these cells. As with naked pairs, the same applies to columns and rows. Previous Next -- @@ -179,9 +179,9 @@ Set from a string OK Save - Enter a puzzle in string form. Empty cells are indicated by a \".\" or a \"0\". - Puzzle - Incorrect puzzle + Enter a sudoku in string form. Empty cells are indicated by a \".\" or a \"0\". + Sudoku + Incorrect sudoku More than one solution. Proper sudokus must have a unique solution. No solutions Set @@ -204,25 +204,25 @@ ID Sort Filter - Help translate + Translation Folders Create a folder Delete a folder Folder: %1$s - %1$d puzzle to import - %1$d puzzles to import - %1$d puzzles to import - %1$d puzzles to import - %1$d puzzles to import + %1$d sudoku to import + %1$d sudokus to import + %1$d sudokus to import + %1$d sudokus to import + %1$d sudokus to import Empty - %1$d puzzle - %1$d puzzles - %1$d puzzles - %1$d puzzles - %1$d puzzles + %1$d sudoku + %1$d sudokus + %1$d sudokus + %1$d sudokus + %1$d sudokus Edit name Export From 00f3d2f4dd5aa13ed8f033b39521192fad84560c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sun, 19 Mar 2023 22:08:09 +0000 Subject: [PATCH 03/15] Spelling: "added", removed ending dot --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 717a1eb1..d97ad707 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -185,7 +185,7 @@ More than one solution. Proper sudokus must have a unique solution. No solutions Set - No sudokus adde yet. + No sudokus added yet Delete selected Delete the selected sudokus permanently? Not started From 44e93f1fd843c21fc549aff3175368bb38c58203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sun, 19 Mar 2023 22:14:00 +0000 Subject: [PATCH 04/15] boxes --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d97ad707..d47e5e14 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -261,7 +261,7 @@ Board theme Move selected Select a folder to move the selected games to - Highlight some boxen on the board + Highlight some boxes on the board Cross highlight LibreSudoku crashed. Send a report to the developers? Crash reporting From ace61cbbc7714c397d2e0ffba8b7ae8d3a4ab031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sun, 19 Mar 2023 22:33:56 +0000 Subject: [PATCH 05/15] Small fixes --- app/src/main/res/values/strings.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d47e5e14..301fb24c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -142,25 +142,25 @@ Difficulty: %1$s Type: %1$s Time: %1$s - Game completed. - Uncompleted game. You gave up. + Completed + You have given up. In progress - Uncompleted game. Mistake limit exceeded. + Mistake-limit exceeded. Learn Sudoku App Toolbar A panel under the keyboard - Press and hold the \"Notes\" button to compute clear, or hide/show notes. + Press and hold the \"Notes\" button to compute, clear, or hide/show notes. Rules Spot the mistake(s) here Highlight mistakes - There can not be two 2s in the sixth box, as that repeats values in a (3x3) box? 6 can not be in row two, column eight (R2C8), as it is in that column (R5C8) already. + 2 can not be repeated within a (3x3) box? There can only be one 6 in each row. Naked pairs Two cells share the same two pencil marks. Knowing values in boxen (3x3) must be unique, one must be 2 and the other 3. - This helps remove any pencil marks indicating 2 or 3 elsewhere in the (3x3) box. + This helps remove any pencil-marked 2 or 3\'s elsewhere in the (3x3) box. Basic - Selecting box seven, one finds it has four cells pre-filled + Selecting the seventh box, one finds it has four cells pre-filled 8 in row four, column three (R4C3) blocks the entire column in our (3x3) box, sp 8 must go elsewhere. 8 (in R7C5) blocks the entire row in our box Thus, only one cell can hold 8 From 19cbcb8bbc2c20f632cc1841125b3fa75022f189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sun, 19 Mar 2023 22:53:16 +0000 Subject: [PATCH 06/15] Basic instructions --- app/src/main/res/values/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 301fb24c..f0b317b4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -157,15 +157,15 @@ Highlight mistakes 2 can not be repeated within a (3x3) box? There can only be one 6 in each row. Naked pairs - Two cells share the same two pencil marks. Knowing values in boxen (3x3) must be unique, one must be 2 and the other 3. + Two cells share the same two pencil-marked values. Knowing values in each (3x3) box must be unique, one must be 2 and the other 3. This helps remove any pencil-marked 2 or 3\'s elsewhere in the (3x3) box. Basic Selecting the seventh box, one finds it has four cells pre-filled - 8 in row four, column three (R4C3) blocks the entire column in our (3x3) box, sp 8 must go elsewhere. + 8 in row four, column three blocks the entire column in our (3x3) box, so 8 must go elsewhere. 8 (in R7C5) blocks the entire row in our box - Thus, only one cell can hold 8 - Rows and columns work the same way. 4 in the first row (R7C3) blocks the third column in the row. 4 (R3C5) blocks two columns at once (four and six), as no other fours can fit in the same box. R6C7 blocks column seven. - Thus, only one cell (R1C3) can be 4. + Thus, only one cell can hold 8. + Rows (and columns) work the same way. 4 is already used in two columns, and also in also found within the same (second) box for row one. + Thus, only one cell can be 4. Hidden pairs Hidden pairs are almost the same as naked ones, but are hidden among the others. These two cells have something in common, they can hold 6 and 9, and these are the only two squares here where they can stand on Thus, these two cells contain only these two values and not the others. Unnecessary markers can be removed from these cells. As with naked pairs, the same applies to columns and rows. From bfa60d379ab9bffd10ca9ba173fe05b17f142baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 20 Mar 2023 17:04:30 +0000 Subject: [PATCH 07/15] Reworked --- app/src/main/res/values/strings.xml | 58 ++++++++++++++--------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f0b317b4..2479294a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,7 +6,7 @@ More New game Game in progress - Postpone this game and start a new one? + Pause this game and start a new one? Start new Cancel Yes @@ -39,8 +39,8 @@ Input method Cell first Value first - Delete all activity? - Removes stats, saved games and records permanetly. + Delete all activity + Deletes stats, saved games and records permanently. Deleted Theme Dynamic @@ -62,12 +62,12 @@ Off Rule violations With final solution - Highlight identical values + Highlight repeated values Selection of a value on the board highlights cells with the same value. Remaining uses - The number of each unplaced value is displayed on the keyboard. + The number of remaining uses of a value is displayed on the keyboard Positional lines - The row and column of the selected cell are highlighted + The row and column of the selected cell are highlighted. Auto-erase notes Other Keep screen awake @@ -88,13 +88,13 @@ Show mine Welcome A classic sudoku - Fill cells using 1–9 without repetition in any column, row, or smaller (3x3) box. - Adjust the settings to your liking. + Fill cells using 1–9 without repetition in any column, row, or smaller (3x3) box. + Adjust settings to your liking. Start - Undo. Just undo. + Undo Note mode (pencil marks) - Solves the selected cell. (Can be turned off.) - Clears a placed value or notes from a cell. + Solves selected cell + Clears selected cell Quick tour OK Exit @@ -118,7 +118,7 @@ %1$d best games Games Time - Delete? + Delete record Delete the #%1$d record permanently? All Average time @@ -126,7 +126,7 @@ %1$d%% A loss (reaching the mistake limit), giving up, or leaving a game resets the win streak. List of records - Your 5 of your best records. Long-press to remove entries. + Your 5 top records. Long-press to remove entries. No records yet History You haven\'t played yet @@ -151,24 +151,24 @@ App Toolbar A panel under the keyboard - Press and hold the \"Notes\" button to compute, clear, or hide/show notes. + Press and hold the \"Notes\" to compute, clear, or hide/show notes. Rules Spot the mistake(s) here Highlight mistakes - 2 can not be repeated within a (3x3) box? There can only be one 6 in each row. + 2 can not be repeated within a (3x3) box? There can only be one 6 in each row. Naked pairs - Two cells share the same two pencil-marked values. Knowing values in each (3x3) box must be unique, one must be 2 and the other 3. - This helps remove any pencil-marked 2 or 3\'s elsewhere in the (3x3) box. + Two cells share the same two pencil-marked values. Knowing values in each (3x3) box must be unique, one must be 2 and the other 3. + This helps remove any pencil-marked 2 or 3\'s elsewhere in the (3x3) box. Basic Selecting the seventh box, one finds it has four cells pre-filled - 8 in row four, column three blocks the entire column in our (3x3) box, so 8 must go elsewhere. - 8 (in R7C5) blocks the entire row in our box - Thus, only one cell can hold 8. - Rows (and columns) work the same way. 4 is already used in two columns, and also in also found within the same (second) box for row one. - Thus, only one cell can be 4. + 8 in row four, column three blocks the entire column in our (3x3) box, so 8 must go elsewhere. + 8 (in R7C5) blocks the entire row in our box + Thus, only one cell can hold 8. + Rows (and columns) work the same way. 4 is already used in two columns, and also in also found within the same (second) box for row one. + Thus, only one cell can be 4. Hidden pairs - Hidden pairs are almost the same as naked ones, but are hidden among the others. These two cells have something in common, they can hold 6 and 9, and these are the only two squares here where they can stand on - Thus, these two cells contain only these two values and not the others. Unnecessary markers can be removed from these cells. As with naked pairs, the same applies to columns and rows. + Like naked ones, but hidden among the others.\nThese two cells can hold 6 and 9, and are the only two cells for them. + Unnecessary markers can be removed from a pair of cells limited to two values in a box, column, or row. Previous Next -- @@ -189,14 +189,14 @@ Delete selected Delete the selected sudokus permanently? Not started - Select text from the text field, or click the \"Copy\" button. + Select text from the text field, or press \"Copy\". Export as string Copy Copied Error All Completed - Underway + In progress Not started Ascending Descending @@ -255,9 +255,9 @@ Import from a file Recently played Apply accent colors - Colorize your sudoku + Colorize the board Board theme - Customize the look of the sudoku board + Customize the look of the board Board theme Move selected Select a folder to move the selected games to @@ -265,7 +265,7 @@ Cross highlight LibreSudoku crashed. Send a report to the developers? Crash reporting - Help us fix bugs. No logs leave the device unless sent by e-mail. + Help fix bugs by allowing a prompt to send logs by e-mail. Function panel over the values Place the function panel above the value keyboard Date format From 7908c28cad6d411536446ef0c670475cfb1f2f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 20 Mar 2023 17:26:26 +0000 Subject: [PATCH 08/15] Small fixes and removed strings --- app/src/main/res/values/strings.xml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2479294a..0b6a6506 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -10,7 +10,7 @@ Start new Cancel Yes - Start + Play Continue Delete Unspecified @@ -114,7 +114,7 @@ Win rate Win streak Current - Streak + Best %1$d best games Games Time @@ -145,7 +145,7 @@ Completed You have given up. In progress - Mistake-limit exceeded. + Mistake limit exceeded Learn Sudoku App @@ -153,7 +153,7 @@ A panel under the keyboard Press and hold the \"Notes\" to compute, clear, or hide/show notes. Rules - Spot the mistake(s) here + Spot the mistakes here Highlight mistakes 2 can not be repeated within a (3x3) box? There can only be one 6 in each row. Naked pairs @@ -182,14 +182,13 @@ Enter a sudoku in string form. Empty cells are indicated by a \".\" or a \"0\". Sudoku Incorrect sudoku - More than one solution. Proper sudokus must have a unique solution. - No solutions + Ensure there is only one possible solution. + Unsolvable Set No sudokus added yet Delete selected Delete the selected sudokus permanently? Not started - Select text from the text field, or press \"Copy\". Export as string Copy Copied @@ -230,8 +229,7 @@ Import The \"%1$s\" folder will be deleted Help - Manage your folder and import sudokus from a file here. - Supported filetypes:\n.sdm (or .txt with the same structure)\n.opensudoku\n.1gsudoku + Manage the sudoku folder, and import .sdm (or .txt with the same structure) .opensudoku, or .1gsudoku files here. Could not import sudoku From a file Saving… From 9185de3a9e5354c9e89034cfa6a3dd1d9f1ad3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 20 Mar 2023 17:28:09 +0000 Subject: [PATCH 09/15] folders --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0b6a6506..8c254abe 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -229,7 +229,7 @@ Import The \"%1$s\" folder will be deleted Help - Manage the sudoku folder, and import .sdm (or .txt with the same structure) .opensudoku, or .1gsudoku files here. + Manage folders, and import .sdm (or .txt with the same structure) .opensudoku, or .1gsudoku files here. Could not import sudoku From a file Saving… From 3ee5883865b112da424dc02f46ee2cf57809c6e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 20 Mar 2023 18:03:45 +0000 Subject: [PATCH 10/15] Remaining fixes --- app/src/main/res/values/strings.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8c254abe..1a32e2bb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,7 +6,7 @@ More New game Game in progress - Pause this game and start a new one? + Continue, or start a new game? Start new Cancel Yes @@ -126,7 +126,7 @@ %1$d%% A loss (reaching the mistake limit), giving up, or leaving a game resets the win streak. List of records - Your 5 top records. Long-press to remove entries. + Your 5 best records. Long-press to remove entries. No records yet History You haven\'t played yet @@ -155,19 +155,19 @@ Rules Spot the mistakes here Highlight mistakes - 2 can not be repeated within a (3x3) box? There can only be one 6 in each row. + 2 can not be repeated within a (3x3) box. There can only be one 6 in each row. Naked pairs - Two cells share the same two pencil-marked values. Knowing values in each (3x3) box must be unique, one must be 2 and the other 3. - This helps remove any pencil-marked 2 or 3\'s elsewhere in the (3x3) box. + Two cells share the same two pencil-marked values.\nKnowing values in each (3x3) box must be unique, one must be a 2 and the other a 3. + This helps remove any pencil-marked 2s or 3s elsewhere in the (3x3) box. Basic Selecting the seventh box, one finds it has four cells pre-filled - 8 in row four, column three blocks the entire column in our (3x3) box, so 8 must go elsewhere. - 8 (in R7C5) blocks the entire row in our box + 8 blocks the entire column in our (3x3) box, so 8 must go elsewhere. + 8 blocks the entire row in the box. Thus, only one cell can hold 8. Rows (and columns) work the same way. 4 is already used in two columns, and also in also found within the same (second) box for row one. - Thus, only one cell can be 4. + This means only cell can be 4. Hidden pairs - Like naked ones, but hidden among the others.\nThese two cells can hold 6 and 9, and are the only two cells for them. + Like naked ones, but hidden among the others.\nOnly these two cells can hold 6 and 9. Unnecessary markers can be removed from a pair of cells limited to two values in a box, column, or row. Previous Next @@ -263,7 +263,7 @@ Cross highlight LibreSudoku crashed. Send a report to the developers? Crash reporting - Help fix bugs by allowing a prompt to send logs by e-mail. + Ask to submit bug reports via e-mail. Function panel over the values Place the function panel above the value keyboard Date format From 0367226a1a4e67902e9ca4e3ef965044dd906332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 20 Mar 2023 18:07:50 +0000 Subject: [PATCH 11/15] Corrections, no "hold" --- app/src/main/res/values/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1a32e2bb..d0af3e10 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -157,17 +157,17 @@ Highlight mistakes 2 can not be repeated within a (3x3) box. There can only be one 6 in each row. Naked pairs - Two cells share the same two pencil-marked values.\nKnowing values in each (3x3) box must be unique, one must be a 2 and the other a 3. + Two cells share the same two pencil-marked values.\nKnowing values in each (3x3) box must be unique, one must be 2 and the other 3. This helps remove any pencil-marked 2s or 3s elsewhere in the (3x3) box. Basic Selecting the seventh box, one finds it has four cells pre-filled 8 blocks the entire column in our (3x3) box, so 8 must go elsewhere. 8 blocks the entire row in the box. - Thus, only one cell can hold 8. + Thus, only one cell can be 8. Rows (and columns) work the same way. 4 is already used in two columns, and also in also found within the same (second) box for row one. - This means only cell can be 4. + This means only one cell can be 4. Hidden pairs - Like naked ones, but hidden among the others.\nOnly these two cells can hold 6 and 9. + Like naked ones, but hidden among the others.\nOnly these two cells can be either 6 or 9. Unnecessary markers can be removed from a pair of cells limited to two values in a box, column, or row. Previous Next From aad5987e7546d6fd8c6fe70622f13ac1bac11e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 20 Mar 2023 20:21:36 +0000 Subject: [PATCH 12/15] Got it, -ask --- app/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d0af3e10..e1c0585c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -96,7 +96,7 @@ Solves selected cell Clears selected cell Quick tour - OK + Got it Exit Stay %1$d/%2$d mistakes @@ -263,7 +263,7 @@ Cross highlight LibreSudoku crashed. Send a report to the developers? Crash reporting - Ask to submit bug reports via e-mail. + Submit bug reports via e-mail. Function panel over the values Place the function panel above the value keyboard Date format From 5fe3fb9880da35bbe7f188a25e230e775223c0da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 20 Mar 2023 21:15:54 +0000 Subject: [PATCH 13/15] Reverted changes --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e1c0585c..b73fc55e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,7 +6,7 @@ More New game Game in progress - Continue, or start a new game? + You have a game in progress. Want to start a new one? Start new Cancel Yes From b5c312eb84bc43a5a7dd9927ad8d7db559b347af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 20 Mar 2023 21:16:09 +0000 Subject: [PATCH 14/15] Reverted changes --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b73fc55e..467eb9ce 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -183,7 +183,7 @@ Sudoku Incorrect sudoku Ensure there is only one possible solution. - Unsolvable + This sudoku has no solutions. Set No sudokus added yet Delete selected From 6f514f14a1dde1d3318ea88825a113a970cfa8ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Tue, 21 Mar 2023 01:33:42 +0000 Subject: [PATCH 15/15] Small fixes --- app/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 467eb9ce..918dd4fd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -62,11 +62,11 @@ Off Rule violations With final solution - Highlight repeated values + Highlight identical values Selection of a value on the board highlights cells with the same value. Remaining uses The number of remaining uses of a value is displayed on the keyboard - Positional lines + Position lines The row and column of the selected cell are highlighted. Auto-erase notes Other