diff options
author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-07 10:44:28 +0100 |
---|---|---|
committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-07 10:44:28 +0100 |
commit | 5788d36c8d1e9869d8a645293805e3b0265ea238 (patch) | |
tree | 80045c0eb1687652f956b3bdaccb1c765893d2e1 /l10n/templates/core.pot | |
parent | 84f3c8b6cc1060203d807ee65545478ce34f93c4 (diff) | |
parent | 35bd7a400d30fb27703d4fa02b107f9629845b7d (diff) | |
download | nextcloud-server-5788d36c8d1e9869d8a645293805e3b0265ea238.tar.gz nextcloud-server-5788d36c8d1e9869d8a645293805e3b0265ea238.zip |
Merge branch 'master' into fixing-1354-master
Conflicts:
settings/admin.php
settings/templates/admin.php
Diffstat (limited to 'l10n/templates/core.pot')
-rw-r--r-- | l10n/templates/core.pot | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 6f663178aa4..7d0512dba9f 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-05 00:19+0100\n" +"POT-Creation-Date: 2013-02-07 00:07+0100\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" @@ -570,6 +570,10 @@ msgstr "" msgid "Log in" msgstr "" +#: templates/login.php:49 +msgid "Alternative Logins" +msgstr "" + #: templates/part.pagenavi.php:3 msgid "prev" msgstr "" |