diff options
author | Brion Vibber <brion@pobox.com> | 2010-10-25 13:08:57 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-10-25 13:08:57 -0700 |
commit | ca489631db840e33757a71a7e4cb56b187c182d3 (patch) | |
tree | 92c71b81b6870a8fd2d9c94bed8571b653d95413 /plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po | |
parent | 90c87553ee7566593529199374215ae80bb3e209 (diff) | |
parent | 01637bcd32921d6857fb7f5c0bbd40fba6bdb830 (diff) |
Merge branch '0.9.x' into 1.0.x
Conflicts:
actions/subscriptions.php
lib/router.php
lib/xmppmanager.php
lib/xmppoutqueuehandler.php
Diffstat (limited to 'plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po')
-rw-r--r-- | plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po index 07d0419fa..00114e708 100644 --- a/plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po +++ b/plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po @@ -9,18 +9,18 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet - CacheLog\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-03 19:53+0000\n" -"PO-Revision-Date: 2010-10-03 19:56:28+0000\n" +"POT-Creation-Date: 2010-10-23 18:02+0000\n" +"PO-Revision-Date: 2010-10-23 18:04:45+0000\n" "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-POT-Import-Date: 2010-09-27 23:18:16+0000\n" -"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n" +"X-POT-Import-Date: 2010-10-09 14:33:29+0000\n" +"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: #out-statusnet-plugin-cachelog\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: CacheLogPlugin.php:116 +#: CacheLogPlugin.php:106 msgid "Log reads and writes to the cache." msgstr "Registra lecturas y escrituras en el caché" |