Merge branch 'release/1.2'

Kaju Admin App/Kaju Admin.xojo_project

@@ -26,13 +26,13 @@ Class=FolderItemAlias;Other Classes/FolderItemAlias.xojo_code;&h53EF1AE5;&h6AF5D
 Class=HTTPSSocket;../Kaju Classes/Kaju/HTTPSSocket.xojo_code;&h5ACDFAEB;&h11400316;false
 AppMenuBar=MainMenuBar
 MajorVersion=1
-MinorVersion=1
+MinorVersion=2
 SubVersion=0
 NonRelease=0
 Release=3
 InfoVersion=Kaju Admin
-LongVersion=v.1.1
-ShortVersion=1.1
+LongVersion=v.1.2
+ShortVersion=1.2
 WinCompanyName=MacTechnologies Consulting
 WinInternalName=
 WinProductName=

Kaju Classes/KajuLocale.xojo_code

@@ -14,150 +14,191 @@ Protected Module KajuLocale
 
 	#tag Constant, Name = kBadDownloadMessage, Type = String, Dynamic = True, Default = \"The downloaded file appears to be corrupted.", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Die heruntergeladene Datei scheint defekt zu sein."
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Le fichier t\xC3\xA9l\xC3\xA9charg\xC3\xA9 semble corrompu."
 	#tag EndConstant
 
 	#tag Constant, Name = kBinaryInfoInvalidReason, Type = String, Dynamic = True, Default = \"Binary information is not valid", Scope = Protected
-		#Tag Instance, Platform = Any, Language = de, Definition  = \"Bin\xC3\xA4re Informationen sind nicht valide"
+		#Tag Instance, Platform = Any, Language = de, Definition  = \"Bin\xC3\xA4re Informationen sind ung\xC3\xBCltig"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Les informations binaires du fichier ne sont pas valides"
 	#tag EndConstant
 
 	#tag Constant, Name = kCancelButton, Type = String, Dynamic = True, Default = \"&Cancel", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"&Abbrechen"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"&Annuler"
 	#tag EndConstant
 
 	#tag Constant, Name = kCannotSkipVersionsMessage, Type = String, Dynamic = True, Default = \"You cannot skip versions until you have updated to version <<Version>> or beyond.", Scope = Protected
-		#Tag Instance, Platform = Any, Language = de, Definition  = \"Sie k\xC3\xB6nnen keine Versionen \xC3\xBCberspringen bevor Sie nicht mindestens <<Version>> oder h\xC3\xB6her installiert haben."
+		#Tag Instance, Platform = Any, Language = de, Definition  = \"Sie k\xC3\xB6nnen keine Version \xC3\xBCberspringen bevor Sie nicht mindestens <<Version>> oder h\xC3\xB6her installiert haben."
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Vous ne pouvez pas sautter cette version avant d\'avoir mis \xC3\xA0 jour en <<Version>> ou sup\xC3\xA9rieur."
 	#tag EndConstant
 
 	#tag Constant, Name = kDownloadingMessage, Type = String, Dynamic = True, Default = \"Downloading...", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Herunterladen..."
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"T\xC3\xA9l\xC3\xA9chargement..."
 	#tag EndConstant
 
 	#tag Constant, Name = kDryRunMessage, Type = String, Dynamic = True, Default = \"(Dry run\x2C not really installing)", Scope = Protected
