diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-03 00:25:56 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-03 00:25:56 -0400 |
| commit | 0446766f0407b45c78031ad9e5029cc9218b025e (patch) | |
| tree | 030c81fee9826ce80c0bd488f06fd469d2a6afa9 /util/messages.po | |
| parent | 02dc116a9c646ea5683b8df199a7ff492ae6cfcb (diff) | |
| parent | ff2ddc319d4307e56a1bf48f51f8f948fe0736ca (diff) | |
| download | volse-hubzilla-0446766f0407b45c78031ad9e5029cc9218b025e.tar.gz volse-hubzilla-0446766f0407b45c78031ad9e5029cc9218b025e.tar.bz2 volse-hubzilla-0446766f0407b45c78031ad9e5029cc9218b025e.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
diabook-theme: small fix
diabook-theme: made boxes at right_aside sortable
use cid rather than uid in perms
Modify events_post() in mod/events.php to set the `private` field to true when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others.
use mysql replace on cache items
fixing common friends
rev update
Moved Meta Viewport from global head.tpl to diabook's header
* master:
Diffstat (limited to 'util/messages.po')
| -rw-r--r-- | util/messages.po | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/util/messages.po b/util/messages.po index f5612882c..3314eb58d 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1329\n" +"Project-Id-Version: 2.3.1330\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-01 10:00-0700\n" +"POT-Creation-Date: 2012-05-02 10:00-0700\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" @@ -3584,7 +3584,7 @@ msgstr "" msgid "Access to this profile has been restricted." msgstr "" -#: ../../mod/profile.php:147 +#: ../../mod/profile.php:151 msgid "Tips for New Members" msgstr "" @@ -3783,7 +3783,7 @@ msgstr "" #: ../../mod/profiles.php:331 #, php-format -msgid "%1$s changed %2$s to %3$s" +msgid "%1$s changed %2$s to \"%3$s\"" msgstr "" #: ../../mod/profiles.php:332 @@ -6431,6 +6431,13 @@ msgstr "" msgid "Categories" msgstr "" +#: ../../include/contact_widgets.php:183 +#, php-format +msgid "%d friend in common" +msgid_plural "%d friends in common" +msgstr[0] "" +msgstr[1] "" + #: ../../include/auth.php:29 msgid "Logged out." msgstr "" |