Commit graph

62 commits

Author SHA1 Message Date
Michael Delpach 85fdab3c56 Revert "Merge branch 'master' of https://github.com/ShareX/ShareX"
This reverts commit 2903ca1082, reversing
changes made to 195c0f2f8a.
2020-07-06 06:27:50 +08:00
Michael Delpach 2903ca1082 Merge branch 'master' of https://github.com/ShareX/ShareX 2020-07-06 06:26:47 +08:00
Jaex 40e802f9ce Clean .sxie registry 2020-06-30 22:44:36 +03:00
Michael Delpach b055f25531 Merge branch 'master' into tweaks 2020-06-03 05:57:09 +08:00
Jaex 9276c9927f #4774: Added pt-PT.resx files to setup 2020-05-08 14:28:02 +03:00
Michael Delpach b426a1ae67 Allow non-admin installations 2020-04-27 12:14:46 +08:00
Jaex a837226b50 Added "Override screenshots folder" option to hotkey task settings, task tab 2020-04-22 15:26:04 +03:00
Charles Milette f9624520ec
Add ARM64 to allowed architectures
Inno Setup 6 got installed recently on the AppVeyor images, which results in a regression where ARM64 machines can't install ShareX 13.1.0 or update to it, because the architecture now needs to be whitelisted.
2020-04-20 16:45:26 -04:00
Jaex 803a4e567c Update year 2020-02-05 10:19:48 +03:00
Jaex de88936bd7 Added resx files to csproj 2019-08-31 13:02:03 +03:00
Amir Pourmand c03a3091cc Add Persian Language to Setup (#4319)
* Create Resources.fa-IR.resx

* Add more translations

* adding Persian language to enums and langauge helper

* Ading Persian to Main form and resources

* translate about form

* translate Standard Record Form

* add Iran icon

* add Ir Icon to resources

* update Resource file

* update main Form

* fix adding IR File

* catching all Exceptions!

* Adding More Forms

* merge commit

* Add More

* Back To Version

* A little Change

* Add Persian Resource Files

* Add More Persian

* add more translation

* add more traslation

* add resource file Fa-IR

* Revert "merge commit"

This reverts commit e5f4a36f8c.

# Conflicts:
#	ShareX/Forms/TaskSettingsForm.Designer.cs
#	ShareX/Forms/TaskSettingsForm.resx

* Revert History Form to its original state

* make branches equal

* correct ir file

* delete IR

* Add Persian Language To Build
2019-08-30 13:59:51 +03:00
Jaex 879852cf04 Update inno scripts 2019-05-01 08:57:23 +03:00
Jaex 469fc29b87 Update year 2019-01-02 10:43:52 +03:00
Jaex 6ce681e761 Added es-MX to setup 2018-08-07 13:38:35 +03:00
Jaex 3769cef12c Add new language folders to setup 2018-04-30 12:03:13 +03:00
Jaex a28062b74a Clean edit image context menu item 2018-04-25 13:47:03 +03:00
Jaex 07b7ea8361 Add () to functions 2018-04-24 03:55:35 +03:00
Jaex e9b0e7256b Inno script check changes 2018-04-24 03:46:45 +03:00
Jaex cce5f7f005
Merge pull request #3243 from sylveon/inno-no-shortcut
Prevent the update process from recreating the desktop shortcut
2018-04-24 03:17:21 +03:00
Charles Milette 9e1a1c5730
Add a similar check for the context menu entry 2018-04-22 17:39:23 -04:00
Charles Milette 1e89178aa0
Add a similar check for send to and startup shortcuts 2018-04-22 17:28:30 -04:00
Jaex e747d5cccf Line ending 2018-04-20 00:22:39 +03:00
Nicedward a8ea7c53ab Add indonesian file (#3324)
* Add "indonesian.ini" file

Add indonesian

* Add "HotkeySelectionControl.id-ID.resx" file

add indonesian "HotkeySelectionControl.id-ID.resx"

* Add indonesian

Add ("AboutForm.id-ID.resx" "ActionsForm.id-ID.resx" "ActionsToolbarEditForm.id-ID.resx" "AfterCaptureForm.id-ID.resx" "AfterUploadForm.id-ID.resx" "ApplicationSettingsForm.id-ID.resx" "AutoCaptureForm.id-ID.resx" "BeforeUploadForm.id-ID.resx" "ClipboardFormatForm.id-ID.resx" "EncoderProgramForm.id-ID.resx" "FileExistForm.id-ID.resx" "FirstTimeConfigForm.id-ID.resx" "HotkeySettingsForm.id-ID.resx" "MainForm.id-ID.resx" "QRCodeForm.id-ID.resx" "QuickTaskInfoEditForm.id-ID.resx" "QuickTaskMenuEditorForm.id-ID.resx" "ScreenColorPicker.id-ID.resx" "ScreenRecordForm.id-ID.resx" "TaskSettingsForm.id-ID.resx" "VideoEncodersForm.id-ID.resx" "WatchFolderForm.id-ID.resx")

* Add "Resources.id-ID.resx" file

Add indonesian

* Add indonesian

Add "ColorPickerForm.id-ID.resx" "GradientPickerForm.id-ID.resx"

* Add indonesian

Add "ExportImportControl.id-ID.resx" "MyPictureBox.id-ID.resx"

* Add "DNSChangerForm.id-ID.resx"

Add "DNSChangerForm.id-ID.resx" file

* Add indonesian

Add "ClipboardContentViewer.id-ID.resx" "DebugForm.id-ID.resx" "ErrorForm.id-ID.resx" "HashCheckForm.id-ID.resx" "InputBox.id-ID.resx" "MonitorTestForm.id-ID.resx"

* Add indonesian

Add "PrintTextForm.id-ID.resx" "PrintForm.id-ID.resx"

* Add "Resources.id-ID.resx" file

Add "Resources.id-ID.resx"

* Add indonesian

Add "UpdateMessageBox.id-ID.resx" "DownloaderForm.id-ID.resx" "UpdateCheckerLabel.id-ID.resx"

* Add indonesian

Add "HistoryForm.id-ID.resx" "HistoryItemInfoForm.id-ID.resx" "ImageHistoryForm.id-ID.resx"

* delete

* delete

* delete

* Add " ImageEffectsForm.id-ID.resx"

Add " ImageEffectsForm.id-ID.resx" file

* Add "Resources.id-ID.resx" file

Add "Resources.id-ID.resx" file

* Add indonesian

Add "VideoThumbnailerForm.id-ID.resx" "ImageCombinerForm.id-ID.resx" "ImageThumbnailerForm.id-ID.resx"

* Add "Resources.id-ID.resx" file

Add "Resources.id-ID.resx" file

* add indonesian

Add "CanvasSizeForm.id-ID.resx" "EditorStartupForm.id-ID.resx" "FFmpegOptionsForm.id-ID.resx" "ImageInsertForm.id-ID.resx" "ImageSizeForm.id-ID.resx" "NewImageForm.id-ID.resx" "ScrollingCaptureForm.id-ID.resx" "TextDrawingInputBox.id-ID.resx" "WebpageCaptureForm.id-ID.resx"

* Add "Resources.id-ID.resx" file

Add "Resources.id-ID.resx" file

* Add indonesian

Add "AccountsControl.id-ID.resx" "AccountTypeControl.id-ID.resx" "OAuthControl.id-ID.resx"

* Add indonesian

Add "EmailForm.id-ID.resx" "JiraUpload.id-ID.resx" "OAuthWebForm.id-ID.resx" "OCRSpaceForm.id-ID.resx" "ResponseForm.id-ID.resx" "TwitterTweetForm.id-ID.resx" "UploadersConfigForm.id-ID.resx" "UserPassBox.id-ID.resx"

* Add "FTPClientForm.id-ID.resx" file

Add "FTPClientForm.id-ID.resx" file

* Add " Resources.id-ID.resx" file

Add " Resources.id-ID.resx" file
2018-04-20 00:05:49 +03:00
Jaex 8eb9b9ef34 Removed unused registry 2018-04-03 00:04:04 +03:00
Charles Milette df5ed2a9ee
Prevent the update process from recreating the desktop shortcut 2018-03-25 16:36:15 -04:00
Jaex a4744ce0bf Copy stickers folder in setup script 2018-03-16 22:58:25 +03:00
Jaex d2a6da448c Fix recorder devices setup 2018-03-13 09:46:08 +03:00
Jaex d4dffd5eb3 Ready page and memo must be enabled for dependency to download 2018-03-12 20:13:10 +03:00
Jaex 048e2c877d Check for .NET Framework 4.6.2 2018-03-12 18:45:12 +03:00
Jaex 0412610e65 Fix missing custom message issue 2018-03-12 17:55:49 +03:00
Jaex 743104d1c0 fixed #2823: Added /NORUN parameter to setup which can be used together with /VERYSILENT to install ShareX without run it afterwards 2018-03-11 15:12:37 +03:00
Jaex fa22ad8b2a Not using 7-Zip anymore 2018-03-03 00:06:40 +03:00
Jaex 1207b8f01a Fix inno setup script 2018-02-28 18:29:25 +03:00
Jaex cbc5412b15 Update inno setup scripts 2018-02-28 17:23:01 +03:00
Jaex 1d6343605f Update InnoSetup Dependency Installer 2018-02-28 16:40:20 +03:00
Jaex cb2fec9ef4 Update recorder devices setup version 2018-02-15 21:21:02 +03:00
Jaex b463a16567 Update year 2018-01-01 17:59:14 +03:00
Jaex d406a33a16 Added 7za.exe to setup 2017-12-18 12:04:22 +03:00
Jaex 408f1d2d84 Invalid field 2017-08-07 00:09:47 +03:00
Jaex 4d6dc31f09 Added it-IT to setup 2017-08-06 23:55:03 +03:00
Jaex d42acd468a Fix setup script output issue 2017-04-22 23:49:45 +03:00
Jaex ad5e19f060 Moved setup output to project directory 2017-04-22 20:37:50 +03:00
Jaex 528d459db3 Added zh-TW language to setup script 2017-04-12 23:55:39 +03:00
Jaex afdb6054c4 Change file name of native messaging host file 2017-02-10 17:43:29 +03:00
Jaex dce13417f5 Update year 2017-01-26 14:03:00 +03:00
Jaex 2d2a14469b Make sure to uninstall custom uploader extension 2017-01-13 22:09:38 +03:00
Jaex f7951f4b75 fixed #2154: Allow decimal value for auto capture interval 2016-12-15 18:38:33 +03:00
Jaex 7e344ba34e InnoSetup script variable name changes 2016-12-14 20:32:21 +03:00
Jaex 1cd1f0f115 Added uploader filter update button functionality 2016-11-07 03:16:24 +03:00
Jaex 6ca51101d5 Fix ShareX_Chrome.exe path 2016-08-27 02:04:12 +03:00