-		#Tag Instance, Platform = Any, Language = de, Definition  = \"(Testlauf\x2C keine wirkliche Installation)"
+		#Tag Instance, Platform = Any, Language = de, Definition  = \"(Testlauf\x2C keine Installation)"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"(Essai\x2C pas d\'installation)"
 	#tag EndConstant
 
 	#tag Constant, Name = kErrorBadUpdateData, Type = String, Dynamic = True, Default = \"The update data cannot be read.", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Update Informationen k\xC3\xB6nnen nicht gelesen werden."
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"La mise \xC3\xA0 jour ne peut \xC3\xAAtre lue."
 	#tag EndConstant
 
 	#tag Constant, Name = kErrorIncorrectPacketMarker, Type = String, Dynamic = True, Default = \"The update packet signature marker was incorrect.", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Die Update Paket Signatur war inkorrekt."
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"La signature de la mise \xC3\xA0 jour est invalide."
 	#tag EndConstant
 
 	#tag Constant, Name = kErrorIncorrectPacketSignature, Type = String, Dynamic = True, Default = \"The RSA signature of the update packet cannot be verified.", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Die RSA Signatur des Update Paket kann nicht verifiziert werden."
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"La signature RSA de la mise \xC3\xA0 jour ne peut pas \xC3\xAAtre v\xC3\xA9rifi\xC3\xA9e."
 	#tag EndConstant
 
 	#tag Constant, Name = kErrorNoUpdateData, Type = String, Dynamic = True, Default = \"No update data was available.", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Es standen keine Update Informationen zur Verf\xC3\xBCgung."
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Il n\'y a pas de mise \xC3\xA0 jour disponible."
 	#tag EndConstant
 
 	#tag Constant, Name = kErrorOccurredMessage, Type = String, Dynamic = True, Default = \"An error has occurred. Would you like to try again now or later\?", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Es ist ein Fehler aufgetreten. M\xC3\xB6chten Sie es jetzt oder sp\xC3\xA4ter noch einmal versuchen\?"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Une erreur est survenue. Voulez-vous re-essayer maintenant ou plus tard \?"
 	#tag EndConstant
 
 	#tag Constant, Name = kGenericErrorMessage, Type = String, Dynamic = True, Default = \"An error has occurred.", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Es ist ein Fehler aufgetreten."
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Une erreur est survenue."
 	#tag EndConstant
 
 	#tag Constant, Name = kInstallButton, Type = String, Dynamic = True, Default = \"Install Update", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Update installieren"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Installer"
 	#tag EndConstant
 
 	#tag Constant, Name = kLaterButton, Type = String, Dynamic = True, Default = \"Later", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Sp\xC3\xA4ter"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Plus tard"
 	#tag EndConstant
 
 	#tag Constant, Name = kMainNotice, Type = String, Dynamic = True, Default = \"A new version of <<AppName>> is available!", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Eine neue <<AppName>> Version ist verf\xC3\xBCgbar!"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Une nouvelle version de <<AppName>> est disponible !"
 	#tag EndConstant
 
 	#tag Constant, Name = kMissingAppNameReason, Type = String, Dynamic = True, Default = \"Missing app name", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"App Name fehlt"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Le nom de l\'application est manquant"
 	#tag EndConstant
 
 	#tag Constant, Name = kMissingReason, Type = String, Dynamic = False, Default = \"Missing", Scope = Protected
+		#Tag Instance, Platform = Any, Language = de, Definition  = \"Fehlt"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Manquant"
 	#tag EndConstant
 
 	#tag Constant, Name = kNewVersionMarker, Type = String, Dynamic = False, Default = \"<<NewVersion>>", Scope = Protected
 	#tag EndConstant
 
 	#tag Constant, Name = kNoUpdateInfoMessage, Type = String, Dynamic = True, Default = \"NO UPDATE INFORMATION", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"KEINE UPDATE INFORMATIONEN"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"AUCUNE INFORMATION"
 	#tag EndConstant
 
 	#tag Constant, Name = kPaymentRequiredMessage, Type = String, Dynamic = True, Default = \"This update is not free and will require payment. Proceed anyway\?", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Das ist ein kostenpflichtiges Update. Dennoch installieren\?"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Cette mise \xC3\xA0 jour est payante. Souhaitez-vous continuer \?"
 	#tag EndConstant
 
 	#tag Constant, Name = kProceedButton, Type = String, Dynamic = True, Default = \"Proceed", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Weiter"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Continuer"
 	#tag EndConstant
 
 	#tag Constant, Name = kProcessingFileMessage, Type = String, Dynamic = True, Default = \"Processing file...", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Verarbeite Datei..."
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Traitement du fichier..."
 	#tag EndConstant
 
 	#tag Constant, Name = kQuitButton, Type = String, Dynamic = True, Default = \"Quit && Install", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Beenden && Installieren"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Quitter && Installer"
 	#tag EndConstant
 
 	#tag Constant, Name = kReadyMessage, Type = String, Dynamic = True, Default = \"Ready to install", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Zum Update bereit"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Pr\xC3\xAAt pour installation"
 	#tag EndConstant
 
 	#tag Constant, Name = kReleaseNotesLabel, Type = String, Dynamic = True, Default = \"Release Notes:", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Informationen zur Ver\xC3\xB6ffentlichung:"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Notes d\'information :"
 	#tag EndConstant
 
 	#tag Constant, Name = kRemindMeLaterButton, Type = String, Dynamic = True, Default = \"Remind Me Later", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Jetzt nicht"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Me le rappeler plus tard"
 	#tag EndConstant
 
 	#tag Constant, Name = kSecondaryNoticeMultiple, Type = String, Dynamic = True, Default = \"You have version <<ThisVersion>> and there are multiple updates available. Install one\?", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Sie haben Version <<ThisVersion>> und es stehen mehrere Updates zur Verf\xC3\xBCgung. Ein Update installieren\?"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Vous avez la version <<ThisVersion>> et il existe plusieurs mises \xC3\xA0 jour. Voulez-vous en installer une \?"
 	#tag EndConstant
 
 	#tag Constant, Name = kSecondaryNoticeOne, Type = String, Dynamic = True, Default = \"You have version <<ThisVersion>>. Would you like to install version <<NewVersion>>\?", Scope = Protected
