Merge Package fixes from MarcRiera\Release

Conflicts: openBVE/OpenBve/UserInterface/formMain.Designer.cs openBVE/OpenBve/UserInterface/formMain.Packages.cs openBVE/OpenBve/UserInterface/formMain.resx openBVE/OpenBveApi/Packages.cs
leezer3 · Jul 6, 2016 · 0b6e9cf · 0b6e9cf
2 parents 061f487 + 87adc8e
commit 0b6e9cf
Show file tree

Hide file tree

Showing 29 changed files with 6,955 additions and 5,864 deletions.
diff --git a/openBVE/OpenBve/Data/Languages/ca-ES.cfg b/openBVE/OpenBve/Data/Languages/ca-ES.cfg
@@ -1,5 +1,5 @@
 ; openBVE interface language configuration file
-; last updated: 2016-06-23
+; last updated: 2016-07-06
 ; by Marc Riera Irigoyen
 
 [program]
@@ -132,36 +132,38 @@ list_minimum = Versió mínima
 list_maximum = Versió màxima
 list_author = Autor
 list_website = Lloc web
+list_packagetype = Tipus
 install = Instal·la
-install_button = Instal·la
+install_button = Instal·la un paquet
 install_header = Instal·la un paquet
 install_invalid = Aquest fitxer no és un paquet vàlid per a OpenBVE.
 install_version_error = Error en la versió del paquet
-install_version_new = El paquet seleccionat ja es troba instal·lat, i es troba en una versió posterior.
-install_version_old = El paquet seleccionat ja es troba instal·lat, i es troba en una versió anterior.
-install_version_same = El paquet seleccionat ja es troba instal·lat, i es troba en la mateixa versió.
+install_version_new = Ja hi ha instal·lada una versió posterior del paquet seleccionat.
+install_version_old = Ja hi ha instal·lada una versió anterior del paquet seleccionat.
+install_version_same = Ja hi ha instal·lada la mateixa versió del paquet seleccionat.
 install_success = S'han instal·lat els paquets correctament.
 install_success_header = Instal·lació completada
 install_success_files = Llistat de fitxers instal·lats:
 install_select = Selecciona un paquet...
 install_dependancies_unmet = El paquet actual té dependències que no es poden resoldre.
 install_dependancies_unmet_header = Error de dependències
 install_dependancies_broken = Les següents dependències quedaran trencades si continueu:
-install_reccomends_unmet = The following packages are reccomended, but not installed:
-install_reccomends_unmet_header = Reccomended Packages
+install_reccomends_unmet = Els següents paquets estan recomanats però no es troben instal·lats:
+install_reccomends_unmet_header = Paquets recomanats
 install_name = Nom del paquet:
 install_author = Autor del paquet:
 install_version = Versió del paquet:
 install_website = Lloc web del paquet:
 install_description = Descripció del paquet:
-creation_button = Nou
+creation_button = Nou paquet
 creation_header = Crea un paquet
 creation_saveas_button = Desa...
 creation_saveas_label = Desa a:
 creation_dependancies = Seleccioneu les dependències
-creation_dependancies_add = Afegeix dependències
+creation_dependancies_add = Afegeix una dependència
+creation_dependancies_remove = Elimina
 creation_dependancies_nextstep = Ara podreu assignar els detalls i les dependències del paquet.
-creation_reccommends_add = Afegeix recomanació
+creation_reccommends_add = Afegeix una recomanació
 creation_clearselection = Esborra la selecció
 creation_additems = Afegir fitxers
 creation_selecteditems = Es crearà un paquet amb els fitxers i carpetes següents:
@@ -176,7 +178,7 @@ creation_success = S'ha creat el paquet correctament.
 creation_success_header = Paquet creat correctament
 creation_success_files = S'han afegit els fitxers següents al paquet:
 creation_proceed = Continua...
-creation_invalid_filename = El nom del fitxer no és vàlid. \r\n Torneu-ho a intentar
+creation_invalid_filename = El nom del fitxer no és vàlid. \r\n Torneu-ho a intentar.
 creation_new_id = El nou paquet té assignat el següent GUID:
 creation_replace_id = Reeemplaça el paquet amb el GUID següent:
 creation_save = Desa el paquet
@@ -195,14 +197,27 @@ uninstall_failure_header = Error de desinstal·lació
 uninstall_success = S'ha esborrat el paquet correctament.
 uninstall_success_header = Paquet esborrat correctament
 uninstall_log = A continuació es mostra el registre:
