Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
dasa committed Sep 26, 2013
2 parents dc8ea39 + dcad2d8 commit b458e2c
Show file tree
Hide file tree
Showing 60 changed files with 1,404 additions and 759 deletions.
10 changes: 6 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Esri welcomes contributions from anyone and everyone. Please see our
[guidelines for contributing](https://github.com/esri/contributing).

# Contributing to ArcGIS Viewer for Flex

There are many ways you can contribute to the [ArcGIS Viewer for Flex](http://links.esri.com/flexviewer).
Expand Down Expand Up @@ -26,12 +29,11 @@ The [ArcGIS Viewer for Flex](http://links.esri.com/flexviewer) is built by the F
7. Test your code.

### Submitting changes
1. Read the License section below.
2. Push the changes in your feature branch to your repo.
3. Submit a [pull request](https://help.github.com/articles/using-pull-requests) against the "develop" branch. Submitting a pull request will open a GitHub issue.
1. Push the changes in your feature branch to your repo.
2. Submit a [pull request](https://help.github.com/articles/using-pull-requests) against the "develop" branch. Submitting a pull request will open a GitHub issue.
* Clearly describe the issue including steps to reproduce; or if an enhancement, indicate the functionality you built.

## License
By contributing your code, you agree to license your contribution under the terms of the [Apache License 2.0](https://github.com/Esri/arcgis-viewer-flex/blob/master/license.txt). See item 5 of [https://github.com/Esri/arcgis-viewer-flex/blob/master/license.txt](https://github.com/Esri/arcgis-viewer-flex/blob/master/license.txt) for more details.

[1]: https://github.com/Esri/arcgis-viewer-flex/wiki/Coding-Conventions
[1]: https://github.com/Esri/arcgis-viewer-flex/wiki/Coding-Conventions
2 changes: 1 addition & 1 deletion build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ fb.debug.dir=bin-debug
fb.workspace.project.name=FlexViewer

# Locales to create resource modules for
locale.modules=ar,da_DK,de_DE,en_US,es_ES,et_EE,fr_FR,he_IL,it_IT,ja_JP,ko_KR,lt_LT,lv_LV,nb_NO,nl_NL,pl_PL,pt_BR,pt_PT,ro_RO,ru_RU,sv_SE,zh_CN
locale.modules=ar,da_DK,de_DE,en_US,es_ES,et_EE,fi_FI,fr_FR,he_IL,it_IT,ja_JP,ko_KR,lt_LT,lv_LV,nb_NO,nl_NL,pl_PL,pt_BR,pt_PT,ro_RO,ru_RU,sv_SE,zh_CN
2 changes: 2 additions & 0 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@
//flashvars.resourceModuleURLs = "assets/locale/es_ES.swf";
//flashvars.localeChain = "et_EE";
//flashvars.resourceModuleURLs = "assets/locale/et_EE.swf";
//flashvars.localeChain = "fi_FI";
//flashvars.resourceModuleURLs = "assets/locale/fi_FI.swf";
//flashvars.localeChain = "fr_FR";
//flashvars.resourceModuleURLs = "assets/locale/fr_FR.swf";
//flashvars.localeChain = "he_IL";
Expand Down
6 changes: 4 additions & 2 deletions locale/ar/ViewerStrings.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


contextMenuText=حول ArcGIS Viewer for Flex...
aboutText=يستخدم هذا التطبيق ArcGIS Viewer 3.4 for Flex.
aboutText=يستخدم هذا التطبيق ArcGIS Viewer 3.5 for Flex.
aboutLearnMoreBtn=تعلم المزيد
aboutCloseBtn=إغلاق

Expand Down Expand Up @@ -84,7 +84,7 @@ faultDetail=تفاصيل الخطأ: {0}

parseConfigErrorText=حدثت مشكلة أثناء تحليل ملف تكوين {0}
standalonePlayerExternalInterfaceErrorText=حدث خطأ ما. لا يعمل ExternalInterface في مشغل مستقل.
layerFailedToLoad:فشل تحميل الطبقة {0}: {1}
layerFailedToLoad=فشل تحميل الطبقة {0}: {1}
couldNotFetchBasemapData=تعذر إحضار بيانات خريطة الأساس:\n{0}
couldNotConnectToPortal=تعذر الاتصال بالمدخل.
couldNotQueryPortal=تعذر الاستعلام عن المدخل.
Expand Down Expand Up @@ -250,6 +250,8 @@ step1ErrorLabel=رجاء اختيار المساحة المرغوب فيها.
step2ErrorLabel=رجاء اختيار طبقات لاستخراجها.
emptyResultsLabel=تم إكمال المهمة ولكن لم تظهر أية نتائج.
saveDataFileLabel=تم إنشاء ملف البيانات. هل ترغب في حفظه؟
selectAllLabel=تحديد الكل
deselectAllLabel=إلغاء تحديد الكل


attributesLabel=البيانات الجدولية
Expand Down
6 changes: 4 additions & 2 deletions locale/da_DK/ViewerStrings.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


contextMenuText=Om ArcGIS Viewer for Flex...
aboutText=Denne applikation bruger ArcGIS Viewer 3.4 for Flex.
aboutText=Denne applikation bruger ArcGIS Viewer 3.5 for Flex.
aboutLearnMoreBtn=Lær mere
aboutCloseBtn=Luk

Expand Down Expand Up @@ -84,7 +84,7 @@ faultDetail=Fejldetaljer: {0}

parseConfigErrorText=Der opstod et problem under analyse af konfigurationsfilen {0}
standalonePlayerExternalInterfaceErrorText=Der opstod en fejl. ExternalInterface fungerer ikke sammen med den enkeltstående afspiller.
layerFailedToLoad:{0} lag kunne ikke indlæse: {1}
layerFailedToLoad={0} lag kunne ikke indlæse: {1}
couldNotFetchBasemapData=Kunne ikke hente baggrundskortdata:\n{0}
couldNotConnectToPortal=Kunne ikke oprette forbindelse til portalen.
couldNotQueryPortal=Kunne ikke sende forespørgsel til portalen.
Expand Down Expand Up @@ -250,6 +250,8 @@ step1ErrorLabel=Vælg et interesseområde.
step2ErrorLabel=Vælg de lag, der skal udtrækkes.
emptyResultsLabel=Opgave fuldført, men der er ikke returneret nogen resultater.
saveDataFileLabel=Datafil oprettet. Vil du gemme den?
selectAllLabel=Markér alle
deselectAllLabel=Fravælg alle


attributesLabel=Attributter
Expand Down
6 changes: 4 additions & 2 deletions locale/de_DE/ViewerStrings.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


contextMenuText=Info zu ArcGIS Viewer for Flex...
aboutText=Diese Anwendung verwendet ArcGIS Viewer 3.4 for Flex.
aboutText=Diese Anwendung verwendet ArcGIS Viewer 3.5 for Flex.
aboutLearnMoreBtn=Weitere Informationen
aboutCloseBtn=Schließen

Expand Down Expand Up @@ -84,7 +84,7 @@ faultDetail=Fehlerdetails: {0}

parseConfigErrorText=Problem beim Parsen der Konfigurationsdatei {0}
standalonePlayerExternalInterfaceErrorText=Ein Fehler ist aufgetreten. ExternalInterface funktioniert nicht in eigenständigem Player.
layerFailedToLoad:Layer "{0}" konnte nicht geladen werden: {1}
layerFailedToLoad=Layer "{0}" konnte nicht geladen werden: {1}
couldNotFetchBasemapData=Grundkartendaten konnten nicht abgerufen werden:\n{0}
couldNotConnectToPortal=Verbindung zum Portal konnte nicht hergestellt werden.
couldNotQueryPortal=Portal konnte nicht abgefragt werden.
Expand Down Expand Up @@ -250,6 +250,8 @@ step1ErrorLabel=Wählen Sie einen Interessensbereich aus.
step2ErrorLabel=Wählen Sie die zu extrahierenden Layer aus.
emptyResultsLabel=Der Task wurde abgeschlossen, hat aber keine Ergebnisse zurückgegeben.
saveDataFileLabel=Die Datendatei wurde erstellt. Möchten Sie sie speichern?
selectAllLabel=Alle auswählen
deselectAllLabel=Auswahl für alle aufheben


attributesLabel=Attribute
Expand Down
6 changes: 4 additions & 2 deletions locale/en_US/ViewerStrings.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -- UI related messages for the context menu on the map, in addition to messages from the api --
#
contextMenuText=About ArcGIS Viewer for Flex...
aboutText=This application is using ArcGIS Viewer for Flex version 3.4.
aboutText=This application is using ArcGIS Viewer for Flex version 3.5.
aboutLearnMoreBtn=Learn more
aboutCloseBtn=Close

Expand Down Expand Up @@ -84,7 +84,7 @@ faultDetail=Fault details: {0}
########## Errors
parseConfigErrorText=A problem occurred while parsing the configuration file {0}
standalonePlayerExternalInterfaceErrorText=Some error occurred. ExternalInterface doesn't work in Standalone player.
layerFailedToLoad:{0} layer failed to load: {1}
layerFailedToLoad={0} layer failed to load: {1}
couldNotFetchBasemapData=Could not fetch basemap data:\n{0}
couldNotConnectToPortal=Could not connect to Portal.
couldNotQueryPortal=Could not query portal.
Expand Down Expand Up @@ -250,6 +250,8 @@ step1ErrorLabel=Please select an area of interest.
step2ErrorLabel=Please select layers to extract.
emptyResultsLabel=Task completed but didn't return any results.
saveDataFileLabel=Data file created. Would you like to save it?
selectAllLabel=Select all
deselectAllLabel=Deselect all

########## Edit Widget
attributesLabel=Attributes
Expand Down
6 changes: 4 additions & 2 deletions locale/es_ES/ViewerStrings.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


contextMenuText=Acerca de ArcGIS Viewer for Flex...
aboutText=Esta aplicación utiliza ArcGIS Viewer 3.4 for Flex.
aboutText=Esta aplicación utiliza ArcGIS Viewer 3.5 for Flex.
aboutLearnMoreBtn=Más información
aboutCloseBtn=Cerrar

Expand Down Expand Up @@ -84,7 +84,7 @@ faultDetail=Detalles del fallo: {0}

parseConfigErrorText=Se encontró un problema mientras se analizaba el archivo de configuración {0}
standalonePlayerExternalInterfaceErrorText=Ha ocurrido un error. ExternalInterface no funciona en el reproductor independiente.
layerFailedToLoad:No se pudo cargar la capa {0}: {1}
layerFailedToLoad=No se pudo cargar la capa {0}: {1}
couldNotFetchBasemapData=No se pudieron recuperar los datos del mapa base:\n{0}
couldNotConnectToPortal=No se pudo conectar con el Portal.
couldNotQueryPortal=No se pudo consultar el portal.
Expand Down Expand Up @@ -250,6 +250,8 @@ step1ErrorLabel=Seleccione un área de interés.
step2ErrorLabel=Seleccione las capas para extraer.
emptyResultsLabel=La tarea se completó pero no produjo ningún resultado.
saveDataFileLabel=Se creó el archivo de datos. ¿Desea guardarlo?
selectAllLabel=Seleccionar todo
deselectAllLabel=Deseleccionar todo


attributesLabel=Atributos
Expand Down
6 changes: 4 additions & 2 deletions locale/et_EE/ViewerStrings.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


contextMenuText=ArcGIS Viewer for Flex rakendusest...
aboutText=Antud rakendus kasutab ArcGIS Viewer 3.4 for Flex versiooni.
aboutText=Antud rakendus kasutab ArcGIS Viewer 3.5 for Flex versiooni.
aboutLearnMoreBtn=Loe lähemalt
aboutCloseBtn=Sulge

Expand Down Expand Up @@ -84,7 +84,7 @@ faultDetail=Vea detailid: {0}

parseConfigErrorText=Konfiguratsiooni faili parsimisel esines probleem: {0}
standalonePlayerExternalInterfaceErrorText=Tekkis viga. ExternalInterface ei toimi iseseisvas mängijas.
layerFailedToLoad:{0} kihi laadimine ebaõnnestus: {1}
layerFailedToLoad={0} kihi laadimine ebaõnnestus: {1}
couldNotFetchBasemapData=Ei õnnestunud saada aluskaardi andmeid:\n{0}
couldNotConnectToPortal=Ei õnnestunud portaaliga ühendust saada.
couldNotQueryPortal=Ei õnnestunud portaali pärida.
Expand Down Expand Up @@ -250,6 +250,8 @@ step1ErrorLabel=Palun valige huvipiirkond.
step2ErrorLabel=Palun valige väljavõtte kihid.
emptyResultsLabel=Ülesanne lõpetatud edukalt, kuid ei tagastanud ühtegi tulemust.
saveDataFileLabel=Fail andmetega on loodud. Kas soovite seda alla laadida?
selectAllLabel=Vali kõik
deselectAllLabel=Eemalda valik kõigilt


attributesLabel=Atribuudid
Expand Down
Loading

0 comments on commit b458e2c

Please sign in to comment.