-		#Tag Instance, Platform = Any, Language = de, Definition  = \"Sie haben Version <<ThisVersion>>. M\xC3\xB6chten Sie die Version <<NewVersion>> installieren\?"
+		#Tag Instance, Platform = Any, Language = de, Definition  = \"Sie haben Version <<ThisVersion>>. M\xC3\xB6chten Sie Version <<NewVersion>> installieren\?"
+		#Tag Instance, Platform = Any, Language = Default, Definition  = \"Vous utilisez la version <<ThisVersion>>. Voulez-vous installer la version <<NewVersion>> \?"
 	#tag EndConstant
 
 	#tag Constant, Name = kSkipVersionButton, Type = String, Dynamic = True, Default = \"Skip Version", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Version \xC3\xBCberspringen"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Passer cette version"
 	#tag EndConstant
 
 	#tag Constant, Name = kStopButton, Type = String, Dynamic = True, Default = \"Stop", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Stopp"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Stop"
 	#tag EndConstant
 
 	#tag Constant, Name = kThisApplication, Type = String, Dynamic = True, Default = \"this application", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"diese Anwendung"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Cette application"
 	#tag EndConstant
 
 	#tag Constant, Name = kThisVersionMarker, Type = String, Dynamic = False, Default = \"<<ThisVersion>>", Scope = Protected
 	#tag EndConstant
 
+	#tag Constant, Name = kTimedOutMessage, Type = String, Dynamic = False, Default = \"The operation has timed out.", Scope = Protected
+		#Tag Instance, Platform = Any, Language = de, Definition  = \"Der Vorgang wurde wegen Zeit\xC3\xBCberschreitung abgebrochen."
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Maximum d\xC3\xA9lai expir\xC3\xA9."
+	#tag EndConstant
+
 	#tag Constant, Name = kTryAgainButton, Type = String, Dynamic = True, Default = \"Try Again", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Erneut versuchen"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"R\xC3\xA9essayer"
 	#tag EndConstant
 
 	#tag Constant, Name = kTryLaterButton, Type = String, Dynamic = True, Default = \"Try Later", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Sp\xC3\xA4ter erneut versuchen"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Essayer plus tard"
 	#tag EndConstant
 
 	#tag Constant, Name = kVersionMarker, Type = String, Dynamic = False, Default = \"<<Version>>", Scope = Protected
 	#tag EndConstant
 
 	#tag Constant, Name = kVersionMustBeInFormReason, Type = String, Dynamic = True, Default = \"Version must be in one of these forms", Scope = Protected
