Merge remote-tracking branch 'refs/remotes/origin/master' into thyphoon

# Conflicts:
#	PBMap.pb
#	screenshot.png

.gitignore

@@ -0,0 +1,2 @@
+screenshot.png
+*.png

Forms/MarkerEdit.pbf

@@ -0,0 +1,40 @@
+;
+; This code is automatically generated by the FormDesigner.
+; Manual modification is possible to adjust existing commands, but anything else will be dropped when the code is compiled.
+; Event procedures needs to be put in another source file.
+;
+
+Global WindowMarkerEdit
+
+Global TextIdentifier, TextLegend, StringIdentifier, EditorLegend
+
+
+Procedure OpenWindowMarkerEdit(x = 0, y = 0, width = 300, height = 100)
+  WindowMarkerEdit = OpenWindow(#PB_Any, x, y, width, height, Marker Edit, #PB_Window_SystemMenu | #PB_Window_TitleBar | #PB_Window_WindowCentered | #PB_Window_NoGadgets)
+  TextIdentifier = TextGadget(#PB_Any, 2, 2, 80, 25, Identifier)
+  TextLegend = TextGadget(#PB_Any, 2, 27, 80, 25, Legend)
+  StringIdentifier = StringGadget(#PB_Any, 84, 2, 120, 25, "")
+  EditorLegend = EditorGadget(#PB_Any, 84, 27, 210, 70)
+EndProcedure
+
+Procedure WindowMarkerEdit_Events(event)
+  Select event
+    Case #PB_Event_CloseWindow
+      ProcedureReturn #False
+
+    Case #PB_Event_Menu
+      Select EventMenu()
+      EndSelect
+
+    Case #PB_Event_Gadget
+      Select EventGadget()
+      EndSelect
+  EndSelect
+  ProcedureReturn #True
+EndProcedure
+
+
+; IDE Options = PureBasic 5.50 (Windows - x64)
+; CursorPosition = 11
+; Folding = -
+; EnableXP

gettext.pbi

@@ -0,0 +1,29 @@
+Procedure.s gettext(String.s = "")
+  Protected Language.s = "EN_en"
+  
+  Select Language
+      
+    Case "EN_en"
+      ProcedureReturn String
+      
+    Case "FR_fr"
+      
+      Select String
+          
+        Case "Identifier"
+          ProcedureReturn("Identificateur")
+          
+        Default
+          ProcedureReturn String
+          
+      EndSelect  
+      
+    Default
+      ProcedureReturn String
+
+  EndSelect
+EndProcedure
+; IDE Options = PureBasic 5.50 (Windows - x64)
+; CursorPosition = 21
+; Folding = -
+; EnableXP