mirror of
https://github.com/friendica/friendica
synced 2024-11-10 14:22:54 +00:00
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
This commit is contained in:
root
commit
dda4ab3381
2 changed files with 54 additions and 54 deletions
2
boot.php
2
boot.php
|
|
@ -11,7 +11,7 @@ require_once('include/cache.php');
|
|||
require_once('library/Mobile_Detect/Mobile_Detect.php');
|
||||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '3.0.1427' );
|
||||
define ( 'FRIENDICA_VERSION', '3.0.1429' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1154 );
|
||||
|
||||
|
|
|
|||
106
util/messages.po
106
util/messages.po
|
|
@ -6,9 +6,9 @@
|
|||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: 3.0.1427\n"
|
||||
"Project-Id-Version: 3.0.1429\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2012-08-06 10:00-0700\n"
|
||||
"POT-Creation-Date: 2012-08-08 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"
|
||||
|
|
@ -232,7 +232,7 @@ msgid "link to source"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131
|
||||
#: ../../include/nav.php:52 ../../boot.php:1635
|
||||
#: ../../include/nav.php:52 ../../boot.php:1645
|
||||
msgid "Events"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -288,7 +288,7 @@ msgstr ""
|
|||
|
||||
#: ../../mod/events.php:432 ../../mod/directory.php:132
|
||||
#: ../../include/event.php:40 ../../include/bb2diaspora.php:447
|
||||
#: ../../boot.php:1187
|
||||
#: ../../boot.php:1197
|
||||
msgid "Location:"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -370,7 +370,7 @@ msgstr ""
|
|||
msgid "No"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:46 ../../boot.php:1628
|
||||
#: ../../mod/photos.php:46 ../../boot.php:1638
|
||||
msgid "Photo Albums"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -594,7 +594,7 @@ msgstr ""
|
|||
|
||||
#: ../../mod/photos.php:1324 ../../mod/photos.php:1365
|
||||
#: ../../mod/photos.php:1397 ../../mod/content.php:690
|
||||
#: ../../include/conversation.php:695 ../../boot.php:570
|
||||
#: ../../include/conversation.php:695 ../../boot.php:580
|
||||
msgid "Comment"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1251,7 +1251,7 @@ msgid "is interested in:"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/match.php:58 ../../mod/suggest.php:59
|
||||
#: ../../include/contact_widgets.php:9 ../../boot.php:1131
|
||||
#: ../../include/contact_widgets.php:9 ../../boot.php:1141
|
||||
msgid "Connect"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1311,7 +1311,7 @@ msgstr[1] ""
|
|||
#: ../../mod/content.php:587 ../../addon/page/page.php:76
|
||||
#: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119
|
||||
#: ../../include/contact_widgets.php:188 ../../include/conversation.php:592
|
||||
#: ../../boot.php:571
|
||||
#: ../../boot.php:581
|
||||
msgid "show more"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1914,7 +1914,7 @@ msgstr ""
|
|||
#: ../../addon/facebook/facebook.php:1200
|
||||
#: ../../addon/public_server/public_server.php:62
|
||||
#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3214
|
||||
#: ../../boot.php:780
|
||||
#: ../../boot.php:790
|
||||
msgid "Administrator"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1924,7 +1924,7 @@ msgid ""
|
|||
"Password reset failed."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/lostpass.php:83 ../../boot.php:913
|
||||
#: ../../mod/lostpass.php:83 ../../boot.php:923
|
||||
msgid "Password Reset"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2592,7 +2592,7 @@ msgstr ""
|
|||
msgid "Invalid contact."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/notes.php:44 ../../boot.php:1642
|
||||
#: ../../mod/notes.php:44 ../../boot.php:1652
|
||||
msgid "Personal Notes"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2845,7 +2845,7 @@ msgstr ""
|
|||
|
||||
#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128
|
||||
#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
|
||||
#: ../../include/nav.php:50 ../../boot.php:1618
|
||||
#: ../../include/nav.php:50 ../../boot.php:1628
|
||||
msgid "Profile"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2949,7 +2949,7 @@ msgstr ""
|
|||
msgid "Choose a nickname: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:879
|
||||
#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:889
|
||||
msgid "Register"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2992,7 +2992,7 @@ msgid "Access denied."
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
|
||||
#: ../../include/nav.php:51 ../../boot.php:1625
|
||||
#: ../../include/nav.php:51 ../../boot.php:1635
|
||||
msgid "Photos"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3803,7 +3803,7 @@ msgstr ""
|
|||
msgid "FTP Password"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/profile.php:21 ../../boot.php:1044
|
||||
#: ../../mod/profile.php:21 ../../boot.php:1054
|
||||
msgid "Requested profile is not available."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -4198,23 +4198,23 @@ msgstr ""
|
|||
msgid "Edit/Manage Profiles"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/profiles.php:673 ../../boot.php:1153
|
||||
#: ../../mod/profiles.php:673 ../../boot.php:1163
|
||||
msgid "Change profile photo"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/profiles.php:674 ../../boot.php:1154
|
||||
#: ../../mod/profiles.php:674 ../../boot.php:1164
|
||||
msgid "Create New Profile"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/profiles.php:685 ../../boot.php:1164
|
||||
#: ../../mod/profiles.php:685 ../../boot.php:1174
|
||||
msgid "Profile Image"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/profiles.php:687 ../../boot.php:1167
|
||||
#: ../../mod/profiles.php:687 ../../boot.php:1177
|
||||
msgid "visible to everybody"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/profiles.php:688 ../../boot.php:1168
|
||||
#: ../../mod/profiles.php:688 ../../boot.php:1178
|
||||
msgid "Edit visibility"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -4343,17 +4343,17 @@ msgid "Gender: "
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/directory.php:134 ../../include/profile_advanced.php:17
|
||||
#: ../../boot.php:1189
|
||||
#: ../../boot.php:1199
|
||||
msgid "Gender:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/directory.php:136 ../../include/profile_advanced.php:37
|
||||
#: ../../boot.php:1192
|
||||
#: ../../boot.php:1202
|
||||
msgid "Status:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/directory.php:138 ../../include/profile_advanced.php:48
|
||||
#: ../../boot.php:1194
|
||||
#: ../../boot.php:1204
|
||||
msgid "Homepage:"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -5111,7 +5111,7 @@ msgstr ""
|
|||
#: ../../addon/communityhome/communityhome.php:34
|
||||
#: ../../addon/communityhome/twillingham/communityhome.php:28
|
||||
#: ../../addon/communityhome/twillingham/communityhome.php:34
|
||||
#: ../../include/nav.php:64 ../../boot.php:900
|
||||
#: ../../include/nav.php:64 ../../boot.php:910
|
||||
msgid "Login"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -7504,11 +7504,11 @@ msgstr ""
|
|||
msgid "view full size"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/oembed.php:135
|
||||
#: ../../include/oembed.php:137
|
||||
msgid "Embedded content"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/oembed.php:144
|
||||
#: ../../include/oembed.php:146
|
||||
msgid "Embedding disabled"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -7547,7 +7547,7 @@ msgstr ""
|
|||
msgid "Contacts not in any group"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/nav.php:46 ../../boot.php:899
|
||||
#: ../../include/nav.php:46 ../../boot.php:909
|
||||
msgid "Logout"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -7555,7 +7555,7 @@ msgstr ""
|
|||
msgid "End this session"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/nav.php:49 ../../boot.php:1611
|
||||
#: ../../include/nav.php:49 ../../boot.php:1621
|
||||
msgid "Status"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -7635,11 +7635,11 @@ msgstr ""
|
|||
msgid "Manage other pages"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/nav.php:138 ../../boot.php:1147
|
||||
#: ../../include/nav.php:138 ../../boot.php:1157
|
||||
msgid "Profiles"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/nav.php:138 ../../boot.php:1147
|
||||
#: ../../include/nav.php:138 ../../boot.php:1157
|
||||
msgid "Manage/edit profiles"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -8322,96 +8322,96 @@ msgstr ""
|
|||
msgid "This action is not available under your subscription plan."
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:569
|
||||
#: ../../boot.php:579
|
||||
msgid "Delete this item?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:572
|
||||
#: ../../boot.php:582
|
||||
msgid "show fewer"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:775
|
||||
#: ../../boot.php:785
|
||||
#, php-format
|
||||
msgid "Update %s failed. See error logs."
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:777
|
||||
#: ../../boot.php:787
|
||||
#, php-format
|
||||
msgid "Update Error at %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:878
|
||||
#: ../../boot.php:888
|
||||
msgid "Create a New Account"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:902
|
||||
#: ../../boot.php:912
|
||||
msgid "Nickname or Email address: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:903
|
||||
#: ../../boot.php:913
|
||||
msgid "Password: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:906
|
||||
#: ../../boot.php:916
|
||||
msgid "Or login using OpenID: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:912
|
||||
#: ../../boot.php:922
|
||||
msgid "Forgot your password?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1079
|
||||
#: ../../boot.php:1089
|
||||
msgid "Edit profile"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1139
|
||||
#: ../../boot.php:1149
|
||||
msgid "Message"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1261 ../../boot.php:1347
|
||||
#: ../../boot.php:1271 ../../boot.php:1357
|
||||
msgid "g A l F d"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1262 ../../boot.php:1348
|
||||
#: ../../boot.php:1272 ../../boot.php:1358
|
||||
msgid "F d"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1307 ../../boot.php:1388
|
||||
#: ../../boot.php:1317 ../../boot.php:1398
|
||||
msgid "[today]"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1319
|
||||
#: ../../boot.php:1329
|
||||
msgid "Birthday Reminders"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1320
|
||||
#: ../../boot.php:1330
|
||||
msgid "Birthdays this week:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1381
|
||||
#: ../../boot.php:1391
|
||||
msgid "[No description]"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1399
|
||||
#: ../../boot.php:1409
|
||||
msgid "Event Reminders"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1400
|
||||
#: ../../boot.php:1410
|
||||
msgid "Events this week:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1614
|
||||
#: ../../boot.php:1624
|
||||
msgid "Status Messages and Posts"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1621
|
||||
#: ../../boot.php:1631
|
||||
msgid "Profile Details"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1638
|
||||
#: ../../boot.php:1648
|
||||
msgid "Events and Calendar"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1645
|
||||
#: ../../boot.php:1655
|
||||
msgid "Only You Can See This"
|
||||
msgstr ""
|
||||
|
|
|
|||
Loading…
Reference in a new issue