Merge branch 'main' into ssh.net

sajmons · Feb 5, 2024 · fa6e906 · fa6e906
2 parents 1d53bbc + 347a8bb
commit fa6e906
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 1 deletion.
diff --git a/CollimationCircles/Resources/Lang/de-DE.axaml b/CollimationCircles/Resources/Lang/de-DE.axaml
@@ -117,4 +117,8 @@
   <system:String x:Key="Text.PlayStopCameraVideoStream">Starten oder stoppen Sie den Videostream der Kamera</system:String>
   <system:String x:Key="Text.CameraType">Kameratyp</system:String>
   <system:String x:Key="Text.RemoteCameraType">Fernbedienung</system:String>
+
+  <!-- Non translatable -->
+  <system:String x:Key="Text.StarChar">*</system:String>
+  <system:String x:Key="Text.StarJson">json</system:String>
 </ResourceDictionary>
diff --git a/CollimationCircles/Resources/Lang/en-US.axaml b/CollimationCircles/Resources/Lang/en-US.axaml
@@ -122,5 +122,5 @@
 
   <!-- Non translatable -->
   <system:String x:Key="Text.StarChar">*</system:String>
-  <system:String x:Key="Text.StarJson">json</system:String>  
+  <system:String x:Key="Text.StarJson">json</system:String>
 </ResourceDictionary>
diff --git a/CollimationCircles/Resources/Lang/fr-FR.axaml b/CollimationCircles/Resources/Lang/fr-FR.axaml
@@ -118,4 +118,8 @@
   <system:String x:Key="Text.PlayStopCameraVideoStream">Démarrer ou arrêter le flux vidéo de la caméra</system:String>
   <system:String x:Key="Text.CameraType">Type de caméra</system:String>
   <system:String x:Key="Text.RemoteCameraType">Télécommande</system:String>
+
+  <!-- Non translatable -->
+  <system:String x:Key="Text.StarChar">*</system:String>
+  <system:String x:Key="Text.StarJson">json</system:String>
 </ResourceDictionary>
diff --git a/CollimationCircles/Resources/Lang/sl-SI.axaml b/CollimationCircles/Resources/Lang/sl-SI.axaml
@@ -117,4 +117,8 @@
   <system:String x:Key="Text.PlayStopCameraVideoStream">Začne ali ustavi video tok kamere</system:String>
   <system:String x:Key="Text.CameraType">Tip kamere</system:String>
   <system:String x:Key="Text.RemoteCameraType">Oddaljen</system:String>
+
+  <!-- Non translatable -->
+  <system:String x:Key="Text.StarChar">*</system:String>
+  <system:String x:Key="Text.StarJson">json</system:String>
 </ResourceDictionary>
diff --git a/Graphics/ic_launcher.png b/Graphics/ic_launcher.png
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # Collimation Circles
 
 <img src="https://github.com/sajmons/CollimationCircles/assets/7437280/1424b10e-b81e-483d-bd1b-cf2ce30869a5" width="500">
+<img src="https://github.com/sajmons/CollimationCircles/assets/7437280/2495c622-4683-4d8e-b39d-667203580c19" width="500">
 
 This program was inspired by Mire De Collimation program written by Gilbert Grillot and Al's Collimation Aid. I combined best features of both and addes some of my own. Purpose of this program is not to reinvent the wheel, but rather to learn new technologies, become better at colimating my telescope and to learn something new.
 
@@ -27,6 +28,7 @@ https://saimons-astronomy.webador.com/software/collimation-circles
 - multilanguage (English, Slovenian, German)
 - always on top option
 - up to date online help available
+- 3.x and newer camera video stream support to display video from your telescope in background
 
 # Prebuild binaries
 Here are prebuild binary files avaliable for you to download (win-x64, linux-x64, linux-arm64 and macos-x64).