-uninstall_button = Esborra
+uninstall_button = Esborra un paquet
 uninstall_broken = Alguns paquets instal·lats quedaran trencats si continueu.
 uninstall_missing_xml = No s'ha pogut esborrar el paquet seleccionat. \r\n No s'ha trobat la llista de fitxers XML.
 uninstall_database_remove = Voleu esborrar aquest paquet de la base de dades?
 database_save_error = S'ha produït un error quan es desava la base de dades dels paquets. \r\n Comproveu els permisos d'escriptura.
 version_new = Nova versió:
 version_current = Versió actual:
-success = Finished!
+success = Completat!
+selected = Paquets seleccionats
+dependancy = Dependència
+recommendation = Recomanació
+error_action = Seleccioneu què voleu fer amb el paquet:
+error_overwrite = Sobreescriu-lo
+error_replace = Reemplaça'l
+button_next = Següent >
+button_back = < Enrere
+button_cancel = Cancel·la
+button_install = Instal·la
+button_create = Crea
+button_ignore = Ignora
+button_abort = Avorta
 
 [controls]
 title = Personalitza els controls
@@ -326,6 +341,7 @@ other_timetable_mode_none = Cap
 other_timetable_mode_default = Per defecte
 other_timetable_mode_autogenerated = Horari autogenerat
 other_timetable_mode_prefercustom = Horari personalitzat
+package_choose = Tria...
 package_route_directory = Carpeta d'instal·lació de rutes:
 package_train_directory = Carpeta d'instal·lació de trens:
 package_other_directory = Carpeta d'instal·lació d'altres paquets:

diff --git a/openBVE/OpenBve/Data/Languages/cs-CZ.cfg b/openBVE/OpenBve/Data/Languages/cs-CZ.cfg
@@ -132,6 +132,7 @@ list_minimum = Minimum Version
 list_maximum = Maximum Version
 list_author = Author
 list_website = Website
+list_packagetype = Type
 install = Install
 install_button = Install Package
 install_header = Install a Package
@@ -160,6 +161,7 @@ creation_saveas_button = Save As...
 creation_saveas_label = Save package as:
 creation_dependancies = Select Dependancies
 creation_dependancies_add = Add Dependancy
+creation_dependancies_remove = Remove
 creation_dependancies_nextstep = Package details and dependancies may be assigned in the following steps.
 creation_reccommends_add = Add Reccomendation
 creation_clearselection = Clear Selection
@@ -203,6 +205,19 @@ database_save_error = An error occured whilst saving the package database. \r\n
 version_new = New version:
 version_current = Current version:
 success = Finished!
+selected = Selected Packages
+dependancy = Dependancy
+recommendation = Recommendation
+error_action = Please select the action you wish to take:
+error_overwrite = Overwrite
+error_replace = Replace
+button_next = Next >
+button_back = < Back
+button_cancel = Cancel
+button_install = Install
+button_create = Create
+button_ignore = Ignore
+button_abort = Abort
 
 [controls]
 title = Nastavení ovládacích prvků
@@ -326,6 +341,7 @@ other_timetable_mode_none = None
 other_timetable_mode_default = Default
 other_timetable_mode_autogenerated = Auto-generated timetable
 other_timetable_mode_prefercustom = Prefer custom timetable
+package_choose = Choose...
 package_route_directory = Route installation directory:
 package_train_directory = Train installation directory:
 package_other_directory = Other items installation directory:

diff --git a/openBVE/OpenBve/Data/Languages/de-CH.cfg b/openBVE/OpenBve/Data/Languages/de-CH.cfg
@@ -132,6 +132,7 @@ list_minimum = Minimum Version
 list_maximum = Maximum Version
 list_author = Author
 list_website = Website
+list_packagetype = Type
 install = Install
 install_button = Install Package
 install_header = Install a Package
@@ -160,6 +161,7 @@ creation_saveas_button = Save As...
 creation_saveas_label = Save package as:
 creation_dependancies = Select Dependancies
 creation_dependancies_add = Add Dependancy
+creation_dependancies_remove = Remove
 creation_dependancies_nextstep = Package details and dependancies may be assigned in the following steps.
 creation_reccommends_add = Add Reccomendation
 creation_clearselection = Clear Selection
@@ -203,6 +205,19 @@ database_save_error = An error occured whilst saving the package database. \r\n
 version_new = New version:
 version_current = Current version:
 success = Finished!
+selected = Selected Packages
+dependancy = Dependancy
+recommendation = Recommendation
+error_action = Please select the action you wish to take:
+error_overwrite = Overwrite
+error_replace = Replace
+button_next = Next >
+button_back = < Back
+button_cancel = Cancel
+button_install = Install
+button_create = Create
+button_ignore = Ignore
+button_abort = Abort
 
 [controls]
 title = Steuerung anpassen