-		#Tag Instance, Platform = Any, Language = de, Definition  = \"Version muss in einer der folgenden Formen eingegeben werden"
+		#Tag Instance, Platform = Any, Language = de, Definition  = \"Version muss in einem der folgenden Formate eingegeben werden"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"La version doit \xC3\xAAtre dans une de ces formes"
 	#tag EndConstant
 
 	#tag Constant, Name = kVersionsLabel, Type = String, Dynamic = True, Default = \"Available Versions:", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Verf\xC3\xBCgbare Versionen:"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Versions disponibles :"
 	#tag EndConstant
 
 	#tag Constant, Name = kWindowTitle, Type = String, Dynamic = True, Default = \"Update Available", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Update verf\xC3\xBCgbar"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Mise \xC3\xA0 jour disponible"
 	#tag EndConstant
 
 

Kaju Classes/KajuUpdateWindow.xojo_window

@@ -271,7 +271,7 @@ Begin Window KajuUpdateWindow
       TextSize        =   0.0
       TextUnit        =   0
       Top             =   555
-      Transparent     =   False
+      Transparent     =   True
       Underline       =   False
       Visible         =   False
       Width           =   294
@@ -416,6 +416,19 @@ Begin Window KajuUpdateWindow
       Visible         =   True
       Width           =   101
    End
+   Begin Timer tmrTimeout
+      Height          =   32
+      Index           =   -2147483648
+      InitialParent   =   ""
+      Left            =   0
+      LockedInPosition=   False
+      Mode            =   0
+      Period          =   5000
+      Scope           =   0
+      TabPanelIndex   =   0
+      Top             =   0
+      Width           =   32
+   End
 End
 #tag EndWindow
 
@@ -512,6 +525,8 @@ End
 		    shZipper.Close
 		  end if
 
+		  tmrTimeout.Mode = Timer.ModeOff
+
 		  if Checker.QuitOnCancelIfRequired and Checker.Result = Kaju.UpdateChecker.ResultType.RequiredUpdateAvailable then
 		    quit
 		  else
@@ -882,6 +897,12 @@ End
 		      //
 		      hsSocket.Get( url, DownloadFile )
 
+		      //
+		      // Start the timeout timer
+		      //
+		      tmrTimeout.Reset
+		      tmrTimeout.Mode = Timer.ModeSingle
+
 		    end if
 
 		  case Stage.WaitingToQuit
@@ -967,6 +988,7 @@ End
 		  pbProgress.Maximum = totalBytes
 		  pbProgress.Value = bytesReceived
 
+		  tmrTimeout.Reset
 
 		  #pragma unused newData
 		End Sub
@@ -983,6 +1005,8 @@ End
 		  pbProgress.Maximum = -1
 		  pbProgress.Value = 0
 
+		  tmrTimeout.Mode = Timer.ModeOff
+
 		  if httpStatus <> 200 then
 
 		    ShowError()
@@ -1131,6 +1155,18 @@ End
 		End Sub
 	#tag EndEvent
 #tag EndEvents
+#tag Events tmrTimeout
+	#tag Event
+		Sub Action()
+		  if hsSocket.IsConnected then
+		    hsSocket.Disconnect
+		  end if
+
+		  ShowError( KajuLocale.kTimedOutMessage )
+
+		End Sub
+	#tag EndEvent
+#tag EndEvents
 #tag ViewBehavior
 	#tag ViewProperty
 		Name="AppName"

README.md

@@ -278,6 +278,7 @@ With thanks to John Hansen and Paul Lefebvre.
 Translations to other languages by:
 
 * Sascha Schneppmueller (German)
+* Valdemar De SOUSA (French)
 
 With special thanks to [Advanced Medical Pricing Solutions, Inc.](http://www.advancedpricing.com), for making this possible.
 
@@ -331,3 +332,10 @@ Add a translation for each, then submit a pull request as outlined above.
 - Fixed bug where the app name was not being presented in the Update window.
 - Changed behavior of how the "A never version of..." message is presented in the Update window.
 - German translation.
+
+1.2 (Jan. 12, 2015)
+
+- Added timeout timer for downloads.
+- Fixed transparency issue on Windows.
+- Fixed some German translations.
+- Added French translation.