Skip to content

Commit

Permalink
Merge branch 'release/1.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
ktekinay committed Jan 13, 2015
2 parents 6a1f23d + 84132fe commit 4ae37da
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Kaju Admin App/Kaju Admin.xojo_project
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ Class=HTTPSSocket;../Kaju Classes/Kaju/HTTPSSocket.xojo_code;&h5ACDFAEB;&h114003
AppMenuBar=MainMenuBar
MajorVersion=1
MinorVersion=2
SubVersion=0
SubVersion=1
NonRelease=0
Release=3
InfoVersion=Kaju Admin
LongVersion=v.1.2
ShortVersion=1.2
LongVersion=v.1.2.1
ShortVersion=1.2.1
WinCompanyName=MacTechnologies Consulting
WinInternalName=
WinProductName=
Expand Down
38 changes: 37 additions & 1 deletion Kaju Classes/KajuLocale.xojo_code
Original file line number Diff line number Diff line change
Expand Up @@ -15,86 +15,103 @@ 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 Instance, Platform = Any, Language = es, Definition = \"El fichero descargado parece estar da\xC3\xB1ado."
#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 ung\xC3\xBCltig"
#Tag Instance, Platform = Any, Language = fr, Definition = \"Les informations binaires du fichier ne sont pas valides"
#Tag Instance, Platform = Any, Language = es, Definition = \"La informaci\xC3\xB3n binaria no es correcta"
#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 Instance, Platform = Any, Language = es, Definition = \"&Cancelar"
#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 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 Instance, Platform = Any, Language = es, Definition = \"No se pueden omitir versiones hasta haber actualizado a la versi\xC3\xB3n <<Version>> o superior."
#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 Instance, Platform = Any, Language = es, Definition = \"Descargando..."
#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 Installation)"
#Tag Instance, Platform = Any, Language = fr, Definition = \"(Essai\x2C pas d\'installation)"
#Tag Instance, Platform = Any, Language = es, Definition = \"(Prueba\x2C sin instalaci\xC3\xB3n real)"
#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 Instance, Platform = Any, Language = es, Definition = \"La actualizaci\xC3\xB3n no puede ser le\xC3\xADda."
#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 Instance, Platform = Any, Language = es, Definition = \"La firma de la actualizaci\xC3\xB3n es incorrecta."
#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 Instance, Platform = Any, Language = es, Definition = \"Imposible verificar la firma RSA de la actualizaci\xC3\xB3n."
#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 Instance, Platform = Any, Language = es, Definition = \"No hay actualizaciones disponibles."
#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 Instance, Platform = Any, Language = es, Definition = \"Ha ocurrido un error. \xC2\xBFReintentar ahora o m\xC3\xA1s tarde\?"
#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 Instance, Platform = Any, Language = es, Definition = \"Ha ocurrido un error."
#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 Instance, Platform = Any, Language = es, Definition = \"Instalar"
#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 Instance, Platform = Any, Language = es, Definition = \"M\xC3\xA1s tarde"
#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 Instance, Platform = Any, Language = es, Definition = \"\xC2\xA1Hay disponible una nueva versi\xC3\xB3n de <<AppName>>!"
#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 Instance, Platform = Any, Language = es, Definition = \"El nombre de la aplicaci\xC3\xB3n no est\xC3\xA1 disponible "
#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 Instance, Platform = Any, Language = es, Definition = \"No disponible"
#tag EndConstant

