summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/geocode.php98
-rw-r--r--actions/newnotice.php2
-rw-r--r--classes/Notice_inbox.php9
-rw-r--r--js/jquery.cookie.js96
-rw-r--r--js/util.js80
-rw-r--r--lib/action.php1
-rw-r--r--lib/noticeform.php21
-rw-r--r--lib/router.php3
-rw-r--r--lib/util.php1
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/arz/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po186
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/el/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/fa/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/he/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/hsb/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/ia/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po883
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po188
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po217
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po182
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po181
-rw-r--r--locale/statusnet.po174
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po188
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po179
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po179
-rw-r--r--plugins/CasAuthentication/CasAuthenticationPlugin.php1
-rw-r--r--scripts/triminboxes.php24
-rw-r--r--theme/base/css/display.css15
-rw-r--r--theme/identica/css/display.css4
49 files changed, 4268 insertions, 3298 deletions
diff --git a/actions/geocode.php b/actions/geocode.php
new file mode 100644
index 000000000..9671d2c27
--- /dev/null
+++ b/actions/geocode.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Geocode action class
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package StatusNet
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+ exit(1);
+}
+
+/**
+ * Geocode action class
+ *
+ * @category Action
+ * @package StatusNet
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link http://status.net/
+ */
+class GeocodeAction extends Action
+{
+ function prepare($args)
+ {
+ parent::prepare($args);
+ $token = $this->trimmed('token');
+ if (!$token || $token != common_session_token()) {
+ $this->clientError(_('There was a problem with your session token. '.
+ 'Try again, please.'));
+ }
+ $this->lat = $this->trimmed('lat');
+ $this->lon = $this->trimmed('lon');
+ $location = Location::fromLatLon($this->lat, $this->lon);
+ if ($location) {
+ $this->location = Location::fromId($location->location_id, $location->location_ns);
+ $this->lat = $this->location->lat;
+ $this->lon = $this->location->lon;
+ }
+ return true;
+ }
+
+ /**
+ * Class handler
+ *
+ * @param array $args query arguments
+ *
+ * @return nothing
+ *
+ **/
+ function handle($args)
+ {
+ header('Content-Type: application/json; charset=utf-8');
+ $location_object = array();
+ $location_object['lat']=$this->lat;
+ $location_object['lon']=$this->lon;
+ if($this->location) {
+ $location_object['location_id']=$this->location->location_id;
+ $location_object['location_ns']=$this->location->location_ns;
+ $location_object['name']=$this->location->getName();
+ $location_object['url']=$this->location->getUrl();
+ }
+ print(json_encode($location_object));
+ }
+
+ /**
+ * Is this action read-only?
+ *
+ * @return boolean true
+ */
+
+ function isReadOnly($args)
+ {
+ return true;
+ }
+}
+?>
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 2d9f0ff79..8d89e9da0 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -184,7 +184,7 @@ class NewnoticeAction extends Action
$options = array('reply_to' => ($replyto == 'false') ? null : $replyto);
- if ($user->shareLocation()) {
+ if ($user->shareLocation() && $this->arg('notice_data-location_enabled')) {
$locOptions = Notice::locationOptions($this->trimmed('lat'),
$this->trimmed('lon'),
diff --git a/classes/Notice_inbox.php b/classes/Notice_inbox.php
index b39006542..d3ddad656 100644
--- a/classes/Notice_inbox.php
+++ b/classes/Notice_inbox.php
@@ -106,6 +106,13 @@ class Notice_inbox extends Memcached_DataObject
return Memcached_DataObject::pkeyGet('Notice_inbox', $kv);
}
+ /**
+ * Trim inbox for a given user to latest NOTICE_INBOX_LIMIT items
+ * (up to NOTICE_INBOX_GC_MAX will be deleted).
+ *
+ * @param int $user_id
+ * @return int count of notices dropped from the inbox, if any
+ */
static function gc($user_id)
{
$entry = new Notice_inbox();
@@ -133,6 +140,8 @@ class Notice_inbox extends Memcached_DataObject
$notices = array();
}
}
+
+ return $total;
}
static function deleteMatching($user_id, $notices)
diff --git a/js/jquery.cookie.js b/js/jquery.cookie.js
new file mode 100644
index 000000000..6df1faca2
--- /dev/null
+++ b/js/jquery.cookie.js
@@ -0,0 +1,96 @@
+/**
+ * Cookie plugin
+ *
+ * Copyright (c) 2006 Klaus Hartl (stilbuero.de)
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ */
+
+/**
+ * Create a cookie with the given name and value and other optional parameters.
+ *
+ * @example $.cookie('the_cookie', 'the_value');
+ * @desc Set the value of a cookie.
+ * @example $.cookie('the_cookie', 'the_value', { expires: 7, path: '/', domain: 'jquery.com', secure: true });
+ * @desc Create a cookie with all available options.
+ * @example $.cookie('the_cookie', 'the_value');
+ * @desc Create a session cookie.
+ * @example $.cookie('the_cookie', null);
+ * @desc Delete a cookie by passing null as value. Keep in mind that you have to use the same path and domain
+ * used when the cookie was set.
+ *
+ * @param String name The name of the cookie.
+ * @param String value The value of the cookie.
+ * @param Object options An object literal containing key/value pairs to provide optional cookie attributes.
+ * @option Number|Date expires Either an integer specifying the expiration date from now on in days or a Date object.
+ * If a negative value is specified (e.g. a date in the past), the cookie will be deleted.
+ * If set to null or omitted, the cookie will be a session cookie and will not be retained
+ * when the the browser exits.
+ * @option String path The value of the path atribute of the cookie (default: path of page that created the cookie).
+ * @option String domain The value of the domain attribute of the cookie (default: domain of page that created the cookie).
+ * @option Boolean secure If true, the secure attribute of the cookie will be set and the cookie transmission will
+ * require a secure protocol (like HTTPS).
+ * @type undefined
+ *
+ * @name $.cookie
+ * @cat Plugins/Cookie
+ * @author Klaus Hartl/klaus.hartl@stilbuero.de
+ */
+
+/**
+ * Get the value of a cookie with the given name.
+ *
+ * @example $.cookie('the_cookie');
+ * @desc Get the value of a cookie.
+ *
+ * @param String name The name of the cookie.
+ * @return The value of the cookie.
+ * @type String
+ *
+ * @name $.cookie
+ * @cat Plugins/Cookie
+ * @author Klaus Hartl/klaus.hartl@stilbuero.de
+ */
+jQuery.cookie = function(name, value, options) {
+ if (typeof value != 'undefined') { // name and value given, set cookie
+ options = options || {};
+ if (value === null) {
+ value = '';
+ options.expires = -1;
+ }
+ var expires = '';
+ if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) {
+ var date;
+ if (typeof options.expires == 'number') {
+ date = new Date();
+ date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
+ } else {
+ date = options.expires;
+ }
+ expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE
+ }
+ // CAUTION: Needed to parenthesize options.path and options.domain
+ // in the following expressions, otherwise they evaluate to undefined
+ // in the packed version for some reason...
+ var path = options.path ? '; path=' + (options.path) : '';
+ var domain = options.domain ? '; domain=' + (options.domain) : '';
+ var secure = options.secure ? '; secure' : '';
+ document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join('');
+ } else { // only name given, get cookie
+ var cookieValue = null;
+ if (document.cookie && document.cookie != '') {
+ var cookies = document.cookie.split(';');
+ for (var i = 0; i < cookies.length; i++) {
+ var cookie = jQuery.trim(cookies[i]);
+ // Does this cookie string begin with the name we want?
+ if (cookie.substring(0, name.length + 1) == (name + '=')) {
+ cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+ break;
+ }
+ }
+ }
+ return cookieValue;
+ }
+}; \ No newline at end of file
diff --git a/js/util.js b/js/util.js
index 0987c6cc0..dd7a74a7a 100644
--- a/js/util.js
+++ b/js/util.js
@@ -50,7 +50,9 @@ var SN = { // StatusNet
NoticeLat: 'notice_data-lat',
NoticeLon: 'notice_data-lon',
NoticeLocationId: 'notice_data-location_id',
- NoticeLocationNs: 'notice_data-location_ns'
+ NoticeLocationNs: 'notice_data-location_ns',
+ NoticeLocationName: 'notice_data-location_name',
+ NoticeLocationCookieName: 'location_enabled'
}
},
@@ -436,10 +438,78 @@ var SN = { // StatusNet
},
NoticeLocationAttach: function() {
- if(navigator.geolocation) navigator.geolocation.watchPosition(function(position) {
- $('#'+SN.C.S.NoticeLat).val(position.coords.latitude);
- $('#'+SN.C.S.NoticeLon).val(position.coords.longitude);
- });
+ if ($('#notice_data-location_enabled').length > 0) {
+ var NLE = $('#notice_data-location_wrap');
+ var geocodeURL = NLE.attr('title');
+
+ NLE.insertAfter('#'+SN.C.S.FormNotice+' fieldset');
+
+ if (navigator.geolocation) {
+ NLE.change(function() {
+ NLE.removeAttr('title');
+
+ $.cookie(SN.C.S.NoticeLocationCookieName, $('#notice_data-location_enabled').attr('checked'));
+
+ var NLN = $('#'+SN.C.S.NoticeLocationName);
+ if (NLN.length > 0) {
+ NLN.remove();
+ }
+
+ NLE.prepend('<span id="'+SN.C.S.NoticeLocationName+'">Geo</span>');
+ NLN = $('#'+SN.C.S.NoticeLocationName);
+
+ if ($('#notice_data-location_enabled').attr('checked') === true) {
+ NLN.show();
+ NLN.addClass('processing');
+
+ navigator.geolocation.getCurrentPosition(function(position) {
+ $('#'+SN.C.S.NoticeLat).val(position.coords.latitude);
+ $('#'+SN.C.S.NoticeLon).val(position.coords.longitude);
+
+ var data = {
+ 'lat': position.coords.latitude,
+ 'lon': position.coords.longitude,
+ 'token': $('#token').val()
+ };
+
+ $.getJSON(geocodeURL, data, function(location) {
+ NLN.replaceWith('<a id="notice_data-location_name"/>');
+ NLN = $('#'+SN.C.S.NoticeLocationName);
+
+ if (typeof(location.location_ns) != 'undefined') {
+ $('#'+SN.C.S.NoticeLocationNs).val(location.location_ns);
+ }
+
+ if (typeof(location.location_id) != 'undefined') {
+ $('#'+SN.C.S.NoticeLocationId).val(location.location_id);
+ }
+
+ if (typeof(location.name) == 'undefined') {
+ NLN_text = position.coords.latitude + ';' + position.coords.longitude;
+ }
+ else {
+ NLN_text = location.name;
+ }
+
+ NLN.attr('href', location.url);
+ NLN.text(NLN_text);
+ });
+ });
+ }
+ else {
+ NLN.hide();
+ $('#'+SN.C.S.NoticeLat).val('');
+ $('#'+SN.C.S.NoticeLon).val('');
+ $('#'+SN.C.S.NoticeLocationNs).val('');
+ $('#'+SN.C.S.NoticeLocationId).val('');
+ }
+ });
+
+ var cookieVal = $.cookie(SN.C.S.NoticeLocationCookieName);
+ $('#notice_data-location_enabled').attr('checked', (cookieVal == null || cookieVal == 'true'));
+ NLE.change();
+ }
+ }
},
NewDirectMessage: function() {
diff --git a/lib/action.php b/lib/action.php
index dac0e2583..35df03566 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -252,6 +252,7 @@ class Action extends HTMLOutputter // lawsuit
if (Event::handle('StartShowJQueryScripts', array($this))) {
$this->script('js/jquery.min.js');
$this->script('js/jquery.form.js');
+ $this->script('js/jquery.cookie.js');
$this->script('js/jquery.joverlay.min.js');
Event::handle('EndShowJQueryScripts', array($this));
}
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 593a1e932..d35655a0b 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -110,6 +110,8 @@ class NoticeForm extends Form
$this->user = common_current_user();
}
+ $this->profile = $this->user->getProfile();
+
if (common_config('attachments', 'uploads')) {
$this->enctype = 'multipart/form-data';
}
@@ -198,12 +200,21 @@ class NoticeForm extends Form
$this->out->hidden('notice_return-to', $this->action, 'returnto');
}
$this->out->hidden('notice_in-reply-to', $this->inreplyto, 'inreplyto');
- $this->out->hidden('notice_data-lat', empty($this->lat) ? null : $this->lat, 'lat');
- $this->out->hidden('notice_data-lon', empty($this->lon) ? null : $this->lon, 'lon');
- $this->out->hidden('notice_data-location_id', empty($this->location_id) ? null : $this->location_id, 'location_id');
- $this->out->hidden('notice_data-location_ns', empty($this->location_ns) ? null : $this->location_ns, 'location_ns');
- Event::handle('StartShowNoticeFormData', array($this));
+ if ($this->user->shareLocation()) {
+ $this->out->hidden('notice_data-lat', empty($this->lat) ? (empty($this->profile->lat) ? null : $this->profile->lat) : $this->lat, 'lat');
+ $this->out->hidden('notice_data-lon', empty($this->lon) ? (empty($this->profile->lon) ? null : $this->profile->lon) : $this->lon, 'lon');
+ $this->out->hidden('notice_data-location_id', empty($this->location_id) ? (empty($this->profile->location_id) ? null : $this->profile->location_id) : $this->location_id, 'location_id');
+ $this->out->hidden('notice_data-location_ns', empty($this->location_ns) ? (empty($this->profile->location_ns) ? null : $this->profile->location_ns) : $this->location_ns, 'location_ns');
+
+ $this->out->elementStart('div', array('id' => 'notice_data-location_wrap',
+ 'class' => 'success',
+ 'title' => common_local_url('geocode')));
+ $this->out->checkbox('notice_data-location_enabled', _('Share your location'), true);
+ $this->out->elementEnd('div');
+ }
+
+ Event::handle('EndShowNoticeFormData', array($this));
}
}
diff --git a/lib/router.php b/lib/router.php
index 474e05996..7ec962460 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -100,7 +100,8 @@ class Router
'sandbox', 'unsandbox',
'silence', 'unsilence',
'repeat',
- 'deleteuser');
+ 'deleteuser',
+ 'geocode');
foreach ($main as $a) {
$m->connect('main/'.$a, array('action' => $a));
diff --git a/lib/util.php b/lib/util.php
index ed81aeba1..df3110ddd 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1416,6 +1416,7 @@ function common_memcache()
} else {
$cache->addServer($servers);
}
+ $cache->setCompressThreshold(20000, 0.2);
}
return $cache;
}
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 0a4bdeb2f..7053fbc47 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:09:41+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:06:07+0000\n"
"Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: out-statusnet\n"
@@ -188,11 +188,11 @@ msgstr "تعذّر تحديث تصميمك."
msgid "You cannot block yourself!"
msgstr "لا يمكنك منع نفسك!"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "فشل منع المستخدم."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "فشل إلغاء منع المستخدم."
@@ -304,31 +304,31 @@ msgid "Could not find target user."
msgstr "تعذّر إيجاد المستخدم الهدف."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr ""
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "ليس اسمًا مستعارًا صحيحًا."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
@@ -339,7 +339,7 @@ msgid "Description is too long (max %d chars)."
msgstr ""
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr ""
@@ -454,7 +454,7 @@ msgstr ""
msgid "Not found"
msgstr "لم يوجد"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -596,13 +596,13 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -672,7 +672,7 @@ msgstr "نعم"
msgid "Block this user"
msgstr "امنع هذا المستخدم"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "فشل حفظ معلومات المنع."
@@ -744,7 +744,7 @@ msgstr ""
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "تعذّر تحديث المستخدم."
@@ -938,7 +938,7 @@ msgstr "ارجع إلى المبدئي"
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1420,7 +1420,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr "قائمة بمستخدمي هذه المجموعة."
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "إداري"
@@ -1507,7 +1507,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "المستخدم ليس ممنوعًا من المجموعة."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "خطأ أثناء منع الحجب."
@@ -1772,7 +1772,7 @@ msgstr "اسم المستخدم أو كلمة السر غير صحيحان."
msgid "Error setting user. You are probably not authorized."
msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "لُج"
@@ -1879,7 +1879,7 @@ msgstr "أُرسلت الرسالة"
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "خطأ أجاكس"
@@ -1887,7 +1887,7 @@ msgstr "خطأ أجاكس"
msgid "New notice"
msgstr "إشعار جديد"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "أُرسل الإشعار"
@@ -2304,69 +2304,78 @@ msgstr "الموقع"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "الوسوم"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "اللغة"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "اللغة المفضلة"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "المنطقة الزمنية"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "ما المنطقة الزمنية التي تتواجد فيها عادة؟"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr ""
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "لم تُختر المنطقة الزمنية."
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr ""
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "وسم غير صالح: \"%s\""
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "تعذّر حفظ الوسوم."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "تعذّر حفظ الملف الشخصي."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "تعذّر حفظ الوسوم."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "حُفظت الإعدادات."
@@ -2601,7 +2610,7 @@ msgstr "عذرا، رمز دعوة غير صالح."
msgid "Registration successful"
msgstr "نجح التسجيل"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "سجّل"
@@ -3839,16 +3848,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "مشكلة أثناء حفظ الإشعار."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر تي @%1$s %2$s"
@@ -3903,128 +3912,128 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "صفحة غير مُعنونة"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "الرئيسية"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr "الملف الشخصي ومسار الأصدقاء الزمني"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "الحساب"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "اتصل"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect to services"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:441
msgid "Change site configuration"
msgstr "غيّر ضبط الموقع"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "ادعُ"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "اخرج"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "اخرج من الموقع"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "أنشئ حسابًا"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "لُج إلى الموقع"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "مساعدة"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "ساعدني!"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "ابحث"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "ابحث عن أشخاص أو نص"
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr "إشعار الموقع"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "المشاهدات المحلية"
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr "إشعار الصفحة"
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "عن"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "الأسئلة المكررة"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr "الشروط"
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "خصوصية"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "المصدر"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "اتصل"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr ""
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4033,12 +4042,12 @@ msgstr ""
"**%%site.name%%** خدمة تدوين مصغر يقدمها لك [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4049,31 +4058,31 @@ msgstr ""
"المتوفر تحت [رخصة غنو أفيرو العمومية](http://www.fsf.org/licensing/licenses/"
"agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
msgid "Site content license"
msgstr "رخصة محتوى الموقع"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr ""
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "الرخصة."
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr ""
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "بعد"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "قبل"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr ""
@@ -4885,6 +4894,14 @@ msgstr "أرفق"
msgid "Attach a file"
msgstr "أرفق ملفًا"
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index c0ec3623e..eadbe6c6e 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:09:44+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:06:10+0000\n"
"Language-Team: Egyptian Spoken Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: arz\n"
"X-Message-Group: out-statusnet\n"
@@ -187,11 +187,11 @@ msgstr "تعذّر تحديث تصميمك."
msgid "You cannot block yourself!"
msgstr "ا يمكنك منع نفسك!"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "فشل منع المستخدم."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "فشل إلغاء منع المستخدم."
@@ -303,31 +303,31 @@ msgid "Could not find target user."
msgstr "تعذّر إيجاد المستخدم الهدف."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr ""
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "ليس اسمًا مستعارًا صحيحًا."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
@@ -338,7 +338,7 @@ msgid "Description is too long (max %d chars)."
msgstr ""
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr ""
@@ -453,7 +453,7 @@ msgstr ""
msgid "Not found"
msgstr "لم يوجد"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -595,13 +595,13 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -671,7 +671,7 @@ msgstr "نعم"
msgid "Block this user"
msgstr "امنع هذا المستخدم"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "فشل حفظ معلومات المنع."
@@ -743,7 +743,7 @@ msgstr ""
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "تعذّر تحديث المستخدم."
@@ -937,7 +937,7 @@ msgstr "ارجع إلى المبدئي"
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1419,7 +1419,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr "قائمه بمستخدمى هذه المجموعه."
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "إداري"
@@ -1506,7 +1506,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "المستخدم ليس ممنوعًا من المجموعه."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "خطأ أثناء منع الحجب."
@@ -1771,7 +1771,7 @@ msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
msgid "Error setting user. You are probably not authorized."
msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "لُج"
@@ -1878,7 +1878,7 @@ msgstr "أُرسلت الرسالة"
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "خطأ أجاكس"
@@ -1886,7 +1886,7 @@ msgstr "خطأ أجاكس"
msgid "New notice"
msgstr "إشعار جديد"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "أُرسل الإشعار"
@@ -2303,69 +2303,78 @@ msgstr "الموقع"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "الوسوم"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "اللغة"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "اللغه المفضلة"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "المنطقه الزمنية"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "ما المنطقه الزمنيه التى تتواجد فيها عادة؟"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr ""
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "لم تُختر المنطقه الزمنيه."
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr ""
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "وسم غير صالح: \"%s\""
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "تعذّر حفظ الوسوم."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "تعذّر حفظ الملف الشخصى."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "تعذّر حفظ الوسوم."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "حُفظت الإعدادات."
@@ -2600,7 +2609,7 @@ msgstr "عذرا، رمز دعوه غير صالح."
msgid "Registration successful"
msgstr "نجح التسجيل"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "سجّل"
@@ -3838,16 +3847,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "مشكله أثناء حفظ الإشعار."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر تي @%1$s %2$s"
@@ -3902,128 +3911,128 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "صفحه غير مُعنونة"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "الرئيسية"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr "الملف الشخصى ومسار الأصدقاء الزمني"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "الحساب"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "اتصل"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect to services"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:441
msgid "Change site configuration"
msgstr "غيّر ضبط الموقع"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "ادعُ"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "اخرج"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "اخرج من الموقع"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "أنشئ حسابًا"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "لُج إلى الموقع"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "مساعدة"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "ساعدني!"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "ابحث"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "ابحث عن أشخاص أو نص"
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr "إشعار الموقع"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "المشاهدات المحلية"
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr "إشعار الصفحة"
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "عن"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "الأسئله المكررة"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr "الشروط"
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "خصوصية"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "المصدر"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "اتصل"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr ""
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4032,12 +4041,12 @@ msgstr ""
"**%%site.name%%** خدمه تدوين مصغر يقدمها لك [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4048,31 +4057,31 @@ msgstr ""
"المتوفر تحت [رخصه غنو أفيرو العمومية](http://www.fsf.org/licensing/licenses/"
"agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
msgid "Site content license"
msgstr "رخصه محتوى الموقع"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr ""
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "الرخصه."
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr ""
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "بعد"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "قبل"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr ""
@@ -4884,6 +4893,14 @@ msgstr "أرفق"
msgid "Attach a file"
msgstr "أرفق ملفًا"
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index b3940ff01..4f85d85d7 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
# Translation of StatusNet to Bulgarian
#
+# Author@translatewiki.net: DCLXVI
# Author@translatewiki.net: Turin
# --
# This file is distributed under the same license as the StatusNet package.
@@ -8,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:09:50+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:06:13+0000\n"
"Language-Team: Bulgarian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: out-statusnet\n"
@@ -188,11 +189,11 @@ msgstr "Грешка при обновяване на потребителя."
msgid "You cannot block yourself!"
msgstr "Не можете да блокирате себе си!"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "Грешка при блокиране на потребителя."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "Грешка при разблокиране на потребителя."
@@ -303,12 +304,11 @@ msgid "Could not determine source user."
msgstr "Грешка при изтегляне на общия поток"
#: actions/apifriendshipsshow.php:143
-#, fuzzy
msgid "Could not find target user."
-msgstr "Не са открити бележки."
+msgstr "Целевият потребител не беше открит."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
@@ -316,25 +316,25 @@ msgstr ""
"между тях."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Опитайте друг псевдоним, този вече е зает."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Неправилен псевдоним."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "Адресът на личната страница не е правилен URL."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Пълното име е твърде дълго (макс. 255 знака)"
@@ -345,7 +345,7 @@ msgid "Description is too long (max %d chars)."
msgstr "Описанието е твърде дълго (до %d символа)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "Името на местоположението е твърде дълго (макс. 255 знака)."
@@ -460,7 +460,7 @@ msgstr "Твърде дълга бележка. Трябва да е най-мн
msgid "Not found"
msgstr "Не е открито."
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -604,13 +604,13 @@ msgid "Crop"
msgstr "Изрязване"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -680,7 +680,7 @@ msgstr "Да"
msgid "Block this user"
msgstr "Блокиране на потребителя"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "Грешка при записване данните за блокирането."
@@ -754,7 +754,7 @@ msgstr "Този адрес е вече потвърден."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Грешка при обновяване на потребителя."
@@ -954,7 +954,7 @@ msgstr ""
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1268,9 +1268,8 @@ msgid "No notice."
msgstr "Липсва бележка."
#: actions/file.php:42
-#, fuzzy
msgid "No attachments."
-msgstr "Няма такъв документ."
+msgstr "Няма прикачени файлове."
#: actions/file.php:51
#, fuzzy
@@ -1458,7 +1457,7 @@ msgstr "Членове на групата %s, страница %d"
msgid "A list of the users in this group."
msgstr "Списък с потребителите в тази група."
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "Настройки"
@@ -1549,7 +1548,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "Потребителят ви е блокирал."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
#, fuzzy
msgid "Error removing the block."
msgstr "Грешка при запазване на потребител."
@@ -1857,7 +1856,7 @@ msgstr "Грешно име или парола."
msgid "Error setting user. You are probably not authorized."
msgstr "Забранено."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Вход"
@@ -1970,7 +1969,7 @@ msgstr "Съобщението е изпратено"
msgid "Direct message to %s sent"
msgstr "Прякото съобщение до %s е изпратено."
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "Грешка в Ajax"
@@ -1978,7 +1977,7 @@ msgstr "Грешка в Ajax"
msgid "New notice"
msgstr "Нова бележка"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "Бележката е публикувана"
@@ -2401,71 +2400,80 @@ msgstr "Местоположение"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Къде се намирате (град, община, държава и т.н.)"
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "Етикети"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Език"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "Предпочитан език"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Часови пояс"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "В кой часови пояс сте обикновено?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
"Автоматично абониране за всеки, който се абонира за мен (подходящо за "
"ботове)."
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Биографията е твърде дълга (до %d символа)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "Не е избран часови пояс"
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "Името на езика е твърде дълго (може да е до 50 знака)."
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Неправилен етикет: \"%s\""
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Грешка при запазване етикетите."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Грешка при запазване на профила."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "Грешка при запазване етикетите."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Настройките са запазени."
@@ -2698,7 +2706,7 @@ msgstr "Грешка в кода за потвърждение."
msgid "Registration successful"
msgstr "Записването е успешно."
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистриране"
@@ -4000,16 +4008,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr "Забранено ви е да публикувате бележки в този сайт."
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Проблем при записване на бележката."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4066,132 +4074,132 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Неозаглавена страница"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Начало"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "Сметка"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr "Промяна на поща, аватар, парола, профил"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Свързване"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect to services"
msgstr "Свързване към услуги"
-#: lib/action.php:440
+#: lib/action.php:441
msgid "Change site configuration"
msgstr "Промяна настройките на сайта"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Покани"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Поканете приятели и колеги да се присъединят към вас в %s"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Изход"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "Излизане от сайта"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "Създаване на нова сметка"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "Влизане в сайта"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Помощ"
-#: lib/action.php:461
+#: lib/action.php:462
#, fuzzy
msgid "Help me!"
msgstr "Помощ"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Търсене"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "Търсене за хора или бележки"
-#: lib/action.php:485
+#: lib/action.php:486
#, fuzzy
msgid "Site notice"
msgstr "Нова бележка"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr ""
-#: lib/action.php:617
+#: lib/action.php:618
#, fuzzy
msgid "Page notice"
msgstr "Нова бележка"
-#: lib/action.php:719
+#: lib/action.php:720
#, fuzzy
msgid "Secondary site navigation"
msgstr "Абонаменти"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "Относно"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "Въпроси"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr "Условия"
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Поверителност"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Изходен код"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr "Табелка"
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr "Лиценз на програмата StatusNet"
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4200,12 +4208,12 @@ msgstr ""
"**%%site.name%%** е услуга за микроблогване, предоставена ви от [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** е услуга за микроблогване. "
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4216,31 +4224,31 @@ msgstr ""
"достъпна под [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
msgid "Site content license"
msgstr "Лиценз на съдържанието"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr "Всички "
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "лиценз."
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "Страниране"
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "След"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "Преди"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr "Имаше проблем със сесията ви в сайта."
@@ -5064,6 +5072,14 @@ msgstr "Прикрепяне"
msgid "Attach a file"
msgstr "Прикрепяне на файл"
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index f897ec18d..3c275d0ce 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:09:53+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:06:17+0000\n"
"Language-Team: Catalan\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: out-statusnet\n"
@@ -195,11 +195,11 @@ msgstr "No s'ha pogut actualitzar l'usuari."
msgid "You cannot block yourself!"
msgstr "No podeu suprimir els usuaris."
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "Ha fallat el bloqueig d'usuari."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "Ha fallat el desbloqueig d'usuari."
@@ -316,7 +316,7 @@ msgid "Could not find target user."
msgstr "No es pot trobar cap estatus."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
@@ -324,25 +324,25 @@ msgstr ""
"espais."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Aquest sobrenom ja existeix. Prova un altre. "
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Sobrenom no vàlid."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "La pàgina personal no és un URL vàlid."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "El teu nom és massa llarg (màx. 255 caràcters)."
@@ -353,7 +353,7 @@ msgid "Description is too long (max %d chars)."
msgstr "La descripció és massa llarga (màx. %d caràcters)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "La ubicació és massa llarga (màx. 255 caràcters)."
@@ -470,7 +470,7 @@ msgstr "Massa llarg. La longitud màxima és de %d caràcters."
msgid "Not found"
msgstr "No s'ha trobat"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -613,13 +613,13 @@ msgid "Crop"
msgstr "Retalla"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -693,7 +693,7 @@ msgstr "Sí"
msgid "Block this user"
msgstr "Bloquejar aquest usuari"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "Error al guardar la informació del block."
@@ -767,7 +767,7 @@ msgstr "Aquesta adreça ja ha estat confirmada."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "No s'ha pogut actualitzar l'usuari."
@@ -969,7 +969,7 @@ msgstr ""
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1471,7 +1471,7 @@ msgstr "%s membre/s en el grup, pàgina %d"
msgid "A list of the users in this group."
msgstr "La llista dels usuaris d'aquest grup."
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
@@ -1560,7 +1560,7 @@ msgstr "Només un administrador pot desblocar els membres del grup."
msgid "User is not blocked from group."
msgstr "L'usuari no està blocat del grup."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "S'ha produït un error en suprimir el bloc."
@@ -1874,7 +1874,7 @@ msgstr "Nom d'usuari o contrasenya incorrectes."
msgid "Error setting user. You are probably not authorized."
msgstr "No autoritzat."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Inici de sessió"
@@ -1988,7 +1988,7 @@ msgstr "S'ha enviat el missatge"
msgid "Direct message to %s sent"
msgstr "Missatge directe per a %s enviat"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "Ajax Error"
@@ -1996,7 +1996,7 @@ msgstr "Ajax Error"
msgid "New notice"
msgstr "Nou avís"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "Notificació publicada"
@@ -2428,73 +2428,82 @@ msgstr "Ubicació"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "On ets, per exemple \"Ciutat, Estat (o Regió), País\""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "Etiquetes"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
"Etiquetes per a tu mateix (lletres, números, -, ., i _), per comes o separat "
"por espais"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Idioma"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "Preferència d'idioma"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Franja horària"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "Quina franja horària seria normal ser?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
"Automàticament subscriure's a qualsevol que ho estigui a tu mateix (ideal "
"per no-humans)"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "La biografia és massa llarga (màx. %d caràcters)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "Franja horària no seleccionada."
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "L'idioma és massa llarg (màx 50 caràcters)."
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Etiqueta no vàlida: \"%s\""
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr "No es pot actualitzar l'usuari per autosubscriure."
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "No s'han pogut guardar les etiquetes."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "No s'ha pogut guardar el perfil."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "No s'han pogut guardar les etiquetes."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Configuració guardada."
@@ -2731,7 +2740,7 @@ msgstr "El codi d'invitació no és vàlid."
msgid "Registration successful"
msgstr "Registre satisfactori"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registre"
@@ -4052,16 +4061,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr "Ha estat bandejat de publicar notificacions en aquest lloc."
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Problema en guardar l'avís."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Error de BD en inserir resposta: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -4117,129 +4126,129 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Pàgina sense titol"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr "Navegació primària del lloc"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Inici"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr "Perfil personal i línia temporal dels amics"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "Compte"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr "Canviar correu electrònic, avatar, contrasenya, perfil"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Connexió"
-#: lib/action.php:436
+#: lib/action.php:437
#, fuzzy
msgid "Connect to services"
msgstr "No s'ha pogut redirigir al servidor: %s"
-#: lib/action.php:440
+#: lib/action.php:441
msgid "Change site configuration"
msgstr "Canvia la configuració del lloc"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Convida"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convidar amics i companys perquè participin a %s"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Finalitza la sessió"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "Finalitza la sessió del lloc"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "Crea un compte"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "Inicia una sessió al lloc"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Ajuda"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "Ajuda'm"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Cerca"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "Cerca gent o text"
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr "Avís del lloc"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "Vistes locals"
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr "Notificació pàgina"
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr "Navegació del lloc secundària"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "Quant a"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "Preguntes més freqüents"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Privadesa"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Font"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Contacte"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr "Insígnia"
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr "Llicència del programari StatusNet"
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4248,12 +4257,12 @@ msgstr ""
"**%%site.name%%** és un servei de microblogging de [%%site.broughtby%%**](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** és un servei de microblogging."
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4264,32 +4273,32 @@ msgstr ""
"%s, disponible sota la [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
#, fuzzy
msgid "Site content license"
msgstr "Llicència del programari StatusNet"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr "Tot "
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "llicència."
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "Paginació"
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "Posteriors"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "Anteriors"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr "Ha ocorregut algun problema amb la teva sessió."
@@ -5116,6 +5125,14 @@ msgstr "Adjunta"
msgid "Attach a file"
msgstr "Adjunta un fitxer"
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 6cc1e1dbf..aa5d77f2e 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:09:56+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:06:19+0000\n"
"Language-Team: Czech\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: cs\n"
"X-Message-Group: out-statusnet\n"
@@ -194,11 +194,11 @@ msgstr "Nelze aktualizovat uživatele"
msgid "You cannot block yourself!"
msgstr "Nelze aktualizovat uživatele"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr ""
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr ""
@@ -313,31 +313,31 @@ msgid "Could not find target user."
msgstr "Nelze aktualizovat uživatele"
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Přezdívka může obsahovat pouze malá písmena a čísla bez mezer"
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Přezdívku již někdo používá. Zkuste jinou"
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Není platnou přezdívkou."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "Stránka není platnou URL."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Jméno je moc dlouhé (maximální délka je 255 znaků)"
@@ -348,7 +348,7 @@ msgid "Description is too long (max %d chars)."
msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
@@ -469,7 +469,7 @@ msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -615,13 +615,13 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -694,7 +694,7 @@ msgstr "Ano"
msgid "Block this user"
msgstr "Zablokovat tohoto uživatele"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr ""
@@ -768,7 +768,7 @@ msgstr "Adresa již byla potvrzena"
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Nelze aktualizovat uživatele"
@@ -972,7 +972,7 @@ msgstr ""
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1477,7 +1477,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1570,7 +1570,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "Uživatel nemá profil."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
#, fuzzy
msgid "Error removing the block."
msgstr "Chyba při ukládaní uživatele"
@@ -1849,7 +1849,7 @@ msgstr "Neplatné jméno nebo heslo"
msgid "Error setting user. You are probably not authorized."
msgstr "Neautorizován."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Přihlásit"
@@ -1959,7 +1959,7 @@ msgstr ""
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr ""
@@ -1967,7 +1967,7 @@ msgstr ""
msgid "New notice"
msgstr "Nové sdělení"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
#, fuzzy
msgid "Notice posted"
msgstr "Sdělení"
@@ -2406,70 +2406,79 @@ msgstr "Umístění"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Místo. Město, stát."
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr ""
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Jazyk"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr ""
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr ""
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr ""
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr ""
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr ""
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, fuzzy, php-format
msgid "Invalid tag: \"%s\""
msgstr "Neplatná adresa '%s'"
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Nelze uložit profil"
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Nelze uložit profil"
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
#, fuzzy
msgid "Couldn't save tags."
msgstr "Nelze uložit profil"
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Nastavení uloženo"
@@ -2705,7 +2714,7 @@ msgstr "Chyba v ověřovacím kódu"
msgid "Registration successful"
msgstr "Registrace úspěšná"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrovat"
@@ -4006,16 +4015,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Chyba v DB při vkládání odpovědi: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4074,135 +4083,135 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Domů"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:434
#, fuzzy
msgid "Account"
msgstr "O nás"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Připojit"
-#: lib/action.php:436
+#: lib/action.php:437
#, fuzzy
msgid "Connect to services"
msgstr "Nelze přesměrovat na server: %s"
-#: lib/action.php:440
+#: lib/action.php:441
#, fuzzy
msgid "Change site configuration"
msgstr "Odběry"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Odhlásit"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:455
+#: lib/action.php:456
#, fuzzy
msgid "Create an account"
msgstr "Vytvořit nový účet"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr ""
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Nápověda"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "Pomoci mi!"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Hledat"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:485
+#: lib/action.php:486
#, fuzzy
msgid "Site notice"
msgstr "Nové sdělení"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr ""
-#: lib/action.php:617
+#: lib/action.php:618
#, fuzzy
msgid "Page notice"
msgstr "Nové sdělení"
-#: lib/action.php:719
+#: lib/action.php:720
#, fuzzy
msgid "Secondary site navigation"
msgstr "Odběry"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "O nás"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Soukromí"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Zdroj"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr ""
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4211,12 +4220,12 @@ msgstr ""
"**%%site.name%%** je služba microblogů, kterou pro vás poskytuje [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** je služba mikroblogů."
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4227,34 +4236,34 @@ msgstr ""
"dostupná pod [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
#, fuzzy
msgid "Site content license"
msgstr "Nové sdělení"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr ""
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr ""
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr ""
-#: lib/action.php:1107
+#: lib/action.php:1108
#, fuzzy
msgid "After"
msgstr "« Novější"
-#: lib/action.php:1115
+#: lib/action.php:1116
#, fuzzy
msgid "Before"
msgstr "Starší »"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr ""
@@ -5086,6 +5095,14 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 42cc95a1e..91ca2e0c0 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:10:00+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:06:23+0000\n"
"Language-Team: German\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: out-statusnet\n"
@@ -200,11 +200,11 @@ msgstr "Konnte Benutzerdesign nicht aktualisieren."
msgid "You cannot block yourself!"
msgstr "Du kannst dich nicht selbst entfolgen!"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "Blockieren des Benutzers fehlgeschlagen."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "Freigeben des Benutzers fehlgeschlagen."
@@ -319,7 +319,7 @@ msgid "Could not find target user."
msgstr "Konnte keine Statusmeldungen finden."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
@@ -327,26 +327,26 @@ msgstr ""
"Leerzeichen sind nicht erlaubt."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Nutzername wird bereits verwendet. Suche dir einen anderen aus."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Ungültiger Nutzername."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr ""
"Homepage ist keine gültige URL. URL’s müssen ein Präfix wie http enthalten."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Der vollständige Name ist zu lang (maximal 255 Zeichen)."
@@ -357,7 +357,7 @@ msgid "Description is too long (max %d chars)."
msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
@@ -475,7 +475,7 @@ msgstr ""
msgid "Not found"
msgstr "Nicht gefunden"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -620,13 +620,13 @@ msgid "Crop"
msgstr "Zuschneiden"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -697,7 +697,7 @@ msgstr "Ja"
msgid "Block this user"
msgstr "Diesen Benutzer blockieren"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "Konnte Blockierungsdaten nicht speichern."
@@ -769,7 +769,7 @@ msgstr "Diese Adresse wurde bereits bestätigt."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Konnte Benutzerdaten nicht aktualisieren."
@@ -967,7 +967,7 @@ msgstr "Standard wiederherstellen"
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1464,7 +1464,7 @@ msgstr "%s Gruppen-Mitglieder, Seite %d"
msgid "A list of the users in this group."
msgstr "Liste der Benutzer in dieser Gruppe."
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
@@ -1558,7 +1558,7 @@ msgstr "Nur Administratoren können Gruppenmitglieder entsperren."
msgid "User is not blocked from group."
msgstr "Dieser Nutzer ist nicht von der Gruppe gesperrt."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "Fehler beim Freigeben des Benutzers."
@@ -1872,7 +1872,7 @@ msgid "Error setting user. You are probably not authorized."
msgstr ""
"Fehler beim setzen des Benutzers. Du bist vermutlich nicht autorisiert."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Anmelden"
@@ -1984,7 +1984,7 @@ msgstr "Nachricht gesendet"
msgid "Direct message to %s sent"
msgstr "Direkte Nachricht an %s abgeschickt"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "Ajax-Fehler"
@@ -1992,7 +1992,7 @@ msgstr "Ajax-Fehler"
msgid "New notice"
msgstr "Neue Nachricht"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "Nachricht hinzugefügt"
@@ -2422,73 +2422,82 @@ msgstr "Aufenthaltsort"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Wo du bist, beispielsweise „Stadt, Gebiet, Land“"
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "Tags"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
"Tags über dich selbst (Buchstaben, Zahlen, -, ., und _) durch Kommas oder "
"Leerzeichen getrennt"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Sprache"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "Bevorzugte Sprache"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Zeitzone"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "In welcher Zeitzone befindest du dich üblicherweise?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
"Abonniere automatisch alle Kontakte, die mich abonnieren (sinnvoll für Nicht-"
"Menschen)"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Die Biografie ist zu lang (max. %d Zeichen)"
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "Keine Zeitzone ausgewählt."
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "Die eingegebene Sprache ist zu lang (maximal 50 Zeichen)"
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Ungültiger Tag: „%s“"
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr "Autosubscribe konnte nicht aktiviert werden."
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Konnte Tags nicht speichern."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Konnte Profil nicht speichern."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "Konnte Tags nicht speichern."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Einstellungen gespeichert."
@@ -2722,7 +2731,7 @@ msgstr "Entschuldigung, ungültiger Bestätigungscode."
msgid "Registration successful"
msgstr "Registrierung erfolgreich"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrieren"
@@ -4061,16 +4070,16 @@ msgid "You are banned from posting notices on this site."
msgstr ""
"Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt."
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Problem bei Speichern der Nachricht."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Datenbankfehler beim Einfügen der Antwort: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -4126,131 +4135,131 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Seite ohne Titel"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr "Hauptnavigation"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Startseite"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr "Persönliches Profil und Freundes-Zeitleiste"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "Konto"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr "Ändere deine E-Mail, dein Avatar, Passwort, Profil"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Verbinden"
-#: lib/action.php:436
+#: lib/action.php:437
#, fuzzy
msgid "Connect to services"
msgstr "Konnte nicht zum Server umleiten: %s"
-#: lib/action.php:440
+#: lib/action.php:441
#, fuzzy
msgid "Change site configuration"
msgstr "Hauptnavigation"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Einladen"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Lade Freunde und Kollegen ein dir auf %s zu folgen"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Abmelden"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "Von der Seite abmelden"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "Neues Konto erstellen"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "Auf der Seite anmelden"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Hilfe"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "Hilf mir!"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Suchen"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "Suche nach Leuten oder Text"
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr "Seitennachricht"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "Lokale Ansichten"
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr "Neue Nachricht"
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr "Unternavigation"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "Über"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr "AGB"
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Privatsphäre"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Quellcode"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:741
+#: lib/action.php:742
#, fuzzy
msgid "Badge"
msgstr "Stups"
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr "StatusNet-Software-Lizenz"
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4259,12 +4268,12 @@ msgstr ""
"**%%site.name%%** ist ein Microbloggingdienst von [%%site.broughtby%%](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** ist ein Microbloggingdienst."
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4275,32 +4284,32 @@ msgstr ""
"(Version %s) betrieben, die unter der [GNU Affero General Public License]"
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist."
-#: lib/action.php:790
+#: lib/action.php:791
msgid "Site content license"
msgstr "StatusNet-Software-Lizenz"
-#: lib/action.php:799
+#: lib/action.php:800
#, fuzzy
msgid "All "
msgstr "Alle "
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "Lizenz."
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "Seitenerstellung"
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "Später"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "Vorher"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr "Es gab ein Problem mit deinem Sessiontoken."
@@ -5183,6 +5192,14 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index 91637b930..0ccb09a9b 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:10:05+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:06:26+0000\n"
"Language-Team: Greek\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: el\n"
"X-Message-Group: out-statusnet\n"
@@ -191,11 +191,11 @@ msgstr "Απέτυχε η ενημέρωση του χρήστη."
msgid "You cannot block yourself!"
msgstr "Δεν μπορείτε να εμποδίσετε τον εαυτό σας!"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr ""
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr ""
@@ -311,31 +311,31 @@ msgid "Could not find target user."
msgstr "Απέτυχε η εύρεση οποιασδήποτε κατάστασης."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Το ψευδώνυμο πρέπει να έχει μόνο πεζούς χαρακτήρες και χωρίς κενά."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Το ψευδώνυμο είναι ήδη σε χρήση. Δοκιμάστε κάποιο άλλο."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr ""
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Το ονοματεπώνυμο είναι πολύ μεγάλο (μέγιστο 255 χαρακτ.)."
@@ -346,7 +346,7 @@ msgid "Description is too long (max %d chars)."
msgstr "Η περιγραφή είναι πολύ μεγάλη (μέγιστο %d χαρακτ.)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "Η τοποθεσία είναι πολύ μεγάλη (μέγιστο 255 χαρακτ.)."
@@ -463,7 +463,7 @@ msgstr ""
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -605,13 +605,13 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -684,7 +684,7 @@ msgstr "Ναί"
msgid "Block this user"
msgstr ""
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr ""
@@ -756,7 +756,7 @@ msgstr ""
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Απέτυχε η ενημέρωση του χρήστη."
@@ -956,7 +956,7 @@ msgstr ""
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1455,7 +1455,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "Διαχειριστής"
@@ -1544,7 +1544,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr ""
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr ""
@@ -1815,7 +1815,7 @@ msgstr "Λάθος όνομα χρήστη ή κωδικός"
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Σύνδεση"
@@ -1927,7 +1927,7 @@ msgstr ""
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr ""
@@ -1935,7 +1935,7 @@ msgstr ""
msgid "New notice"
msgstr ""
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr ""
@@ -2363,34 +2363,38 @@ msgstr "Τοποθεσία"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr ""
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr ""
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr ""
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr ""
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr ""
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
#, fuzzy
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
@@ -2398,38 +2402,43 @@ msgstr ""
"Αυτόματα γίνε συνδρομητής σε όσους γίνονται συνδρομητές σε μένα (χρήση "
"κυρίως από λογισμικό και όχι ανθρώπους)"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Το βιογραφικό είναι πολύ μεγάλο (μέγιστο 140 χαρακτ.)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr ""
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr ""
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr ""
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr "Απέτυχε η ενημέρωση του χρήστη για την αυτόματη συνδρομή."
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Απέτυχε η αποθήκευση του προφίλ."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
#, fuzzy
msgid "Couldn't save tags."
msgstr "Αδύνατη η αποθήκευση του προφίλ."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr ""
@@ -2661,7 +2670,7 @@ msgstr ""
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -3940,16 +3949,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγωγή απάντησης: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4005,129 +4014,129 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Αρχή"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "Λογαριασμός"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Σύνδεση"
-#: lib/action.php:436
+#: lib/action.php:437
#, fuzzy
msgid "Connect to services"
msgstr "Αδυναμία ανακατεύθηνσης στο διακομιστή: %s"
-#: lib/action.php:440
+#: lib/action.php:441
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Προσκάλεσε φίλους και συναδέλφους σου να γίνουν μέλη στο %s"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Αποσύνδεση"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "Δημιουργία έναν λογαριασμού"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr ""
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Βοήθεια"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "Βοηθήστε με!"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr ""
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr ""
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr ""
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr ""
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "Περί"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "Συχνές ερωτήσεις"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr ""
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Επικοινωνία"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr ""
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:772
+#: lib/action.php:773
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4136,13 +4145,13 @@ msgstr ""
"To **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου) που "
"έφερε κοντά σας το [%%site.broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:774
+#: lib/action.php:775
#, fuzzy, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
"Το **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου). "
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4150,31 +4159,31 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:790
+#: lib/action.php:791
msgid "Site content license"
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr ""
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr ""
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr ""
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr ""
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr ""
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr ""
@@ -4983,6 +4992,14 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 115d94ace..5912c76dd 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:10:08+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:06:30+0000\n"
"Language-Team: British English\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: en-gb\n"
"X-Message-Group: out-statusnet\n"
@@ -201,11 +201,11 @@ msgstr "Could not update your design."
msgid "You cannot block yourself!"
msgstr "You cannot block yourself!"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "Block user failed."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "Unblock user failed."
@@ -317,31 +317,31 @@ msgid "Could not find target user."
msgstr "Could not find target user."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Nickname must have only lowercase letters and numbers, and no spaces."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Nickname already in use. Try another one."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Not a valid nickname."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "Homepage is not a valid URL."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Full name is too long (max 255 chars)."
@@ -352,7 +352,7 @@ msgid "Description is too long (max %d chars)."
msgstr "Description is too long (max %d chars)"
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "Location is too long (max 255 chars)."
@@ -467,7 +467,7 @@ msgstr "That's too long. Max notice size is %d chars."
msgid "Not found"
msgstr "Not found"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Max notice size is %d chars, including attachment URL."
@@ -609,13 +609,13 @@ msgid "Crop"
msgstr "Crop"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -688,7 +688,7 @@ msgstr "Yes"
msgid "Block this user"
msgstr "Block this user"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "Failed to save block information."
@@ -760,7 +760,7 @@ msgstr "That address has already been confirmed."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Couldn't update user."
@@ -965,7 +965,7 @@ msgstr "Reset back to default"
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1476,7 +1476,7 @@ msgstr "%s group members, page %d"
msgid "A list of the users in this group."
msgstr "A list of the users in this group."
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
@@ -1568,7 +1568,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "User is not blocked from group."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "Error removing the block."
@@ -1874,7 +1874,7 @@ msgstr "Incorrect username or password."
msgid "Error setting user. You are probably not authorized."
msgstr "You are not authorised."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Login"
@@ -1986,7 +1986,7 @@ msgstr "Message sent"
msgid "Direct message to %s sent"
msgstr "Direct message to %s sent"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "Ajax Error"
@@ -1994,7 +1994,7 @@ msgstr "Ajax Error"
msgid "New notice"
msgstr "New notice"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "Notice posted"
@@ -2424,71 +2424,80 @@ msgstr "Location"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Where you are, like \"City, State (or Region), Country\""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "Tags"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Language"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "Preferred language"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Timezone"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "In which timezone are you?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Bio is too long (max %d chars)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "Timezone not selected."
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "Language is too long (max 50 chars)."
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Invalid tag: \"%s\""
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr "Couldn't update user for autosubscribe."
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Couldn't save tags."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Couldn't save profile."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "Couldn't save tags."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Settings saved."
@@ -2730,7 +2739,7 @@ msgstr "Error with confirmation code."
msgid "Registration successful"
msgstr "Registration successful"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Register"
@@ -4049,16 +4058,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr "You are banned from posting notices on this site."
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Problem saving notice."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "DB error inserting reply: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -4113,130 +4122,130 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Untitled page"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr "Primary site navigation"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Home"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr "Personal profile and friends timeline"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "Account"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr "Change your e-mail, avatar, password, profile"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Connect"
-#: lib/action.php:436
+#: lib/action.php:437
#, fuzzy
msgid "Connect to services"
msgstr "Could not redirect to server: %s"
-#: lib/action.php:440
+#: lib/action.php:441
#, fuzzy
msgid "Change site configuration"
msgstr "Primary site navigation"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invite"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invite friends and colleagues to join you on %s"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Logout"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "Logout from the site"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "Create an account"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "Login to the site"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Help"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "Help me!"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Search"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "Search for people or text"
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr "Site notice"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "Local views"
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr "Page notice"
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr "Secondary site navigation"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "About"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "F.A.Q."
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Privacy"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Source"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr "Badge"
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr "StatusNet software licence"
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4245,12 +4254,12 @@ msgstr ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** is a microblogging service."
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4261,31 +4270,31 @@ msgstr ""
"s, available under the [GNU Affero General Public Licence](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
msgid "Site content license"
msgstr "Site content license"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr "All "
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "licence."
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "After"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "Before"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr "There was a problem with your session token."
@@ -5119,6 +5128,14 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index e0e5ebba7..5804171cb 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:10:11+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:06:32+0000\n"
"Language-Team: Spanish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: out-statusnet\n"
@@ -196,11 +196,11 @@ msgstr "No se pudo actualizar el usuario."
msgid "You cannot block yourself!"
msgstr "¡No puedes bloquearte a tí mismo!"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "Falló bloquear usuario."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "Falló desbloquear usuario."
@@ -312,7 +312,7 @@ msgid "Could not find target user."
msgstr "No se pudo encontrar ningún usuario de destino."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
@@ -320,25 +320,25 @@ msgstr ""
"espacios."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "El apodo ya existe. Prueba otro."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Apodo no válido"
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "La página de inicio no es un URL válido."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
@@ -349,7 +349,7 @@ msgid "Description is too long (max %d chars)."
msgstr "La descripción es demasiado larga (máx. %d caracteres)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
@@ -467,7 +467,7 @@ msgstr "Demasiado largo. La longitud máxima es de 140 caracteres. "
msgid "Not found"
msgstr "No encontrado"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -611,13 +611,13 @@ msgid "Crop"
msgstr "Cortar"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -691,7 +691,7 @@ msgstr "Sí"
msgid "Block this user"
msgstr "Bloquear este usuario."
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "No se guardó información de bloqueo."
@@ -764,7 +764,7 @@ msgstr "Esa dirección ya fue confirmada."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "No se pudo actualizar el usuario."
@@ -971,7 +971,7 @@ msgstr ""
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1475,7 +1475,7 @@ msgstr "Miembros del grupo %s, página %d"
msgid "A list of the users in this group."
msgstr "Lista de los usuarios en este grupo."
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
@@ -1569,7 +1569,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "El usuario te ha bloqueado."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
#, fuzzy
msgid "Error removing the block."
msgstr "Error al sacar bloqueo."
@@ -1884,7 +1884,7 @@ msgstr "Nombre de usuario o contraseña incorrectos."
msgid "Error setting user. You are probably not authorized."
msgstr "No autorizado."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Inicio de sesión"
@@ -1999,7 +1999,7 @@ msgstr "Mensaje"
msgid "Direct message to %s sent"
msgstr "Se envió mensaje directo a %s"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "Error de Ajax"
@@ -2007,7 +2007,7 @@ msgstr "Error de Ajax"
msgid "New notice"
msgstr "Nuevo aviso"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
#, fuzzy
msgid "Notice posted"
msgstr "Aviso publicado"
@@ -2454,72 +2454,81 @@ msgstr "Ubicación"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "Tags"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr "Tags para ti (letras, números, -, ., y _), coma - o espacio - separado"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Idioma"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "Lenguaje de preferencia"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Zona horaria"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "En que zona horaria se encuentra normalmente?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
"Suscribirse automáticamente a quien quiera que se suscriba a mí (es mejor "
"para no-humanos)"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "La biografía es demasiado larga (máx. 140 caracteres)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "Zona horaria no seleccionada"
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "Idioma es muy largo ( max 50 car.)"
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, fuzzy, php-format
msgid "Invalid tag: \"%s\""
msgstr "Tag no válido: '%s' "
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr "No se pudo actualizar el usuario para autosuscribirse."
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "No se pudo guardar tags."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "No se pudo guardar el perfil."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
#, fuzzy
msgid "Couldn't save tags."
msgstr "No se pudo guardar tags."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Se guardó configuración."
@@ -2761,7 +2770,7 @@ msgstr "Error con el código de confirmación."
msgid "Registration successful"
msgstr "Registro exitoso."
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrarse"
@@ -4109,16 +4118,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr "Tienes prohibido publicar avisos en este sitio."
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Hubo un problema al guardar el aviso."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Error de BD al insertar respuesta: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4174,129 +4183,129 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Página sin título"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr "Navegación de sitio primario"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Inicio"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr "Perfil personal y línea de tiempo de amigos"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "Cuenta"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr "Cambia tu correo electrónico, avatar, contraseña, perfil"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Conectarse"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect to services"
msgstr "Conectar a los servicios"
-#: lib/action.php:440
+#: lib/action.php:441
#, fuzzy
msgid "Change site configuration"
msgstr "Navegación de sitio primario"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invitar"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invita a amigos y colegas a unirse a %s"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Salir"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "Salir de sitio"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "Crear una cuenta"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "Ingresar a sitio"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Ayuda"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "Ayúdame!"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Buscar"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "Buscar personas o texto"
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr "Aviso de sitio"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "Vistas locales"
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr "Aviso de página"
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr "Navegación de sitio secundario"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "Acerca de"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "Preguntas Frecuentes"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Privacidad"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Fuente"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Ponerse en contacto"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr "Insignia"
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr "Licencia de software de StatusNet"
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4305,12 +4314,12 @@ msgstr ""
"**%%site.name%%** es un servicio de microblogueo de [%%site.broughtby%%**](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** es un servicio de microblogueo."
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4321,31 +4330,31 @@ msgstr ""
"disponible bajo la [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
msgid "Site content license"
msgstr "Licencia de contenido del sitio"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr "Todo"
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "Licencia."
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "Paginación"
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "Después"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "Antes"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr "Hubo problemas con tu clave de sesión."
@@ -5177,6 +5186,14 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index f6c9559aa..c62aeb47d 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:10:17+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:06:39+0000\n"
"Last-Translator: Ahmad Sufi Mahmudi\n"
"Language-Team: Persian\n"
"MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
"X-Language-Code: fa\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
@@ -195,11 +195,11 @@ msgstr "نمی‌توان طرح‌تان به‌هنگام‌سازی کرد."
msgid "You cannot block yourself!"
msgstr "شما نمی‌توانید خودتان رو مسدود کنید!"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "مسدود کردن کاربر شکست خورد."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "باز کردن کاربر ناموفق بود."
@@ -311,31 +311,31 @@ msgid "Could not find target user."
msgstr "نمی‌توان کاربر هدف را پیدا کرد."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "لقب باید شامل حروف کوچک و اعداد و بدون فاصله باشد."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "این لقب در حال حاضر ثبت شده است. لطفا یکی دیگر انتخاب کنید."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "لقب نا معتبر."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "برگهٔ آغازین یک نشانی معتبر نیست."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "نام کامل طولانی است (۲۵۵ حرف در حالت بیشینه(."
@@ -346,7 +346,7 @@ msgid "Description is too long (max %d chars)."
msgstr "توصیف بسیار زیاد است (حداکثر %d حرف)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "مکان طولانی است (حداکثر ۲۵۵ حرف)"
@@ -461,7 +461,7 @@ msgstr "خیلی طولانی است. حداکثر طول مجاز پیام %d
msgid "Not found"
msgstr "یافت نشد"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "حداکثر طول پیام %d حرف است که شامل ضمیمه نیز می‌باشد"
@@ -604,13 +604,13 @@ msgid "Crop"
msgstr "برش"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -684,7 +684,7 @@ msgstr "بله"
msgid "Block this user"
msgstr "کاربر را مسدود کن"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr ""
@@ -756,7 +756,7 @@ msgstr "آن نشانی در حال حاضر تصدیق شده است."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "نمی‌توان کاربر را به روز کرد."
@@ -956,7 +956,7 @@ msgstr "برگشت به حالت پیش گزیده"
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1445,7 +1445,7 @@ msgstr "اعضای گروه %s، صفحهٔ %d"
msgid "A list of the users in this group."
msgstr "یک فهرست از کاربران در این گروه"
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "مدیر"
@@ -1541,7 +1541,7 @@ msgstr "تنها یک مدیر توانایی برداشتن منع کاربرا
msgid "User is not blocked from group."
msgstr "کاربر از گروه منع نشده است."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "اشکال در پاکسازی"
@@ -1818,7 +1818,7 @@ msgstr "نام کاربری یا رمز عبور نادرست."
msgid "Error setting user. You are probably not authorized."
msgstr "خطا در تنظیم کاربر. شما احتمالا اجازه ی این کار را ندارید."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "ورود"
@@ -1929,7 +1929,7 @@ msgstr "پیام فرستاده‌شد"
msgid "Direct message to %s sent"
msgstr "پیام مستقیم به %s فرستاده شد."
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "اشکال آژاکسی"
@@ -1937,7 +1937,7 @@ msgstr "اشکال آژاکسی"
msgid "New notice"
msgstr "آگهی جدید"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "آگهی فرستاده‌شد."
@@ -2368,69 +2368,78 @@ msgstr "موقعیت"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "برچسب‌ها"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "زبان"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "زبان برگزیده"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "منطقهٔ‌زمانی"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "شما معمولا در کدام منطقه ی زمانی هستید؟"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr ""
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "منطقه‌ی زمانی انتخاب نشده است."
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "کلام بسیار طولانی است( حداکثر ۵۰ کاراکتر)"
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "نشان نادرست »%s«"
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "نمی‌توان نشان را ذخیره کرد."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "نمی‌توان شناسه را ذخیره کرد."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "نمی‌توان نشان را ذخیره کرد."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "تنظیمات ذخیره شد."
@@ -2663,7 +2672,7 @@ msgstr "با عرض تاسف، کد دعوت نا معتبر است."
msgid "Registration successful"
msgstr "ثبت نام با موفقیت انجام شد."
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "ثبت نام"
@@ -3911,16 +3920,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr "شما از فرستادن پست در این سایت مردود شدید ."
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "مشکل در ذخیره کردن آگهی."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -3975,140 +3984,140 @@ msgstr ""
msgid "Untitled page"
msgstr "صفحه ی بدون عنوان"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "خانه"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "حساب کاربری"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr "آدرس ایمیل، آواتار، کلمه ی عبور، پروفایل خود را تغییر دهید"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "وصل‌شدن"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect to services"
msgstr "متصل شدن به خدمات"
-#: lib/action.php:440
+#: lib/action.php:441
msgid "Change site configuration"
msgstr "تغییر پیکربندی سایت"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "دعوت‌کردن"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr " به شما ملحق شوند %s دوستان و همکاران را دعوت کنید تا در"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "خروج"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "خارج شدن از سایت ."
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "یک حساب کاربری بسازید"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "ورود به وب‌گاه"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "کمک"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "به من کمک کنید!"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "جست‌وجو"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "جستجو برای شخص با متن"
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr "خبر سایت"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "دید محلی"
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr "خبر صفحه"
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "دربارهٔ"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "سوال‌های رایج"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "خصوصی"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "منبع"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "تماس"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr ""
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr "StatusNet مجوز نرم افزار"
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4116,31 +4125,31 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:790
+#: lib/action.php:791
msgid "Site content license"
msgstr "مجوز محتویات سایت"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr "همه "
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "مجوز."
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "صفحه بندى"
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "بعد از"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "قبل از"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr ""
@@ -4947,6 +4956,14 @@ msgstr "ضمیمه کردن"
msgid "Attach a file"
msgstr "یک فایل ضمیمه کنید"
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 8887a7b91..fb1bf1900 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:10:14+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:06:36+0000\n"
"Language-Team: Finnish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fi\n"
"X-Message-Group: out-statusnet\n"
@@ -198,11 +198,11 @@ msgstr "Ei voitu päivittää käyttäjää."
msgid "You cannot block yourself!"
msgstr "Et voi lopettaa itsesi tilausta!"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "Käyttäjän esto epäonnistui."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "Käyttäjän eston poisto epäonnistui."
@@ -317,7 +317,7 @@ msgid "Could not find target user."
msgstr "Ei löytynyt yhtään päivitystä."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
@@ -325,25 +325,25 @@ msgstr ""
"välilyöntiä."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Tuo ei ole kelvollinen tunnus."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "Kotisivun verkko-osoite ei ole toimiva."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
@@ -354,7 +354,7 @@ msgid "Description is too long (max %d chars)."
msgstr "kuvaus on liian pitkä (max 140 merkkiä)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
@@ -471,7 +471,7 @@ msgstr "Päivitys on liian pitkä. Maksimipituus on %d merkkiä."
msgid "Not found"
msgstr "Ei löytynyt"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite."
@@ -614,13 +614,13 @@ msgid "Crop"
msgstr "Rajaa"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -693,7 +693,7 @@ msgstr "Kyllä"
msgid "Block this user"
msgstr "Estä tämä käyttäjä"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "Käyttäjän estotiedon tallennus epäonnistui."
@@ -766,7 +766,7 @@ msgstr "Tämä osoite on jo vahvistettu."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Ei voitu päivittää käyttäjää."
@@ -973,7 +973,7 @@ msgstr ""
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1472,7 +1472,7 @@ msgstr "Ryhmän %s jäsenet, sivu %d"
msgid "A list of the users in this group."
msgstr "Lista ryhmän käyttäjistä."
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "Ylläpito"
@@ -1562,7 +1562,7 @@ msgstr "Vain ylläpitäjä voi poistaa eston ryhmän jäseniltä."
msgid "User is not blocked from group."
msgstr "Käyttäjää ei ole estetty ryhmästä."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "Tapahtui virhe, kun estoa poistettiin."
@@ -1874,7 +1874,7 @@ msgstr "Väärä käyttäjätunnus tai salasana"
msgid "Error setting user. You are probably not authorized."
msgstr "Sinulla ei ole valtuutusta tähän."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Kirjaudu sisään"
@@ -1988,7 +1988,7 @@ msgstr "Viesti lähetetty"
msgid "Direct message to %s sent"
msgstr "Suora viesti käyttäjälle %s lähetetty"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "Ajax-virhe"
@@ -1996,7 +1996,7 @@ msgstr "Ajax-virhe"
msgid "New notice"
msgstr "Uusi päivitys"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "Päivitys lähetetty"
@@ -2439,73 +2439,82 @@ msgstr "Kotipaikka"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "Tagit"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
"Kuvaa itseäsi henkilötageilla (sanoja joissa voi olla muita kirjaimia kuin "
"ääkköset, numeroita, -, ., ja _), pilkulla tai välilyönnillä erotettuna"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Kieli"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "Ensisijainen kieli"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Aikavyöhyke"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "Missä aikavyöhykkeessä olet normaalisti?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
"Tilaa automaattisesti kaikki, jotka tilaavat päivitykseni (ei sovi hyvin "
"ihmiskäyttäjille)"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "\"Tietoja\" on liian pitkä (max 140 merkkiä)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "Aikavyöhykettä ei ole valittu."
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "Kieli on liian pitkä (max 50 merkkiä)."
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Virheellinen tagi: \"%s\""
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr "Ei voitu asettaa käyttäjälle automaattista tilausta."
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Tageja ei voitu tallentaa."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Ei voitu tallentaa profiilia."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "Tageja ei voitu tallentaa."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Asetukset tallennettu."
@@ -2742,7 +2751,7 @@ msgstr "Virheellinen kutsukoodin."
msgid "Registration successful"
msgstr "Rekisteröityminen onnistui"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Rekisteröidy"
@@ -4081,16 +4090,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr "Päivityksesi tähän palveluun on estetty."
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Ongelma päivityksen tallentamisessa."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Tietokantavirhe tallennettaessa vastausta: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -4146,131 +4155,131 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Nimetön sivu"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr "Ensisijainen sivunavigointi"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Koti"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr "Henkilökohtainen profiili ja kavereiden aikajana"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "Käyttäjätili"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr "Muuta sähköpostiosoitettasi, kuvaasi, salasanaasi, profiiliasi"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Yhdistä"
-#: lib/action.php:436
+#: lib/action.php:437
#, fuzzy
msgid "Connect to services"
msgstr "Ei voitu uudelleenohjata palvelimelle: %s"
-#: lib/action.php:440
+#: lib/action.php:441
#, fuzzy
msgid "Change site configuration"
msgstr "Ensisijainen sivunavigointi"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Kutsu"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Kirjaudu ulos"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "Kirjaudu ulos palvelusta"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "Luo uusi käyttäjätili"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "Kirjaudu sisään palveluun"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Ohjeet"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "Auta minua!"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Haku"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "Hae ihmisiä tai tekstiä"
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr "Palvelun ilmoitus"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "Paikalliset näkymät"
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr "Sivuilmoitus"
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr "Toissijainen sivunavigointi"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "Tietoa"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "UKK"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Yksityisyys"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Lähdekoodi"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Ota yhteyttä"
-#: lib/action.php:741
+#: lib/action.php:742
#, fuzzy
msgid "Badge"
msgstr "Tönäise"
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr "StatusNet-ohjelmiston lisenssi"
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4279,12 +4288,12 @@ msgstr ""
"**%%site.name%%** on mikroblogipalvelu, jonka tarjoaa [%%site.broughtby%%](%%"
"site.broughtbyurl%%). "
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** on mikroblogipalvelu. "
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4295,32 +4304,32 @@ msgstr ""
"versio %s, saatavilla lisenssillä [GNU Affero General Public License](http://"
"www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
#, fuzzy
msgid "Site content license"
msgstr "StatusNet-ohjelmiston lisenssi"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr "Kaikki "
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "lisenssi."
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "Sivutus"
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "Myöhemmin"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "Aiemmin"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr "Istuntoavaimesi kanssa oli ongelma."
@@ -5162,6 +5171,14 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index c3b1a0527..58cb965af 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -13,12 +13,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:10:21+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:06:42+0000\n"
"Language-Team: French\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: out-statusnet\n"
@@ -204,11 +204,11 @@ msgstr "Impossible de mettre à jour votre conception."
msgid "You cannot block yourself!"
msgstr "Vous ne pouvez pas vous bloquer vous-même !"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "Le blocage de l’utilisateur a échoué."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "Le déblocage de l’utilisateur a échoué."
@@ -322,7 +322,7 @@ msgid "Could not find target user."
msgstr "Impossible de trouver l’utilisateur cible."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
@@ -330,25 +330,25 @@ msgstr ""
"chiffres, sans espaces."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Pseudo déjà utilisé. Essayez-en un autre."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Pseudo invalide."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "L’adresse du site personnel n’est pas un URL valide. "
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Nom complet trop long (maximum de 255 caractères)."
@@ -359,7 +359,7 @@ msgid "Description is too long (max %d chars)."
msgstr "La description est trop longue (%d caractères maximum)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "Emplacement trop long (maximum de 255 caractères)."
@@ -474,7 +474,7 @@ msgstr "C’est trop long ! La taille maximale de l’avis est de %d caractères
msgid "Not found"
msgstr "Non trouvé"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -620,13 +620,13 @@ msgid "Crop"
msgstr "Recadrer"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -701,7 +701,7 @@ msgstr "Oui"
msgid "Block this user"
msgstr "Bloquer cet utilisateur"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "Impossible d’enregistrer les informations de blocage."
@@ -773,7 +773,7 @@ msgstr "Cette adresse a déjà été confirmée."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Impossible de mettre à jour l’utilisateur."
@@ -975,7 +975,7 @@ msgstr "Revenir aux valeurs par défaut"
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1477,7 +1477,7 @@ msgstr "Membres du groupe %s - page %d"
msgid "A list of the users in this group."
msgstr "Liste des utilisateurs inscrits à ce groupe."
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrer"
@@ -1577,7 +1577,7 @@ msgstr "Seul un administrateur peut débloquer les membres du groupes."
msgid "User is not blocked from group."
msgstr "Cet utilisateur n’est pas bloqué du groupe."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "Erreur lors de l’annulation du blocage."
@@ -1894,7 +1894,7 @@ msgstr ""
"Erreur lors de la mise en place de l'utilisateur. Vous n'y êtes probablement "
"pas autorisé."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Ouvrir une session"
@@ -2012,7 +2012,7 @@ msgstr "Message envoyé"
msgid "Direct message to %s sent"
msgstr "Votre message a été envoyé à %s"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "Erreur Ajax"
@@ -2020,7 +2020,7 @@ msgstr "Erreur Ajax"
msgid "New notice"
msgstr "Nouvel avis"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "Avis publié"
@@ -2454,73 +2454,82 @@ msgstr "Emplacement"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »"
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "Marques"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
"Marques pour vous-même (lettres, chiffres, -, ., et _), séparées par des "
"virgules ou des espaces"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Langue"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "Langue préférée"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Fuseau horaire"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "Quel est votre fuseau horaire habituel ?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
"M’abonner automatiquement à tous ceux qui s’abonnent à moi (recommandé pour "
"les utilisateurs non-humains)"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "La bio est trop longue (%d caractères maximum)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "Aucun fuseau horaire n’a été choisi."
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "La langue est trop longue (255 caractères maximum)."
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Marque invalide : « %s »"
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr "Impossible de mettre à jour l’auto-abonnement."
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Impossible d’enregistrer les marques."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Impossible d’enregistrer le profil."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "Impossible d’enregistrer les marques."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Préférences enregistrées."
@@ -2771,7 +2780,7 @@ msgstr "Désolé, code d’invitation invalide."
msgid "Registration successful"
msgstr "Compte créé avec succès"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Créer un compte"
@@ -4126,16 +4135,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr "Il vous est interdit de poster des avis sur ce site."
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Problème lors de l’enregistrement de l’avis."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Erreur de base de donnée en insérant la réponse :%s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4190,128 +4199,128 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Page sans nom"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr "Navigation primaire du site"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Accueil"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr "Profil personnel et flux des amis"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "Compte"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr "Modifier votre courriel, avatar, mot de passe, profil"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Connecter"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect to services"
msgstr "Se connecter aux services"
-#: lib/action.php:440
+#: lib/action.php:441
msgid "Change site configuration"
msgstr "Modifier la configuration du site"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Inviter"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Inviter des amis et collègues à vous rejoindre dans %s"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Fermeture de session"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "Fermer la session"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "Créer un compte"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "Ouvrir une session"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Aide"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "À l’aide !"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Rechercher"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "Rechercher des personnes ou du texte"
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr "Notice du site"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "Vues locales"
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr "Avis de la page"
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr "Navigation secondaire du site"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "À propos"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr "CGU"
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Confidentialité"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Source"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr "Insigne"
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr "Licence du logiciel StatusNet"
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4320,12 +4329,12 @@ msgstr ""
"**%%site.name%%** est un service de microblogging qui vous est proposé par "
"[%%site.broughtby%%](%%site.broughtbyurl%%)."
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** est un service de micro-blogging."
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4336,31 +4345,31 @@ msgstr ""
"version %s, disponible sous la licence [GNU Affero General Public License] "
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
msgid "Site content license"
msgstr "Licence du contenu du site"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr "Tous "
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "licence."
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "Après"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "Avant"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr "Un problème est survenu avec votre jeton de session."
@@ -5304,6 +5313,14 @@ msgstr "Attacher"
msgid "Attach a file"
msgstr "Attacher un fichier"
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index 8da467cea..2f2ebe62c 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:10:24+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:06:45+0000\n"
"Language-Team: Irish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ga\n"
"X-Message-Group: out-statusnet\n"
@@ -195,11 +195,11 @@ msgstr "Non se puido actualizar o usuario."
msgid "You cannot block yourself!"
msgstr "Non se puido actualizar o usuario."
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "Bloqueo de usuario fallido."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "Desbloqueo de usuario fallido."
@@ -320,31 +320,31 @@ msgid "Could not find target user."
msgstr "Non se puido atopar ningún estado"
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "O alcume debe ter só letras minúsculas e números, e sen espazos."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Non é un alcume válido."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "A páxina persoal semella que non é unha URL válida."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "O nome completo é demasiado longo (max 255 car)."
@@ -355,7 +355,7 @@ msgid "Description is too long (max %d chars)."
msgstr "O teu Bio é demasiado longo (max 140 car.)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "A localización é demasiado longa (max 255 car.)."
@@ -475,7 +475,7 @@ msgstr ""
msgid "Not found"
msgstr "Non atopado"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -621,13 +621,13 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -704,7 +704,7 @@ msgstr "Si"
msgid "Block this user"
msgstr "Bloquear usuario"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "Erro ao gardar información de bloqueo."
@@ -781,7 +781,7 @@ msgstr "Esa dirección xa foi confirmada."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Non se puido actualizar o usuario."
@@ -995,7 +995,7 @@ msgstr ""
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1512,7 +1512,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1605,7 +1605,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "O usuario bloqueoute."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "Acounteceu un erro borrando o bloqueo."
@@ -1916,7 +1916,7 @@ msgstr "Usuario ou contrasinal incorrectos."
msgid "Error setting user. You are probably not authorized."
msgstr "Non está autorizado."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Inicio de sesión"
@@ -2031,7 +2031,7 @@ msgstr "Non hai mensaxes de texto!"
msgid "Direct message to %s sent"
msgstr "Mensaxe directo a %s enviado"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "Erro de Ajax"
@@ -2039,7 +2039,7 @@ msgstr "Erro de Ajax"
msgid "New notice"
msgstr "Novo chío"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "Chío publicado"
@@ -2482,73 +2482,82 @@ msgstr "Localización"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "¿Onde estas, coma \"Cidade, Provincia, País\""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "Tags"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
"Etiquetas para o teu usuario (letras, números, -, ., e _), separados por "
"coma ou espazo"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Linguaxe"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "Linguaxe preferida"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Fuso Horario"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "En que fuso horario estas normalmente?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
"Suscribirse automáticamente a calquera que se suscriba a min (o mellor para "
"non humáns)"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "O teu Bio é demasiado longo (max 140 car.)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "Fuso Horario non seleccionado"
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "A Linguaxe é demasiado longa (max 50 car.)."
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Etiqueta inválida: '%s'"
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr "Non se puido actualizar o usuario para autosuscrición."
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Non se puideron gardar as etiquetas."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Non se puido gardar o perfil."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "Non se puideron gardar as etiquetas."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Configuracións gardadas."
@@ -2792,7 +2801,7 @@ msgstr "Acounteceu un erro co código de confirmación."
msgid "Registration successful"
msgstr "Xa estas rexistrado!!"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Rexistrar"
@@ -4154,16 +4163,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr "Tes restrinxido o envio de chíos neste sitio."
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Aconteceu un erro ó gardar o chío."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Erro ó inserir a contestación na BD: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -4222,139 +4231,139 @@ msgstr "%s (%s)"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Persoal"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:434
#, fuzzy
msgid "Account"
msgstr "Sobre"
-#: lib/action.php:433
+#: lib/action.php:434
#, fuzzy
msgid "Change your email, avatar, password, profile"
msgstr "Cambiar contrasinal"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Conectar"
-#: lib/action.php:436
+#: lib/action.php:437
#, fuzzy
msgid "Connect to services"
msgstr "Non se pode redireccionar ao servidor: %s"
-#: lib/action.php:440
+#: lib/action.php:441
#, fuzzy
msgid "Change site configuration"
msgstr "Navegación de subscricións"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invitar"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, fuzzy, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
"Emprega este formulario para invitar ós teus amigos e colegas a empregar "
"este servizo."
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Sair"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:455
+#: lib/action.php:456
#, fuzzy
msgid "Create an account"
msgstr "Crear nova conta"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr ""
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Axuda"
-#: lib/action.php:461
+#: lib/action.php:462
#, fuzzy
msgid "Help me!"
msgstr "Axuda"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Buscar"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:485
+#: lib/action.php:486
#, fuzzy
msgid "Site notice"
msgstr "Novo chío"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr ""
-#: lib/action.php:617
+#: lib/action.php:618
#, fuzzy
msgid "Page notice"
msgstr "Novo chío"
-#: lib/action.php:719
+#: lib/action.php:720
#, fuzzy
msgid "Secondary site navigation"
msgstr "Navegación de subscricións"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "Sobre"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "Preguntas frecuentes"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Privacidade"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Fonte"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Contacto"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr ""
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4363,12 +4372,12 @@ msgstr ""
"**%%site.name%%** é un servizo de microbloguexo que che proporciona [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** é un servizo de microbloguexo."
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4379,35 +4388,35 @@ msgstr ""
"%s, dispoñible baixo licenza [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
#, fuzzy
msgid "Site content license"
msgstr "Atopar no contido dos chíos"
-#: lib/action.php:799
+#: lib/action.php:800
#, fuzzy
msgid "All "
msgstr "Todos"
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr ""
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr ""
-#: lib/action.php:1107
+#: lib/action.php:1108
#, fuzzy
msgid "After"
msgstr "« Despois"
-#: lib/action.php:1115
+#: lib/action.php:1116
#, fuzzy
msgid "Before"
msgstr "Antes »"
-#: lib/action.php:1163
+#: lib/action.php:1164
#, fuzzy
msgid "There was a problem with your session token."
msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
@@ -5343,6 +5352,14 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index c0d4ecf51..0522937d9 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:10:27+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:06:49+0000\n"
"Language-Team: Hebrew\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: he\n"
"X-Message-Group: out-statusnet\n"
@@ -192,11 +192,11 @@ msgstr "עידכון המשתמש נכשל."
msgid "You cannot block yourself!"
msgstr "עידכון המשתמש נכשל."
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr ""
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr ""
@@ -311,31 +311,31 @@ msgid "Could not find target user."
msgstr "עידכון המשתמש נכשל."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "כינוי יכול להכיל רק אותיות אנגליות קטנות ומספרים, וללא רווחים."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "כינוי זה כבר תפוס. נסה כינוי אחר."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "שם משתמש לא חוקי."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "לאתר הבית יש כתובת לא חוקית."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "השם המלא ארוך מידי (מותרות 255 אותיות בלבד)"
@@ -346,7 +346,7 @@ msgid "Description is too long (max %d chars)."
msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיות)"
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "שם המיקום ארוך מידי (מותר עד 255 אותיות)."
@@ -467,7 +467,7 @@ msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 או
msgid "Not found"
msgstr "לא נמצא"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -614,13 +614,13 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -695,7 +695,7 @@ msgstr "כן"
msgid "Block this user"
msgstr "אין משתמש כזה."
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr ""
@@ -771,7 +771,7 @@ msgstr "כתובת זו כבר אושרה."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "עידכון המשתמש נכשל."
@@ -980,7 +980,7 @@ msgstr ""
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1488,7 +1488,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1581,7 +1581,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "למשתמש אין פרופיל."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
#, fuzzy
msgid "Error removing the block."
msgstr "שגיאה בשמירת המשתמש."
@@ -1860,7 +1860,7 @@ msgstr "שם משתמש או סיסמה לא נכונים."
msgid "Error setting user. You are probably not authorized."
msgstr "לא מורשה."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "היכנס"
@@ -1970,7 +1970,7 @@ msgstr "הודעה חדשה"
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr ""
@@ -1978,7 +1978,7 @@ msgstr ""
msgid "New notice"
msgstr "הודעה חדשה"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
#, fuzzy
msgid "Notice posted"
msgstr "הודעות"
@@ -2417,70 +2417,79 @@ msgstr "מיקום"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "מיקומך, למשל \"עיר, מדינה או מחוז, ארץ\""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr ""
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "שפה"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr ""
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr ""
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr ""
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיות)"
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr ""
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr ""
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, fuzzy, php-format
msgid "Invalid tag: \"%s\""
msgstr "כתובת אתר הבית '%s' אינה חוקית"
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "שמירת הפרופיל נכשלה."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "שמירת הפרופיל נכשלה."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
#, fuzzy
msgid "Couldn't save tags."
msgstr "שמירת הפרופיל נכשלה."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "ההגדרות נשמרו."
@@ -2714,7 +2723,7 @@ msgstr "שגיאה באישור הקוד."
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "הירשם"
@@ -4010,16 +4019,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4078,136 +4087,136 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "בית"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:434
#, fuzzy
msgid "Account"
msgstr "אודות"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "התחבר"
-#: lib/action.php:436
+#: lib/action.php:437
#, fuzzy
msgid "Connect to services"
msgstr "נכשלה ההפניה לשרת: %s"
-#: lib/action.php:440
+#: lib/action.php:441
#, fuzzy
msgid "Change site configuration"
msgstr "הרשמות"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "צא"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:455
+#: lib/action.php:456
#, fuzzy
msgid "Create an account"
msgstr "צור חשבון חדש"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr ""
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "עזרה"
-#: lib/action.php:461
+#: lib/action.php:462
#, fuzzy
msgid "Help me!"
msgstr "עזרה"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "חיפוש"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:485
+#: lib/action.php:486
#, fuzzy
msgid "Site notice"
msgstr "הודעה חדשה"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr ""
-#: lib/action.php:617
+#: lib/action.php:618
#, fuzzy
msgid "Page notice"
msgstr "הודעה חדשה"
-#: lib/action.php:719
+#: lib/action.php:720
#, fuzzy
msgid "Secondary site navigation"
msgstr "הרשמות"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "אודות"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "רשימת שאלות נפוצות"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "פרטיות"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "מקור"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "צור קשר"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr ""
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4216,12 +4225,12 @@ msgstr ""
"**%%site.name%%** הוא שרות ביקרובלוג הניתן על ידי [%%site.broughtby%%](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** הוא שרות ביקרובלוג."
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4232,34 +4241,34 @@ msgstr ""
"s, המופצת תחת רשיון [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)"
-#: lib/action.php:790
+#: lib/action.php:791
#, fuzzy
msgid "Site content license"
msgstr "הודעה חדשה"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr ""
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr ""
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr ""
-#: lib/action.php:1107
+#: lib/action.php:1108
#, fuzzy
msgid "After"
msgstr "<< אחרי"
-#: lib/action.php:1115
+#: lib/action.php:1116
#, fuzzy
msgid "Before"
msgstr "לפני >>"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr ""
@@ -5087,6 +5096,14 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index ae5b19651..515d49607 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:10:30+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:06:52+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: hsb\n"
"X-Message-Group: out-statusnet\n"
@@ -188,11 +188,11 @@ msgstr "Design njeda so aktualizować."
msgid "You cannot block yourself!"
msgstr "Njemóžeš so samoho blokować."
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr ""
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr ""
@@ -304,31 +304,31 @@ msgid "Could not find target user."
msgstr ""
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Žane płaćiwe přimjeno."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "Startowa strona njeje płaćiwy URL."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
@@ -339,7 +339,7 @@ msgid "Description is too long (max %d chars)."
msgstr "Wopisanje je předołho (maks. %d znamješkow)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "Městno je předołho (maks. 255 znamješkow)."
@@ -454,7 +454,7 @@ msgstr "To je předołho. Maksimalna wulkosć zdźělenki je %d znamješkow."
msgid "Not found"
msgstr "Njenamakany"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -597,13 +597,13 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -673,7 +673,7 @@ msgstr "Haj"
msgid "Block this user"
msgstr "Tutoho wužiwarja blokować"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr ""
@@ -745,7 +745,7 @@ msgstr "Tuta adresa bu hižo wobkrućena."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr ""
@@ -940,7 +940,7 @@ msgstr "Na standard wróćo stajić"
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1424,7 +1424,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr "Lisćina wužiwarjow w tutej skupinje."
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrator"
@@ -1511,7 +1511,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr ""
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr ""
@@ -1778,7 +1778,7 @@ msgstr "Wopačne wužiwarske mjeno abo hesło."
msgid "Error setting user. You are probably not authorized."
msgstr "Zmylk při nastajenju wužiwarja. Snano njejsy awtorizowany."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Přizjewić"
@@ -1885,7 +1885,7 @@ msgstr "Powěsć pósłana"
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "Zmylk Ajax"
@@ -1893,7 +1893,7 @@ msgstr "Zmylk Ajax"
msgid "New notice"
msgstr "Nowa zdźělenka"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "Zdźělenka wotpósłana"
@@ -2310,69 +2310,78 @@ msgstr "Městno"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr ""
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Rěč"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "Preferowana rěč"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Časowe pasmo"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr ""
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Biografija je předołha (maks. %d znamješkow)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "Časowe pasmo njeje wubrane."
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "Mjeno rěče je předołhe (maks. 50 znamješkow)."
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr ""
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Profil njeje so składować dał."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr ""
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr ""
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Nastajenja składowane."
@@ -2602,7 +2611,7 @@ msgstr "Wodaj, njepłaćiwy přeprošenski kod."
msgid "Registration successful"
msgstr "Registrowanje wuspěšne"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrować"
@@ -3836,16 +3845,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -3900,140 +3909,140 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Strona bjez titula"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr ""
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "Konto"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Zwjazać"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect to services"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:441
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Přeprosyć"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "Konto załožić"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr ""
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Pomoc"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "Pomhaj!"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Pytać"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "Za ludźimi abo tekstom pytać"
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr ""
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr ""
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr ""
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "Wo"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "Huste prašenja"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Priwatnosć"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Žórło"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr ""
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4041,31 +4050,31 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:790
+#: lib/action.php:791
msgid "Site content license"
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr ""
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr ""
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr ""
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr ""
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr ""
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr ""
@@ -4870,6 +4879,14 @@ msgstr "Připowěsnyć"
msgid "Attach a file"
msgstr "Dataju připowěsnyć"
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 9f64bd619..f06e4ac48 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:10:33+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:06:55+0000\n"
"Language-Team: Interlingua\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: out-statusnet\n"
@@ -198,11 +198,11 @@ msgstr "Non poteva actualisar le apparentia."
msgid "You cannot block yourself!"
msgstr "Tu non pote blocar te mesme!"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "Le blocada del usator ha fallite."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "Le disblocada del usator ha fallite."
@@ -314,31 +314,31 @@ msgid "Could not find target user."
msgstr "Non poteva trovar le usator de destination."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Le pseudonymo pote solmente haber minusculas e numeros, sin spatios."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Pseudonymo ja in uso. Proba un altere."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Non un pseudonymo valide."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "Le pagina personal non es un URL valide."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Le nomine complete es troppo longe (max. 255 characteres)."
@@ -349,7 +349,7 @@ msgid "Description is too long (max %d chars)."
msgstr "Description es troppo longe (max %d charachteres)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "Loco es troppo longe (max. 255 characteres)."
@@ -465,7 +465,7 @@ msgstr ""
msgid "Not found"
msgstr "Non trovate"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -610,13 +610,13 @@ msgid "Crop"
msgstr "Taliar"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -689,7 +689,7 @@ msgstr "Si"
msgid "Block this user"
msgstr "Blocar iste usator"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "Falleva de salveguardar le information del blocada."
@@ -761,7 +761,7 @@ msgstr "Iste adresse ha ja essite confirmate."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Non poteva actualisar usator."
@@ -961,7 +961,7 @@ msgstr "Revenir al predefinitiones"
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1461,7 +1461,7 @@ msgstr "Membros del gruppo %s, pagina %d"
msgid "A list of the users in this group."
msgstr "Un lista de usatores in iste gruppo."
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrator"
@@ -1559,7 +1559,7 @@ msgstr "Solmente un administrator pote disblocar membros de un gruppo."
msgid "User is not blocked from group."
msgstr "Le usator non es blocate del gruppo."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "Error de remover le blocada."
@@ -1869,7 +1869,7 @@ msgid "Error setting user. You are probably not authorized."
msgstr ""
"Error de acceder al conto de usator. Tu probabilemente non es autorisate."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Aperir session"
@@ -1984,7 +1984,7 @@ msgstr "Message inviate"
msgid "Direct message to %s sent"
msgstr "Message directe a %s inviate"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "Error de Ajax"
@@ -1992,7 +1992,7 @@ msgstr "Error de Ajax"
msgid "New notice"
msgstr "Nove nota"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "Nota publicate"
@@ -2424,72 +2424,81 @@ msgstr "Loco"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Ubi tu es, como \"Citate, Stato (o Region), Pais\""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "Etiquettas"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
"Etiquettas pro te (litteras, numeros, -, ., e _), separate per commas o "
"spatios"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Lingua"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "Lingua preferite"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Fuso horari"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "In que fuso horari es tu normalmente?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
"Subscriber me automaticamente a qui se subscribe a me (utile pro non-humanos)"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Bio es troppo longe (max %d chars)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "Fuso horari non seligite."
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "Lingua es troppo longe (max 50 chars)."
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Etiquetta invalide: \"%s\""
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr "Non poteva actualisar usator pro autosubscription."
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Non poteva salveguardar etiquettas."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Non poteva salveguardar profilo."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "Non poteva salveguardar etiquettas."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Preferentias confirmate."
@@ -2735,7 +2744,7 @@ msgstr "Pardono, le codice de invitation es invalide."
msgid "Registration successful"
msgstr "Registration succedite"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Crear un conto"
@@ -4032,16 +4041,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4096,140 +4105,140 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr ""
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr ""
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect to services"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:441
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr ""
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr ""
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr ""
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr ""
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr ""
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr ""
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr ""
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr ""
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr ""
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr ""
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr ""
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr ""
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr ""
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4237,31 +4246,31 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:790
+#: lib/action.php:791
msgid "Site content license"
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr ""
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr ""
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr ""
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr ""
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr ""
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr ""
@@ -5058,6 +5067,14 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index d085a47c8..b90feacaf 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:10:35+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:06:58+0000\n"
"Language-Team: Icelandic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: is\n"
"X-Message-Group: out-statusnet\n"
@@ -194,11 +194,11 @@ msgstr "Gat ekki uppfært hóp."
msgid "You cannot block yourself!"
msgstr "Gat ekki uppfært notanda."
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "Mistókst að loka á notanda."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "Mistókst að opna fyrir notanda."
@@ -312,31 +312,31 @@ msgid "Could not find target user."
msgstr ""
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Stuttnefni geta bara verið lágstafir og tölustafir en engin bil."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Ekki tækt stuttnefni."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "Heimasíða er ekki gild vefslóð."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)."
@@ -347,7 +347,7 @@ msgid "Description is too long (max %d chars)."
msgstr "Lýsing er of löng (í mesta lagi 140 tákn)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
@@ -467,7 +467,7 @@ msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
msgid "Not found"
msgstr "Fannst ekki"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -610,13 +610,13 @@ msgid "Crop"
msgstr "Skera af"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -689,7 +689,7 @@ msgstr "Já"
msgid "Block this user"
msgstr "Loka á þennan notanda"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "Mistókst að vista upplýsingar um notendalokun"
@@ -762,7 +762,7 @@ msgstr "Þetta tölvupóstfang hefur nú þegar verið staðfest."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Gat ekki uppfært notanda."
@@ -967,7 +967,7 @@ msgstr ""
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1463,7 +1463,7 @@ msgstr "Hópmeðlimir %s, síða %d"
msgid "A list of the users in this group."
msgstr "Listi yfir notendur í þessum hóp."
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "Stjórnandi"
@@ -1550,7 +1550,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr ""
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "Vill kom upp við að aflétta notendalokun."
@@ -1862,7 +1862,7 @@ msgstr "Rangt notendanafn eða lykilorð."
msgid "Error setting user. You are probably not authorized."
msgstr "Engin heimild."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Innskráning"
@@ -1978,7 +1978,7 @@ msgstr ""
msgid "Direct message to %s sent"
msgstr "Bein skilaboð send til %s"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "Ajax villa"
@@ -1986,7 +1986,7 @@ msgstr "Ajax villa"
msgid "New notice"
msgstr "Nýtt babl"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "Babl sent inn"
@@ -2425,73 +2425,82 @@ msgstr "Staðsetning"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Staðsetning þín, eins og \"borg, sýsla, land\""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "Merki"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
"Merki fyrir þig (bókstafir, tölustafir, -, ., og _), aðskilin með kommu eða "
"bili"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Tungumál"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "Tungumál (ákjósanlegt)"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Tímabelti"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "Í hvaða tímabelti eru í rauninni?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
"Gerast sjálfkrafa áskrifandi að hverjum þeim sem gerist áskrifandi að þér "
"(best fyrir ómannlega notendur)"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Lýsingin er of löng (í mesta lagi 140 tákn)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "Tímabelti ekki valið."
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "Tungumál er of langt (í mesta lagi 50 stafir)."
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Ógilt merki: \"%s\""
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr "Gat ekki uppfært notanda í sjálfvirka áskrift."
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Gat ekki vistað merki."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Gat ekki vistað persónulega síðu."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "Gat ekki vistað merki."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Stillingar vistaðar."
@@ -2724,7 +2733,7 @@ msgstr ""
msgid "Registration successful"
msgstr "Nýskráning tókst"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Nýskrá"
@@ -4042,16 +4051,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu."
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Vandamál komu upp við að vista babl."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Gagnagrunnsvilla við innsetningu svars: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -4106,132 +4115,132 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Ónafngreind síða"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr "Stikl aðalsíðu"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Heim"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr "Persónuleg síða og vinarás"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "Aðgangur"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr ""
"Breyttu tölvupóstinum þínum, einkennismyndinni þinni, lykilorðinu þínu, "
"persónulegu síðunni þinni"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Tengjast"
-#: lib/action.php:436
+#: lib/action.php:437
#, fuzzy
msgid "Connect to services"
msgstr "Gat ekki framsent til vefþjóns: %s"
-#: lib/action.php:440
+#: lib/action.php:441
#, fuzzy
msgid "Change site configuration"
msgstr "Stikl aðalsíðu"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Bjóða"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Bjóða vinum og vandamönnum að slást í hópinn á %s"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Útskráning"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "Skrá þig út af síðunni"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "Búa til aðgang"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "Skrá þig inn á síðuna"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Hjálp"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "Hjálp!"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Leita"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "Leita að fólki eða texta"
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr "Babl vefsíðunnar"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "Staðbundin sýn"
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr "Babl síðunnar"
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr "Stikl undirsíðu"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "Um"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "Spurt og svarað"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Friðhelgi"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Frumþula"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Tengiliður"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr ""
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr "Hugbúnaðarleyfi StatusNet"
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4240,12 +4249,12 @@ msgstr ""
"**%%site.name%%** er örbloggsþjónusta í boði [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** er örbloggsþjónusta."
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4256,32 +4265,32 @@ msgstr ""
"sem er gefinn út undir [GNU Affero almenningsleyfinu](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
#, fuzzy
msgid "Site content license"
msgstr "Hugbúnaðarleyfi StatusNet"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr "Allt "
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "leyfi."
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "Uppröðun"
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "Eftir"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "Áður"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr "Það komu upp vandamál varðandi setutókann þinn."
@@ -5109,6 +5118,14 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 29aab4755..d7c2fcd98 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:10:38+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:07:01+0000\n"
"Language-Team: Italian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: it\n"
"X-Message-Group: out-statusnet\n"
@@ -199,11 +199,11 @@ msgstr "Impossibile aggiornare l'aspetto."
msgid "You cannot block yourself!"
msgstr "Non puoi bloccarti!"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "Blocco dell'utente non riuscito."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "Sblocco dell'utente non riuscito."
@@ -315,7 +315,7 @@ msgid "Could not find target user."
msgstr "Impossibile trovare l'utente destinazione."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
@@ -323,25 +323,25 @@ msgstr ""
"spazi."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Soprannome già in uso. Prova con un altro."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Non è un soprannome valido."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "L'indirizzo della pagina web non è valido."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Nome troppo lungo (max 255 caratteri)."
@@ -352,7 +352,7 @@ msgid "Description is too long (max %d chars)."
msgstr "La descrizione è troppo lunga (max %d caratteri)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "Ubicazione troppo lunga (max 255 caratteri)."
@@ -467,7 +467,7 @@ msgstr "Troppo lungo. Lunghezza massima %d caratteri."
msgid "Not found"
msgstr "Non trovato"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -611,13 +611,13 @@ msgid "Crop"
msgstr "Ritaglia"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -691,7 +691,7 @@ msgstr "Sì"
msgid "Block this user"
msgstr "Blocca questo utente"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "Salvataggio delle informazioni per il blocco non riuscito."
@@ -763,7 +763,7 @@ msgstr "Quell'indirizzo è già stato confermato."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Impossibile aggiornare l'utente."
@@ -964,7 +964,7 @@ msgstr "Reimposta i valori predefiniti"
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1467,7 +1467,7 @@ msgstr "Membri del gruppo %s, pagina %d"
msgid "A list of the users in this group."
msgstr "Un elenco degli utenti in questo gruppo."
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "Amministra"
@@ -1565,7 +1565,7 @@ msgstr "Solo gli amministratori possono sbloccare i membri del gruppo."
msgid "User is not blocked from group."
msgstr "L'utente non è bloccato dal gruppo."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "Errore nel rimuovere il blocco."
@@ -1873,7 +1873,7 @@ msgstr "Nome utente o password non corretto."
msgid "Error setting user. You are probably not authorized."
msgstr "Errore nell'impostare l'utente. Forse non hai l'autorizzazione."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Accedi"
@@ -1985,7 +1985,7 @@ msgstr "Messaggio inviato"
msgid "Direct message to %s sent"
msgstr "Messaggio diretto a %s inviato"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "Errore di Ajax"
@@ -1993,7 +1993,7 @@ msgstr "Errore di Ajax"
msgid "New notice"
msgstr "Nuovo messaggio"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "Messaggio inviato"
@@ -2427,72 +2427,81 @@ msgstr "Ubicazione"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Dove ti trovi, tipo \"città, regione, stato\""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "Etichette"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
"Le tue etichette (lettere, numeri, -, . e _), separate da virgole o spazi"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Lingua"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "Lingua preferita"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Fuso orario"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "In che fuso orario risiedi solitamente?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
"Abbonami automaticamente a chi si abbona ai miei messaggi (utile per i non-"
"umani)"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "La biografia è troppo lunga (max %d caratteri)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "Fuso orario non selezionato"
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "La lingua è troppo lunga (max 50 caratteri)."
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Etichetta non valida: \"%s\""
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr "Impossibile aggiornare l'utente per auto-abbonarsi."
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Impossibile salvare le etichette."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Impossibile salvare il profilo."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "Impossibile salvare le etichette."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Impostazioni salvate."
@@ -2736,7 +2745,7 @@ msgstr "Codice di invito non valido."
msgid "Registration successful"
msgstr "Registrazione riuscita"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registra"
@@ -4079,16 +4088,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr "Ti è proibito inviare messaggi su questo sito."
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Problema nel salvare il messaggio."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Errore del DB nell'inserire la risposta: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4143,128 +4152,128 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Pagina senza nome"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr "Esplorazione sito primaria"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Home"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr "Profilo personale e attività degli amici"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "Account"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr "Modifica la tua email, immagine, password o il tuo profilo"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Connetti"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect to services"
msgstr "Connettiti con altri servizi"
-#: lib/action.php:440
+#: lib/action.php:441
msgid "Change site configuration"
msgstr "Modifica la configurazione del sito"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invita"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invita amici e colleghi a seguirti su %s"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Esci"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "Termina la tua sessione sul sito"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "Crea un account"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "Accedi al sito"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Aiuto"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "Aiutami!"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Cerca"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "Cerca persone o del testo"
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr "Messaggio del sito"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "Viste locali"
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr "Pagina messaggio"
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr "Esplorazione secondaria del sito"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "Informazioni"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr "TOS"
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Privacy"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Sorgenti"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Contatti"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr "Badge"
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr "Licenza del software StatusNet"
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4273,12 +4282,12 @@ msgstr ""
"**%%site.name%%** è un servizio di microblog offerto da [%%site.broughtby%%]"
"(%%site.broughtbyurl%%). "
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** è un servizio di microblog. "
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4289,31 +4298,31 @@ msgstr ""
"s, disponibile nei termini della licenza [GNU Affero General Public License]"
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
msgid "Site content license"
msgstr "Licenza del contenuto del sito"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr "Tutti "
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "licenza."
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "Paginazione"
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "Successivi"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "Precedenti"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr "Si è verificato un problema con il tuo token di sessione."
@@ -5250,6 +5259,14 @@ msgstr "Allega"
msgid "Attach a file"
msgstr "Allega un file"
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 9fb5918e7..e8d2e9e0e 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:10:42+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:07:04+0000\n"
"Language-Team: Japanese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ja\n"
"X-Message-Group: out-statusnet\n"
@@ -199,11 +199,11 @@ msgstr "デザインを更新できませんでした。"
msgid "You cannot block yourself!"
msgstr "自分自身をブロックすることはできません!"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "利用者のブロックに失敗しました。"
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "利用者のブロック解除に失敗しました。"
@@ -316,7 +316,7 @@ msgid "Could not find target user."
msgstr "ターゲットユーザーを見つけられません。"
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
@@ -324,25 +324,25 @@ msgstr ""
"できません。"
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "有効なニックネームではありません。"
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "ホームページのURLが不適切です。"
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "フルネームが長すぎます。(255字まで)"
@@ -353,7 +353,7 @@ msgid "Description is too long (max %d chars)."
msgstr "記述が長すぎます。(最長140字)"
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "場所が長すぎます。(255字まで)"
@@ -468,7 +468,7 @@ msgstr "長すぎます。つぶやきは最大 140 字までです。"
msgid "Not found"
msgstr "みつかりません"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "つぶやきは URL を含めて最大 %d 字までです。"
@@ -507,7 +507,7 @@ msgstr "%1$s / %2$s について更新"
#: actions/apitimelinementions.php:127
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
+msgstr "%2$s からアップデートに答える %1$s アップデート"
#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
#, php-format
@@ -517,12 +517,12 @@ msgstr "%s のパブリックタイムライン"
#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
-msgstr ""
+msgstr "皆からの %s アップデート!"
#: actions/apitimelineretweetedbyme.php:112
#, php-format
msgid "Repeated by %s"
-msgstr ""
+msgstr "%s による繰り返し"
#: actions/apitimelineretweetedtome.php:111
#, php-format
@@ -537,7 +537,7 @@ msgstr "%s の返信"
#: actions/apitimelinetag.php:102 actions/tag.php:66
#, php-format
msgid "Notices tagged with %s"
-msgstr ""
+msgstr "%s とタグ付けされたつぶやき"
#: actions/apitimelinetag.php:108 actions/tagrss.php:64
#, php-format
@@ -579,7 +579,7 @@ msgstr "自分のアバターをアップロードできます。最大サイズ
#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
#: actions/userauthorization.php:72 actions/userrss.php:103
msgid "User without matching profile"
-msgstr ""
+msgstr "合っているプロフィールのない利用者"
#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
#: actions/grouplogo.php:251
@@ -610,13 +610,13 @@ msgid "Crop"
msgstr "切り取り"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -686,7 +686,7 @@ msgstr ""
msgid "Block this user"
msgstr "このユーザをブロックする"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "ブロック情報の保存に失敗しました。"
@@ -758,7 +758,7 @@ msgstr "そのアドレスは既に承認されています。"
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "ユーザを更新できません"
@@ -954,7 +954,7 @@ msgstr "デフォルトへリセットする"
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1453,7 +1453,7 @@ msgstr "%s グループメンバー、ページ %d"
msgid "A list of the users in this group."
msgstr "このグループの利用者のリスト。"
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "管理者"
@@ -1517,9 +1517,8 @@ msgstr "グループの検索"
#: actions/groupsearch.php:79 actions/noticesearch.php:117
#: actions/peoplesearch.php:83
-#, fuzzy
msgid "No results."
-msgstr "結果なし"
+msgstr "結果なし。"
#: actions/groupsearch.php:82
#, php-format
@@ -1547,7 +1546,7 @@ msgstr "管理者だけがグループメンバーをアンブロックできま
msgid "User is not blocked from group."
msgstr "利用者はグループからブロックされていません。"
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "ブロックの削除エラー"
@@ -1798,71 +1797,68 @@ msgstr ""
#: actions/joingroup.php:60
msgid "You must be logged in to join a group."
-msgstr ""
+msgstr "グループに入るためにはログインしなければなりません。"
#: actions/joingroup.php:90 lib/command.php:217
msgid "You are already a member of that group"
msgstr "あなたは既にそのグループに参加しています。"
#: actions/joingroup.php:128 lib/command.php:234
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %s to group %s"
-msgstr "サーバへリダイレクトできません : %s"
+msgstr "利用者 %s はグループ %s に参加できません"
#: actions/joingroup.php:135 lib/command.php:239
#, php-format
msgid "%s joined group %s"
-msgstr ""
+msgstr "%s はグループ %s に参加しました"
#: actions/leavegroup.php:60
msgid "You must be logged in to leave a group."
-msgstr ""
+msgstr "グループから離れるにはログインしていなければなりません。"
#: actions/leavegroup.php:90 lib/command.php:268
-#, fuzzy
msgid "You are not a member of that group."
-msgstr "そのプロファイルは送信されていません。"
+msgstr "あなたはそのグループのメンバーではありません。"
#: actions/leavegroup.php:119 lib/command.php:278
msgid "Could not find membership record."
-msgstr ""
+msgstr "会員資格記録を見つけることができませんでした。"
#: actions/leavegroup.php:127 lib/command.php:284
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %s to group %s"
-msgstr "OpenIDを作成できません : %s"
+msgstr "利用者 %s をグループ %s から削除することができません"
#: actions/leavegroup.php:134 lib/command.php:289
#, php-format
msgid "%s left group %s"
-msgstr ""
+msgstr "%s はグループ %s に残りました。"
#: actions/login.php:83 actions/register.php:137
msgid "Already logged in."
msgstr "既にログインしています。"
#: actions/login.php:114 actions/login.php:124
-#, fuzzy
msgid "Invalid or expired token."
-msgstr "不正な通知内容"
+msgstr "不正または期限切れのトークン"
#: actions/login.php:147
msgid "Incorrect username or password."
msgstr "ユーザ名またはパスワードが間違っています。"
#: actions/login.php:153
-#, fuzzy
msgid "Error setting user. You are probably not authorized."
-msgstr "認証されていません。"
+msgstr "ユーザ設定エラー。 あなたはたぶん承認されていません。"
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "ログイン"
#: actions/login.php:247
msgid "Login to site"
-msgstr ""
+msgstr "サイトへログイン"
#: actions/login.php:250 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
@@ -1901,45 +1897,47 @@ msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
"(%%action.register%%) a new account."
msgstr ""
+"ユーザ名とパスワードで、ログインしてください。 まだユーザ名を持っていません"
+"か? 新しいアカウントを [登録](%%action.register%%)。"
#: actions/makeadmin.php:91
msgid "Only an admin can make another user an admin."
-msgstr ""
+msgstr "管理者だけが別のユーザを管理者にすることができます。"
#: actions/makeadmin.php:95
#, php-format
msgid "%s is already an admin for group \"%s\"."
-msgstr ""
+msgstr "%s はすでにグループ \"%s\" の管理者です。"
#: actions/makeadmin.php:132
#, php-format
msgid "Can't get membership record for %s in group %s"
-msgstr ""
+msgstr "%s の会員資格記録をグループ %s 中から取得できません。"
#: actions/makeadmin.php:145
#, php-format
msgid "Can't make %s an admin for group %s"
-msgstr ""
+msgstr "%s をグループ %s の管理者にすることはできません"
#: actions/microsummary.php:69
msgid "No current status"
-msgstr ""
+msgstr "現在のステータスはありません"
#: actions/newgroup.php:53
msgid "New group"
-msgstr ""
+msgstr "新しいグループ"
#: actions/newgroup.php:110
msgid "Use this form to create a new group."
-msgstr ""
+msgstr "このフォームを使って新しいグループを作成します。"
#: actions/newmessage.php:71 actions/newmessage.php:231
msgid "New message"
-msgstr ""
+msgstr "新しいメッセージ"
#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
msgid "You can't send a message to this user."
-msgstr ""
+msgstr "この利用者にメッセージを送ることはできません。"
#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
#: lib/command.php:484
@@ -1948,31 +1946,32 @@ msgstr "コンテンツがありません!"
#: actions/newmessage.php:158
msgid "No recipient specified."
-msgstr ""
+msgstr "受取人が書かれていません。"
#: actions/newmessage.php:164 lib/command.php:370
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
+"自分自身にメッセージを送ることはできません; かわりに独り言を言いましょう。"
#: actions/newmessage.php:181
msgid "Message sent"
-msgstr ""
+msgstr "メッセージを送りました"
#: actions/newmessage.php:185 lib/command.php:376
#, php-format
msgid "Direct message to %s sent"
-msgstr ""
+msgstr "ダイレクトメッセージを %s に送りました"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
-msgstr ""
+msgstr "Ajax エラー"
#: actions/newnotice.php:69
msgid "New notice"
msgstr "新しいつぶやき"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "つぶやきを投稿しました"
@@ -1981,16 +1980,17 @@ msgstr "つぶやきを投稿しました"
msgid ""
"Search for notices on %%site.name%% by their contents. Separate search terms "
"by spaces; they must be 3 characters or more."
-msgstr "%%site.name%% の通知を内容から検索。検索語はスペース区切る。3字以上"
+msgstr ""
+"%%site.name%% のつぶやきを内容から検索。検索語はスペース区切り。3字以上"
#: actions/noticesearch.php:78
msgid "Text search"
-msgstr "文字検索"
+msgstr "テキスト検索"
#: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Search results for \"%s\" on %s"
-msgstr "\"%s\" のストリームを検索"
+msgstr "%s の %s 上の検索結果"
#: actions/noticesearch.php:121
#, php-format
@@ -1998,6 +1998,8 @@ msgid ""
"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
"status_textarea=%s)!"
msgstr ""
+"最初の [このトピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) をして"
+"ください!"
#: actions/noticesearch.php:124
#, php-format
@@ -2005,29 +2007,33 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
+"なぜ [アカウント登録](%%%%action.register%%%%) しないのですか、そして最初の"
+"[このトピック投稿](%%%%action.newnotice%%%%?status_textarea=%s)してください!"
#: actions/noticesearchrss.php:96
-#, fuzzy, php-format
+#, php-format
msgid "Updates with \"%s\""
-msgstr "マイクロブログ by %s"
+msgstr "%s で更新"
#: actions/noticesearchrss.php:98
#, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "検索語「%s」に一致するすべての更新"
+msgstr "\"%2$s\" 上の検索語 \"$1$s\" に一致するすべての更新"
#: actions/nudge.php:85
msgid ""
"This user doesn't allow nudges or hasn't confirmed or set his email yet."
msgstr ""
+"この利用者は、合図を許可していないか、確認されていた状態でないか、メール設定"
+"をしていません。"
#: actions/nudge.php:94
msgid "Nudge sent"
-msgstr ""
+msgstr "合図を送った"
#: actions/nudge.php:97
msgid "Nudge sent!"
-msgstr ""
+msgstr "合図を送った!"
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
@@ -2036,7 +2042,7 @@ msgstr "つぶやきにはプロファイルはありません。"
#: actions/oembed.php:86 actions/shownotice.php:180
#, php-format
msgid "%1$s's status on %2$s"
-msgstr "%2$s における %1$ の状態"
+msgstr "%2$s における %1$ のステータス"
#: actions/oembed.php:157
msgid "content type "
@@ -2044,12 +2050,12 @@ msgstr "内容種別 "
#: actions/oembed.php:160
msgid "Only "
-msgstr ""
+msgstr "だけ "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031
#: lib/api.php:1059 lib/api.php:1169
msgid "Not a supported data format."
-msgstr ""
+msgstr "サポートされていないデータ形式。"
#: actions/opensearch.php:64
msgid "People Search"
@@ -2060,53 +2066,52 @@ msgid "Notice Search"
msgstr "つぶやき検索"
#: actions/othersettings.php:60
-#, fuzzy
msgid "Other Settings"
-msgstr "設定"
+msgstr "その他の設定"
#: actions/othersettings.php:71
msgid "Manage various other options."
-msgstr ""
+msgstr "他のオプションを管理。"
#: actions/othersettings.php:108
msgid " (free service)"
-msgstr ""
+msgstr "(フリーサービス)"
#: actions/othersettings.php:116
msgid "Shorten URLs with"
-msgstr ""
+msgstr "URLを短くします"
#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
-msgstr ""
+msgstr "使用する自動短縮サービス。"
#: actions/othersettings.php:122
-#, fuzzy
msgid "View profile designs"
-msgstr "プロファイル設定"
+msgstr "プロファイルデザインを表示"
#: actions/othersettings.php:123
msgid "Show or hide profile designs."
-msgstr ""
+msgstr "プロファイルデザインの表示または非表示"
#: actions/othersettings.php:153
-#, fuzzy
msgid "URL shortening service is too long (max 50 chars)."
-msgstr "場所が長すぎます。(255字まで)"
+msgstr "URL 短縮サービスが長すぎます。(最大50字)"
#: actions/outbox.php:58
#, php-format
msgid "Outbox for %s - page %d"
-msgstr ""
+msgstr "%s の送信箱 - ページ %d"
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
-msgstr ""
+msgstr "%s の送信箱"
#: actions/outbox.php:116
msgid "This is your outbox, which lists private messages you have sent."
msgstr ""
+"これはあなたの送信箱です、あなたが送ったプライベート・メッセージをリストしま"
+"す。"
#: actions/passwordsettings.php:58
msgid "Change password"
@@ -2118,7 +2123,7 @@ msgstr "パスワードを変更します。"
#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
-msgstr "パスワードの変更"
+msgstr "パスワード変更"
#: actions/passwordsettings.php:104
msgid "Old password"
@@ -2135,7 +2140,7 @@ msgstr "6文字以上"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
-msgstr "確認"
+msgstr "パスワード確認"
#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
msgid "Same as password above"
@@ -2171,135 +2176,128 @@ msgstr "パスワードが保存されました。"
#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
msgid "Paths"
-msgstr ""
+msgstr "パス"
#: actions/pathsadminpanel.php:70
msgid "Path and server settings for this StatusNet site."
-msgstr ""
+msgstr "パスと StatusNet サイトのサーバー設定"
#: actions/pathsadminpanel.php:140
-#, fuzzy, php-format
+#, php-format
msgid "Theme directory not readable: %s"
-msgstr "このページはあなたが承認したメディアタイプでは利用できません。"
+msgstr "テーマディレクトリが読み込めません: %s"
#: actions/pathsadminpanel.php:146
#, php-format
msgid "Avatar directory not writable: %s"
-msgstr ""
+msgstr "アバターディレクトリに書き込みできません: %s"
#: actions/pathsadminpanel.php:152
#, php-format
msgid "Background directory not writable: %s"
-msgstr ""
+msgstr "バックグラウンドディレクトリに書き込みできません : %s"
#: actions/pathsadminpanel.php:160
#, php-format
msgid "Locales directory not readable: %s"
-msgstr ""
+msgstr "場所ディレクトリが読み込めません: %s"
#: actions/pathsadminpanel.php:166
msgid "Invalid SSL server. The maximum length is 255 characters."
-msgstr ""
+msgstr "不正な SSL サーバー。最大 255 文字まで。"
#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:299
msgid "Site"
-msgstr ""
+msgstr "サイト"
#: actions/pathsadminpanel.php:221
msgid "Path"
-msgstr ""
+msgstr "パス"
#: actions/pathsadminpanel.php:221
-#, fuzzy
msgid "Site path"
-msgstr "新しい通知"
+msgstr "サイトパス"
#: actions/pathsadminpanel.php:225
msgid "Path to locales"
-msgstr ""
+msgstr "ロケールのパス"
#: actions/pathsadminpanel.php:225
msgid "Directory path to locales"
-msgstr ""
+msgstr "ロケールへのディレクトリパス"
#: actions/pathsadminpanel.php:232
msgid "Theme"
-msgstr ""
+msgstr "テーマ"
#: actions/pathsadminpanel.php:237
msgid "Theme server"
-msgstr ""
+msgstr "テーマサーバー"
#: actions/pathsadminpanel.php:241
msgid "Theme path"
-msgstr ""
+msgstr "テーマパス"
#: actions/pathsadminpanel.php:245
msgid "Theme directory"
-msgstr ""
+msgstr "テーマディレクトリ"
#: actions/pathsadminpanel.php:252
-#, fuzzy
msgid "Avatars"
msgstr "アバター"
#: actions/pathsadminpanel.php:257
-#, fuzzy
msgid "Avatar server"
-msgstr "設定"
+msgstr "アバターサーバー"
#: actions/pathsadminpanel.php:261
-#, fuzzy
msgid "Avatar path"
-msgstr "アバターが更新されました。"
+msgstr "アバターパス"
#: actions/pathsadminpanel.php:265
-#, fuzzy
msgid "Avatar directory"
-msgstr "アバターが更新されました。"
+msgstr "アバターディレクトリ"
#: actions/pathsadminpanel.php:274
msgid "Backgrounds"
-msgstr ""
+msgstr "バックグラウンド"
#: actions/pathsadminpanel.php:278
msgid "Background server"
-msgstr ""
+msgstr "バックグラウンドサーバー"
#: actions/pathsadminpanel.php:282
msgid "Background path"
-msgstr ""
+msgstr "バックグラウンドパス"
#: actions/pathsadminpanel.php:286
msgid "Background directory"
-msgstr ""
+msgstr "バックグラウンドディレクトリ"
#: actions/pathsadminpanel.php:293
msgid "SSL"
msgstr ""
#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
-#, fuzzy
msgid "Never"
-msgstr "回復"
+msgstr ""
#: actions/pathsadminpanel.php:297
-#, fuzzy
msgid "Sometimes"
-msgstr "通知"
+msgstr "ときどき"
#: actions/pathsadminpanel.php:298
msgid "Always"
-msgstr ""
+msgstr "いつも"
#: actions/pathsadminpanel.php:302
msgid "Use SSL"
-msgstr ""
+msgstr "SSL 使用"
#: actions/pathsadminpanel.php:303
msgid "When to use SSL"
-msgstr ""
+msgstr "SSL 使用時"
#: actions/pathsadminpanel.php:308
msgid "SSL Server"
@@ -2307,12 +2305,11 @@ msgstr ""
#: actions/pathsadminpanel.php:309
msgid "Server to direct SSL requests to"
-msgstr ""
+msgstr "ダイレクト SSL リクエストを向けるサーバ"
#: actions/pathsadminpanel.php:325
-#, fuzzy
msgid "Save paths"
-msgstr "新しい通知"
+msgstr "保存パス"
#: actions/peoplesearch.php:52
#, php-format
@@ -2320,30 +2317,31 @@ msgid ""
"Search for people on %%site.name%% by their name, location, or interests. "
"Separate the terms by spaces; they must be 3 characters or more."
msgstr ""
-"%%site.name%% の人を名前、場所、興味から検索。検索語はスペース区切る。3字以上"
+"%%site.name%% の人を名前、場所、興味から検索。検索語はスペース区切り。3字以"
+"上。"
#: actions/peoplesearch.php:58
msgid "People search"
msgstr "ピープルサーチ"
#: actions/peopletag.php:70
-#, fuzzy, php-format
+#, php-format
msgid "Not a valid people tag: %s"
-msgstr "有効なメールアドレスではありません。"
+msgstr "正しいタグではありません: %s"
#: actions/peopletag.php:144
#, php-format
msgid "Users self-tagged with %s - page %d"
-msgstr ""
+msgstr "ユーザがつけたタグ %s - ページ %d"
#: actions/postnotice.php:84
msgid "Invalid notice content"
-msgstr "不正な通知内容"
+msgstr "不正なつぶやき内容"
#: actions/postnotice.php:90
#, php-format
msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
-msgstr ""
+msgstr "つぶやきライセンス ‘%s’ はサイトライセンス ‘%s’ と互換性がありません。"
#: actions/profilesettings.php:60
msgid "Profile settings"
@@ -2357,9 +2355,8 @@ msgstr ""
"す。"
#: actions/profilesettings.php:99
-#, fuzzy
msgid "Profile information"
-msgstr "プロファイルが不明"
+msgstr "プロファイル情報"
#: actions/profilesettings.php:108 lib/groupeditform.php:154
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
@@ -2402,109 +2399,114 @@ msgstr "場所"
#: actions/profilesettings.php:134 actions/register.php:472
msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "自分のいる場所。例:「都市, 州 (または地域), 国」"
+msgstr "自分のいる場所。例:「都市, 都道府県 (または地域), 国」"
+
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "タグ"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-"自分自身についてのタグ (アルファベット/数字/-/./_)、カンマまたは空白区切"
+"自分自身についてのタグ (アルファベット、数字、-、.、_)、カンマまたは空白区切"
"りで"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "言語"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "ご希望の言語"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "タイムゾーン"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "普段のタイムゾーンはどれですか?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "自分をフォローしている者を自動的にフォローする (BOTに最適)"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "自己紹介が長すぎます (最長140文字)。"
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
-msgstr ""
+msgstr "タイムゾーンが選ばれていません。"
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
-msgstr ""
+msgstr "言語が長すぎます。(最大50字)"
-#: actions/profilesettings.php:246 actions/tagother.php:178
-#, fuzzy, php-format
+#: actions/profilesettings.php:253 actions/tagother.php:178
+#, php-format
msgid "Invalid tag: \"%s\""
-msgstr "不正なホームページ '%s'"
+msgstr "不正なタグ: \"%s\""
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
-msgstr ""
+msgstr "自動フォローのための利用者を更新できませんでした。"
+
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "タグを保存できません。"
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "プロファイルを保存できません"
-#: actions/profilesettings.php:336
-#, fuzzy
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
-msgstr "プロファイルを保存できません"
+msgstr "タグを保存できません。"
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "設定が保存されました。"
#: actions/public.php:83
#, php-format
msgid "Beyond the page limit (%s)"
-msgstr ""
+msgstr "ページ制限を超えました (%s)"
#: actions/public.php:92
msgid "Could not retrieve public stream."
-msgstr ""
+msgstr "パブリックストリームを検索できません。"
#: actions/public.php:129
-#, fuzzy, php-format
+#, php-format
msgid "Public timeline, page %d"
-msgstr "パブリックタイムライン"
+msgstr "パブリックタイムライン、ページ %d"
#: actions/public.php:131 lib/publicgroupnav.php:79
msgid "Public timeline"
msgstr "パブリックタイムライン"
#: actions/public.php:151
-#, fuzzy
msgid "Public Stream Feed (RSS 1.0)"
-msgstr "パブリックフィード"
+msgstr "パブリックストリームフィード (RSS 1.0)"
#: actions/public.php:155
-#, fuzzy
msgid "Public Stream Feed (RSS 2.0)"
-msgstr "パブリックフィード"
+msgstr "パブリックストリームフィード (RSS 2.0)"
#: actions/public.php:159
-#, fuzzy
msgid "Public Stream Feed (Atom)"
-msgstr "パブリックフィード"
+msgstr "パブリックストリームフィード (Atom)"
#: actions/public.php:179
#, php-format
@@ -2512,16 +2514,20 @@ msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
+"これは %%site.name%% のパブリックタイムラインです、しかしまだ誰も投稿していま"
+"せん。"
#: actions/public.php:182
msgid "Be the first to post!"
-msgstr ""
+msgstr "投稿する1番目になってください!"
#: actions/public.php:186
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
+"なぜ [アカウント登録](%%action.register%%) しないのですか、そして最初の投稿を"
+"してください!"
#: actions/public.php:233
#, php-format
@@ -2531,6 +2537,11 @@ msgid ""
"tool. [Join now](%%action.register%%) to share notices about yourself with "
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
+"これは %%site.name%% です。フリーソフトウェアツール[StatusNet](http://status."
+"net/)を基にした[マイクロブロギング](http: //en.wikipedia.org/wiki/Micro-"
+"blogging) サービス。[今すぐ参加](%%action.register%%)してあなた自身や友達、家"
+"族そして同僚などについてのつぶやきを共有しましょう! ([もっと読む](%%doc.help%"
+"%))"
#: actions/public.php:238
#, php-format
@@ -2539,25 +2550,28 @@ msgid ""
"blogging) service based on the Free Software [StatusNet](http://status.net/) "
"tool."
msgstr ""
+"これは %%site.name%% です。フリーソフトウェアツール[StatusNet](http://status."
+"net/)を基にした[マイクロブロギング](http://en.wikipedia.org/wiki/Micro-"
+"blogging) サービス。"
#: actions/publictagcloud.php:57
-#, fuzzy
msgid "Public tag cloud"
-msgstr "パブリックフィード"
+msgstr "パブリックタグクラウド"
#: actions/publictagcloud.php:63
#, php-format
msgid "These are most popular recent tags on %s "
-msgstr ""
+msgstr "これらは %s の人気がある最近のタグです "
#: actions/publictagcloud.php:69
#, php-format
msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
msgstr ""
+"まだだれも [ハッシュタグ](%%doc.tags%%) 付きのつぶやきを投稿していません。"
#: actions/publictagcloud.php:72
msgid "Be the first to post one!"
-msgstr ""
+msgstr "投稿する1番目になってください!"
#: actions/publictagcloud.php:75
#, php-format
@@ -2565,10 +2579,12 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to post "
"one!"
msgstr ""
+"なぜ [アカウント登録](%%action.register%%) しないのですか。そして最初の投稿を"
+"してください!"
#: actions/publictagcloud.php:135
msgid "Tag cloud"
-msgstr ""
+msgstr "タグクラウド"
#: actions/recoverpassword.php:36
msgid "You are already logged in!"
@@ -2596,25 +2612,27 @@ msgstr "確認コードが古すぎます。もう一度やり直してくださ
#: actions/recoverpassword.php:111
msgid "Could not update user with confirmed email address."
-msgstr ""
+msgstr "確認されたメールアドレスで利用者を更新できません。"
#: actions/recoverpassword.php:152
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
msgstr ""
+"あなたのパスワードを忘れるか紛失したなら、あなたはアカウントに格納したメール"
+"アドレスに新しいものを送らせることができます。"
#: actions/recoverpassword.php:158
msgid "You have been identified. Enter a new password below. "
-msgstr ""
+msgstr "あなたは特定されました。 以下の新しいパスワードを入力してください。 "
#: actions/recoverpassword.php:188
msgid "Password recovery"
-msgstr ""
+msgstr "パスワード回復"
#: actions/recoverpassword.php:191
msgid "Nickname or email address"
-msgstr ""
+msgstr "ニックネームまたはメールアドレス"
#: actions/recoverpassword.php:193
msgid "Your nickname on this server, or your registered email address."
@@ -2634,11 +2652,11 @@ msgstr "パスワードを回復"
#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
msgid "Password recovery requested"
-msgstr "パスワード回復のリクエストされました"
+msgstr "パスワード回復がリクエストされました"
#: actions/recoverpassword.php:213
msgid "Unknown action"
-msgstr ""
+msgstr "不明なアクション"
#: actions/recoverpassword.php:236
msgid "6 or more characters, and don't forget it!"
@@ -2654,11 +2672,11 @@ msgstr "ニックネームかメールアドレスを入力してください。
#: actions/recoverpassword.php:272
msgid "No user with that email address or username."
-msgstr ""
+msgstr "そのメールアドレスかユーザ名をもっている利用者がありません。"
#: actions/recoverpassword.php:287
msgid "No registered email address for that user."
-msgstr "そのユーザにはメールアドレスの登録がありません。"
+msgstr "その利用者にはメールアドレスの登録がありません。"
#: actions/recoverpassword.php:301
msgid "Error saving address confirmation."
@@ -2668,7 +2686,7 @@ msgstr "アドレス確認保存エラー"
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
-msgstr "登録されたメールアドレスにパスワードの回復方法をおおくりしました。"
+msgstr "登録されたメールアドレスにパスワードの回復方法をお送りしました。"
#: actions/recoverpassword.php:344
msgid "Unexpected password reset."
@@ -2692,25 +2710,24 @@ msgstr "新しいパスワードの保存に成功しました。ログインし
#: actions/register.php:85 actions/register.php:189 actions/register.php:404
msgid "Sorry, only invited people can register."
-msgstr ""
+msgstr "すみません、招待された人々だけが登録できます。"
#: actions/register.php:92
-#, fuzzy
msgid "Sorry, invalid invitation code."
-msgstr "確認コードにエラーがあります。"
+msgstr "すみません、不正な招待コード。"
#: actions/register.php:112
msgid "Registration successful"
-msgstr ""
+msgstr "登録成功"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "登録"
#: actions/register.php:135
msgid "Registration not allowed."
-msgstr ""
+msgstr "登録は許可されていません。"
#: actions/register.php:198
msgid "You can't register if you don't agree to the license."
@@ -2733,6 +2750,8 @@ msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
+"このフォームで新しいアカウントを作成できます。 次につぶやきを投稿して、友人や"
+"同僚にリンクできます。 "
#: actions/register.php:424
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
@@ -2745,7 +2764,7 @@ msgstr "6文字以上。必須です。"
#: actions/register.php:433
msgid "Same as password above. Required."
-msgstr ""
+msgstr "上のパスワードと同じです。 必須。"
#: actions/register.php:437 actions/register.php:441
#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
@@ -2758,22 +2777,21 @@ msgstr "更新、アナウンス、パスワードリカバリーでのみ使用
#: actions/register.php:449
msgid "Longer name, preferably your \"real\" name"
-msgstr ""
+msgstr "長い名前"
#: actions/register.php:493
msgid "My text and files are available under "
-msgstr "の下でテキスト及びファイルを利用可能"
+msgstr "次の下でテキスト及びファイルを利用可能 "
#: actions/register.php:495
msgid "Creative Commons Attribution 3.0"
msgstr ""
#: actions/register.php:496
-#, fuzzy
msgid ""
" except this private data: password, email address, IM address, and phone "
"number."
-msgstr "個人情報を除く:パスワード、メールアドレス、IMアドレス、電話番号"
+msgstr "個人情報を除く: パスワード、メールアドレス、IMアドレス、電話番号"
#: actions/register.php:537
#, php-format
@@ -2823,22 +2841,22 @@ msgid ""
"register%%) a new account. If you already have an account on a [compatible "
"microblogging site](%%doc.openmublog%%), enter your profile URL below."
msgstr ""
-"サブスクライブするには、[ログイン](%%action.login%%) するか, [登録](%%action."
+"フォローするには、[ログイン](%%action.login%%) するか, [登録](%%action."
"register%%) を行って下さい。既に [compatible microblogging site](%%doc."
-"openmublog%%) にアカウントを持っおもちの場合は、下にプロファイルURLを入力して"
-"下さい."
+"openmublog%%) にアカウントをお持ちの場合は、下にプロファイルURLを入力して下さ"
+"い."
#: actions/remotesubscribe.php:112
msgid "Remote subscribe"
-msgstr "リモートサブスクライブ"
+msgstr "リモートフォロー"
#: actions/remotesubscribe.php:124
msgid "Subscribe to a remote user"
-msgstr "リモートユーザーのフォローを許可"
+msgstr "リモートユーザーをフォロー"
#: actions/remotesubscribe.php:129
msgid "User nickname"
-msgstr "ユーザのニックネーム"
+msgstr "利用者のニックネーム"
#: actions/remotesubscribe.php:130
msgid "Nickname of the user you want to follow"
@@ -2862,47 +2880,43 @@ msgid "Invalid profile URL (bad format)"
msgstr "不正なプロファイルURL。(形式不備)"
#: actions/remotesubscribe.php:168
-#, fuzzy
msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr "有効なプロファイルURLではありません。(XRDSドキュメントが無い)"
+msgstr ""
+"有効なプロファイルURLではありません。(YADIS ドキュメントがないかまたは 不正"
+"な XRDS 定義)"
#: actions/remotesubscribe.php:176
msgid "That’s a local profile! Login to subscribe."
msgstr ""
+"それはローカルのプロファイルです! フォローするには、ログインしてください。"
#: actions/remotesubscribe.php:183
-#, fuzzy
msgid "Couldn’t get a request token."
msgstr "リクエストトークンを取得できません"
#: actions/repeat.php:57
msgid "Only logged-in users can repeat notices."
-msgstr ""
+msgstr "ログインユーザだけがつぶやきを繰り返せます。"
#: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
msgid "No notice specified."
-msgstr "新しい通知"
+msgstr "つぶやきがありません。"
#: actions/repeat.php:76
-#, fuzzy
msgid "You can't repeat your own notice."
-msgstr "ライセンスに同意頂けない場合は登録できません。"
+msgstr "自分のつぶやきは繰り返せません。"
#: actions/repeat.php:90
-#, fuzzy
msgid "You already repeated that notice."
-msgstr "既にログイン済みです。"
+msgstr "すでにそのつぶやきを繰り返しています。"
#: actions/repeat.php:114 lib/noticelist.php:621
-#, fuzzy
msgid "Repeated"
-msgstr "作成"
+msgstr "繰り返された"
#: actions/repeat.php:119
-#, fuzzy
msgid "Repeated!"
-msgstr "作成"
+msgstr "繰り返されました!"
#: actions/replies.php:125 actions/repliesrss.php:68
#: lib/personalgroupnav.php:105
@@ -2911,24 +2925,24 @@ msgid "Replies to %s"
msgstr "%s への返信"
#: actions/replies.php:127
-#, fuzzy, php-format
+#, php-format
msgid "Replies to %s, page %d"
-msgstr "%s への返信"
+msgstr "%s への返信、ページ %d"
#: actions/replies.php:144
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (RSS 1.0)"
-msgstr "%sの通知フィード"
+msgstr "%s の返信フィード (RSS 1.0)"
#: actions/replies.php:151
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (RSS 2.0)"
-msgstr "%sの通知フィード"
+msgstr "%s の返信フィード (RSS 2.0)"
#: actions/replies.php:158
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (Atom)"
-msgstr "%sの通知フィード"
+msgstr "%s の返信フィード (Atom)"
#: actions/replies.php:198
#, php-format
@@ -2936,6 +2950,8 @@ msgid ""
"This is the timeline showing replies to %s but %s hasn't received a notice "
"to his attention yet."
msgstr ""
+"これは %s への返信を表示したタイムラインです、しかし %s はまだつぶやきを受け"
+"取っていません。"
#: actions/replies.php:203
#, php-format
@@ -2943,6 +2959,8 @@ msgid ""
"You can engage other users in a conversation, subscribe to more people or "
"[join groups](%%action.groups%%)."
msgstr ""
+"あなたは、他のユーザを会話をするか、多くの人々をフォローするか、または [グ"
+"ループに加わる] (%%action.groups%%)ことができます。"
#: actions/replies.php:205
#, php-format
@@ -2950,51 +2968,54 @@ msgid ""
"You can try to [nudge %s](../%s) or [post something to his or her attention]"
"(%%%%action.newnotice%%%%?status_textarea=%s)."
msgstr ""
+"あなたは [合図 %s](../%s) するか、[その人宛てに何かを投稿](%%%%action."
+"newnotice%%%%?status_textarea=%s)してください。"
#: actions/repliesrss.php:72
-#, fuzzy, php-format
+#, php-format
msgid "Replies to %1$s on %2$s!"
-msgstr "%s への返信"
+msgstr "%2$s 上の %1$s への返信!"
#: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
msgid "You cannot sandbox users on this site."
-msgstr "そのプロファイルは送信されていません。"
+msgstr "あなたはこのサイトのサンドボックスユーザができません。"
#: actions/sandbox.php:72
-#, fuzzy
msgid "User is already sandboxed."
-msgstr "プロファイルがありません。"
+msgstr "利用者はすでにサンドボックスです。"
#: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%s's favorite notices, page %d"
-msgstr "そのような通知はありません。"
+msgstr "%s のお気に入りのつぶやき、ページ %d"
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
-msgstr ""
+msgstr "お気に入りのつぶやきを検索できません。"
#: actions/showfavorites.php:170
-#, fuzzy, php-format
+#, php-format
msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr "%s のともだちのフィード"
+msgstr "%s のお気に入りのフィード (RSS 1.0)"
#: actions/showfavorites.php:177
-#, fuzzy, php-format
+#, php-format
msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr "%s のともだちのフィード"
+msgstr "%s のお気に入りのフィード (RSS 2.0)"
#: actions/showfavorites.php:184
-#, fuzzy, php-format
+#, php-format
msgid "Feed for favorites of %s (Atom)"
-msgstr "%s のともだちのフィード"
+msgstr "%s のお気に入りのフィード (Atom)"
#: actions/showfavorites.php:205
msgid ""
"You haven't chosen any favorite notices yet. Click the fave button on "
"notices you like to bookmark them for later or shed a spotlight on them."
msgstr ""
+"あなたはまだ少しのお気に入りのつぶやきも選んでいません。 後でブックマークを追"
+"加するあなたがそれらがお気に入りのつぶやきのときにお気に入りボタンをクリック"
+"するか、またはそれらの上でスポットライトをはじいてください。"
#: actions/showfavorites.php:207
#, php-format
@@ -3002,6 +3023,8 @@ msgid ""
"%s hasn't added any notices to his favorites yet. Post something interesting "
"they would add to their favorites :)"
msgstr ""
+"%s はまだ彼のお気に入りに少しのつぶやきも加えていません。 彼らがお気に入りに"
+"加えることおもしろいものを投稿してください:)"
#: actions/showfavorites.php:211
#, php-format
@@ -3010,25 +3033,27 @@ msgid ""
"account](%%%%action.register%%%%) and then post something interesting they "
"would add to their favorites :)"
msgstr ""
+"%s はまだお気に入りに少しのつぶやきも加えていません。 なぜ [アカウント登録](%"
+"%%%action.register%%%%) しないのですか。そして、彼らがお気に入りに加えるおも"
+"しろい何かを投稿しませんか:)"
#: actions/showfavorites.php:242
msgid "This is a way to share what you like."
-msgstr ""
+msgstr "これは、あなたが好きなことを共有する方法です。"
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
msgid "%s group"
-msgstr ""
+msgstr "%s グループ"
#: actions/showgroup.php:84
#, php-format
msgid "%s group, page %d"
-msgstr ""
+msgstr "%s グループ、ページ %d"
#: actions/showgroup.php:218
-#, fuzzy
msgid "Group profile"
-msgstr "そのような通知はありません。"
+msgstr "グループプロファイル"
#: actions/showgroup.php:263 actions/tagother.php:118
#: actions/userauthorization.php:167 lib/userprofile.php:177
@@ -3037,61 +3062,58 @@ msgstr ""
#: actions/showgroup.php:274 actions/tagother.php:128
#: actions/userauthorization.php:179 lib/userprofile.php:194
-#, fuzzy
msgid "Note"
-msgstr "通知"
+msgstr "ノート"
#: actions/showgroup.php:284 lib/groupeditform.php:184
msgid "Aliases"
-msgstr ""
+msgstr "別名"
#: actions/showgroup.php:293
msgid "Group actions"
-msgstr ""
+msgstr "グループアクション"
#: actions/showgroup.php:328
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "%sの通知フィード"
+msgstr "%s グループのつぶやきフィード (RSS 1.0)"
#: actions/showgroup.php:334
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "%sの通知フィード"
+msgstr "%s グループのつぶやきフィード (RSS 2.0)"
#: actions/showgroup.php:340
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s group (Atom)"
-msgstr "%sの通知フィード"
+msgstr "%s グループのつぶやきフィード (Atom)"
#: actions/showgroup.php:345
-#, fuzzy, php-format
+#, php-format
msgid "FOAF for %s group"
-msgstr "%sの通知フィード"
+msgstr "%s グループの FOAF"
#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
-#, fuzzy
msgid "Members"
-msgstr "からのメンバー"
+msgstr "メンバー"
#: actions/showgroup.php:386 lib/profileaction.php:117
#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
-msgstr ""
+msgstr "(なし)"
#: actions/showgroup.php:392
msgid "All members"
-msgstr ""
+msgstr "全てのメンバー"
#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "統計データ"
#: actions/showgroup.php:432
-#, fuzzy
msgid "Created"
-msgstr "作成"
+msgstr "作成されました"
#: actions/showgroup.php:448
#, php-format
@@ -3102,6 +3124,11 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** は %%site.name%% 上のユーザグループです。フリーソフトウェアツール"
+"[StatusNet](http://status.net/)を基にした[マイクロブロギング] (http: //en."
+"wikipedia.org/wiki/Micro-blogging) サービス。メンバーは彼らの暮らしと興味に関"
+"する短いメッセージを共有します。[今すぐ参加](%%%%action.register%%%%) してこ"
+"のグループの一員になりましょう! ([もっと読む](%%%%doc.help%%%%))"
#: actions/showgroup.php:454
#, php-format
@@ -3111,29 +3138,32 @@ msgid ""
"[StatusNet](http://status.net/) tool. Its members share short messages about "
"their life and interests. "
msgstr ""
+"**%s** は %%site.name%% 上のユーザグループです。フリーソフトウェアツール"
+"[StatusNet](http://status.net/)を基にした[マイクロブロギング](http: //en."
+"wikipedia.org/wiki/Micro-blogging) サービス。メンバーは彼らの暮らしと興味に関"
+"する短いメッセージを共有します。"
#: actions/showgroup.php:482
-#, fuzzy
msgid "Admins"
msgstr "管理者"
#: actions/showmessage.php:81
msgid "No such message."
-msgstr ""
+msgstr "そのようなメッセージはありません。"
#: actions/showmessage.php:98
msgid "Only the sender and recipient may read this message."
-msgstr ""
+msgstr "送信者と受取人だけがこのメッセージを読めます。"
#: actions/showmessage.php:108
#, php-format
msgid "Message to %1$s on %2$s"
-msgstr ""
+msgstr "%2$s 上の %1$s へのメッセージ"
#: actions/showmessage.php:113
#, php-format
msgid "Message from %1$s on %2$s"
-msgstr ""
+msgstr "%2$s 上の %1$s からのメッセージ"
#: actions/shownotice.php:90
msgid "Notice deleted."
@@ -3142,12 +3172,12 @@ msgstr "つぶやきを削除しました。"
#: actions/showstream.php:73
#, php-format
msgid " tagged %s"
-msgstr ""
+msgstr "タグ付けされた %s"
#: actions/showstream.php:79
#, php-format
msgid "%s, page %d"
-msgstr ""
+msgstr "%s、ページ %d"
#: actions/showstream.php:122
#, php-format
@@ -3172,18 +3202,20 @@ msgstr "%sのつぶやきフィード (Atom)"
#: actions/showstream.php:148
#, php-format
msgid "FOAF for %s"
-msgstr ""
+msgstr "%s の FOAF"
#: actions/showstream.php:191
#, php-format
msgid "This is the timeline for %s but %s hasn't posted anything yet."
-msgstr ""
+msgstr "これは %s のタイムラインですが、%s はまだなにも投稿していません。"
#: actions/showstream.php:196
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
+"最近おもしろいものは何でしょう? あなたは少しのつぶやきも投稿していませんが、"
+"いまは始める良い時でしょう:)"
#: actions/showstream.php:198
#, php-format
@@ -3191,6 +3223,8 @@ msgid ""
"You can try to nudge %s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%s)."
msgstr ""
+"あなたは、%s に合図するか、[またはその人宛に何かを投稿](%%%%action.newnotice%"
+"%%%?status_textarea=%s) しようとすることができます。"
#: actions/showstream.php:234
#, php-format
@@ -3200,6 +3234,11 @@ msgid ""
"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** は %%site.name%% 上のアカウントです。フリーソフトウェアツール"
+"[StatusNet](http://status.net/)を基にした[マイクロブロギング] (http: //en."
+"wikipedia.org/wiki/Micro-blogging) サービス。[今すぐ参加](%%%%action.register"
+"%%%%)して、**%s** のつぶやきなどをフォローしましょう! ([もっと読む](%%%%doc."
+"help%%%%))"
#: actions/showstream.php:239
#, php-format
@@ -3208,62 +3247,63 @@ msgid ""
"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
"[StatusNet](http://status.net/) tool. "
msgstr ""
+"**%s** は %%site.name%% 上のアカウントです。フリーソフトウェアツール"
+"[StatusNet](http://status.net/)を基にした[マイクロブロギング] (http: //en."
+"wikipedia.org/wiki/Micro-blogging) サービス。"
#: actions/showstream.php:313
-#, fuzzy, php-format
+#, php-format
msgid "Repeat of %s"
-msgstr "%s への返信"
+msgstr "%s の繰り返し"
#: actions/silence.php:65 actions/unsilence.php:65
msgid "You cannot silence users on this site."
-msgstr ""
+msgstr "あなたはこのサイトでユーザを黙らせることができません。"
#: actions/silence.php:72
-#, fuzzy
msgid "User is already silenced."
-msgstr "プロファイルがありません。"
+msgstr "利用者は既に黙っています。"
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
-msgstr ""
+msgstr "この StatusNet サイトの基本設定。"
#: actions/siteadminpanel.php:146
msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "サイト名は長さ0ではいけません。"
#: actions/siteadminpanel.php:154
-#, fuzzy
msgid "You must have a valid contact email address"
-msgstr "有効なメールアドレスではありません。"
+msgstr "有効な連絡用メールアドレスがなければなりません。"
#: actions/siteadminpanel.php:172
#, php-format
msgid "Unknown language \"%s\""
-msgstr ""
+msgstr "不明な言語 \"%s\""
#: actions/siteadminpanel.php:179
msgid "Invalid snapshot report URL."
-msgstr ""
+msgstr "不正なスナップショットレポートURL。"
#: actions/siteadminpanel.php:185
msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "不正なスナップショットランバリュー"
#: actions/siteadminpanel.php:191
msgid "Snapshot frequency must be a number."
-msgstr ""
+msgstr "スナップショット頻度は数でなければなりません。"
#: actions/siteadminpanel.php:197
msgid "Minimum text limit is 140 characters."
-msgstr ""
+msgstr "最小のテキスト制限は140字です。"
#: actions/siteadminpanel.php:203
msgid "Dupe limit must 1 or more seconds."
-msgstr ""
+msgstr "デュープ制限は1秒以上でなければなりません。"
#: actions/siteadminpanel.php:253
msgid "General"
-msgstr ""
+msgstr "一般"
#: actions/siteadminpanel.php:256
msgid "Site name"
@@ -3271,58 +3311,58 @@ msgstr "サイト名"
#: actions/siteadminpanel.php:257
msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr ""
+msgstr "あなたのサイトの名前、\"Yourcompany Microblog\"のような。"
#: actions/siteadminpanel.php:261
msgid "Brought by"
-msgstr ""
+msgstr "持って来られます"
#: actions/siteadminpanel.php:262
msgid "Text used for credits link in footer of each page"
msgstr ""
+"クレジットに使用されるテキストは、それぞれのページのフッターでリンクされま"
+"す。"
#: actions/siteadminpanel.php:266
msgid "Brought by URL"
-msgstr ""
+msgstr "URLで、持って来られます"
#: actions/siteadminpanel.php:267
msgid "URL used for credits link in footer of each page"
msgstr ""
+"クレジットに使用されるURLは、それぞれのページのフッターでリンクされます。"
#: actions/siteadminpanel.php:271
-#, fuzzy
msgid "Contact email address for your site"
-msgstr "そのユーザにはメールアドレスの登録がありません。"
+msgstr "あなたのサイトにコンタクトするメールアドレス"
#: actions/siteadminpanel.php:277
-#, fuzzy
msgid "Local"
-msgstr "場所"
+msgstr "ローカル"
#: actions/siteadminpanel.php:288
msgid "Default timezone"
-msgstr ""
+msgstr "デフォルトタイムゾーン"
#: actions/siteadminpanel.php:289
msgid "Default timezone for the site; usually UTC."
-msgstr ""
+msgstr "サイトのデフォルトタイムゾーン; 通常UTC。"
#: actions/siteadminpanel.php:295
msgid "Default site language"
-msgstr ""
+msgstr "デフォルトサイト言語"
#: actions/siteadminpanel.php:303
msgid "URLs"
msgstr ""
#: actions/siteadminpanel.php:306
-#, fuzzy
msgid "Server"
-msgstr "回復"
+msgstr "サーバー"
#: actions/siteadminpanel.php:306
msgid "Site's server hostname."
-msgstr ""
+msgstr "サイトのサーバーホスト名"
#: actions/siteadminpanel.php:310
msgid "Fancy URLs"
@@ -3330,42 +3370,39 @@ msgstr ""
#: actions/siteadminpanel.php:312
msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
+msgstr "Fancy URL (読みやすく忘れにくい) を使用しますか?"
#: actions/siteadminpanel.php:318
-#, fuzzy
msgid "Access"
-msgstr "承認"
+msgstr "アクセス"
#: actions/siteadminpanel.php:321
-#, fuzzy
msgid "Private"
-msgstr "プライバシー"
+msgstr "プライベート"
#: actions/siteadminpanel.php:323
msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
+msgstr "匿名ユーザー(ログインしていません)がサイトを見るのを禁止しますか?"
#: actions/siteadminpanel.php:327
msgid "Invite only"
-msgstr ""
+msgstr "招待のみ"
#: actions/siteadminpanel.php:329
msgid "Make registration invitation only."
-msgstr ""
+msgstr "招待のみ登録する"
#: actions/siteadminpanel.php:333
-#, fuzzy
msgid "Closed"
-msgstr "ブロック"
+msgstr "閉じられた"
#: actions/siteadminpanel.php:335
msgid "Disable new registrations."
-msgstr ""
+msgstr "新規登録を無効。"
#: actions/siteadminpanel.php:341
msgid "Snapshots"
-msgstr ""
+msgstr "スナップショット"
#: actions/siteadminpanel.php:344
msgid "Randomly during Web hit"
@@ -3373,74 +3410,75 @@ msgstr ""
#: actions/siteadminpanel.php:345
msgid "In a scheduled job"
-msgstr ""
+msgstr "予定されているジョブで"
#: actions/siteadminpanel.php:347
msgid "Data snapshots"
-msgstr ""
+msgstr "データスナップショット"
#: actions/siteadminpanel.php:348
msgid "When to send statistical data to status.net servers"
-msgstr ""
+msgstr "いつ status.net サーバに統計データを送りますか"
#: actions/siteadminpanel.php:353
msgid "Frequency"
-msgstr ""
+msgstr "頻度"
#: actions/siteadminpanel.php:354
msgid "Snapshots will be sent once every N web hits"
-msgstr ""
+msgstr "レポート URL"
#: actions/siteadminpanel.php:359
msgid "Report URL"
-msgstr ""
+msgstr "レポート URL"
#: actions/siteadminpanel.php:360
msgid "Snapshots will be sent to this URL"
-msgstr ""
+msgstr "このURLにスナップショットを送るでしょう"
#: actions/siteadminpanel.php:367
msgid "Limits"
-msgstr ""
+msgstr "制限"
#: actions/siteadminpanel.php:370
msgid "Text limit"
-msgstr ""
+msgstr "テキスト制限"
#: actions/siteadminpanel.php:370
msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "つぶやきの文字の最大数"
#: actions/siteadminpanel.php:374
msgid "Dupe limit"
-msgstr ""
+msgstr "デュープ制限"
#: actions/siteadminpanel.php:374
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
+"どれくらい長い間(秒)、ユーザは、再び同じものを投稿するのを待たなければならな"
+"いか。"
#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-#, fuzzy
msgid "Save site settings"
-msgstr "設定"
+msgstr "サイト設定の保存"
#: actions/smssettings.php:58
msgid "SMS Settings"
-msgstr ""
+msgstr "SMS 設定"
#: actions/smssettings.php:69
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
+"あなたは %%site.name%% からメールでSMSメッセージを受け取ることができます。"
#: actions/smssettings.php:91
-#, fuzzy
msgid "SMS is not available."
-msgstr "このページはあなたが承認したメディアタイプでは利用できません。"
+msgstr "SMS は利用できません。"
#: actions/smssettings.php:112
msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
+msgstr "現在の確認された SMS 可能な電話番号。"
#: actions/smssettings.php:123
msgid "Awaiting confirmation on this phone number."
@@ -3452,60 +3490,63 @@ msgstr "確認コード"
#: actions/smssettings.php:131
msgid "Enter the code you received on your phone."
-msgstr ""
+msgstr "あなたがあなたの電話で受け取ったコードを入れてください。"
#: actions/smssettings.php:138
msgid "SMS Phone number"
-msgstr ""
+msgstr "SMS 電話番号"
#: actions/smssettings.php:140
msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
+msgstr "電話番号、句読点またはスペースがない、市街番号付き"
#: actions/smssettings.php:174
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
+"SMSを通してつぶやきを私に送ってください; 私は、私のキャリアから法外な料金を被"
+"るかもしれないのを理解しています。"
#: actions/smssettings.php:306
msgid "No phone number."
-msgstr ""
+msgstr "電話番号がありません。"
#: actions/smssettings.php:311
msgid "No carrier selected."
-msgstr ""
+msgstr "キャリアが選択されていません。"
#: actions/smssettings.php:318
msgid "That is already your phone number."
-msgstr ""
+msgstr "これはすでにあなたの電話番号です。"
#: actions/smssettings.php:321
msgid "That phone number already belongs to another user."
-msgstr ""
+msgstr "この電話番号はすでに他の利用者に使われています。"
#: actions/smssettings.php:347
-#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
-msgstr "その確認コードはあなたのものではありません!"
+msgstr ""
+"あなたが加えた電話番号に確認コードを送りました。 どうそれを使用するかに関する"
+"コードと指示のために電話をチェックしてください。"
#: actions/smssettings.php:374
msgid "That is the wrong confirmation number."
-msgstr ""
+msgstr "それは間違った確認番号です。"
#: actions/smssettings.php:405
msgid "That is not your phone number."
-msgstr ""
+msgstr "それはあなたの電話番号ではありません。"
#: actions/smssettings.php:465
msgid "Mobile carrier"
-msgstr ""
+msgstr "携帯電話会社"
#: actions/smssettings.php:469
msgid "Select a carrier"
-msgstr ""
+msgstr "キャリア選択"
#: actions/smssettings.php:476
#, php-format
@@ -3513,25 +3554,25 @@ msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr ""
+"あなたの電話のための携帯電話会社。 メールの上にSMSを受け入れますが、ここに記"
+"載されていないキャリアを知っているなら、メールを送って、%sで私たちに知らせて"
+"ください。"
#: actions/smssettings.php:498
msgid "No code entered"
-msgstr ""
+msgstr "コードが入力されていません"
#: actions/subedit.php:70
-#, fuzzy
msgid "You are not subscribed to that profile."
-msgstr "そのプロファイルは送信されていません。"
+msgstr "あなたはそのプロファイルにフォローされていません。"
#: actions/subedit.php:83
-#, fuzzy
msgid "Could not save subscription."
-msgstr "サブスクリプションを作成できません"
+msgstr "フォローを保存できません。"
#: actions/subscribe.php:55
-#, fuzzy
msgid "Not a local user."
-msgstr "そのようなユーザはいません。"
+msgstr "ローカルユーザではありません。"
#: actions/subscribe.php:69
msgid "Subscribed"
@@ -3561,11 +3602,13 @@ msgid ""
"You have no subscribers. Try subscribing to people you know and they might "
"return the favor"
msgstr ""
+"あなたには、フォローしている人が全くいません。 あなたが知っている人々をフォ"
+"ローしてみてください。そうすれば、彼らはお気に入りを返すかもしれません。"
#: actions/subscribers.php:110
#, php-format
msgid "%s has no subscribers. Want to be the first?"
-msgstr ""
+msgstr "%s にはフォローしている人がいません。最初の人になりますか?"
#: actions/subscribers.php:114
#, php-format
@@ -3573,6 +3616,8 @@ msgid ""
"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
"%) and be the first?"
msgstr ""
+"%s にはフォローしている人がいません。なぜ[アカウント登録](%%%%action.register"
+"%%%%)して最初にならないのですか?"
#: actions/subscriptions.php:52
#, php-format
@@ -3604,100 +3649,96 @@ msgid ""
msgstr ""
#: actions/subscriptions.php:123 actions/subscriptions.php:127
-#, fuzzy, php-format
+#, php-format
msgid "%s is not listening to anyone."
-msgstr "%1$s は %2$s であなたの通知を聞いています。"
+msgstr "%s はだれも言うことを聞いていません。"
#: actions/subscriptions.php:194
-#, fuzzy
msgid "Jabber"
-msgstr "Jabbar ID はありません。"
+msgstr ""
#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
#: actions/tag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Notices tagged with %s, page %d"
-msgstr "マイクロブログ by %s"
+msgstr "%s とタグ付けされたつぶやき、ページ %d"
#: actions/tag.php:86
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "%sの通知フィード"
+msgstr "%s とタグ付けされたつぶやきフィード (RSS 1.0)"
#: actions/tag.php:92
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "%sの通知フィード"
+msgstr "%s とタグ付けされたつぶやきフィード (RSS 2.0)"
#: actions/tag.php:98
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (Atom)"
-msgstr "%sの通知フィード"
+msgstr "%s とタグ付けされたつぶやきフィード (Atom)"
#: actions/tagother.php:39
-#, fuzzy
msgid "No ID argument."
-msgstr "そのようなドキュメントはありません。"
+msgstr "ID引数がありません。"
#: actions/tagother.php:65
#, php-format
msgid "Tag %s"
-msgstr ""
+msgstr "タグ %s"
#: actions/tagother.php:77 lib/userprofile.php:75
-#, fuzzy
msgid "User profile"
-msgstr "プロファイルがありません。"
+msgstr "利用者プロファイル"
#: actions/tagother.php:81 lib/userprofile.php:102
msgid "Photo"
-msgstr ""
+msgstr "写真"
#: actions/tagother.php:141
msgid "Tag user"
-msgstr ""
+msgstr "タグ利用者"
#: actions/tagother.php:151
msgid ""
"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
"separated"
msgstr ""
+"この利用者のタグ (アルファベット、数字、-、.、_)、カンマかスペース区切り"
#: actions/tagother.php:193
msgid ""
"You can only tag people you are subscribed to or who are subscribed to you."
msgstr ""
+"あなたはフォローされる人々にタグ付けをすることができるだけか、あなたをフォ"
+"ローされているか。"
#: actions/tagother.php:200
-#, fuzzy
msgid "Could not save tags."
-msgstr "アバターを保存できません"
+msgstr "タグをを保存できません。"
#: actions/tagother.php:236
msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr ""
+msgstr "このフォームを使用して、フォロー者かフォローにタグを加えてください。"
#: actions/tagrss.php:35
-#, fuzzy
msgid "No such tag."
-msgstr "そのような通知はありません。"
+msgstr "そのようなタグはありません。"
#: actions/twitapitrends.php:87
msgid "API method under construction."
msgstr "API メソッドが工事中です。"
#: actions/unblock.php:59
-#, fuzzy
msgid "You haven't blocked that user."
-msgstr "既にログイン済みです。"
+msgstr "あなたはそのユーザをブロックしていません。"
#: actions/unsandbox.php:72
-#, fuzzy
msgid "User is not sandboxed."
-msgstr "プロファイルがありません。"
+msgstr "利用者はサンドボックスではありません。"
#: actions/unsilence.php:72
#, fuzzy
@@ -4007,16 +4048,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "つぶやきを保存する際に問題が発生しました。"
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "返信を追加する際にデータベースエラー : %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4074,131 +4115,131 @@ msgstr ""
msgid "Untitled page"
msgstr "名称未設定ページ"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "ホーム"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "アカウント"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr "メールアドレス、アバター、パスワード、プロパティの変更"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "接続"
-#: lib/action.php:436
+#: lib/action.php:437
#, fuzzy
msgid "Connect to services"
msgstr "サーバへリダイレクトできません : %s"
-#: lib/action.php:440
+#: lib/action.php:441
#, fuzzy
msgid "Change site configuration"
msgstr "サブスクリプション"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "招待"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "友人や同僚が %s で加わるよう誘ってください。"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "ログアウト"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "サイトからログアウト"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "アカウントを作成"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "サイトへログイン"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "ヘルプ"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "助けて!"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "検索"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "人々かテキストを検索"
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr "サイトつぶやき"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "ローカルビュー"
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr "ページつぶやき"
-#: lib/action.php:719
+#: lib/action.php:720
#, fuzzy
msgid "Secondary site navigation"
msgstr "サブスクリプション"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "解説"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "よくある質問"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "プライバシー"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "ソース"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "連絡先"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr "バッジ"
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4207,12 +4248,12 @@ msgstr ""
"**%%site.name%%** は [%%site.broughtby%%](%%site.broughtbyurl%%) が提供するマ"
"イクロブログサービスです。 "
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** はマイクロブログサービスです。 "
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4223,34 +4264,34 @@ msgstr ""
"いています。 ライセンス [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)。"
-#: lib/action.php:790
+#: lib/action.php:791
#, fuzzy
msgid "Site content license"
msgstr "新しい通知"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr "全て "
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "ライセンス。"
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "ページ化"
-#: lib/action.php:1107
+#: lib/action.php:1108
#, fuzzy
msgid "After"
msgstr "<< 前"
-#: lib/action.php:1115
+#: lib/action.php:1116
#, fuzzy
msgid "Before"
msgstr "前 >>"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr ""
@@ -5072,6 +5113,14 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index eb7cdfb3c..065170972 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:10:45+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:07:07+0000\n"
"Language-Team: Korean\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ko\n"
"X-Message-Group: out-statusnet\n"
@@ -193,11 +193,11 @@ msgstr "사용자를 업데이트 할 수 없습니다."
msgid "You cannot block yourself!"
msgstr "사용자를 업데이트 할 수 없습니다."
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "사용자 차단에 실패했습니다."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "사용자 차단 해제에 실패했습니다."
@@ -314,7 +314,7 @@ msgid "Could not find target user."
msgstr "어떠한 상태도 찾을 수 없습니다."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
@@ -322,25 +322,25 @@ msgstr ""
"다."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "유효한 별명이 아닙니다"
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "홈페이지 주소형식이 올바르지 않습니다."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "실명이 너무 깁니다. (최대 255글자)"
@@ -351,7 +351,7 @@ msgid "Description is too long (max %d chars)."
msgstr "설명이 너무 길어요. (최대 140글자)"
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "위치가 너무 깁니다. (최대 255글자)"
@@ -472,7 +472,7 @@ msgstr "너무 깁니다. 통지의 최대 길이는 140글자 입니다."
msgid "Not found"
msgstr "찾지 못함"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -616,13 +616,13 @@ msgid "Crop"
msgstr "자르기"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -695,7 +695,7 @@ msgstr "네, 맞습니다."
msgid "Block this user"
msgstr "이 사용자 차단하기"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "정보차단을 저장하는데 실패했습니다."
@@ -770,7 +770,7 @@ msgstr "그 주소는 이미 승인되었습니다."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "사용자를 업데이트 할 수 없습니다."
@@ -983,7 +983,7 @@ msgstr ""
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1493,7 +1493,7 @@ msgstr "%s 그룹 회원, %d페이지"
msgid "A list of the users in this group."
msgstr "이 그룹의 회원리스트"
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "관리자"
@@ -1586,7 +1586,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "회원이 당신을 차단해왔습니다."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "차단 제거 에러!"
@@ -1886,7 +1886,7 @@ msgstr "틀린 계정 또는 비밀 번호"
msgid "Error setting user. You are probably not authorized."
msgstr "인증이 되지 않았습니다."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "로그인"
@@ -1999,7 +1999,7 @@ msgstr "메시지"
msgid "Direct message to %s sent"
msgstr "%s에게 보낸 직접 메시지"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "Ajax 에러입니다."
@@ -2007,7 +2007,7 @@ msgstr "Ajax 에러입니다."
msgid "New notice"
msgstr "새로운 통지"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "게시글이 등록되었습니다."
@@ -2444,69 +2444,78 @@ msgstr "위치"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라"
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "태그"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr "당신을 위한 태그, (문자,숫자,-, ., _로 구성) 콤마 혹은 공백으로 구분."
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "언어"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "언어 설정"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "타임존"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "당신이 주로 생활하는 곳이 어떤 타임존입니까?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "나에게 구독하는 사람에게 자동 구독 신청"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "자기소개가 너무 깁니다. (최대 140글자)"
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "타임존이 설정 되지 않았습니다."
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "언어가 너무 깁니다. (최대 50글자)"
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "유효하지 않은태그: \"%s\""
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr "자동구독에 사용자를 업데이트 할 수 없습니다."
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "태그를 저장할 수 없습니다."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "프로필을 저장 할 수 없습니다."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "태그를 저장할 수 없습니다."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "설정 저장"
@@ -2742,7 +2751,7 @@ msgstr "확인 코드 오류"
msgid "Registration successful"
msgstr "회원 가입이 성공적입니다."
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "회원가입"
@@ -4071,16 +4080,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr "이 사이트에 게시글 포스팅으로부터 당신은 금지되었습니다."
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "통지를 저장하는데 문제가 발생했습니다."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "답신을 추가 할 때에 데이타베이스 에러 : %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -4136,131 +4145,131 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "제목없는 페이지"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr "주 사이트 네비게이션"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "홈"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr "개인 프로필과 친구 타임라인"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "계정"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr "당신의 이메일, 아바타, 비밀 번호, 프로필을 변경하세요."
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "연결"
-#: lib/action.php:436
+#: lib/action.php:437
#, fuzzy
msgid "Connect to services"
msgstr "서버에 재접속 할 수 없습니다 : %s"
-#: lib/action.php:440
+#: lib/action.php:441
#, fuzzy
msgid "Change site configuration"
msgstr "주 사이트 네비게이션"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "초대"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "%s에 친구를 가입시키기 위해 친구와 동료를 초대합니다."
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "로그아웃"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "이 사이트로부터 로그아웃"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "계정 만들기"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "이 사이트 로그인"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "도움말"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "도움이 필요해!"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "검색"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "프로필이나 텍스트 검색"
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr "사이트 공지"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "로컬 뷰"
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr "페이지 공지"
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr "보조 사이트 네비게이션"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "정보"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "자주 묻는 질문"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "개인정보 취급방침"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "소스 코드"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "연락하기"
-#: lib/action.php:741
+#: lib/action.php:742
#, fuzzy
msgid "Badge"
msgstr "찔러 보기"
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr "라코니카 소프트웨어 라이선스"
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4269,12 +4278,12 @@ msgstr ""
"**%%site.name%%** 는 [%%site.broughtby%%](%%site.broughtbyurl%%)가 제공하는 "
"마이크로블로깅서비스입니다."
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다."
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4285,32 +4294,32 @@ msgstr ""
"을 사용합니다. StatusNet는 [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html) 라이선스에 따라 사용할 수 있습니다."
-#: lib/action.php:790
+#: lib/action.php:791
#, fuzzy
msgid "Site content license"
msgstr "라코니카 소프트웨어 라이선스"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr "모든 것"
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "라이선스"
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "페이지수"
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "뒷 페이지"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "앞 페이지"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr "당신의 세션토큰관련 문제가 있습니다."
@@ -5135,6 +5144,14 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 96f199c79..c3f3aacb8 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
# Translation of StatusNet to Macedonian
#
# Author@translatewiki.net: Bjankuloski06
+# Author@translatewiki.net: Brest
# --
# This file is distributed under the same license as the StatusNet package.
#
@@ -8,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:10:48+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:07:09+0000\n"
"Language-Team: Macedonian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: out-statusnet\n"
@@ -63,14 +64,14 @@ msgid "%s and friends"
msgstr "%s и пријателите"
#: actions/all.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "Канал со пријатели на %S"
+msgstr "Канал со пријатели на %s (RSS 1.0)"
#: actions/all.php:107
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "Канал со пријатели на %S"
+msgstr "Канал со пријатели на %s (RSS 2.0)"
#: actions/all.php:115
#, php-format
@@ -190,11 +191,11 @@ msgstr "Корисникот не може да се освежи/"
msgid "You cannot block yourself!"
msgstr "Не можете да се блокирате самите себеси!"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr ""
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr ""
@@ -307,31 +308,31 @@ msgid "Could not find target user."
msgstr "Не можев да го пронајдам целниот корисник."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Прекарот мора да има само мали букви и бројки и да нема празни места."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Тој прекар е во употреба. Одберете друг."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Неправилен прекар."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "Домашната страница не е правилно URL."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Целото име е предолго (максимум 255 знаци)"
@@ -342,7 +343,7 @@ msgid "Description is too long (max %d chars)."
msgstr "Описот е предолг (дозволено е највеќе %d знаци)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "Локацијата е предолга (максимумот е 255 знаци)."
@@ -461,7 +462,7 @@ msgstr "Ова е предолго. Максималната должина е 1
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -607,13 +608,13 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -688,7 +689,7 @@ msgstr ""
msgid "Block this user"
msgstr "Нема таков корисник."
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr ""
@@ -763,7 +764,7 @@ msgstr "Оваа адреса веќе е потврдена."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Корисникот не може да се освежи/"
@@ -971,7 +972,7 @@ msgstr ""
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1477,7 +1478,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1569,7 +1570,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "Корисникот нема профил."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
#, fuzzy
msgid "Error removing the block."
msgstr "Грешка во снимањето на корисникот."
@@ -1849,7 +1850,7 @@ msgstr "Неточно корисничко име или лозинка"
msgid "Error setting user. You are probably not authorized."
msgstr "Не е одобрено."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Пријави се"
@@ -1961,7 +1962,7 @@ msgstr ""
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr ""
@@ -1969,7 +1970,7 @@ msgstr ""
msgid "New notice"
msgstr "Ново известување"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
#, fuzzy
msgid "Notice posted"
msgstr "Известувања"
@@ -2409,70 +2410,79 @@ msgstr "Локација"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Каде се наоѓате, на пр. „Град, Држава“."
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr ""
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr ""
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr ""
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr ""
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr ""
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Биографијата е предолга (максимумот е 140 знаци)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr ""
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr ""
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, fuzzy, php-format
msgid "Invalid tag: \"%s\""
msgstr "Невалидна домашна страница: '%s'"
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Профилот не може да се сними."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Профилот не може да се сними."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
#, fuzzy
msgid "Couldn't save tags."
msgstr "Профилот не може да се сними."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Поставките се снимени."
@@ -2710,7 +2720,7 @@ msgstr "Грешка со кодот за потврдување."
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистрирај се"
@@ -4009,16 +4019,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Проблем во снимањето на известувањето."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Одговор од внесот во базата: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4077,135 +4087,135 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Дома"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:434
#, fuzzy
msgid "Account"
msgstr "За"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Поврзи се"
-#: lib/action.php:436
+#: lib/action.php:437
#, fuzzy
msgid "Connect to services"
msgstr "Не може да се пренасочи кон серверот: %s"
-#: lib/action.php:440
+#: lib/action.php:441
#, fuzzy
msgid "Change site configuration"
msgstr "Претплати"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Одјави се"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "Создај сметка"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr ""
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Помош"
-#: lib/action.php:461
+#: lib/action.php:462
#, fuzzy
msgid "Help me!"
msgstr "Помош"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Барај"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:485
+#: lib/action.php:486
#, fuzzy
msgid "Site notice"
msgstr "Ново известување"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr ""
-#: lib/action.php:617
+#: lib/action.php:618
#, fuzzy
msgid "Page notice"
msgstr "Ново известување"
-#: lib/action.php:719
+#: lib/action.php:720
#, fuzzy
msgid "Secondary site navigation"
msgstr "Претплати"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "За"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "ЧПП"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Приватност"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Изворен код"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr ""
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4214,12 +4224,12 @@ msgstr ""
"**%%site.name%%** е сервис за микроблогирање што ви го овозможува [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** е сервис за микроблогирање."
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4230,34 +4240,34 @@ msgstr ""
"верзија %s, достапен пд [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
#, fuzzy
msgid "Site content license"
msgstr "Ново известување"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr ""
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr ""
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr ""
-#: lib/action.php:1107
+#: lib/action.php:1108
#, fuzzy
msgid "After"
msgstr "« Следни"
-#: lib/action.php:1115
+#: lib/action.php:1116
#, fuzzy
msgid "Before"
msgstr "Предходни »"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr ""
@@ -5086,6 +5096,14 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index eadbb8fc2..fb773cecc 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:10:52+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:07:13+0000\n"
"Language-Team: Norwegian (bokmål)‬\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: out-statusnet\n"
@@ -199,11 +199,11 @@ msgstr "Klarte ikke å oppdatere bruker."
msgid "You cannot block yourself!"
msgstr "Du kan ikke blokkere deg selv!"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "Blokkering av bruker mislyktes."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "Oppheving av blokkering av bruker mislyktes."
@@ -317,31 +317,31 @@ msgid "Could not find target user."
msgstr "Klarte ikke å oppdatere bruker."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Kallenavn kan kun ha små bokstaver og tall og ingen mellomrom."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Det nicket er allerede i bruk. Prøv et annet."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Ugyldig nick."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "Hjemmesiden er ikke en gyldig URL."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Beklager, navnet er for langt (max 250 tegn)."
@@ -352,7 +352,7 @@ msgid "Description is too long (max %d chars)."
msgstr "Beskrivelsen er for lang (maks %d tegn)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr ""
@@ -471,7 +471,7 @@ msgstr ""
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -616,13 +616,13 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -695,7 +695,7 @@ msgstr "Ja"
msgid "Block this user"
msgstr ""
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr ""
@@ -769,7 +769,7 @@ msgstr ""
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Klarte ikke å oppdatere bruker."
@@ -975,7 +975,7 @@ msgstr ""
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1472,7 +1472,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr "En liste over brukerne i denne gruppen."
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrator"
@@ -1561,7 +1561,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr ""
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr ""
@@ -1853,7 +1853,7 @@ msgstr "Feil brukernavn eller passord"
msgid "Error setting user. You are probably not authorized."
msgstr "Ikke autorisert."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logg inn"
@@ -1961,7 +1961,7 @@ msgstr ""
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr ""
@@ -1969,7 +1969,7 @@ msgstr ""
msgid "New notice"
msgstr ""
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr ""
@@ -2396,71 +2396,80 @@ msgstr ""
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "Tagger"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Språk"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr ""
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Tidssone"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr ""
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
"Abonner automatisk på de som abonnerer på meg (best for ikke-mennesker)"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "«Om meg» er for lang (maks 140 tegn)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr ""
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr ""
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, fuzzy, php-format
msgid "Invalid tag: \"%s\""
msgstr "Ugyldig hjemmeside '%s'"
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Klarte ikke å lagre profil."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Klarte ikke å lagre profil."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
#, fuzzy
msgid "Couldn't save tags."
msgstr "Klarte ikke å lagre profil."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr ""
@@ -2692,7 +2701,7 @@ msgstr ""
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -3978,16 +3987,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4045,131 +4054,131 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Hjem"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:434
#, fuzzy
msgid "Account"
msgstr "Om"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Koble til"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect to services"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:441
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Logg ut"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:455
+#: lib/action.php:456
#, fuzzy
msgid "Create an account"
msgstr "Opprett en ny konto"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr ""
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Hjelp"
-#: lib/action.php:461
+#: lib/action.php:462
#, fuzzy
msgid "Help me!"
msgstr "Hjelp"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Søk"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr ""
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr ""
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr ""
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "Om"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "OSS/FAQ"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Kilde"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr ""
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4178,12 +4187,12 @@ msgstr ""
"**%%site.name%%** er en mikrobloggingtjeneste av [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** er en mikrobloggingtjeneste. "
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4191,32 +4200,32 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:790
+#: lib/action.php:791
msgid "Site content license"
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr ""
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr ""
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr ""
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr ""
-#: lib/action.php:1115
+#: lib/action.php:1116
#, fuzzy
msgid "Before"
msgstr "Tidligere »"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr ""
@@ -5039,6 +5048,14 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 0d7d9d58f..6204d6900 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:11:03+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:07:19+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: out-statusnet\n"
@@ -200,11 +200,11 @@ msgstr "Het was niet mogelijk uw ontwerp bij te werken."
msgid "You cannot block yourself!"
msgstr "U kunt zichzelf niet blokkeren!"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "Het blokkeren van de gebruiker is mislukt."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "Het deblokkeren van de gebruiker is mislukt."
@@ -321,7 +321,7 @@ msgid "Could not find target user."
msgstr "Het was niet mogelijk de doelgebruiker te vinden."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
@@ -329,26 +329,26 @@ msgstr ""
"geen spaties bevatten."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr ""
"De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Geen geldige gebruikersnaam."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "De thuispagina is geen geldige URL."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "De volledige naam is te lang (maximaal 255 tekens)."
@@ -359,7 +359,7 @@ msgid "Description is too long (max %d chars)."
msgstr "De beschrijving is te lang. Gebruik maximaal %d tekens."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "Locatie is te lang (maximaal 255 tekens)."
@@ -474,7 +474,7 @@ msgstr "Dat is te lang. De maximale mededelingslengte is 140 tekens."
msgid "Not found"
msgstr "Niet gevonden"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -619,13 +619,13 @@ msgid "Crop"
msgstr "Uitsnijden"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -701,7 +701,7 @@ msgstr "Ja"
msgid "Block this user"
msgstr "Deze gebruiker blokkeren"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan."
@@ -773,7 +773,7 @@ msgstr "Dit adres is al bevestigd."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Kon gebruiker niet actualiseren."
@@ -975,7 +975,7 @@ msgstr "Standaardinstellingen toepassen"
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1484,7 +1484,7 @@ msgstr "% groeps leden, pagina %d"
msgid "A list of the users in this group."
msgstr "Ledenlijst van deze groep"
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "Beheerder"
@@ -1584,7 +1584,7 @@ msgstr "Alleen beheerders kunnen groepsleden deblokkeren."
msgid "User is not blocked from group."
msgstr "De gebruiker is niet de toegang tot de groep ontzegd."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "Er is een fout opgetreden bij het verwijderen van de blokkade."
@@ -1896,7 +1896,7 @@ msgstr ""
"Er is een fout opgetreden bij het maken van de instellingen. U hebt "
"waarschijnlijk niet de juiste rechten."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Aanmelden"
@@ -2007,7 +2007,7 @@ msgstr "Bericht verzonden."
msgid "Direct message to %s sent"
msgstr "Het directe bericht aan %s is verzonden"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "Er is een Ajax-fout opgetreden"
@@ -2015,7 +2015,7 @@ msgstr "Er is een Ajax-fout opgetreden"
msgid "New notice"
msgstr "Nieuw bericht"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "De mededeling is verzonden"
@@ -2448,75 +2448,84 @@ msgstr "Locatie"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "Labels"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
"Eigen labels (letter, getallen, -, ., en _). Gescheiden door komma's of "
"spaties"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Taal"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "Voorkeurstaal"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Tijdzone"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "In welke tijdzone verblijft u meestal?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
"Automatisch abonneren bij abonnement op mij (beste voor automatische "
"processen)"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "De beschrijving is te lang (maximaal %d tekens)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "Er is geen tijdzone geselecteerd."
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "Taal is te lang (max 50 tekens)."
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Ongeldig label: '%s'"
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr ""
"Het was niet mogelijk de instelling voor automatisch abonneren voor de "
"gebruiker bij te werken."
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Het was niet mogelijk de labels op te slaan."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Het profiel kon niet opgeslagen worden."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "Het was niet mogelijk de labels op te slaan."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "De instellingen zijn opgeslagen."
@@ -2768,7 +2777,7 @@ msgstr "Sorry. De uitnodigingscode is ongeldig."
msgid "Registration successful"
msgstr "De registratie is voltooid"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registreren"
@@ -4126,17 +4135,17 @@ msgid "You are banned from posting notices on this site."
msgstr ""
"U bent geblokkeerd en mag geen mededelingen meer achterlaten op deze site."
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
"Er is een databasefout opgetreden bij het invoegen van het antwoord: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4191,128 +4200,128 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Naamloze pagina"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr "Primaire sitenavigatie"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Start"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr "Persoonlijk profiel en tijdlijn van vrienden"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "Gebruiker"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr "Uw e-mailadres, avatar, wachtwoord of profiel wijzigen"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Koppelen"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect to services"
msgstr "Met diensten verbinden"
-#: lib/action.php:440
+#: lib/action.php:441
msgid "Change site configuration"
msgstr "Websiteinstellingen wijzigen"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Uitnodigen"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Afmelden"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "Van de site afmelden"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "Gebruiker aanmaken"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "Bij de site aanmelden"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Help"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "Help me!"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Zoeken"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "Naar gebruikers of tekst zoeken"
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr "Mededeling van de website"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "Lokale weergaven"
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr "Mededeling van de pagina"
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr "Secundaire sitenavigatie"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "Over"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "Veel gestelde vragen"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr "Gebruiksvoorwaarden"
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Privacy"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Broncode"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr "Widget"
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr "Licentie van de StatusNet-software"
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4321,12 +4330,12 @@ msgstr ""
"**%%site.name%%** is een microblogdienst van [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** is een microblogdienst. "
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4337,31 +4346,31 @@ msgstr ""
"versie %s, beschikbaar onder de [GNU Affero General Public License](http://"
"www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
msgid "Site content license"
msgstr "Licentie voor siteinhoud"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr "Alle "
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "licentie."
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "Paginering"
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "Later"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "Eerder"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr "Er is een probleem met uw sessietoken."
@@ -5307,6 +5316,14 @@ msgstr "Toevoegen"
msgid "Attach a file"
msgstr "Bestand toevoegen"
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index e327c5aa0..aa4705631 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:10:58+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:07:16+0000\n"
"Language-Team: Norwegian Nynorsk\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nn\n"
"X-Message-Group: out-statusnet\n"
@@ -193,11 +193,11 @@ msgstr "Kan ikkje oppdatera brukar."
msgid "You cannot block yourself!"
msgstr "Kan ikkje oppdatera brukar."
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "Blokkering av brukar feila."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "De-blokkering av brukar feila."
@@ -314,31 +314,31 @@ msgid "Could not find target user."
msgstr "Kan ikkje finna einkvan status."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Kallenamn må berre ha små bokstavar og nummer, ingen mellomrom."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Ikkje eit gyldig brukarnamn."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "Heimesida er ikkje ei gyldig internettadresse."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
@@ -349,7 +349,7 @@ msgid "Description is too long (max %d chars)."
msgstr "skildringa er for lang (maks 140 teikn)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "Plassering er for lang (maksimalt 255 teikn)."
@@ -470,7 +470,7 @@ msgstr "Det er for langt! Ein notis kan berre innehalde 140 teikn."
msgid "Not found"
msgstr "Fann ikkje"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -614,13 +614,13 @@ msgid "Crop"
msgstr "Skaler"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -693,7 +693,7 @@ msgstr "Jau"
msgid "Block this user"
msgstr "Blokkér denne brukaren"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "Lagring av informasjon feila."
@@ -768,7 +768,7 @@ msgstr "Den addressa har alt blitt bekrefta."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Kan ikkje oppdatera brukar."
@@ -982,7 +982,7 @@ msgstr ""
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1493,7 +1493,7 @@ msgstr "%s medlemmar i gruppa, side %d"
msgid "A list of the users in this group."
msgstr "Ei liste over brukarane i denne gruppa."
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrator"
@@ -1586,7 +1586,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "Brukar har blokkert deg."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "Feil ved fjerning av blokka."
@@ -1888,7 +1888,7 @@ msgstr "Feil brukarnamn eller passord"
msgid "Error setting user. You are probably not authorized."
msgstr "Ikkje autorisert."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logg inn"
@@ -2003,7 +2003,7 @@ msgstr "Melding"
msgid "Direct message to %s sent"
msgstr "Direkte melding til %s sendt"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "Ajax feil"
@@ -2011,7 +2011,7 @@ msgstr "Ajax feil"
msgid "New notice"
msgstr "Ny notis"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "Melding lagra"
@@ -2450,72 +2450,81 @@ msgstr "Plassering"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Kvar er du, t.d. «By, Fylke (eller Region), Land»"
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "Merkelappar"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
"merkelappar for deg sjølv ( bokstavar, nummer, -, ., og _ ), komma eller "
"mellomroms separert."
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Språk"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "Foretrukke språk"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Tidssone"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "Kva tidssone er du vanlegvis i?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
"Automatisk ting notisane til dei som tingar mine (best for ikkje-menneskje)"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "«Om meg» er for lang (maks 140 "
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "Tidssone er ikkje valt."
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "Språk er for langt (maksimalt 50 teikn)."
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Ugyldig merkelapp: %s"
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr "Kan ikkje oppdatera brukar for automatisk tinging."
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Kan ikkje lagra merkelapp."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Kan ikkje lagra profil."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "Kan ikkje lagra merkelapp."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Lagra innstillingar."
@@ -2752,7 +2761,7 @@ msgstr "Feil med stadfestingskode."
msgid "Registration successful"
msgstr "Registreringa gikk bra"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrér"
@@ -4088,16 +4097,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Eit problem oppstod ved lagring av notis."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Databasefeil, kan ikkje lagra svar: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -4153,131 +4162,131 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Ingen tittel"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr "Navigasjon for hovudsida"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Heim"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr "Personleg profil og oversyn over vener"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "Konto"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr "Endra e-posten, avataren, passordet eller profilen"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Kopla til"
-#: lib/action.php:436
+#: lib/action.php:437
#, fuzzy
msgid "Connect to services"
msgstr "Klarte ikkje å omdirigera til tenaren: %s"
-#: lib/action.php:440
+#: lib/action.php:441
#, fuzzy
msgid "Change site configuration"
msgstr "Navigasjon for hovudsida"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invitér"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Inviter vennar og kollega til å bli med deg på %s"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Logg ut"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "Logg ut or sida"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "Opprett ny konto"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "Logg inn or sida"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Hjelp"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "Hjelp meg!"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Søk"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "Søk etter folk eller innhald"
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr "Statusmelding"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "Lokale syningar"
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr "Sidenotis"
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr "Andrenivås side navigasjon"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "Om"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "OSS"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Personvern"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Kjeldekode"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:741
+#: lib/action.php:742
#, fuzzy
msgid "Badge"
msgstr "Dult"
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr "StatusNets programvarelisens"
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4286,12 +4295,12 @@ msgstr ""
"**%%site.name%%** er ei mikrobloggingteneste av [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** er ei mikrobloggingteneste. "
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4302,32 +4311,32 @@ msgstr ""
"%s, tilgjengeleg under [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
#, fuzzy
msgid "Site content license"
msgstr "StatusNets programvarelisens"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr "Alle"
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "lisens."
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "Paginering"
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "« Etter"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "Før »"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr "Det var eit problem med sesjons billetten din."
@@ -5162,6 +5171,14 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index f57cbd100..0184ada85 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:11:06+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:07:22+0000\n"
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pl\n"
"X-Message-Group: out-statusnet\n"
@@ -203,11 +203,11 @@ msgstr "Nie można zaktualizować wyglądu."
msgid "You cannot block yourself!"
msgstr "Nie można zablokować siebie."
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "Zablokowanie użytkownika nie powiodło się."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "Odblokowanie użytkownika nie powiodło się."
@@ -322,31 +322,31 @@ msgid "Could not find target user."
msgstr "Nie można odnaleźć użytkownika docelowego."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Pseudonim może zawierać tylko małe litery i cyfry, bez spacji."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Pseudonim jest już używany. Spróbuj innego."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "To nie jest prawidłowy pseudonim."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "Strona domowa nie jest prawidłowym adresem URL."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
@@ -357,7 +357,7 @@ msgid "Description is too long (max %d chars)."
msgstr "Opis jest za długi (maksymalnie %d znaków)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
@@ -472,7 +472,7 @@ msgstr "Wpis jest za długi. Maksymalna długość wynosi %d znaków."
msgid "Not found"
msgstr "Nie odnaleziono"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL załącznika."
@@ -614,13 +614,13 @@ msgid "Crop"
msgstr "Przytnij"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -693,7 +693,7 @@ msgstr "Tak"
msgid "Block this user"
msgstr "Zablokuj tego użytkownika"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "Zapisanie informacji o blokadzie nie powiodło się."
@@ -765,7 +765,7 @@ msgstr "Ten adres został już potwierdzony."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Nie można zaktualizować użytkownika."
@@ -963,7 +963,7 @@ msgstr "Przywróć domyślne ustawienia"
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1460,7 +1460,7 @@ msgstr "Członkowie grupy %s, strona %d"
msgid "A list of the users in this group."
msgstr "Lista użytkowników znajdujących się w tej grupie."
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrator"
@@ -1558,7 +1558,7 @@ msgstr "Tylko administrator może odblokowywać członków grupy."
msgid "User is not blocked from group."
msgstr "Użytkownik nie został zablokowany w grupie."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "Błąd podczas usuwania blokady."
@@ -1866,7 +1866,7 @@ msgstr "Niepoprawna nazwa użytkownika lub hasło."
msgid "Error setting user. You are probably not authorized."
msgstr "Błąd podczas ustawiania użytkownika. Prawdopodobnie brak upoważnienia."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Zaloguj się"
@@ -1979,7 +1979,7 @@ msgstr "Wysłano wiadomość"
msgid "Direct message to %s sent"
msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "Błąd AJAX"
@@ -1987,7 +1987,7 @@ msgstr "Błąd AJAX"
msgid "New notice"
msgstr "Nowy wpis"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "Wysłano wpis"
@@ -2418,72 +2418,81 @@ msgstr "Położenie"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "Znaczniki"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
"Znaczniki dla siebie (litery, liczby, -, . i _), oddzielone przecinkami lub "
"spacjami"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Język"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "Preferowany język"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Strefa czasowa"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "W jakiej strefie czasowej zwykle się znajdujesz?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
"Automatycznie subskrybuj każdego, kto mnie subskrybuje (najlepsze dla botów)"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Wpis \"O mnie\" jest za długi (maksymalnie %d znaków)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "Nie wybrano strefy czasowej."
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "Język jest za długi (maksymalnie 50 znaków)."
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Nieprawidłowy znacznik: \"%s\""
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr "Nie można zaktualizować użytkownika do automatycznej subskrypcji."
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Nie można zapisać znaczników."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Nie można zapisać profilu."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "Nie można zapisać znaczników."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Zapisano ustawienia."
@@ -2729,7 +2738,7 @@ msgstr "Nieprawidłowy kod zaproszenia."
msgid "Registration successful"
msgstr "Rejestracja powiodła się"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Zarejestruj się"
@@ -4073,16 +4082,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr "Zabroniono ci wysyłania wpisów na tej stronie."
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Problem podczas zapisywania wpisu."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Błąd bazy danych podczas wprowadzania odpowiedzi: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4137,128 +4146,128 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Strona bez nazwy"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr "Główna nawigacja strony"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Strona domowa"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr "Profil osobisty i oś czasu przyjaciół"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "Konto"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr "Zmień adres e-mail, awatar, hasło, profil"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Połącz"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect to services"
msgstr "Połącz z serwisami"
-#: lib/action.php:440
+#: lib/action.php:441
msgid "Change site configuration"
msgstr "Zmień konfigurację strony"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Zaproś"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Zaproś przyjaciół i kolegów do dołączenia do ciebie na %s"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Wyloguj się"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "Wyloguj się ze strony"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "Utwórz konto"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "Zaloguj się na stronę"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Pomoc"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "Pomóż mi."
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Wyszukaj"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "Wyszukaj osoby lub tekst"
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr "Wpis strony"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "Lokalne widoki"
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr "Wpis strony"
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr "Druga nawigacja strony"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "O usłudze"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr "TOS"
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Prywatność"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Kod źródłowy"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr "Odznaka"
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr "Licencja oprogramowania StatusNet"
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4267,12 +4276,12 @@ msgstr ""
"**%%site.name%%** jest usługą mikroblogowania prowadzoną przez [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** jest usługą mikroblogowania. "
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4283,31 +4292,31 @@ msgstr ""
"status.net/) w wersji %s, dostępnego na [Powszechnej Licencji Publicznej GNU "
"Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
msgid "Site content license"
msgstr "Licencja zawartości strony"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr "Wszystko "
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "licencja."
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "Paginacja"
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "Później"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "Wcześniej"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr "Wystąpił problem z tokenem sesji."
@@ -4566,7 +4575,6 @@ msgstr[1] "Jesteś członkiem tych grup:"
msgstr[2] "Jesteś członkiem tych grup:"
#: lib/command.php:745
-#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4610,38 +4618,41 @@ msgstr ""
"on - włącza powiadomienia\n"
"off - wyłącza powiadomienia\n"
"help - wyświetla tę pomoc\n"
-"follow <pseudonim> - subskrybuje użytkownika\n"
-"groups - wyświetla listę grup, do których dołączono\n"
+"follow <pseudonim> - włącza obserwowanie użytkownika\n"
+"groups - wyświetla listę grup, do których dołączyłeś\n"
"subscriptions - wyświetla listę obserwowanych osób\n"
"subscribers - wyświetla listę osób, które cię obserwują\n"
-"leave <pseudonim> - rezygnuje z subskrypcji użytkownika\n"
+"leave <pseudonim> - rezygnuje z obserwowania użytkownika\n"
"d <pseudonim> <tekst> - bezpośrednia wiadomość do użytkownika\n"
-"get <pseudonim> - uzyskuje ostatni wpis użytkownika\n"
-"whois <pseudonim> - uzyskuje informacje o profilu użytkownika\n"
+"get <pseudonim> - zwraca ostatni wpis użytkownika\n"
+"whois <pseudonim> - zwraca informacje o profilu użytkownika\n"
"fav <pseudonim> - dodaje ostatni wpis użytkownika jako \"ulubiony\"\n"
"fav #<identyfikator_wpisu> - dodaje wpis z podanym identyfikatorem jako "
"\"ulubiony\"\n"
+"repeat #<identyfikator_wpisu> - powtarza wiadomość z zadanym "
+"identyfikatorem\n"
+"repeat <pseudonim> - powtarza ostatnią wiadomość od użytkownika\n"
"reply #<identyfikator_wpisu> - odpowiada na wpis z podanym identyfikatorem\n"
"reply <pseudonim> - odpowiada na ostatni wpis użytkownika\n"
"join <grupa> - dołącza do grupy\n"
-"login - uzyskuje odnośnik do logowania do interfejsu WWW\n"
+"login - pobiera odnośnik do zalogowania się do interfejsu WWW\n"
"drop <grupa> - opuszcza grupę\n"
-"stats - uzyskuje statystyki\n"
+"stats - pobiera statystyki\n"
"stop - to samo co \"off\"\n"
"quit - to samo co \"off\"\n"
"sub <pseudonim> - to samo co \"follow\"\n"
"unsub <pseudonim> - to samo co \"leave\"\n"
"last <pseudonim> - to samo co \"get\"\n"
-"on <pseudonim> - jeszcze nie zaimplementowano.\n"
-"off <pseudonim> - jeszcze nie zaimplementowano.\n"
-"nudge <pseudonim> - przypomina użytkownikowi o aktualizacji.\n"
-"invite <numer telefonu> - jeszcze nie zaimplementowano.\n"
-"track <wyraz> - jeszcze nie zaimplementowano.\n"
-"untrack <wyraz> - jeszcze nie zaimplementowano.\n"
-"track off - jeszcze nie zaimplementowano.\n"
-"untrack all - jeszcze nie zaimplementowano.\n"
-"tracks - jeszcze nie zaimplementowano.\n"
-"tracking - jeszcze nie zaimplementowano.\n"
+"on <pseudonim> - jeszcze nie zaimplementowano\n"
+"off <pseudonim> - jeszcze nie zaimplementowano\n"
+"nudge <pseudonim> - przypomina użytkownikowi o aktualizacji\n"
+"invite <numer telefonu> - jeszcze nie zaimplementowano\n"
+"track <wyraz> - jeszcze nie zaimplementowano\n"
+"untrack <wyraz> - jeszcze nie zaimplementowano\n"
+"track off - jeszcze nie zaimplementowano\n"
+"untrack all - jeszcze nie zaimplementowano\n"
+"tracks - jeszcze nie zaimplementowano\n"
+"tracking - jeszcze nie zaimplementowano\n"
#: lib/common.php:199
msgid "No configuration file found. "
@@ -5243,6 +5254,14 @@ msgstr "Załącz"
msgid "Attach a file"
msgstr "Załącz plik"
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 92f7def37..ee22197e2 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:11:09+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:07:26+0000\n"
"Language-Team: Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt\n"
"X-Message-Group: out-statusnet\n"
@@ -197,11 +197,11 @@ msgstr "Não foi possível actualizar o seu design."
msgid "You cannot block yourself!"
msgstr "Os utilizadores não podem bloquear-se a si próprios!"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "Bloqueio do utilizador falhou."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "Desbloqueio do utilizador falhou."
@@ -315,31 +315,31 @@ msgid "Could not find target user."
msgstr "Não foi possível encontrar o utilizador de destino."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Alcunha só deve conter letras minúsculas e números. Sem espaços."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Alcunha já é usada. Tente outra."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Alcunha não é válida."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "Página de acolhimento não é uma URL válida."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
@@ -350,7 +350,7 @@ msgid "Description is too long (max %d chars)."
msgstr "Descrição demasiado longa (máx. 140 caracteres)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "Localidade demasiado longa (máx. 255 caracteres)."
@@ -465,7 +465,7 @@ msgstr "Demasiado longo. Tamanho máx. das notas é %d caracteres."
msgid "Not found"
msgstr "Não encontrado"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Tamanho máx. das notas é %d caracteres, incluíndo a URL do anexo."
@@ -607,13 +607,13 @@ msgid "Crop"
msgstr "Cortar"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -687,7 +687,7 @@ msgstr "Sim"
msgid "Block this user"
msgstr "Bloquear este utilizador"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "Não foi possível gravar informação do bloqueio."
@@ -759,7 +759,7 @@ msgstr "Esse endereço já tinha sido confirmado."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Não foi possível actualizar o utilizador."
@@ -960,7 +960,7 @@ msgstr "Repor predefinição"
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1464,7 +1464,7 @@ msgstr "Membros do grupo %s, página %d"
msgid "A list of the users in this group."
msgstr "Uma lista dos utilizadores neste grupo."
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
@@ -1562,7 +1562,7 @@ msgstr "Só um administrador pode desbloquear membros de um grupo."
msgid "User is not blocked from group."
msgstr "Acesso do utilizador ao grupo não foi bloqueado."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "Erro ao remover o bloqueio."
@@ -1870,7 +1870,7 @@ msgstr "Nome de utilizador ou palavra-passe incorrectos."
msgid "Error setting user. You are probably not authorized."
msgstr "Erro ao preparar o utilizador. Provavelmente não está autorizado."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Entrar"
@@ -1983,7 +1983,7 @@ msgstr "Mensagem enviada"
msgid "Direct message to %s sent"
msgstr "Mensagem directa para %s enviada"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "Erro do Ajax"
@@ -1991,7 +1991,7 @@ msgstr "Erro do Ajax"
msgid "New notice"
msgstr "Nota nova"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "Nota publicada"
@@ -2423,72 +2423,81 @@ msgstr "Localidade"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Onde está, por ex. \"Cidade, Região, País\""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "Categorias"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
"Categorias para si (letras, números, -, ., _), separadas por vírgulas ou "
"espaços"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Língua"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "Língua preferida"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Fuso horário"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "Em que fuso horário se encontra normalmente?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
"Subscrever automaticamente quem me subscreva (óptimo para seres não-humanos)"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Biografia demasiado extensa (máx. %d caracteres)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "Fuso horário não foi seleccionado."
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "Língua é demasiado extensa (máx. 50 caracteres)."
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Categoria inválida: \"%s\""
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr "Não foi possível actualizar o utilizador para subscrição automática."
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Não foi possível gravar as categorias."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Não foi possível gravar o perfil."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "Não foi possível gravar as categorias."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Configurações gravadas."
@@ -2740,7 +2749,7 @@ msgstr "Desculpe, código de convite inválido."
msgid "Registration successful"
msgstr "Registo efectuado"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registar"
@@ -4081,16 +4090,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr "Está proibido de publicar notas neste site."
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Problema na gravação da nota."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4145,128 +4154,128 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Página sem título"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr "Navegação primária deste site"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Início"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr "Perfil pessoal e notas dos amigos"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "Conta"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr "Altere o seu endereço electrónico, avatar, palavra-chave, perfil"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Ligar"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect to services"
msgstr "Ligar aos serviços"
-#: lib/action.php:440
+#: lib/action.php:441
msgid "Change site configuration"
msgstr "Alterar a configuração do site"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Convidar"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convidar amigos e colegas para se juntarem a si em %s"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Sair"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "Terminar esta sessão"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "Criar uma conta"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "Iniciar uma sessão"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Ajuda"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "Ajudem-me!"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Pesquisa"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "Procurar pessoas ou pesquisar texto"
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr "Aviso do site"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "Vistas locais"
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr "Aviso da página"
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr "Navegação secundária deste site"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "Sobre"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr "Condições do Serviço"
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Privacidade"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Código"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Contacto"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr "Emblema"
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr "Licença de software do StatusNet"
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4275,12 +4284,12 @@ msgstr ""
"**%%site.name%%** é um serviço de microblogues disponibilizado por [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** é um serviço de microblogues. "
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4291,31 +4300,31 @@ msgstr ""
"disponibilizado nos termos da [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
msgid "Site content license"
msgstr "Licença de conteúdos do site"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr "Tudo "
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "licença."
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "Paginação"
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "Depois"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "Antes"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr "Ocorreu um problema com a sua chave de sessão."
@@ -5249,6 +5258,14 @@ msgstr "Anexar"
msgid "Attach a file"
msgstr "Anexar um ficheiro"
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
@@ -5420,9 +5437,8 @@ msgid "Popular"
msgstr "Populares"
#: lib/repeatform.php:107
-#, fuzzy
msgid "Repeat this notice?"
-msgstr "Repetir esta nota"
+msgstr "Repetir esta nota?"
#: lib/repeatform.php:132
msgid "Repeat this notice"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 69329e074..9d9474658 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:11:12+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:07:31+0000\n"
"Language-Team: Brazilian Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: out-statusnet\n"
@@ -194,11 +194,11 @@ msgstr "Não foi possível atualizar o usuário."
msgid "You cannot block yourself!"
msgstr "Não foi possível atualizar o usuário."
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "Não foi possível bloquear o usuário."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "Não foi possível desbloquear o usuário."
@@ -314,7 +314,7 @@ msgid "Could not find target user."
msgstr "Não foi possível encontrar usuário alvo."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
@@ -322,25 +322,25 @@ msgstr ""
"acentuação e espaços."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Este apelido já está em uso. Tente outro."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Não é um apelido válido."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "A URL do site informada não é válida."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
@@ -351,7 +351,7 @@ msgid "Description is too long (max %d chars)."
msgstr "Descrição muito extensa (máximo 140 caracteres)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "A localização é muito extensa (máx. 255 caracteres)."
@@ -468,7 +468,7 @@ msgstr "Está muito extenso. O tamanho máximo é de 140 caracteres."
msgid "Not found"
msgstr "Não encontrado"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -612,13 +612,13 @@ msgid "Crop"
msgstr "Cortar"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -691,7 +691,7 @@ msgstr "Sim"
msgid "Block this user"
msgstr "Bloquear usuário"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "Não foi possível salvar a informação de bloqueio."
@@ -764,7 +764,7 @@ msgstr "Esse endereço já foi confirmado."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Não foi possível atualizar o usuário."
@@ -980,7 +980,7 @@ msgstr ""
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1494,7 +1494,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
@@ -1590,7 +1590,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "O usuário bloqueou você."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "Erro na remoção do bloqueio."
@@ -1909,7 +1909,7 @@ msgstr "Nome de usuário e/ou senha incorreto(s)."
msgid "Error setting user. You are probably not authorized."
msgstr "Não autorizado."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logar"
@@ -2027,7 +2027,7 @@ msgstr "Nova mensagem"
msgid "Direct message to %s sent"
msgstr "A mensagem direta para %s foi enviada"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "Erro no Ajax"
@@ -2035,7 +2035,7 @@ msgstr "Erro no Ajax"
msgid "New notice"
msgstr "Nova mensagem"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "Mensagem publicada"
@@ -2478,71 +2478,80 @@ msgstr "Localização"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "Tags"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
"Suas etiquetas (letras, números, -, ., e _), separadas por vírgulas ou "
"espaços"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Idioma"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "Idioma preferencial"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Fuso horário"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "Em que fuso horário você normalmente está?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "Assinar automaticamente à quem me assinar"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Descrição muito extensa (máximo 140 caracteres)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "O fuso horário não foi selecionado."
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "O nome do idioma é muito extenso (máx. 50 caracteres)."
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Etiqueta inválida: \"%s\""
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr "Não foi possível atualizar o usuário para assinar automaticamente."
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Não foi possível salvar as etiquetas."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Não foi possível salvar o perfil."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "Não foi possível salvar as etiquetas."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "As configurações foram salvas."
@@ -2784,7 +2793,7 @@ msgstr "Erro com o código de confirmação."
msgid "Registration successful"
msgstr "Registro realizado com sucesso"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrar"
@@ -4128,16 +4137,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr "Você foi banido de publicar mensagens nesse site."
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Problema ao salvar a mensagem."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Erro no banco de dados na inserção da reposta: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -4194,134 +4203,134 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Página sem título"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr "Navegação primária no site"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Início"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr "Perfil pessoal e mensagens dos amigos"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "Conta"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr "Alterar email, avatar, senha, perfil"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Conectar"
-#: lib/action.php:436
+#: lib/action.php:437
#, fuzzy
msgid "Connect to services"
msgstr "Não foi possível redirecionar para o servidor: %s"
-#: lib/action.php:440
+#: lib/action.php:441
#, fuzzy
msgid "Change site configuration"
msgstr "Navegação primária no site"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Convidar"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convide seus amigos e colegas para unir-se a você no %s"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Sair"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "Sair deste site"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "Criar uma nova conta"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "Entrar"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Ajuda"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "Ajuda"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Procurar"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "Pesquisar por pessoa ou texto"
-#: lib/action.php:485
+#: lib/action.php:486
#, fuzzy
msgid "Site notice"
msgstr "Nova mensagem"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr ""
-#: lib/action.php:617
+#: lib/action.php:618
#, fuzzy
msgid "Page notice"
msgstr "Nova mensagem"
-#: lib/action.php:719
+#: lib/action.php:720
#, fuzzy
msgid "Secondary site navigation"
msgstr "Navegação pelas assinaturas"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "Sobre"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Privacidade"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Fonte"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Contato"
-#: lib/action.php:741
+#: lib/action.php:742
#, fuzzy
msgid "Badge"
msgstr "Chamar a atenção"
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4330,12 +4339,12 @@ msgstr ""
"**%%site.name%%** é um serviço de microblogagem disponibilizado por [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** é um serviço de microblogagem. "
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4346,33 +4355,33 @@ msgstr ""
"net/), versão %s, disponível sob a [GNU Affero General Public License] "
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
#, fuzzy
msgid "Site content license"
msgstr "Procure no conteúdo das mensagens"
-#: lib/action.php:799
+#: lib/action.php:800
#, fuzzy
msgid "All "
msgstr "Todas"
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "licença"
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "Paginação"
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "Próximo"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "Anterior"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr ""
"Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
@@ -5213,6 +5222,14 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index bcfc757be..a03404bef 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:11:15+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:07:34+0000\n"
"Language-Team: Russian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: out-statusnet\n"
@@ -198,11 +198,11 @@ msgstr "Не удаётся обновить ваше оформление."
msgid "You cannot block yourself!"
msgstr "Вы не можете заблокировать самого себя!"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "Неудача при блокировке пользователя."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "Неудача при разблокировке пользователя."
@@ -320,32 +320,32 @@ msgid "Could not find target user."
msgstr "Не удаётся найти целевого пользователя."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Имя должно состоять только из прописных букв и цифр и не иметь пробелов."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Такое имя уже используется. Попробуйте какое-нибудь другое."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Неверное имя."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "URL Главной страницы неверен."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Полное имя слишком длинное (не больше 255 знаков)."
@@ -356,7 +356,7 @@ msgid "Description is too long (max %d chars)."
msgstr "Слишком длинное описание (максимум %d символов)"
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "Слишком длинное месторасположение (максимум 255 знаков)."
@@ -471,7 +471,7 @@ msgstr "Слишком длинная запись. Максимальная д
msgid "Not found"
msgstr "Не найдено"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Максимальная длина записи — %d символов, включая URL вложения."
@@ -614,13 +614,13 @@ msgid "Crop"
msgstr "Обрезать"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -693,7 +693,7 @@ msgstr "Да"
msgid "Block this user"
msgstr "Заблокировать пользователя."
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "Не удаётся сохранить информацию о блокировании."
@@ -765,7 +765,7 @@ msgstr "Этот адрес уже подтверждён."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Не удаётся обновить пользователя."
@@ -965,7 +965,7 @@ msgstr "Восстановить значения по умолчанию"
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1475,7 +1475,7 @@ msgstr "Участники группы %s, страница %d"
msgid "A list of the users in this group."
msgstr "Список пользователей, являющихся членами этой группы."
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "Настройки"
@@ -1573,7 +1573,7 @@ msgstr "Только администратор может разблокиро
msgid "User is not blocked from group."
msgstr "Пользователь не заблокировал вас из группы."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "Ошибка при удалении данного блока."
@@ -1882,7 +1882,7 @@ msgstr "Некорректное имя или пароль."
msgid "Error setting user. You are probably not authorized."
msgstr "Ошибка установки пользователя. Вы, вероятно, не авторизованы."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Вход"
@@ -1994,7 +1994,7 @@ msgstr "Сообщение отправлено"
msgid "Direct message to %s sent"
msgstr "Прямое сообщение для %s послано"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "Ошибка AJAX"
@@ -2002,7 +2002,7 @@ msgstr "Ошибка AJAX"
msgid "New notice"
msgstr "Новая запись"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "Запись опубликована"
@@ -2433,71 +2433,80 @@ msgstr "Месторасположение"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Где вы находитесь, например «Город, область, страна»"
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "Теги"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
"Теги для самого себя (буквы, цифры, -, ., и _), разделенные запятой или "
"пробелом"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Язык"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "Предпочитаемый язык"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Часовой пояс"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "В каком часовом поясе Вы обычно находитесь?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "Автоматически подписываться на всех, кто подписался на меня"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Слишком длинная биография (максимум %d символов)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "Часовой пояс не выбран."
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "Слишком длинный язык (более 50 символов). "
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Неверный тег: «%s»"
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr "Не удаётся обновить пользователя для автоподписки."
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Не удаётся сохранить теги."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Не удаётся сохранить профиль."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "Не удаётся сохранить теги."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Настройки сохранены."
@@ -2742,7 +2751,7 @@ msgstr "Извините, неверный пригласительный код
msgid "Registration successful"
msgstr "Регистрация успешна!"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистрация"
@@ -4088,16 +4097,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr "Вам запрещено поститься на этом сайте (бан)"
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Проблемы с сохранением записи."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Ошибка баз данных при вставке ответа для %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4152,128 +4161,128 @@ msgstr "%s (%s)"
msgid "Untitled page"
msgstr "Страница без названия"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr "Главная навигация"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Моё"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr "Личный профиль и лента друзей"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "Настройки"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr "Изменить ваш email, аватару, пароль, профиль"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Соединить"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect to services"
msgstr "Соединить с сервисами"
-#: lib/action.php:440
+#: lib/action.php:441
msgid "Change site configuration"
msgstr "Изменить конфигурацию сайта"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Пригласить"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Пригласи друзей и коллег стать такими же как ты участниками %s"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Выход"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "Выйти"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "Создать новый аккаунт"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "Войти"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Помощь"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "Помощь"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Поиск"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "Искать людей или текст"
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr "Новая запись"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "Локальные виды"
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr "Новая запись"
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr "Навигация по подпискам"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "О проекте"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "ЧаВо"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr "TOS"
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Пользовательское соглашение"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Исходный код"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Контактная информация"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr "Бедж"
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr "StatusNet лицензия"
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4282,12 +4291,12 @@ msgstr ""
"**%%site.name%%** — это сервис микроблогинга, созданный для вас при помощи [%"
"%site.broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** — сервис микроблогинга. "
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4299,31 +4308,31 @@ msgstr ""
"лицензией [GNU Affero General Public License](http://www.fsf.org/licensing/"
"licenses/agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
msgid "Site content license"
msgstr "Лицензия содержимого сайта"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr "All "
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "license."
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "Разбиение на страницы"
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "Сюда"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "Туда"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
@@ -4933,7 +4942,7 @@ msgstr ""
#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s сейчас слушает ваши заметки на %2$s."
+msgstr "%1$s теперь следит за вашими записями на %2$s."
#: lib/mail.php:241
#, php-format
@@ -5258,6 +5267,14 @@ msgstr "Прикрепить"
msgid "Attach a file"
msgstr "Прикрепить файл"
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/statusnet.po b/locale/statusnet.po
index 3b094b0a6..114d8ba6e 100644
--- a/locale/statusnet.po
+++ b/locale/statusnet.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-28 08:09+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -184,11 +184,11 @@ msgstr ""
msgid "You cannot block yourself!"
msgstr ""
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr ""
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr ""
@@ -300,31 +300,31 @@ msgid "Could not find target user."
msgstr ""
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr ""
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr ""
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr ""
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr ""
@@ -335,7 +335,7 @@ msgid "Description is too long (max %d chars)."
msgstr ""
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr ""
@@ -450,7 +450,7 @@ msgstr ""
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -592,13 +592,13 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -668,7 +668,7 @@ msgstr ""
msgid "Block this user"
msgstr ""
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr ""
@@ -740,7 +740,7 @@ msgstr ""
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr ""
@@ -934,7 +934,7 @@ msgstr ""
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1416,7 +1416,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1503,7 +1503,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr ""
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr ""
@@ -1768,7 +1768,7 @@ msgstr ""
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr ""
@@ -1875,7 +1875,7 @@ msgstr ""
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr ""
@@ -1883,7 +1883,7 @@ msgstr ""
msgid "New notice"
msgstr ""
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr ""
@@ -2300,69 +2300,77 @@ msgstr ""
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr ""
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr ""
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr ""
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr ""
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr ""
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr ""
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr ""
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr ""
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr ""
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+msgid "Couldn't save location prefs."
+msgstr ""
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr ""
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr ""
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr ""
@@ -2591,7 +2599,7 @@ msgstr ""
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -3825,16 +3833,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -3889,140 +3897,140 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr ""
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr ""
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect to services"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:441
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr ""
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr ""
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr ""
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr ""
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr ""
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr ""
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr ""
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr ""
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr ""
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr ""
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr ""
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr ""
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr ""
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4030,31 +4038,31 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:790
+#: lib/action.php:791
msgid "Site content license"
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr ""
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr ""
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr ""
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr ""
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr ""
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr ""
@@ -4851,6 +4859,14 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 34606dc9d..993989074 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:11:18+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:07:38+0000\n"
"Language-Team: Swedish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: sv\n"
"X-Message-Group: out-statusnet\n"
@@ -196,11 +196,11 @@ msgstr "Kunde inte uppdatera din profils utseende."
msgid "You cannot block yourself!"
msgstr "Du kan inte blockera dig själv!"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "Blockering av användare misslyckades."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "Hävning av blockering av användare misslyckades."
@@ -312,32 +312,32 @@ msgid "Could not find target user."
msgstr ""
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Smeknamnet får endast innehålla små bokstäver eller siffror, inga mellanslag."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Smeknamnet används redan. Försök med ett annat."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Inte ett giltigt smeknamn."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "Hemsida är inte en giltig URL."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Fullständigt namn är för långt (max 255 tecken)."
@@ -348,7 +348,7 @@ msgid "Description is too long (max %d chars)."
msgstr "Beskrivning är för lång (max 140 tecken)"
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "Beskrivning av plats är för lång (max 255 tecken)."
@@ -463,7 +463,7 @@ msgstr "Det är för långt. Maximal notisstorlek är %d tecken."
msgid "Not found"
msgstr "Hittades inte"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maximal notisstorlek är %d tecken, inklusive bilage-URL."
@@ -606,13 +606,13 @@ msgid "Crop"
msgstr "Beskär"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -685,7 +685,7 @@ msgstr "Ja"
msgid "Block this user"
msgstr "Blockera denna användare"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "Misslyckades att spara blockeringsinformation."
@@ -758,7 +758,7 @@ msgstr "Denna adress har redan blivit bekräftad."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Kunde inte uppdatera användare."
@@ -958,7 +958,7 @@ msgstr "Återställ till standardvärde"
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1456,7 +1456,7 @@ msgstr "%s gruppmedlemmar, sida %d"
msgid "A list of the users in this group."
msgstr "En lista av användarna i denna grupp."
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "Administratör"
@@ -1555,7 +1555,7 @@ msgstr "Bara en administratör kan häva blockering av gruppmedlemmar."
msgid "User is not blocked from group."
msgstr "Användare är inte blockerad från grupp."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "Fel vid hävning av blockering."
@@ -1837,7 +1837,7 @@ msgstr "Felaktigt användarnamn eller lösenord."
msgid "Error setting user. You are probably not authorized."
msgstr "Fel vid inställning av användare. Du har sannolikt inte tillstånd."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logga in"
@@ -1950,7 +1950,7 @@ msgstr "Meddelande skickat"
msgid "Direct message to %s sent"
msgstr "Direktmeddelande till %s skickat"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "AJAX-fel"
@@ -1958,7 +1958,7 @@ msgstr "AJAX-fel"
msgid "New notice"
msgstr "Ny notis"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "Notis postad"
@@ -2387,72 +2387,81 @@ msgstr "Plats"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Var du håller till, såsom \"Stad, Län, Land\""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "Taggar"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
"Taggar för dig själv (bokstäver, nummer, -, ., och _), separerade med "
"kommatecken eller mellanslag"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Språk"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "Föredraget språk"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Tidszon"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "I vilken tidszon befinner du dig normalt?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
"Prenumerera automatiskt på den prenumererar på mig (bäst för icke-människa) "
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Biografin är för lång (max %d tecken)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "Tidszon inte valt."
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "Språknamn är för långt (max 50 tecken)."
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Ogiltig tagg: \"%s\""
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr "Kunde inte uppdatera användaren för automatisk prenumeration."
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Kunde inte spara taggar."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Kunde inte spara profil."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "Kunde inte spara taggar."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Inställningar sparade."
@@ -2699,7 +2708,7 @@ msgstr "Ledsen, ogiltig inbjudningskod."
msgid "Registration successful"
msgstr "Registreringen genomförd"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrera"
@@ -4018,16 +4027,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr "Du är utestängd från att posta notiser på denna webbplats."
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Problem med att spara notis."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Databasfel vid infogning av svar: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4082,128 +4091,128 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Namnlös sida"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr "Primär webbplatsnavigation"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Hem"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr "Personlig profil och vänners tidslinje"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "Konto"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr "Ändra din e-post, avatar, lösenord, profil"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Anslut"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect to services"
msgstr "Anslut till tjänster"
-#: lib/action.php:440
+#: lib/action.php:441
msgid "Change site configuration"
msgstr "Ändra webbplatskonfiguration"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Bjud in"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Bjud in vänner och kollegor att gå med dig på %s"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Logga ut"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "Logga ut från webbplatsen"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "Skapa ett konto"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "Logga in på webbplatsen"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Hjälp"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "Hjälp mig!"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Sök"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "Sök efter personer eller text"
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr "Webbplatsnotis"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "Lokala vyer"
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr "Sidnotis"
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr "Sekundär webbplatsnavigation"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "Om"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "Frågor & svar"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr "Användarvillkor"
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Sekretess"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Källa"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr "Emblem"
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr "Programvarulicens för StatusNet"
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4212,12 +4221,12 @@ msgstr ""
"**%%site.name%%** är en mikrobloggtjänst tillhandahållen av [%%site.broughtby"
"%%](%%site.broughtbyurl%%)"
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** är en mikrobloggtjänst."
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4228,31 +4237,31 @@ msgstr ""
"version %s, tillgänglig under [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
msgid "Site content license"
msgstr "Licens för webbplatsinnehåll"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr "Alla "
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "licens."
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "Numrering av sidor"
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "Senare"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "Tidigare"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr "Det var ett problem med din sessions-token."
@@ -5072,6 +5081,14 @@ msgstr "Bifoga"
msgid "Attach a file"
msgstr "Bifoga en fil"
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index c7b7aec8e..25b649cf9 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:11:21+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:07:41+0000\n"
"Language-Team: Telugu\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: te\n"
"X-Message-Group: out-statusnet\n"
@@ -190,11 +190,11 @@ msgstr "వాడుకరిని తాజాకరించలేకున
msgid "You cannot block yourself!"
msgstr "మిమ్మల్ని మీరే నిరోధించుకోలేరు!"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "వాడుకరి నిరోధం విఫలమైంది."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr ""
@@ -308,31 +308,31 @@ msgid "Could not find target user."
msgstr "లక్ష్యిత వాడుకరిని కనుగొనలేకపోయాం."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "పేరులో చిన్నబడి అక్షరాలు మరియు అంకెలు మాత్రమే ఖాళీలు లేకుండా ఉండాలి."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "సరైన పేరు కాదు."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "హోమ్ పేజీ URL సరైనది కాదు."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)."
@@ -343,7 +343,7 @@ msgid "Description is too long (max %d chars)."
msgstr "వివరణ చాలా పెద్దగా ఉంది (%d అక్షరాలు గరిష్ఠం)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
@@ -460,7 +460,7 @@ msgstr "అది చాలా పొడవుంది. గరిష్ఠ న
msgid "Not found"
msgstr "దొరకలేదు"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "గరిష్ఠ నోటీసు పొడవు %d అక్షరాలు, జోడింపు URLని కలుపుకుని."
@@ -603,13 +603,13 @@ msgid "Crop"
msgstr "కత్తిరించు"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -679,7 +679,7 @@ msgstr "అవును"
msgid "Block this user"
msgstr "ఈ వాడుకరిని నిరోధించు"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "నిరోధపు సమాచారాన్ని భద్రపరచడంలో విఫలమయ్యాం."
@@ -754,7 +754,7 @@ msgstr "ఆ చిరునామా ఇప్పటికే నిర్ధా
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
@@ -950,7 +950,7 @@ msgstr ""
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1410,16 +1410,15 @@ msgstr "మీ గుంపుకి మీరు ఒక చిహ్నాన
#: actions/grouplogo.php:362
msgid "Pick a square area of the image to be the logo."
-msgstr ""
+msgstr "చిహ్నంగా ఉండాల్సిన చతురస్త్ర ప్రదేశాన్ని బొమ్మ నుండి ఎంచుకోండి."
#: actions/grouplogo.php:396
msgid "Logo updated."
msgstr "చిహ్నాన్ని తాజాకరించాం."
#: actions/grouplogo.php:398
-#, fuzzy
msgid "Failed updating logo."
-msgstr "అవతారపు తాజాకరణ విఫలమైంది."
+msgstr "చిహ్నపు తాజాకరణ విఫలమైంది."
#: actions/groupmembers.php:93 lib/groupnav.php:92
#, php-format
@@ -1435,7 +1434,7 @@ msgstr "%s గుంపు సభ్యులు, పేజీ %d"
msgid "A list of the users in this group."
msgstr "ఈ గుంపులో వాడుకరులు జాబితా."
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1525,7 +1524,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "వాడుకరిని గుంపు నుండి నిరోధించలేదు."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "నిరోధాన్ని తొలగించడంలో పొరపాటు."
@@ -1791,7 +1790,7 @@ msgstr "వాడుకరిపేరు లేదా సంకేతపదం
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "ప్రవేశించండి"
@@ -1901,7 +1900,7 @@ msgstr "సందేశాన్ని పంపించాం"
msgid "Direct message to %s sent"
msgstr "%sకి నేరు సందేశాన్ని పంపించాం"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "అజాక్స్ పొరపాటు"
@@ -1909,7 +1908,7 @@ msgstr "అజాక్స్ పొరపాటు"
msgid "New notice"
msgstr "కొత్త సందేశం"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
#, fuzzy
msgid "Notice posted"
msgstr "సందేశాలు"
@@ -2342,69 +2341,78 @@ msgstr "ప్రాంతం"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "ట్యాగులు"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "భాష"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "ప్రాథాన్యతా భాష"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "కాలమండలం"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "మీరు సామాన్యంగా ఉండే కాలమండలం ఏది?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "స్వపరిచయం చాలా పెద్దగా ఉంది (%d అక్షరాలు గరిష్ఠం)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "కాలమండలాన్ని ఎంచుకోలేదు."
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "భాష మరీ పెద్దగా ఉంది (50 అక్షరాలు గరిష్ఠం)."
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, fuzzy, php-format
msgid "Invalid tag: \"%s\""
msgstr "'%s' అనే హోమ్ పేజీ సరైనదికాదు"
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "ట్యాగులని భద్రపరచలేకున్నాం."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "ట్యాగులని భద్రపరచలేకున్నాం."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "అమరికలు భద్రమయ్యాయి."
@@ -2638,7 +2646,7 @@ msgstr "క్షమించండి, తప్పు ఆహ్వాన స
msgid "Registration successful"
msgstr "నమోదు విజయవంతం"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "నమోదు"
@@ -3291,7 +3299,7 @@ msgstr ""
#: actions/siteadminpanel.php:353
msgid "Frequency"
-msgstr ""
+msgstr "తరచుదనం"
#: actions/siteadminpanel.php:354
msgid "Snapshots will be sent once every N web hits"
@@ -3901,16 +3909,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr "ఈ సైటులో నోటీసులు రాయడం నుండి మిమ్మల్ని నిషేధించారు."
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -3967,132 +3975,132 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "ముంగిలి"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "ఖాతా"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr "మీ ఈమెయిలు, అవతారం, సంకేతపదం మరియు ప్రౌఫైళ్ళను మార్చుకోండి"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "అనుసంధానించు"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect to services"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:441
#, fuzzy
msgid "Change site configuration"
msgstr "చందాలు"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "ఆహ్వానించు"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "నిష్క్రమించు"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "సైటు నుండి నిష్క్రమించు"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "కొత్త ఖాతా సృష్టించు"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "సైటులోని ప్రవేశించు"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "సహాయం"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "సహాయం కావాలి!"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "వెతుకు"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:485
+#: lib/action.php:486
#, fuzzy
msgid "Site notice"
msgstr "కొత్త సందేశం"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "స్థానిక వీక్షణలు"
-#: lib/action.php:617
+#: lib/action.php:618
#, fuzzy
msgid "Page notice"
msgstr "కొత్త సందేశం"
-#: lib/action.php:719
+#: lib/action.php:720
#, fuzzy
msgid "Secondary site navigation"
msgstr "చందాలు"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "గురించి"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "ప్రశ్నలు"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr "సేవా నియమాలు"
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "అంతరంగికత"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "మూలము"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "సంప్రదించు"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr "బాడ్జి"
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4101,12 +4109,12 @@ msgstr ""
"**%%site.name%%** అనేది [%%site.broughtby%%](%%site.broughtbyurl%%) వారు "
"అందిస్తున్న మైక్రో బ్లాగింగు సదుపాయం. "
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగింగు సదుపాయం."
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4117,38 +4125,38 @@ msgstr ""
"html) కింద లభ్యమయ్యే [స్టేటస్&zwnj;నెట్](http://status.net/) మైక్రోబ్లాగింగ్ ఉపకరణం సంచిక %s "
"పై నడుస్తుంది."
-#: lib/action.php:790
+#: lib/action.php:791
#, fuzzy
msgid "Site content license"
msgstr "కొత్త సందేశం"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr "అన్నీ "
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr ""
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "పేజీకరణ"
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "తర్వాత"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "ఇంతక్రితం"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr ""
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
-msgstr ""
+msgstr "ఈ సైటుకి మీరు మార్పులు చేయలేరు."
#: lib/adminpanelaction.php:195
msgid "showForm() not implemented."
@@ -4961,6 +4969,14 @@ msgstr "జోడించు"
msgid "Attach a file"
msgstr "ఒక ఫైలుని జోడించు"
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 402ca048d..9c8df065d 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:11:24+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:07:44+0000\n"
"Language-Team: Turkish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tr\n"
"X-Message-Group: out-statusnet\n"
@@ -193,11 +193,11 @@ msgstr "Kullanıcı güncellenemedi."
msgid "You cannot block yourself!"
msgstr "Kullanıcı güncellenemedi."
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr ""
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr ""
@@ -313,7 +313,7 @@ msgid "Could not find target user."
msgstr "Kullanıcı güncellenemedi."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
@@ -321,25 +321,25 @@ msgstr ""
"kullanılamaz. "
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Takma ad kullanımda. Başka bir tane deneyin."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Geçersiz bir takma ad."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Tam isim çok uzun (azm: 255 karakter)."
@@ -350,7 +350,7 @@ msgid "Description is too long (max %d chars)."
msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
@@ -472,7 +472,7 @@ msgstr ""
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -618,13 +618,13 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -699,7 +699,7 @@ msgstr ""
msgid "Block this user"
msgstr "Böyle bir kullanıcı yok."
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr ""
@@ -775,7 +775,7 @@ msgstr "O adres daha önce onaylanmış."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Kullanıcı güncellenemedi."
@@ -984,7 +984,7 @@ msgstr ""
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1488,7 +1488,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1582,7 +1582,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "Kullanıcının profili yok."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
#, fuzzy
msgid "Error removing the block."
msgstr "Kullanıcıyı kaydetmede hata oluştu."
@@ -1862,7 +1862,7 @@ msgstr "Yanlış kullanıcı adı veya parola."
msgid "Error setting user. You are probably not authorized."
msgstr "Yetkilendirilmemiş."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Giriş"
@@ -1975,7 +1975,7 @@ msgstr ""
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr ""
@@ -1983,7 +1983,7 @@ msgstr ""
msgid "New notice"
msgstr "Yeni durum mesajı"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
#, fuzzy
msgid "Notice posted"
msgstr "Durum mesajları"
@@ -2427,70 +2427,79 @@ msgstr "Yer"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr ""
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr ""
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr ""
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr ""
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr ""
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr ""
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr ""
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, fuzzy, php-format
msgid "Invalid tag: \"%s\""
msgstr "%s Geçersiz başlangıç sayfası"
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Profil kaydedilemedi."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Profil kaydedilemedi."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
#, fuzzy
msgid "Couldn't save tags."
msgstr "Profil kaydedilemedi."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Ayarlar kaydedildi."
@@ -2726,7 +2735,7 @@ msgstr "Onay kodu hatası."
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Kayıt"
@@ -4017,16 +4026,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Cevap eklenirken veritabanı hatası: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4085,136 +4094,136 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Başlangıç"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:434
#, fuzzy
msgid "Account"
msgstr "Hakkında"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Bağlan"
-#: lib/action.php:436
+#: lib/action.php:437
#, fuzzy
msgid "Connect to services"
msgstr "Sunucuya yönlendirme yapılamadı: %s"
-#: lib/action.php:440
+#: lib/action.php:441
#, fuzzy
msgid "Change site configuration"
msgstr "Abonelikler"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Çıkış"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:455
+#: lib/action.php:456
#, fuzzy
msgid "Create an account"
msgstr "Yeni hesap oluştur"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr ""
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Yardım"
-#: lib/action.php:461
+#: lib/action.php:462
#, fuzzy
msgid "Help me!"
msgstr "Yardım"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Ara"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:485
+#: lib/action.php:486
#, fuzzy
msgid "Site notice"
msgstr "Yeni durum mesajı"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr ""
-#: lib/action.php:617
+#: lib/action.php:618
#, fuzzy
msgid "Page notice"
msgstr "Yeni durum mesajı"
-#: lib/action.php:719
+#: lib/action.php:720
#, fuzzy
msgid "Secondary site navigation"
msgstr "Abonelikler"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "Hakkında"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "SSS"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Gizlilik"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Kaynak"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "İletişim"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr ""
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4223,12 +4232,12 @@ msgstr ""
"**%%site.name%%** [%%site.broughtby%%](%%site.broughtbyurl%%)\" tarafından "
"hazırlanan anında mesajlaşma ağıdır. "
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4239,34 +4248,34 @@ msgstr ""
"licenses/agpl-3.0.html) lisansı ile korunan [StatusNet](http://status.net/) "
"microbloglama yazılımının %s. versiyonunu kullanmaktadır."
-#: lib/action.php:790
+#: lib/action.php:791
#, fuzzy
msgid "Site content license"
msgstr "Yeni durum mesajı"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr ""
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr ""
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr ""
-#: lib/action.php:1107
+#: lib/action.php:1108
#, fuzzy
msgid "After"
msgstr "« Sonra"
-#: lib/action.php:1115
+#: lib/action.php:1116
#, fuzzy
msgid "Before"
msgstr "Önce »"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr ""
@@ -5096,6 +5105,14 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 32c26de54..587487404 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:11:27+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:07:47+0000\n"
"Language-Team: Ukrainian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: out-statusnet\n"
@@ -198,11 +198,11 @@ msgstr "Не вдалося оновити Ваш дизайн."
msgid "You cannot block yourself!"
msgstr "Ви не можете блокувати самого себе!"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "Спроба заблокувати користувача невдала."
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "Спроба розблокувати користувача невдала."
@@ -315,7 +315,7 @@ msgid "Could not find target user."
msgstr "Не вдалося знайти цільового користувача."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
@@ -323,25 +323,25 @@ msgstr ""
"інтервалів."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Це ім’я вже використовується. Спробуйте інше."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Це недійсне ім’я користувача."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "Веб-сторінка має недійсну URL-адресу."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Повне ім’я задовге (255 знаків максимум)"
@@ -352,7 +352,7 @@ msgid "Description is too long (max %d chars)."
msgstr "Опис надто довгий (%d знаків максимум)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "Локація надто довга (255 знаків максимум)."
@@ -467,7 +467,7 @@ msgstr "Надто довго. Максимальний розмір допис
msgid "Not found"
msgstr "Не знайдено"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -611,13 +611,13 @@ msgid "Crop"
msgstr "Втяти"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -691,7 +691,7 @@ msgstr "Так"
msgid "Block this user"
msgstr "Блокувати користувача"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "Збереження інформації про блокування завершилось невдачею."
@@ -763,7 +763,7 @@ msgstr "Цю адресу вже було підтверджено."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Не вдалося оновити користувача."
@@ -962,7 +962,7 @@ msgstr "Повернутись до початкових налаштувань"
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1460,7 +1460,7 @@ msgstr "Учасники групи %s, сторінка %d"
msgid "A list of the users in this group."
msgstr "Список учасників цієї групи."
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "Адмін"
@@ -1559,7 +1559,7 @@ msgstr "Лише адміни можуть розблокувати членів
msgid "User is not blocked from group."
msgstr "Користувача не блоковано."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "Помилка при розблокуванні."
@@ -1869,7 +1869,7 @@ msgstr "Неточне ім’я або пароль."
msgid "Error setting user. You are probably not authorized."
msgstr "Помилка. Можливо, Ви не авторизовані."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Увійти"
@@ -1984,7 +1984,7 @@ msgstr "Повідомлення надіслано"
msgid "Direct message to %s sent"
msgstr "Пряме повідомлення до %s надіслано"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "Помилка в Ajax"
@@ -1992,7 +1992,7 @@ msgstr "Помилка в Ajax"
msgid "New notice"
msgstr "Новий допис"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "Допис надіслано"
@@ -2424,72 +2424,81 @@ msgstr "Локація"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Де Ви живете, штибу \"Місто, область (регіон), країна\""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "Теґи"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
"Позначте себе теґами (літери, цифри, -, . та _), відокремлюючи кожен комою "
"або пробілом"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Мова"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "Мова, котрій надаєте перевагу"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Часовий пояс"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "За яким часовим поясом Ви живете?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
"Автоматично підписуватись до тих, хто підписався до мене. (Слава роботам!)"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Ви перевищили ліміт (%d знаків максимум)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "Часовий пояс не обрано."
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "Мова задовга (50 знаків максимум)."
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Недійсний теґ: \"%s\""
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr "Не вдалося оновити користувача для автопідписки."
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Не вдалося зберегти теґи."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Не вдалося зберегти профіль."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
msgid "Couldn't save tags."
msgstr "Не вдалося зберегти теґи."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Налаштування збережено."
@@ -2737,7 +2746,7 @@ msgstr "Даруйте, помилка у коді запрошення."
msgid "Registration successful"
msgstr "Реєстрація успішна"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Реєстрація"
@@ -4079,16 +4088,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr "Вам заборонено надсилати дописи до цього сайту."
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Проблема при збереженні допису."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Помилка бази даних при додаванні відповіді: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4143,128 +4152,128 @@ msgstr "%s — %s"
msgid "Untitled page"
msgstr "Сторінка без заголовку"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr "Відправна навігація по сайту"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Дім"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr "Персональний профіль і стрічка друзів"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "Акаунт"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr "Змінити електронну адресу, аватару, пароль, профіль"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "З’єднання"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect to services"
msgstr "З’єднання з сервісами"
-#: lib/action.php:440
+#: lib/action.php:441
msgid "Change site configuration"
msgstr "Змінити конфігурацію сайту"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Запросити"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Запросіть друзів та колег приєднатись до Вас на %s"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Вийти"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "Вийти з сайту"
-#: lib/action.php:455
+#: lib/action.php:456
msgid "Create an account"
msgstr "Створити новий акаунт"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "Увійти на сайт"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Допомога"
-#: lib/action.php:461
+#: lib/action.php:462
msgid "Help me!"
msgstr "Допоможіть!"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Пошук"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "Пошук людей або текстів"
-#: lib/action.php:485
+#: lib/action.php:486
msgid "Site notice"
msgstr "Зауваження сайту"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "Огляд"
-#: lib/action.php:617
+#: lib/action.php:618
msgid "Page notice"
msgstr "Зауваження сторінки"
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr "Другорядна навігація по сайту"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "Про"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "ЧаПи"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr "Умови"
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Конфіденційність"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Джерело"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr "Бедж"
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr "Ліцензія програмного забезпечення StatusNet"
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4273,12 +4282,12 @@ msgstr ""
"**%%site.name%%** — це сервіс мікроблоґів наданий вам [%%site.broughtby%%](%%"
"site.broughtbyurl%%). "
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** — це сервіс мікроблоґів. "
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4289,31 +4298,31 @@ msgstr ""
"для мікроблоґів, версія %s, доступному під [GNU Affero General Public "
"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
msgid "Site content license"
msgstr "Ліцензія змісту сайту"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr "Всі "
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "ліцензія."
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "Нумерація сторінок"
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr "Вперед"
-#: lib/action.php:1115
+#: lib/action.php:1116
msgid "Before"
msgstr "Назад"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr "Виникли певні проблеми з токеном поточної сесії."
@@ -5245,6 +5254,14 @@ msgstr "Вкласти"
msgid "Attach a file"
msgstr "Вкласти файл"
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index 80dd9617d..ddf60fe0e 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:11:29+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:07:50+0000\n"
"Language-Team: Vietnamese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: vi\n"
"X-Message-Group: out-statusnet\n"
@@ -193,11 +193,11 @@ msgstr "Không thể cập nhật thành viên."
msgid "You cannot block yourself!"
msgstr "Không thể cập nhật thành viên."
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr ""
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr ""
@@ -318,31 +318,31 @@ msgid "Could not find target user."
msgstr "Không tìm thấy bất kỳ trạng thái nào."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Biệt hiệu phải là chữ viết thường hoặc số và không có khoảng trắng."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "Biệt hiệu không hợp lệ."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "Trang chủ không phải là URL"
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "Tên đầy đủ quá dài (tối đa là 255 ký tự)."
@@ -353,7 +353,7 @@ msgid "Description is too long (max %d chars)."
msgstr "Lý lịch quá dài (không quá 140 ký tự)"
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
@@ -474,7 +474,7 @@ msgstr "Quá dài. Tối đa là 140 ký tự."
msgid "Not found"
msgstr "Không tìm thấy"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -624,13 +624,13 @@ msgid "Crop"
msgstr "Nhóm"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -705,7 +705,7 @@ msgstr "Có"
msgid "Block this user"
msgstr "Ban user"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr ""
@@ -780,7 +780,7 @@ msgstr "Địa chỉ đó đã được xác nhận rồi."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Không thể cập nhật thành viên."
@@ -997,7 +997,7 @@ msgstr ""
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1533,7 +1533,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1629,7 +1629,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "Người dùng không có thông tin."
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
#, fuzzy
msgid "Error removing the block."
msgstr "Lỗi xảy ra khi lưu thành viên."
@@ -1946,7 +1946,7 @@ msgstr "Sai tên đăng nhập hoặc mật khẩu."
msgid "Error setting user. You are probably not authorized."
msgstr "Chưa được phép."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Đăng nhập"
@@ -2062,7 +2062,7 @@ msgstr "Tin mới nhất"
msgid "Direct message to %s sent"
msgstr "Tin nhắn riêng"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
#, fuzzy
msgid "Ajax Error"
msgstr "Lỗi"
@@ -2071,7 +2071,7 @@ msgstr "Lỗi"
msgid "New notice"
msgstr "Thông báo mới"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
#, fuzzy
msgid "Notice posted"
msgstr "Tin đã gửi"
@@ -2523,72 +2523,81 @@ msgstr "Thành phố"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "Từ khóa"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "Ngôn ngữ"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "Ngôn ngữ bạn thích"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "Khu vực"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "Khu vực nào bạn thường ở?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "Tự động theo những người nào đăng ký theo tôi"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Lý lịch quá dài (không quá 140 ký tự)"
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr ""
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
#, fuzzy
msgid "Language is too long (max 50 chars)."
msgstr "Ngôn ngữ quá dài (tối đa là 50 ký tự)."
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, fuzzy, php-format
msgid "Invalid tag: \"%s\""
msgstr "Trang chủ '%s' không hợp lệ"
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
#, fuzzy
msgid "Couldn't update user for autosubscribe."
msgstr "Không thể cập nhật thành viên."
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Không thể lưu hồ sơ cá nhân."
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "Không thể lưu hồ sơ cá nhân."
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
#, fuzzy
msgid "Couldn't save tags."
msgstr "Không thể lưu hồ sơ cá nhân."
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Đã lưu các điều chỉnh."
@@ -2826,7 +2835,7 @@ msgstr "Lỗi xảy ra với mã xác nhận."
msgid "Registration successful"
msgstr "Đăng ký thành công"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Đăng ký"
@@ -4169,16 +4178,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%s (%s)"
@@ -4238,140 +4247,140 @@ msgstr "%s (%s)"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "Trang chủ"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:434
#, fuzzy
msgid "Account"
msgstr "Giới thiệu"
-#: lib/action.php:433
+#: lib/action.php:434
#, fuzzy
msgid "Change your email, avatar, password, profile"
msgstr "Thay đổi mật khẩu của bạn"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "Kết nối"
-#: lib/action.php:436
+#: lib/action.php:437
#, fuzzy
msgid "Connect to services"
msgstr "Không thể chuyển đến máy chủ: %s"
-#: lib/action.php:440
+#: lib/action.php:441
#, fuzzy
msgid "Change site configuration"
msgstr "Tôi theo"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Thư mời"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, fuzzy, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
"Điền địa chỉ email và nội dung tin nhắn để gửi thư mời bạn bè và đồng nghiệp "
"của bạn tham gia vào dịch vụ này."
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "Thoát"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:455
+#: lib/action.php:456
#, fuzzy
msgid "Create an account"
msgstr "Tạo tài khoản mới"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr ""
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "Hướng dẫn"
-#: lib/action.php:461
+#: lib/action.php:462
#, fuzzy
msgid "Help me!"
msgstr "Hướng dẫn"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "Tìm kiếm"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:485
+#: lib/action.php:486
#, fuzzy
msgid "Site notice"
msgstr "Thông báo mới"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr ""
-#: lib/action.php:617
+#: lib/action.php:618
#, fuzzy
msgid "Page notice"
msgstr "Thông báo mới"
-#: lib/action.php:719
+#: lib/action.php:720
#, fuzzy
msgid "Secondary site navigation"
msgstr "Tôi theo"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "Giới thiệu"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "Riêng tư"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "Nguồn"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "Liên hệ"
-#: lib/action.php:741
+#: lib/action.php:742
#, fuzzy
msgid "Badge"
msgstr "Tin đã gửi"
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4380,12 +4389,12 @@ msgstr ""
"**%%site.name%%** là dịch vụ gửi tin nhắn được cung cấp từ [%%site.broughtby%"
"%](%%site.broughtbyurl%%). "
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** là dịch vụ gửi tin nhắn. "
-#: lib/action.php:776
+#: lib/action.php:777
#, fuzzy, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4396,34 +4405,34 @@ msgstr ""
"quyền [GNU Affero General Public License](http://www.fsf.org/licensing/"
"licenses/agpl-3.0.html)."
-#: lib/action.php:790
+#: lib/action.php:791
#, fuzzy
msgid "Site content license"
msgstr "Tìm theo nội dung của tin nhắn"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr ""
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr ""
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr ""
-#: lib/action.php:1107
+#: lib/action.php:1108
#, fuzzy
msgid "After"
msgstr "Sau"
-#: lib/action.php:1115
+#: lib/action.php:1116
#, fuzzy
msgid "Before"
msgstr "Trước"
-#: lib/action.php:1163
+#: lib/action.php:1164
#, fuzzy
msgid "There was a problem with your session token."
msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
@@ -5321,6 +5330,14 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 484166549..90d2a301f 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:11:32+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:07:53+0000\n"
"Language-Team: Simplified Chinese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: out-statusnet\n"
@@ -195,11 +195,11 @@ msgstr "无法更新用户。"
msgid "You cannot block yourself!"
msgstr "无法更新用户。"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "阻止用户失败。"
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr "取消阻止用户失败。"
@@ -316,31 +316,31 @@ msgid "Could not find target user."
msgstr "找不到任何信息。"
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "昵称只能使用小写字母和数字,不包含空格。"
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "昵称已被使用,换一个吧。"
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "不是有效的昵称。"
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "主页的URL不正确。"
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "全名过长(不能超过 255 个字符)。"
@@ -351,7 +351,7 @@ msgid "Description is too long (max %d chars)."
msgstr "描述过长(不能超过140字符)。"
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "位置过长(不能超过255个字符)。"
@@ -472,7 +472,7 @@ msgstr "超出长度限制。不能超过 140 个字符。"
msgid "Not found"
msgstr "未找到"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -618,13 +618,13 @@ msgid "Crop"
msgstr "剪裁"
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -699,7 +699,7 @@ msgstr "是"
msgid "Block this user"
msgstr "阻止该用户"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr "保存阻止信息失败。"
@@ -776,7 +776,7 @@ msgstr "此地址已被确认。"
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "无法更新用户。"
@@ -989,7 +989,7 @@ msgstr ""
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1505,7 +1505,7 @@ msgstr "%s 组成员, 第 %d 页"
msgid "A list of the users in this group."
msgstr "该组成员列表。"
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr "admin管理员"
@@ -1599,7 +1599,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "用户没有个人信息。"
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
#, fuzzy
msgid "Error removing the block."
msgstr "保存用户时出错。"
@@ -1898,7 +1898,7 @@ msgstr "用户名或密码不正确。"
msgid "Error setting user. You are probably not authorized."
msgstr "未认证。"
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "登录"
@@ -2008,7 +2008,7 @@ msgstr "新消息"
msgid "Direct message to %s sent"
msgstr "已向 %s 发送消息"
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr "Ajax错误"
@@ -2016,7 +2016,7 @@ msgstr "Ajax错误"
msgid "New notice"
msgstr "新通告"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr "消息已发布。"
@@ -2455,70 +2455,79 @@ msgstr "位置"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "你的位置,格式类似\"城市,省份,国家\""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr "标签"
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr "你的标签 (字母letters, 数字numbers, -, ., 和 _), 以逗号或空格分隔"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr "语言"
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr "首选语言"
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr "时区"
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr "您一般处于哪个时区?"
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器人)"
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "自述过长(不能超过140字符)。"
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr "未选择时区。"
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr "语言过长(不能超过50个字符)。"
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, fuzzy, php-format
msgid "Invalid tag: \"%s\""
msgstr "主页'%s'不正确"
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr "无法更新用户的自动订阅选项。"
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "无法保存个人信息。"
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "无法保存个人信息。"
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
#, fuzzy
msgid "Couldn't save tags."
msgstr "无法保存个人信息。"
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "设置已保存。"
@@ -2755,7 +2764,7 @@ msgstr "验证码出错。"
msgid "Registration successful"
msgstr "注册成功。"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "注册"
@@ -4086,16 +4095,16 @@ msgstr "你在短时间里发布了过多的消息,请深呼吸,过几分钟
msgid "You are banned from posting notices on this site."
msgstr "在这个网站你被禁止发布消息。"
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr "保存通告时出错。"
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "添加回复时数据库出错:%s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -4152,137 +4161,137 @@ msgstr "%s (%s)"
msgid "Untitled page"
msgstr "无标题页"
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr "主站导航"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "主页"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr "个人资料及朋友年表"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Account"
msgstr "帐号"
-#: lib/action.php:433
+#: lib/action.php:434
#, fuzzy
msgid "Change your email, avatar, password, profile"
msgstr "修改资料"
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "连接"
-#: lib/action.php:436
+#: lib/action.php:437
#, fuzzy
msgid "Connect to services"
msgstr "无法重定向到服务器:%s"
-#: lib/action.php:440
+#: lib/action.php:441
#, fuzzy
msgid "Change site configuration"
msgstr "主站导航"
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr "邀请"
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, fuzzy, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "使用这个表单来邀请好友和同事加入。"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "登出"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr "登出本站"
-#: lib/action.php:455
+#: lib/action.php:456
#, fuzzy
msgid "Create an account"
msgstr "创建新帐号"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr "登入本站"
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "帮助"
-#: lib/action.php:461
+#: lib/action.php:462
#, fuzzy
msgid "Help me!"
msgstr "帮助"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr "搜索"
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr "检索人或文字"
-#: lib/action.php:485
+#: lib/action.php:486
#, fuzzy
msgid "Site notice"
msgstr "新通告"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr "本地显示"
-#: lib/action.php:617
+#: lib/action.php:618
#, fuzzy
msgid "Page notice"
msgstr "新通告"
-#: lib/action.php:719
+#: lib/action.php:720
#, fuzzy
msgid "Secondary site navigation"
msgstr "次项站导航"
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "关于"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "常见问题FAQ"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr "隐私"
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr "来源"
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "联系人"
-#: lib/action.php:741
+#: lib/action.php:742
#, fuzzy
msgid "Badge"
msgstr "呼叫"
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr "StatusNet软件注册证"
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4291,12 +4300,12 @@ msgstr ""
"**%%site.name%%** 是一个微博客服务,提供者为 [%%site.broughtby%%](%%site."
"broughtbyurl%%)。"
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** 是一个微博客服务。"
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4307,34 +4316,34 @@ msgstr ""
"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)"
"授权。"
-#: lib/action.php:790
+#: lib/action.php:791
#, fuzzy
msgid "Site content license"
msgstr "StatusNet软件注册证"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr "全部"
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr "注册证"
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr "分页"
-#: lib/action.php:1107
+#: lib/action.php:1108
#, fuzzy
msgid "After"
msgstr "« 之后"
-#: lib/action.php:1115
+#: lib/action.php:1116
#, fuzzy
msgid "Before"
msgstr "之前 »"
-#: lib/action.php:1163
+#: lib/action.php:1164
#, fuzzy
msgid "There was a problem with your session token."
msgstr "会话标识有问题,请重试。"
@@ -5182,6 +5191,14 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index 95e296d04..fc38ad1fa 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 09:42+0000\n"
-"PO-Revision-Date: 2009-12-28 08:11:35+0000\n"
+"POT-Creation-Date: 2009-12-30 19:06+0000\n"
+"PO-Revision-Date: 2009-12-30 19:07:56+0000\n"
"Language-Team: Traditional Chinese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60437); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r60512); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hant\n"
"X-Message-Group: out-statusnet\n"
@@ -192,11 +192,11 @@ msgstr "無法更新使用者"
msgid "You cannot block yourself!"
msgstr "無法更新使用者"
-#: actions/apiblockcreate.php:119
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr ""
-#: actions/apiblockdestroy.php:107
+#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
msgstr ""
@@ -311,31 +311,31 @@ msgid "Could not find target user."
msgstr "無法更新使用者"
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "暱稱請用小寫字母或數字,勿加空格。"
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "此暱稱已有人使用。再試試看別的吧。"
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr ""
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "個人首頁位址錯誤"
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "全名過長(最多255字元)"
@@ -346,7 +346,7 @@ msgid "Description is too long (max %d chars)."
msgstr "自我介紹過長(共140個字元)"
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "地點過長(共255個字)"
@@ -466,7 +466,7 @@ msgstr ""
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:191
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -611,13 +611,13 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:46 actions/tagother.php:166
@@ -692,7 +692,7 @@ msgstr ""
msgid "Block this user"
msgstr "無此使用者"
-#: actions/block.php:162
+#: actions/block.php:167
msgid "Failed to save block information."
msgstr ""
@@ -768,7 +768,7 @@ msgstr ""
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "無法更新使用者"
@@ -975,7 +975,7 @@ msgstr ""
#: actions/designadminpanel.php:586 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:167
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
#: actions/siteadminpanel.php:388 actions/smssettings.php:181
#: actions/subscriptions.php:203 actions/tagother.php:154
#: actions/useradminpanel.php:313 lib/designsettings.php:256
@@ -1474,7 +1474,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1563,7 +1563,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr ""
-#: actions/groupunblock.php:128 actions/unblock.php:77
+#: actions/groupunblock.php:128 actions/unblock.php:86
#, fuzzy
msgid "Error removing the block."
msgstr "儲存使用者發生錯誤"
@@ -1832,7 +1832,7 @@ msgstr "使用者名稱或密碼錯誤"
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:459
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "登入"
@@ -1939,7 +1939,7 @@ msgstr ""
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:250 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
msgstr ""
@@ -1947,7 +1947,7 @@ msgstr ""
msgid "New notice"
msgstr "新訊息"
-#: actions/newnotice.php:216
+#: actions/newnotice.php:211
msgid "Notice posted"
msgstr ""
@@ -2375,70 +2375,79 @@ msgstr "地點"
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
msgstr ""
-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
msgid "Language"
msgstr ""
-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152
msgid "Preferred language"
msgstr ""
-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161
msgid "Timezone"
msgstr ""
-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
msgstr ""
-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:221 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:223
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "自我介紹過長(共140個字元)"
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
msgid "Timezone not selected."
msgstr ""
-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
msgstr ""
-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178
#, fuzzy, php-format
msgid "Invalid tag: \"%s\""
msgstr "個人首頁連結%s無效"
-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:354
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "無法儲存個人資料"
+
+#: actions/profilesettings.php:366
msgid "Couldn't save profile."
msgstr "無法儲存個人資料"
-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:374
#, fuzzy
msgid "Couldn't save tags."
msgstr "無法儲存個人資料"
-#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr ""
@@ -2669,7 +2678,7 @@ msgstr "確認碼發生錯誤"
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: actions/register.php:114 actions/register.php:502 lib/action.php:456
#: lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -3940,16 +3949,16 @@ msgstr ""
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:319 classes/Notice.php:344
+#: classes/Notice.php:309 classes/Notice.php:334
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1044
+#: classes/Notice.php:1034
#, php-format
msgid "DB error inserting reply: %s"
msgstr "增加回覆時,資料庫發生錯誤: %s"
-#: classes/Notice.php:1371
+#: classes/Notice.php:1361
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4008,134 +4017,134 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:425
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Home"
msgstr "主頁"
-#: lib/action.php:431
+#: lib/action.php:432
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:434
#, fuzzy
msgid "Account"
msgstr "關於"
-#: lib/action.php:433
+#: lib/action.php:434
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:436
+#: lib/action.php:437
msgid "Connect"
msgstr "連結"
-#: lib/action.php:436
+#: lib/action.php:437
#, fuzzy
msgid "Connect to services"
msgstr "無法連結到伺服器:%s"
-#: lib/action.php:440
+#: lib/action.php:441
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:444 lib/subgroupnav.php:105
+#: lib/action.php:445 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:445 lib/subgroupnav.php:106
+#: lib/action.php:446 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout"
msgstr "登出"
-#: lib/action.php:450
+#: lib/action.php:451
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:455
+#: lib/action.php:456
#, fuzzy
msgid "Create an account"
msgstr "新增帳號"
-#: lib/action.php:458
+#: lib/action.php:459
msgid "Login to the site"
msgstr ""
-#: lib/action.php:461 lib/action.php:724
+#: lib/action.php:462 lib/action.php:725
msgid "Help"
msgstr "求救"
-#: lib/action.php:461
+#: lib/action.php:462
#, fuzzy
msgid "Help me!"
msgstr "求救"
-#: lib/action.php:464 lib/searchaction.php:127
+#: lib/action.php:465 lib/searchaction.php:127
msgid "Search"
msgstr ""
-#: lib/action.php:464
+#: lib/action.php:465
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:485
+#: lib/action.php:486
#, fuzzy
msgid "Site notice"
msgstr "新訊息"
-#: lib/action.php:551
+#: lib/action.php:552
msgid "Local views"
msgstr ""
-#: lib/action.php:617
+#: lib/action.php:618
#, fuzzy
msgid "Page notice"
msgstr "新訊息"
-#: lib/action.php:719
+#: lib/action.php:720
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:726
+#: lib/action.php:727
msgid "About"
msgstr "關於"
-#: lib/action.php:728
+#: lib/action.php:729
msgid "FAQ"
msgstr "常見問題"
-#: lib/action.php:732
+#: lib/action.php:733
msgid "TOS"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:736
msgid "Privacy"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:738
msgid "Source"
msgstr ""
-#: lib/action.php:739
+#: lib/action.php:740
msgid "Contact"
msgstr "好友名單"
-#: lib/action.php:741
+#: lib/action.php:742
msgid "Badge"
msgstr ""
-#: lib/action.php:769
+#: lib/action.php:770
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:772
+#: lib/action.php:773
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4144,12 +4153,12 @@ msgstr ""
"**%%site.name%%**是由[%%site.broughtby%%](%%site.broughtbyurl%%)所提供的微型"
"部落格服務"
-#: lib/action.php:774
+#: lib/action.php:775
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%**是個微型部落格"
-#: lib/action.php:776
+#: lib/action.php:777
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4157,33 +4166,33 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:790
+#: lib/action.php:791
#, fuzzy
msgid "Site content license"
msgstr "新訊息"
-#: lib/action.php:799
+#: lib/action.php:800
msgid "All "
msgstr ""
-#: lib/action.php:804
+#: lib/action.php:805
msgid "license."
msgstr ""
-#: lib/action.php:1098
+#: lib/action.php:1099
msgid "Pagination"
msgstr ""
-#: lib/action.php:1107
+#: lib/action.php:1108
msgid "After"
msgstr ""
-#: lib/action.php:1115
+#: lib/action.php:1116
#, fuzzy
msgid "Before"
msgstr "之前的內容»"
-#: lib/action.php:1163
+#: lib/action.php:1164
msgid "There was a problem with your session token."
msgstr ""
@@ -5005,6 +5014,14 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:225
+msgid "Share your location "
+msgstr ""
+
+#: lib/noticeform.php:226
+msgid "Finding your location..."
+msgstr ""
+
#: lib/noticelist.php:420
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
diff --git a/plugins/CasAuthentication/CasAuthenticationPlugin.php b/plugins/CasAuthentication/CasAuthenticationPlugin.php
index 428aafb02..8b6ef5462 100644
--- a/plugins/CasAuthentication/CasAuthenticationPlugin.php
+++ b/plugins/CasAuthentication/CasAuthenticationPlugin.php
@@ -34,6 +34,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
// We bundle the phpCAS library...
set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/CAS');
+require_once INSTALLDIR.'/plugins/Authentication/AuthenticationPlugin.php';
class CasAuthenticationPlugin extends AuthenticationPlugin
{
public $server;
diff --git a/scripts/triminboxes.php b/scripts/triminboxes.php
index da09817e5..ea4751305 100644
--- a/scripts/triminboxes.php
+++ b/scripts/triminboxes.php
@@ -21,19 +21,21 @@
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
$shortoptions = 'u::';
-$longoptions = array('start-user-id::');
+$longoptions = array('start-user-id=', 'sleep-time=');
$helptext = <<<END_OF_TRIM_HELP
Batch script for trimming notice inboxes to a reasonable size.
-u <id>
--start-user-id=<id> User ID to start after. Default is all.
+ --sleep-time=<integer> Amount of time to wait (in seconds) between trims. Default is zero.
END_OF_TRIM_HELP;
require_once INSTALLDIR.'/scripts/commandline.inc';
$id = null;
+$sleep_time = 0;
if (have_option('u')) {
$id = get_option_value('u');
@@ -43,6 +45,12 @@ if (have_option('u')) {
$id = null;
}
+if (have_option('--sleep-time')) {
+ $sleep_time = intval(get_option_value('--sleep-time'));
+}
+
+$quiet = have_option('q') || have_option('--quiet');
+
$user = new User();
if (!empty($id)) {
@@ -52,5 +60,17 @@ if (!empty($id)) {
$cnt = $user->find();
while ($user->fetch()) {
- Notice_inbox::gc($user->id);
+ if (!$quiet) {
+ print "Trimming inbox for user $user->id";
+ }
+ $count = Notice_inbox::gc($user->id);
+ if ($count) {
+ if (!$quiet) {
+ print ": $count trimmed...";
+ }
+ sleep($sleep_time);
+ }
+ if (!$quiet) {
+ print "\n";
+ }
}
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 29c7ee963..d6a50ac60 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -566,6 +566,21 @@ overflow:auto;
float:right;
font-size:0.8em;
}
+.form_notice #notice_data-location_wrap input {
+margin-right:7px;
+float:left;
+}
+.form_notice #notice_data-location_wrap label {
+font-weight:normal;
+font-size:1em;
+}
+.form_notice #notice_data-location_name {
+display:block;
+line-height:1.6;
+}
+.form_notice span#notice_data-location_name {
+padding-left:18px;
+}
button.close {
width:16px;
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index e86ee2437..78a0707ce 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -111,6 +111,10 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
text-shadow:none;
}
+.form_notice #notice_data-location_name {
+background-position:0 47%;
+}
+
a,
.form_settings input.form_action-primary,
.notice-options input,