Commit Graph

324 Commits

Author SHA1 Message Date
Ben Olden-Cooligan
8d608a7262 Merge branch 'master' into separate_projects
Conflicts:
	NAPS2.Core/Lang/tmx/bg.tmx
	NAPS2.Core/Lang/tmx/ca.tmx
	NAPS2.Core/Lang/tmx/cs.tmx
	NAPS2.Core/Lang/tmx/da.tmx
	NAPS2.Core/Lang/tmx/de.tmx
	NAPS2.Core/Lang/tmx/empty.tmx
	NAPS2.Core/Lang/tmx/es.tmx
	NAPS2.Core/Lang/tmx/fr.tmx
	NAPS2.Core/Lang/tmx/he.tmx
	NAPS2.Core/Lang/tmx/it.tmx
	NAPS2.Core/Lang/tmx/pl.tmx
	NAPS2.Core/Lang/tmx/pt-BR.tmx
	NAPS2.Core/Lang/tmx/pt-PT.tmx
	NAPS2.Core/Lang/tmx/ru.tmx
	NAPS2.Core/Lang/tmx/uk.tmx
	NAPS2/NAPS2.csproj
	NAPS2/WinForms/FDesktop.ru.resx
2014-10-14 18:07:16 -04:00
Ben Olden-Cooligan
40a8e653c2 Updated project file and language resources. 2013-12-13 13:23:06 -05:00
Ben Olden-Cooligan
b1fe3288dd Merge branch 'master' into separate_projects
Conflicts:
	NAPS2/NAPS2.csproj
	NAPS2/Setup/naps2.ps1
	NAPS2/Setup/setup.iss
2013-11-30 14:54:43 -05:00
Ben Olden-Cooligan
28843944cf Moved most code from the NAPS2 project to a new NAPS2.Core project, without Ninject/NLog dependencies. 2013-11-30 14:44:17 -05:00
Ben Olden-Cooligan
1d9576b563 Changed powershell script to exclude english translations 2013-11-30 13:42:26 -05:00
Ben Olden-Cooligan
2a3287cc41 Updated powershell scripts to use the .po files instead of .tmx. 2013-11-30 13:32:26 -05:00
Ben Olden-Cooligan
0d4caa23b0 Replaced tmx language files with latest po files from the translation website. 2013-11-30 13:31:44 -05:00
Ben Olden-Cooligan
90b4be1cc7 Merge branch 'master' of ssh://bitbucket.org/cyanfish/naps2 2013-11-24 12:32:51 -05:00
Ben Olden-Cooligan
4166ba7cba Fix for issue where image resolution is not preserved with black and white images. 2013-11-24 12:32:30 -05:00
Ben Olden-Cooligan
9550a6a14f Added third version component to version reading 2013-11-10 10:42:58 -05:00
Ben Olden-Cooligan
61ffa75bdd Changed compression level of MSI installer to medium (reduces size by ~38%) 2013-11-04 22:33:27 -05:00
Ben Olden-Cooligan
cc00388eec PUBLISH (2.6.3) 2013-11-03 19:01:01 -05:00
Ben Olden-Cooligan
3978585748 Added Bulgarian and Portuguese to setup configs. 2013-11-03 18:40:35 -05:00
Ben Olden-Cooligan
ac61a51ae6 Fixed pt-PT tmx/resources, added Bulgarian and Portuguese to language dropdown (adding support for country-specific languages). 2013-11-03 18:36:02 -05:00
Ben Olden-Cooligan
a700f38e7a Added Bulgarian and Portuguese resource files. Fixed TMX files as necessary. Fixed powershell script for country-specific languages. 2013-11-03 18:23:56 -05:00
Ben Olden-Cooligan
fc6d4c79e0 Added Bulgarian and Portuguese TMX files. 2013-11-03 18:18:07 -05:00
Ben Olden-Cooligan
5b8029d9d1 PUBLISH (2.6.2) 2013-10-05 19:56:20 -04:00
Ben Olden-Cooligan
7199cbe005 Added Danish localization files to EXE/MSI setup configurations 2013-10-05 19:46:05 -04:00
Ben Olden-Cooligan
6c27629c59 Added Danish to language dropdown 2013-10-05 19:43:44 -04:00
Ben Olden-Cooligan
b07476cde0 Added Danish resource files 2013-10-05 19:42:47 -04:00
Ben Olden-Cooligan
1eaf87cd92 Added Danish tmx file 2013-10-05 19:40:43 -04:00
Ben Olden-Cooligan
3ef0cad43c Image importer WIP 2013-09-30 20:15:44 -04:00
Ben Olden-Cooligan
30ef6c47fb PUBLISH (2.6.1) 2013-09-25 19:20:25 -04:00
Ben Olden-Cooligan
861eefec21 Fixed error when scanning after clearing previously scanned images.
Fixed console help text.
2013-09-25 19:17:41 -04:00
Ben Olden-Cooligan
0aa586fa53 Auto updater WIP 2013-09-25 19:10:26 -04:00
Ben Olden-Cooligan
adc8469793 Auto updater WIP 2013-09-22 18:32:51 -04:00
Ben Olden-Cooligan
cbe38d8093 Merge branch 'master' into auto_update
Conflicts:
	version.xml
