Merge remote-tracking branch 'origin/master'

gis_data_editor.php

@@ -158,6 +158,7 @@ foreach ($gis_types as $gis_type) {
 }
 echo '</select>';
 echo '&nbsp;&nbsp;&nbsp;&nbsp;';
+/* l10n: Spatial Reference System Identifier */
 echo '<label for="srid">' .  __('SRID:') . '</label>';
 echo '<input name="gis_data[srid]" type="text" value="' . $srid . '" />';
 echo '</div>';

po/zh_CN.po

@@ -513,7 +513,6 @@ msgstr "字段“%s”的值"
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "以 OpenStreetMaps 为背景"
 
-# what's the f**k word of "SRID"?
 #: gis_data_editor.php:161
 msgid "SRID:"
 msgstr "空间参照标识符："