Skip to content

Commit ac4fcbf

Browse files
lukegorlukegor
committed
fix(App/LanguageDictionary): wrong config values; refactor: slightly rearrange menu; chore(readme): update
1 parent 56a0240 commit ac4fcbf

14 files changed

+186
-90
lines changed

‎JSharp/App.xaml.cs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@ public partial class App : PrismApplication
2222
protected override void OnStartup(StartupEventArgs e)
2323
{
2424
CultureInfo culture;
25-
#if DEBUG
26-
culture = CultureInfo.InvariantCulture; // Force invariant culture for debugging
27-
#else
28-
if (!string.IsNullOrEmpty(Settings.Default.LanguageVersion))
25+
//#if DEBUG
26+
// culture = CultureInfo.InvariantCulture; // Force invariant culture for debugging
27+
//#else
28+
if (!string.IsNullOrEmpty(Settings.Default.LanguageVersion) && Languages.ContainsKey(Settings.Default.LanguageVersion))
29+
{
2930
culture = Languages[key: Settings.Default.LanguageVersion];
30-
else
31-
culture = CultureInfo.CurrentCulture; // Use the current culture in release mode
32-
#endif
31+
}
32+
else culture = CultureInfo.CurrentCulture; // Use the current culture in release mode
33+
//#endif
3334
// Set default culture for the application - seems unnecessary
3435
CultureInfo.DefaultThreadCurrentCulture = culture;
3536
CultureInfo.DefaultThreadCurrentUICulture = culture;

‎JSharp/Resources/Kernels.de.resx‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<root>
3-
<!--
4-
Microsoft ResX Schema
5-
3+
<!--
4+
Microsoft ResX Schema
5+
66
Version 2.0
7-
8-
The primary goals of this format is to allow a simple XML format
9-
that is mostly human readable. The generation and parsing of the
10-
various data types are done through the TypeConverter classes
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
1111
associated with the data types.
12-
12+
1313
Example:
14-
14+
1515
... ado.net/XML headers & schema ...
1616
<resheader name="resmimetype">text/microsoft-resx</resheader>
1717
<resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
2626
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
2727
<comment>This is a comment</comment>
2828
</data>
29-
30-
There are any number of "resheader" rows that contain simple
29+
30+
There are any number of "resheader" rows that contain simple
3131
name/value pairs.
32-
33-
Each data row contains a name, and value. The row also contains a
34-
type or mimetype. Type corresponds to a .NET class that support
35-
text/value conversion through the TypeConverter architecture.
36-
Classes that don't support this are serialized and stored with the
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
3737
mimetype set.
38-
39-
The mimetype is used for serialized objects, and tells the
40-
ResXResourceReader how to depersist the object. This is currently not
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
4141
extensible. For a given mimetype the value must be set accordingly:
42-
43-
Note - application/x-microsoft.net.object.binary.base64 is the format
44-
that the ResXResourceWriter will generate, however the reader can
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
4545
read any of the formats listed below.
46-
46+
4747
mimetype: application/x-microsoft.net.object.binary.base64
48-
value : The object must be serialized with
48+
value : The object must be serialized with
4949
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
5050
: and then encoded with base64 encoding.
51-
51+
5252
mimetype: application/x-microsoft.net.object.soap.base64
53-
value : The object must be serialized with
53+
value : The object must be serialized with
5454
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
5555
: and then encoded with base64 encoding.
5656
5757
mimetype: application/x-microsoft.net.object.bytearray.base64
58-
value : The object must be serialized into a byte array
58+
value : The object must be serialized into a byte array
5959
: using a System.ComponentModel.TypeConverter
6060
: and then encoded with base64 encoding.
6161
-->
@@ -143,10 +143,10 @@
143143
<value>Benutzerdefiniert</value>
144144
</data>
145145
<data name="DirectionalEdgeDetection" xml:space="preserve">
146-
<value>Richtungskantenerkennung</value>
146+
<value>Richtungskantendetektion</value>
147147
</data>
148148
<data name="EdgeDetection" xml:space="preserve">
149-
<value>Kantenerkennung</value>
149+
<value>Kantendetektion</value>
150150
</data>
151151
<data name="GaussianBlur" xml:space="preserve">
152152
<value>Gaußsche Weichzeichner</value>

‎JSharp/Resources/Strings.Designer.cs‎

Lines changed: 37 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎JSharp/Resources/Strings.de.resx‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,12 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120+
<data name="Advanced" xml:space="preserve">
121+
<value>Fortgeschrittene</value>
122+
</data>
123+
<data name="Analyze" xml:space="preserve">
124+
<value>Analysieren</value>
125+
</data>
120126
<data name="Author" xml:space="preserve">
121127
<value>Autor</value>
122128
</data>
@@ -139,7 +145,11 @@
139145
<value>Duplikatieren</value>
140146
</data>
141147
<data name="EdgeDetection_Hough" xml:space="preserve">
142-
<value>Kantenerkennung (Hough)</value>
148+
<value>Kantendetektion (Hough)</value>
149+
<comment>also Kantenextraktion, Kantenerkennung</comment>
150+
</data>
151+
<data name="Edit" xml:space="preserve">
152+
<value>Bearbeiten</value>
143153
</data>
144154
<data name="EqualizeHistogram" xml:space="preserve">
145155
<value>Histogramm äqualisieren</value>
@@ -193,7 +203,7 @@
193203
<value>Morphologische Schließen</value>
194204
</data>
195205
<data name="MorphologicalOperations" xml:space="preserve">
196-
<value>Elementare morphologische Operationen</value>
206+
<value>Morphologische Operationen</value>
197207
</data>
198208
<data name="Negate" xml:space="preserve">
199209
<value>Negieren</value>
@@ -216,6 +226,9 @@
216226
<data name="Posterize" xml:space="preserve">
217227
<value>Posterisieren</value>
218228
</data>
229+
<data name="Process" xml:space="preserve">
230+
<value>Verarbeiten</value>
231+
</data>
219232
<data name="PyramidDown" xml:space="preserve">
220233
<value>Herunterskalieren</value>
221234
</data>

‎JSharp/Resources/Strings.pl.resx‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,12 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120+
<data name="Advanced" xml:space="preserve">
121+
<value>Zaawansowane</value>
122+
</data>
123+
<data name="Analyze" xml:space="preserve">
124+
<value>Analiza</value>
125+
</data>
120126
<data name="Author" xml:space="preserve">
121127
<value>Autor</value>
122128
</data>
@@ -144,6 +150,9 @@
144150
<data name="EdgePixelsHandling" xml:space="preserve">
145151
<value>Obsługa pikseli brzegowych</value>
146152
</data>
153+
<data name="Edit" xml:space="preserve">
154+
<value>Edycja</value>
155+
</data>
147156
<data name="EqualizeHistogram" xml:space="preserve">
148157
<value>Wyrównaj Histogram</value>
149158
</data>
@@ -193,7 +202,7 @@
193202
<value>Otwarcie Morfologiczne</value>
194203
</data>
195204
<data name="MorphologicalOperations" xml:space="preserve">
196-
<value>Podstawowe Operacje Morfologiczne</value>
205+
<value>Operacje Morfologiczne</value>
197206
</data>
198207
<data name="Negate" xml:space="preserve">
199208
<value>Negacja</value>
@@ -216,6 +225,9 @@
216225
<data name="Posterize" xml:space="preserve">
217226
<value>Posteryzuj</value>
218227
</data>
228+
<data name="Process" xml:space="preserve">
229+
<value>Przetwarzanie</value>
230+
</data>
219231
<data name="PyramidDown" xml:space="preserve">
220232
<value>Skaluj w Dół</value>
221233
</data>

‎JSharp/Resources/Strings.resx‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,12 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120+
<data name="Advanced" xml:space="preserve">
121+
<value>Advanced</value>
122+
</data>
123+
<data name="Analyze" xml:space="preserve">
124+
<value>Analyze</value>
125+
</data>
120126
<data name="Author" xml:space="preserve">
121127
<value>Author</value>
122128
</data>
@@ -141,6 +147,9 @@
141147
<data name="EdgeDetection_Hough" xml:space="preserve">
142148
<value>Edge Detection (Hough)</value>
143149
</data>
150+
<data name="Edit" xml:space="preserve">
151+
<value>Edit</value>
152+
</data>
144153
<data name="EqualizeHistogram" xml:space="preserve">
145154
<value>Equalize Histogram</value>
146155
</data>
@@ -193,7 +202,7 @@
193202
<value>Morphological Opening</value>
194203
</data>
195204
<data name="MorphologicalOperations" xml:space="preserve">
196-
<value>Elementary Morphological Operations</value>
205+
<value>Morphological Operations</value>
197206
</data>
198207
<data name="Negate" xml:space="preserve">
199208
<value>Negate</value>
@@ -216,6 +225,9 @@
216225
<data name="Posterize" xml:space="preserve">
217226
<value>Posterize</value>
218227
</data>
228+
<data name="Process" xml:space="preserve">
229+
<value>Process</value>
230+
</data>
219231
<data name="PyramidDown" xml:space="preserve">
220232
<value>Scale Down</value>
221233
</data>

‎JSharp/Resources/UIStrings.Designer.cs‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎JSharp/Resources/UIStrings.de.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,9 @@
141141
<data name="Help" xml:space="preserve">
142142
<value>Hilfe</value>
143143
</data>
144+
<data name="Save" xml:space="preserve">
145+
<value>Speichern</value>
146+
</data>
144147
<data name="Settings" xml:space="preserve">
145148
<value>Einstellungen</value>
146149
</data>

‎JSharp/Resources/UIStrings.pl.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,9 @@
141141
<data name="Help" xml:space="preserve">
142142
<value>Pomoc</value>
143143
</data>
144+
<data name="Save" xml:space="preserve">
145+
<value>Zapisz</value>
146+
</data>
144147
<data name="Settings" xml:space="preserve">
145148
<value>Ustawienia</value>
146149
</data>

‎JSharp/Resources/UIStrings.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,9 @@
141141
<data name="Help" xml:space="preserve">
142142
<value>Help</value>
143143
</data>
144+
<data name="Save" xml:space="preserve">
145+
<value>Save</value>
146+
</data>
144147
<data name="Settings" xml:space="preserve">
145148
<value>Settings</value>
146149
</data>

0 commit comments

Comments
 (0)