#tag Constant, Name = kNewVersionMarker, Type = String, Dynamic = False, Default = \"<<NewVersion>>", Scope = Protected
Expand All @@ -103,66 +120,79 @@ Protected Module KajuLocale
#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 Instance, Platform = Any, Language = es, Definition = \"NO EXISTE INFORMACION DE LA ACTUALIZACION"
#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 Instance, Platform = Any, Language = es, Definition = \"Esta actualizaci\xC3\xB3n no es gratuita y requerir\xC3\xA1 un pago. \xC2\xBFContinuar\?"
#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 Instance, Platform = Any, Language = es, Definition = \"Continuar"
#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 Instance, Platform = Any, Language = es, Definition = \"Procesando fichero..."
#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 Instance, Platform = Any, Language = Default, Definition = \"Salir && Instalar"
#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 Instance, Platform = Any, Language = es, Definition = \"Listo para la instalaci\xC3\xB3n"
#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 Instance, Platform = Any, Language = es, Definition = \"Notas de informaci\xC3\xB3n: "
#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 Instance, Platform = Any, Language = es, Definition = \"Record\xC3\xA1rmelo m\xC3\xA1s tarde"
#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 Instance, Platform = Any, Language = es, Definition = \"La versi\xC3\xB3n actual es <<ThisVersion>> y existen actualizaciones. \xC2\xBFInstalar una actualizaci\xC3\xB3n\?"
#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 Version <<NewVersion>> installieren\?"
#Tag Instance, Platform = Any, Language = Default, Definition = \"Vous utilisez la version <<ThisVersion>>. Voulez-vous installer la version <<NewVersion>> \?"
#Tag Instance, Platform = Any, Language = es, Definition = \"La versi\xC3\xB3n utilizada actualmente es <<ThisVersion>>. \xC2\xBFActualizar a la versi\xC3\xB3n <<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 Instance, Platform = Any, Language = es, Definition = \"Saltarse esta versi\xC3\xB3n"
#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 Instance, Platform = Any, Language = es, Definition = \"Detener"
#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 Instance, Platform = Any, Language = fr, Definition = \"cette application"
#Tag Instance, Platform = Any, Language = es, Definition = \"esta aplicaci\xC3\xB3n"
#tag EndConstant

#tag Constant, Name = kThisVersionMarker, Type = String, Dynamic = False, Default = \"<<ThisVersion>>", Scope = Protected
Expand All @@ -171,16 +201,19 @@ Protected Module KajuLocale
#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 Instance, Platform = Any, Language = es, Definition = \"La operaci\xC3\xB3n ha excedido el tiempo m\xC3\xA1ximo."
#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 Instance, Platform = Any, Language = es, Definition = \"Reintentar"
#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 Instance, Platform = Any, Language = es, Definition = \"Intentar m\xC3\xA1s tarde"
#tag EndConstant

#tag Constant, Name = kVersionMarker, Type = String, Dynamic = False, Default = \"<<Version>>", Scope = Protected
Expand All @@ -189,16 +222,19 @@ Protected Module KajuLocale
#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 einem der folgenden Formate eingegeben werden"
#Tag Instance, Platform = Any, Language = fr, Definition = \"La version doit \xC3\xAAtre dans une de ces formes"
#Tag Instance, Platform = Any, Language = es, Definition = \"La versi\xC3\xB3n debe estar en una de las siguientes formas"
#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 Instance, Platform = Any, Language = es, Definition = \"Versiones 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 Instance, Platform = Any, Language = es, Definition = \"Actualizaci\xC3\xB3n disponible"
#tag EndConstant


Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ Translations to other languages by:

* Sascha Schneppmueller (German)
* Valdemar De SOUSA (French)
* Julen Ibarretxe Uriguen (Spanish)

With special thanks to [Advanced Medical Pricing Solutions, Inc.](http://www.advancedpricing.com), for making this possible.

Expand Down Expand Up @@ -331,11 +332,15 @@ Add a translation for each, then submit a pull request as outlined above.
- Moved user-presented strings to KajuLocale module for easier translation.
- 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.
- Added German translation.

1.2 (Jan. 12, 2015)

- Added timeout timer for downloads.
- Fixed transparency issue on Windows.
- Fixed some German translations.
- Added French translation.

1.2.1 (Jan. 13, 2015)

- Added Spanish translation.

0 comments on commit 4ae37da

Please sign in to comment.