diff --git a/GeolocationPlugin.php b/GeolocationPlugin.php
index 3877ea8..f7210d1 100644
--- a/GeolocationPlugin.php
+++ b/GeolocationPlugin.php
@@ -1,14 +1,23 @@
 <?php
 
+/**
+ * The Geolocation plugin.
+ *
+ * @package Omeka\Plugins\Geolocation
+ */
 class GeolocationPlugin extends Omeka_Plugin_AbstractPlugin
 {
     const GOOGLE_MAPS_API_VERSION = '3.x';
-    const DEFAULT_LOCATIONS_PER_PAGE = 10;
 
+    /**
+     * @var array Hooks for the plugin.
+     */
     protected $_hooks = array(
+        'initialize',
         'install',
-        'uninstall',
         'upgrade',
+        'uninstall',
+        'uninstall_message',
         'config_form',
         'config',
         'define_acl',
@@ -21,11 +30,12 @@ class GeolocationPlugin extends Omeka_Plugin_AbstractPlugin
         'items_browse_sql',
         'public_head',
         'admin_head',
-        'initialize',
         'contribution_type_form',
-        'contribution_save_form'
     );
 
+    /**
+     * @var array Filters for the plugin.
+     */
     protected $_filters = array(
         'admin_navigation_main',
         'public_navigation_main',
@@ -37,58 +47,79 @@ class GeolocationPlugin extends Omeka_Plugin_AbstractPlugin
         'api_extend_items',
         'exhibit_layouts',
         'api_import_omeka_adapters',
-        'item_search_filters'
+        'item_search_filters',
+    );
+
+    /**
+     * @var array Options and their default values.
+     */
+    protected $_options = array(
+        'geolocation_default_latitude' => '38',
+        'geolocation_default_longitude' => '-77',
+        'geolocation_default_zoom_level' => '5',
+        'geolocation_default_map_type' => 'roadmap',
+        'geolocation_per_page' => 10,
+        'geolocation_auto_fit_browse' => false,
+        'geolocation_browse_append_search' => false,
+        'geolocation_default_radius' => 10,
+        'geolocation_use_metric_distances' => false,
+        'geolocation_item_map_width' => '',
+        'geolocation_item_map_height' => '',
+        'geolocation_link_to_nav' => false,
+        'geolocation_add_map_to_contribution_form' => false,
+        'geolocation_accessible_markup' => false,
+        'geolocation_api_key' => '',
     );
 
+    /**
+     * Add the translations.
+     */
+    public function hookInitialize()
+    {
+        add_translation_source(dirname(__FILE__) . '/languages');
+        add_shortcode( 'geolocation', array($this, 'geolocationShortcode'));
+    }
+
+    /**
+     * Install the plugin.
+     */
     public function hookInstall()
     {
-        $db = get_db();
+        $db = $this->_db;
         $sql = "
         CREATE TABLE IF NOT EXISTS `$db->Location` (
-        `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-        `item_id` BIGINT UNSIGNED NOT NULL ,
-        `latitude` DOUBLE NOT NULL ,
-        `longitude` DOUBLE NOT NULL ,
-        `zoom_level` INT NOT NULL ,
-        `map_type` VARCHAR( 255 ) NOT NULL ,
-        `address` TEXT NOT NULL ,
-        INDEX (`item_id`)) ENGINE = InnoDB";
+            `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+            `item_id` int(10) unsigned NOT NULL,
+            `latitude` DOUBLE NOT NULL,
+            `longitude` DOUBLE NOT NULL,
+            `zoom_level` tinyint unsigned NOT NULL,
+            `map_type` VARCHAR( 255 ) NOT NULL DEFAULT '',
+            `address` text COLLATE utf8_unicode_ci NOT NULL,
+            `description` mediumtext COLLATE utf8_unicode_ci NOT NULL,
+            PRIMARY KEY (`id`),
+            INDEX (`item_id`)
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;";
         $db->query($sql);
 
-        set_option('geolocation_default_latitude', '38');
-        set_option('geolocation_default_longitude', '-77');
-        set_option('geolocation_default_zoom_level', '5');
-        set_option('geolocation_per_page', self::DEFAULT_LOCATIONS_PER_PAGE);
-        set_option('geolocation_add_map_to_contribution_form', '0');
-        set_option('geolocation_default_radius', 10);
-        set_option('geolocation_use_metric_distances', '0');
-    }
-
-    public function hookUninstall()
-    {
-        // Delete the plugin options
-        delete_option('geolocation_default_latitude');
-        delete_option('geolocation_default_longitude');
-        delete_option('geolocation_default_zoom_level');
-        delete_option('geolocation_per_page');
-        delete_option('geolocation_add_map_to_contribution_form');
-        delete_option('geolocation_use_metric_distances');
-
-        // This is for older versions of Geolocation, which used to store a Google Map API key.
-        delete_option('geolocation_gmaps_key');
-
-        // Drop the Location table
-        $db = get_db();
-        $db->query("DROP TABLE IF EXISTS `$db->Location`");
+        $this->_installOptions();
     }
 
     public function hookUpgrade($args)
     {
+        $oldVersion = $args['old_version'];
+        $newVersion = $args['new_version'];
+        $db = $this->_db;
+
         if (version_compare($args['old_version'], '1.1', '<')) {
             // If necessary, upgrade the plugin options
             // Check for old plugin options, and if necessary, transfer to new options
-            $options = array('default_latitude', 'default_longitude', 'default_zoom_level', 'per_page');
-            foreach($options as $option) {
+            $options = array(
+                'default_latitude',
+                'default_longitude',
+                'default_zoom_level',
+                'per_page',
+            );
+            foreach ($options as $option) {
                 $oldOptionValue = get_option('geo_' . $option);
                 if ($oldOptionValue != '') {
                     set_option('geolocation_' . $option, $oldOptionValue);
@@ -97,35 +128,87 @@ public function hookUpgrade($args)
             }
             delete_option('geo_gmaps_key');
         }
+
         if (version_compare($args['old_version'], '2.2.3', '<')) {
             set_option('geolocation_default_radius', 10);
         }
+
+        if (version_compare($oldVersion, '2.3', '<')) {
+            // All the table is normalized to Omeka standards and the field
+            // "description" is added.
+            $sql = "
+                ALTER TABLE `{$db->Location}`
+                CHANGE `id` `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+                CHANGE `item_id` `item_id` int(10) unsigned NOT NULL,
+                CHANGE `latitude` `latitude` DOUBLE NOT NULL,
+                CHANGE `longitude` `longitude` DOUBLE NOT NULL,
+                CHANGE `zoom_level` `zoom_level` tinyint unsigned NOT NULL,
+                CHANGE `map_type` `map_type` VARCHAR( 255 ) NOT NULL DEFAULT '',
+                CHANGE `address` `address` text COLLATE utf8_unicode_ci NOT NULL,
+                ADD `description` mediumtext COLLATE utf8_unicode_ci NOT NULL,
+                ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+            ";
+            $db->query($sql);
+
+            // All wrong map types are reset to empty (the"Google Maps v3.x" is
+            // useless).
+            $sql = "
+                UPDATE `{$db->Location}`
+                SET `map_type` = ''
+                WHERE `map_type` NOT IN ('roadmap', 'satellite', 'hybrid', 'terrain');
+            ";
+            $db->query($sql);
+        }
     }
 
-    public function hookConfigForm()
+    /**
+     * Uninstall the plugin.
+     */
+    public function hookUninstall()
     {
-        include 'config_form.php';
+        $db = get_db();
+        $db->query("DROP TABLE IF EXISTS `$db->Location`");
+
+        $this->_uninstallOptions();
+
+        // This is for older versions of Geolocation, which used to store a Google Map API key.
+        delete_option('geolocation_gmaps_key');
     }
 
+    /**
+     * Display the uninstall message.
+     */
+    public function hookUninstallMessage()
+    {
+        echo __('%sWarning%s: This will remove all the geolocations added by this plugin.%s', '<p><strong>', '</strong>', '</p>');
+    }
+
+    /**
+     * Shows plugin configuration page.
+     *
+     * @return void
+     */
+    public function hookConfigForm($args)
+    {
+        $view = get_view();
+        echo $view->partial(
+            'plugins/geolocation-config-form.php'
+        );
+    }
+
+    /**
+     * Processes the configuration form.
+     *
+     * @return void
+     */
     public function hookConfig($args)
     {
-        // Use the form to set a bunch of default options in the db
-        set_option('geolocation_default_latitude', $_POST['default_latitude']);
-        set_option('geolocation_default_longitude', $_POST['default_longitude']);
-        set_option('geolocation_default_zoom_level', $_POST['default_zoomlevel']);
-        set_option('geolocation_item_map_width', $_POST['item_map_width']);
-        set_option('geolocation_item_map_height', $_POST['item_map_height']);
-        $perPage = (int)$_POST['per_page'];
-        if ($perPage <= 0) {
-            $perPage = self::DEFAULT_LOCATIONS_PER_PAGE;
+        $post = $args['post'];
+        foreach ($this->_options as $optionKey => $optionValue) {
+            if (isset($post[$optionKey])) {
+                set_option($optionKey, $post[$optionKey]);
+            }
         }
-        set_option('geolocation_per_page', $perPage);
-        set_option('geolocation_add_map_to_contribution_form', $_POST['geolocation_add_map_to_contribution_form']);
-        set_option('geolocation_link_to_nav', $_POST['geolocation_link_to_nav']);
-        set_option('geolocation_default_radius', $_POST['geolocation_default_radius']);
-        set_option('geolocation_use_metric_distances', $_POST['geolocation_use_metric_distances']);
-        set_option('geolocation_map_type', $_POST['map_type']);
-        set_option('geolocation_auto_fit_browse', $_POST['auto_fit_browse']);
     }
 
     public function hookDefineAcl($args)
@@ -138,33 +221,78 @@ public function hookDefineAcl($args)
     public function hookDefineRoutes($args)
     {
         $router = $args['router'];
-        $mapRoute = new Zend_Controller_Router_Route('items/map',
-                        array('controller' => 'map',
-                                'action'     => 'browse',
-                                'module'     => 'geolocation'));
-        $router->addRoute('items_map', $mapRoute);
+
+        // Map based on an item to get all other items around.
+        $mapRoute = new Zend_Controller_Router_Route(
+            'items/map/:item_id/:page',
+            array(
+                'module' => 'geolocation',
+                'controller' => 'map',
+                'action' => 'browse',
+                'page' => 1,
+            ),
+            array(
+                'item_id' => '\d+',
+                'page' => '\d+',
+        ));
+        $router->addRoute('items_map_item', $mapRoute);
+
+        $mapRoute = new Zend_Controller_Router_Route(
+            'items/map/:pager/:page',
+            array(
+                'module' => 'geolocation',
+                'controller' => 'map',
+                'action' => 'browse',
+                'pager' => 'page',
+                'page' => 1,
+            ),
+            array(
+                'pager' => 'page',
+                'page' => '\d+',
+        ));
+        $router->addRoute('items_map_page', $mapRoute);
 
         // Trying to make the route look like a KML file so google will eat it.
         // @todo Include page parameter if this works.
-        $kmlRoute = new Zend_Controller_Router_Route_Regex('geolocation/map\.kml',
-                        array('controller' => 'map',
-                                'action' => 'browse',
-                                'module' => 'geolocation',
-                                'output' => 'kml'));
+        $kmlRoute = new Zend_Controller_Router_Route_Regex(
+            'geolocation/map\.kml',
+            array(
+                'module' => 'geolocation',
+                'controller' => 'map',
+                'action' => 'browse',
+                'output' => 'kml',
+        ));
         $router->addRoute('map_kml', $kmlRoute);
+
+        $tabularRoute = new Zend_Controller_Router_Route(
+            'items/map/tabular',
+            array(
+                'module' => 'geolocation',
+                'controller' => 'map',
+                'action' => 'tabular',
+        ));
+        $router->addRoute('items_map_tabular', $tabularRoute);
     }
 
     public function hookAdminHead($args)
     {
-        queue_css_file('geolocation-marker');
-        queue_js_url("//maps.google.com/maps/api/js?sensor=false");
-        queue_js_file('map');
+        $this->_head();
     }
 
     public function hookPublicHead($args)
     {
+        $this->_head();
+    }
+
+    private function _head()
+    {
+        $key = get_option('geolocation_api_key');
+        $mapsUrl = '//maps.googleapis.com/maps/api/js';
+        if ($key) {
+            $mapsUrl .= "?key=$key";
+        }
         queue_css_file('geolocation-marker');
-        queue_js_url("//maps.google.com/maps/api/js?sensor=false");
+        queue_js_url($mapsUrl);
         queue_js_file('map');
     }
 
@@ -174,33 +302,60 @@ public function hookAfterSaveItem($args)
             return;
         }
 
-        $item = $args['record'];
         // If we don't have the geolocation form on the page, don't do anything!
         if (!isset($post['geolocation'])) {
             return;
         }
 
-        // Find the location object for the item
-        $location = $this->_db->getTable('Location')->findLocationByItem($item, true);
+        $item = $args['record'];
+
+        // Find the current location objects for the item, by location id.
+        $locations = $this->_db->getTable('Location')->findLocationsByItem($item);
+        $existingLocations = array();
+        foreach ($locations as $location) {
+            $existingLocations[$location->id] = $location;
+        }
+
+        // Get post values.
+        $locations = $post['geolocation'];
+
+        // Check if this is a single geolocation for compatibility with old
+        // standard plugins.
+        if (isset($locations['latitude'])) {
+            $locations = array('new-old' => $locations);
+        }
+
+        // If we have filled out info for the geolocation, then submit to the db.
+        foreach ($locations as $id => $values) {
+            $values = array_map('trim', $values);
+            // Check the values: minimal is a latitude and a longitude.
+            // TODO Add a Zend validator (currently none).
+            if (empty($values) || strlen($values['latitude']) == 0 || strlen($values['longitude']) == 0) {
+                continue;
+            }
 
-        // If we have filled out info for the geolocation, then submit to the db
-        $geolocationPost = $post['geolocation'];
-        if (!empty($geolocationPost)
-            && $geolocationPost['latitude'] != ''
-            && $geolocationPost['longitude'] != ''
-        ) {
-            if (!$location) {
+            // New location.
+            if (strpos($id, 'new-') === 0
+                    // Should not be possible.
+                    || !isset($existingLocations[$id])
+                ) {
                 $location = new Location;
                 $location->item_id = $item->id;
             }
-            $location->setPostData($geolocationPost);
-            $location->save();
-        } else {
-            // If the form is empty, then we want to delete whatever location is
-            // currently stored
-            if ($location) {
-                $location->delete();
+            // Existing locations.
+            else {
+                $location = $existingLocations[$id];
+                unset($existingLocations[$id]);
             }
+            // Update the location.
+            $location->setPostData($values);
+            $location->save();
+        }
+
+        // If the form is empty, then we want to delete whatever location is
+        // currently stored.
+        foreach ($existingLocations as $location) {
+            $location->delete();
         }
     }
 
@@ -208,15 +363,14 @@ public function hookAdminItemsShowSidebar($args)
     {
         $view = $args['view'];
         $item = $args['item'];
-        $location = $this->_db->getTable('Location')->findLocationByItem($item, true);
 
-        if ($location) {
+        $totalLocations = $this->_db->getTable('Location')->countLocationsForItem($item);
+        if ($totalLocations) {
             $html = ''
-                  . '<div class="geolocation panel">'
-                  . '<h4>' . __('Geolocation') . '</h4>'
-                  . '<div style="margin: 14px 0">'
-                  . $view->itemGoogleMap($item, '100%', '270px' )
-                  . '</div></div>';
+                . '<div class="geolocation panel">'
+                . '<h4>' . __('Geolocation') . '</h4>'
+                . '<div style="margin: 14px 0">' . $view->itemGoogleMap($item, true, '100%', '270px')
+                . '</div></div>';
             echo $html;
         }
     }
@@ -225,25 +379,35 @@ public function hookPublicItemsShow($args)
     {
         $view = $args['view'];
         $item = $args['item'];
-        $location = $this->_db->getTable('Location')->findLocationByItem($item, true);
-
-        if ($location) {
-            $width = get_option('geolocation_item_map_width') ? get_option('geolocation_item_map_width') : '';
-            $height = get_option('geolocation_item_map_height') ? get_option('geolocation_item_map_height') : '300px';
-            $html = "<div id='geolocation'>";
-            $html .= '<h2>'.__('Geolocation').'</h2>';
-            $html .= $view->itemGoogleMap($item, $width, $height);
+
+        $totalLocations = $this->_db->getTable('Location')->countLocationsForItem($item);
+        if ($totalLocations) {
+            $width = get_option('geolocation_item_map_width') ?: '';
+            $height = get_option('geolocation_item_map_height') ?: '300px';
+            $html = '<div id="geolocation">';
+            $html .= '<h2>' . __('Geolocation') . '</h2>';
+            $html .= $view->itemGoogleMap($item, false, $width, $height);
             $html .= "</div>";
             echo $html;
         }
     }
 
+    /**
+     * Hook to include a form in the admin items search form.
+     *
+     * @internal Themed partial should go to "my_theme/map".
+     */
     public function hookAdminItemsSearch($args)
     {
         $view = $args['view'];
         echo $view->partial('map/advanced-search-partial.php');
     }
 
+    /**
+     * Hook to include a form in the admin items search form.
+     *
+     * @internal Themed partial should go to "my_theme/map".
+     */
     public function hookPublicItemsSearch($args)
     {
         $view = $args['view'];
@@ -254,72 +418,98 @@ public function hookItemsBrowseSql($args)
     {
         $db = $this->_db;
         $select = $args['select'];
+        $params = $args['params'];
+
         $alias = $this->_db->getTable('Location')->getTableAlias();
-        if (!empty($args['params']['only_map_items'])
-            || !empty($args['params']['geolocation-address'])
-        ) {
+        if (!empty($params['only_map_items'])
+                || !empty($params['item_id'])
+                || !empty($params['geolocation-address'])
+            ) {
             $select->joinInner(
                 array($alias => $db->Location),
                 "$alias.item_id = items.id",
-                array()
-            );
+                array());
+        }
+
+        // Select all items around the selected one.
+        if (!empty($params['item_id'])) {
+            // TODO Use a sub-query?
+            $location = $db->getTable('Location')->findLocationByItem($params['item_id'], true);
+            if ($location) {
+                $params['geolocation-address'] = $location->address;
+                $params['geolocation-latitude'] = $location->latitude;
+                $params['geolocation-longitude'] = $location->longitude;
+                $params['geolocation-radius'] = isset($params['geolocation-radius'])
+                    ? $params['geolocation-radius']
+                    : get_option('geolocation_default_radius');
+                $this->_selectItemsBrowseSql($select, $params);
+            }
         }
-        if (!empty($args['params']['geolocation-address'])) {
+
+        elseif (!empty($params['geolocation-address'])) {
             // Get the address, latitude, longitude, and the radius from parameters
-            $address = trim($args['params']['geolocation-address']);
-            $lat = trim($args['params']['geolocation-latitude']);
-            $lng = trim($args['params']['geolocation-longitude']);
-            $radius = trim($args['params']['geolocation-radius']);
+            $params['geolocation-address'] = trim($params['geolocation-address']);
+            $params['geolocation-latitude'] = trim($params['geolocation-latitude']);
+            $params['geolocation-longitude'] = trim($params['geolocation-longitude']);
+            $params['geolocation-radius'] = trim($params['geolocation-radius']);
             // Limit items to those that exist within a geographic radius if an address and radius are provided
-            if ($address != ''
-                && is_numeric($lat)
-                && is_numeric($lng)
-                && is_numeric($radius)
-            ) {
-                // SELECT distance based upon haversine forumula
-                if (get_option('geolocation_use_metric_distances')) {
-                    $denominator = 111;
-                    $earthRadius = 6371;
-                } else {
-                    $denominator = 69;
-                    $earthRadius = 3959;
-                }
-
-                $radius = $db->quote($radius, Zend_Db::FLOAT_TYPE);
-                $lat = $db->quote($lat, Zend_Db::FLOAT_TYPE);
-                $lng = $db->quote($lng, Zend_Db::FLOAT_TYPE);
-                $sqlMathExpression = 
-                    new Zend_Db_Expr(
-                        "$earthRadius * ACOS(
-                        COS(RADIANS($lat)) *
-                        COS(RADIANS(locations.latitude)) *
-                        COS(RADIANS($lng) - RADIANS(locations.longitude))
-                        +
-                        SIN(RADIANS($lat)) *
-                        SIN(RADIANS(locations.latitude))
-                        ) AS distance");
-                
-                $select->columns($sqlMathExpression);
-
-                // WHERE the distance is within radius miles/kilometers of the specified lat & long
-                $locationWithinRadius = 
-                    new Zend_Db_Expr(
-                        "(locations.latitude BETWEEN $lat - $radius / $denominator 
-                            AND $lat + $radius / $denominator)
-                            AND
-                        (locations.longitude BETWEEN $lng - $radius / $denominator 
-                            AND $lng + $radius / $denominator)");
-                $select->where($locationWithinRadius);
-
-                // Actually use distance calculation.
-                //$select->having('distance < radius');
-
-                //ORDER by the closest distances
-                $select->order('distance');
+            if ($params['geolocation-address'] != ''
+                    && is_numeric($params['geolocation-latitude'])
+                    && is_numeric($params['geolocation-longitude'])
+                    && is_numeric($params['geolocation-radius'])
+                ) {
+                $this->_selectItemsBrowseSql($select, $params);
             }
         }
     }
 
+    /**
+     * Helper for hookItemsBrowseSql().
+     */
+    private function _selectItemsBrowseSql($select, $params)
+    {
+        $db = $this->_db;
+
+        // Select distance based upon haversine forumula.
+        if (get_option('geolocation_use_metric_distances')) {
+            $denominator = 111;
+            $earthRadius = 6371;
+        } else {
+            $denominator = 69;
+            $earthRadius = 3959;
+        }
+
+        $lat = $db->quote($params['geolocation-latitude'], Zend_Db::FLOAT_TYPE);
+        $lng = $db->quote($params['geolocation-longitude'], Zend_Db::FLOAT_TYPE);
+        $radius = $db->quote($params['geolocation-radius'], Zend_Db::FLOAT_TYPE);
+
+        $select->columns(<<<SQL
+$earthRadius * ACOS(
+    COS(RADIANS($lat)) *
+    COS(RADIANS(locations.latitude)) *
+    COS(RADIANS($lng) - RADIANS(locations.longitude))
+    +
+    SIN(RADIANS($lat)) *
+    SIN(RADIANS(locations.latitude))
+) AS distance
+SQL
+        );
+
+        // WHERE the distance is within radius miles/kilometers of the specified lat & long
+        $select->where(<<<SQL
+(locations.latitude BETWEEN $lat - $radius / $denominator AND $lat + $radius / $denominator)
+AND
+(locations.longitude BETWEEN $lng - $radius / $denominator AND $lng + $radius / $denominator)
+SQL
+        );
+
+        // Actually use distance calculation.
+        //$select->having('distance < radius');
+
+        //ORDER by the closest distances
+        $select->order('distance');
+    }
+
     /**
      * Add geolocation search options to filter output.
      *
@@ -339,37 +529,37 @@ public function filterItemSearchFilters($displayArray, $args)
             $displayArray['location'] = __('within %1$s %2$s of "%3$s"',
                 $requestArray['geolocation-radius'],
                 $unit,
-                $requestArray['geolocation-address']
-            );
+                $requestArray['geolocation-address']);
         }
         return $displayArray;
     }
 
-    /**
-     * Add the translations.
-     */
-    public function hookInitialize()
-    {
-        add_translation_source(dirname(__FILE__) . '/languages');
-        add_shortcode( 'geolocation', array($this, 'geolocationShortcode'));
-    }
-
     public function filterAdminNavigationMain($navArray)
     {
-        $navArray['Geolocation'] = array('label'=>__('Map'), 'uri'=>url('geolocation/map/browse'));
+        $navArray['Geolocation'] = array(
+            'label' => __('Map'),
+            'uri' => url('geolocation/map/browse'),
+        );
         return $navArray;
     }
 
     public function filterPublicNavigationMain($navArray)
     {
-        $navArray['Geolocation'] = array('label'=>__('Map'), 'uri'=>url('geolocation/map/browse'));
+        $navArray['Geolocation'] = array(
+            'label' => __('Map'),
+            'uri' => url('geolocation/map/browse'),
+        );
         return $navArray;
     }
 
     public function filterResponseContexts($contexts)
     {
-        $contexts['kml'] = array('suffix'  => 'kml',
-                'headers' => array('Content-Type' => 'text/xml'));
+        $contexts['kml'] = array(
+            'suffix' => 'kml',
+            'headers' => array(
+                'Content-Type' => 'application/vnd.google-earth.kml+xml',
+            ),
+        );
         return $contexts;
     }
 
@@ -377,7 +567,9 @@ public function filterActionContexts($contexts, $args)
     {
         $controller = $args['controller'];
         if ($controller instanceof Geolocation_MapController) {
-            $contexts['browse'] = array('kml');
+            $contexts['browse'] = array(
+                'kml',
+            );
         }
         return $contexts;
     }
@@ -386,7 +578,7 @@ public function filterAdminItemsFormTabs($tabs, $args)
     {
         // insert the map tab before the Miscellaneous tab
         $item = $args['item'];
-        $tabs['Map'] = $this->_mapForm($item);
+        $tabs['Map'] = get_view()->mapForm($item);
 
         return $tabs;
     }
@@ -395,8 +587,8 @@ public function filterPublicNavigationItems($navArray)
     {
         if (get_option('geolocation_link_to_nav')) {
             $navArray['Browse Map'] = array(
-                'label'=>__('Browse Map'),
-                'uri' => url('items/map')
+                'label' => __('Browse Map'),
+                'uri' => url('items/map'),
             );
         }
         return $navArray;
@@ -412,7 +604,13 @@ public function filterApiResources($apiResources)
     {
         $apiResources['geolocations'] = array(
             'record_type' => 'Location',
-            'actions' => array('get', 'index', 'post', 'put', 'delete'),
+            'actions' => array(
+                'get',
+                'index',
+                'post',
+                'put',
+                'delete',
+            )
         );
         return $apiResources;
     }
@@ -427,7 +625,9 @@ public function filterApiResources($apiResources)
     public function filterApiExtendItems($extend, $args)
     {
         $item = $args['record'];
-        $location = $this->_db->getTable('Location')->findBy(array('item_id' => $item->id));
+        $location = $this->_db->getTable('Location')->findBy(array(
+            'item_id' => $item->id,
+        ));
         if (!$location) {
             return $extend;
         }
@@ -440,32 +640,37 @@ public function filterApiExtendItems($extend, $args)
         return $extend;
     }
 
+    /**
+     * Hook to include a form in a contribution type form.
+     *
+     * @internal Themed partial should go to "my_theme/contribution/map".
+     */
     public function hookContributionTypeForm($args)
     {
         if (get_option('geolocation_add_map_to_contribution_form')) {
             $contributionType = $args['type'];
-            echo $this->_mapForm(null, __('Find A Geographic Location For The ') . $contributionType->display_name . ':', false );
+            $view = $args['view'];
+            // Item is used only to get original location, if not changed.
+            $item = (empty($_POST) && isset($view->item)) ? $view->item : null;
+            echo $view->mapForm($item);
         }
     }
 
-    public function hookContributionSaveForm($args)
-    {
-        $this->hookAfterSaveItem($args);
-    }
-
     public function filterExhibitLayouts($layouts)
     {
         $layouts['geolocation-map'] = array(
             'name' => __('Geolocation Map'),
-            'description' => __('Show attached items on a map')
+            'description' => __('Show attached items on a map'),
         );
         return $layouts;
     }
-    
+
     public function filterApiImportOmekaAdapters($adapters, $args)
     {
         $geolocationAdapter = new ApiImport_ResponseAdapter_Omeka_GenericAdapter(null, $args['endpointUri'], 'Location');
-        $geolocationAdapter->setResourceProperties(array('item' => 'Item'));
+        $geolocationAdapter->setResourceProperties(array(
+            'item' => 'Item',
+        ));
         $adapters['geolocations'] = $geolocationAdapter;
         return $adapters;
     }
@@ -480,7 +685,7 @@ public function geolocationShortcode($args)
         if (isset($args['lat'])) {
             $latitude = $args['lat'];
         } else {
-            $latitude  = get_option('geolocation_default_latitude');
+            $latitude = get_option('geolocation_default_latitude');
         }
 
         if (isset($args['lon'])) {
@@ -495,7 +700,11 @@ public function geolocationShortcode($args)
             $zoomLevel = get_option('geolocation_default_zoom_level');
         }
 
-        $center = array('latitude' => (double) $latitude, 'longitude' => (double) $longitude, 'zoomLevel' => (double) $zoomLevel);
+        $center = array(
+            'latitude' => (double) $latitude,
+            'longitude' => (double) $longitude,
+            'zoomLevel' => (double) $zoomLevel,
+        );
 
         $options = array();
 
@@ -515,7 +724,7 @@ public function geolocationShortcode($args)
 
         if (isset($args['tags'])) {
             $options['params']['tags'] = $args['tags'];
-        }        
+        }
 
         $pattern = '#^[0-9]*(px|%)$#';
 
@@ -531,99 +740,9 @@ public function geolocationShortcode($args)
             $width = '100%';
         }
 
-        $attrs = array('style' => "height:$height;width:$width");
-        return get_view()->googleMap("geolocation-shortcode-$index", $options, $attrs, $center);
-    }
-
-    /**
-     * Returns the form code for geographically searching for items
-     * @param Item $item
-     * @param int $width
-     * @param int $height
-     * @return string
-     **/
-    protected function _mapForm($item, $label = 'Find a Location by Address:', $confirmLocationChange = true,  $post = null)
-    {
-        $html = '';
-        $label = __('Find a Location by Address:');
-        $center = $this->_getCenter();
-        $center['show'] = false;
-
-        $location = $this->_db->getTable('Location')->findLocationByItem($item, true);
-
-        if ($post === null) {
-            $post = $_POST;
-        }
-
-        $usePost = !empty($post) 
-                    && !empty($post['geolocation'])
-                    && $post['geolocation']['longitude'] != ''
-                    && $post['geolocation']['latitude'] != '';
-        if ($usePost) {
-            $lng = (double) $post['geolocation']['longitude'];
-            $lat = (double) $post['geolocation']['latitude'];
-            $zoom = (int) $post['geolocation']['zoom_level'];
-            $addr = html_escape($post['geolocation']['address']);
-        } else {
-            if ($location) {
-                $lng  = (double) $location['longitude'];
-                $lat  = (double) $location['latitude'];
-                $zoom = (int) $location['zoom_level'];
-                $addr = html_escape($location['address']);
-            } else {
-                $lng = $lat = $zoom = $addr = '';
-            }
-        }
-
-        $html .= '<div class="field">';
-        $html .=     '<div id="location_form" class="two columns alpha">';
-        $html .=         '<input type="hidden" name="geolocation[latitude]" value="' . $lat . '" />';
-        $html .=         '<input type="hidden" name="geolocation[longitude]" value="' . $lng . '" />';
-        $html .=         '<input type="hidden" name="geolocation[zoom_level]" value="' . $zoom . '" />';
-        $html .=         '<input type="hidden" name="geolocation[map_type]" value="Google Maps v' . self::GOOGLE_MAPS_API_VERSION . '" />';
-        $html .=         '<label>' . html_escape($label) . '</label>';
-        $html .=     '</div>';
-        $html .=     '<div class="inputs five columns omega">';
-        $html .=          '<div class="input-block">';
-        $html .=            '<input type="text" name="geolocation[address]" id="geolocation_address" value="' . $addr . '" class="textinput"/>';
-        $html .=            '<button type="button" style="float:none;" name="geolocation_find_location_by_address" id="geolocation_find_location_by_address">'.__('Find').'</button>';
-        $html .=          '</div>';
-        $html .=     '</div>';
-        $html .= '</div>';
-        $html .= '<div  id="omeka-map-form" style="width: 100%; height: 300px"></div>';
-
-
-        $options = array();
-        $options['form'] = array('id' => 'location_form',
-                'posted' => $usePost);
-        if ($location or $usePost) {
-            $options['point'] = array('latitude' => $lat,
-                    'longitude' => $lng,
-                    'zoomLevel' => $zoom);
-        }
-
-        $options['confirmLocationChange'] = $confirmLocationChange;
-
-        $center = js_escape($center);
-        $options = js_escape($options);
-
-        $js = "var anOmekaMapForm = new OmekaMapForm(" . js_escape('omeka-map-form') . ", $center, $options);";
-        $js .= "
-            jQuery(document).bind('omeka:tabselected', function () {
-                anOmekaMapForm.resize();
-            });
-        ";
-
-        $html .= "<script type='text/javascript'>" . $js . "</script>";
-        return $html;
-    }
-
-    protected function _getCenter()
-    {
-        return array(
-            'latitude'=>  (double) get_option('geolocation_default_latitude'),
-            'longitude'=> (double) get_option('geolocation_default_longitude'),
-            'zoomLevel'=> (double) get_option('geolocation_default_zoom_level')
+        $attrs = array(
+            'style' => "height:$height;width:$width",
         );
+        return get_view()->googleMap("geolocation-shortcode-$index", $options, $attrs, $center);
     }
-}
\ No newline at end of file
+}
diff --git a/config_form.php b/config_form.php
deleted file mode 100644
index 60aeec3..0000000
--- a/config_form.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php $view = get_view(); ?>
-<fieldset>
-    <legend><?php echo __('General Settings'); ?></legend>
-    <div class="field">
-    <div class="two columns alpha">
-        <label for="default_latitude"><?php echo __('Default Latitude'); ?></label>
-    </div>
-    <div class="inputs five columns omega">
-        <p class="explanation"><?php echo __("Latitude of the map's initial center point, in degrees. Must be between -90 and 90."); ?></p>
-        <?php echo $view->formText('default_latitude', get_option('geolocation_default_latitude')); ?>
-    </div>
-</div>
-
-<div class="field">
-    <div class="two columns alpha">
-        <label for="default_longitude"><?php echo __('Default Longitude'); ?></label>
-    </div>
-    <div class="inputs five columns omega">
-        <p class="explanation"><?php echo __("Longitude of the map's initial center point, in degrees. Must be between -180 and 180.");?></p>
-        <?php echo $view->formText('default_longitude', get_option('geolocation_default_longitude')); ?>
-    </div>
-</div>
-
-<div class="field">
-    <div class="two columns alpha">
-        <label for="default_zoomlevel"><?php echo __('Default Zoom Level'); ?></label>
-    </div>
-    <div class="inputs five columns omega">
-        <p class="explanation"><?php echo __('An integer greater than or equal to 0, where 0 represents the most zoomed out scale.'); ?></p>
-        <?php echo $view->formText('default_zoomlevel', get_option('geolocation_default_zoom_level')); ?>
-    </div>
-</div>
-
-<div class="field">
-    <div class="two columns alpha">
-        <label for="map_type"><?php echo __('Map Type'); ?></label>
-    </div>
-    <div class="inputs five columns omega">
-        <p class="explanation"><?php echo __('The type of map to display'); ?></p>
-        <?php
-        echo $view->formSelect('map_type', get_option('geolocation_map_type'), array(), array(
-            'roadmap' => __('Roadmap'),
-            'satellite' => __('Satellite'),
-            'hybrid' =>__('Hybrid'),
-            'terrain' => __('Terrain')
-            )
-        );
-        ?>
-    </div>
-</div>
-</fieldset>
-
-<fieldset>
-<legend><?php echo __('Browse Map Settings'); ?></legend>
-<div class="field">
-    <div class="two columns alpha">
-        <label for="per_page"><?php echo __('Number of Locations Per Page'); ?></label>
-    </div>
-    <div class="inputs five columns omega">
-        <p class="explanation"><?php echo __('The number of locations displayed per page when browsing the map.'); ?></p>
-        <?php echo $view->formText('per_page', get_option('geolocation_per_page')); ?>
-    </div>
-</div>
-<div class="field">
-    <div class="two columns alpha">
-        <label for="auto_fit_browse"><?php echo __('Auto-fit to Locations'); ?></label>
-    </div>
-    <div class="inputs five columns omega">
-        <p class="explanation">
-            <?php echo __('If checked, the default location and zoom settings '
-                . 'will be ignored on the browse map. Instead, the map will '
-                . 'automatically pan and zoom to fit the locations displayed '
-                . 'on each page.');
-            ?>
-        </p>
-        <?php
-        echo $view->formCheckbox('auto_fit_browse', true,
-            array('checked' => (boolean) get_option('geolocation_auto_fit_browse')));
-        ?>
-    </div>
-</div>
-<div class="field">
-    <div class="two columns alpha">
-        <label for="per_page"><?php echo __('Default Radius'); ?></label>
-    </div>
-    <div class="inputs five columns omega">
-        <p class="explanation"><?php echo __('The size of the default radius to use on the items advanced search page. See below for whether to measure in miles or kilometers.'); ?></p>
-        <?php echo $view->formText('geolocation_default_radius', get_option('geolocation_default_radius')); ?>
-    </div>
-</div>
-<div class="field">
-    <div class="two columns alpha">
-        <label for="geolocation_use_metric_distances"><?php echo __('Use metric distances'); ?></label>
-    </div>
-    <div class="inputs five columns omega">
-        <p class="explanation"><?php echo __('Use metric distances in proximity search.'); ?></p>
-        <?php
-        echo $view->formCheckbox('geolocation_use_metric_distances', true,
-            array('checked' => (boolean) get_option('geolocation_use_metric_distances')));
-        ?>
-    </div>
-</div>
-</fieldset>
-
-<fieldset>
-<legend><?php echo __('Item Map Settings'); ?></legend>
-<div class="field">
-    <div class="two columns alpha">
-        <label for="item_map_width"><?php echo __('Width for Item Map'); ?></label>
-    </div>
-    <div class="inputs five columns omega">
-        <p class="explanation"><?php echo __('The width of the map displayed on your items/show page. If left blank, the default width of 100% will be used.'); ?></p>
-        <?php echo $view->formText('item_map_width', get_option('geolocation_item_map_width')); ?>
-    </div>
-</div>
-
-<div class="field">
-    <div class="two columns alpha">
-        <label for="item_map_height"><?php echo __('Height for Item Map'); ?></label>
-    </div>
-    <div class="inputs five columns omega">
-        <p class="explanation"><?php echo __('The height of the map displayed on your items/show page. If left blank, the default height of 300px will be used.'); ?></p>
-        <?php echo $view->formText('item_map_height', get_option('geolocation_item_map_height')); ?>
-    </div>
-</div>
-</fieldset>
-
-<fieldset>
-<legend><?php echo __('Map Integration'); ?></legend>
-<div class="field">
-    <div class="two columns alpha">
-        <label for="geolocation_link_to_nav"><?php echo __('Add Link to Map on Items/Browse Navigation'); ?></label>
-    </div>
-    <div class="inputs five columns omega">
-        <p class="explanation"><?php echo __('Add a link to the items map on all the items/browse pages.'); ?></p>
-        <?php
-        echo get_view()->formCheckbox('geolocation_link_to_nav', true,
-            array('checked' => (boolean) get_option('geolocation_link_to_nav')));
-        ?>
-    </div>
-</div>
-
-<div class="field">
-    <div class="two columns alpha">
-        <label for="geolocation_add_map_to_contribution_form"><?php echo __('Add Map To Contribution Form'); ?></label>
-    </div>
-    <div class="inputs five columns omega">
-        <p class="explanation"><?php echo __('If the Contribution plugin is installed and activated, Geolocation  will add a geolocation map field to the contribution form to associate a location to a contributed item.'); ?></p>
-        <?php
-        echo get_view()->formCheckbox('geolocation_add_map_to_contribution_form', true,
-            array('checked' => (boolean) get_option('geolocation_add_map_to_contribution_form')));
-        ?>
-    </div>
-</div>
-</fieldset>
diff --git a/controllers/MapController.php b/controllers/MapController.php
index 9a29512..33c69d1 100644
--- a/controllers/MapController.php
+++ b/controllers/MapController.php
@@ -6,33 +6,58 @@ public function init()
     {
         $this->_helper->db->setDefaultModelName('Item');
     }
-    
+
     public function browseAction()
     {
         $table = $this->_helper->db->getTable();
         $locationTable = $this->_helper->db->getTable('Location');
-        
+
         $params = $this->getAllParams();
         $params['only_map_items'] = true;
         $limit = (int) get_option('geolocation_per_page');
         $currentPage = $this->getParam('page', 1);
 
-        // Only get pagination data for the "normal" page, only get
-        // item/location data for the KML output.
+        // Only get item/location data for the KML output.
         if ($this->_helper->contextSwitch->getCurrentContext() == 'kml') {
             $items = $table->findBy($params, $limit, $currentPage);
             $this->view->items = $items;
-            $this->view->locations = $locationTable->findLocationByItem($items);
-        } else {
+            $this->view->locations = $locationTable->findLocationsByItem($items);
+        }
+        // Only get pagination data for the "normal" page.
+        else {
+            $item_id = $this->getParam('item_id');
+            if (!empty($item_id)) {
+                $this->view->item = get_record_by_id('Item', $item_id);
+                $this->view->location = $locationTable->findLocationsByItem($item_id, true);
+            }
             $this->view->totalItems = $table->count($params);
             $this->view->params = $params;
-        
+
             $pagination = array(
-                'page'          => $currentPage,
-                'per_page'      => $limit,
-                'total_results' => $this->view->totalItems
+                'page' => $currentPage,
+                'per_page' => $limit,
+                'total_results' => $this->view->totalItems,
             );
             Zend_Registry::set('pagination', $pagination);
         }
     }
+
+    public function tabularAction()
+    {
+        // Get pagination data via the browse action.
+        $this->browseAction();
+
+        // Get the list of items like in browse action / kml context.
+        $table = $this->_helper->db->getTable();
+        $locationTable = $this->_helper->db->getTable('Location');
+
+        $params = $this->getAllParams();
+        $params['only_map_items'] = true;
+        $limit = (int) get_option('geolocation_per_page');
+        $currentPage = $this->getParam('page', 1);
+
+        $items = $table->findBy($params, $limit, $currentPage);
+        $this->view->items = $items;
+        $this->view->locations = $locationTable->findLocationsByItem($items);
+    }
 }
diff --git a/languages/bg_BG.mo b/languages/bg_BG.mo
new file mode 100644
index 0000000..92a23f5
Binary files /dev/null and b/languages/bg_BG.mo differ
diff --git a/languages/bg_BG.po b/languages/bg_BG.po
new file mode 100644
index 0000000..4787742
--- /dev/null
+++ b/languages/bg_BG.po
@@ -0,0 +1,263 @@
+# Translation for the Geolocation plugin for Omeka.
+# Copyright (C) 2011 Roy Rosenzweig Center for History and New Media
+# This file is distributed under the same license as the Omeka package.
+# 
+# Translators:
+# Gabriel Radev <gabosss@gmail.com>, 2014-2015
+# Svetlozar Kovachev <svetliok26@gmail.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: Omeka\n"
+"Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
+"POT-Creation-Date: 2012-01-09 21:49-0500\n"
+"PO-Revision-Date: 2015-11-27 14:08+0000\n"
+"Last-Translator: Svetlozar Kovachev <svetliok26@gmail.com>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/omeka/omeka/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr "Географско положение"
+
+#: GeolocationPlugin.php:333
+msgid "kilometers"
+msgstr "километри"
+
+#: GeolocationPlugin.php:335
+msgid "miles"
+msgstr "мили"
+
+#: GeolocationPlugin.php:337
+#, php-format
+msgid "within %1$s %2$s of \"%3$s\""
+msgstr "със %1$s %2$s от \"%3$s\""
+
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
+msgid "Map"
+msgstr "Карта"
+
+#: GeolocationPlugin.php:396
+msgid "Browse Map"
+msgstr "Преглед на Карта"
+
+#: GeolocationPlugin.php:445
+msgid "Find A Geographic Location For The "
+msgstr "Търсене на географско местоположение  за "
+
+#: GeolocationPlugin.php:457
+msgid "Geolocation Map"
+msgstr "Географска карта"
+
+#: GeolocationPlugin.php:458
+msgid "Show attached items on a map"
+msgstr "Покажи приложеният документ на картата."
+
+#: GeolocationPlugin.php:546
+msgid "Find a Location by Address:"
+msgstr "Търсене на местонахождение по Адрес:"
+
+#: GeolocationPlugin.php:587
+msgid "Find"
+msgstr "Търси"
+
+#: config_form.php:3
+msgid "General Settings"
+msgstr "Общи Настройки"
+
+#: config_form.php:6
+msgid "Default Latitude"
+msgstr "Подразбираще се Ширина"
+
+#: config_form.php:9
+msgid ""
+"Latitude of the map's initial center point, in degrees. Must be between -90 "
+"and 90."
+msgstr "Географска ширина на началната централна точка на картата, в градуси. Трябва да е между -90 и 90."
+
+#: config_form.php:16
+msgid "Default Longitude"
+msgstr "Подразбираща се Дължина"
+
+#: config_form.php:19
+msgid ""
+"Longitude of the map's initial center point, in degrees. Must be between "
+"-180 and 180."
+msgstr "Географска дължина на началната централна точка на картата, в градуси. Трябва да е между -180 и 180."
+
+#: config_form.php:26
+msgid "Default Zoom Level"
+msgstr "Ниво на увеличаване по подразбиране"
+
+#: config_form.php:29
+msgid ""
+"An integer greater than or equal to 0, where 0 represents the most zoomed "
+"out scale."
+msgstr "Цяло число, по-голямо или равно на 0, като 0 обозначава на-големия мащаб."
+
+#: config_form.php:36
+msgid "Map Type"
+msgstr "Тип карта"
+
+#: config_form.php:39
+msgid "The type of map to display"
+msgstr "Тип на картата за показване"
+
+#: config_form.php:42
+msgid "Roadmap"
+msgstr "Пътна карта"
+
+#: config_form.php:43
+msgid "Satellite"
+msgstr "Сателит"
+
+#: config_form.php:44
+msgid "Hybrid"
+msgstr "Смесена"
+
+#: config_form.php:45
+msgid "Terrain"
+msgstr "Терен"
+
+#: config_form.php:54
+msgid "Browse Map Settings"
+msgstr "Преглед на настройките на Карта"
+
+#: config_form.php:57
+msgid "Number of Locations Per Page"
+msgstr "Брой на местонахожденията за Страница"
+
+#: config_form.php:60
+msgid "The number of locations displayed per page when browsing the map."
+msgstr "Брой на местонахожденията показвани на страница докато се преглежда картата"
+
+#: config_form.php:66
+msgid "Auto-fit to Locations"
+msgstr "Автопобиране на Местонахожденията"
+
+#: config_form.php:70
+msgid ""
+"If checked, the default location and zoom settings will be ignored on the "
+"browse map. Instead, the map will automatically pan and zoom to fit the "
+"locations displayed on each page."
+msgstr "Ако е маркирано, местонахождението и мащабът по подразбиране ще бъдат игнорирани при прегледа на карта. Картата ще се розиционира и мащабира автоматично за да обхване местата изобразени на всяка страница."
+
+#: config_form.php:84
+msgid "Default Radius"
+msgstr "Радиус по подразбиране"
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr "Размер на радиуса по подразбиране за страницата за разширено търсене на документи. Вижте по-долу за това дали мярката е в мили или километри."
+
+#: config_form.php:93
+msgid "Use metric distances"
+msgstr "Използван на метрични разстояния"
+
+#: config_form.php:96
+msgid "Use metric distances in proximity search."
+msgstr "Използване на метрични разстояния при определяне на близостта."
+
+#: config_form.php:106
+msgid "Item Map Settings"
+msgstr "Настройка на карта на документ"
+
+#: config_form.php:109
+msgid "Width for Item Map"
+msgstr "Ширина на картата"
+
+#: config_form.php:112
+msgid ""
+"The width of the map displayed on your items/show page. If left blank, the "
+"default width of 100% will be used."
+msgstr "Ширина на картата показвана на страниците. Ако е празно се използва по подразбиране ширина 100%."
+
+#: config_form.php:119
+msgid "Height for Item Map"
+msgstr "Височина на картата"
+
+#: config_form.php:122
+msgid ""
+"The height of the map displayed on your items/show page. If left blank, the "
+"default height of 300px will be used."
+msgstr "Височина на картата показвана на страниците. Ако е празно се използва по подразбиране височина 300px."
+
+#: config_form.php:129
+msgid "Map Integration"
+msgstr "Интеграция на картата"
+
+#: config_form.php:132
+msgid "Add Link to Map on Items/Browse Navigation"
+msgstr "Добави Връзка към Картата при навигацията Преглед на документите."
+
+#: config_form.php:135
+msgid "Add a link to the items map on all the items/browse pages."
+msgstr "Добави Връзка към картата на документите за всяка страница Преглед на документите."
+
+#: config_form.php:145
+msgid "Add Map To Contribution Form"
+msgstr "Добави карта към формата за сътрудничество."
+
+#: config_form.php:148
+msgid ""
+"If the Contribution plugin is installed and activated, Geolocation  will add"
+" a geolocation map field to the contribution form to associate a location to"
+" a contributed item."
+msgstr "Ако приставката Съпричастен е инсталирана и активирана, приставката Географско положение ще добави поле с карта на местоположението към формата за сътрудничество за да свърже добавения документ с дадено място."
+
+#: models/Location.php:22
+msgid "Location requires an item ID."
+msgstr "За Местоположение се изисква ID на документ."
+
+#: models/Location.php:26
+msgid "Location requires a valid item ID."
+msgstr "За Местоположение се изисква валидно ID на документ."
+
+#: models/Location.php:31
+msgid "A location already exists for the provided item."
+msgstr "За този документ вече е зададено местоположение."
+
+#: models/Location.php:34
+msgid "Location requires a latitude."
+msgstr "За Местоположение се изисква географска ширина."
+
+#: models/Location.php:37
+msgid "Location requires a longitude."
+msgstr "За Местоположение се изисква географска дължина."
+
+#: models/Location.php:40
+msgid "Location requires a zoom level."
+msgstr "За Местоположение се изисква степен на увеличение."
+
+#: views/admin/map/browse.php:4 views/public/map/browse.php:4
+msgid "Browse Items on the Map"
+msgstr "Преглед на Документите на Картата"
+
+#: views/admin/map/browse.php:4
+msgid "total"
+msgstr "всичко"
+
+#: views/admin/map/browse.php:13 views/public/map/browse.php:21
+msgid "Find An Item on the Map"
+msgstr "Търсене на документ на Картата"
+
+#: views/helpers/ItemGoogleMap.php:36
+msgid "This item has no location info associated with it."
+msgstr "За този документ не е зададено местоположение."
+
+#: views/shared/map/advanced-search-partial.php:16
+msgid "Geographic Radius (kilometers)"
+msgstr "Географски радиус (в километри)"
+
+#: views/shared/map/advanced-search-partial.php:18
+msgid "Geographic Radius (miles)"
+msgstr "Географски радиус (в мили)"
+
+#: views/shared/map/advanced-search-partial.php:25
+msgid "Geographic Address"
+msgstr "Географски адрес"
diff --git a/languages/ca_ES.mo b/languages/ca_ES.mo
index 5857894..65af135 100644
Binary files a/languages/ca_ES.mo and b/languages/ca_ES.mo differ
diff --git a/languages/ca_ES.po b/languages/ca_ES.po
index 9091be0..e58a260 100644
--- a/languages/ca_ES.po
+++ b/languages/ca_ES.po
@@ -3,66 +3,69 @@
 # This file is distributed under the same license as the Omeka package.
 # 
 # Translators:
-# Rubén Alcaraz Martínez <rubenalcarazmartinez@gmail.com>, 2013-2014
+# Rubén Alcaraz Martínez <rubenalcarazmartinez@gmail.com>, 2013-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Omeka\n"
 "Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
 "POT-Creation-Date: 2012-01-09 21:49-0500\n"
-"PO-Revision-Date: 2014-06-09 13:16+0000\n"
+"PO-Revision-Date: 2015-02-25 21:22+0000\n"
 "Last-Translator: Rubén Alcaraz Martínez <rubenalcarazmartinez@gmail.com>\n"
-"Language-Team: Catalan (Spain) (http://www.transifex.com/projects/p/omeka/language/ca_ES/)\n"
+"Language-Team: Catalan (Spain) (http://www.transifex.com/omeka/omeka/language/ca_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeolocationPlugin.php:298
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr "Geolocalització"
+
+#: GeolocationPlugin.php:333
 msgid "kilometers"
 msgstr "quilòmetres"
 
-#: GeolocationPlugin.php:300
+#: GeolocationPlugin.php:335
 msgid "miles"
 msgstr "milles"
 
-#: GeolocationPlugin.php:302
+#: GeolocationPlugin.php:337
 #, php-format
 msgid "within %1$s %2$s of \"%3$s\""
 msgstr "entre %1$s %2$s de \"%3$s\""
 
-#: GeolocationPlugin.php:322 GeolocationPlugin.php:328
-#: GeolocationPlugin.php:352
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
 msgid "Map"
 msgstr "Mapa"
 
-#: GeolocationPlugin.php:361
+#: GeolocationPlugin.php:396
 msgid "Browse Map"
 msgstr "Navega pel mapa"
 
-#: GeolocationPlugin.php:409
+#: GeolocationPlugin.php:445
 msgid "Find A Geographic Location For The "
 msgstr "Troba una localització geogràfica per"
 
-#: GeolocationPlugin.php:420
+#: GeolocationPlugin.php:457
 msgid "Geolocation Map"
 msgstr "Mapa amb objectes geolocalitzats"
 
-#: GeolocationPlugin.php:421
+#: GeolocationPlugin.php:458
 msgid "Show attached items on a map"
-msgstr "Mostreu els ítems sobre el mapa"
+msgstr "Mostra els ítems sobre el mapa"
 
-#: GeolocationPlugin.php:509
+#: GeolocationPlugin.php:546
 msgid "Find a Location by Address:"
 msgstr "Troba una localització per l'adreça:"
 
-#: GeolocationPlugin.php:547
+#: GeolocationPlugin.php:587
 msgid "Find"
 msgstr "Troba"
 
 #: config_form.php:3
 msgid "General Settings"
-msgstr "Configuració general"
+msgstr "Paràmetres generals"
 
 #: config_form.php:6
 msgid "Default Latitude"
@@ -120,7 +123,7 @@ msgstr "Terreny"
 
 #: config_form.php:54
 msgid "Browse Map Settings"
-msgstr "Configuració del mapa"
+msgstr "Paràmetres del mapa"
 
 #: config_form.php:57
 msgid "Number of Locations Per Page"
@@ -139,62 +142,72 @@ msgid ""
 "If checked, the default location and zoom settings will be ignored on the "
 "browse map. Instead, the map will automatically pan and zoom to fit the "
 "locations displayed on each page."
-msgstr "Si està activat, la localització per defecte i la configuració del zoom seran ignorades al mapa d'ítems. En canvi, el mapa s'enquadrarà automàticament per les localitzacions mostrades a cada pàgina."
+msgstr "Si està activat, la localització per defecte i els paràmetres del zoom seran ignorats al mapa d'ítems. En canvi, el mapa s'enquadrarà automàticament per les localitzacions mostrades a cada pàgina."
 
 #: config_form.php:84
+msgid "Default Radius"
+msgstr "Radis per defecte"
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr "La mida del radi per defecte que s'utilitza a la pàgina de cerca avançada d'ítems. Vegeu a continuació si es calcula en milles o quilòmetres."
+
+#: config_form.php:93
 msgid "Use metric distances"
 msgstr "Utilitza distàncies mètriques"
 
-#: config_form.php:87
+#: config_form.php:96
 msgid "Use metric distances in proximity search."
 msgstr "Utilitza distàncies mètriques en cerques per proximitat."
 
-#: config_form.php:97
+#: config_form.php:106
 msgid "Item Map Settings"
-msgstr "Configuració del mapa d'ítems"
+msgstr "Paràmetres del mapa d'ítems"
 
-#: config_form.php:100
+#: config_form.php:109
 msgid "Width for Item Map"
 msgstr "Ample del mapa"
 
-#: config_form.php:103
+#: config_form.php:112
 msgid ""
 "The width of the map displayed on your items/show page. If left blank, the "
 "default width of 100% will be used."
 msgstr "L'amplada del mapa mostrat a la pàgina de cada ítem. Si es deixa en blanc, s'utilitzarà un 100%."
 
-#: config_form.php:110
+#: config_form.php:119
 msgid "Height for Item Map"
-msgstr "Altura del mapa"
+msgstr "Alçada del mapa"
 
-#: config_form.php:113
+#: config_form.php:122
 msgid ""
 "The height of the map displayed on your items/show page. If left blank, the "
 "default height of 300px will be used."
 msgstr "L'alçada del mapa mostrat a la pàgina de cada ítem. Si es deixa en blanc, s'utilitzarà una alçada de 300px."
 
-#: config_form.php:120
+#: config_form.php:129
 msgid "Map Integration"
 msgstr "Integració amb el mapa"
 
-#: config_form.php:123
+#: config_form.php:132
 msgid "Add Link to Map on Items/Browse Navigation"
 msgstr "Afegeix un enllaç des de la pàgina de navegació i d'ítems cap al mapa"
 
-#: config_form.php:126
+#: config_form.php:135
 msgid "Add a link to the items map on all the items/browse pages."
 msgstr "Afegeix un enllaç des del mapa cap a la pàgina de navegació i d'ítems."
 
-#: config_form.php:136
+#: config_form.php:145
 msgid "Add Map To Contribution Form"
 msgstr "Afegeix el mapa al formulari de contribució"
 
-#: config_form.php:139
+#: config_form.php:148
 msgid ""
 "If the Contribution plugin is installed and activated, Geolocation  will add"
 " a geolocation map field to the contribution form to associate a location to"
 " a contributed item."
-msgstr "Si el "
+msgstr "Si el connector Contribution es troba instal·lat i activat, Geolocation afegirà un mapa al formulari de contribució per associar localitzacions als ítems que formin part de l'enviament del contribuïdor. "
 
 #: models/Location.php:22
 msgid "Location requires an item ID."
@@ -232,7 +245,7 @@ msgstr "total"
 msgid "Find An Item on the Map"
 msgstr "Troba un ítem al mapa"
 
-#: views/helpers/ItemGoogleMap.php:50
+#: views/helpers/ItemGoogleMap.php:36
 msgid "This item has no location info associated with it."
 msgstr "Aquest ítem no té informació d'ubicació associada."
 
diff --git a/languages/cs.mo b/languages/cs.mo
index c9506b8..fd735f1 100644
Binary files a/languages/cs.mo and b/languages/cs.mo differ
diff --git a/languages/cs.po b/languages/cs.po
index a8dfaae..9834b86 100644
--- a/languages/cs.po
+++ b/languages/cs.po
@@ -4,70 +4,74 @@
 # 
 # Translators:
 # Jan Černý <cernyhonza@gmail.com>, 2013
-# MICHAL D. <black23@gmail.com>, 2013
+# Jiří Vírava <appukonrad@gmail.com>, 2014
+# MICHAL D. <black23@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Omeka\n"
 "Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
 "POT-Creation-Date: 2012-01-09 21:49-0500\n"
-"PO-Revision-Date: 2014-05-22 21:24+0000\n"
+"PO-Revision-Date: 2014-12-01 19:16+0000\n"
 "Last-Translator: John Flatness <john@zerocrates.org>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/omeka/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/omeka/omeka/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: GeolocationPlugin.php:298
-msgid "kilometers"
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
 msgstr ""
 
-#: GeolocationPlugin.php:300
+#: GeolocationPlugin.php:333
+msgid "kilometers"
+msgstr "kilometry"
+
+#: GeolocationPlugin.php:335
 msgid "miles"
-msgstr ""
+msgstr "míle"
 
-#: GeolocationPlugin.php:302
+#: GeolocationPlugin.php:337
 #, php-format
 msgid "within %1$s %2$s of \"%3$s\""
 msgstr ""
 
-#: GeolocationPlugin.php:322 GeolocationPlugin.php:328
-#: GeolocationPlugin.php:352
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
 msgid "Map"
 msgstr "Mapa"
 
-#: GeolocationPlugin.php:361
+#: GeolocationPlugin.php:396
 msgid "Browse Map"
 msgstr "Procházet mapu"
 
-#: GeolocationPlugin.php:409
+#: GeolocationPlugin.php:445
 msgid "Find A Geographic Location For The "
 msgstr "Najít geografickou lokaci pro"
 
-#: GeolocationPlugin.php:420
+#: GeolocationPlugin.php:457
 msgid "Geolocation Map"
 msgstr ""
 
-#: GeolocationPlugin.php:421
+#: GeolocationPlugin.php:458
 msgid "Show attached items on a map"
-msgstr ""
+msgstr "Zobrazit přiložené položky na mapě"
 
-#: GeolocationPlugin.php:509
+#: GeolocationPlugin.php:546
 msgid "Find a Location by Address:"
 msgstr "Najít lokaci podleadresy"
 
-#: GeolocationPlugin.php:547
+#: GeolocationPlugin.php:587
 msgid "Find"
 msgstr "Najít"
 
 #: config_form.php:3
 msgid "General Settings"
-msgstr ""
+msgstr "Obecná Nastavení"
 
 #: config_form.php:6
 msgid "Default Latitude"
-msgstr ""
+msgstr "Výchozí zeměpisná šířka"
 
 #: config_form.php:9
 msgid ""
@@ -77,7 +81,7 @@ msgstr ""
 
 #: config_form.php:16
 msgid "Default Longitude"
-msgstr ""
+msgstr "Výchozí zeměpisná délka"
 
 #: config_form.php:19
 msgid ""
@@ -93,11 +97,11 @@ msgstr "Výchozí úroveň zvětšení"
 msgid ""
 "An integer greater than or equal to 0, where 0 represents the most zoomed "
 "out scale."
-msgstr ""
+msgstr "Celé číslo větší nebo rovno 0, kde 0 představuje největší oddálení stupnice."
 
 #: config_form.php:36
 msgid "Map Type"
-msgstr ""
+msgstr "Typ mapy"
 
 #: config_form.php:39
 msgid "The type of map to display"
@@ -105,19 +109,19 @@ msgstr ""
 
 #: config_form.php:42
 msgid "Roadmap"
-msgstr ""
+msgstr "Silniční síť"
 
 #: config_form.php:43
 msgid "Satellite"
-msgstr ""
+msgstr "Satelitní"
 
 #: config_form.php:44
 msgid "Hybrid"
-msgstr ""
+msgstr "Smíšený"
 
 #: config_form.php:45
 msgid "Terrain"
-msgstr ""
+msgstr "Terénní"
 
 #: config_form.php:54
 msgid "Browse Map Settings"
@@ -143,54 +147,64 @@ msgid ""
 msgstr ""
 
 #: config_form.php:84
-msgid "Use metric distances"
+msgid "Default Radius"
 msgstr ""
 
 #: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr ""
+
+#: config_form.php:93
+msgid "Use metric distances"
+msgstr "Použít metrické vzdálenosti"
+
+#: config_form.php:96
 msgid "Use metric distances in proximity search."
 msgstr ""
 
-#: config_form.php:97
+#: config_form.php:106
 msgid "Item Map Settings"
 msgstr ""
 
-#: config_form.php:100
+#: config_form.php:109
 msgid "Width for Item Map"
 msgstr ""
 
-#: config_form.php:103
+#: config_form.php:112
 msgid ""
 "The width of the map displayed on your items/show page. If left blank, the "
 "default width of 100% will be used."
 msgstr ""
 
-#: config_form.php:110
+#: config_form.php:119
 msgid "Height for Item Map"
 msgstr ""
 
-#: config_form.php:113
+#: config_form.php:122
 msgid ""
 "The height of the map displayed on your items/show page. If left blank, the "
 "default height of 300px will be used."
 msgstr ""
 
-#: config_form.php:120
+#: config_form.php:129
 msgid "Map Integration"
 msgstr ""
 
-#: config_form.php:123
+#: config_form.php:132
 msgid "Add Link to Map on Items/Browse Navigation"
 msgstr ""
 
-#: config_form.php:126
+#: config_form.php:135
 msgid "Add a link to the items map on all the items/browse pages."
 msgstr ""
 
-#: config_form.php:136
+#: config_form.php:145
 msgid "Add Map To Contribution Form"
 msgstr ""
 
-#: config_form.php:139
+#: config_form.php:148
 msgid ""
 "If the Contribution plugin is installed and activated, Geolocation  will add"
 " a geolocation map field to the contribution form to associate a location to"
@@ -233,18 +247,18 @@ msgstr "celkem"
 msgid "Find An Item on the Map"
 msgstr "Najít položku na mapě"
 
-#: views/helpers/ItemGoogleMap.php:50
+#: views/helpers/ItemGoogleMap.php:36
 msgid "This item has no location info associated with it."
-msgstr ""
+msgstr "Tato položka nemá informace o místě s ním spojeném."
 
 #: views/shared/map/advanced-search-partial.php:16
 msgid "Geographic Radius (kilometers)"
-msgstr ""
+msgstr "Geografický radius (kilometry)"
 
 #: views/shared/map/advanced-search-partial.php:18
 msgid "Geographic Radius (miles)"
-msgstr ""
+msgstr "Geografický radius (míle)"
 
 #: views/shared/map/advanced-search-partial.php:25
 msgid "Geographic Address"
-msgstr ""
+msgstr "Geografická adresa"
diff --git a/languages/cy_GB.mo b/languages/cy_GB.mo
index 2ced6e8..842328f 100644
Binary files a/languages/cy_GB.mo and b/languages/cy_GB.mo differ
diff --git a/languages/cy_GB.po b/languages/cy_GB.po
index 5f8d9f1..95c6511 100644
--- a/languages/cy_GB.po
+++ b/languages/cy_GB.po
@@ -9,54 +9,57 @@ msgstr ""
 "Project-Id-Version: Omeka\n"
 "Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
 "POT-Creation-Date: 2012-01-09 21:49-0500\n"
-"PO-Revision-Date: 2014-05-22 21:24+0000\n"
+"PO-Revision-Date: 2014-12-01 19:16+0000\n"
 "Last-Translator: John Flatness <john@zerocrates.org>\n"
-"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/omeka/language/cy_GB/)\n"
+"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/omeka/omeka/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cy_GB\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
-#: GeolocationPlugin.php:298
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr ""
+
+#: GeolocationPlugin.php:333
 msgid "kilometers"
 msgstr ""
 
-#: GeolocationPlugin.php:300
+#: GeolocationPlugin.php:335
 msgid "miles"
 msgstr ""
 
-#: GeolocationPlugin.php:302
+#: GeolocationPlugin.php:337
 #, php-format
 msgid "within %1$s %2$s of \"%3$s\""
 msgstr ""
 
-#: GeolocationPlugin.php:322 GeolocationPlugin.php:328
-#: GeolocationPlugin.php:352
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
 msgid "Map"
 msgstr "Map"
 
-#: GeolocationPlugin.php:361
+#: GeolocationPlugin.php:396
 msgid "Browse Map"
 msgstr "Pori'r map"
 
-#: GeolocationPlugin.php:409
+#: GeolocationPlugin.php:445
 msgid "Find A Geographic Location For The "
 msgstr "Darganfod Lleoliad Ar Gyfer Y"
 
-#: GeolocationPlugin.php:420
+#: GeolocationPlugin.php:457
 msgid "Geolocation Map"
 msgstr ""
 
-#: GeolocationPlugin.php:421
+#: GeolocationPlugin.php:458
 msgid "Show attached items on a map"
 msgstr ""
 
-#: GeolocationPlugin.php:509
+#: GeolocationPlugin.php:546
 msgid "Find a Location by Address:"
 msgstr "Darganfod Lleoliad yn ôl Cyfeiriad:"
 
-#: GeolocationPlugin.php:547
+#: GeolocationPlugin.php:587
 msgid "Find"
 msgstr "Darganfod"
 
@@ -142,54 +145,64 @@ msgid ""
 msgstr ""
 
 #: config_form.php:84
+msgid "Default Radius"
+msgstr ""
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr ""
+
+#: config_form.php:93
 msgid "Use metric distances"
 msgstr "Defnyddio pellteroedd metrig"
 
-#: config_form.php:87
+#: config_form.php:96
 msgid "Use metric distances in proximity search."
 msgstr "Defnyddio pellteroedd metrig mewn chwiliadau agosrwydd."
 
-#: config_form.php:97
+#: config_form.php:106
 msgid "Item Map Settings"
 msgstr ""
 
-#: config_form.php:100
+#: config_form.php:109
 msgid "Width for Item Map"
 msgstr "Lled ar gyfer Map Eitem"
 
-#: config_form.php:103
+#: config_form.php:112
 msgid ""
 "The width of the map displayed on your items/show page. If left blank, the "
 "default width of 100% will be used."
 msgstr "Lled y map ar eich tudalen eitemau/dangos. Os yw'n wag, bydd lled rhagosodedig o 100% yn cael ei ddefnyddio."
 
-#: config_form.php:110
+#: config_form.php:119
 msgid "Height for Item Map"
 msgstr "Uchder ar gyfer Map Eitem"
 
-#: config_form.php:113
+#: config_form.php:122
 msgid ""
 "The height of the map displayed on your items/show page. If left blank, the "
 "default height of 300px will be used."
 msgstr "Uchder y map ar eich tudalen eitemau/dangos. Os yw'n wag, bydd uchder rhagosodedig o 300px yn cael ei ddefnyddio."
 
-#: config_form.php:120
+#: config_form.php:129
 msgid "Map Integration"
 msgstr ""
 
-#: config_form.php:123
+#: config_form.php:132
 msgid "Add Link to Map on Items/Browse Navigation"
 msgstr "Ychwanegu Dolen i'r Map ar y Rhyngwyneb Eitemau/Pori"
 
-#: config_form.php:126
+#: config_form.php:135
 msgid "Add a link to the items map on all the items/browse pages."
 msgstr "Ychwanegu dolen i'r map eitemau ar yr holl dudalennau eitemau/pori."
 
-#: config_form.php:136
+#: config_form.php:145
 msgid "Add Map To Contribution Form"
 msgstr "Ychwanegu Map I'r Ffurflen Cyfrannu"
 
-#: config_form.php:139
+#: config_form.php:148
 msgid ""
 "If the Contribution plugin is installed and activated, Geolocation  will add"
 " a geolocation map field to the contribution form to associate a location to"
@@ -232,7 +245,7 @@ msgstr "cyfanswm"
 msgid "Find An Item on the Map"
 msgstr "Dod o hyd i Eitem ar y Map"
 
-#: views/helpers/ItemGoogleMap.php:50
+#: views/helpers/ItemGoogleMap.php:36
 msgid "This item has no location info associated with it."
 msgstr "Does dim gwybodaeth lleoliad yn gysylltiol a'r eitem hon."
 
diff --git a/languages/de_DE.mo b/languages/de_DE.mo
new file mode 100644
index 0000000..1a68ed4
Binary files /dev/null and b/languages/de_DE.mo differ
diff --git a/languages/de_DE.po b/languages/de_DE.po
new file mode 100644
index 0000000..6475b08
--- /dev/null
+++ b/languages/de_DE.po
@@ -0,0 +1,263 @@
+# Translation for the Geolocation plugin for Omeka.
+# Copyright (C) 2011 Roy Rosenzweig Center for History and New Media
+# This file is distributed under the same license as the Omeka package.
+# 
+# Translators:
+# E, 2014
+# Roland Keck <roland.keck@web.de>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Omeka\n"
+"Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
+"POT-Creation-Date: 2012-01-09 21:49-0500\n"
+"PO-Revision-Date: 2014-12-18 21:58+0000\n"
+"Last-Translator: E\n"
+"Language-Team: German (Germany) (http://www.transifex.com/omeka/omeka/language/de_DE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_DE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr "Geolokation"
+
+#: GeolocationPlugin.php:333
+msgid "kilometers"
+msgstr "Kilometer"
+
+#: GeolocationPlugin.php:335
+msgid "miles"
+msgstr "Meilen"
+
+#: GeolocationPlugin.php:337
+#, php-format
+msgid "within %1$s %2$s of \"%3$s\""
+msgstr "Innerhalb %1$s %2$s von \"%3$s\""
+
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
+msgid "Map"
+msgstr "Karte"
+
+#: GeolocationPlugin.php:396
+msgid "Browse Map"
+msgstr "Karte durchstöbern"
+
+#: GeolocationPlugin.php:445
+msgid "Find A Geographic Location For The "
+msgstr "Den geographischen Ort für The finden"
+
+#: GeolocationPlugin.php:457
+msgid "Geolocation Map"
+msgstr "Geolocation Karte"
+
+#: GeolocationPlugin.php:458
+msgid "Show attached items on a map"
+msgstr "Verwandte Objekte auf einer Karte zeigen"
+
+#: GeolocationPlugin.php:546
+msgid "Find a Location by Address:"
+msgstr "Ort mit Hilfe der Adresse finden:"
+
+#: GeolocationPlugin.php:587
+msgid "Find"
+msgstr "Finden"
+
+#: config_form.php:3
+msgid "General Settings"
+msgstr "generelle Einstellungen"
+
+#: config_form.php:6
+msgid "Default Latitude"
+msgstr "Standard Breitengrad"
+
+#: config_form.php:9
+msgid ""
+"Latitude of the map's initial center point, in degrees. Must be between -90 "
+"and 90."
+msgstr "Initieller Breitengrad, der als Kartenmitte verwendet wird. Angabe muss zwischen -90 und 90 liegen."
+
+#: config_form.php:16
+msgid "Default Longitude"
+msgstr "Standard Längengrad."
+
+#: config_form.php:19
+msgid ""
+"Longitude of the map's initial center point, in degrees. Must be between "
+"-180 and 180."
+msgstr "Initieller Längengrad, der als Kartenmitte verwendet wird. Angabe muss zwischen -180 und 180 liegen."
+
+#: config_form.php:26
+msgid "Default Zoom Level"
+msgstr "Standard Zoom Level"
+
+#: config_form.php:29
+msgid ""
+"An integer greater than or equal to 0, where 0 represents the most zoomed "
+"out scale."
+msgstr "Eine Ganzzahl, größer oder gleich 0. 0 bedeutet die größtmögliche Verkleinerung."
+
+#: config_form.php:36
+msgid "Map Type"
+msgstr "Kartentyp"
+
+#: config_form.php:39
+msgid "The type of map to display"
+msgstr "Anzuzeigender Kartentyp"
+
+#: config_form.php:42
+msgid "Roadmap"
+msgstr "Straßenkarte"
+
+#: config_form.php:43
+msgid "Satellite"
+msgstr "Satellit"
+
+#: config_form.php:44
+msgid "Hybrid"
+msgstr "Gemischt"
+
+#: config_form.php:45
+msgid "Terrain"
+msgstr "Gelände"
+
+#: config_form.php:54
+msgid "Browse Map Settings"
+msgstr "Karteneinstellungen durchstöbern"
+
+#: config_form.php:57
+msgid "Number of Locations Per Page"
+msgstr "Anzahl der Orte pro Seite"
+
+#: config_form.php:60
+msgid "The number of locations displayed per page when browsing the map."
+msgstr "Anzahl der Orte, die pro Seite angezeigt werden, wenn die Karte duchstöbert wird."
+
+#: config_form.php:66
+msgid "Auto-fit to Locations"
+msgstr "Automatisch an die Orte anpassen"
+
+#: config_form.php:70
+msgid ""
+"If checked, the default location and zoom settings will be ignored on the "
+"browse map. Instead, the map will automatically pan and zoom to fit the "
+"locations displayed on each page."
+msgstr "Wenn das Feld angehakt ist, werden die Einstellungen zum Standardort und -Zoom ignoriert. Statt dessen wird die Karte automatisch ausgerichtet und gezoomt, so dass die Orte auf jeder Seite passend angezeigt werden."
+
+#: config_form.php:84
+msgid "Default Radius"
+msgstr "Standardradius"
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr "Größe des Standardradius, der bei der erweiterten Suche verwendet wird. Ob die Längen in Meilen oder Kilometer angegeben sind siehe weiter unten."
+
+#: config_form.php:93
+msgid "Use metric distances"
+msgstr "Metrische Entfernungen verwenden"
+
+#: config_form.php:96
+msgid "Use metric distances in proximity search."
+msgstr "Metrische Einstellungen in der Umgebungssuche verwenden"
+
+#: config_form.php:106
+msgid "Item Map Settings"
+msgstr "Karteneinstellungen"
+
+#: config_form.php:109
+msgid "Width for Item Map"
+msgstr "Breite der Karte"
+
+#: config_form.php:112
+msgid ""
+"The width of the map displayed on your items/show page. If left blank, the "
+"default width of 100% will be used."
+msgstr "Die Breite der Karte, wie sie auf der Anzeigeseite für die Objekte verwendet wird. Wird diese Einstellung leer gelassen, wird die Standardeinstellung von 100% verwendet."
+
+#: config_form.php:119
+msgid "Height for Item Map"
+msgstr "Höhe der Karte"
+
+#: config_form.php:122
+msgid ""
+"The height of the map displayed on your items/show page. If left blank, the "
+"default height of 300px will be used."
+msgstr "Die Höhe der Karte, wie sie auf der Anzeigeseite für die Objekte verwendet wird. Wird diese Einstellung leer gelassen, wird die Standardeinstellung von 300px verwendet."
+
+#: config_form.php:129
+msgid "Map Integration"
+msgstr "Integration der Karte"
+
+#: config_form.php:132
+msgid "Add Link to Map on Items/Browse Navigation"
+msgstr "Link zur Karte auf der Browse-Items-Seite hinzufügen"
+
+#: config_form.php:135
+msgid "Add a link to the items map on all the items/browse pages."
+msgstr "Einen Link auf die Karte auf allen Objekt-Browse-Seiten hinzufügen."
+
+#: config_form.php:145
+msgid "Add Map To Contribution Form"
+msgstr "Karte auf dem Formular \"Beiträge\" hinzufügen"
+
+#: config_form.php:148
+msgid ""
+"If the Contribution plugin is installed and activated, Geolocation  will add"
+" a geolocation map field to the contribution form to associate a location to"
+" a contributed item."
+msgstr "Wenn das Beitrags-Plugin installiert und akitiviert wurde, wird Geolocation ein Feld zur Erfassung der Geolocation eines Objekts dem entsprechenden Formular hinzufügen."
+
+#: models/Location.php:22
+msgid "Location requires an item ID."
+msgstr "Ortsangabe erfordert eine Objekt-ID."
+
+#: models/Location.php:26
+msgid "Location requires a valid item ID."
+msgstr "Ortsangabe erfordert eine gültige Objekt-ID."
+
+#: models/Location.php:31
+msgid "A location already exists for the provided item."
+msgstr "Es existiert bereits eine Ortsangabe für das Objekt."
+
+#: models/Location.php:34
+msgid "Location requires a latitude."
+msgstr "Ortsangabe erfordert einen Breitengrad."
+
+#: models/Location.php:37
+msgid "Location requires a longitude."
+msgstr "Ortsangabe erfordert einen Längengrad."
+
+#: models/Location.php:40
+msgid "Location requires a zoom level."
+msgstr "Ortsangabe erfordert einen Zoomlevel."
+
+#: views/admin/map/browse.php:4 views/public/map/browse.php:4
+msgid "Browse Items on the Map"
+msgstr "Objekte auf der Karte durchstöbern"
+
+#: views/admin/map/browse.php:4
+msgid "total"
+msgstr "Total"
+
+#: views/admin/map/browse.php:13 views/public/map/browse.php:21
+msgid "Find An Item on the Map"
+msgstr "Objekt auf der Karte finden"
+
+#: views/helpers/ItemGoogleMap.php:36
+msgid "This item has no location info associated with it."
+msgstr "Dieses Objekt hat keine zugehörige Ortsangabe."
+
+#: views/shared/map/advanced-search-partial.php:16
+msgid "Geographic Radius (kilometers)"
+msgstr "Geographischer Radius (Kilometer)"
+
+#: views/shared/map/advanced-search-partial.php:18
+msgid "Geographic Radius (miles)"
+msgstr "Geographischer Radius (Meilen)"
+
+#: views/shared/map/advanced-search-partial.php:25
+msgid "Geographic Address"
+msgstr "Geographische Adresse"
diff --git a/languages/el_GR.mo b/languages/el_GR.mo
new file mode 100644
index 0000000..eea92c8
Binary files /dev/null and b/languages/el_GR.mo differ
diff --git a/languages/el_GR.po b/languages/el_GR.po
new file mode 100644
index 0000000..75f2fc8
--- /dev/null
+++ b/languages/el_GR.po
@@ -0,0 +1,262 @@
+# Translation for the Geolocation plugin for Omeka.
+# Copyright (C) 2011 Roy Rosenzweig Center for History and New Media
+# This file is distributed under the same license as the Omeka package.
+# 
+# Translators:
+# Konstantina Elma <konstantinaelma@hotmail.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: Omeka\n"
+"Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
+"POT-Creation-Date: 2012-01-09 21:49-0500\n"
+"PO-Revision-Date: 2015-03-05 15:23+0000\n"
+"Last-Translator: Konstantina Elma <konstantinaelma@hotmail.com>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/omeka/omeka/language/el_GR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el_GR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr "Γεωεντοπισμός "
+
+#: GeolocationPlugin.php:333
+msgid "kilometers"
+msgstr "χιλιόμετρα"
+
+#: GeolocationPlugin.php:335
+msgid "miles"
+msgstr "μίλια"
+
+#: GeolocationPlugin.php:337
+#, php-format
+msgid "within %1$s %2$s of \"%3$s\""
+msgstr ""
+
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
+msgid "Map"
+msgstr "Χάρτης"
+
+#: GeolocationPlugin.php:396
+msgid "Browse Map"
+msgstr "Περιήγηση Χάρτη"
+
+#: GeolocationPlugin.php:445
+msgid "Find A Geographic Location For The "
+msgstr ""
+
+#: GeolocationPlugin.php:457
+msgid "Geolocation Map"
+msgstr ""
+
+#: GeolocationPlugin.php:458
+msgid "Show attached items on a map"
+msgstr ""
+
+#: GeolocationPlugin.php:546
+msgid "Find a Location by Address:"
+msgstr "Εύρεση μιας τοποθεσίας βάση διεύθυνσης:"
+
+#: GeolocationPlugin.php:587
+msgid "Find"
+msgstr "Εύρεση"
+
+#: config_form.php:3
+msgid "General Settings"
+msgstr "Γενικές Ρυθμίσεις"
+
+#: config_form.php:6
+msgid "Default Latitude"
+msgstr "Προεπιλεγμένο Γεωγραφικό Πλάτος"
+
+#: config_form.php:9
+msgid ""
+"Latitude of the map's initial center point, in degrees. Must be between -90 "
+"and 90."
+msgstr ""
+
+#: config_form.php:16
+msgid "Default Longitude"
+msgstr "Προεπιλεγμένο Γεωγραφικό Μήκος"
+
+#: config_form.php:19
+msgid ""
+"Longitude of the map's initial center point, in degrees. Must be between "
+"-180 and 180."
+msgstr ""
+
+#: config_form.php:26
+msgid "Default Zoom Level"
+msgstr "Προεπιλεγμένο Επίπεδο Εστίασης"
+
+#: config_form.php:29
+msgid ""
+"An integer greater than or equal to 0, where 0 represents the most zoomed "
+"out scale."
+msgstr ""
+
+#: config_form.php:36
+msgid "Map Type"
+msgstr ""
+
+#: config_form.php:39
+msgid "The type of map to display"
+msgstr ""
+
+#: config_form.php:42
+msgid "Roadmap"
+msgstr "Οδικός χάρτης"
+
+#: config_form.php:43
+msgid "Satellite"
+msgstr "Δορυφόρος "
+
+#: config_form.php:44
+msgid "Hybrid"
+msgstr ""
+
+#: config_form.php:45
+msgid "Terrain"
+msgstr ""
+
+#: config_form.php:54
+msgid "Browse Map Settings"
+msgstr "Περιήγηση Ρυθμίσεων Χάρτη "
+
+#: config_form.php:57
+msgid "Number of Locations Per Page"
+msgstr ""
+
+#: config_form.php:60
+msgid "The number of locations displayed per page when browsing the map."
+msgstr ""
+
+#: config_form.php:66
+msgid "Auto-fit to Locations"
+msgstr ""
+
+#: config_form.php:70
+msgid ""
+"If checked, the default location and zoom settings will be ignored on the "
+"browse map. Instead, the map will automatically pan and zoom to fit the "
+"locations displayed on each page."
+msgstr ""
+
+#: config_form.php:84
+msgid "Default Radius"
+msgstr ""
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr ""
+
+#: config_form.php:93
+msgid "Use metric distances"
+msgstr ""
+
+#: config_form.php:96
+msgid "Use metric distances in proximity search."
+msgstr ""
+
+#: config_form.php:106
+msgid "Item Map Settings"
+msgstr ""
+
+#: config_form.php:109
+msgid "Width for Item Map"
+msgstr ""
+
+#: config_form.php:112
+msgid ""
+"The width of the map displayed on your items/show page. If left blank, the "
+"default width of 100% will be used."
+msgstr ""
+
+#: config_form.php:119
+msgid "Height for Item Map"
+msgstr ""
+
+#: config_form.php:122
+msgid ""
+"The height of the map displayed on your items/show page. If left blank, the "
+"default height of 300px will be used."
+msgstr ""
+
+#: config_form.php:129
+msgid "Map Integration"
+msgstr "Ενσωμάτωση Χάρτη"
+
+#: config_form.php:132
+msgid "Add Link to Map on Items/Browse Navigation"
+msgstr ""
+
+#: config_form.php:135
+msgid "Add a link to the items map on all the items/browse pages."
+msgstr ""
+
+#: config_form.php:145
+msgid "Add Map To Contribution Form"
+msgstr "Προσθήκη χάρτη στη φόρμα συνεισφοράς  "
+
+#: config_form.php:148
+msgid ""
+"If the Contribution plugin is installed and activated, Geolocation  will add"
+" a geolocation map field to the contribution form to associate a location to"
+" a contributed item."
+msgstr ""
+
+#: models/Location.php:22
+msgid "Location requires an item ID."
+msgstr ""
+
+#: models/Location.php:26
+msgid "Location requires a valid item ID."
+msgstr ""
+
+#: models/Location.php:31
+msgid "A location already exists for the provided item."
+msgstr ""
+
+#: models/Location.php:34
+msgid "Location requires a latitude."
+msgstr ""
+
+#: models/Location.php:37
+msgid "Location requires a longitude."
+msgstr ""
+
+#: models/Location.php:40
+msgid "Location requires a zoom level."
+msgstr ""
+
+#: views/admin/map/browse.php:4 views/public/map/browse.php:4
+msgid "Browse Items on the Map"
+msgstr "Περιήγηση Αντικειμένων στο Χάρτη"
+
+#: views/admin/map/browse.php:4
+msgid "total"
+msgstr ""
+
+#: views/admin/map/browse.php:13 views/public/map/browse.php:21
+msgid "Find An Item on the Map"
+msgstr "Εύρεση ενός αντικειμένου στο Χάρτη"
+
+#: views/helpers/ItemGoogleMap.php:36
+msgid "This item has no location info associated with it."
+msgstr ""
+
+#: views/shared/map/advanced-search-partial.php:16
+msgid "Geographic Radius (kilometers)"
+msgstr "Γεωγραφική Ακτίνα (χιλιόμετρα)"
+
+#: views/shared/map/advanced-search-partial.php:18
+msgid "Geographic Radius (miles)"
+msgstr "Γεωγραφική Ακτίνα (μίλια)"
+
+#: views/shared/map/advanced-search-partial.php:25
+msgid "Geographic Address"
+msgstr "Γεωγραφική Διεύθυνση"
diff --git a/languages/es.mo b/languages/es.mo
index 5f5e719..aabb10c 100644
Binary files a/languages/es.mo and b/languages/es.mo differ
diff --git a/languages/es.po b/languages/es.po
index 11998c3..7aaea80 100644
--- a/languages/es.po
+++ b/languages/es.po
@@ -3,66 +3,70 @@
 # This file is distributed under the same license as the Omeka package.
 # 
 # Translators:
+# dario hereñu <magallania@gmail.com>, 2014
 # Francisco Gálvez Prada <iguannaweb@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Omeka\n"
 "Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
 "POT-Creation-Date: 2012-01-09 21:49-0500\n"
-"PO-Revision-Date: 2014-05-22 21:24+0000\n"
-"Last-Translator: John Flatness <john@zerocrates.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/omeka/language/es/)\n"
+"PO-Revision-Date: 2014-12-01 20:56+0000\n"
+"Last-Translator: dario hereñu <magallania@gmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/omeka/omeka/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeolocationPlugin.php:298
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr "Geolocalización"
+
+#: GeolocationPlugin.php:333
 msgid "kilometers"
-msgstr ""
+msgstr "kilómetros"
 
-#: GeolocationPlugin.php:300
+#: GeolocationPlugin.php:335
 msgid "miles"
-msgstr ""
+msgstr "millas"
 
-#: GeolocationPlugin.php:302
+#: GeolocationPlugin.php:337
 #, php-format
 msgid "within %1$s %2$s of \"%3$s\""
-msgstr ""
+msgstr "dentro %1$s %2$s de \"%3$s\""
 
-#: GeolocationPlugin.php:322 GeolocationPlugin.php:328
-#: GeolocationPlugin.php:352
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
 msgid "Map"
 msgstr "Mapa"
 
-#: GeolocationPlugin.php:361
+#: GeolocationPlugin.php:396
 msgid "Browse Map"
 msgstr "Explorar mapa"
 
-#: GeolocationPlugin.php:409
+#: GeolocationPlugin.php:445
 msgid "Find A Geographic Location For The "
-msgstr "Encontrar una localización geográfica para "
+msgstr "Encontrar una localización geográfica para el"
 
-#: GeolocationPlugin.php:420
+#: GeolocationPlugin.php:457
 msgid "Geolocation Map"
-msgstr ""
+msgstr "Mapa de geolocalización"
 
-#: GeolocationPlugin.php:421
+#: GeolocationPlugin.php:458
 msgid "Show attached items on a map"
-msgstr ""
+msgstr "Mostrar elementos adjuntos en un mapa"
 
-#: GeolocationPlugin.php:509
+#: GeolocationPlugin.php:546
 msgid "Find a Location by Address:"
 msgstr "Encontrar una localización por dirección:"
 
-#: GeolocationPlugin.php:547
+#: GeolocationPlugin.php:587
 msgid "Find"
-msgstr "Encontrar"
+msgstr "Buscar"
 
 #: config_form.php:3
 msgid "General Settings"
-msgstr ""
+msgstr "Configuración General"
 
 #: config_form.php:6
 msgid "Default Latitude"
@@ -92,35 +96,35 @@ msgstr "Nivel de zoom por defecto"
 msgid ""
 "An integer greater than or equal to 0, where 0 represents the most zoomed "
 "out scale."
-msgstr ""
+msgstr "Un número entero mayor que o igual a 0, donde 0 representa la escala más amplia."
 
 #: config_form.php:36
 msgid "Map Type"
-msgstr ""
+msgstr "Tipo de mapa"
 
 #: config_form.php:39
 msgid "The type of map to display"
-msgstr ""
+msgstr "El tipo de mapa a mostrar"
 
 #: config_form.php:42
 msgid "Roadmap"
-msgstr ""
+msgstr "Hoja de ruta"
 
 #: config_form.php:43
 msgid "Satellite"
-msgstr ""
+msgstr "Satélite"
 
 #: config_form.php:44
 msgid "Hybrid"
-msgstr ""
+msgstr "Híbrido"
 
 #: config_form.php:45
 msgid "Terrain"
-msgstr ""
+msgstr "Terreno"
 
 #: config_form.php:54
 msgid "Browse Map Settings"
-msgstr ""
+msgstr "Navegar configuración del mapa"
 
 #: config_form.php:57
 msgid "Number of Locations Per Page"
@@ -128,122 +132,132 @@ msgstr "Numero de localizaciones por página"
 
 #: config_form.php:60
 msgid "The number of locations displayed per page when browsing the map."
-msgstr ""
+msgstr "El número de ubicaciones mostradas por página cuando se navega el mapa."
 
 #: config_form.php:66
 msgid "Auto-fit to Locations"
-msgstr ""
+msgstr "Autoajuste de ubicaciones"
 
 #: config_form.php:70
 msgid ""
 "If checked, the default location and zoom settings will be ignored on the "
 "browse map. Instead, the map will automatically pan and zoom to fit the "
 "locations displayed on each page."
-msgstr ""
+msgstr "Si se marca, la ubicación y los valores de zoom predeterminados serán ignorados en el mapa de navegación. En cambio, el mapa se encuadrará automáticamente para adaptarse a los lugares que se muestran en cada página."
 
 #: config_form.php:84
-msgid "Use metric distances"
-msgstr ""
+msgid "Default Radius"
+msgstr "Radio por defecto"
 
 #: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr "El tamaño del radio por defecto para usar en la página de búsqueda avanzada de objetos. Vea a continuación si se debe medir en millas o kilómetros."
+
+#: config_form.php:93
+msgid "Use metric distances"
+msgstr "Utilizar distancias métricas"
+
+#: config_form.php:96
 msgid "Use metric distances in proximity search."
-msgstr ""
+msgstr "Utilizar distancias métricas en búsqueda de proximidad."
 
-#: config_form.php:97
+#: config_form.php:106
 msgid "Item Map Settings"
-msgstr ""
+msgstr "Configuración elemento de mapa"
 
-#: config_form.php:100
+#: config_form.php:109
 msgid "Width for Item Map"
-msgstr ""
+msgstr "Ancho del elemento de mapa"
 
-#: config_form.php:103
+#: config_form.php:112
 msgid ""
 "The width of the map displayed on your items/show page. If left blank, the "
 "default width of 100% will be used."
-msgstr ""
+msgstr "La anchura del mapa visualizado en su página de elementos/mostrar. Si se deja en blanco, se usará el ancho predeterminado de 100%."
 
-#: config_form.php:110
+#: config_form.php:119
 msgid "Height for Item Map"
-msgstr ""
+msgstr "Altura del elemento de mapa"
 
-#: config_form.php:113
+#: config_form.php:122
 msgid ""
 "The height of the map displayed on your items/show page. If left blank, the "
 "default height of 300px will be used."
-msgstr ""
+msgstr "La altura del mapa visualizado en su página de elementos/mostrar. Si se deja vacío, se usará la altura predeterminada de 300 píxeles."
 
-#: config_form.php:120
+#: config_form.php:129
 msgid "Map Integration"
-msgstr ""
+msgstr "Integración de mapa"
 
-#: config_form.php:123
+#: config_form.php:132
 msgid "Add Link to Map on Items/Browse Navigation"
-msgstr ""
+msgstr "Agregar enlace de elementos del mapa/Navegar "
 
-#: config_form.php:126
+#: config_form.php:135
 msgid "Add a link to the items map on all the items/browse pages."
-msgstr ""
+msgstr "Añadir un enlace a los elementos del mapa en todas las páginas de elementos/navegación."
 
-#: config_form.php:136
+#: config_form.php:145
 msgid "Add Map To Contribution Form"
-msgstr ""
+msgstr "Agregar mapa al formulario de contribución"
 
-#: config_form.php:139
+#: config_form.php:148
 msgid ""
 "If the Contribution plugin is installed and activated, Geolocation  will add"
 " a geolocation map field to the contribution form to associate a location to"
 " a contributed item."
-msgstr ""
+msgstr "Si el plugin Contribution está instalado y activado, Geolocation agregará un campo de mapa de geolocalización al formulario de contribución para asociar una ubicación al elemento aportado."
 
 #: models/Location.php:22
 msgid "Location requires an item ID."
-msgstr ""
+msgstr "Ubicación exige de un elemento ID."
 
 #: models/Location.php:26
 msgid "Location requires a valid item ID."
-msgstr ""
+msgstr "Locación exige un elemento ID válido."
 
 #: models/Location.php:31
 msgid "A location already exists for the provided item."
-msgstr ""
+msgstr "Una ubicación ya existe para el elemento proporcionado."
 
 #: models/Location.php:34
 msgid "Location requires a latitude."
-msgstr ""
+msgstr "Ubicación solicita una latitud."
 
 #: models/Location.php:37
 msgid "Location requires a longitude."
-msgstr ""
+msgstr "Ubicación solicita una longitud."
 
 #: models/Location.php:40
 msgid "Location requires a zoom level."
-msgstr ""
+msgstr "Ubicación solicita un nivel de zoom."
 
 #: views/admin/map/browse.php:4 views/public/map/browse.php:4
 msgid "Browse Items on the Map"
-msgstr ""
+msgstr "Navegar elementos en el mapa"
 
 #: views/admin/map/browse.php:4
 msgid "total"
-msgstr ""
+msgstr "total"
 
 #: views/admin/map/browse.php:13 views/public/map/browse.php:21
 msgid "Find An Item on the Map"
-msgstr ""
+msgstr "Encontrar un elemento en el mapa"
 
-#: views/helpers/ItemGoogleMap.php:50
+#: views/helpers/ItemGoogleMap.php:36
 msgid "This item has no location info associated with it."
-msgstr ""
+msgstr "Este elemento no tiene información de ubicación asociada al mismo."
 
 #: views/shared/map/advanced-search-partial.php:16
 msgid "Geographic Radius (kilometers)"
-msgstr ""
+msgstr "Radio geográfico (kilómetros)"
 
 #: views/shared/map/advanced-search-partial.php:18
 msgid "Geographic Radius (miles)"
-msgstr ""
+msgstr "Radio geográfico (millas)"
 
 #: views/shared/map/advanced-search-partial.php:25
 msgid "Geographic Address"
-msgstr ""
+msgstr "Dirección geográfica"
diff --git a/languages/es_CO.mo b/languages/es_CO.mo
index 60d69cf..0d88780 100644
Binary files a/languages/es_CO.mo and b/languages/es_CO.mo differ
diff --git a/languages/es_CO.po b/languages/es_CO.po
index 5351f56..a867408 100644
--- a/languages/es_CO.po
+++ b/languages/es_CO.po
@@ -9,54 +9,57 @@ msgstr ""
 "Project-Id-Version: Omeka\n"
 "Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
 "POT-Creation-Date: 2012-01-09 21:49-0500\n"
-"PO-Revision-Date: 2014-07-01 02:12+0000\n"
-"Last-Translator: Catalina_Melo <catalinamelo10@gmail.com>\n"
-"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/omeka/language/es_CO/)\n"
+"PO-Revision-Date: 2014-12-01 19:16+0000\n"
+"Last-Translator: John Flatness <john@zerocrates.org>\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/omeka/omeka/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeolocationPlugin.php:298
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr ""
+
+#: GeolocationPlugin.php:333
 msgid "kilometers"
 msgstr "kilómetros"
 
-#: GeolocationPlugin.php:300
+#: GeolocationPlugin.php:335
 msgid "miles"
 msgstr "millas"
 
-#: GeolocationPlugin.php:302
+#: GeolocationPlugin.php:337
 #, php-format
 msgid "within %1$s %2$s of \"%3$s\""
 msgstr "entre %1$s %2$s de \"%3$s\""
 
-#: GeolocationPlugin.php:322 GeolocationPlugin.php:328
-#: GeolocationPlugin.php:352
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
 msgid "Map"
 msgstr "Mapa"
 
-#: GeolocationPlugin.php:361
+#: GeolocationPlugin.php:396
 msgid "Browse Map"
 msgstr "Ver en el Mapa"
 
-#: GeolocationPlugin.php:409
+#: GeolocationPlugin.php:445
 msgid "Find A Geographic Location For The "
 msgstr "Encontrar una Ubicación Geográfica "
 
-#: GeolocationPlugin.php:420
+#: GeolocationPlugin.php:457
 msgid "Geolocation Map"
 msgstr "Mapa de Geolocalización"
 
-#: GeolocationPlugin.php:421
+#: GeolocationPlugin.php:458
 msgid "Show attached items on a map"
 msgstr "Mostrar registros asociados en el mapa"
 
-#: GeolocationPlugin.php:509
+#: GeolocationPlugin.php:546
 msgid "Find a Location by Address:"
 msgstr "Encontrar una Ubicación por Dirección"
 
-#: GeolocationPlugin.php:547
+#: GeolocationPlugin.php:587
 msgid "Find"
 msgstr "Encontrar"
 
@@ -142,54 +145,64 @@ msgid ""
 msgstr "Si es seleccionado, la ubicación predeterminada y la configuración del zoom será ignorada en el mapa público. En este caso, el mapa ajustará automáticamente el zoom para mostrar las ubicaciones en cada página. "
 
 #: config_form.php:84
+msgid "Default Radius"
+msgstr ""
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr ""
+
+#: config_form.php:93
 msgid "Use metric distances"
 msgstr "Utilizar sistema métrico"
 
-#: config_form.php:87
+#: config_form.php:96
 msgid "Use metric distances in proximity search."
 msgstr "Utilizar distancias métricas en la búsqueda de proximidad."
 
-#: config_form.php:97
+#: config_form.php:106
 msgid "Item Map Settings"
 msgstr "Configuración del Mapa de Registros"
 
-#: config_form.php:100
+#: config_form.php:109
 msgid "Width for Item Map"
 msgstr "Ancho del Mapa en el Registro"
 
-#: config_form.php:103
+#: config_form.php:112
 msgid ""
 "The width of the map displayed on your items/show page. If left blank, the "
 "default width of 100% will be used."
 msgstr "El ancho del mapa en la página pública del registro. Si se deja en blanco, se utilizará un valor de ancho predeterminado del 100%."
 
-#: config_form.php:110
+#: config_form.php:119
 msgid "Height for Item Map"
 msgstr "Altura del Mapa en el Registro"
 
-#: config_form.php:113
+#: config_form.php:122
 msgid ""
 "The height of the map displayed on your items/show page. If left blank, the "
 "default height of 300px will be used."
 msgstr "La altura del mapa en la página pública del registro. Si se deja en blanco, se utilizará un valor de altura predeterminado de 300px."
 
-#: config_form.php:120
+#: config_form.php:129
 msgid "Map Integration"
 msgstr "Map Integration"
 
-#: config_form.php:123
+#: config_form.php:132
 msgid "Add Link to Map on Items/Browse Navigation"
 msgstr "Agregar un Vínculo al Mapa en la Navegación Principal"
 
-#: config_form.php:126
+#: config_form.php:135
 msgid "Add a link to the items map on all the items/browse pages."
 msgstr "Agregar un vínculo al mapa en todas las páginas públicas de registros. "
 
-#: config_form.php:136
+#: config_form.php:145
 msgid "Add Map To Contribution Form"
 msgstr "Agregar Mapa al Formulario de Colaboración"
 
-#: config_form.php:139
+#: config_form.php:148
 msgid ""
 "If the Contribution plugin is installed and activated, Geolocation  will add"
 " a geolocation map field to the contribution form to associate a location to"
@@ -232,7 +245,7 @@ msgstr "total"
 msgid "Find An Item on the Map"
 msgstr "Encontrar un Registro el Mapa"
 
-#: views/helpers/ItemGoogleMap.php:50
+#: views/helpers/ItemGoogleMap.php:36
 msgid "This item has no location info associated with it."
 msgstr "Este registro no tiene información de ubicación asociada. "
 
diff --git a/languages/et.mo b/languages/et.mo
new file mode 100644
index 0000000..4f7d7c7
Binary files /dev/null and b/languages/et.mo differ
diff --git a/languages/et.po b/languages/et.po
new file mode 100644
index 0000000..963aaa2
--- /dev/null
+++ b/languages/et.po
@@ -0,0 +1,262 @@
+# Translation for the Geolocation plugin for Omeka.
+# Copyright (C) 2011 Roy Rosenzweig Center for History and New Media
+# This file is distributed under the same license as the Omeka package.
+# 
+# Translators:
+# Rivo Zängov <eraser@eraser.ee>, 2015-2016
+msgid ""
+msgstr ""
+"Project-Id-Version: Omeka\n"
+"Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
+"POT-Creation-Date: 2012-01-09 21:49-0500\n"
+"PO-Revision-Date: 2016-01-13 15:08+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"Language-Team: Estonian (http://www.transifex.com/omeka/omeka/language/et/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr "Asukoha määramine"
+
+#: GeolocationPlugin.php:333
+msgid "kilometers"
+msgstr "kilomeetrid"
+
+#: GeolocationPlugin.php:335
+msgid "miles"
+msgstr "miilid"
+
+#: GeolocationPlugin.php:337
+#, php-format
+msgid "within %1$s %2$s of \"%3$s\""
+msgstr ""
+
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
+msgid "Map"
+msgstr "Kaart"
+
+#: GeolocationPlugin.php:396
+msgid "Browse Map"
+msgstr "Sirvi kaardil"
+
+#: GeolocationPlugin.php:445
+msgid "Find A Geographic Location For The "
+msgstr "Leia geograafiline asukoht:"
+
+#: GeolocationPlugin.php:457
+msgid "Geolocation Map"
+msgstr "Asukoha määramise kaart"
+
+#: GeolocationPlugin.php:458
+msgid "Show attached items on a map"
+msgstr "Näita seotud ühikuid kaardil"
+
+#: GeolocationPlugin.php:546
+msgid "Find a Location by Address:"
+msgstr "Leia asukoht kaardi järgi:"
+
+#: GeolocationPlugin.php:587
+msgid "Find"
+msgstr "Leia"
+
+#: config_form.php:3
+msgid "General Settings"
+msgstr "Üldised seaded"
+
+#: config_form.php:6
+msgid "Default Latitude"
+msgstr "Vaikimisi laiuskraad"
+
+#: config_form.php:9
+msgid ""
+"Latitude of the map's initial center point, in degrees. Must be between -90 "
+"and 90."
+msgstr "Kaardi algse keskpunkti laiuskraad. Peab olema vahemikus -90 ja 90."
+
+#: config_form.php:16
+msgid "Default Longitude"
+msgstr "Vaikimisi pikkuskraad"
+
+#: config_form.php:19
+msgid ""
+"Longitude of the map's initial center point, in degrees. Must be between "
+"-180 and 180."
+msgstr "Kaardi algse keskpunkti pikkuskraad. Peab olema vahemikus -180 ja 180."
+
+#: config_form.php:26
+msgid "Default Zoom Level"
+msgstr "Vaikimisi suurenduse tase"
+
+#: config_form.php:29
+msgid ""
+"An integer greater than or equal to 0, where 0 represents the most zoomed "
+"out scale."
+msgstr ""
+
+#: config_form.php:36
+msgid "Map Type"
+msgstr "Kaardi tüüp"
+
+#: config_form.php:39
+msgid "The type of map to display"
+msgstr "Näidatava kaardi tüüp"
+
+#: config_form.php:42
+msgid "Roadmap"
+msgstr "Teede kaart"
+
+#: config_form.php:43
+msgid "Satellite"
+msgstr "Satelliit"
+
+#: config_form.php:44
+msgid "Hybrid"
+msgstr "Hübriid"
+
+#: config_form.php:45
+msgid "Terrain"
+msgstr "Maastik"
+
+#: config_form.php:54
+msgid "Browse Map Settings"
+msgstr "Kaardi sirvimise seaded"
+
+#: config_form.php:57
+msgid "Number of Locations Per Page"
+msgstr "Asukohtade arv lehe kohta"
+
+#: config_form.php:60
+msgid "The number of locations displayed per page when browsing the map."
+msgstr "Asukohtade arv lehe kohta kaardi sirvimisel."
+
+#: config_form.php:66
+msgid "Auto-fit to Locations"
+msgstr "Sobita automaatselt kohtade järgi"
+
+#: config_form.php:70
+msgid ""
+"If checked, the default location and zoom settings will be ignored on the "
+"browse map. Instead, the map will automatically pan and zoom to fit the "
+"locations displayed on each page."
+msgstr "Kui see valik on märgitud, siis kaardi sirvimisel ignoreeritakse vaikimisi asukoha ja suurenduse seadeid. Selle asemel kaart valib asukoha ja suurenduse automaatselt, et mahutada ära lehel olevad asukohad."
+
+#: config_form.php:84
+msgid "Default Radius"
+msgstr "Vaikimisi raadius"
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr ""
+
+#: config_form.php:93
+msgid "Use metric distances"
+msgstr "Kasuta meetermõõdustikku"
+
+#: config_form.php:96
+msgid "Use metric distances in proximity search."
+msgstr "Kasuta lähiümbruse otsingu korral  meetermõõdustikku"
+
+#: config_form.php:106
+msgid "Item Map Settings"
+msgstr "Ühiku kaardi seaded"
+
+#: config_form.php:109
+msgid "Width for Item Map"
+msgstr "Ühiku kaardi laius"
+
+#: config_form.php:112
+msgid ""
+"The width of the map displayed on your items/show page. If left blank, the "
+"default width of 100% will be used."
+msgstr "Ühiku lehel näidatava kaardi laius. Kui see tühjaks jätta, siis kasutatakse vaikeväärtust 100%."
+
+#: config_form.php:119
+msgid "Height for Item Map"
+msgstr "Ühiku kaardi kõrgus"
+
+#: config_form.php:122
+msgid ""
+"The height of the map displayed on your items/show page. If left blank, the "
+"default height of 300px will be used."
+msgstr "Ühiku lehel näidatava kaardi kõrgus. Kui see tühjaks jätta, siis kasutatakse vaikeväärtust 300px."
+
+#: config_form.php:129
+msgid "Map Integration"
+msgstr "Kaardi integreerimine"
+
+#: config_form.php:132
+msgid "Add Link to Map on Items/Browse Navigation"
+msgstr ""
+
+#: config_form.php:135
+msgid "Add a link to the items map on all the items/browse pages."
+msgstr ""
+
+#: config_form.php:145
+msgid "Add Map To Contribution Form"
+msgstr ""
+
+#: config_form.php:148
+msgid ""
+"If the Contribution plugin is installed and activated, Geolocation  will add"
+" a geolocation map field to the contribution form to associate a location to"
+" a contributed item."
+msgstr ""
+
+#: models/Location.php:22
+msgid "Location requires an item ID."
+msgstr "Adukoht vajab ühiku ID-d."
+
+#: models/Location.php:26
+msgid "Location requires a valid item ID."
+msgstr "Asukoht vajab korrektset ühiku ID-d."
+
+#: models/Location.php:31
+msgid "A location already exists for the provided item."
+msgstr "Valitud ühiku jaoks on juba asukoht olemas."
+
+#: models/Location.php:34
+msgid "Location requires a latitude."
+msgstr "Asukoht vajab laiuskraadi."
+
+#: models/Location.php:37
+msgid "Location requires a longitude."
+msgstr "Asukoht vajab pikkuskraadi."
+
+#: models/Location.php:40
+msgid "Location requires a zoom level."
+msgstr "Asukoht vajab suurenduse taset."
+
+#: views/admin/map/browse.php:4 views/public/map/browse.php:4
+msgid "Browse Items on the Map"
+msgstr "Sirvi ühikuid kaardil"
+
+#: views/admin/map/browse.php:4
+msgid "total"
+msgstr "kokku"
+
+#: views/admin/map/browse.php:13 views/public/map/browse.php:21
+msgid "Find An Item on the Map"
+msgstr "Leia ühik kaardil"
+
+#: views/helpers/ItemGoogleMap.php:36
+msgid "This item has no location info associated with it."
+msgstr ""
+
+#: views/shared/map/advanced-search-partial.php:16
+msgid "Geographic Radius (kilometers)"
+msgstr "Geograafiline raadius (kilomeetrites)"
+
+#: views/shared/map/advanced-search-partial.php:18
+msgid "Geographic Radius (miles)"
+msgstr "Geograafiline raadius (miilides)"
+
+#: views/shared/map/advanced-search-partial.php:25
+msgid "Geographic Address"
+msgstr "Geograafiline aadress"
diff --git a/languages/fi_FI.mo b/languages/fi_FI.mo
index 9f5ae19..b795524 100644
Binary files a/languages/fi_FI.mo and b/languages/fi_FI.mo differ
diff --git a/languages/fi_FI.po b/languages/fi_FI.po
index a683f81..72bc4c3 100644
--- a/languages/fi_FI.po
+++ b/languages/fi_FI.po
@@ -3,66 +3,69 @@
 # This file is distributed under the same license as the Omeka package.
 # 
 # Translators:
-# Matti Lassila <matti.lassila@gmail.com>, 2013
+# Matti Lassila <matti.lassila@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Omeka\n"
 "Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
 "POT-Creation-Date: 2012-01-09 21:49-0500\n"
-"PO-Revision-Date: 2014-05-22 21:24+0000\n"
+"PO-Revision-Date: 2014-12-01 19:16+0000\n"
 "Last-Translator: John Flatness <john@zerocrates.org>\n"
-"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/omeka/language/fi_FI/)\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/omeka/omeka/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeolocationPlugin.php:298
-msgid "kilometers"
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
 msgstr ""
 
-#: GeolocationPlugin.php:300
+#: GeolocationPlugin.php:333
+msgid "kilometers"
+msgstr "kilometriä"
+
+#: GeolocationPlugin.php:335
 msgid "miles"
-msgstr ""
+msgstr "mailia"
 
-#: GeolocationPlugin.php:302
+#: GeolocationPlugin.php:337
 #, php-format
 msgid "within %1$s %2$s of \"%3$s\""
 msgstr ""
 
-#: GeolocationPlugin.php:322 GeolocationPlugin.php:328
-#: GeolocationPlugin.php:352
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
 msgid "Map"
 msgstr "Kartta"
 
-#: GeolocationPlugin.php:361
+#: GeolocationPlugin.php:396
 msgid "Browse Map"
 msgstr "Selaa karttaa"
 
-#: GeolocationPlugin.php:409
+#: GeolocationPlugin.php:445
 msgid "Find A Geographic Location For The "
 msgstr "Hae maantieteellinen sijainti"
 
-#: GeolocationPlugin.php:420
+#: GeolocationPlugin.php:457
 msgid "Geolocation Map"
-msgstr ""
+msgstr "Kartta"
 
-#: GeolocationPlugin.php:421
+#: GeolocationPlugin.php:458
 msgid "Show attached items on a map"
-msgstr ""
+msgstr "Näytä aineistot kartalla"
 
-#: GeolocationPlugin.php:509
+#: GeolocationPlugin.php:546
 msgid "Find a Location by Address:"
 msgstr "Hae paikka osoitteen tai paikan nimen mukaan:"
 
-#: GeolocationPlugin.php:547
+#: GeolocationPlugin.php:587
 msgid "Find"
 msgstr "Hae"
 
 #: config_form.php:3
 msgid "General Settings"
-msgstr ""
+msgstr "Yleisasetukset"
 
 #: config_form.php:6
 msgid "Default Latitude"
@@ -96,31 +99,31 @@ msgstr "Aloitusnäkymän zoomausaste. Arvon tulee olla nolla tai sitä suurempi
 
 #: config_form.php:36
 msgid "Map Type"
-msgstr ""
+msgstr "Kartan tyyppi"
 
 #: config_form.php:39
 msgid "The type of map to display"
-msgstr ""
+msgstr "Karttanäkymän karttatyyppi"
 
 #: config_form.php:42
 msgid "Roadmap"
-msgstr ""
+msgstr "Maantiekartta"
 
 #: config_form.php:43
 msgid "Satellite"
-msgstr ""
+msgstr "Ilmakuva"
 
 #: config_form.php:44
 msgid "Hybrid"
-msgstr ""
+msgstr "Yhdistelmä"
 
 #: config_form.php:45
 msgid "Terrain"
-msgstr ""
+msgstr "Maasto"
 
 #: config_form.php:54
 msgid "Browse Map Settings"
-msgstr ""
+msgstr "Karttaselausnäkymän asetukset"
 
 #: config_form.php:57
 msgid "Number of Locations Per Page"
@@ -128,68 +131,78 @@ msgstr "Sijainteja sivua kohti"
 
 #: config_form.php:60
 msgid "The number of locations displayed per page when browsing the map."
-msgstr ""
+msgstr "Kerralla näytettyjen sijaintien määrä karttaselausnäkymässä."
 
 #: config_form.php:66
 msgid "Auto-fit to Locations"
-msgstr ""
+msgstr "Sovita aineistoihin"
 
 #: config_form.php:70
 msgid ""
 "If checked, the default location and zoom settings will be ignored on the "
 "browse map. Instead, the map will automatically pan and zoom to fit the "
 "locations displayed on each page."
-msgstr ""
+msgstr "Jätä oletussijainti ja zoomausasetus huomiotta ja sovita kartta näyttämään kaikki karttaselausnäkymän sivun aineistot kerralla."
 
 #: config_form.php:84
+msgid "Default Radius"
+msgstr ""
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr ""
+
+#: config_form.php:93
 msgid "Use metric distances"
 msgstr "Käytä mittayksikkönä kilometrejä"
 
-#: config_form.php:87
+#: config_form.php:96
 msgid "Use metric distances in proximity search."
 msgstr "Käytä läheisyyteen perustuvassa haussa yksikkönä kilometrejä. Oletuksena mittayksikkö on maili."
 
-#: config_form.php:97
+#: config_form.php:106
 msgid "Item Map Settings"
-msgstr ""
+msgstr "Aineistonäkymän kartta-asetukset"
 
-#: config_form.php:100
+#: config_form.php:109
 msgid "Width for Item Map"
 msgstr "Aineistonäkymän kartan leveys"
 
-#: config_form.php:103
+#: config_form.php:112
 msgid ""
 "The width of the map displayed on your items/show page. If left blank, the "
 "default width of 100% will be used."
 msgstr "Karttanäkymän leveys aineistosivulla. Oletuksena kartta näytetään sivupohjan suhteen täysleveänä (100%)."
 
-#: config_form.php:110
+#: config_form.php:119
 msgid "Height for Item Map"
 msgstr "Aineistonäkymän kartan korkeus"
 
-#: config_form.php:113
+#: config_form.php:122
 msgid ""
 "The height of the map displayed on your items/show page. If left blank, the "
 "default height of 300px will be used."
 msgstr "Karttanäkymän korkeus aineistolivulla. Oletuskorkeus on 300 pikseliä."
 
-#: config_form.php:120
+#: config_form.php:129
 msgid "Map Integration"
-msgstr ""
+msgstr "Karttaintegraatio"
 
-#: config_form.php:123
+#: config_form.php:132
 msgid "Add Link to Map on Items/Browse Navigation"
 msgstr "Lisää linkki karttaan aineistojen selausnäkymiin"
 
-#: config_form.php:126
+#: config_form.php:135
 msgid "Add a link to the items map on all the items/browse pages."
 msgstr "Lisää karttalinkki selausnäkymiin."
 
-#: config_form.php:136
+#: config_form.php:145
 msgid "Add Map To Contribution Form"
 msgstr "Lisää kartta julkiselle tallennuslomakkeelle"
 
-#: config_form.php:139
+#: config_form.php:148
 msgid ""
 "If the Contribution plugin is installed and activated, Geolocation  will add"
 " a geolocation map field to the contribution form to associate a location to"
@@ -232,7 +245,7 @@ msgstr "yhteensä"
 msgid "Find An Item on the Map"
 msgstr "Aineistot kartalla"
 
-#: views/helpers/ItemGoogleMap.php:50
+#: views/helpers/ItemGoogleMap.php:36
 msgid "This item has no location info associated with it."
 msgstr "Aineistoon ei liity sijaintitietoja."
 
diff --git a/languages/fr.mo b/languages/fr.mo
index 6d7308a..6205f54 100644
Binary files a/languages/fr.mo and b/languages/fr.mo differ
diff --git a/languages/fr.po b/languages/fr.po
index df9967a..61df186 100644
--- a/languages/fr.po
+++ b/languages/fr.po
@@ -4,70 +4,70 @@
 # 
 # Translators:
 # Julien Sicot <julien.sicot@gmail.com>, 2013
-# Thierry Pasquier <thierry.pasquier@emf.ccsti.eu>, 2013
+# Thierry Pasquier <thierry.pasquier@emf.ccsti.eu>, 2013,2015
+# symac <wikitipiac@laposte.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Omeka\n"
 "Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
 "POT-Creation-Date: 2012-01-09 21:49-0500\n"
-"PO-Revision-Date: 2014-05-22 21:24+0000\n"
-"Last-Translator: John Flatness <john@zerocrates.org>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/omeka/language/fr/)\n"
+"PO-Revision-Date: 2015-02-25 18:36+0000\n"
+"Last-Translator: Thierry Pasquier <thierry.pasquier@emf.ccsti.eu>\n"
+"Language-Team: French (http://www.transifex.com/omeka/omeka/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: GeolocationPlugin.php:234
+#: GeolocationPlugin.php:216
 msgid "Geolocation"
 msgstr "Géolocalisation"
 
-#: GeolocationPlugin.php:298
+#: GeolocationPlugin.php:333
 msgid "kilometers"
-msgstr ""
+msgstr "kilomètres"
 
-#: GeolocationPlugin.php:300
+#: GeolocationPlugin.php:335
 msgid "miles"
-msgstr ""
+msgstr "miles"
 
-#: GeolocationPlugin.php:302
+#: GeolocationPlugin.php:337
 #, php-format
 msgid "within %1$s %2$s of \"%3$s\""
-msgstr ""
+msgstr "parmi %1$s %2$s de \"%3$s\""
 
-#: GeolocationPlugin.php:322 GeolocationPlugin.php:328
-#: GeolocationPlugin.php:352
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
 msgid "Map"
 msgstr "Carte"
 
-#: GeolocationPlugin.php:361
+#: GeolocationPlugin.php:396
 msgid "Browse Map"
 msgstr "Parcourir la carte"
 
-#: GeolocationPlugin.php:409
+#: GeolocationPlugin.php:445
 msgid "Find A Geographic Location For The "
 msgstr "Trouver un lieu sur la "
 
-#: GeolocationPlugin.php:420
+#: GeolocationPlugin.php:457
 msgid "Geolocation Map"
-msgstr ""
+msgstr "Carte de géolocalisation"
 
-#: GeolocationPlugin.php:421
+#: GeolocationPlugin.php:458
 msgid "Show attached items on a map"
-msgstr ""
+msgstr "Afficher les contenus attachés sur une carte"
 
-#: GeolocationPlugin.php:509
+#: GeolocationPlugin.php:546
 msgid "Find a Location by Address:"
 msgstr "Localiser à partir de l'adresse : "
 
-#: GeolocationPlugin.php:547
+#: GeolocationPlugin.php:587
 msgid "Find"
 msgstr "Trouver"
 
 #: config_form.php:3
 msgid "General Settings"
-msgstr ""
+msgstr "Paramètres généraux"
 
 #: config_form.php:6
 msgid "Default Latitude"
@@ -101,31 +101,31 @@ msgstr "Un entier égal ou supérieur à 0, 0 représentant le niveau de zoom le
 
 #: config_form.php:36
 msgid "Map Type"
-msgstr ""
+msgstr "Type de carte"
 
 #: config_form.php:39
 msgid "The type of map to display"
-msgstr ""
+msgstr "Type de carte à afficher"
 
 #: config_form.php:42
 msgid "Roadmap"
-msgstr ""
+msgstr "Carte routière"
 
 #: config_form.php:43
 msgid "Satellite"
-msgstr ""
+msgstr "Satellite"
 
 #: config_form.php:44
 msgid "Hybrid"
-msgstr ""
+msgstr "Hybride"
 
 #: config_form.php:45
 msgid "Terrain"
-msgstr ""
+msgstr "Terrain"
 
 #: config_form.php:54
 msgid "Browse Map Settings"
-msgstr ""
+msgstr "Parcourir les paramètres de la carte"
 
 #: config_form.php:57
 msgid "Number of Locations Per Page"
@@ -133,68 +133,78 @@ msgstr "Nombre de localisations par page"
 
 #: config_form.php:60
 msgid "The number of locations displayed per page when browsing the map."
-msgstr ""
+msgstr "Nombre de localisations par page à afficher lors du parcours de la carte."
 
 #: config_form.php:66
 msgid "Auto-fit to Locations"
-msgstr ""
+msgstr "Association automatique avec les adresses."
 
 #: config_form.php:70
 msgid ""
 "If checked, the default location and zoom settings will be ignored on the "
 "browse map. Instead, the map will automatically pan and zoom to fit the "
 "locations displayed on each page."
-msgstr ""
+msgstr "Si cette case est cochée, les paramètres par défaut de localisation et de zoom seront ignorés sur la carte de parcours. À la place, la carte sera automatiquement adaptée aux localisations affichées sur chaque page."
 
 #: config_form.php:84
+msgid "Default Radius"
+msgstr "Rayon par défaut"
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr "La valeur du rayon par défaut à utiliser dans la page de recherche avancée de contenus. Voir ci-dessous si la valeur est donnée en miles ou en kilomètres."
+
+#: config_form.php:93
 msgid "Use metric distances"
 msgstr "Utiliser le système métrique"
 
-#: config_form.php:87
+#: config_form.php:96
 msgid "Use metric distances in proximity search."
 msgstr "Utiliser le système métrique dans la recherche de proximité."
 
-#: config_form.php:97
+#: config_form.php:106
 msgid "Item Map Settings"
-msgstr ""
+msgstr "Paramètres de la carte"
 
-#: config_form.php:100
+#: config_form.php:109
 msgid "Width for Item Map"
 msgstr "Largeur de la carte d'un contenu"
 
-#: config_form.php:103
+#: config_form.php:112
 msgid ""
 "The width of the map displayed on your items/show page. If left blank, the "
 "default width of 100% will be used."
 msgstr "La largeur de la carte affichée sur la page items/show. Si vide, une largeur de 300px sera utilisée."
 
-#: config_form.php:110
+#: config_form.php:119
 msgid "Height for Item Map"
 msgstr "Hauteur de la carte d'un contenu"
 
-#: config_form.php:113
+#: config_form.php:122
 msgid ""
 "The height of the map displayed on your items/show page. If left blank, the "
 "default height of 300px will be used."
 msgstr "La hauteir de la carte affichée sur la page associée à un contenu. Une valeur de 300px est utilisée si ce champ reste vide."
 
-#: config_form.php:120
+#: config_form.php:129
 msgid "Map Integration"
-msgstr ""
+msgstr "Intégration de la carte"
 
-#: config_form.php:123
+#: config_form.php:132
 msgid "Add Link to Map on Items/Browse Navigation"
 msgstr "Ajouter un lien vers la carte lors de la navigation dans les contenus."
 
-#: config_form.php:126
+#: config_form.php:135
 msgid "Add a link to the items map on all the items/browse pages."
 msgstr "Ajouter un lien vers les contenus à partir des cartes. "
 
-#: config_form.php:136
+#: config_form.php:145
 msgid "Add Map To Contribution Form"
 msgstr "Ajouter une carte au formulaire de contribution"
 
-#: config_form.php:139
+#: config_form.php:148
 msgid ""
 "If the Contribution plugin is installed and activated, Geolocation  will add"
 " a geolocation map field to the contribution form to associate a location to"
@@ -237,7 +247,7 @@ msgstr "total"
 msgid "Find An Item on the Map"
 msgstr "Trouver un contenu sur la carte"
 
-#: views/helpers/ItemGoogleMap.php:50
+#: views/helpers/ItemGoogleMap.php:36
 msgid "This item has no location info associated with it."
 msgstr "Ce contenu n'a pas de localisation associée."
 
diff --git a/languages/hr.mo b/languages/hr.mo
new file mode 100644
index 0000000..1ead78f
Binary files /dev/null and b/languages/hr.mo differ
diff --git a/languages/hr.po b/languages/hr.po
new file mode 100644
index 0000000..24c340d
--- /dev/null
+++ b/languages/hr.po
@@ -0,0 +1,262 @@
+# Translation for the Geolocation plugin for Omeka.
+# Copyright (C) 2011 Roy Rosenzweig Center for History and New Media
+# This file is distributed under the same license as the Omeka package.
+# 
+# Translators:
+# rijekateam <digitalizacija@gkri.hr>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: Omeka\n"
+"Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
+"POT-Creation-Date: 2012-01-09 21:49-0500\n"
+"PO-Revision-Date: 2015-02-19 17:47+0000\n"
+"Last-Translator: rijekateam <digitalizacija@gkri.hr>\n"
+"Language-Team: Croatian (http://www.transifex.com/omeka/omeka/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr "Geolokacija"
+
+#: GeolocationPlugin.php:333
+msgid "kilometers"
+msgstr "kilometri"
+
+#: GeolocationPlugin.php:335
+msgid "miles"
+msgstr "milje"
+
+#: GeolocationPlugin.php:337
+#, php-format
+msgid "within %1$s %2$s of \"%3$s\""
+msgstr "unutar %1$s %2$s of \"%3$s\""
+
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
+msgid "Map"
+msgstr "Karta"
+
+#: GeolocationPlugin.php:396
+msgid "Browse Map"
+msgstr "Pregledaj kartu"
+
+#: GeolocationPlugin.php:445
+msgid "Find A Geographic Location For The "
+msgstr "Pronađi geografsku lokaciju za"
+
+#: GeolocationPlugin.php:457
+msgid "Geolocation Map"
+msgstr "Geolokacijska karta"
+
+#: GeolocationPlugin.php:458
+msgid "Show attached items on a map"
+msgstr "Prikaži dodane dokumente na karti"
+
+#: GeolocationPlugin.php:546
+msgid "Find a Location by Address:"
+msgstr "Pronađi lokaciju po adresi"
+
+#: GeolocationPlugin.php:587
+msgid "Find"
+msgstr "Pronađi"
+
+#: config_form.php:3
+msgid "General Settings"
+msgstr "Opće postavke"
+
+#: config_form.php:6
+msgid "Default Latitude"
+msgstr "Zadana širina"
+
+#: config_form.php:9
+msgid ""
+"Latitude of the map's initial center point, in degrees. Must be between -90 "
+"and 90."
+msgstr "Geografska širina početne centralne točke na karti, u stupnjevima. Mora biti između -90 i 90."
+
+#: config_form.php:16
+msgid "Default Longitude"
+msgstr "Zadana dužina"
+
+#: config_form.php:19
+msgid ""
+"Longitude of the map's initial center point, in degrees. Must be between "
+"-180 and 180."
+msgstr "Geografska dužina početne centralne točke na karti, u stupnjevima. Mora biti između -180 i 180."
+
+#: config_form.php:26
+msgid "Default Zoom Level"
+msgstr "Zadana razina uvećanja"
+
+#: config_form.php:29
+msgid ""
+"An integer greater than or equal to 0, where 0 represents the most zoomed "
+"out scale."
+msgstr "Cijeli broj veći od ili jednak 0, gdje je 0 predstavlja najvišu mogućnost umanjivanja."
+
+#: config_form.php:36
+msgid "Map Type"
+msgstr "Vrsta karte"
+
+#: config_form.php:39
+msgid "The type of map to display"
+msgstr "Vrsta karte koja će se prikazivati"
+
+#: config_form.php:42
+msgid "Roadmap"
+msgstr "Cestovna karta"
+
+#: config_form.php:43
+msgid "Satellite"
+msgstr "Satelit"
+
+#: config_form.php:44
+msgid "Hybrid"
+msgstr "Hibridno"
+
+#: config_form.php:45
+msgid "Terrain"
+msgstr "Teren"
+
+#: config_form.php:54
+msgid "Browse Map Settings"
+msgstr "Pregledaj postavke karte"
+
+#: config_form.php:57
+msgid "Number of Locations Per Page"
+msgstr "Broj lokacija po stranici"
+
+#: config_form.php:60
+msgid "The number of locations displayed per page when browsing the map."
+msgstr "Broj lokacija prikazanih po stranici prilikom pregledavanja karte."
+
+#: config_form.php:66
+msgid "Auto-fit to Locations"
+msgstr "Automatski prilagodi lokacijama"
+
+#: config_form.php:70
+msgid ""
+"If checked, the default location and zoom settings will be ignored on the "
+"browse map. Instead, the map will automatically pan and zoom to fit the "
+"locations displayed on each page."
+msgstr "Ako odaberete ovu opciju, zadane postavke lokacije i uvećanja bit će ignorirane prilikom pregledavanja karte. Umjesto toga, karta će se automatski pomicati i zumirati kako bi prilagodila prikaz lokacija na svakoj stranici."
+
+#: config_form.php:84
+msgid "Default Radius"
+msgstr "Zadani radijus"
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr "Veličina zadanog radijusa koja će se koristiti na stranici za napredno pretraživanje dokumenata. Vidi ispod za mjerenje u miljama ili u kilometrima."
+
+#: config_form.php:93
+msgid "Use metric distances"
+msgstr "Koristi metričke udaljenosti"
+
+#: config_form.php:96
+msgid "Use metric distances in proximity search."
+msgstr "Koristi metrički sustav za pretraživanje udaljenosti."
+
+#: config_form.php:106
+msgid "Item Map Settings"
+msgstr "Postavke karte dokumenta"
+
+#: config_form.php:109
+msgid "Width for Item Map"
+msgstr "Širina za kartu dokumenta"
+
+#: config_form.php:112
+msgid ""
+"The width of the map displayed on your items/show page. If left blank, the "
+"default width of 100% will be used."
+msgstr "Širina karte koja se prikazuje na stranici za prikaz dokumenta u korisničkom sučelju. Ako pustite prazno, koristit će se zadana širina od 100%."
+
+#: config_form.php:119
+msgid "Height for Item Map"
+msgstr "Visina karte dokumenta"
+
+#: config_form.php:122
+msgid ""
+"The height of the map displayed on your items/show page. If left blank, the "
+"default height of 300px will be used."
+msgstr "Visina karte koja se prikazuje na stranici za prikaz dokumenta u korisničkom sučelju. Ako pustite prazno, koristit će se zadana visina od 300px."
+
+#: config_form.php:129
+msgid "Map Integration"
+msgstr "Integracija karte"
+
+#: config_form.php:132
+msgid "Add Link to Map on Items/Browse Navigation"
+msgstr "Dodaj poveznicu za pregledavanje na karti u navigaciju za pregledavanje dokumenata na korisničkom sučelju"
+
+#: config_form.php:135
+msgid "Add a link to the items map on all the items/browse pages."
+msgstr "Dodaj link na kartu dokumenta svim stranicama za pregled dokumenta."
+
+#: config_form.php:145
+msgid "Add Map To Contribution Form"
+msgstr "Dodaj kartu obrascu za suradnike"
+
+#: config_form.php:148
+msgid ""
+"If the Contribution plugin is installed and activated, Geolocation  will add"
+" a geolocation map field to the contribution form to associate a location to"
+" a contributed item."
+msgstr "Ako je dodatak za suradnike instaliran i aktiviran, Geolokacija će dodati polje za geolokacijsku kartu obrascu za suradnju, kako bi suradnici mogli dodati lokaciju dokumenta kojeg prilažu."
+
+#: models/Location.php:22
+msgid "Location requires an item ID."
+msgstr "Lokacija zahtijeva ID dokumenta."
+
+#: models/Location.php:26
+msgid "Location requires a valid item ID."
+msgstr "Lokacija zahtijeva važeći ID dokumenta."
+
+#: models/Location.php:31
+msgid "A location already exists for the provided item."
+msgstr "Već postoji lokacija za dodani dokument."
+
+#: models/Location.php:34
+msgid "Location requires a latitude."
+msgstr "Lokacija zahtijeva geografsku širinu."
+
+#: models/Location.php:37
+msgid "Location requires a longitude."
+msgstr "Lokacija zahtijeva geografsku dužinu."
+
+#: models/Location.php:40
+msgid "Location requires a zoom level."
+msgstr "Lokacija zahtijeva razinu uvećanja."
+
+#: views/admin/map/browse.php:4 views/public/map/browse.php:4
+msgid "Browse Items on the Map"
+msgstr "Pregledaj dokumente na karti"
+
+#: views/admin/map/browse.php:4
+msgid "total"
+msgstr "ukupno"
+
+#: views/admin/map/browse.php:13 views/public/map/browse.php:21
+msgid "Find An Item on the Map"
+msgstr "Pronađi dokument na karti"
+
+#: views/helpers/ItemGoogleMap.php:36
+msgid "This item has no location info associated with it."
+msgstr "Ovaj dokument nema pridružene podatke o lokaciji."
+
+#: views/shared/map/advanced-search-partial.php:16
+msgid "Geographic Radius (kilometers)"
+msgstr "Geografski radijus (kilometri)"
+
+#: views/shared/map/advanced-search-partial.php:18
+msgid "Geographic Radius (miles)"
+msgstr "Geografski radijus (milje)"
+
+#: views/shared/map/advanced-search-partial.php:25
+msgid "Geographic Address"
+msgstr "Geografska adresa"
diff --git a/languages/is.mo b/languages/is.mo
index 115110a..ce12a0e 100644
Binary files a/languages/is.mo and b/languages/is.mo differ
diff --git a/languages/is.po b/languages/is.po
index 1e89cb0..dfe7cd8 100644
--- a/languages/is.po
+++ b/languages/is.po
@@ -3,60 +3,63 @@
 # This file is distributed under the same license as the Omeka package.
 # 
 # Translators:
-# Bryndís Zoega <bryndisz@skagafjordur.is>, 2014
+# Bryndís Zoega <inactive+bryndiszoega@transifex.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Omeka\n"
 "Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
 "POT-Creation-Date: 2012-01-09 21:49-0500\n"
-"PO-Revision-Date: 2014-06-25 12:31+0000\n"
-"Last-Translator: Bryndís Zoega <bryndisz@skagafjordur.is>\n"
-"Language-Team: Icelandic (http://www.transifex.com/projects/p/omeka/language/is/)\n"
+"PO-Revision-Date: 2014-12-01 19:16+0000\n"
+"Last-Translator: John Flatness <john@zerocrates.org>\n"
+"Language-Team: Icelandic (http://www.transifex.com/omeka/omeka/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: is\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
 
-#: GeolocationPlugin.php:298
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr ""
+
+#: GeolocationPlugin.php:333
 msgid "kilometers"
 msgstr "kílómetrar"
 
-#: GeolocationPlugin.php:300
+#: GeolocationPlugin.php:335
 msgid "miles"
 msgstr "mílur"
 
-#: GeolocationPlugin.php:302
+#: GeolocationPlugin.php:337
 #, php-format
 msgid "within %1$s %2$s of \"%3$s\""
 msgstr ""
 
-#: GeolocationPlugin.php:322 GeolocationPlugin.php:328
-#: GeolocationPlugin.php:352
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
 msgid "Map"
 msgstr "Kort"
 
-#: GeolocationPlugin.php:361
+#: GeolocationPlugin.php:396
 msgid "Browse Map"
 msgstr "Skoða kort"
 
-#: GeolocationPlugin.php:409
+#: GeolocationPlugin.php:445
 msgid "Find A Geographic Location For The "
 msgstr "Finna landfræðilega staðsetingu fyrir"
 
-#: GeolocationPlugin.php:420
+#: GeolocationPlugin.php:457
 msgid "Geolocation Map"
 msgstr "Staðsetningarkort"
 
-#: GeolocationPlugin.php:421
+#: GeolocationPlugin.php:458
 msgid "Show attached items on a map"
 msgstr "Sýna gagnaviðhengi á korti"
 
-#: GeolocationPlugin.php:509
+#: GeolocationPlugin.php:546
 msgid "Find a Location by Address:"
 msgstr "Leita að staðsetningu með heimilisfangi: "
 
-#: GeolocationPlugin.php:547
+#: GeolocationPlugin.php:587
 msgid "Find"
 msgstr "Leita"
 
@@ -142,54 +145,64 @@ msgid ""
 msgstr ""
 
 #: config_form.php:84
+msgid "Default Radius"
+msgstr ""
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr ""
+
+#: config_form.php:93
 msgid "Use metric distances"
 msgstr "Nota vegalengdir í metrum"
 
-#: config_form.php:87
+#: config_form.php:96
 msgid "Use metric distances in proximity search."
 msgstr "Nota vegalengdir í metrum í nálægðar leit. "
 
-#: config_form.php:97
+#: config_form.php:106
 msgid "Item Map Settings"
 msgstr ""
 
-#: config_form.php:100
+#: config_form.php:109
 msgid "Width for Item Map"
 msgstr ""
 
-#: config_form.php:103
+#: config_form.php:112
 msgid ""
 "The width of the map displayed on your items/show page. If left blank, the "
 "default width of 100% will be used."
 msgstr ""
 
-#: config_form.php:110
+#: config_form.php:119
 msgid "Height for Item Map"
 msgstr ""
 
-#: config_form.php:113
+#: config_form.php:122
 msgid ""
 "The height of the map displayed on your items/show page. If left blank, the "
 "default height of 300px will be used."
 msgstr ""
 
-#: config_form.php:120
+#: config_form.php:129
 msgid "Map Integration"
 msgstr ""
 
-#: config_form.php:123
+#: config_form.php:132
 msgid "Add Link to Map on Items/Browse Navigation"
 msgstr ""
 
-#: config_form.php:126
+#: config_form.php:135
 msgid "Add a link to the items map on all the items/browse pages."
 msgstr ""
 
-#: config_form.php:136
+#: config_form.php:145
 msgid "Add Map To Contribution Form"
 msgstr ""
 
-#: config_form.php:139
+#: config_form.php:148
 msgid ""
 "If the Contribution plugin is installed and activated, Geolocation  will add"
 " a geolocation map field to the contribution form to associate a location to"
@@ -232,7 +245,7 @@ msgstr "samtals"
 msgid "Find An Item on the Map"
 msgstr "Finna gagn á kortinu"
 
-#: views/helpers/ItemGoogleMap.php:50
+#: views/helpers/ItemGoogleMap.php:36
 msgid "This item has no location info associated with it."
 msgstr ""
 
diff --git a/languages/it.mo b/languages/it.mo
new file mode 100644
index 0000000..76ef6e8
Binary files /dev/null and b/languages/it.mo differ
diff --git a/languages/it.po b/languages/it.po
new file mode 100644
index 0000000..771c455
--- /dev/null
+++ b/languages/it.po
@@ -0,0 +1,262 @@
+# Translation for the Geolocation plugin for Omeka.
+# Copyright (C) 2011 Roy Rosenzweig Center for History and New Media
+# This file is distributed under the same license as the Omeka package.
+# 
+# Translators:
+# Guybrush88 <erpizzo@alice.it>, 2014-2015
+msgid ""
+msgstr ""
+"Project-Id-Version: Omeka\n"
+"Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
+"POT-Creation-Date: 2012-01-09 21:49-0500\n"
+"PO-Revision-Date: 2015-03-17 18:37+0000\n"
+"Last-Translator: Guybrush88 <erpizzo@alice.it>\n"
+"Language-Team: Italian (http://www.transifex.com/omeka/omeka/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr ""
+
+#: GeolocationPlugin.php:333
+msgid "kilometers"
+msgstr "chilometri"
+
+#: GeolocationPlugin.php:335
+msgid "miles"
+msgstr "miglia"
+
+#: GeolocationPlugin.php:337
+#, php-format
+msgid "within %1$s %2$s of \"%3$s\""
+msgstr ""
+
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
+msgid "Map"
+msgstr "Mappa"
+
+#: GeolocationPlugin.php:396
+msgid "Browse Map"
+msgstr "Esplora la mappa"
+
+#: GeolocationPlugin.php:445
+msgid "Find A Geographic Location For The "
+msgstr ""
+
+#: GeolocationPlugin.php:457
+msgid "Geolocation Map"
+msgstr ""
+
+#: GeolocationPlugin.php:458
+msgid "Show attached items on a map"
+msgstr ""
+
+#: GeolocationPlugin.php:546
+msgid "Find a Location by Address:"
+msgstr ""
+
+#: GeolocationPlugin.php:587
+msgid "Find"
+msgstr "Trova"
+
+#: config_form.php:3
+msgid "General Settings"
+msgstr "Impostazioni generali"
+
+#: config_form.php:6
+msgid "Default Latitude"
+msgstr "Latitudine predefinita"
+
+#: config_form.php:9
+msgid ""
+"Latitude of the map's initial center point, in degrees. Must be between -90 "
+"and 90."
+msgstr ""
+
+#: config_form.php:16
+msgid "Default Longitude"
+msgstr "Longitudine predefinita"
+
+#: config_form.php:19
+msgid ""
+"Longitude of the map's initial center point, in degrees. Must be between "
+"-180 and 180."
+msgstr ""
+
+#: config_form.php:26
+msgid "Default Zoom Level"
+msgstr ""
+
+#: config_form.php:29
+msgid ""
+"An integer greater than or equal to 0, where 0 represents the most zoomed "
+"out scale."
+msgstr ""
+
+#: config_form.php:36
+msgid "Map Type"
+msgstr "Tipo di mappa"
+
+#: config_form.php:39
+msgid "The type of map to display"
+msgstr ""
+
+#: config_form.php:42
+msgid "Roadmap"
+msgstr "Cartina stradale"
+
+#: config_form.php:43
+msgid "Satellite"
+msgstr "Satellite"
+
+#: config_form.php:44
+msgid "Hybrid"
+msgstr "Ibrido"
+
+#: config_form.php:45
+msgid "Terrain"
+msgstr "Terreno"
+
+#: config_form.php:54
+msgid "Browse Map Settings"
+msgstr "Esplora le impostazioni della mappa"
+
+#: config_form.php:57
+msgid "Number of Locations Per Page"
+msgstr ""
+
+#: config_form.php:60
+msgid "The number of locations displayed per page when browsing the map."
+msgstr ""
+
+#: config_form.php:66
+msgid "Auto-fit to Locations"
+msgstr ""
+
+#: config_form.php:70
+msgid ""
+"If checked, the default location and zoom settings will be ignored on the "
+"browse map. Instead, the map will automatically pan and zoom to fit the "
+"locations displayed on each page."
+msgstr ""
+
+#: config_form.php:84
+msgid "Default Radius"
+msgstr "Raggio predefinito"
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr ""
+
+#: config_form.php:93
+msgid "Use metric distances"
+msgstr "Utilizza le distanze metriche"
+
+#: config_form.php:96
+msgid "Use metric distances in proximity search."
+msgstr ""
+
+#: config_form.php:106
+msgid "Item Map Settings"
+msgstr ""
+
+#: config_form.php:109
+msgid "Width for Item Map"
+msgstr ""
+
+#: config_form.php:112
+msgid ""
+"The width of the map displayed on your items/show page. If left blank, the "
+"default width of 100% will be used."
+msgstr ""
+
+#: config_form.php:119
+msgid "Height for Item Map"
+msgstr ""
+
+#: config_form.php:122
+msgid ""
+"The height of the map displayed on your items/show page. If left blank, the "
+"default height of 300px will be used."
+msgstr ""
+
+#: config_form.php:129
+msgid "Map Integration"
+msgstr ""
+
+#: config_form.php:132
+msgid "Add Link to Map on Items/Browse Navigation"
+msgstr ""
+
+#: config_form.php:135
+msgid "Add a link to the items map on all the items/browse pages."
+msgstr ""
+
+#: config_form.php:145
+msgid "Add Map To Contribution Form"
+msgstr ""
+
+#: config_form.php:148
+msgid ""
+"If the Contribution plugin is installed and activated, Geolocation  will add"
+" a geolocation map field to the contribution form to associate a location to"
+" a contributed item."
+msgstr ""
+
+#: models/Location.php:22
+msgid "Location requires an item ID."
+msgstr ""
+
+#: models/Location.php:26
+msgid "Location requires a valid item ID."
+msgstr ""
+
+#: models/Location.php:31
+msgid "A location already exists for the provided item."
+msgstr ""
+
+#: models/Location.php:34
+msgid "Location requires a latitude."
+msgstr "La posizione richiede una latitudine."
+
+#: models/Location.php:37
+msgid "Location requires a longitude."
+msgstr "La posizione richiede una longitudine."
+
+#: models/Location.php:40
+msgid "Location requires a zoom level."
+msgstr ""
+
+#: views/admin/map/browse.php:4 views/public/map/browse.php:4
+msgid "Browse Items on the Map"
+msgstr ""
+
+#: views/admin/map/browse.php:4
+msgid "total"
+msgstr "totale"
+
+#: views/admin/map/browse.php:13 views/public/map/browse.php:21
+msgid "Find An Item on the Map"
+msgstr "Trova un oggetto sulla mappa"
+
+#: views/helpers/ItemGoogleMap.php:36
+msgid "This item has no location info associated with it."
+msgstr ""
+
+#: views/shared/map/advanced-search-partial.php:16
+msgid "Geographic Radius (kilometers)"
+msgstr ""
+
+#: views/shared/map/advanced-search-partial.php:18
+msgid "Geographic Radius (miles)"
+msgstr ""
+
+#: views/shared/map/advanced-search-partial.php:25
+msgid "Geographic Address"
+msgstr "Indirizzo geografico"
diff --git a/languages/ja.mo b/languages/ja.mo
index f86f779..b13da37 100644
Binary files a/languages/ja.mo and b/languages/ja.mo differ
diff --git a/languages/ja.po b/languages/ja.po
index d492ef5..0dc8c5a 100644
--- a/languages/ja.po
+++ b/languages/ja.po
@@ -9,54 +9,57 @@ msgstr ""
 "Project-Id-Version: Omeka\n"
 "Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
 "POT-Creation-Date: 2012-01-09 21:49-0500\n"
-"PO-Revision-Date: 2014-05-22 21:24+0000\n"
+"PO-Revision-Date: 2014-12-01 19:16+0000\n"
 "Last-Translator: John Flatness <john@zerocrates.org>\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/omeka/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/omeka/omeka/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: GeolocationPlugin.php:298
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr ""
+
+#: GeolocationPlugin.php:333
 msgid "kilometers"
 msgstr ""
 
-#: GeolocationPlugin.php:300
+#: GeolocationPlugin.php:335
 msgid "miles"
 msgstr ""
 
-#: GeolocationPlugin.php:302
+#: GeolocationPlugin.php:337
 #, php-format
 msgid "within %1$s %2$s of \"%3$s\""
 msgstr ""
 
-#: GeolocationPlugin.php:322 GeolocationPlugin.php:328
-#: GeolocationPlugin.php:352
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
 msgid "Map"
 msgstr "地図"
 
-#: GeolocationPlugin.php:361
+#: GeolocationPlugin.php:396
 msgid "Browse Map"
 msgstr "地図"
 
-#: GeolocationPlugin.php:409
+#: GeolocationPlugin.php:445
 msgid "Find A Geographic Location For The "
 msgstr ""
 
-#: GeolocationPlugin.php:420
+#: GeolocationPlugin.php:457
 msgid "Geolocation Map"
 msgstr ""
 
-#: GeolocationPlugin.php:421
+#: GeolocationPlugin.php:458
 msgid "Show attached items on a map"
 msgstr ""
 
-#: GeolocationPlugin.php:509
+#: GeolocationPlugin.php:546
 msgid "Find a Location by Address:"
 msgstr "住所で場所を検索"
 
-#: GeolocationPlugin.php:547
+#: GeolocationPlugin.php:587
 msgid "Find"
 msgstr "検索"
 
@@ -142,54 +145,64 @@ msgid ""
 msgstr ""
 
 #: config_form.php:84
+msgid "Default Radius"
+msgstr ""
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr ""
+
+#: config_form.php:93
 msgid "Use metric distances"
 msgstr "メートルを利用"
 
-#: config_form.php:87
+#: config_form.php:96
 msgid "Use metric distances in proximity search."
 msgstr "近傍検索でメートルを利用"
 
-#: config_form.php:97
+#: config_form.php:106
 msgid "Item Map Settings"
 msgstr ""
 
-#: config_form.php:100
+#: config_form.php:109
 msgid "Width for Item Map"
 msgstr "アイテム地図の幅"
 
-#: config_form.php:103
+#: config_form.php:112
 msgid ""
 "The width of the map displayed on your items/show page. If left blank, the "
 "default width of 100% will be used."
 msgstr ""
 
-#: config_form.php:110
+#: config_form.php:119
 msgid "Height for Item Map"
 msgstr "アイテム地図の高さ"
 
-#: config_form.php:113
+#: config_form.php:122
 msgid ""
 "The height of the map displayed on your items/show page. If left blank, the "
 "default height of 300px will be used."
 msgstr ""
 
-#: config_form.php:120
+#: config_form.php:129
 msgid "Map Integration"
 msgstr ""
 
-#: config_form.php:123
+#: config_form.php:132
 msgid "Add Link to Map on Items/Browse Navigation"
 msgstr ""
 
-#: config_form.php:126
+#: config_form.php:135
 msgid "Add a link to the items map on all the items/browse pages."
 msgstr ""
 
-#: config_form.php:136
+#: config_form.php:145
 msgid "Add Map To Contribution Form"
 msgstr ""
 
-#: config_form.php:139
+#: config_form.php:148
 msgid ""
 "If the Contribution plugin is installed and activated, Geolocation  will add"
 " a geolocation map field to the contribution form to associate a location to"
@@ -232,7 +245,7 @@ msgstr ""
 msgid "Find An Item on the Map"
 msgstr "地図上でアイテムを検索"
 
-#: views/helpers/ItemGoogleMap.php:50
+#: views/helpers/ItemGoogleMap.php:36
 msgid "This item has no location info associated with it."
 msgstr ""
 
diff --git a/languages/ko_KR.mo b/languages/ko_KR.mo
new file mode 100644
index 0000000..dae0773
Binary files /dev/null and b/languages/ko_KR.mo differ
diff --git a/languages/ko_KR.po b/languages/ko_KR.po
new file mode 100644
index 0000000..4d312de
--- /dev/null
+++ b/languages/ko_KR.po
@@ -0,0 +1,261 @@
+# Translation for the Geolocation plugin for Omeka.
+# Copyright (C) 2011 Roy Rosenzweig Center for History and New Media
+# This file is distributed under the same license as the Omeka package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Omeka\n"
+"Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
+"POT-Creation-Date: 2012-01-09 21:49-0500\n"
+"PO-Revision-Date: 2014-12-18 08:37+0000\n"
+"Last-Translator: Seung-il, Lee <silee0523@gmail.com>\n"
+"Language-Team: Korean (Korea) (http://www.transifex.com/omeka/omeka/language/ko_KR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko_KR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr "위치정보"
+
+#: GeolocationPlugin.php:333
+msgid "kilometers"
+msgstr "킬로미터"
+
+#: GeolocationPlugin.php:335
+msgid "miles"
+msgstr "마일"
+
+#: GeolocationPlugin.php:337
+#, php-format
+msgid "within %1$s %2$s of \"%3$s\""
+msgstr ""
+
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
+msgid "Map"
+msgstr "지도"
+
+#: GeolocationPlugin.php:396
+msgid "Browse Map"
+msgstr "지도보기"
+
+#: GeolocationPlugin.php:445
+msgid "Find A Geographic Location For The "
+msgstr ""
+
+#: GeolocationPlugin.php:457
+msgid "Geolocation Map"
+msgstr "위치정보 지도"
+
+#: GeolocationPlugin.php:458
+msgid "Show attached items on a map"
+msgstr "지도에 추가된 아이템 보기"
+
+#: GeolocationPlugin.php:546
+msgid "Find a Location by Address:"
+msgstr "주소로 장소 검색 : "
+
+#: GeolocationPlugin.php:587
+msgid "Find"
+msgstr "검색"
+
+#: config_form.php:3
+msgid "General Settings"
+msgstr "일반 설정"
+
+#: config_form.php:6
+msgid "Default Latitude"
+msgstr "기본 위도"
+
+#: config_form.php:9
+msgid ""
+"Latitude of the map's initial center point, in degrees. Must be between -90 "
+"and 90."
+msgstr ""
+
+#: config_form.php:16
+msgid "Default Longitude"
+msgstr "기본 경도"
+
+#: config_form.php:19
+msgid ""
+"Longitude of the map's initial center point, in degrees. Must be between "
+"-180 and 180."
+msgstr ""
+
+#: config_form.php:26
+msgid "Default Zoom Level"
+msgstr "기본 Zomm 레벨"
+
+#: config_form.php:29
+msgid ""
+"An integer greater than or equal to 0, where 0 represents the most zoomed "
+"out scale."
+msgstr ""
+
+#: config_form.php:36
+msgid "Map Type"
+msgstr "지도 유형"
+
+#: config_form.php:39
+msgid "The type of map to display"
+msgstr ""
+
+#: config_form.php:42
+msgid "Roadmap"
+msgstr "로드맵"
+
+#: config_form.php:43
+msgid "Satellite"
+msgstr "위성"
+
+#: config_form.php:44
+msgid "Hybrid"
+msgstr "하이브리드"
+
+#: config_form.php:45
+msgid "Terrain"
+msgstr "지역"
+
+#: config_form.php:54
+msgid "Browse Map Settings"
+msgstr "지도 설정 보기"
+
+#: config_form.php:57
+msgid "Number of Locations Per Page"
+msgstr "페이지당 장소 개수"
+
+#: config_form.php:60
+msgid "The number of locations displayed per page when browsing the map."
+msgstr ""
+
+#: config_form.php:66
+msgid "Auto-fit to Locations"
+msgstr ""
+
+#: config_form.php:70
+msgid ""
+"If checked, the default location and zoom settings will be ignored on the "
+"browse map. Instead, the map will automatically pan and zoom to fit the "
+"locations displayed on each page."
+msgstr ""
+
+#: config_form.php:84
+msgid "Default Radius"
+msgstr ""
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr ""
+
+#: config_form.php:93
+msgid "Use metric distances"
+msgstr ""
+
+#: config_form.php:96
+msgid "Use metric distances in proximity search."
+msgstr ""
+
+#: config_form.php:106
+msgid "Item Map Settings"
+msgstr "아이템 지도 설정"
+
+#: config_form.php:109
+msgid "Width for Item Map"
+msgstr "아이템 지도의 너비"
+
+#: config_form.php:112
+msgid ""
+"The width of the map displayed on your items/show page. If left blank, the "
+"default width of 100% will be used."
+msgstr ""
+
+#: config_form.php:119
+msgid "Height for Item Map"
+msgstr "아이템 지도의 높이"
+
+#: config_form.php:122
+msgid ""
+"The height of the map displayed on your items/show page. If left blank, the "
+"default height of 300px will be used."
+msgstr ""
+
+#: config_form.php:129
+msgid "Map Integration"
+msgstr ""
+
+#: config_form.php:132
+msgid "Add Link to Map on Items/Browse Navigation"
+msgstr "아이템/보기 메뉴에 지도 링크 추가"
+
+#: config_form.php:135
+msgid "Add a link to the items map on all the items/browse pages."
+msgstr "아이템/보기 페이지에 아이템 지도 링크 추가"
+
+#: config_form.php:145
+msgid "Add Map To Contribution Form"
+msgstr "기록물 기증 폼에 지도 추가"
+
+#: config_form.php:148
+msgid ""
+"If the Contribution plugin is installed and activated, Geolocation  will add"
+" a geolocation map field to the contribution form to associate a location to"
+" a contributed item."
+msgstr ""
+
+#: models/Location.php:22
+msgid "Location requires an item ID."
+msgstr ""
+
+#: models/Location.php:26
+msgid "Location requires a valid item ID."
+msgstr ""
+
+#: models/Location.php:31
+msgid "A location already exists for the provided item."
+msgstr ""
+
+#: models/Location.php:34
+msgid "Location requires a latitude."
+msgstr ""
+
+#: models/Location.php:37
+msgid "Location requires a longitude."
+msgstr ""
+
+#: models/Location.php:40
+msgid "Location requires a zoom level."
+msgstr ""
+
+#: views/admin/map/browse.php:4 views/public/map/browse.php:4
+msgid "Browse Items on the Map"
+msgstr "지도에 등록된 아이템 보기"
+
+#: views/admin/map/browse.php:4
+msgid "total"
+msgstr "전체"
+
+#: views/admin/map/browse.php:13 views/public/map/browse.php:21
+msgid "Find An Item on the Map"
+msgstr "지도에서 아이템 검색"
+
+#: views/helpers/ItemGoogleMap.php:36
+msgid "This item has no location info associated with it."
+msgstr "이 아이템은 연관된 장소 정보가 없습니다."
+
+#: views/shared/map/advanced-search-partial.php:16
+msgid "Geographic Radius (kilometers)"
+msgstr "지리적 반경(킬로미터)"
+
+#: views/shared/map/advanced-search-partial.php:18
+msgid "Geographic Radius (miles)"
+msgstr "지리적 반경(마일)"
+
+#: views/shared/map/advanced-search-partial.php:25
+msgid "Geographic Address"
+msgstr "지리적 주소"
diff --git a/languages/mn.mo b/languages/mn.mo
new file mode 100644
index 0000000..4aae572
Binary files /dev/null and b/languages/mn.mo differ
diff --git a/languages/mn.po b/languages/mn.po
new file mode 100644
index 0000000..2c86afe
--- /dev/null
+++ b/languages/mn.po
@@ -0,0 +1,262 @@
+# Translation for the Geolocation plugin for Omeka.
+# Copyright (C) 2011 Roy Rosenzweig Center for History and New Media
+# This file is distributed under the same license as the Omeka package.
+# 
+# Translators:
+# Khaidav T. <khaidaw@yahoo.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: Omeka\n"
+"Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
+"POT-Creation-Date: 2012-01-09 21:49-0500\n"
+"PO-Revision-Date: 2016-04-05 09:18+0000\n"
+"Last-Translator: Khaidav T. <khaidaw@yahoo.com>\n"
+"Language-Team: Mongolian (http://www.transifex.com/omeka/omeka/language/mn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr "Газар зүйн байршил"
+
+#: GeolocationPlugin.php:333
+msgid "kilometers"
+msgstr "километр"
+
+#: GeolocationPlugin.php:335
+msgid "miles"
+msgstr "мийл"
+
+#: GeolocationPlugin.php:337
+#, php-format
+msgid "within %1$s %2$s of \"%3$s\""
+msgstr ""
+
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
+msgid "Map"
+msgstr "Газрын зураг"
+
+#: GeolocationPlugin.php:396
+msgid "Browse Map"
+msgstr "Газрын зургийг гүйлгэж харах"
+
+#: GeolocationPlugin.php:445
+msgid "Find A Geographic Location For The "
+msgstr ""
+
+#: GeolocationPlugin.php:457
+msgid "Geolocation Map"
+msgstr "Газарзүйн зураг"
+
+#: GeolocationPlugin.php:458
+msgid "Show attached items on a map"
+msgstr ""
+
+#: GeolocationPlugin.php:546
+msgid "Find a Location by Address:"
+msgstr "Байршлыг хаягаар хайх:"
+
+#: GeolocationPlugin.php:587
+msgid "Find"
+msgstr "Хайх"
+
+#: config_form.php:3
+msgid "General Settings"
+msgstr "Ерөнхий тохиргоо"
+
+#: config_form.php:6
+msgid "Default Latitude"
+msgstr "Үндсэн өргөрөг"
+
+#: config_form.php:9
+msgid ""
+"Latitude of the map's initial center point, in degrees. Must be between -90 "
+"and 90."
+msgstr ""
+
+#: config_form.php:16
+msgid "Default Longitude"
+msgstr "Үндсэн уртраг"
+
+#: config_form.php:19
+msgid ""
+"Longitude of the map's initial center point, in degrees. Must be between "
+"-180 and 180."
+msgstr ""
+
+#: config_form.php:26
+msgid "Default Zoom Level"
+msgstr ""
+
+#: config_form.php:29
+msgid ""
+"An integer greater than or equal to 0, where 0 represents the most zoomed "
+"out scale."
+msgstr ""
+
+#: config_form.php:36
+msgid "Map Type"
+msgstr "Газрын зургийн төрөл"
+
+#: config_form.php:39
+msgid "The type of map to display"
+msgstr "Дэлгэцэнд харагдах газрын зургийн төрөл"
+
+#: config_form.php:42
+msgid "Roadmap"
+msgstr "Замын зураг"
+
+#: config_form.php:43
+msgid "Satellite"
+msgstr "Хиймэл дагуул"
+
+#: config_form.php:44
+msgid "Hybrid"
+msgstr ""
+
+#: config_form.php:45
+msgid "Terrain"
+msgstr "Газар нутаг"
+
+#: config_form.php:54
+msgid "Browse Map Settings"
+msgstr "Газрын зургийн гүйлгэн харах тохиргоо"
+
+#: config_form.php:57
+msgid "Number of Locations Per Page"
+msgstr ""
+
+#: config_form.php:60
+msgid "The number of locations displayed per page when browsing the map."
+msgstr ""
+
+#: config_form.php:66
+msgid "Auto-fit to Locations"
+msgstr ""
+
+#: config_form.php:70
+msgid ""
+"If checked, the default location and zoom settings will be ignored on the "
+"browse map. Instead, the map will automatically pan and zoom to fit the "
+"locations displayed on each page."
+msgstr ""
+
+#: config_form.php:84
+msgid "Default Radius"
+msgstr "Үндсэн Радиус"
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr ""
+
+#: config_form.php:93
+msgid "Use metric distances"
+msgstr ""
+
+#: config_form.php:96
+msgid "Use metric distances in proximity search."
+msgstr ""
+
+#: config_form.php:106
+msgid "Item Map Settings"
+msgstr "Мэдээллийг газрын зургийн тохиргоо"
+
+#: config_form.php:109
+msgid "Width for Item Map"
+msgstr ""
+
+#: config_form.php:112
+msgid ""
+"The width of the map displayed on your items/show page. If left blank, the "
+"default width of 100% will be used."
+msgstr ""
+
+#: config_form.php:119
+msgid "Height for Item Map"
+msgstr "Газрын зургийн өндөр"
+
+#: config_form.php:122
+msgid ""
+"The height of the map displayed on your items/show page. If left blank, the "
+"default height of 300px will be used."
+msgstr ""
+
+#: config_form.php:129
+msgid "Map Integration"
+msgstr ""
+
+#: config_form.php:132
+msgid "Add Link to Map on Items/Browse Navigation"
+msgstr ""
+
+#: config_form.php:135
+msgid "Add a link to the items map on all the items/browse pages."
+msgstr ""
+
+#: config_form.php:145
+msgid "Add Map To Contribution Form"
+msgstr ""
+
+#: config_form.php:148
+msgid ""
+"If the Contribution plugin is installed and activated, Geolocation  will add"
+" a geolocation map field to the contribution form to associate a location to"
+" a contributed item."
+msgstr ""
+
+#: models/Location.php:22
+msgid "Location requires an item ID."
+msgstr ""
+
+#: models/Location.php:26
+msgid "Location requires a valid item ID."
+msgstr ""
+
+#: models/Location.php:31
+msgid "A location already exists for the provided item."
+msgstr ""
+
+#: models/Location.php:34
+msgid "Location requires a latitude."
+msgstr ""
+
+#: models/Location.php:37
+msgid "Location requires a longitude."
+msgstr ""
+
+#: models/Location.php:40
+msgid "Location requires a zoom level."
+msgstr ""
+
+#: views/admin/map/browse.php:4 views/public/map/browse.php:4
+msgid "Browse Items on the Map"
+msgstr "Газрын зураг дээр мэдээллүүдийг үзэх"
+
+#: views/admin/map/browse.php:4
+msgid "total"
+msgstr "нийт"
+
+#: views/admin/map/browse.php:13 views/public/map/browse.php:21
+msgid "Find An Item on the Map"
+msgstr ""
+
+#: views/helpers/ItemGoogleMap.php:36
+msgid "This item has no location info associated with it."
+msgstr ""
+
+#: views/shared/map/advanced-search-partial.php:16
+msgid "Geographic Radius (kilometers)"
+msgstr ""
+
+#: views/shared/map/advanced-search-partial.php:18
+msgid "Geographic Radius (miles)"
+msgstr ""
+
+#: views/shared/map/advanced-search-partial.php:25
+msgid "Geographic Address"
+msgstr ""
diff --git a/languages/nl_BE.mo b/languages/nl_BE.mo
index 780cb3f..5c06a2a 100644
Binary files a/languages/nl_BE.mo and b/languages/nl_BE.mo differ
diff --git a/languages/nl_BE.po b/languages/nl_BE.po
index 9b6b8d1..c9cdd0d 100644
--- a/languages/nl_BE.po
+++ b/languages/nl_BE.po
@@ -9,54 +9,57 @@ msgstr ""
 "Project-Id-Version: Omeka\n"
 "Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
 "POT-Creation-Date: 2012-01-09 21:49-0500\n"
-"PO-Revision-Date: 2014-05-22 21:24+0000\n"
+"PO-Revision-Date: 2014-12-01 19:16+0000\n"
 "Last-Translator: John Flatness <john@zerocrates.org>\n"
-"Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/omeka/language/nl_BE/)\n"
+"Language-Team: Dutch (Belgium) (http://www.transifex.com/omeka/omeka/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeolocationPlugin.php:298
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr ""
+
+#: GeolocationPlugin.php:333
 msgid "kilometers"
 msgstr ""
 
-#: GeolocationPlugin.php:300
+#: GeolocationPlugin.php:335
 msgid "miles"
 msgstr ""
 
-#: GeolocationPlugin.php:302
+#: GeolocationPlugin.php:337
 #, php-format
 msgid "within %1$s %2$s of \"%3$s\""
 msgstr ""
 
-#: GeolocationPlugin.php:322 GeolocationPlugin.php:328
-#: GeolocationPlugin.php:352
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
 msgid "Map"
 msgstr "Kaart"
 
-#: GeolocationPlugin.php:361
+#: GeolocationPlugin.php:396
 msgid "Browse Map"
 msgstr "Verken de kaart"
 
-#: GeolocationPlugin.php:409
+#: GeolocationPlugin.php:445
 msgid "Find A Geographic Location For The "
 msgstr "Vind een geografische plaats voor de"
 
-#: GeolocationPlugin.php:420
+#: GeolocationPlugin.php:457
 msgid "Geolocation Map"
 msgstr ""
 
-#: GeolocationPlugin.php:421
+#: GeolocationPlugin.php:458
 msgid "Show attached items on a map"
 msgstr ""
 
-#: GeolocationPlugin.php:509
+#: GeolocationPlugin.php:546
 msgid "Find a Location by Address:"
 msgstr "Vind een plaats door gebruik te maken van een adres:"
 
-#: GeolocationPlugin.php:547
+#: GeolocationPlugin.php:587
 msgid "Find"
 msgstr "Vind"
 
@@ -142,54 +145,64 @@ msgid ""
 msgstr ""
 
 #: config_form.php:84
+msgid "Default Radius"
+msgstr ""
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr ""
+
+#: config_form.php:93
 msgid "Use metric distances"
 msgstr "Gebruik metrische afstanden"
 
-#: config_form.php:87
+#: config_form.php:96
 msgid "Use metric distances in proximity search."
 msgstr "Gebruik metrische afstanden bij het zoeken in de nabijheid."
 
-#: config_form.php:97
+#: config_form.php:106
 msgid "Item Map Settings"
 msgstr ""
 
-#: config_form.php:100
+#: config_form.php:109
 msgid "Width for Item Map"
 msgstr "Breedte voor item kaart"
 
-#: config_form.php:103
+#: config_form.php:112
 msgid ""
 "The width of the map displayed on your items/show page. If left blank, the "
 "default width of 100% will be used."
 msgstr "De breedte van de kaart weergegeven op uw items/weergave pagina. De standaard breedte van 100% wordt gebruikt als dit leeg is."
 
-#: config_form.php:110
+#: config_form.php:119
 msgid "Height for Item Map"
 msgstr "Hoogte voor item kaart"
 
-#: config_form.php:113
+#: config_form.php:122
 msgid ""
 "The height of the map displayed on your items/show page. If left blank, the "
 "default height of 300px will be used."
 msgstr "De hoogte van de kaart weergegeven op uw items/weergave pagina. De standaard hoogte van 300px wordt gebruikt als dit leeg is."
 
-#: config_form.php:120
+#: config_form.php:129
 msgid "Map Integration"
 msgstr ""
 
-#: config_form.php:123
+#: config_form.php:132
 msgid "Add Link to Map on Items/Browse Navigation"
 msgstr "Voeg een link toe aan de kaart bij items/verken navigatie"
 
-#: config_form.php:126
+#: config_form.php:135
 msgid "Add a link to the items map on all the items/browse pages."
 msgstr "Voeg een link toe aan de items kaart op alle items/verken pagina's."
 
-#: config_form.php:136
+#: config_form.php:145
 msgid "Add Map To Contribution Form"
 msgstr "Voeg een kaart toe aan het bijdrage-formulier"
 
-#: config_form.php:139
+#: config_form.php:148
 msgid ""
 "If the Contribution plugin is installed and activated, Geolocation  will add"
 " a geolocation map field to the contribution form to associate a location to"
@@ -232,7 +245,7 @@ msgstr "totaal"
 msgid "Find An Item on the Map"
 msgstr "Vind een item op de kaart"
 
-#: views/helpers/ItemGoogleMap.php:50
+#: views/helpers/ItemGoogleMap.php:36
 msgid "This item has no location info associated with it."
 msgstr "Dit item is nog niet verbonden met plaats informatie."
 
diff --git a/languages/nl_NL.mo b/languages/nl_NL.mo
new file mode 100644
index 0000000..acd1ec0
Binary files /dev/null and b/languages/nl_NL.mo differ
diff --git a/languages/nl_NL.po b/languages/nl_NL.po
new file mode 100644
index 0000000..2cebfe4
--- /dev/null
+++ b/languages/nl_NL.po
@@ -0,0 +1,262 @@
+# Translation for the Geolocation plugin for Omeka.
+# Copyright (C) 2011 Roy Rosenzweig Center for History and New Media
+# This file is distributed under the same license as the Omeka package.
+# 
+# Translators:
+# hans schraven <hans.schraven@gmail.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: Omeka\n"
+"Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
+"POT-Creation-Date: 2012-01-09 21:49-0500\n"
+"PO-Revision-Date: 2015-10-08 16:12+0000\n"
+"Last-Translator: Brian Cho <briancho@ezuserguide.com>\n"
+"Language-Team: Dutch (Netherlands) (http://www.transifex.com/omeka/omeka/language/nl_NL/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl_NL\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr "Geo-locatie"
+
+#: GeolocationPlugin.php:333
+msgid "kilometers"
+msgstr "kilometers"
+
+#: GeolocationPlugin.php:335
+msgid "miles"
+msgstr "mijlen"
+
+#: GeolocationPlugin.php:337
+#, php-format
+msgid "within %1$s %2$s of \"%3$s\""
+msgstr "binnen %1$s %2$s van \"%3$s\""
+
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
+msgid "Map"
+msgstr "Kaart"
+
+#: GeolocationPlugin.php:396
+msgid "Browse Map"
+msgstr "Doorzoek kaart"
+
+#: GeolocationPlugin.php:445
+msgid "Find A Geographic Location For The "
+msgstr "Een geografische locatie vinden voor de  "
+
+#: GeolocationPlugin.php:457
+msgid "Geolocation Map"
+msgstr "Geolocatiekaart"
+
+#: GeolocationPlugin.php:458
+msgid "Show attached items on a map"
+msgstr "Toon bijgesloten items op een kaart"
+
+#: GeolocationPlugin.php:546
+msgid "Find a Location by Address:"
+msgstr "Vind een locatie door middel van een adres"
+
+#: GeolocationPlugin.php:587
+msgid "Find"
+msgstr "Zoeken"
+
+#: config_form.php:3
+msgid "General Settings"
+msgstr "Algemene instellingen"
+
+#: config_form.php:6
+msgid "Default Latitude"
+msgstr "Standaard breedtegraad"
+
+#: config_form.php:9
+msgid ""
+"Latitude of the map's initial center point, in degrees. Must be between -90 "
+"and 90."
+msgstr "De breedtegraad van het oorspronkelijke centrum van de kaart in graden. Deze moet tussen de -90 en 90 liggen."
+
+#: config_form.php:16
+msgid "Default Longitude"
+msgstr "Standaard lengtegraad"
+
+#: config_form.php:19
+msgid ""
+"Longitude of the map's initial center point, in degrees. Must be between "
+"-180 and 180."
+msgstr "De lengtegraad van het oorspronkelijke centrum van de kaart in graden. Deze moet tussen de -180 en 180 liggen."
+
+#: config_form.php:26
+msgid "Default Zoom Level"
+msgstr "Standaard zoomniveau"
+
+#: config_form.php:29
+msgid ""
+"An integer greater than or equal to 0, where 0 represents the most zoomed "
+"out scale."
+msgstr "Een geheel getal dat groter of gelijk is aan 0, waarbij 0 staat voor het verste uitgezoomd."
+
+#: config_form.php:36
+msgid "Map Type"
+msgstr "Soort kaart"
+
+#: config_form.php:39
+msgid "The type of map to display"
+msgstr "Het soort weer te geven kaart"
+
+#: config_form.php:42
+msgid "Roadmap"
+msgstr "Wegenkaart"
+
+#: config_form.php:43
+msgid "Satellite"
+msgstr "Satelliet"
+
+#: config_form.php:44
+msgid "Hybrid"
+msgstr "Beide"
+
+#: config_form.php:45
+msgid "Terrain"
+msgstr "Terrein"
+
+#: config_form.php:54
+msgid "Browse Map Settings"
+msgstr "Kaartinstellingen doorzoeken"
+
+#: config_form.php:57
+msgid "Number of Locations Per Page"
+msgstr "Aantal locaties per pagina"
+
+#: config_form.php:60
+msgid "The number of locations displayed per page when browsing the map."
+msgstr "Het aantal locaties dat per pagina wordt weergegeven als u de kaart doorzoekt."
+
+#: config_form.php:66
+msgid "Auto-fit to Locations"
+msgstr "Automatisch aanpassen aan locaties"
+
+#: config_form.php:70
+msgid ""
+"If checked, the default location and zoom settings will be ignored on the "
+"browse map. Instead, the map will automatically pan and zoom to fit the "
+"locations displayed on each page."
+msgstr "Als deze keuze is aangevinkt, worden de standaard locatie- en zoominstellingen op de zoekkaart genegeerd. In plaats daarvan verschuift de kaart en wordt er in- of uitgezoomd zodat de locaties die op elke pagina worden weergegeven passen."
+
+#: config_form.php:84
+msgid "Default Radius"
+msgstr "Standaard straal"
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr "De afmeting van de standaard straal die op de geavanceerde zoekpagina voor items moet worden gebruikt. Hieronder kunt u instellen of afstanden in mijlen of kilometers moeten worden weergegeven."
+
+#: config_form.php:93
+msgid "Use metric distances"
+msgstr "Gebruik het metrisch stelsel voor afstanden."
+
+#: config_form.php:96
+msgid "Use metric distances in proximity search."
+msgstr "Gebruik het metrisch stelsel voor zoeken in de omgeving."
+
+#: config_form.php:106
+msgid "Item Map Settings"
+msgstr "Kaartinstellingen item"
+
+#: config_form.php:109
+msgid "Width for Item Map"
+msgstr "Breedte voor itemkaart"
+
+#: config_form.php:112
+msgid ""
+"The width of the map displayed on your items/show page. If left blank, the "
+"default width of 100% will be used."
+msgstr "De breedte van de kaart die op uw items/toon-pagina wordt weergegeven. Als deze waarde niet wordt ingevuld, de standaard breedte van 100% worden gebruikt."
+
+#: config_form.php:119
+msgid "Height for Item Map"
+msgstr "Hoogte voor itemkaart"
+
+#: config_form.php:122
+msgid ""
+"The height of the map displayed on your items/show page. If left blank, the "
+"default height of 300px will be used."
+msgstr "De hoogte van de kaart die op uw items/toon-pagina wordt weergegeven. Als deze waarde niet wordt ingevuld, de standaard hoogte van 300px worden gebruikt."
+
+#: config_form.php:129
+msgid "Map Integration"
+msgstr "Neem in kaart op"
+
+#: config_form.php:132
+msgid "Add Link to Map on Items/Browse Navigation"
+msgstr "Voeg een link toe aan Kaart bij Items/Bladeren"
+
+#: config_form.php:135
+msgid "Add a link to the items map on all the items/browse pages."
+msgstr "Hiermee voegt u een link toe aan de itemskaart op alle items-/zoekpagina's."
+
+#: config_form.php:145
+msgid "Add Map To Contribution Form"
+msgstr "Voeg een kaart aan een bijdrageformulier toe"
+
+#: config_form.php:148
+msgid ""
+"If the Contribution plugin is installed and activated, Geolocation  will add"
+" a geolocation map field to the contribution form to associate a location to"
+" a contributed item."
+msgstr "Als de plug-in Bijdragen is geïnstalleerd en geactiveerd, dan voegt Geolocatie een geolocatiekaartveld toe aan het bijdrageformulier om een locatie aan een bijgedragen item te koppelen."
+
+#: models/Location.php:22
+msgid "Location requires an item ID."
+msgstr "Voor de locatie is een item-ID nodig."
+
+#: models/Location.php:26
+msgid "Location requires a valid item ID."
+msgstr "Voor de locatie is een geldig item-ID nodig."
+
+#: models/Location.php:31
+msgid "A location already exists for the provided item."
+msgstr "Er bestaat al een locatie voor het aangeboden item."
+
+#: models/Location.php:34
+msgid "Location requires a latitude."
+msgstr "Geef een breedtegraad op voor de locatie."
+
+#: models/Location.php:37
+msgid "Location requires a longitude."
+msgstr "Geef een lengtegraad op voor de locatie."
+
+#: models/Location.php:40
+msgid "Location requires a zoom level."
+msgstr "Geef een zoomniveau op voor de locatie."
+
+#: views/admin/map/browse.php:4 views/public/map/browse.php:4
+msgid "Browse Items on the Map"
+msgstr "Blader door items op de kaart"
+
+#: views/admin/map/browse.php:4
+msgid "total"
+msgstr "totaal"
+
+#: views/admin/map/browse.php:13 views/public/map/browse.php:21
+msgid "Find An Item on the Map"
+msgstr "Zoek een item op de kaart"
+
+#: views/helpers/ItemGoogleMap.php:36
+msgid "This item has no location info associated with it."
+msgstr "Er is geen locatie aan dit item gekoppeld."
+
+#: views/shared/map/advanced-search-partial.php:16
+msgid "Geographic Radius (kilometers)"
+msgstr "Geografische radius (in kilometers)"
+
+#: views/shared/map/advanced-search-partial.php:18
+msgid "Geographic Radius (miles)"
+msgstr "Geografische radius (in mijlen)"
+
+#: views/shared/map/advanced-search-partial.php:25
+msgid "Geographic Address"
+msgstr "Geografisch adres"
diff --git a/languages/pl.mo b/languages/pl.mo
new file mode 100644
index 0000000..82a7e34
Binary files /dev/null and b/languages/pl.mo differ
diff --git a/languages/pl.po b/languages/pl.po
new file mode 100644
index 0000000..f7a5690
--- /dev/null
+++ b/languages/pl.po
@@ -0,0 +1,262 @@
+# Translation for the Geolocation plugin for Omeka.
+# Copyright (C) 2011 Roy Rosenzweig Center for History and New Media
+# This file is distributed under the same license as the Omeka package.
+# 
+# Translators:
+# Tomasz Sopylo <tomasz@sopylo.pl>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: Omeka\n"
+"Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
+"POT-Creation-Date: 2012-01-09 21:49-0500\n"
+"PO-Revision-Date: 2015-06-22 20:24+0000\n"
+"Last-Translator: Tomasz Sopylo <tomasz@sopylo.pl>\n"
+"Language-Team: Polish (http://www.transifex.com/omeka/omeka/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr "Geolokalizacja"
+
+#: GeolocationPlugin.php:333
+msgid "kilometers"
+msgstr "kilometrów"
+
+#: GeolocationPlugin.php:335
+msgid "miles"
+msgstr "mil"
+
+#: GeolocationPlugin.php:337
+#, php-format
+msgid "within %1$s %2$s of \"%3$s\""
+msgstr "w %1$s %2$s z \"%3$s\""
+
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
+msgid "Map"
+msgstr "Mapa"
+
+#: GeolocationPlugin.php:396
+msgid "Browse Map"
+msgstr "Przeglądaj mapę"
+
+#: GeolocationPlugin.php:445
+msgid "Find A Geographic Location For The "
+msgstr "Znajdź lokalizację geograficzną dla"
+
+#: GeolocationPlugin.php:457
+msgid "Geolocation Map"
+msgstr "Mapa geolokalizacji"
+
+#: GeolocationPlugin.php:458
+msgid "Show attached items on a map"
+msgstr "Pokaż załączone pozycje na mapie"
+
+#: GeolocationPlugin.php:546
+msgid "Find a Location by Address:"
+msgstr "Znajdź lokalizację poprzez adres:"
+
+#: GeolocationPlugin.php:587
+msgid "Find"
+msgstr "Znajdź"
+
+#: config_form.php:3
+msgid "General Settings"
+msgstr "Ustawienia ogólne"
+
+#: config_form.php:6
+msgid "Default Latitude"
+msgstr "Domyślna szerokość geograficzna"
+
+#: config_form.php:9
+msgid ""
+"Latitude of the map's initial center point, in degrees. Must be between -90 "
+"and 90."
+msgstr "Szerokość geograficzna początkowego, centralnego punktu mapy w stopniach. Musi zawierać się pomiędzy -90 i 90."
+
+#: config_form.php:16
+msgid "Default Longitude"
+msgstr "Domyślna długość geograficzna"
+
+#: config_form.php:19
+msgid ""
+"Longitude of the map's initial center point, in degrees. Must be between "
+"-180 and 180."
+msgstr "Długość geograficzna początkowego, centralnego punktu mapy w stopniach. Musi zawierać się pomiędzy -180 i 180."
+
+#: config_form.php:26
+msgid "Default Zoom Level"
+msgstr "Domyślny poziom powiększenia"
+
+#: config_form.php:29
+msgid ""
+"An integer greater than or equal to 0, where 0 represents the most zoomed "
+"out scale."
+msgstr "Liczba całkowita większa lub równa 0, gdzie 0 oznacza skalę mapy w największym oddaleniu."
+
+#: config_form.php:36
+msgid "Map Type"
+msgstr "Typ mapy"
+
+#: config_form.php:39
+msgid "The type of map to display"
+msgstr "Typ mapy do wyświetlenia"
+
+#: config_form.php:42
+msgid "Roadmap"
+msgstr "Mapa drogowa"
+
+#: config_form.php:43
+msgid "Satellite"
+msgstr "Zdjęcie satelitarne"
+
+#: config_form.php:44
+msgid "Hybrid"
+msgstr "Mapa hybrydowa"
+
+#: config_form.php:45
+msgid "Terrain"
+msgstr "Mapa topograficzna"
+
+#: config_form.php:54
+msgid "Browse Map Settings"
+msgstr "Przeglądaj ustawienia mapy"
+
+#: config_form.php:57
+msgid "Number of Locations Per Page"
+msgstr "Liczba lokalizacji na stronę"
+
+#: config_form.php:60
+msgid "The number of locations displayed per page when browsing the map."
+msgstr "Liczba lokalizacji wyświetlanych na stronie podczas przeglądania mapy."
+
+#: config_form.php:66
+msgid "Auto-fit to Locations"
+msgstr "Automatycznie dopasuj do lokalizacji"
+
+#: config_form.php:70
+msgid ""
+"If checked, the default location and zoom settings will be ignored on the "
+"browse map. Instead, the map will automatically pan and zoom to fit the "
+"locations displayed on each page."
+msgstr "Gdy zaznaczone, domyślne ustawienia długości i szerokości geograficznej dla punktu centralnego mapy oraz powiększenia zostaną zignorowane. Zamiast tego mapa zostanie automatycznie dopasowana i powiększona tak by objąć lokalizacje wyświetlane na każdej ze stron."
+
+#: config_form.php:84
+msgid "Default Radius"
+msgstr "Domyślny promień"
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr "Wielkość domyślnego promienia wykorzystywana podczas zaawansowanego wyszukiwania pozycji. Zobacz poniżej by mierzyć w milach lub w kilometrach."
+
+#: config_form.php:93
+msgid "Use metric distances"
+msgstr "Używaj odległości metrycznych"
+
+#: config_form.php:96
+msgid "Use metric distances in proximity search."
+msgstr "Używaj odległości metrycznych w ustawieniach wyszukiwania w pobliżu."
+
+#: config_form.php:106
+msgid "Item Map Settings"
+msgstr "Ustawienia mapy publikacji"
+
+#: config_form.php:109
+msgid "Width for Item Map"
+msgstr "Szerokość dla mapy publikacji"
+
+#: config_form.php:112
+msgid ""
+"The width of the map displayed on your items/show page. If left blank, the "
+"default width of 100% will be used."
+msgstr "Szerokość mapy wyświetlanej na Twojej stronie Publikacje/Pokaż. Jeśli pozostawione puste, zostanie wykorzystana domyślna szerokość 100%."
+
+#: config_form.php:119
+msgid "Height for Item Map"
+msgstr "Wysokość dla mapy publikacji"
+
+#: config_form.php:122
+msgid ""
+"The height of the map displayed on your items/show page. If left blank, the "
+"default height of 300px will be used."
+msgstr "Wysokość mapy wyświetlanej na Twojej stronie Publikacje/Pokaż. Jeśli pozostawione puste, zostanie wykorzystana domyślna wysokość 300 px."
+
+#: config_form.php:129
+msgid "Map Integration"
+msgstr "Integracja"
+
+#: config_form.php:132
+msgid "Add Link to Map on Items/Browse Navigation"
+msgstr "Dodaj łącze do mapy w nawigacji Publikacje/Przeglądaj"
+
+#: config_form.php:135
+msgid "Add a link to the items map on all the items/browse pages."
+msgstr "Dodaj łącze do mapy publikacji na wszystkich stronach Publikacje/Przeglądaj."
+
+#: config_form.php:145
+msgid "Add Map To Contribution Form"
+msgstr "Dodaj mapę do formularza wtyczki Contribution"
+
+#: config_form.php:148
+msgid ""
+"If the Contribution plugin is installed and activated, Geolocation  will add"
+" a geolocation map field to the contribution form to associate a location to"
+" a contributed item."
+msgstr "Jeśli wtyczna Contribution jest zainstalowana i aktywowana, w formularzu dodawania publikacji zostanie umieszczona mapa geolokalizacji pozwalająca na wskazanie lokalizacji powiązanej z dodawaną przez użytkownika publikacją."
+
+#: models/Location.php:22
+msgid "Location requires an item ID."
+msgstr "Lokalizacja wymaga określenia ID publikacji."
+
+#: models/Location.php:26
+msgid "Location requires a valid item ID."
+msgstr "Lokalizacja wymaga określenia prawidłowego ID publikacji."
+
+#: models/Location.php:31
+msgid "A location already exists for the provided item."
+msgstr "Istnieje już lokalizacja dla wskazanej publikacji."
+
+#: models/Location.php:34
+msgid "Location requires a latitude."
+msgstr "Lokalizacja wymaga wskazania szerokości geograficznej."
+
+#: models/Location.php:37
+msgid "Location requires a longitude."
+msgstr "Lokalizacja wymaga wskazania długości geograficznej."
+
+#: models/Location.php:40
+msgid "Location requires a zoom level."
+msgstr "Lokalizacja wymaga określenia poziomu powiększenia."
+
+#: views/admin/map/browse.php:4 views/public/map/browse.php:4
+msgid "Browse Items on the Map"
+msgstr "Przeglądaj publikacje na mapie"
+
+#: views/admin/map/browse.php:4
+msgid "total"
+msgstr "ogółem"
+
+#: views/admin/map/browse.php:13 views/public/map/browse.php:21
+msgid "Find An Item on the Map"
+msgstr "Znajdź publikację na mapie"
+
+#: views/helpers/ItemGoogleMap.php:36
+msgid "This item has no location info associated with it."
+msgstr "Ta publikacja nie posiada powiązanej z nią informacji o lokalizacji."
+
+#: views/shared/map/advanced-search-partial.php:16
+msgid "Geographic Radius (kilometers)"
+msgstr "Promień geograficzny (kilometry)"
+
+#: views/shared/map/advanced-search-partial.php:18
+msgid "Geographic Radius (miles)"
+msgstr "Promień geograficzny (mile)"
+
+#: views/shared/map/advanced-search-partial.php:25
+msgid "Geographic Address"
+msgstr "Adres geograficzny"
diff --git a/languages/pt_BR.mo b/languages/pt_BR.mo
index d81d052..c10151b 100644
Binary files a/languages/pt_BR.mo and b/languages/pt_BR.mo differ
diff --git a/languages/pt_BR.po b/languages/pt_BR.po
index 9e8b894..3894ac3 100644
--- a/languages/pt_BR.po
+++ b/languages/pt_BR.po
@@ -3,60 +3,64 @@
 # This file is distributed under the same license as the Omeka package.
 # 
 # Translators:
-# Carlos Eduardo Maciel <carlosmaciel1@gmail.com>, 2014
+# Carlos Eduardo Maciel <carlosmaciel1@gmail.com>, 2014-2015
+# Tel, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Omeka\n"
 "Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
 "POT-Creation-Date: 2012-01-09 21:49-0500\n"
-"PO-Revision-Date: 2014-06-05 19:13+0000\n"
+"PO-Revision-Date: 2015-03-18 00:55+0000\n"
 "Last-Translator: Carlos Eduardo Maciel <carlosmaciel1@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/omeka/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/omeka/omeka/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: GeolocationPlugin.php:298
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr "Geolocalização"
+
+#: GeolocationPlugin.php:333
 msgid "kilometers"
 msgstr "quilômetros"
 
-#: GeolocationPlugin.php:300
+#: GeolocationPlugin.php:335
 msgid "miles"
 msgstr "milhas"
 
-#: GeolocationPlugin.php:302
+#: GeolocationPlugin.php:337
 #, php-format
 msgid "within %1$s %2$s of \"%3$s\""
 msgstr "entre %1$s %2$s de \"%3$s\""
 
-#: GeolocationPlugin.php:322 GeolocationPlugin.php:328
-#: GeolocationPlugin.php:352
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
 msgid "Map"
 msgstr "Mapa"
 
-#: GeolocationPlugin.php:361
+#: GeolocationPlugin.php:396
 msgid "Browse Map"
 msgstr "Visualizar mapa"
 
-#: GeolocationPlugin.php:409
+#: GeolocationPlugin.php:445
 msgid "Find A Geographic Location For The "
 msgstr "Encontrar uma localização geográfica para o"
 
-#: GeolocationPlugin.php:420
+#: GeolocationPlugin.php:457
 msgid "Geolocation Map"
 msgstr "Mapa de Geolocação"
 
-#: GeolocationPlugin.php:421
+#: GeolocationPlugin.php:458
 msgid "Show attached items on a map"
 msgstr "Mostrar itens anexados em um mapa"
 
-#: GeolocationPlugin.php:509
+#: GeolocationPlugin.php:546
 msgid "Find a Location by Address:"
 msgstr "Encontrar uma localização por endereço:"
 
-#: GeolocationPlugin.php:547
+#: GeolocationPlugin.php:587
 msgid "Find"
 msgstr "Encontrar:"
 
@@ -142,54 +146,64 @@ msgid ""
 msgstr "Se marcado, a locação e opções de zoom padrão serão ignoradas no mapa de visualização. Ao invés disso, o mapa irá automaticamente ajustar-se para mostrar os locais mostrados em cada página."
 
 #: config_form.php:84
+msgid "Default Radius"
+msgstr "Raio padrão"
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr "O raio padrão a ser usado nos itens na página de busca avançada. Veja abaixo se a medição será em quilometros ou milhas."
+
+#: config_form.php:93
 msgid "Use metric distances"
 msgstr "Usar sistema métrico"
 
-#: config_form.php:87
+#: config_form.php:96
 msgid "Use metric distances in proximity search."
 msgstr "Usar distâncias métricas na busca por proximidade."
 
-#: config_form.php:97
+#: config_form.php:106
 msgid "Item Map Settings"
 msgstr "Opções de item do Mapa"
 
-#: config_form.php:100
+#: config_form.php:109
 msgid "Width for Item Map"
 msgstr "Largura para item no mapa"
 
-#: config_form.php:103
+#: config_form.php:112
 msgid ""
 "The width of the map displayed on your items/show page. If left blank, the "
 "default width of 100% will be used."
 msgstr "A largura do mapa exibido na sua página de mostra de itens. Se deixado em branco, a largura padrão de 100% será usada."
 
-#: config_form.php:110
+#: config_form.php:119
 msgid "Height for Item Map"
 msgstr "Altura para o item no mapa"
 
-#: config_form.php:113
+#: config_form.php:122
 msgid ""
 "The height of the map displayed on your items/show page. If left blank, the "
 "default height of 300px will be used."
 msgstr "A altura do mapa exibido na sua página de mostra de itens. Se deixado em branco, a altura padrão de 300px será usada."
 
-#: config_form.php:120
+#: config_form.php:129
 msgid "Map Integration"
 msgstr "Integração do Mapa"
 
-#: config_form.php:123
+#: config_form.php:132
 msgid "Add Link to Map on Items/Browse Navigation"
 msgstr "Adicionar link ao mapa de Visualização de itens"
 
-#: config_form.php:126
+#: config_form.php:135
 msgid "Add a link to the items map on all the items/browse pages."
 msgstr "Adicionar um link para os mapa de itens em todas páginas de visualização de items."
 
-#: config_form.php:136
+#: config_form.php:145
 msgid "Add Map To Contribution Form"
 msgstr "Adicionar mapa no formulário de contribuidores"
 
-#: config_form.php:139
+#: config_form.php:148
 msgid ""
 "If the Contribution plugin is installed and activated, Geolocation  will add"
 " a geolocation map field to the contribution form to associate a location to"
@@ -232,7 +246,7 @@ msgstr "total"
 msgid "Find An Item on the Map"
 msgstr "Encontrar um item no mapa"
 
-#: views/helpers/ItemGoogleMap.php:50
+#: views/helpers/ItemGoogleMap.php:36
 msgid "This item has no location info associated with it."
 msgstr "Este item não tem informação de localização associado."
 
diff --git a/languages/pt_PT.mo b/languages/pt_PT.mo
index c04bb8a..6fb007c 100644
Binary files a/languages/pt_PT.mo and b/languages/pt_PT.mo differ
diff --git a/languages/pt_PT.po b/languages/pt_PT.po
index d4d6bf1..c937e97 100644
--- a/languages/pt_PT.po
+++ b/languages/pt_PT.po
@@ -3,61 +3,64 @@
 # This file is distributed under the same license as the Omeka package.
 # 
 # Translators:
-# Daniel Alves <daniel_r_alves@hotmail.com>, 2013-2014
+# Daniel Alves <daniel_r_alves@hotmail.com>, 2013-2015
 # Filipe <llopes@museus.ul.pt>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Omeka\n"
 "Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
 "POT-Creation-Date: 2012-01-09 21:49-0500\n"
-"PO-Revision-Date: 2014-05-29 21:09+0000\n"
+"PO-Revision-Date: 2015-03-03 16:26+0000\n"
 "Last-Translator: Daniel Alves <daniel_r_alves@hotmail.com>\n"
-"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/omeka/language/pt_PT/)\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/omeka/omeka/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeolocationPlugin.php:298
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr "Geolocalização"
+
+#: GeolocationPlugin.php:333
 msgid "kilometers"
 msgstr "quilómetros"
 
-#: GeolocationPlugin.php:300
+#: GeolocationPlugin.php:335
 msgid "miles"
 msgstr "milhas"
 
-#: GeolocationPlugin.php:302
+#: GeolocationPlugin.php:337
 #, php-format
 msgid "within %1$s %2$s of \"%3$s\""
 msgstr "a %1$s %2$s de \"%3$s\""
 
-#: GeolocationPlugin.php:322 GeolocationPlugin.php:328
-#: GeolocationPlugin.php:352
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
 msgid "Map"
 msgstr "Mapa"
 
-#: GeolocationPlugin.php:361
+#: GeolocationPlugin.php:396
 msgid "Browse Map"
 msgstr "Explorar Mapa"
 
-#: GeolocationPlugin.php:409
+#: GeolocationPlugin.php:445
 msgid "Find A Geographic Location For The "
 msgstr "Encontrar uma Localização Geográfica para a"
 
-#: GeolocationPlugin.php:420
+#: GeolocationPlugin.php:457
 msgid "Geolocation Map"
 msgstr "Mapa de Geolocalização"
 
-#: GeolocationPlugin.php:421
+#: GeolocationPlugin.php:458
 msgid "Show attached items on a map"
 msgstr "Mostrar itens anexos num mapa"
 
-#: GeolocationPlugin.php:509
+#: GeolocationPlugin.php:546
 msgid "Find a Location by Address:"
 msgstr "Encontrar uma Localização pela Morada:"
 
-#: GeolocationPlugin.php:547
+#: GeolocationPlugin.php:587
 msgid "Find"
 msgstr "Procurar"
 
@@ -143,54 +146,64 @@ msgid ""
 msgstr "Quando marcado, a localização por defeito e as configurações de zoom são ignoradas na exploração do mapa. Em vez disso, o mapa vai descolar-se e aplicar zoom de modo a ajustar-se aos locais mostrados em cada página."
 
 #: config_form.php:84
+msgid "Default Radius"
+msgstr "Raio por defeito"
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr "O tamanho por defeito do raio a usar na página de pesquisa de itens. Ver abaixo para optar pela medida em milhas ou quilómetros."
+
+#: config_form.php:93
 msgid "Use metric distances"
 msgstr "Usar distâncias métricas"
 
-#: config_form.php:87
+#: config_form.php:96
 msgid "Use metric distances in proximity search."
 msgstr "Usar distâncias métricas na pesquisa de proximidade."
 
-#: config_form.php:97
+#: config_form.php:106
 msgid "Item Map Settings"
 msgstr "Configurações do Item Mapa"
 
-#: config_form.php:100
+#: config_form.php:109
 msgid "Width for Item Map"
 msgstr "Largura para o mapa do item"
 
-#: config_form.php:103
+#: config_form.php:112
 msgid ""
 "The width of the map displayed on your items/show page. If left blank, the "
 "default width of 100% will be used."
 msgstr "A largura do mapa mostrado na sua página de items/visualização. Se deixado em branco a largura por omissão será 100%."
 
-#: config_form.php:110
+#: config_form.php:119
 msgid "Height for Item Map"
 msgstr "Altura para o mapa do item"
 
-#: config_form.php:113
+#: config_form.php:122
 msgid ""
 "The height of the map displayed on your items/show page. If left blank, the "
 "default height of 300px will be used."
 msgstr "A altura do mapa mostrado na sua página de items/visualização. Se deixado em branco a largura por omissão será 300px."
 
-#: config_form.php:120
+#: config_form.php:129
 msgid "Map Integration"
 msgstr "Integração do Mapa"
 
-#: config_form.php:123
+#: config_form.php:132
 msgid "Add Link to Map on Items/Browse Navigation"
 msgstr "Adicione uma ligação para o mapa no explorador de items/navegação"
 
-#: config_form.php:126
+#: config_form.php:135
 msgid "Add a link to the items map on all the items/browse pages."
 msgstr "Adicione uma ligação para o mapa de itens em todas as páginas de items/navegação."
 
-#: config_form.php:136
+#: config_form.php:145
 msgid "Add Map To Contribution Form"
 msgstr "Adicionar mapa ao formulário de contribuição"
 
-#: config_form.php:139
+#: config_form.php:148
 msgid ""
 "If the Contribution plugin is installed and activated, Geolocation  will add"
 " a geolocation map field to the contribution form to associate a location to"
@@ -233,7 +246,7 @@ msgstr "total"
 msgid "Find An Item on the Map"
 msgstr "Encontrar um item no mapa"
 
-#: views/helpers/ItemGoogleMap.php:50
+#: views/helpers/ItemGoogleMap.php:36
 msgid "This item has no location info associated with it."
 msgstr "O item não tem informação de localização associado."
 
diff --git a/languages/ro.mo b/languages/ro.mo
index db84b03..3042916 100644
Binary files a/languages/ro.mo and b/languages/ro.mo differ
diff --git a/languages/ro.po b/languages/ro.po
index b7c6da3..0330485 100644
--- a/languages/ro.po
+++ b/languages/ro.po
@@ -3,66 +3,70 @@
 # This file is distributed under the same license as the Omeka package.
 # 
 # Translators:
+# Doru  DEACONU <dumitrudeaconu@yahoo.com>, 2014
 # Nicolaie Constantinescu <kosson@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Omeka\n"
 "Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
 "POT-Creation-Date: 2012-01-09 21:49-0500\n"
-"PO-Revision-Date: 2014-05-22 21:24+0000\n"
-"Last-Translator: John Flatness <john@zerocrates.org>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/omeka/language/ro/)\n"
+"PO-Revision-Date: 2014-12-05 09:28+0000\n"
+"Last-Translator: Doru  DEACONU <dumitrudeaconu@yahoo.com>\n"
+"Language-Team: Romanian (http://www.transifex.com/omeka/omeka/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: GeolocationPlugin.php:298
-msgid "kilometers"
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
 msgstr ""
 
-#: GeolocationPlugin.php:300
+#: GeolocationPlugin.php:333
+msgid "kilometers"
+msgstr "kilometri"
+
+#: GeolocationPlugin.php:335
 msgid "miles"
-msgstr ""
+msgstr "mile"
 
-#: GeolocationPlugin.php:302
+#: GeolocationPlugin.php:337
 #, php-format
 msgid "within %1$s %2$s of \"%3$s\""
 msgstr ""
 
-#: GeolocationPlugin.php:322 GeolocationPlugin.php:328
-#: GeolocationPlugin.php:352
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
 msgid "Map"
 msgstr "Hartă"
 
-#: GeolocationPlugin.php:361
+#: GeolocationPlugin.php:396
 msgid "Browse Map"
 msgstr "Navighează pe hartă"
 
-#: GeolocationPlugin.php:409
+#: GeolocationPlugin.php:445
 msgid "Find A Geographic Location For The "
 msgstr "Caută o locație geografică pentru"
 
-#: GeolocationPlugin.php:420
+#: GeolocationPlugin.php:457
 msgid "Geolocation Map"
 msgstr ""
 
-#: GeolocationPlugin.php:421
+#: GeolocationPlugin.php:458
 msgid "Show attached items on a map"
 msgstr ""
 
-#: GeolocationPlugin.php:509
+#: GeolocationPlugin.php:546
 msgid "Find a Location by Address:"
 msgstr "Caută o locație după adresa:"
 
-#: GeolocationPlugin.php:547
+#: GeolocationPlugin.php:587
 msgid "Find"
 msgstr "Caută"
 
 #: config_form.php:3
 msgid "General Settings"
-msgstr ""
+msgstr "Setări generale"
 
 #: config_form.php:6
 msgid "Default Latitude"
@@ -96,7 +100,7 @@ msgstr "Un întreg mai mare decât sau egal cu 0. 0 reprezintă nivelul în afar
 
 #: config_form.php:36
 msgid "Map Type"
-msgstr ""
+msgstr "Tip hartă"
 
 #: config_form.php:39
 msgid "The type of map to display"
@@ -108,15 +112,15 @@ msgstr ""
 
 #: config_form.php:43
 msgid "Satellite"
-msgstr ""
+msgstr "Satelit"
 
 #: config_form.php:44
 msgid "Hybrid"
-msgstr ""
+msgstr "Hybrid"
 
 #: config_form.php:45
 msgid "Terrain"
-msgstr ""
+msgstr "Teren"
 
 #: config_form.php:54
 msgid "Browse Map Settings"
@@ -142,54 +146,64 @@ msgid ""
 msgstr ""
 
 #: config_form.php:84
+msgid "Default Radius"
+msgstr ""
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr ""
+
+#: config_form.php:93
 msgid "Use metric distances"
 msgstr "Folosește sistemul metric"
 
-#: config_form.php:87
+#: config_form.php:96
 msgid "Use metric distances in proximity search."
 msgstr "Folosește distanțele în metri pentru căutările într-un anumit perimetru."
 
-#: config_form.php:97
+#: config_form.php:106
 msgid "Item Map Settings"
 msgstr ""
 
-#: config_form.php:100
+#: config_form.php:109
 msgid "Width for Item Map"
 msgstr "Lățimea hărții"
 
-#: config_form.php:103
+#: config_form.php:112
 msgid ""
 "The width of the map displayed on your items/show page. If left blank, the "
 "default width of 100% will be used."
 msgstr "Lățimea hărții afișate pe pagina resurselor/panotare. Dacă nu este completat, va fi utilizată o lățime de 100%."
 
-#: config_form.php:110
+#: config_form.php:119
 msgid "Height for Item Map"
 msgstr "Înălțimea pentru Harta Resursei"
 
-#: config_form.php:113
+#: config_form.php:122
 msgid ""
 "The height of the map displayed on your items/show page. If left blank, the "
 "default height of 300px will be used."
 msgstr "Înălțimea hărții afișate pe pagina resurselor/panotare. Dacă nu este completat, va fi utilizată o înălțime de 300px."
 
-#: config_form.php:120
+#: config_form.php:129
 msgid "Map Integration"
 msgstr ""
 
-#: config_form.php:123
+#: config_form.php:132
 msgid "Add Link to Map on Items/Browse Navigation"
 msgstr "Adaugă un link la hartă din Navigarea pe Resurse"
 
-#: config_form.php:126
+#: config_form.php:135
 msgid "Add a link to the items map on all the items/browse pages."
 msgstr ""
 
-#: config_form.php:136
+#: config_form.php:145
 msgid "Add Map To Contribution Form"
 msgstr ""
 
-#: config_form.php:139
+#: config_form.php:148
 msgid ""
 "If the Contribution plugin is installed and activated, Geolocation  will add"
 " a geolocation map field to the contribution form to associate a location to"
@@ -226,13 +240,13 @@ msgstr ""
 
 #: views/admin/map/browse.php:4
 msgid "total"
-msgstr ""
+msgstr "total"
 
 #: views/admin/map/browse.php:13 views/public/map/browse.php:21
 msgid "Find An Item on the Map"
 msgstr ""
 
-#: views/helpers/ItemGoogleMap.php:50
+#: views/helpers/ItemGoogleMap.php:36
 msgid "This item has no location info associated with it."
 msgstr ""
 
@@ -246,4 +260,4 @@ msgstr ""
 
 #: views/shared/map/advanced-search-partial.php:25
 msgid "Geographic Address"
-msgstr ""
+msgstr "Adresă Geografică"
diff --git a/languages/ru.mo b/languages/ru.mo
index 6a02b2e..4e3d754 100644
Binary files a/languages/ru.mo and b/languages/ru.mo differ
diff --git a/languages/ru.po b/languages/ru.po
index f728dd2..603fa87 100644
--- a/languages/ru.po
+++ b/languages/ru.po
@@ -9,54 +9,57 @@ msgstr ""
 "Project-Id-Version: Omeka\n"
 "Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
 "POT-Creation-Date: 2012-01-09 21:49-0500\n"
-"PO-Revision-Date: 2014-05-22 21:24+0000\n"
+"PO-Revision-Date: 2014-12-01 19:16+0000\n"
 "Last-Translator: John Flatness <john@zerocrates.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/omeka/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/omeka/omeka/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: GeolocationPlugin.php:298
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr ""
+
+#: GeolocationPlugin.php:333
 msgid "kilometers"
 msgstr ""
 
-#: GeolocationPlugin.php:300
+#: GeolocationPlugin.php:335
 msgid "miles"
 msgstr ""
 
-#: GeolocationPlugin.php:302
+#: GeolocationPlugin.php:337
 #, php-format
 msgid "within %1$s %2$s of \"%3$s\""
 msgstr ""
 
-#: GeolocationPlugin.php:322 GeolocationPlugin.php:328
-#: GeolocationPlugin.php:352
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
 msgid "Map"
 msgstr "Карта"
 
-#: GeolocationPlugin.php:361
+#: GeolocationPlugin.php:396
 msgid "Browse Map"
 msgstr "Просмотр карты"
 
-#: GeolocationPlugin.php:409
+#: GeolocationPlugin.php:445
 msgid "Find A Geographic Location For The "
 msgstr "Найдите географическое положение для"
 
-#: GeolocationPlugin.php:420
+#: GeolocationPlugin.php:457
 msgid "Geolocation Map"
 msgstr ""
 
-#: GeolocationPlugin.php:421
+#: GeolocationPlugin.php:458
 msgid "Show attached items on a map"
 msgstr ""
 
-#: GeolocationPlugin.php:509
+#: GeolocationPlugin.php:546
 msgid "Find a Location by Address:"
 msgstr "Найдите расположение по адресу:"
 
-#: GeolocationPlugin.php:547
+#: GeolocationPlugin.php:587
 msgid "Find"
 msgstr "Найти"
 
@@ -142,54 +145,64 @@ msgid ""
 msgstr ""
 
 #: config_form.php:84
+msgid "Default Radius"
+msgstr ""
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr ""
+
+#: config_form.php:93
 msgid "Use metric distances"
 msgstr "Используйте метрическую систему мер"
 
-#: config_form.php:87
+#: config_form.php:96
 msgid "Use metric distances in proximity search."
 msgstr "Используйте метрическую систему мер при доступном поиске."
 
-#: config_form.php:97
+#: config_form.php:106
 msgid "Item Map Settings"
 msgstr ""
 
-#: config_form.php:100
+#: config_form.php:109
 msgid "Width for Item Map"
 msgstr "Ширина географической карты"
 
-#: config_form.php:103
+#: config_form.php:112
 msgid ""
 "The width of the map displayed on your items/show page. If left blank, the "
 "default width of 100% will be used."
 msgstr "Ширина географической карты отображённой на странице документа. Если страница останется незаполненной, то по умолчанию ширина будет равна 100%."
 
-#: config_form.php:110
+#: config_form.php:119
 msgid "Height for Item Map"
 msgstr "Высота географической карты"
 
-#: config_form.php:113
+#: config_form.php:122
 msgid ""
 "The height of the map displayed on your items/show page. If left blank, the "
 "default height of 300px will be used."
 msgstr "Высота географической карты отображённой на странице документа. Если страница останется незаполненной, то по умолчанию высота будет равна 300 пикселей."
 
-#: config_form.php:120
+#: config_form.php:129
 msgid "Map Integration"
 msgstr ""
 
-#: config_form.php:123
+#: config_form.php:132
 msgid "Add Link to Map on Items/Browse Navigation"
 msgstr "Добавьте на карту ссылку на странице просмотра"
 
-#: config_form.php:126
+#: config_form.php:135
 msgid "Add a link to the items map on all the items/browse pages."
 msgstr "Добавьте на карту ссылку на всех страницах просмотра."
 
-#: config_form.php:136
+#: config_form.php:145
 msgid "Add Map To Contribution Form"
 msgstr "Добавьте карту на форме Contribution"
 
-#: config_form.php:139
+#: config_form.php:148
 msgid ""
 "If the Contribution plugin is installed and activated, Geolocation  will add"
 " a geolocation map field to the contribution form to associate a location to"
@@ -232,7 +245,7 @@ msgstr "общий итог"
 msgid "Find An Item on the Map"
 msgstr "Найдите элемент на карте"
 
-#: views/helpers/ItemGoogleMap.php:50
+#: views/helpers/ItemGoogleMap.php:36
 msgid "This item has no location info associated with it."
 msgstr "У этого элемента нет информации по месторасположению."
 
diff --git a/languages/sr_RS.mo b/languages/sr_RS.mo
index 3b75dec..c002ea3 100644
Binary files a/languages/sr_RS.mo and b/languages/sr_RS.mo differ
diff --git a/languages/sr_RS.po b/languages/sr_RS.po
index 1a8312c..b940af3 100644
--- a/languages/sr_RS.po
+++ b/languages/sr_RS.po
@@ -3,60 +3,64 @@
 # This file is distributed under the same license as the Omeka package.
 # 
 # Translators:
-# Predrag Djukic <predragd@bgb.rs>, 2014
+# Predrag Djukic <djukic.predrag@gmail.com>, 2015
+# Predrag Djukic <djukic.predrag@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Omeka\n"
 "Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
 "POT-Creation-Date: 2012-01-09 21:49-0500\n"
-"PO-Revision-Date: 2014-06-18 07:38+0000\n"
-"Last-Translator: Predrag Djukic <predragd@bgb.rs>\n"
-"Language-Team: Serbian (Serbia) (http://www.transifex.com/projects/p/omeka/language/sr_RS/)\n"
+"PO-Revision-Date: 2015-04-22 13:47+0000\n"
+"Last-Translator: Predrag Djukic <djukic.predrag@gmail.com>\n"
+"Language-Team: Serbian (Serbia) (http://www.transifex.com/omeka/omeka/language/sr_RS/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr_RS\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: GeolocationPlugin.php:298
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr "Географска локација"
+
+#: GeolocationPlugin.php:333
 msgid "kilometers"
 msgstr "километри"
 
-#: GeolocationPlugin.php:300
+#: GeolocationPlugin.php:335
 msgid "miles"
 msgstr "миље"
 
-#: GeolocationPlugin.php:302
+#: GeolocationPlugin.php:337
 #, php-format
 msgid "within %1$s %2$s of \"%3$s\""
 msgstr "у оквиру %1$s %2$s од \"%3$s\""
 
-#: GeolocationPlugin.php:322 GeolocationPlugin.php:328
-#: GeolocationPlugin.php:352
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
 msgid "Map"
 msgstr "Мапа"
 
-#: GeolocationPlugin.php:361
+#: GeolocationPlugin.php:396
 msgid "Browse Map"
 msgstr "Прегледај мапу"
 
-#: GeolocationPlugin.php:409
+#: GeolocationPlugin.php:445
 msgid "Find A Geographic Location For The "
 msgstr "Пронађи географску локацију за"
 
-#: GeolocationPlugin.php:420
+#: GeolocationPlugin.php:457
 msgid "Geolocation Map"
 msgstr "Мапа геолокације"
 
-#: GeolocationPlugin.php:421
+#: GeolocationPlugin.php:458
 msgid "Show attached items on a map"
 msgstr "Прикажи додате јединице на мапи"
 
-#: GeolocationPlugin.php:509
+#: GeolocationPlugin.php:546
 msgid "Find a Location by Address:"
 msgstr "Пронађи локацију по адреси:"
 
-#: GeolocationPlugin.php:547
+#: GeolocationPlugin.php:587
 msgid "Find"
 msgstr "Пронађи"
 
@@ -142,54 +146,64 @@ msgid ""
 msgstr "Уколико је опција укључена, почетно подешавање локације и зумирања ће бити занемарено на мапи за преглед. Уместо тога, мапа ће се аутоматски прилагодити за приказ локација приказаних на свакој страници."
 
 #: config_form.php:84
+msgid "Default Radius"
+msgstr "Подразумевани полупречник"
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr "Величина подразумеваног полупречника која се употребљава на страници напредног претраживања јединица. Погледајте испод да ли су мере дате у миљама или километрима."
+
+#: config_form.php:93
 msgid "Use metric distances"
 msgstr "Користите метрички систем за раздаљину"
 
-#: config_form.php:87
+#: config_form.php:96
 msgid "Use metric distances in proximity search."
 msgstr "Користите метрички систем за претрагу удаљености"
 
-#: config_form.php:97
+#: config_form.php:106
 msgid "Item Map Settings"
 msgstr "Подешавање једице Мапа"
 
-#: config_form.php:100
+#: config_form.php:109
 msgid "Width for Item Map"
 msgstr "Ширина за јединицу Мапа"
 
-#: config_form.php:103
+#: config_form.php:112
 msgid ""
 "The width of the map displayed on your items/show page. If left blank, the "
 "default width of 100% will be used."
 msgstr "Ширина мапе на вашој страници за приказ јединица. Ако је вредност изостављена, користиће се основна поставка од 100%."
 
-#: config_form.php:110
+#: config_form.php:119
 msgid "Height for Item Map"
 msgstr " Висина за једниницу Мапа"
 
-#: config_form.php:113
+#: config_form.php:122
 msgid ""
 "The height of the map displayed on your items/show page. If left blank, the "
 "default height of 300px will be used."
 msgstr "Висина мапе на вашој страници за приказ јединица. Ако је вредност изостављена, користиће се основна поставка од 300px."
 
-#: config_form.php:120
+#: config_form.php:129
 msgid "Map Integration"
 msgstr "Интеграција мапе"
 
-#: config_form.php:123
+#: config_form.php:132
 msgid "Add Link to Map on Items/Browse Navigation"
 msgstr "Додај линк за Мапе на Јединице/Преглед навигацији"
 
-#: config_form.php:126
+#: config_form.php:135
 msgid "Add a link to the items map on all the items/browse pages."
 msgstr "Додај линк ка јединци мапа на свим страницама са јединицама/прегледом."
 
-#: config_form.php:136
+#: config_form.php:145
 msgid "Add Map To Contribution Form"
 msgstr "Додај мапу формулару за допринос"
 
-#: config_form.php:139
+#: config_form.php:148
 msgid ""
 "If the Contribution plugin is installed and activated, Geolocation  will add"
 " a geolocation map field to the contribution form to associate a location to"
@@ -232,7 +246,7 @@ msgstr "укупно"
 msgid "Find An Item on the Map"
 msgstr "Пронађите јединицу на мапи"
 
-#: views/helpers/ItemGoogleMap.php:50
+#: views/helpers/ItemGoogleMap.php:36
 msgid "This item has no location info associated with it."
 msgstr "Јединица нема придружене податке о локацији."
 
diff --git a/languages/th.mo b/languages/th.mo
new file mode 100644
index 0000000..1f2c327
Binary files /dev/null and b/languages/th.mo differ
diff --git a/languages/th.po b/languages/th.po
new file mode 100644
index 0000000..76caf43
--- /dev/null
+++ b/languages/th.po
@@ -0,0 +1,262 @@
+# Translation for the Geolocation plugin for Omeka.
+# Copyright (C) 2011 Roy Rosenzweig Center for History and New Media
+# This file is distributed under the same license as the Omeka package.
+# 
+# Translators:
+# iteau <songphan@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Omeka\n"
+"Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
+"POT-Creation-Date: 2012-01-09 21:49-0500\n"
+"PO-Revision-Date: 2014-12-01 19:16+0000\n"
+"Last-Translator: John Flatness <john@zerocrates.org>\n"
+"Language-Team: Thai (http://www.transifex.com/omeka/omeka/language/th/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr ""
+
+#: GeolocationPlugin.php:333
+msgid "kilometers"
+msgstr "กิโลเมตร"
+
+#: GeolocationPlugin.php:335
+msgid "miles"
+msgstr "ไมล์"
+
+#: GeolocationPlugin.php:337
+#, php-format
+msgid "within %1$s %2$s of \"%3$s\""
+msgstr "ภายใน %1$s %2$s จาก \"%3$s\""
+
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
+msgid "Map"
+msgstr "แผนที่"
+
+#: GeolocationPlugin.php:396
+msgid "Browse Map"
+msgstr "เลือกดูตามแผนที่"
+
+#: GeolocationPlugin.php:445
+msgid "Find A Geographic Location For The "
+msgstr "ค้นหาสถานที่สำหรับ"
+
+#: GeolocationPlugin.php:457
+msgid "Geolocation Map"
+msgstr "แผนที่ทางภูมิศาสตร์"
+
+#: GeolocationPlugin.php:458
+msgid "Show attached items on a map"
+msgstr "แสดงรายการแนบบนแผนที่"
+
+#: GeolocationPlugin.php:546
+msgid "Find a Location by Address:"
+msgstr "ค้นหาสถานที่จากที่อยู่"
+
+#: GeolocationPlugin.php:587
+msgid "Find"
+msgstr "ค้นหา"
+
+#: config_form.php:3
+msgid "General Settings"
+msgstr "การตั้งค่าทั่วไป"
+
+#: config_form.php:6
+msgid "Default Latitude"
+msgstr "ละติจูดตั้งต้น"
+
+#: config_form.php:9
+msgid ""
+"Latitude of the map's initial center point, in degrees. Must be between -90 "
+"and 90."
+msgstr "ละติจูดของจุดศูนย์กลางตั้งต้นบนแผนที่ จะต้องอยู่ระหว่าง -90 และ 90 องศา"
+
+#: config_form.php:16
+msgid "Default Longitude"
+msgstr "ลองติจูดตั้งต้น"
+
+#: config_form.php:19
+msgid ""
+"Longitude of the map's initial center point, in degrees. Must be between "
+"-180 and 180."
+msgstr "ลองติจูดของจุดศูนย์กลางตั้งต้นบนแผนที่ จะต้องอยู่ระหว่าง -180 และ 80 องศา"
+
+#: config_form.php:26
+msgid "Default Zoom Level"
+msgstr "ระดับการซูมตั้งต้น"
+
+#: config_form.php:29
+msgid ""
+"An integer greater than or equal to 0, where 0 represents the most zoomed "
+"out scale."
+msgstr "ตัวเลขจะสร้างมากกว่าหรือเท่ากับ 0 ซึ่ง 0 หมายถึง ซูมกว้างที่สุด"
+
+#: config_form.php:36
+msgid "Map Type"
+msgstr "ประเภทของแผนที่"
+
+#: config_form.php:39
+msgid "The type of map to display"
+msgstr "ประเภทของแผนที่ที่จะนำแสดง"
+
+#: config_form.php:42
+msgid "Roadmap"
+msgstr "แผนที่ถนน"
+
+#: config_form.php:43
+msgid "Satellite"
+msgstr "แผนที่ดาวเทียม"
+
+#: config_form.php:44
+msgid "Hybrid"
+msgstr "แผนที่ผสม"
+
+#: config_form.php:45
+msgid "Terrain"
+msgstr "แผนที่ภูมิประเทศ"
+
+#: config_form.php:54
+msgid "Browse Map Settings"
+msgstr "ตั้งค่าการเลือกดูแผนที่"
+
+#: config_form.php:57
+msgid "Number of Locations Per Page"
+msgstr "จำนวนสถานที่ต่อหน้า"
+
+#: config_form.php:60
+msgid "The number of locations displayed per page when browsing the map."
+msgstr "จำนวนสถานที่แสดงต่อหนึ่งหน้าเมื่อเลือกดูบนแผนที่"
+
+#: config_form.php:66
+msgid "Auto-fit to Locations"
+msgstr "ปรับอัตโนมัติตามสถานที่"
+
+#: config_form.php:70
+msgid ""
+"If checked, the default location and zoom settings will be ignored on the "
+"browse map. Instead, the map will automatically pan and zoom to fit the "
+"locations displayed on each page."
+msgstr "ถ้าเลือก ค่าตั้งต้นของสถานที่และระดับการซูมจะไม่นำมาใช้บนหน้าจอการเลือกดูบนแผนที่ แต่จะปรับการแสดงผลให้เข้ากับสถานที่ที่แสดงในแต่ละหน้า"
+
+#: config_form.php:84
+msgid "Default Radius"
+msgstr ""
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr ""
+
+#: config_form.php:93
+msgid "Use metric distances"
+msgstr "ใช้การวัดระยะแบบเมตริกส์"
+
+#: config_form.php:96
+msgid "Use metric distances in proximity search."
+msgstr "ใช้การวัดระบบแบบเมตริกส์ในการค้นระยะทาง"
+
+#: config_form.php:106
+msgid "Item Map Settings"
+msgstr "ตั้งค่าแผนที่บนหน้ารายการ"
+
+#: config_form.php:109
+msgid "Width for Item Map"
+msgstr "ความกว้างของแผนที่ในหน้ารายการ"
+
+#: config_form.php:112
+msgid ""
+"The width of the map displayed on your items/show page. If left blank, the "
+"default width of 100% will be used."
+msgstr "ความกว้างของแผนที่แสดงในหน้าแสดงข้อมูลรายการ หากไม่ระบุ ความกว้างตั้งต้นจะอยู่ที่ 100%"
+
+#: config_form.php:119
+msgid "Height for Item Map"
+msgstr "ความสูงของแผนที่ในหน้ารายการ"
+
+#: config_form.php:122
+msgid ""
+"The height of the map displayed on your items/show page. If left blank, the "
+"default height of 300px will be used."
+msgstr "ความสูงของแผนที่แสดงในหน้าแสดงข้อมูลรายการ หากไม่ระบุ ความสูงตั้งต้นจะอยู่ที่ 100%"
+
+#: config_form.php:129
+msgid "Map Integration"
+msgstr "การเชื่อมต่อกับแผนที่"
+
+#: config_form.php:132
+msgid "Add Link to Map on Items/Browse Navigation"
+msgstr "เพิ่มลิงก์แผนที่บนแถบนำทางเลือกดูรายการ"
+
+#: config_form.php:135
+msgid "Add a link to the items map on all the items/browse pages."
+msgstr "เพิ่มลิงค์ไปยังแผนที่ของรายการในทุกหน้าเลือกดูข้อมูลรายการ"
+
+#: config_form.php:145
+msgid "Add Map To Contribution Form"
+msgstr "เพิ่มแผนที่ในแบบฟอร์มส่งข้อมูล"
+
+#: config_form.php:148
+msgid ""
+"If the Contribution plugin is installed and activated, Geolocation  will add"
+" a geolocation map field to the contribution form to associate a location to"
+" a contributed item."
+msgstr "หากมีการใช้งานปลั๊กอิน Contribution ปลั๊กอิน Geolocation จะเพิ่มแผนที่ทางภูมิศาสตร์ในหน้าแบบฟอร์มนำส่งข้อมูล เพื่อเชื่อมโยงข้อมูลสถานที่กับรายการที่นำส่ง"
+
+#: models/Location.php:22
+msgid "Location requires an item ID."
+msgstr "กรุณาระบุรหัสประจำรายการ"
+
+#: models/Location.php:26
+msgid "Location requires a valid item ID."
+msgstr "กรุณาระบุรหัสประจำรายการที่ใช้งานได้"
+
+#: models/Location.php:31
+msgid "A location already exists for the provided item."
+msgstr "รายการนี้มีข้อมูลสถานที่แล้ว"
+
+#: models/Location.php:34
+msgid "Location requires a latitude."
+msgstr "กรุณาระบุละติจูด"
+
+#: models/Location.php:37
+msgid "Location requires a longitude."
+msgstr "กรุณาระบุลองติจูด"
+
+#: models/Location.php:40
+msgid "Location requires a zoom level."
+msgstr "กรุณาระบุระดับการซูม"
+
+#: views/admin/map/browse.php:4 views/public/map/browse.php:4
+msgid "Browse Items on the Map"
+msgstr "เลือกดูรายการบนแผนที่"
+
+#: views/admin/map/browse.php:4
+msgid "total"
+msgstr "รวม"
+
+#: views/admin/map/browse.php:13 views/public/map/browse.php:21
+msgid "Find An Item on the Map"
+msgstr "ค้นหารายการจากแผนที่"
+
+#: views/helpers/ItemGoogleMap.php:36
+msgid "This item has no location info associated with it."
+msgstr "รายการนี้ไม่มีข้อมูลสถานที่"
+
+#: views/shared/map/advanced-search-partial.php:16
+msgid "Geographic Radius (kilometers)"
+msgstr "รัศมีทางภูมิศาสตร์ (กิโลเมตร)"
+
+#: views/shared/map/advanced-search-partial.php:18
+msgid "Geographic Radius (miles)"
+msgstr "รัศมีทางภูมิศาสตร์ (ไมล์)"
+
+#: views/shared/map/advanced-search-partial.php:25
+msgid "Geographic Address"
+msgstr "ที่อยู่ทางภูมิศาสตร์"
diff --git a/languages/zh_TW.mo b/languages/zh_TW.mo
index 06d7a95..faaf611 100644
Binary files a/languages/zh_TW.mo and b/languages/zh_TW.mo differ
diff --git a/languages/zh_TW.po b/languages/zh_TW.po
index cc69b22..58a75eb 100644
--- a/languages/zh_TW.po
+++ b/languages/zh_TW.po
@@ -9,54 +9,57 @@ msgstr ""
 "Project-Id-Version: Omeka\n"
 "Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n"
 "POT-Creation-Date: 2012-01-09 21:49-0500\n"
-"PO-Revision-Date: 2014-05-22 21:24+0000\n"
+"PO-Revision-Date: 2014-12-01 19:16+0000\n"
 "Last-Translator: John Flatness <john@zerocrates.org>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/omeka/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/omeka/omeka/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: GeolocationPlugin.php:298
+#: GeolocationPlugin.php:216
+msgid "Geolocation"
+msgstr ""
+
+#: GeolocationPlugin.php:333
 msgid "kilometers"
 msgstr ""
 
-#: GeolocationPlugin.php:300
+#: GeolocationPlugin.php:335
 msgid "miles"
 msgstr ""
 
-#: GeolocationPlugin.php:302
+#: GeolocationPlugin.php:337
 #, php-format
 msgid "within %1$s %2$s of \"%3$s\""
 msgstr ""
 
-#: GeolocationPlugin.php:322 GeolocationPlugin.php:328
-#: GeolocationPlugin.php:352
+#: GeolocationPlugin.php:357 GeolocationPlugin.php:363
 msgid "Map"
 msgstr "地圖"
 
-#: GeolocationPlugin.php:361
+#: GeolocationPlugin.php:396
 msgid "Browse Map"
 msgstr "瀏覽地圖"
 
-#: GeolocationPlugin.php:409
+#: GeolocationPlugin.php:445
 msgid "Find A Geographic Location For The "
 msgstr "尋找這個的地理位置"
 
-#: GeolocationPlugin.php:420
+#: GeolocationPlugin.php:457
 msgid "Geolocation Map"
 msgstr ""
 
-#: GeolocationPlugin.php:421
+#: GeolocationPlugin.php:458
 msgid "Show attached items on a map"
 msgstr ""
 
-#: GeolocationPlugin.php:509
+#: GeolocationPlugin.php:546
 msgid "Find a Location by Address:"
 msgstr "透過地址尋找位置："
 
-#: GeolocationPlugin.php:547
+#: GeolocationPlugin.php:587
 msgid "Find"
 msgstr "尋找"
 
@@ -142,54 +145,64 @@ msgid ""
 msgstr ""
 
 #: config_form.php:84
+msgid "Default Radius"
+msgstr ""
+
+#: config_form.php:87
+msgid ""
+"The size of the default radius to use on the items advanced search page. See"
+" below for whether to measure in miles or kilometers."
+msgstr ""
+
+#: config_form.php:93
 msgid "Use metric distances"
 msgstr "使用公制"
 
-#: config_form.php:87
+#: config_form.php:96
 msgid "Use metric distances in proximity search."
 msgstr "在相鄰搜尋時使用公制。"
 
-#: config_form.php:97
+#: config_form.php:106
 msgid "Item Map Settings"
 msgstr ""
 
-#: config_form.php:100
+#: config_form.php:109
 msgid "Width for Item Map"
 msgstr "單件地圖的寬度"
 
-#: config_form.php:103
+#: config_form.php:112
 msgid ""
 "The width of the map displayed on your items/show page. If left blank, the "
 "default width of 100% will be used."
 msgstr "顯示在單件詳目頁面的地圖之寬度。如果保留空白，會使用預設的寬度 100%。"
 
-#: config_form.php:110
+#: config_form.php:119
 msgid "Height for Item Map"
 msgstr "單件地圖的高度"
 
-#: config_form.php:113
+#: config_form.php:122
 msgid ""
 "The height of the map displayed on your items/show page. If left blank, the "
 "default height of 300px will be used."
 msgstr "顯示在單件詳目頁面的地圖之高度。如果保留空白，會使用預設的高度300px。"
 
-#: config_form.php:120
+#: config_form.php:129
 msgid "Map Integration"
 msgstr ""
 
-#: config_form.php:123
+#: config_form.php:132
 msgid "Add Link to Map on Items/Browse Navigation"
 msgstr "在單件瀏覽導覽增加到地圖的連結"
 
-#: config_form.php:126
+#: config_form.php:135
 msgid "Add a link to the items map on all the items/browse pages."
 msgstr "在所有的單件瀏覽導覽增加到地圖的連結"
 
-#: config_form.php:136
+#: config_form.php:145
 msgid "Add Map To Contribution Form"
 msgstr "增加地圖到貢獻者表單"
 
-#: config_form.php:139
+#: config_form.php:148
 msgid ""
 "If the Contribution plugin is installed and activated, Geolocation  will add"
 " a geolocation map field to the contribution form to associate a location to"
@@ -232,7 +245,7 @@ msgstr "總數"
 msgid "Find An Item on the Map"
 msgstr "在地圖上尋找一個單件"
 
-#: views/helpers/ItemGoogleMap.php:50
+#: views/helpers/ItemGoogleMap.php:36
 msgid "This item has no location info associated with it."
 msgstr "這個單件沒有相關聯的位置資訊。"
 
diff --git a/models/Api/Location.php b/models/Api/Location.php
index 19ef3c8..59ea2a6 100644
--- a/models/Api/Location.php
+++ b/models/Api/Location.php
@@ -20,13 +20,14 @@ class Api_Location extends Omeka_Record_Api_AbstractRecordAdapter
     public function getRepresentation(Omeka_Record_AbstractRecord $record)
     {
         $representation = array(
-            'id' => $record->id, 
-            'url' => $this->getResourceUrl("/geolocations/{$record->id}"), 
-            'latitude' => $record->latitude, 
-            'longitude' => $record->longitude, 
-            'zoom_level' => $record->zoom_level, 
-            'map_type' => $record->map_type, 
-            'address' => $record->address, 
+            'id' => $record->id,
+            'url' => $this->getResourceUrl("/geolocations/{$record->id}"),
+            'latitude' => $record->latitude,
+            'longitude' => $record->longitude,
+            'zoom_level' => $record->zoom_level,
+            'map_type' => $record->map_type,
+            'address' => $record->address,
+            'description' => $record->description,
             'item' => array(
                 'id' => $record->item_id, 
                 'url' => $this->getResourceUrl("/items/{$record->item_id}"), 
@@ -66,6 +67,11 @@ public function setPostData(Omeka_Record_AbstractRecord $record, $data)
         } else {
             $record->address = '';
         }
+        if (isset($data->description)) {
+            $record->description = $data->description;
+        } else {
+            $record->description = '';
+        }
     }
     
     /**
@@ -95,5 +101,10 @@ public function setPutData(Omeka_Record_AbstractRecord $record, $data)
         } else {
             $record->address = '';
         }
+        if (isset($data->description)) {
+            $record->description = $data->description;
+        } else {
+            $record->description = '';
+        }
     }
 }
diff --git a/models/Location.php b/models/Location.php
index 946f9b5..b317478 100644
--- a/models/Location.php
+++ b/models/Location.php
@@ -12,7 +12,24 @@ class Location extends Omeka_Record_AbstractRecord implements Zend_Acl_Resource_
     public $zoom_level;
     public $map_type;
     public $address;
-    
+    public $description;
+
+    /**
+     * Executes before the record is saved.
+     */
+    protected function beforeSave($args)
+    {
+        if (is_null($this->map_type)) {
+            $this->map_type = '';
+        }
+        if (is_null($this->address)) {
+            $this->address = '';
+        }
+        if (is_null($this->description)) {
+            $this->description = '';
+        }
+    }
+
     /**
      * Validate this location before saving.
      */
@@ -25,11 +42,6 @@ protected function _validate()
         if (!$this->getTable('Item')->exists($this->item_id)) {
             $this->addError('item_id', __('Location requires a valid item ID.'));
         }
-        // An item can only have one location. This assumes that updating an 
-        // existing location will never modify the item ID.
-        if (!$this->exists() && $this->getTable()->findBy(array('item_id' => $this->item_id))) {
-            $this->addError('latitude', __('A location already exists for the provided item.'));
-        }
         if (empty($this->latitude)) {
             $this->addError('latitude', __('Location requires a latitude.'));
         }
@@ -39,11 +51,14 @@ protected function _validate()
         if (empty($this->zoom_level)) {
             $this->addError('zoom_level', __('Location requires a zoom level.'));
         }
+        if (!empty($this->map_type) && !in_array($this->map_type, array('roadmap', 'satellite', 'hybrid', 'terrain'))) {
+            $this->addError('map_type', __('Map type should be "roadmap", "satellite", "hybrid" or "terrain".'));
+        }
     }
-    
+
     /**
      * Identify Location records as relating to the Locations ACL resource.
-     * 
+     *
      * @return string
      */
     public function getResourceId()
diff --git a/models/Table/Location.php b/models/Table/Location.php
index 8f3fdb8..4984791 100644
--- a/models/Table/Location.php
+++ b/models/Table/Location.php
@@ -2,62 +2,111 @@
 class Table_Location extends Omeka_Db_Table
 {
     /**
-     * Returns a location (or array of locations) for an item (or array of items)
-     * @param array|Item|int $item An item or item id, or an array of items or item ids
-     * @param boolean $findOnlyOne Whether or not to return only one location if it exists for the item
-     * @return array|Location A location or an array of locations
-     **/
-    public function findLocationByItem($item, $findOnlyOne = false)
+     * Count locations for an item.
+     *
+     * @param array|Item|integer $item An item or item id, or an array of items
+     * or item ids.
+     * @return integer The total of location for the item or list of items.
+     */
+    public function countLocationsForItem($item)
     {
-        $db = get_db();
-        
+        return $this->count(array('item' => $item));
+    }
+
+    /**
+     * Returns a location or an array of locations for an item or an array of
+     * items.
+     *
+     * @param array|Item|integer $item An item or item id, or an array of items
+     * or item ids.
+     * @param boolean $findOnlyFirst Whether or not to return only the first
+     * location of each item, if it exists.
+     * @param boolean $flat Whether or not to return the list of locations as a
+     * simple unordered list. If the param $item is not an array, the list is
+     * always flat.
+     * @return array|Location A location, or a list of locations if a flat
+     * response is requested, or an associative array of locations, with the
+     * item id as key. If the parameter "find only first" is true, the value
+     * will be a single location, else the list of locations associated to the
+     * item.
+     */
+    public function findLocationsByItem($item, $findOnlyFirst = false, $flat = false)
+    {
+        $db = $this->_db;
+
+        // Quick checks.
         if (($item instanceof Item) && !$item->exists()) {
             return array();
-        } else if (is_array($item) && !count($item)) {
-            return array();
         }
-        $alias = $this->getTableAlias();
-        // Create a SELECT statement for the Location table
-        $select = $db->select()->from(array($alias => $db->Location), "$alias.*");
-        
-        // Create a WHERE condition that will pull down all the location info
-        if (is_array($item)) {
-            $itemIds = array();
-            foreach ($item as $it) {
-                $itemIds[] = (int)(($it instanceof Item) ? $it->id : $it);
-            }
-            $select->where("$alias.item_id IN (?)", $itemIds);
-        } else {
-            $itemId = (int)(($item instanceof Item) ? $item->id : $item);
-            $select->where("$alias.item_id = ?", $itemId);
+        // Empty.
+        elseif (empty($item)) {
+            return array();
         }
 
+        $params = array('item' => $item);
+        $select = $this->getSelectForFindBy($params);
+
         // If only a single location is request, return the first one found.
-        if ($findOnlyOne) {
+        if (!is_array($item) && $findOnlyFirst) {
             $location = $this->fetchObject($select);
             return $location;
         }
 
+        if ($findOnlyFirst) {
+            $alias = $this->getTableAlias();
+            // With MySql, group by item allows to keep the first of the group.
+            $select->group("$alias.item_id");
+            // Sort by id in order to return always the first location.
+            $select->order("$alias.id");
+        }
+
         // Get the locations.
         $locations = $this->fetchObjects($select);
 
-        // Return an associative array of locations where the key is the item_id of the location
-        // Note: Since each item can only have one location, this makes sense to associate a single location with a single item_id.
-        // However, if in the future, an item can have multiple locations, then we cannot just associate a single location with a single item_id;
-        // Instead, in the future, we would have to associate an array of locations with a single item_id.         
+        if (!is_array($item) || $flat) {
+            return $locations;
+        }
+
+        // Return an associative array of locations where the key is the item_id
+        // of the location.
         $indexedLocations = array();
-        foreach ($locations as $k => $loc) {
-            $indexedLocations[$loc['item_id']] = $loc;
+        if ($findOnlyFirst) {
+            foreach ($locations as $loc) {
+                $indexedLocations[$loc['item_id']] = $loc;
+            }
+        }
+        // Return an associative array of locations with each item id.
+        else {
+            foreach ($locations as $loc) {
+                $indexedLocations[$loc['item_id']][] = $loc;
+            }
         }
+
         return $indexedLocations;
     }
 
+    /**
+     * Returns one location or an array of the first locations for an item or an
+     * array of items.
+     *
+     * @param array|Item|integer $item An item or item id, or an array of items
+     * or item ids.
+     * @param boolean $findOnlyFirst Whether or not to return only one location
+     * if it exists for the item.
+     * @return array|Location A location or an associative array of locations,
+     * with the item id as key.
+     */
+    public function findLocationByItem($item, $findOnlyFirst = false)
+    {
+        return $this->findLocationsByItem($item, $findOnlyFirst);
+    }
+
     /**
      * Add permission check to location queries.
-     * 
-     * Since all locations belong to an item we can override this method to join 
+     *
+     * Since all locations belong to an item we can override this method to join
      * the items table and add a permission check to the select object.
-     * 
+     *
      * @return Omeka_Db_Select
      */
     public function getSelect()
@@ -68,4 +117,64 @@ public function getSelect()
         $permissions->apply($select, 'items');
         return $select;
     }
+
+    /**
+     * Retrieve an array of key=>value pairs that can be used as options in a
+     * <select> form input.
+     *
+     * @param Omeka_Db_Select
+     * @param array
+     * @return void
+     */
+    public function applySearchFilters($select, $params)
+    {
+        $alias = $this->getTableAlias();
+        $boolean = new Omeka_Filter_Boolean;
+        $genericParams = array();
+        foreach ($params as $key => $value) {
+            if ($value === null || (is_string($value) && trim($value) == '')) {
+                continue;
+            }
+            switch ($key) {
+                case 'item':
+                    $this->filterByItem($select, $value);
+                    break;
+                default:
+                    $genericParams[$key] = $value;
+            }
+        }
+
+        if (!empty($genericParams)) {
+            parent::applySearchFilters($select, $genericParams);
+        }
+    }
+
+    /**
+     * Filter locations by item.
+     *
+     * @see self::applySearchFilters()
+     * @param Omeka_Db_Select
+     * @param Item|array|integer $items An item or item id, or an array of items
+     * or item ids.
+     */
+    public function filterByItem($select, $items)
+    {
+        $alias = $this->getTableAlias();
+
+        if (!is_array($items)) {
+            $items = array($items);
+        }
+
+        $items = array_map(
+            function ($value) {
+                 return (integer) ((is_object($value)) ? $value->id : $value);
+            },
+            $items);
+
+        if (count($items) > 1) {
+            $select->where("`$alias`.`item_id` IN (?)", $items);
+        } else {
+            $select->where("`$alias`.`item_id` = ?", reset($items));
+        }
+    }
 }
diff --git a/plugin.ini b/plugin.ini
index 065e6e2..53a51da 100644
--- a/plugin.ini
+++ b/plugin.ini
@@ -1,10 +1,10 @@
 [info]
-name="Geolocation"
-author="Roy Rosenzweig Center for History and New Media"
-description="Adds location info and maps to Omeka"
-license="GPLv3"
-link="http://omeka.org/codex/Plugins/Geolocation_2.0"
-support_link="http://omeka.org/forums/forum/plugins"
-omeka_minimum_version="2.2"
-omeka_target_version="2.2"
-version="2.2.3"
+name = "Geolocation"
+author = "Roy Rosenzweig Center for History and New Media"
+description = "Adds location info and maps to Omeka"
+license = "GPLv3"
+link = "https://omeka.org/codex/Plugins/Geolocation_2.0"
+support_link = "https://omeka.org/forums/forum/plugins"
+omeka_minimum_version = "2.2.2"
+omeka_target_version = "2.4"
+version = "2.3.1"
diff --git a/tests/cases/Globals/GeolocationGetCenterTest.php b/tests/cases/Globals/GeolocationGetCenterTest.php
index 64a11d6..ec22c84 100644
--- a/tests/cases/Globals/GeolocationGetCenterTest.php
+++ b/tests/cases/Globals/GeolocationGetCenterTest.php
@@ -19,7 +19,7 @@ public function testGeolocationGetCenter()
         $this->_checkValidCenter();
         set_option('geolocation_default_latitude', '4');
         set_option('geolocation_default_longitude', '5');
-        set_option('geolocation_default_zoom', '6');
+        set_option('geolocation_default_zoom_level', '6');
         $this->_checkValidCenter();
     }
 
diff --git a/views/admin/plugins/geolocation-config-form.php b/views/admin/plugins/geolocation-config-form.php
new file mode 100644
index 0000000..196f384
--- /dev/null
+++ b/views/admin/plugins/geolocation-config-form.php
@@ -0,0 +1,223 @@
+<fieldset id="fieldset-geolocation-general">
+    <legend><?php echo __('General Settings'); ?></legend>
+    <div class="field">
+        <div class="two columns alpha">
+            <?php echo $this->formLabel('geolocation_default_latitude',
+                __('Default Latitude')); ?>
+        </div>
+        <div class="inputs five columns omega">
+            <p class="explanation">
+                <?php echo __("Latitude of the map's initial center point, in degrees. Must be between -90 and 90."); ?>
+            </p>
+            <?php echo $this->formText('geolocation_default_latitude', get_option('geolocation_default_latitude')); ?>
+        </div>
+    </div>
+    <div class="field">
+        <div class="two columns alpha">
+            <?php echo $this->formLabel('geolocation_default_longitude',
+                __('Default Longitude')); ?>
+        </div>
+        <div class="inputs five columns omega">
+            <p class="explanation">
+                <?php echo __("Longitude of the map's initial center point, in degrees. Must be between -180 and 180.");?>
+            </p>
+            <?php echo $this->formText('geolocation_default_longitude', get_option('geolocation_default_longitude')); ?>
+        </div>
+    </div>
+    <div class="field">
+        <div class="two columns alpha">
+            <?php echo $this->formLabel('geolocation_default_zoom_level',
+                __('Default Zoom Level')); ?>
+        </div>
+        <div class="inputs five columns omega">
+            <p class="explanation">
+                <?php echo __('An integer greater than or equal to 0, where 0 represents the most zoomed out scale.'); ?>
+            </p>
+            <?php echo $this->formText('geolocation_default_zoom_level', get_option('geolocation_default_zoom_level')); ?>
+        </div>
+    </div>
+    <div class="field">
+        <div class="two columns alpha">
+            <?php echo $this->formLabel('geolocation_default_map_type',
+                __('Map Type')); ?>
+        </div>
+        <div class="inputs five columns omega">
+            <p class="explanation">
+                <?php echo __('The type of map to display'); ?>
+            </p>
+            <?php
+            echo $this->formSelect('geolocation_default_map_type', get_option('geolocation_default_map_type'),
+                array(), array(
+                    'roadmap' => __('Roadmap'),
+                    'satellite' => __('Satellite'),
+                    'hybrid' =>__('Hybrid'),
+                    'terrain' => __('Terrain'),
+            ));
+            ?>
+        </div>
+    </div>
+    <div class="field">
+        <div class="two columns alpha">
+            <label for="api_key"><?php echo __('API Key'); ?></label>
+        </div>
+        <div class="inputs five columns omega">
+            <p class="explanation"><?php echo __('Google API key for this project.'); ?></p>
+            <?php echo $this->formText('api_key', get_option('geolocation_api_key')); ?>
+        </div>
+    </div>
+</fieldset>
+<fieldset id="fieldset-geolocation-browse">
+    <legend><?php echo __('Browse Map Settings'); ?></legend>
+    <div class="field">
+        <div class="two columns alpha">
+            <?php echo $this->formLabel('geolocation_per_page',
+                __('Number of Locations Per Page')); ?>
+        </div>
+        <div class="inputs five columns omega">
+            <p class="explanation">
+                <?php echo __('The number of locations displayed per page when browsing the map.'); ?>
+            </p>
+            <?php echo $this->formText('geolocation_per_page', get_option('geolocation_per_page')); ?>
+        </div>
+    </div>
+    <div class="field">
+        <div class="two columns alpha">
+            <?php echo $this->formLabel('geolocation_auto_fit_browse',
+                __('Auto-fit to Locations')); ?>
+        </div>
+        <div class="inputs five columns omega">
+            <p class="explanation">
+                <?php echo __('If checked, the default location and zoom settings '
+                    . 'will be ignored on the browse map. Instead, the map will '
+                    . 'automatically pan and zoom to fit the locations displayed '
+                    . 'on each page.');
+                ?>
+            </p>
+            <?php
+            echo $this->formCheckbox('geolocation_auto_fit_browse', true,
+                array('checked' => (boolean) get_option('geolocation_auto_fit_browse')));
+            ?>
+        </div>
+    </div>
+
+    <div class="field">
+        <div class="two columns alpha">
+            <?php echo $this->formLabel('geolocation_browse_append_search',
+                __('Append Search to Map')); ?>
+        </div>
+        <div class="inputs five columns omega">
+            <p class="explanation">
+                <?php echo __('If checked, the block advanced search will be appended to the view "map/browse", like in the admin interface.'); ?>
+            </p>
+            <?php
+            echo $this->formCheckbox('geolocation_browse_append_search', true,
+                array('checked' => (boolean) get_option('geolocation_browse_append_search')));
+            ?>
+        </div>
+    </div>
+    <div class="field">
+        <div class="two columns alpha">
+            <?php echo $this->formLabel('geolocation_default_radius',
+                __('Default Radius')); ?>
+        </div>
+        <div class="inputs five columns omega">
+            <p class="explanation">
+                <?php echo __('The size of the default radius to use on the items advanced search page. See below for whether to measure in miles or kilometers.'); ?>
+            </p>
+            <?php echo $this->formText('geolocation_default_radius', get_option('geolocation_default_radius')); ?>
+        </div>
+    </div>
+    <div class="field">
+        <div class="two columns alpha">
+            <?php echo $this->formLabel('geolocation_use_metric_distances',
+                __('Use metric distances')); ?>
+        </div>
+        <div class="inputs five columns omega">
+            <p class="explanation">
+                <?php echo __('Use metric distances in proximity search.'); ?>
+            </p>
+            <?php
+            echo $this->formCheckbox('geolocation_use_metric_distances', true,
+                array('checked' => (boolean) get_option('geolocation_use_metric_distances')));
+            ?>
+        </div>
+    </div>
+</fieldset>
+<fieldset id="fieldset-geolocation-item-map">
+    <legend><?php echo __('Item Map Settings'); ?></legend>
+    <div class="field">
+        <div class="two columns alpha">
+            <?php echo $this->formLabel('geolocation_item_map_width',
+                __('Width for Item Map')); ?>
+        </div>
+        <div class="inputs five columns omega">
+            <p class="explanation">
+                <?php echo __('The width of the map displayed on your items/show page. If left blank, the default width of 100% will be used.'); ?>
+            </p>
+            <?php echo $this->formText('geolocation_item_map_width', get_option('geolocation_item_map_width')); ?>
+        </div>
+    </div>
+    <div class="field">
+        <div class="two columns alpha">
+            <?php echo $this->formLabel('geolocation_item_map_height',
+                __('Height for Item Map')); ?>
+        </div>
+        <div class="inputs five columns omega">
+            <p class="explanation">
+                <?php echo __('The height of the map displayed on your items/show page. If left blank, the default height of 300px will be used.'); ?>
+            </p>
+            <?php echo $this->formText('geolocation_item_map_height', get_option('geolocation_item_map_height')); ?>
+        </div>
+    </div>
+</fieldset>
+<fieldset id="fieldset-geolocation-integration">
+    <legend><?php echo __('Map Integration'); ?></legend>
+    <div class="field">
+        <div class="two columns alpha">
+            <?php echo $this->formLabel('geolocation_link_to_nav',
+                __('Add Link to Map on Items/Browse Navigation')); ?>
+        </div>
+        <div class="inputs five columns omega">
+            <p class="explanation">
+                <?php echo __('Add a link to the items map on all the items/browse pages.'); ?>
+            </p>
+            <?php
+            echo $this->formCheckbox('geolocation_link_to_nav', true,
+                array('checked' => (boolean) get_option('geolocation_link_to_nav')));
+            ?>
+        </div>
+    </div>
+    <div class="field">
+        <div class="two columns alpha">
+            <?php echo $this->formLabel('geolocation_add_map_to_contribution_form',
+                __('Add Map To Contribution Form')); ?>
+        </div>
+        <div class="inputs five columns omega">
+            <p class="explanation">
+                <?php echo __('If the Contribution plugin is installed and activated, Geolocation  will add a geolocation map field to the contribution form to associate a location to a contributed item.'); ?>
+            </p>
+            <?php
+            echo $this->formCheckbox('geolocation_add_map_to_contribution_form', true,
+                array('checked' => (boolean) get_option('geolocation_add_map_to_contribution_form')));
+            ?>
+        </div>
+    </div>
+</fieldset>
+<fieldset id="fieldset-geolocation-accessibilty">
+    <legend><?php echo __('Accessibility'); ?></legend>
+    <div class="field">
+        <div class="two columns alpha">
+            <?php echo $this->formLabel('geolocation_accessible_markup',
+                __('Enable alternate format')); ?>
+        </div>
+        <div class="inputs five columns omega">
+            <p class="explanation">
+                <?php echo __('Provide accessible markup and a link to a tabular version of the map content.'); ?>
+            </p>
+            <?php
+            echo $this->formCheckbox('geolocation_accessible_markup', true,
+                array('checked' => (boolean) get_option('geolocation_accessible_markup')));
+            ?>
+        </div>
+    </div>
+</fieldset>
diff --git a/views/helpers/GoogleMap.php b/views/helpers/GoogleMap.php
index 03097c2..3dfa2b6 100644
--- a/views/helpers/GoogleMap.php
+++ b/views/helpers/GoogleMap.php
@@ -23,7 +23,7 @@ public function googleMap($divId = 'map', $options = array(), $attrs = array(),
         }
 
         if (!array_key_exists('mapType', $options)) {
-            $options['mapType'] = get_option('geolocation_map_type');
+            $options['mapType'] = get_option('geolocation_default_map_type');
         }
 
         if (!array_key_exists('fitMarkers', $options)) {
@@ -35,16 +35,15 @@ public function googleMap($divId = 'map', $options = array(), $attrs = array(),
             $class .= ' ' . $attrs['class'];
         }
 
-        $options = js_escape($options);
-        $center = js_escape($center);
-        $varDivId = Inflector::variablize($divId);
         $divAttrs = array_merge($attrs, array(
             'id' => $divId,
-            'class' => $class
+            'class' => $class,
         ));
 
+        $js = sprintf('var %sOmekaMapBrowse = new OmekaMapBrowse(%s, %s, %s);',
+            Inflector::variablize($divId), js_escape($divId), js_escape($center), js_escape($options));
+
         $html = '<div ' . tag_attributes($divAttrs) . '></div>';
-        $js = "var $varDivId" . "OmekaMapBrowse = new OmekaMapBrowse(" . js_escape($divId) .", $center, $options); ";
         $html .= "<script type='text/javascript'>$js</script>";
         return $html;
     }
diff --git a/views/helpers/ItemGoogleMap.php b/views/helpers/ItemGoogleMap.php
index 052b95e..5a8d1d1 100644
--- a/views/helpers/ItemGoogleMap.php
+++ b/views/helpers/ItemGoogleMap.php
@@ -1,40 +1,118 @@
 <?php
 
 class Geolocation_View_Helper_ItemGoogleMap extends Zend_View_Helper_Abstract
-{    
-    public function itemGoogleMap($item = null, $width = '200px', $height = '200px', $hasBalloonForMarker = false, $markerHtmlClassName = 'geolocation_balloon')
+{
+    /**
+     * Display the map of an item with markers and balloons.
+     *
+     * @param Item|null $item
+     * @param boolean $onlyFirst Display only first location of the item.
+     * @param string $width Css width of the block.
+     * @param string $height Css height of the block.
+     * @param boolean $hasBalloonForMarker
+     * @param string $markerHtmlClassName Class name of the marker.
+     * @return string Html.
+     */
+    public function itemGoogleMap($item = null, $onlyFirst = false, $width = '200px', $height = '200px', $hasBalloonForMarker = false, $markerHtmlClassName = 'geolocation_balloon')
     {
+        if (empty($item)) {
+            $item = get_current_record('item');
+        }
+
         $divId = "item-map-{$item->id}";
-        $location = get_db()->getTable('Location')->findLocationByItem($item, true);
+        // First location only.
+        if ($onlyFirst) {
+            $location = get_db()->getTable('Location')->findLocationsByItem($item, $onlyFirst, true);
+            $locations = $location ? array($location) : array();
+        }
+        // Multiple locations.
+        else {
+            $locations = get_db()->getTable('Location')->findLocationsByItem($item, $onlyFirst, true);
+            $location = reset($locations);
+        }
+
+        if (empty($locations)) {
+            $html = '<p class="map-notification">'.__('This item has no location info associated with it.').'</p>';
+            return;
+        }
+
+        // Define the main data.
+        $center = array();
+        $center['latitude'] = $location->latitude;
+        $center['longitude'] = $location->longitude;
+        $center['zoomLevel'] = $location->zoom_level;
+        $center['show'] = true;
+        if ($hasBalloonForMarker) {
+            $titleLink = link_to_item(metadata($item, array('Dublin Core', 'Title'), array(), $item), array(), 'show', $item);
+            $itemImage = item_image('thumbnail',array(), 0, $item);
+            $thumbnailLink = $itemImage
+                ? link_to_item($itemImage , array(), 'show', $item)
+                : '';
+            $description = metadata($item, array('Dublin Core', 'Description'), array('snippet'=>150), $item);
+            $center['markerHtml'] = '<div class="' . $markerHtmlClassName . '">'
+                . '<div class="geolocation_balloon_title">' . $titleLink . '</div>'
+                . '<div class="geolocation_balloon_thumbnail">' . $thumbnailLink . '</div>'
+                . '<p class="geolocation_balloon_description">' . $description . '</p></div>';
+        }
+
+        $options = array();
+        $options['mapType'] = $location->map_type;
+        // Here is the styling for the balloon that appears on the map. Values
+        // "$[x]" will be replaced via javascript.
+        $options['balloon'] = '<div class="geolocation_balloon">'
+            . '<div class="geolocation_balloon_address">$[address]</div>'
+            . '<div class="geolocation_balloon_description">$[description]</div>'
+            . '</div>';
+
         // Only set the center of the map if this item actually has a location
-        // associated with it
-        if ($location) {
-            $center['latitude']     = $location->latitude;
-            $center['longitude']    = $location->longitude;
-            $center['zoomLevel']    = $location->zoom_level;
-            $center['show']         = true;
-            if ($hasBalloonForMarker) {
-                $titleLink = link_to_item(metadata($item, array('Dublin Core', 'Title'), array(), $item), array(), 'show', $item);
-                $thumbnailLink = !(item_image('thumbnail')) ? '' : link_to_item(item_image('thumbnail',array(), 0, $item), array(), 'show', $item);
-                $description = metadata($item, array('Dublin Core', 'Description'), array('snippet'=>150), $item);
-                $center['markerHtml'] = '<div class="' . $markerHtmlClassName . '">'
-                                      . '<div class="geolocation_balloon_title">' . $titleLink . '</div>'
-                                      . '<div class="geolocation_balloon_thumbnail">' . $thumbnailLink . '</div>'
-                                      . '<p class="geolocation_balloon_description">' . $description . '</p></div>';
+        // associated with it.
+        $points = array();
+        foreach ($locations as $location) {
+            $point = array();
+            $point['address'] = $location->address;
+            $point['latitude'] = $location->latitude;
+            $point['longitude'] = $location->longitude;
+            $point['description'] = $location->description;
+            $points[] = $point;
+        }
+
+        $accessible_markup = get_option('geolocation_accessible_markup');
+        if ($accessible_markup) {
+            $html = '<figure>';
+            $html .= sprintf('<div id="%s" class="map geolocation-map" style="width: %s; height: %s"></div>',
+                $divId, $width, $height);
+            if (count($points) == 1) {
+                $point = reset($points);
+                $figcaption = sprintf('<div class="geolocation-latitude accessible">%s}</div>', __('Latitude: %s', $point['latitude']));
+                $figcaption .= sprintf('<div class="geolocation-longitude accessible">%s</div>', __('Longitude: %s', $point['longitude']));
+                if (!empty($point['address'])) $figcaption .= sprintf('<div class="geolocation-address accessible">%s</div>', __('Address: %s', $point['address']));
+                if (!empty($point['description'])) $figcaption .= sprintf('<div class="geolocation-description accessible">%s</div>', __('Description: %s', $point['description']));
+                $html .= '<figcaption class="element-invisible">' . $figcaption . '</figcaption>';
             }
-            $options = array();
-            $options['mapType'] = get_option('geolocation_map_type');
-            $center = js_escape($center);
-            $options = js_escape($options);
-            $style = "width: $width; height: $height";
-            $html = '<div id="' . $divId . '" class="map geolocation-map" style="' . $style . '"></div>';
-            
-            $js = "var " . Inflector::variablize($divId) . ";";
-            $js .= "OmekaMapSingle = new OmekaMapSingle(" . js_escape($divId) . ", $center, $options); ";
-            $html .= "<script type='text/javascript'>$js</script>";
-        } else {
-            $html = '<p class="map-notification">'.__('This item has no location info associated with it.').'</p>';
+            else {
+                foreach ($points as $key => $point) {
+                    $figcaption = sprintf('<div class="geolocation-point accessible">%s</div>', __('Point #%d', $key + 1));
+                    $figcaption .= sprintf('<div class="geolocation-latitude accessible">%s</div>', __('Latitude: %s', $point['latitude']));
+                    $figcaption .= sprintf('<div class="geolocation-longitude accessible">%s</div>', __('Longitude: %s', $point['longitude']));
+                    if (!empty($point['address'])) $figcaption .= sprintf('<div class="geolocation-address accessible">%s</div>', __('Address: %s', $point['address']));
+                    if (!empty($point['description'])) $figcaption .= sprintf('<div class="geolocation-description accessible">%s</div>', __('Description: %s', $point['description']));
+                    $html .= '<figcaption class="element-invisible">' . $figcaption . '</figcaption>';
+                }
+            }
+            $html .= '</figure>';
         }
-         return $html;   
-    }    
+
+        // Normal display.
+        else {
+            $html = sprintf('<div id="%s" class="map geolocation-map" style="width: %s; height: %s"></div>',
+                $divId, $width, $height);
+        }
+
+        $js = sprintf('var %s; omekaMapSingle = new OmekaMapSingle(%s, %s, %s, %s);',
+            Inflector::variablize($divId), js_escape($divId), js_escape($center), js_escape($options), js_escape($points));
+
+        $html .= "<script type='text/javascript'>$js</script>";
+
+         return $html;
+    }
 }
diff --git a/views/helpers/MapForm.php b/views/helpers/MapForm.php
new file mode 100644
index 0000000..768f20d
--- /dev/null
+++ b/views/helpers/MapForm.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Helper to display a Google Map Form.
+ */
+class Geolocation_View_Helper_MapForm extends Zend_View_Helper_Abstract
+{
+
+    /**
+     * Returns the form code for geographically searching for items.
+     *
+     * @param Item $item
+     * @return string Html string.
+     */
+    public function mapForm($item)
+    {
+        $view = $this->view;
+        $db = get_db();
+
+        $center = $this->_getCenter();
+        $center['show'] = false;
+
+        $locations = $db->getTable('Location')->findLocationsByItem($item);
+        // The first location is used to prepare the map (center, zoom, type).
+        $location = reset($locations);
+
+        $latitude = $longitude = $address = $description = '';
+        $zoomLevel = (integer) get_option('geolocation_default_zoom_level');
+        $mapType = get_option('geolocation_default_map_type');
+
+        // Prepare javascript.
+        $options = array();
+        $options['form'] = array(
+            'id' => 'location_form',
+        );
+        $options['mapType'] = $mapType;
+
+        // This option is kept for future evolution, but set false currently.
+        // $options['confirmLocationChange'] = empty($location) ? false : $item->exists();
+        $options['confirmLocationChange'] = false;
+
+        // Prepare the output.
+        $html = '<input type="hidden" name="current-geolocation[latitude]" value="' . $latitude . '" />';
+        $html .= '<input type="hidden" name="current-geolocation[longitude]" value="' . $longitude . '" />';
+        $html .= '<input type="hidden" name="current-geolocation[zoom_level]" value="' . $zoomLevel . '" />';
+        $html .= '<input type="hidden" name="current-geolocation[map_type]" value="' . $mapType . '" />';
+        $html .= '<input type="hidden" name="current-geolocation[description]" value="' . $description . '" />';
+
+        $html .= $view->partial('map/input-partial.php', array(
+            'item' => $item,
+            'address' => $address,
+            'locations' => $locations,
+        ));
+
+        $js = sprintf('var anOmekaMapForm = new OmekaMapForm(%s, %s, %s);',
+            js_escape('omeka-map-form'), js_escape($center), js_escape($options));
+        $js .= "
+            jQuery(document).bind('omeka:tabselected', function () {
+                anOmekaMapForm.displayLocations();
+            });
+        ";
+
+        $html .= "<script type='text/javascript'>" . $js . "</script>";
+
+        return $html;
+    }
+
+    protected function _getCenter()
+    {
+        return array(
+            'latitude' => (double) get_option('geolocation_default_latitude'),
+            'longitude' => (double) get_option('geolocation_default_longitude'),
+            'zoomLevel' => (integer) get_option('geolocation_default_zoom_level'),
+        );
+    }
+}
diff --git a/views/public/map/browse.php b/views/public/map/browse.php
index e851034..1bb725c 100644
--- a/views/public/map/browse.php
+++ b/views/public/map/browse.php
@@ -1,7 +1,19 @@
-<?php 
+<?php
 queue_css_file('geolocation-items-map');
 
-$title = __('Browse Items on the Map') . ' ' . __('(%s total)', $totalItems);
+$center = array();
+if (isset($item)) {
+    $radius = isset($params['geolocation-radius']) ? $params['geolocation-radius'] : get_option('geolocation_default_radius');
+    $unit = get_option('geolocation_use_metric_distances') ? __('kilometers') :__('miles');
+    $title = __('Browse Items around Item "%s" (%d total, %s %s radius)', link_to_item(null, array(), 'show', $item), $totalItems, $radius, $unit);
+    $center['latitude'] = (double) $location->latitude;
+    $center['longitude'] = (double) $location->longitude;
+    $center['zoomLevel'] = (double) get_option('geolocation_default_zoom_level');
+}
+else {
+    $title = __('Browse Items on the Map (%s total)', $totalItems);
+}
+
 echo head(array('title' => $title, 'bodyclass' => 'map browse'));
 ?>
 
@@ -17,8 +29,29 @@
 ?>
 
 <div id="geolocation-browse">
-    <?php echo $this->googleMap('map_browse', array('list' => 'map-links', 'params' => $params)); ?>
+    <?php
+    $accessible_markup = get_option('geolocation_accessible_markup');
+    if ($accessible_markup):
+        $tabular_url = absolute_url('geolocation/map/tabular');
+    ?>
+    <figure aria-describedat="<?php echo $tabular_url;?>">
+    <?php endif;
+
+    echo $this->googleMap('map_browse', array('list' => 'map-links', 'params' => $params), array(), $center);
+    ?>
     <div id="map-links"><h2><?php echo __('Find An Item on the Map'); ?></h2></div>
+    <?php if ($accessible_markup):?>
+    <figcaption class="element-invisible"><?php echo __('Map with geographic locations of items.'); ?>
+        <a href="<?php echo $tabular_url;?>"><?php echo __('View as text'); ?></a>
+    </figcaption>
+    </figure>
+    <?php endif; ?>
+
+    <?php if (get_option('geolocation_browse_append_search')): ?>
+    <div id="search_block">
+        <?php echo items_search_form(array('id'=>'search'), $_SERVER['REQUEST_URI']); ?>
+    </div>
+    <?php endif; ?>
 </div>
 
-<?php echo foot(); ?>
+<?php echo foot();
diff --git a/views/public/map/tabular.php b/views/public/map/tabular.php
new file mode 100644
index 0000000..cdb0ab1
--- /dev/null
+++ b/views/public/map/tabular.php
@@ -0,0 +1,50 @@
+<?php
+queue_css_file('geolocation-items-map');
+
+$title = __('Browse Items on the Map') . ' ' . __('(%s total)', $totalItems);
+echo head(array('title' => $title, 'bodyclass' => 'map browse_tabular'));
+?>
+
+<h1><?php echo $title; ?></h1>
+
+<nav class="items-nav navigation secondary-nav">
+    <?php echo public_nav_items(); ?>
+</nav>
+
+<div id="geolocation-tabular">
+    <table>
+        <thead>
+            <tr>
+                <th scope="col"><?php echo __('Title'); ?></th>
+                <th scope="col"><?php echo __('Longitude'); ?></th>
+                <th scope="col"><?php echo __('Latitude'); ?></th>
+                <th scope="col"><?php echo __('Address'); ?></th>
+                <th scope="col"><?php echo __('Description'); ?></th>
+            </tr>
+        </thead>
+        <tbody>
+            <?php
+            foreach ($items as $item):
+                foreach ($locations[$item->id] as $key => $location): ?>
+            <tr>
+                    <?php if ($key == 0): ?>
+                         <?php if (count($locations[$item->id]) == 1): ?>
+                <td><?php echo link_to_item(null, array(), 'show', $item); ?></td>
+                    <?php else: ?>
+                <td rowspan="<?php echo count($locations[$item->id]); ?>"><?php echo link_to_item(null, array(), 'show', $item); ?></td>
+                    <?php endif; ?>
+                <?php endif; ?>
+                <td><?php echo $location->longitude; ?></td>
+                <td><?php echo $location->latitude; ?></td>
+                <td><?php echo $location->address; ?></td>
+                <td><?php echo $location->description; ?></td>
+            </tr>
+                <?php endforeach; ?>
+            <?php endforeach ?>
+        </tbody>
+    </table>
+    <p>
+        <a href="<?php echo absolute_url('items/map'); ?>"><?php echo __('View as a map'); ?></a>
+    </p>
+</div>
+<?php echo foot();
diff --git a/views/shared/css/geolocation-items-map.css b/views/shared/css/geolocation-items-map.css
index 5997e3f..585b933 100644
--- a/views/shared/css/geolocation-items-map.css
+++ b/views/shared/css/geolocation-items-map.css
@@ -9,7 +9,11 @@
 }
 
 #map_browse {
-    height: 436px; 
+    height: 436px;
+}
+
+#map-links {
+    padding: 10px 0 10px 0;
 }
 
 #map-links ul {
@@ -18,7 +22,7 @@
 }
 
 #map-links li {
-    overflow:hidden; 
+    overflow:hidden;
     width: 100% !important;
     display: inline-block;
     border-radius: 3px;
@@ -26,17 +30,29 @@
     box-sizing: border-box;
     margin-bottom: 10px;
 }
-    
-#map-links {
-    padding: 10px 0 10px 0;
-}
 
 #map-links li a {
     display:block;
-    text-decoration:none; 
+    text-decoration:none;
     border-bottom: 0 !important;
 }
 
+#map-links ul ul {
+    line-height: 18px;
+}
+
+#map-links li li {
+    display: inline;
+    list-style-type: none;
+    padding: 0px;
+}
+
+#map-links li li a {
+    display: inline;
+    padding-left: 8px;
+    padding-right: 8px;
+}
+
 #map-links h2:first-child {
     margin-top: 0 !important;
 }
@@ -78,7 +94,7 @@ div.map-notification {
         overflow: hidden;
     }
 
-    #map_browse { 
+    #map_browse {
         float:left;
         width:70%;
         margin-bottom: 0 !important;
diff --git a/views/shared/css/geolocation-marker.css b/views/shared/css/geolocation-marker.css
index e6a1548..998fc92 100644
--- a/views/shared/css/geolocation-marker.css
+++ b/views/shared/css/geolocation-marker.css
@@ -1,26 +1,94 @@
+#omeka-map-form {
+    width: 100%;
+    height: 300px;
+}
+button#geolocation_location_find {
+    float: none;
+}
+button#geolocation_location_add {
+    float: right;
+}
+
 div#geolocation {
-	clear: both;
+    clear: both;
+}
+
+#geolocation .element-invisible,
+#geolocation-browse .element-invisible {
+    position: absolute !important;
+    clip: rect(1px 1px 1px 1px);
+    clip: rect(1px,1px,1px,1px);
+    overflow: hidden;
+    height: 1px;
 }
 
 .info-panel .map {
     margin-top:-18px;
-    display:block; 
-    margin-left:-18px; 
+    display:block;
+    margin-left:-18px;
     margin-bottom:0;
-    border-top:3px solid #eae9db; 
+    border-top:3px solid #eae9db;
     padding:0;
 }
 
 .geolocation_balloon {
     width: 200px;
 }
-
 .geolocation_balloon img {
     max-width: 100%;
 }
-
 .geolocation_balloon_title {
-    font-weight:bold; 
-    font-size:18px; 
+    font-weight:bold;
+    font-size:18px;
     margin-bottom:0px;
 }
+
+.geolocation-list {
+    margin-top: 12px;
+}
+
+table.geolocation-locations col {
+    width: 48px;
+}
+table.geolocation-locations div {
+    padding-bottom: 14px;
+}
+input.geolocation-address,
+input.geolocation-latitude,
+input.geolocation-longitude {
+    width: 150px;
+}
+input.geolocation-description {
+    width: 296px;
+}
+
+@media screen and (max-width:960px) {
+    input.geolocation-address,
+    input.geolocation-latitude,
+    input.geolocation-longitude {
+        width: 96px;
+    }
+    input.geolocation-description {
+        width: 240px;
+    }
+}
+@media screen and (max-width:767px) {
+    input.geolocation-address,
+    input.geolocation-latitude,
+    input.geolocation-longitude {
+        width: 90px;
+    }
+    input.geolocation-description {
+        width: 236px;
+    }
+}
+@media screen and (max-width:480px) {
+    input.geolocation-address,
+    input.geolocation-latitude,
+    input.geolocation-longitude {
+        width: 120px;
+    input.geolocation-description {
+    }
+        width: 120px;
+    }
+}
diff --git a/views/shared/javascripts/map.js b/views/shared/javascripts/map.js
index e2a4555..33d4972 100644
--- a/views/shared/javascripts/map.js
+++ b/views/shared/javascripts/map.js
@@ -5,24 +5,24 @@ function OmekaMap(mapDivId, center, options) {
 }
 
 OmekaMap.prototype = {
-    
+
     map: null,
     mapDivId: null,
     markers: [],
     options: {},
     center: null,
     markerBounds: null,
-    
-    addMarker: function (lat, lng, options, bindHtml)
-    {        
+
+    addMarker: function (lat, lng, options, bindHtml, folder)
+    {
         if (!options) {
             options = {};
         }
         options.position = new google.maps.LatLng(lat, lng);
         options.map = this.map;
-          
+
         var marker = new google.maps.Marker(options);
-        
+
         if (bindHtml) {
             var infoWindow = new google.maps.InfoWindow({
                 content: bindHtml
@@ -38,7 +38,9 @@ OmekaMap.prototype = {
                 infoWindow.open(this.map, marker);
             });
         }
-               
+
+        marker.set('folder', folder);
+
         this.markers.push(marker);
         this.markerBounds.extend(options.position);
         return marker;
@@ -51,7 +53,18 @@ OmekaMap.prototype = {
             this.map.fitBounds(this.markerBounds);
         }
     },
-    
+
+    // Helper to convert the map type from Omeka to Google.
+    convertMapType: function (omekaMapType) {
+        switch (omekaMapType) {
+        case 'hybrid': return google.maps.MapTypeId.HYBRID;
+        case 'satellite': return google.maps.MapTypeId.SATELLITE;
+        case 'terrain': return google.maps.MapTypeId.TERRAIN;
+        case 'roadmap':
+        default: return google.maps.MapTypeId.ROADMAP;
+        }
+    },
+
     initMap: function () {
         if (!this.center) {
             alert('Error: The center of the map has not been set!');
@@ -62,23 +75,9 @@ OmekaMap.prototype = {
         var mapOptions = {
             zoom: this.center.zoomLevel,
             center: new google.maps.LatLng(this.center.latitude, this.center.longitude),
+            mapTypeId: this.convertMapType(this.options.mapType),
         };
 
-        switch (this.options.mapType) {
-        case 'hybrid':
-            mapOptions.mapTypeId = google.maps.MapTypeId.HYBRID;
-            break;
-        case 'satellite':
-            mapOptions.mapTypeId = google.maps.MapTypeId.SATELLITE;
-            break;
-        case 'terrain':
-            mapOptions.mapTypeId = google.maps.MapTypeId.TERRAIN;
-            break;
-        case 'roadmap':
-        default:
-            mapOptions.mapTypeId = google.maps.MapTypeId.ROADMAP;
-        }
-
         jQuery.extend(mapOptions, this.options.mapOptions);
 
         this.map = new google.maps.Map(document.getElementById(this.mapDivId), mapOptions);
@@ -86,14 +85,40 @@ OmekaMap.prototype = {
 
         // Show the center marker if we have that enabled.
         if (this.center.show) {
-            this.addMarker(this.center.latitude, 
-                           this.center.longitude, 
-                           {title: "(" + this.center.latitude + ',' + this.center.longitude + ")"}, 
-                           this.center.markerHtml);
+            this.addMarker(
+                this.center.latitude,
+                this.center.longitude,
+                {title: "(" + this.center.latitude + ',' + this.center.longitude + ")"},
+                this.center.markerHtml);
         }
     }
 };
 
+function OmekaMapSingle(mapDivId, center, options, points) {
+    var omekaMap = new OmekaMap(mapDivId, center, options);
+    jQuery.extend(true, this, omekaMap);
+    this.initMap();
+
+    // Display all current geolocation points.
+    if (points) {
+        var that = this;
+
+        that.itemBalloon = options.balloon;
+
+        points.forEach(function (pointValue, index) {
+            if (pointValue.latitude.length != 0 && pointValue.longitude.length != 0) {
+                var balloon = '';
+                if (pointValue.address.length != 0 || pointValue.description.length != 0) {
+                    balloon = that.itemBalloon;
+                    balloon = balloon.replace('$[address]', pointValue.address).replace('$[description]', pointValue.description);
+                }
+                var marker = that.addMarker(pointValue.latitude, pointValue.longitude, {title: pointValue.description}, balloon);
+            }
+        });
+        this.fitMarkers();
+    }
+}
+
 function OmekaMapBrowse(mapDivId, center, options) {
     var omekaMap = new OmekaMap(mapDivId, center, options);
     jQuery.extend(true, this, omekaMap);
@@ -104,12 +129,14 @@ function OmekaMapBrowse(mapDivId, center, options) {
 }
 
 OmekaMapBrowse.prototype = {
-    
-    afterLoadItems: function () {
+
+    /* Update the main map and add the list of folders, if needed and if any. */
+    afterLoadItems: function (folders) {
         if (this.options.fitMarkers) {
             this.fitMarkers();
         }
 
+        // "list" contains the id used to build the list of links of locations.
         if (!this.options.list) {
             return;
         }
@@ -119,11 +146,11 @@ OmekaMapBrowse.prototype = {
             alert('Error: You have no map links div!');
         } else {
             //Create HTML links for each of the markers
-            this.buildListLinks(listDiv);
+            this.buildListLinks(listDiv, folders);
         }
     },
-    
-    /* Need to parse KML manually b/c Google Maps API cannot access the KML 
+
+    /* Need to parse KML manually b/c Google Maps API cannot access the KML
        behind the admin interface */
     loadKmlIntoMap: function (kmlUrl, params) {
         var that = this;
@@ -134,63 +161,102 @@ OmekaMapBrowse.prototype = {
             data: params,
             success: function(data) {
                 var xml = jQuery(data);
-        
+
                 /* KML can be parsed as:
                     kml - root element
-                        Placemark
-                            namewithlink
-                            description
-                            Point - longitude,latitude
+                        Document
+                            Folder - item level, if any
+                                Placemark
+                                    namewithlink
+                                    description
+                                    Point - longitude,latitude
                 */
-                var placeMarks = xml.find('Placemark');
-        
-                // If we have some placemarks, load them
-                if (placeMarks.size()) {
-                    // Retrieve the balloon styling from the KML file
-                    that.browseBalloon = that.getBalloonStyling(xml);
-                
-                    // Build the markers from the placemarks
-                    jQuery.each(placeMarks, function (index, placeMark) {
-                        placeMark = jQuery(placeMark);
-                        that.buildMarkerFromPlacemark(placeMark);
+
+                // Retrieve the balloon styling from the KML file.
+                that.browseBalloon = that.getBalloonStyling(xml);
+
+                var folders = xml.find('Folder');
+                if (folders.size()) {
+                    jQuery.each(folders, function (index, folder) {
+                        folder = jQuery(folder);
+                        var placeMarks = folder.find('Placemark');
+
+                        // If we have some placemarks, load them.
+                        if (placeMarks.size()) {
+                            // Build the markers from the placemarks
+                            jQuery.each(placeMarks, function (index, placeMark) {
+                                placeMark = jQuery(placeMark);
+                                that.buildMarkerFromPlacemark(placeMark, folder);
+                            });
+                        } else {
+                            // @todo Elaborate with an error message
+                            return false;
+                        }
                     });
-            
-                    // We have successfully loaded some map points, so continue setting up the map object
-                    return that.afterLoadItems();
+
+                    // We have successfully loaded some map points, so continue
+                    // setting up the map object.
+                    return that.afterLoadItems(folders);
+
                 } else {
-                    // @todo Elaborate with an error message
-                    return false;
-                }            
+                    var folder = null;
+                    var placeMarks = xml.find('Placemark');
+
+                    // If we have some placemarks, load them
+                    if (placeMarks.size()) {
+                        // Build the markers from the placemarks
+                        jQuery.each(placeMarks, function (index, placeMark) {
+                            placeMark = jQuery(placeMark);
+                            that.buildMarkerFromPlacemark(placeMark, folder);
+                        });
+
+                        // We have successfully loaded some map points, so
+                        // continue setting up the map object.
+                        return that.afterLoadItems(folders);
+                    } else {
+                        // @todo Elaborate with an error message
+                        return false;
+                    }
+                }
             }
         });
     },
-    
+
     getBalloonStyling: function (xml) {
-        return xml.find('BalloonStyle text').text();        
+        return xml.find('BalloonStyle text').text();
     },
-    
-    // Build a marker given the KML XML Placemark data
+
+    // Build a marker given the KML XML Placemark data. Some data can be set at
+    // Folder (item) level.
     // I wish we could use the KML file directly, but it's behind the admin interface so no go
-    buildMarkerFromPlacemark: function (placeMark) {
+    buildMarkerFromPlacemark: function (placeMark, folder) {
         // Get the info for each location on the map
         var title = placeMark.find('name').text();
         var titleWithLink = placeMark.find('namewithlink').text();
         var body = placeMark.find('description').text();
         var snippet = placeMark.find('Snippet').text();
-            
+
+        // Set the default values if none was provided at the location level.
+        if (folder) {
+            title = title ? title : folder.find('name').text();
+            titleWithLink = titleWithLink ? titleWithLink : folder.find('namewithlink').text();
+            body = body ? body : folder.find('description').text();
+            snippet = snippet ? snippet : folder.find('Snippet').text();
+        }
+
         // Extract the lat/long from the KML-formatted data
         var coordinates = placeMark.find('Point coordinates').text().split(',');
         var longitude = coordinates[0];
         var latitude = coordinates[1];
-        
+
         // Use the KML formatting (do some string sub magic)
         var balloon = this.browseBalloon;
         balloon = balloon.replace('$[namewithlink]', titleWithLink).replace('$[description]', body).replace('$[Snippet]', snippet);
 
         // Build a marker, add HTML for it
-        this.addMarker(latitude, longitude, {title: title}, balloon);
+        this.addMarker(latitude, longitude, {title: title}, balloon, folder);
     },
-    
+
     // Calculate the zoom level given the 'range' value
     // Not currently used by this class, but possibly useful
     // http://throwless.wordpress.com/2008/02/23/gmap-geocoding-zoom-level-and-accuracy/
@@ -198,52 +264,134 @@ OmekaMapBrowse.prototype = {
         var zoom = 18 - Math.log(3.3 * range / Math.sqrt(width * width + height * height)) / Math.log(2);
         return zoom;
     },
-    
-    buildListLinks: function (container) {
+
+    // Build the list of links to markers, grouped by folders if any.
+    buildListLinks: function (container, folders) {
         var that = this;
         var list = jQuery('<ul></ul>');
         list.appendTo(container);
 
-        // Loop through all the markers
-        jQuery.each(this.markers, function (index, marker) {
-            var listElement = jQuery('<li></li>');
+        // TODO Factorize.
+        if (folders.size()) {
+            // Build the list of markers by folder. To avoid an issue, the
+            // process is done from the markers, already checked.
 
-            // Make an <a> tag, give it a class for styling
-            var link = jQuery('<a></a>');
-            link.addClass('item-link');
+            // Build the list of markers by folder to simplify next process.
+            var markers = this.markers;
+            var markersByFolder = new Array();
+            jQuery.each(folders, function (index, folder) {
+                var folderId = jQuery(folder).attr('id');
+                var folderMarkers = {folderId: folderId, markers: []};
+                jQuery.each(markers, function (index, marker) {
+                    var markerFolderId = marker.get('folder').attr('id');
+                    if (folderId == markerFolderId) {
+                        folderMarkers.markers.push(marker);
+                    }
+                });
+                markersByFolder.push(folderMarkers);
+            });
 
-            // Links open up the markers on the map, clicking them doesn't actually go anywhere
-            link.attr('href', 'javascript:void(0);');
+            markersByFolder.forEach(function(folderMarkers, index) {
+                var listFolder = jQuery('<li class="locations-item"></li>');
+                listFolder.attr('id', folderMarkers.folderId);
 
-            // Each <li> starts with the title of the item            
-            link.html(marker.getTitle());
+                // If there is one marker, don't display the list. This makes
+                // this view similar to old Geolocation.
+                if (folderMarkers.markers.length == 1) {
+                    var marker = folderMarkers.markers[0];
+                    var listElement = listFolder;
+                    listElement.addClass('single');
 
-            // Clicking the link should take us to the map
-            link.bind('click', {}, function (event) {
-                google.maps.event.trigger(marker, 'click');
-                that.map.panTo(marker.getPosition()); 
-            });     
+                    // Make an <a> tag, give it a class for styling
+                    var link = jQuery('<a></a>');
+                    link.addClass('item-link');
 
-            link.appendTo(listElement);
-            listElement.appendTo(list);
-        });
+                    // Links open up the markers on the map, clicking them doesn't actually go anywhere
+                    link.attr('href', 'javascript:void(0);');
+
+                    // Each <li> starts with the title of the item
+                    link.html(marker.getTitle());
+
+                    // Clicking the link should take us to the map
+                    link.bind('click', {}, function (event) {
+                        google.maps.event.trigger(marker, 'click');
+                        that.map.panTo(marker.getPosition());
+                    });
+
+                    link.appendTo(listElement);
+                    listElement.appendTo(list);
+
+                } else {
+                    folderKml = folders.parent().find('#' + folderMarkers.folderId);
+                    listFolder.html(folderKml.find('name').text());
+                    var listElements = jQuery('<ul></ul>');
+
+                    // Add the list of markers, with links.
+                    folderMarkers.markers.forEach(function (marker, index) {
+                        var listElement = jQuery('<li></li>');
+
+                        // Make an <a> tag, give it a class for styling
+                        var link = jQuery('<a></a>');
+                        link.addClass('item-link');
+
+                        // Links open up the markers on the map, clicking them doesn't actually go anywhere
+                        link.attr('href', 'javascript:void(0);');
+
+                        // Each line is the index of the location of the item.
+                        var indexNumber = index + 1;
+                        link.html(indexNumber.toString() + ' ');
+
+                        // Clicking the link should take us to the map
+                        link.bind('click', {}, function (event) {
+                            google.maps.event.trigger(marker, 'click');
+                            that.map.panTo(marker.getPosition());
+                        });
+
+                        link.appendTo(listElement);
+                        listElement.appendTo(listElements);
+                    });
+
+                    listElements.appendTo(listFolder);
+                    listFolder.appendTo(list);
+                }
+            });
+
+        } else {
+            // Simple list of single markers.
+            jQuery.each(this.markers, function (index, marker) {
+                var listElement = jQuery('<li></li>');
+
+                // Make an <a> tag, give it a class for styling
+                var link = jQuery('<a></a>');
+                link.addClass('item-link');
+
+                // Links open up the markers on the map, clicking them doesn't actually go anywhere
+                link.attr('href', 'javascript:void(0);');
+
+                // Each <li> starts with the title of the item
+                link.html(marker.getTitle());
+
+                // Clicking the link should take us to the map
+                link.bind('click', {}, function (event) {
+                    google.maps.event.trigger(marker, 'click');
+                    that.map.panTo(marker.getPosition());
+                });
+
+                link.appendTo(listElement);
+                listElement.appendTo(list);
+            });
+        }
     }
 };
 
-function OmekaMapSingle(mapDivId, center, options) {
-    var omekaMap = new OmekaMap(mapDivId, center, options);
-    jQuery.extend(true, this, omekaMap);
-    this.initMap();
-}
-
 function OmekaMapForm(mapDivId, center, options) {
     var that = this;
     var omekaMap = new OmekaMap(mapDivId, center, options);
     jQuery.extend(true, this, omekaMap);
     this.initMap();
-    
-    this.formDiv = jQuery('#' + this.options.form.id);       
-        
+
+    this.formDiv = jQuery('#' + this.options.form.id);
+
     // Make the map clickable to add a location point.
     google.maps.event.addListener(this.map, 'click', function (event) {
         // If we are clicking a new spot on the map
@@ -253,31 +401,61 @@ function OmekaMapForm(mapDivId, center, options) {
             jQuery('#geolocation_address').val('');
         }
     });
-	
+
     // Make the map update on zoom changes.
     google.maps.event.addListener(this.map, 'zoom_changed', function () {
         that.updateZoomForm();
     });
 
     // Make the Find By Address button lookup the geocode of an address and add a marker.
-    jQuery('#geolocation_find_location_by_address').bind('click', function (event) {
+    jQuery('#geolocation_location_find').bind('click', function (event) {
         var address = jQuery('#geolocation_address').val();
         that.findAddress(address);
-
-        //Don't submit the form
         event.stopPropagation();
         return false;
     });
-	
+
     // Make the return key in the geolocation address input box click the button to find the address.
     jQuery('#geolocation_address').bind('keydown', function (event) {
         if (event.which == 13) {
-            jQuery('#geolocation_find_location_by_address').click();
+            jQuery('#geolocation_location_find').click();
             event.stopPropagation();
             return false;
         }
     });
 
+    // Make the button Add add the point to the list.
+    jQuery('#geolocation_location_add').bind('click', function (event) {
+        that.addLocation();
+        event.stopPropagation();
+        return false;
+    });
+
+    // Make the buttons Remove remove the point of the list (may be dynamically
+    // created).
+    jQuery(document).on('click', '.geolocation-remove', function (event) {
+        var locationElement = jQuery(this).closest('tr');
+        that.removeLocation(locationElement);
+        event.stopPropagation();
+        return false;
+     });
+
+    // Make the buttons Display display the current point (may be dynamically
+    // created).
+    jQuery(document).on('click', '.geolocation-display', function (event) {
+        var locationElement = jQuery(this).closest('tr');
+        that.displayLocation(locationElement);
+        event.stopPropagation();
+        return false;
+     });
+
+    // Make the buttons All display all current points.
+    jQuery(document).on('click', '.geolocation-locations-display', function (event) {
+        that.displayLocations();
+        event.stopPropagation();
+        return false;
+     });
+
     // Add the existing map point.
     if (this.options.point) {
         this.map.setZoom(this.options.point.zoomLevel);
@@ -294,7 +472,7 @@ OmekaMapForm.prototype = {
         var that = this;
         if (!this.geocoder) {
             this.geocoder = new google.maps.Geocoder();
-        }    
+        }
         this.geocoder.geocode({'address': address}, function (results, status) {
             // If the point was found, then put the marker on that spot
             if (status == google.maps.GeocoderStatus.OK) {
@@ -315,70 +493,207 @@ OmekaMapForm.prototype = {
             }
         });
     },
-    
-    /* Set the marker to the point. */   
+
+    /* Add the current geolocation to the list of points. */
+    addLocation: function () {
+        // Get the point and check it.
+        if (!this.markers.length) {
+            alert('Error: No point defined!');
+            return null;
+        }
+        var marker = this.markers[0];
+        var point = marker.getPosition();
+
+        var addressElement = document.getElementsByName('current-geolocation[address]')[0];
+        var latitudeElement = document.getElementsByName('current-geolocation[latitude]')[0];
+        var longitudeElement = document.getElementsByName('current-geolocation[longitude]')[0];
+        var zoomElement = document.getElementsByName('current-geolocation[zoom_level]')[0];
+
+        if (latitudeElement.value == '' || longitudeElement.value == '') {
+            alert('Error: No point defined!');
+            return null;
+        }
+
+        // Set the value in the list.
+        var locations = jQuery('table.geolocation-locations tbody tr');
+
+        var newRowId = 'new-' + Math.floor(Math.random() * 999999999);
+
+        // Add a new row to the list.
+        var row = '<tr id="geolocation-location-' + newRowId + '" class="geolocation-location location-new ' + (locations.length % 2 ? 'odd' : 'even') + '">';
+        row += '<td>';
+        row += '<button type="button" class="geolocation-display button small green" id="locations-' + newRowId + '-display" name="geolocation[' + newRowId + '][display]" title="Display this location">O</button>';
+        row += '<button type="button" class="geolocation-remove button small red" id="locations-' + newRowId + '-remove" name="geolocation[' + newRowId + '][remove]" title="Remove this location">X</button>';
+        row += '</td>';
+        row += '<td colspan="4">';
+        row += '<div>';
+        row += '<span>';
+        row += '<input type="text" name="geolocation[' + newRowId + '][latitude]" id="locations-' + newRowId + '-latitude" value="" placeholder="Latitude" maxlength="15" class="geolocation-latitude">';
+        row += '</span>';
+        row += '<span>';
+        row += '<input type="text" name="geolocation[' + newRowId + '][longitude]" id="locations-' + newRowId + '-longitude" value="" placeholder="Longitude" maxlength="15" class="geolocation-longitude">';
+        row += '</span>';
+        row += '<span>';
+        row += '<select name="geolocation[' + newRowId + '][zoom_level]" id="locations-' + newRowId + '-zoom_level" class="geolocation-zoom-level">';
+        row += '<option value="0">0</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option>';
+        row += '<option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option><option value="11">11</option>';
+        row += '<option value="12">12</option><option value="13">13</option><option value="14">14</option><option value="15">15</option><option value="16">16</option><option value="17">17</option>';
+        row += '<option value="18">18</option><option value="19">19</option><option value="20">20</option><option value="21">21</option>';
+        row += '</select>';
+        row += '</span>';
+        row += '<span>';
+        row += '<select name="geolocation[' + newRowId + '][map_type]" id="locations-' + newRowId + '-map_type" class="geolocation-map-type">';
+        row += '<option value="roadmap">Roadmap</option><option value="satellite">Satellite</option><option value="hybrid">Hybrid</option><option value="terrain">Terrain</option>';
+        row += '</select>';
+        row += '</span>';
+        row += '</div>';
+        row += '<div>';
+        row += '<span><input type="text" name="geolocation[' + newRowId + '][address]" id="locations-' + newRowId + '-address" value="" placeholder="Address" class="geolocation-address"></span>';
+        row += '<span><input type="text" name="geolocation[' + newRowId + '][description]" id="locations-' + newRowId + '-description" value="" placeholder="Description" class="geolocation-description"></span>';
+        row += '</div>';
+        row += '</td>';
+        row += '</tr>';
+
+        jQuery('table.geolocation-locations tbody tr:last').after(row);
+        document.getElementById('locations-' + newRowId + '-address').value = addressElement.value;
+        document.getElementById('locations-' + newRowId + '-latitude').value = latitudeElement.value;
+        document.getElementById('locations-' + newRowId + '-longitude').value = longitudeElement.value;
+        jQuery('#locations-' + newRowId + '-zoom_level').val(this.map.getZoom().toString());
+        jQuery('#locations-' + newRowId + '-map_type').val(this.map.getMapTypeId());
+
+        // Remove the message for empty location if any.
+        geolocationEmpty = jQuery('#geolocation-empty');
+        if (geolocationEmpty.length > 0) {
+            geolocationEmpty.remove();
+        }
+    },
+
+    /* Remove the current geolocation from the list. */
+    removeLocation: function (location) {
+        location.remove();
+
+        // Add the empty location if none.
+        var locations = jQuery('table.geolocation-locations tbody tr');
+        if (locations.length == 0) {
+            var row = '<tr id="geolocation-empty"><td colspan="5">No location defined.</td></tr>';
+            jQuery('table.geolocation-locations tbody').html(row);
+        }
+    },
+
+    /* Display the current geolocation from the list. */
+    displayLocation: function (location) {
+        var that = this;
+        var latitude = location.find('input.geolocation-latitude').val();
+        var longitude = location.find('input.geolocation-longitude').val();
+        if (latitude.length == 0 || longitude.length == 0) {
+            alert('Error: This location has no latitude or longitude!');
+            return;
+        }
+        var point = new google.maps.LatLng(latitude, longitude);
+        var address = location.find('input.geolocation-address').val();
+        var zoomLevel = +location.find('select.geolocation-zoom-level').val();
+        var mapType = location.find('select.geolocation-map-type').val();
+
+        jQuery('#geolocation_address').val(address);
+        // TODO This hack avoids a recursion for newly created locations.
+        if (!location.hasClass('location-new')) {
+            that.map.setZoom(zoomLevel);
+        }
+        that.map.setMapTypeId(this.convertMapType(mapType));
+        that.updateForm(point);
+        that.setMarker(point);
+    },
+
+    /* Display all current geolocation from the list. */
+    displayLocations: function () {
+        var that = this;
+        this.clearForm();
+        this.updateForm();
+
+        var locations = jQuery('table.geolocation-locations tbody tr.geolocation-location');
+        if (locations.length == 0) {
+            return;
+        }
+
+        jQuery.each(locations, function (index, location) {
+            location = jQuery(location);
+            var latitude = location.find('input.geolocation-latitude').val();
+            var longitude = location.find('input.geolocation-longitude').val();
+            if (latitude && longitude && latitude.length != 0 && longitude.length != 0) {
+                var point = new google.maps.LatLng(latitude, longitude);
+                var marker = that.addMarker(point.lat(), point.lng());
+            }
+        });
+
+        var mapType = jQuery(locations[0]).find('select.geolocation-map-type').val();
+        that.map.setMapTypeId(this.convertMapType(mapType));
+
+        this.fitMarkers();
+    },
+
+    /* Set the marker to the point. */
     setMarker: function (point) {
         var that = this;
-        
+
         // Get rid of existing markers.
         this.clearForm();
-        
+
         // Add the marker
         var marker = this.addMarker(point.lat(), point.lng());
         marker.setAnimation(google.maps.Animation.DROP);
-        
+
         // Pan the map to the marker
         that.map.panTo(point);
-        
-        //  Make the marker clear the form if clicked.
+
+        // Make the marker clear the form if clicked.
         google.maps.event.addListener(marker, 'click', function (event) {
             if (!that.options.confirmLocationChange || confirm('Are you sure you want to remove the location of the item?')) {
                 that.clearForm();
             }
         });
-        
+
         this.updateForm(point);
         return marker;
     },
-    
+
     /* Update the latitude, longitude, and zoom of the form. */
     updateForm: function (point) {
-        var latElement = document.getElementsByName('geolocation[latitude]')[0];
-        var lngElement = document.getElementsByName('geolocation[longitude]')[0];
-        var zoomElement = document.getElementsByName('geolocation[zoom_level]')[0];
-        
+        var latElement = document.getElementsByName('current-geolocation[latitude]')[0];
+        var lngElement = document.getElementsByName('current-geolocation[longitude]')[0];
+        var zoomElement = document.getElementsByName('current-geolocation[zoom_level]')[0];
+
         // If we passed a point, then set the form to that. If there is no point, clear the form
         if (point) {
             latElement.value = point.lat();
             lngElement.value = point.lng();
-            zoomElement.value = this.map.getZoom();          
+            zoomElement.value = this.map.getZoom();
         } else {
             latElement.value = '';
             lngElement.value = '';
-            zoomElement.value = this.map.getZoom();          
-        }        
+            zoomElement.value = this.map.getZoom();
+        }
     },
-    
+
     /* Update the zoom input of the form to be the current zoom on the map. */
     updateZoomForm: function () {
-        var zoomElement = document.getElementsByName('geolocation[zoom_level]')[0];
+        var zoomElement = document.getElementsByName('current-geolocation[zoom_level]')[0];
         zoomElement.value = this.map.getZoom();
     },
-    
+
     /* Clear the form of all markers. */
     clearForm: function () {
         // Remove the markers from the map
         for (var i = 0; i < this.markers.length; i++) {
             this.markers[i].setMap(null);
         }
-        
+
         // Clear the markers array
         this.markers = [];
-        
+
         // Update the form
         this.updateForm();
     },
-    
+
     /* Resize the map and center it on the first marker. */
     resize: function () {
         google.maps.event.trigger(this.map, 'resize');
diff --git a/views/shared/map/advanced-search-partial.php b/views/shared/map/advanced-search-partial.php
index fa6ed2f..ef9b8f9 100644
--- a/views/shared/map/advanced-search-partial.php
+++ b/views/shared/map/advanced-search-partial.php
@@ -4,6 +4,7 @@
 
 // Get the address, latitude, longitude, and the radius from parameters
 $address = trim($request->getParam('geolocation-address'));
+$description = trim($request->getParam('geolocation-description'));
 $currentLat = trim($request->getParam('geolocation-latitude'));
 $currentLng = trim($request->getParam('geolocation-longitude'));
 $radius = trim($request->getParam('geolocation-radius'));
@@ -26,6 +27,7 @@
     </div>
     <div class="five columns omega inputs">
         <?php echo $this->formText('geolocation-address',  $address, array('size' => '40')); ?>
+        <?php // echo $this->formText('geolocation-description', $description, array('size' => '40')); ?>
         <?php echo $this->formHidden('geolocation-latitude', $currentLat); ?>
         <?php echo $this->formHidden('geolocation-longitude', $currentLng); ?>
     </div>
diff --git a/views/shared/map/browse-placemark-kml.php b/views/shared/map/browse-placemark-kml.php
new file mode 100644
index 0000000..d8dcef9
--- /dev/null
+++ b/views/shared/map/browse-placemark-kml.php
@@ -0,0 +1,44 @@
+<Placemark id="item-<?php echo $item->id . '-' . (empty($indexLocation) ? '1' : $indexLocation); ?>">
+<?php if (empty($byFolder)): ?>
+    <name><![CDATA[<?php
+    $title = metadata($item, array('Dublin Core', 'Title'));
+    echo $title;
+    ?>]]></name>
+    <namewithlink><![CDATA[<?php echo link_to_item($title, array('class' => 'view-item')); ?>]]></namewithlink>
+<?php endif; ?>
+    <Snippet maxLines="2"><![CDATA[<?php
+if (empty($byFolder)):
+    if (isset($countLocations) && $countLocations > 1):
+        echo __('[Point %d/%d]', $indexLocation, $countLocations) . ' ';
+    endif;
+    echo metadata($item, array('Dublin Core', 'Description'), array('snippet' => 150));
+    if (!empty($location['description'])): ?>
+        <em><?php echo $location['description']; ?></em>
+    <?php endif;
+else:
+    if (isset($indexLocation) && $countLocations > 1):
+        echo __('[Point %d/%d]', $indexLocation, $countLocations) . ' ';
+        echo metadata($item, array('Dublin Core', 'Description'), array('snippet' => 150));
+        if (!empty($location['description'])): ?>
+            <em><?php echo $location['description']; ?></em>
+        <?php endif;
+    endif;
+endif;
+    ?>]]></Snippet>
+<?php if (empty($byFolder)): ?>
+    <description><![CDATA[<?php
+    // @since 3/26/08: movies do not display properly on the map in IE6,
+    // so can't use display_files(). Description field contains the HTML
+    // for displaying the first file (if possible).
+    if (metadata($item, 'has thumbnail')):
+        echo link_to_item(item_image('thumbnail', array(), 0, $item), array('class' => 'view-item'));
+    endif;
+    ?>]]></description>
+<?php endif; ?>
+    <Point>
+        <coordinates><?php echo $location['longitude']; ?>,<?php echo $location['latitude']; ?></coordinates>
+    </Point>
+    <?php if (!empty($location['address'])): ?>
+    <address><![CDATA[<?php echo $location['address']; ?>]]></address>
+    <?php endif; ?>
+</Placemark>
diff --git a/views/shared/map/browse.kml.php b/views/shared/map/browse.kml.php
index 20e5d8d..9c96d98 100644
--- a/views/shared/map/browse.kml.php
+++ b/views/shared/map/browse.kml.php
@@ -1,8 +1,20 @@
-<?php echo '<?xml version="1.0" encoding="UTF-8"?>'; ?>
+<?php
+// A "Folder" groups all locations of one item. It can be set systematically
+// even when only the first location of each item is displayed. Else, all
+// placemarks can be set at the same level and each point will contain all the
+// metadata of the item. This option can be modified inside the theme.
+// The main purpose of this choice is related to the possibility to reuse the
+// kml data somewhere outside of Omeka.
+$byFolder = true;
+
+echo '<?xml version="1.0" encoding="UTF-8"?>'; ?>
 <kml xmlns="http://earth.google.com/kml/2.0">
     <Document>
         <name>Omeka Items KML</name>
-        <?php /* Here is the styling for the balloon that appears on the map */ ?>
+        <?php
+        // Here is the styling for the balloon that appears on the map. Values
+        // "$[x]" will be replaced via javascript.
+        ?>
         <Style id="item-info-balloon">
             <BalloonStyle>
                 <text><![CDATA[
@@ -15,30 +27,79 @@
             </BalloonStyle>
         </Style>
         <?php
-        foreach(loop('item') as $item):        
-        $location = $locations[$item->id];
+
+        if ($byFolder):
+            foreach(loop('item') as $item): ?>
+            <Folder id="item-<?php echo $item->id; ?>">
+                <name><![CDATA[<?php
+                    echo metadata($item, array('Dublin Core', 'Title'));
+                ?>]]></name>
+                <namewithlink><![CDATA[<?php
+                    echo link_to_item(metadata($item , array('Dublin Core', 'Title')), array('class' => 'view-item'));
+                ?>]]></namewithlink>
+                <Snippet maxLines="2"><![CDATA[<?php
+                    echo metadata($item, array('Dublin Core', 'Description'), array('snippet' => 150));
+                ?>]]></Snippet>
+                <description><![CDATA[<?php
+                // @since 3/26/08: movies do not display properly on the map in IE6,
+                // so can't use display_files(). Description field contains the HTML
+                // for displaying the first file (if possible).
+                if (metadata($item, 'has thumbnail')):
+                    echo link_to_item(item_image('thumbnail', array(), 0, $item), array('class' => 'view-item'));
+                endif;
+                ?>]]></description>
+                <?php
+                // One or multiple locations can be displayed by item.
+                if (is_object($locations[$item->id])):
+                    $location = $locations[$item->id];
+                    echo $this->partial('map/browse-placemark-kml.php', array(
+                        'item' => $item,
+                        'location' => $location,
+                        'byFolder' => true,
+                    ));
+                // Multiple locations.
+                else:
+                    $itemLocations = $locations[$item->id];
+                    foreach ($itemLocations as $key => $location):
+                        echo $this->partial('map/browse-placemark-kml.php', array(
+                            'item' => $item,
+                            'location' => $location,
+                            // Return a one based number.
+                            'indexLocation' => $key + 1,
+                            'countLocations' => count($itemLocations),
+                            'byFolder' => true,
+                        ));
+                    endforeach;
+                endif;
+                ?>
+                </Folder>
+            <?php endforeach;
+
+        // All placemarks together, without the item/folder level.
+        else:
+            foreach(loop('item') as $item):
+                // One or multiple locations can be displayed by item.
+                if (is_object($locations[$item->id])):
+                    $location = $locations[$item->id];
+                    echo $this->partial('map/browse-placemark-kml.php', array(
+                        'item' => $item,
+                        'location' => $location,
+                    ));
+                // Multiple locations.
+                else:
+                    $itemLocations = $locations[$item->id];
+                    foreach ($itemLocations as $key => $location):
+                        echo $this->partial('map/browse-placemark-kml.php', array(
+                            'item' => $item,
+                            'location' => $location,
+                            // Return a one based number.
+                            'indexLocation' => $key + 1,
+                            'countLocations' => count($itemLocations),
+                        ));
+                    endforeach;
+                endif;
+            endforeach;
+        endif;
         ?>
-        <Placemark>
-            <name><![CDATA[<?php echo metadata('item', array('Dublin Core', 'Title'));?>]]></name>
-            <namewithlink><![CDATA[<?php echo link_to_item(metadata('item' , array('Dublin Core', 'Title')), array('class' => 'view-item')); ?>]]></namewithlink>
-            <Snippet maxLines="2"><![CDATA[<?php
-            echo metadata('item', array('Dublin Core', 'Description'), array('snippet' => 150));
-            ?>]]></Snippet>    
-            <description><![CDATA[<?php 
-            // @since 3/26/08: movies do not display properly on the map in IE6, 
-            // so can't use display_files(). Description field contains the HTML 
-            // for displaying the first file (if possible).
-            if (metadata($item, 'has thumbnail')) {
-                echo link_to_item(item_image('thumbnail'), array('class' => 'view-item'));                
-            }
-            ?>]]></description>
-            <Point>
-                <coordinates><?php echo $location['longitude']; ?>,<?php echo $location['latitude']; ?></coordinates>
-            </Point>
-            <?php if ($location['address']): ?>
-            <address><![CDATA[<?php echo $location['address']; ?>]]></address>
-            <?php endif; ?>
-        </Placemark>
-        <?php endforeach; ?>
     </Document>
 </kml>
diff --git a/views/shared/map/input-partial-row.php b/views/shared/map/input-partial-row.php
new file mode 100644
index 0000000..6c9db09
--- /dev/null
+++ b/views/shared/map/input-partial-row.php
@@ -0,0 +1,89 @@
+<?php
+// Add a new location.
+if (empty($location)) {
+    $id = time();
+    $latitude = '';
+    $longitude = '';
+    $zoom_level = get_option('geolocation_default_zoom_level');
+    $map_type = get_option('geolocation_default_map_type');
+    $address = '';
+    $description = '';
+}
+// Existing location.
+else {
+    $id = $location->id;
+    $latitude = $location->latitude;
+    $longitude = $location->longitude;
+    $zoom_level = $location->zoom_level;
+    $map_type = $location->map_type;
+    $address = $location->address;
+    $description = $location->description;
+}
+
+$baseField = 'geolocation[' . $id . ']';
+$mapTypes = array(
+    'roadmap' => __('Roadmap'),
+    'satellite' => __('Satellite'),
+    'hybrid' => __('Hybrid'),
+    'terrain' => __('Terrain'),
+);
+$zoomLevels = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21);
+?>
+<tr id="geolocation-location-<?php echo $id; ?>" class="geolocation-location <?php echo $key%2 ? 'odd' : 'even'; ?>">
+    <td>
+        <button type="button" class="geolocation-display button small green" id="locations-<?php echo $id; ?>-display" name="<?php echo $baseField; ?>[display]" title="<?php echo __('Display this location'); ?>">O</button>
+        <button type="button" class="geolocation-remove button small red" id="locations-<?php echo $id; ?>-remove" name="<?php echo $baseField; ?>[remove]" title="<?php echo __('Remove this location'); ?>">X</button>
+    </td>
+    <td colspan="4">
+    <div>
+        <span><?php
+        echo $this->formText($baseField . '[latitude]',
+            $latitude,
+            array(
+                'placeholder' => __('Latitude'),
+                'maxlength' => '15',
+                'class' => 'geolocation-latitude',
+            ));
+        ?></span>
+        <span><?php
+        echo $this->formText($baseField . '[longitude]',
+            $longitude,
+            array(
+                'placeholder' => __('Longitude'),
+                'maxlength' => '15',
+                'class' => 'geolocation-longitude',
+            ));
+        ?></span>
+        <span><?php
+        echo $this->formSelect($baseField . '[zoom_level]',
+            $zoom_level,
+            array('class' => 'geolocation-zoom-level'),
+            $zoomLevels);
+        ?></span>
+        <span><?php
+        echo $this->formSelect($baseField . '[map_type]',
+            $map_type,
+            array('class' => 'geolocation-map-type'),
+            $mapTypes);
+        ?></span>
+    </div>
+    <div>
+        <span><?php
+        echo $this->formText($baseField . '[address]',
+            $address,
+            array(
+                'placeholder' => __('Address'),
+                'class' => 'geolocation-address',
+            ));
+        ?></span>
+        <span><?php
+        echo $this->formText($baseField . '[description]',
+            $description,
+            array(
+                'placeholder' => __('Description'),
+                'class' => 'geolocation-description',
+            ));
+        ?></span>
+    </div>
+    </td>
+</tr>
diff --git a/views/shared/map/input-partial.php b/views/shared/map/input-partial.php
new file mode 100644
index 0000000..f9db146
--- /dev/null
+++ b/views/shared/map/input-partial.php
@@ -0,0 +1,62 @@
+<div class="geolocation-list seven columns alpha omega">
+    <h3><?php echo __('List of locations'); ?></h3>
+    <table id="geolocation-locations-<?php echo $item->id; ?>" class="geolocation-locations">
+        <colgroup><col /></colgroup>
+        <thead>
+            <tr>
+                <th>
+                    <button type="button" class="geolocation-locations-display button small green" name="geolocation_locations_display" id="geolocation_locations_display-<?php echo $item->id; ?>">
+                        <?php echo __('All'); ?>
+                    </button>
+                </th>
+                <th><?php echo __('Latitude'); ?></th>
+                <th><?php echo __('Longitude'); ?></th>
+                <th><?php echo __('Zoom Level'); ?></th>
+                <th><?php echo __('Map Type'); ?></th>
+            </tr>
+        </thead>
+        <tbody>
+            <?php
+            if (empty($locations)):
+                $key = 0;?>
+                <tr id="geolocation-empty">
+                    <td colspan="5"><?php echo __('No location defined.'); ?></td>
+                </tr>
+            <?php else:
+                foreach ($locations as $key => $location):
+                    echo $this->partial('map/input-partial-row.php', array(
+                        'location' => $location,
+                        'key' => $key,
+                    ));
+                endforeach;
+            endif;
+            /*
+            // New element.
+            echo $this->partial('map/input-partial-row.php', array(
+                'key' => $key + 1,
+            ));
+             */
+          ?>
+        </tbody>
+    </table>
+</div>
+<div class="geolocation-add-form seven columns alpha omega">
+    <h3><?php echo __('Add a new location'); ?></h3>
+    <div class="field">
+        <div id="location_form" class="two columns alpha">
+            <label><?php echo __('Find by address or point to a location'); ?></label>
+        </div>
+        <div class="inputs five columns omega">
+            <div class="input-block">
+                <input type="text" name="current-geolocation[address]" id="geolocation_address" value="" placeholder="<?php echo __('Address to find'); ?>" class="textinput" />
+                <button type="button" name="geolocation_location_find" id="geolocation_location_find" class="button small green">
+                    <?php echo __('Find'); ?>
+                </button>
+                <button type="button" name="geolocation_location_add" id="geolocation_location_add" class="button small blue">
+                    <?php echo __('Add'); ?>
+                </button>
+            </div>
+        </div>
+    </div>
+    <div  id="omeka-map-form" class="seven columns alpha omega"></div>
+</div>