diff options
| author | friendica <info@friendica.com> | 2013-04-16 20:16:44 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-04-16 20:16:44 -0700 |
| commit | f72d3512242d13fbba69b77a739319a9cd58627c (patch) | |
| tree | d59c8904fda78b04ee19e42343d8c7ca56c67a5f /util | |
| parent | 3e7e0a3c43ddb742a6518a3b38b89e3d9675eae5 (diff) | |
| parent | 23f897b8aedac8a99aa81ac7799ec67ca196d407 (diff) | |
| download | volse-hubzilla-f72d3512242d13fbba69b77a739319a9cd58627c.tar.gz volse-hubzilla-f72d3512242d13fbba69b77a739319a9cd58627c.tar.bz2 volse-hubzilla-f72d3512242d13fbba69b77a739319a9cd58627c.zip | |
Merge branch 'master' into photothread
Diffstat (limited to 'util')
| -rw-r--r-- | util/messages.po | 8 | ||||
| -rwxr-xr-x | util/run_xgettext.sh | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/util/messages.po b/util/messages.po index 06db522bc..449751f57 100644 --- a/util/messages.po +++ b/util/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-05 00:01-0700\n" +"POT-Creation-Date: 2013-04-12 00: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" @@ -3546,7 +3546,7 @@ msgid "View Connnections" msgstr "" #: ../../mod/chanview.php:74 ../../mod/wall_upload.php:35 -#: ../../mod/magic.php:59 ../../mod/page.php:21 +#: ../../mod/magic.php:58 ../../mod/page.php:21 msgid "Channel not found." msgstr "" @@ -3592,13 +3592,13 @@ msgstr "" msgid "Wall Photos" msgstr "" -#: ../../mod/post.php:107 +#: ../../mod/post.php:114 msgid "" "Remote authentication blocked. You are logged into this site locally. Please " "logout and retry." msgstr "" -#: ../../mod/post.php:117 +#: ../../mod/post.php:124 #, php-format msgid "Welcome %s. Remote authentication successful." msgstr "" diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh index 891c04657..997446818 100755 --- a/util/run_xgettext.sh +++ b/util/run_xgettext.sh @@ -28,7 +28,7 @@ else fi -F9KVERSION=$(sed -n "s/.*'FRIENDICA_VERSION'.*'\([0-9.]*\)'.*/\1/p" ../../boot.php); +F9KVERSION=$(sed -n "s/.*'RED_VERSION'.*'\([0-9.]*\)'.*/\1/p" ../../boot.php); echo "Friendica version $F9KVERSION" |