@@ -326,6 +341,7 @@ other_timetable_mode_none = None
 other_timetable_mode_default = Default
 other_timetable_mode_autogenerated = Auto-generated timetable
 other_timetable_mode_prefercustom = Prefer custom timetable
+package_choose = Choose...
 package_route_directory = Route installation directory:
 package_train_directory = Train installation directory:
 package_other_directory = Other items installation directory:

diff --git a/openBVE/OpenBve/Data/Languages/de-DE.cfg b/openBVE/OpenBve/Data/Languages/de-DE.cfg
@@ -132,6 +132,7 @@ list_minimum = Minimum Version
 list_maximum = Maximum Version
 list_author = Author
 list_website = Website
+list_packagetype = Type
 install = Install
 install_button = Install Package
 install_header = Install a Package
@@ -160,6 +161,7 @@ creation_saveas_button = Save As...
 creation_saveas_label = Save package as:
 creation_dependancies = Select Dependancies
 creation_dependancies_add = Add Dependancy
+creation_dependancies_remove = Remove
 creation_dependancies_nextstep = Package details and dependancies may be assigned in the following steps.
 creation_reccommends_add = Add Reccomendation
 creation_clearselection = Clear Selection
@@ -203,6 +205,19 @@ database_save_error = An error occured whilst saving the package database. \r\n
 version_new = New version:
 version_current = Current version:
 success = Finished!
+selected = Selected Packages
+dependancy = Dependancy
+recommendation = Recommendation
+error_action = Please select the action you wish to take:
+error_overwrite = Overwrite
+error_replace = Replace
+button_next = Next >
+button_back = < Back
+button_cancel = Cancel
+button_install = Install
+button_create = Create
+button_ignore = Ignore
+button_abort = Abort
 
 [controls]
 title = Steuerung anpassen
@@ -326,6 +341,7 @@ other_timetable_mode_none = None
 other_timetable_mode_default = Default
 other_timetable_mode_autogenerated = Auto-generated timetable
 other_timetable_mode_prefercustom = Prefer custom timetable
+package_choose = Choose...
 package_route_directory = Route installation directory:
 package_train_directory = Train installation directory:
 package_other_directory = Other items installation directory:

diff --git a/openBVE/OpenBve/Data/Languages/en-GB.cfg b/openBVE/OpenBve/Data/Languages/en-GB.cfg
@@ -1,4 +1,4 @@
-; openBVE interface language configuration file
+; openBVE interface language configuration file
 ; last updated: 2016-02-21
 ; by 
 
@@ -132,6 +132,7 @@ list_minimum = Minimum Version
 list_maximum = Maximum Version
 list_author = Author
 list_website = Website
+list_packagetype = Type
 install = Install
 install_button = Install Package
 install_header = Install a Package
@@ -147,8 +148,8 @@ install_select = Select Package......
 install_dependancies_unmet = The current package has unmet dependancies.
 install_dependancies_unmet_header = Dependancy Error
 install_dependancies_broken = The following dependancies may be broken by this action:
-install_reccomends_unmet = The following packages are reccomended, but not installed:
-install_reccomends_unmet_header = Reccomended Packages
+install_reccomends_unmet = The following packages are recommended, but not installed:
+install_reccomends_unmet_header = Recommended Packages
 install_name = Package Name:
 install_author = Package Author:
 install_version = Package Version:
@@ -160,12 +161,13 @@ creation_saveas_button = Save As...
 creation_saveas_label = Save package as:
 creation_dependancies = Select Dependancies
 creation_dependancies_add = Add Dependancy
+creation_dependancies_remove = Remove
 creation_dependancies_nextstep = Package details and dependancies may be assigned in the following steps.
-creation_reccommends_add = Add Reccomendation
+creation_reccommends_add = Add Recommendation
 creation_clearselection = Clear Selection
 creation_additems = Add Item(s)
 creation_selecteditems = The following files and folders will be packaged:
-creation_new_guid = The new package has been assinged the following GUID:
+creation_new_guid = The new package has been assigned the following GUID:
 creation_header = Enter Package Details
 creation_name = Please enter a package name.
 creation_author = Please enter a package author.
@@ -177,7 +179,7 @@ creation_success_header = Package Creation Successful
 creation_success_files = The following files were added to your package:
 creation_proceed = Proceed......
 creation_invalid_filename = The selected filename is invalid- Please retry.
-creation_new_id = The new package has been assinged the following GUID:
+creation_new_id = The new package has been assigned the following GUID:
 creation_replace_id = Replacing the package with the following GUID:
 creation_save = Save Package
 creation_replace = Is this to replace an existing package?
