Merge remote-tracking branch 'gravitystorm/i18n' into staging

diff --cc net/systemeD/potlatch2/TagViewer.mxml
Simple merge

diff --cc net/systemeD/potlatch2/Toolbox.mxml
Simple merge

diff --cc potlatch2.mxml
index a00c46d79ef2defdb1e6441e3fe31cb0a9d4b8bf,74e434d98372e819d08656624e597be32771c630..fbf700e56f28d06f559188ed520809e240d8f6ba
--- 1/potlatch2.mxml
--- 2/potlatch2.mxml
+++ b/potlatch2.mxml
@@@ -31,16 -33,11 +33,16 @@@
          <mx:PopUpButton id="styleButton" label="Map Style" openAlways="true" styleName="appBarButton"
              creationComplete="styleButton.popUp = new StyleSelector();"/>
                <mx:PopUpMenuButton id="gpsButton" styleName="appBarButton"
 -                  itemClick="if (event.index==0) { trackLoader.load(); } else { new MyGpxDialog().init(); }">
 +                  itemClick="if (event.index==0) { trackLoader.load(); } 
 +                        else if (event.index==1) { new MyGpxDialog().init(); } 
 +                                            else { mx.controls.Menu(gpsButton.popUp).selectedIndex=0; 
 +                                                   mx.controls.Menu(gpsButton.popUp).selectedIndex=0; /* Yes, we do need to call it twice */
 +                                                   theMap.removeVectorLayer(theMap.findVectorLayer('GPS tracks')); }">
                        <mx:dataProvider>
                                <mx:Array>
-                                       <mx:Object label="GPS data" />
-                                       <mx:Object label="My tracks" />
-                                       <mx:Object label="Clear" />
+                                       <mx:Object label="GPS data" id="gpsData" />
+                                       <mx:Object label="My tracks" id="myTracks" />
++                                      <mx:Object label="Clear" id="clearGps" />
                                </mx:Array>
                        </mx:dataProvider>
                </mx:PopUpMenuButton>