2013-09-22 13:16:35 -04:00
Ben Olden-Cooligan
0df0c5341e Auto updater WIP 2013-09-22 13:15:38 -04:00
Ben Olden-Cooligan
e83fd83234 Auto updater WIP 2013-09-22 13:04:30 -04:00
Ben Olden-Cooligan
0492af1ced Added some debug output to the powershell publish script 2013-09-22 12:02:28 -04:00
Ben Olden-Cooligan
a3c19de8f3 Changed bin folder paths to remove the platform (x86) folder, so that the publish scripts match the paths correctly (I could have modified the publish scripts instead, but this was easier) 2013-09-22 12:00:40 -04:00
Ben Olden-Cooligan
22ba45de62 Modified publish configuration and scripts to handle the unique builds for each edition. 2013-09-22 11:53:31 -04:00
Ben Olden-Cooligan
d39529a3d5 Updated the DI configuration to correctly determine the Edition based upon the conditional compilation symbols of the various configurations. 2013-09-21 09:41:13 -04:00
Ben Olden-Cooligan
9ef1fe3c1b Updated project and solution configurations to move from Release/Standalone to InstallerEXE/MSI/StandaloneZIP/7Z. 2013-09-21 09:37:36 -04:00
Ben Olden-Cooligan
9679a17db9 Added auto updater types to CommonModule 2013-09-21 09:24:06 -04:00
Ben Olden-Cooligan
2acd479976 Merge branch 'import' into auto_update 2013-09-21 09:18:31 -04:00
Ben Olden-Cooligan
51293fa752 Auto updater WIP 2013-09-20 21:47:55 -04:00
Ben Olden-Cooligan
e9cc86bc08 Fixed version download url pattern 2013-09-19 21:25:36 -04:00
Ben Olden-Cooligan
8b7b15b593 Auto update WIP 2013-09-19 21:24:59 -04:00
Ben Olden-Cooligan
639ff3d731 More auto update WIP 2013-09-19 20:15:39 -04:00
Ben Olden-Cooligan
e37d453c83 Merge branch 'master' into auto_update 2013-09-18 19:24:48 -04:00
Ben Olden-Cooligan
c2c2ed2ec3 Changed the version file from a simple txt file to a more comprehensive xml file. 2013-09-18 19:24:16 -04:00
Ben Olden-Cooligan
f8930ddbc8 Auto update WIP 2013-09-18 19:23:01 -04:00
Ben Olden-Cooligan
50a9788244 Added new fields to UserConfig and AppConfig, and added some types relating to automatic updates. 2013-09-17 21:19:11 -04:00
Ben Olden-Cooligan
464c34f030 Added version.txt file to test the future auto-updater with. 2013-09-17 20:52:56 -04:00
Ben Olden-Cooligan
c2633f011e PUBLISH (2.6) 2013-09-08 20:15:13 -04:00
Ben Olden-Cooligan
4cd27396fd Added resource files to project file. 2013-09-08 20:14:01 -04:00
Ben Olden-Cooligan
5af7bbcebd Added Czech to the language dropdown. 2013-09-08 20:12:21 -04:00
Ben Olden-Cooligan
b7572aaeb4 Added Czech, French, and Polish localization files to the setup configurations. Fixed Catalan configuration for EXE installer. 2013-09-08 20:10:29 -04:00
Ben Olden-Cooligan
e9c23e5e56 Added Czech, French, and Polish resource files. 2013-09-08 20:05:54 -04:00