@@ -203,6 +205,19 @@ database_save_error = An error occured whilst saving the package database. \r\n
 version_new = New version:
 version_current = Current version:
 success = Finished!
+selected = Selected Packages
+dependancy = Dependancy
+recommendation = Recommendation
+error_action = Please select the action you wish to take:
+error_overwrite = Overwrite
+error_replace = Replace
+button_next = Next >
+button_back = < Back
+button_cancel = Cancel
+button_install = Install
+button_create = Create
+button_ignore = Ignore
+button_abort = Abort
 
 [controls]
 title = Customize controls
@@ -326,6 +341,7 @@ other_timetable_mode_none = None
 other_timetable_mode_default = Default
 other_timetable_mode_autogenerated = Auto-generated timetable
 other_timetable_mode_prefercustom = Prefer custom timetable
+package_choose = Choose...
 package_route_directory = Route installation directory:
 package_train_directory = Train installation directory:
 package_other_directory = Other items installation directory:

diff --git a/openBVE/OpenBve/Data/Languages/en-US.cfg b/openBVE/OpenBve/Data/Languages/en-US.cfg
@@ -132,6 +132,7 @@ list_minimum = Minimum Version
 list_maximum = Maximum Version
 list_author = Author
 list_website = Website
+list_packagetype = Type
 install = Install
 install_button = Install Package
 install_header = Install a Package
@@ -160,6 +161,7 @@ creation_saveas_button = Save As...
 creation_saveas_label = Save package as:
 creation_dependancies = Select Dependancies
 creation_dependancies_add = Add Dependancy
+creation_dependancies_remove = Remove
 creation_dependancies_nextstep = Package details and dependancies may be assigned in the following steps.
 creation_reccommends_add = Add Reccomendation
 creation_clearselection = Clear Selection
@@ -203,6 +205,19 @@ database_save_error = An error occured whilst saving the package database. \r\n
 version_new = New version:
 version_current = Current version:
 success = Finished!
+selected = Selected Packages
+dependancy = Dependancy
+recommendation = Recommendation
+error_action = Please select the action you wish to take:
+error_overwrite = Overwrite
+error_replace = Replace
+button_next = Next >
+button_back = < Back
+button_cancel = Cancel
+button_install = Install
+button_create = Create
+button_ignore = Ignore
+button_abort = Abort
 
 [controls]
 title = Customize controls
@@ -326,6 +341,7 @@ other_timetable_mode_none = None
 other_timetable_mode_default = Default
 other_timetable_mode_autogenerated = Auto-generated timetable
 other_timetable_mode_prefercustom = Prefer custom timetable
+package_choose = Choose...
 package_route_directory = Route installation directory:
 package_train_directory = Train installation directory:
 package_other_directory = Other items installation directory:

diff --git a/openBVE/OpenBve/Data/Languages/es-ES.cfg b/openBVE/OpenBve/Data/Languages/es-ES.cfg
@@ -132,6 +132,7 @@ list_minimum = Minimum Version
 list_maximum = Maximum Version
 list_author = Author
 list_website = Website
+list_packagetype = Type
 install = Install
 install_button = Install Package
 install_header = Install a Package
@@ -160,6 +161,7 @@ creation_saveas_button = Save As...
 creation_saveas_label = Save package as:
 creation_dependancies = Select Dependancies
 creation_dependancies_add = Add Dependancy
+creation_dependancies_remove = Remove
 creation_dependancies_nextstep = Package details and dependancies may be assigned in the following steps.
 creation_reccommends_add = Add Reccomendation
 creation_clearselection = Clear Selection
@@ -203,6 +205,19 @@ database_save_error = An error occured whilst saving the package database. \r\n
 version_new = New version:
 version_current = Current version:
 success = Finished!
+selected = Selected Packages
+dependancy = Dependancy
+recommendation = Recommendation
+error_action = Please select the action you wish to take:
+error_overwrite = Overwrite
+error_replace = Replace
+button_next = Next >
+button_back = < Back
+button_cancel = Cancel
+button_install = Install
+button_create = Create
+button_ignore = Ignore
+button_abort = Abort
 
 [controls]
 title = Controles
@@ -326,6 +341,7 @@ other_timetable_mode_none = None
 other_timetable_mode_default = Default
 other_timetable_mode_autogenerated = Auto-generated timetable
 other_timetable_mode_prefercustom = Prefer custom timetable
+package_choose = Choose...
 package_route_directory = Route installation directory:
 package_train_directory = Train installation directory:
 package_other_directory = Other items installation directory: