1
0
Fork 0

Merge pull request #6737 from MrPetovan/bug/6630-fix-empty-label-profile

Fix "EMPTY" label in profile
This commit is contained in:
Michael Vogel 2019-02-24 06:34:48 +01:00 committed by GitHub
commit 9f11476ca0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 184 additions and 171 deletions

View file

@ -338,7 +338,7 @@ function profiles_post(App $a) {
$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0); $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
PConfig::set(local_user(), 'system', 'detailled_profile', (($_POST['detailled_profile'] == 1) ? 1: 0)); PConfig::set(local_user(), 'system', 'detailled_profile', (($_POST['detailed_profile'] == 1) ? 1: 0));
$changes = []; $changes = [];
if ($is_default) { if ($is_default) {
@ -535,18 +535,18 @@ function profiles_content(App $a) {
$personal_account = !(in_array($a->user["page-flags"], $personal_account = !(in_array($a->user["page-flags"],
[User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP])); [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP]));
$detailled_profile = (PConfig::get(local_user(), 'system', 'detailled_profile') AND $personal_account); $detailed_profile = (PConfig::get(local_user(), 'system', 'detailled_profile') AND $personal_account);
$is_default = (($r[0]['is-default']) ? 1 : 0); $is_default = (($r[0]['is-default']) ? 1 : 0);
$tpl = Renderer::getMarkupTemplate("profile_edit.tpl"); $tpl = Renderer::getMarkupTemplate("profile_edit.tpl");
$o .= Renderer::replaceMacros($tpl, [ $o .= Renderer::replaceMacros($tpl, [
'$personal_account' => $personal_account, '$personal_account' => $personal_account,
'$detailled_profile' => $detailled_profile, '$detailled_profile' => $detailed_profile,
'$details' => [ '$details' => [
'detailled_profile', //Name 'detailed_profile', //Name
L10n::t('Show more profile fields:'), //Label L10n::t('Show more profile fields:'), //Label
$detailled_profile, //Value $detailed_profile, //Value
'', //Help string '', //Help string
[L10n::t('No'), L10n::t('Yes')] //Off - On strings [L10n::t('No'), L10n::t('Yes')] //Off - On strings
], ],

View file

@ -150,7 +150,7 @@ class ContactSelector
{ {
$o = ''; $o = '';
$select = [ $select = [
'EMPTY' => '', '' => L10n::t('No answer'),
'Male' => L10n::t('Male'), 'Male' => L10n::t('Male'),
'Female' => L10n::t('Female'), 'Female' => L10n::t('Female'),
'Currently Male' => L10n::t('Currently Male'), 'Currently Male' => L10n::t('Currently Male'),
@ -190,7 +190,7 @@ class ContactSelector
{ {
$o = ''; $o = '';
$select = [ $select = [
'EMPTY' => '', '' => L10n::t('No answer'),
'Males' => L10n::t('Males'), 'Males' => L10n::t('Males'),
'Females' => L10n::t('Females'), 'Females' => L10n::t('Females'),
'Gay' => L10n::t('Gay'), 'Gay' => L10n::t('Gay'),
@ -228,7 +228,7 @@ class ContactSelector
{ {
$o = ''; $o = '';
$select = [ $select = [
'EMPTY' => '', '' => L10n::t('No answer'),
'Single' => L10n::t('Single'), 'Single' => L10n::t('Single'),
'Lonely' => L10n::t('Lonely'), 'Lonely' => L10n::t('Lonely'),
'Available' => L10n::t('Available'), 'Available' => L10n::t('Available'),

View file

@ -787,7 +787,7 @@ class Profile
$profile['marital']['with'] = $a->profile['with']; $profile['marital']['with'] = $a->profile['with'];
} }
if (strlen($a->profile['howlong']) && $a->profile['howlong'] >= DBA::NULL_DATETIME) { if (strlen($a->profile['howlong']) && $a->profile['howlong'] > DBA::NULL_DATETIME) {
$profile['howlong'] = Temporal::getRelativeDate($a->profile['howlong'], L10n::t('for %1$d %2$s')); $profile['howlong'] = Temporal::getRelativeDate($a->profile['howlong'], L10n::t('for %1$d %2$s'));
} }

View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-02-15 09:33-0500\n" "POT-Creation-Date: 2019-02-23 18:53-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,26 +18,26 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: include/api.php:1179 #: include/api.php:1117
#, php-format #, php-format
msgid "Daily posting limit of %d post reached. The post was rejected." msgid "Daily posting limit of %d post reached. The post was rejected."
msgid_plural "Daily posting limit of %d posts reached. The post was rejected." msgid_plural "Daily posting limit of %d posts reached. The post was rejected."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: include/api.php:1193 #: include/api.php:1131
#, php-format #, php-format
msgid "Weekly posting limit of %d post reached. The post was rejected." msgid "Weekly posting limit of %d post reached. The post was rejected."
msgid_plural "Weekly posting limit of %d posts reached. The post was rejected." msgid_plural "Weekly posting limit of %d posts reached. The post was rejected."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: include/api.php:1207 #: include/api.php:1145
#, php-format #, php-format
msgid "Monthly posting limit of %d post reached. The post was rejected." msgid "Monthly posting limit of %d post reached. The post was rejected."
msgstr "" msgstr ""
#: include/api.php:4578 mod/photos.php:93 mod/photos.php:201 mod/photos.php:695 #: include/api.php:4520 mod/photos.php:93 mod/photos.php:201 mod/photos.php:695
#: mod/photos.php:1126 mod/photos.php:1143 mod/photos.php:1636 #: mod/photos.php:1126 mod/photos.php:1143 mod/photos.php:1636
#: mod/profile_photo.php:85 mod/profile_photo.php:94 mod/profile_photo.php:103 #: mod/profile_photo.php:85 mod/profile_photo.php:94 mod/profile_photo.php:103
#: mod/profile_photo.php:217 mod/profile_photo.php:305 #: mod/profile_photo.php:217 mod/profile_photo.php:305
@ -134,7 +134,7 @@ msgstr ""
msgid "Might attend" msgid "Might attend"
msgstr "" msgstr ""
#: include/conversation.php:649 mod/photos.php:1524 src/Object/Post.php:207 #: include/conversation.php:649 mod/photos.php:1524 src/Object/Post.php:208
msgid "Select" msgid "Select"
msgstr "" msgstr ""
@ -143,20 +143,20 @@ msgstr ""
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
#: include/conversation.php:684 src/Object/Post.php:380 src/Object/Post.php:381 #: include/conversation.php:684 src/Object/Post.php:381 src/Object/Post.php:382
#, php-format #, php-format
msgid "View %s's profile @ %s" msgid "View %s's profile @ %s"
msgstr "" msgstr ""
#: include/conversation.php:696 src/Object/Post.php:368 #: include/conversation.php:696 src/Object/Post.php:369
msgid "Categories:" msgid "Categories:"
msgstr "" msgstr ""
#: include/conversation.php:697 src/Object/Post.php:369 #: include/conversation.php:697 src/Object/Post.php:370
msgid "Filed under:" msgid "Filed under:"
msgstr "" msgstr ""
#: include/conversation.php:704 src/Object/Post.php:394 #: include/conversation.php:704 src/Object/Post.php:395
#, php-format #, php-format
msgid "%s from %s" msgid "%s from %s"
msgstr "" msgstr ""
@ -167,7 +167,7 @@ msgstr ""
#: include/conversation.php:721 include/conversation.php:1171 #: include/conversation.php:721 include/conversation.php:1171
#: mod/editpost.php:88 mod/message.php:260 mod/message.php:442 #: mod/editpost.php:88 mod/message.php:260 mod/message.php:442
#: mod/photos.php:1440 mod/wallmessage.php:141 src/Object/Post.php:421 #: mod/photos.php:1440 mod/wallmessage.php:141 src/Object/Post.php:422
msgid "Please wait" msgid "Please wait"
msgstr "" msgstr ""
@ -188,7 +188,7 @@ msgid "View Status"
msgstr "" msgstr ""
#: include/conversation.php:895 include/conversation.php:911 #: include/conversation.php:895 include/conversation.php:911
#: mod/allfriends.php:72 mod/directory.php:167 mod/dirfind.php:226 #: mod/allfriends.php:72 mod/directory.php:198 mod/dirfind.php:226
#: mod/match.php:87 mod/suggest.php:87 src/Model/Contact.php:989 #: mod/match.php:87 mod/suggest.php:87 src/Model/Contact.php:989
#: src/Model/Contact.php:1042 src/Model/Contact.php:1050 #: src/Model/Contact.php:1042 src/Model/Contact.php:1050
msgid "View Profile" msgid "View Profile"
@ -311,7 +311,7 @@ msgstr ""
msgid "Visible to <strong>everybody</strong>" msgid "Visible to <strong>everybody</strong>"
msgstr "" msgstr ""
#: include/conversation.php:1111 src/Object/Post.php:883 #: include/conversation.php:1111 src/Object/Post.php:886
msgid "Please enter a image/video/audio/webpage URL:" msgid "Please enter a image/video/audio/webpage URL:"
msgstr "" msgstr ""
@ -356,35 +356,35 @@ msgstr ""
msgid "attach file" msgid "attach file"
msgstr "" msgstr ""
#: include/conversation.php:1155 src/Object/Post.php:875 #: include/conversation.php:1155 src/Object/Post.php:878
msgid "Bold" msgid "Bold"
msgstr "" msgstr ""
#: include/conversation.php:1156 src/Object/Post.php:876 #: include/conversation.php:1156 src/Object/Post.php:879
msgid "Italic" msgid "Italic"
msgstr "" msgstr ""
#: include/conversation.php:1157 src/Object/Post.php:877 #: include/conversation.php:1157 src/Object/Post.php:880
msgid "Underline" msgid "Underline"
msgstr "" msgstr ""
#: include/conversation.php:1158 src/Object/Post.php:878 #: include/conversation.php:1158 src/Object/Post.php:881
msgid "Quote" msgid "Quote"
msgstr "" msgstr ""
#: include/conversation.php:1159 src/Object/Post.php:879 #: include/conversation.php:1159 src/Object/Post.php:882
msgid "Code" msgid "Code"
msgstr "" msgstr ""
#: include/conversation.php:1160 src/Object/Post.php:880 #: include/conversation.php:1160 src/Object/Post.php:883
msgid "Image" msgid "Image"
msgstr "" msgstr ""
#: include/conversation.php:1161 src/Object/Post.php:881 #: include/conversation.php:1161 src/Object/Post.php:884
msgid "Link" msgid "Link"
msgstr "" msgstr ""
#: include/conversation.php:1162 src/Object/Post.php:882 #: include/conversation.php:1162 src/Object/Post.php:885
msgid "Link or Media" msgid "Link or Media"
msgstr "" msgstr ""
@ -426,7 +426,7 @@ msgstr ""
#: include/conversation.php:1186 mod/editpost.php:110 mod/events.php:551 #: include/conversation.php:1186 mod/editpost.php:110 mod/events.php:551
#: mod/photos.php:1458 mod/photos.php:1497 mod/photos.php:1557 #: mod/photos.php:1458 mod/photos.php:1497 mod/photos.php:1557
#: src/Object/Post.php:884 #: src/Object/Post.php:887
msgid "Preview" msgid "Preview"
msgstr "" msgstr ""
@ -837,7 +837,7 @@ msgstr ""
#: mod/unfollow.php:77 mod/unfollow.php:109 mod/viewcontacts.php:56 #: mod/unfollow.php:77 mod/unfollow.php:109 mod/viewcontacts.php:56
#: mod/wallmessage.php:19 mod/wallmessage.php:43 mod/wallmessage.php:82 #: mod/wallmessage.php:19 mod/wallmessage.php:43 mod/wallmessage.php:82
#: mod/wallmessage.php:106 mod/wall_attach.php:76 mod/wall_attach.php:79 #: mod/wallmessage.php:106 mod/wall_attach.php:76 mod/wall_attach.php:79
#: mod/wall_upload.php:107 mod/wall_upload.php:110 src/App.php:1480 #: mod/wall_upload.php:107 mod/wall_upload.php:110 src/App.php:1390
#: src/Module/Attach.php:42 src/Module/Contact.php:360 #: src/Module/Attach.php:42 src/Module/Contact.php:360
#: src/Module/Register.php:193 #: src/Module/Register.php:193
msgid "Permission denied." msgid "Permission denied."
@ -2875,7 +2875,7 @@ msgstr ""
msgid "No" msgid "No"
msgstr "" msgstr ""
#: mod/apps.php:15 src/App.php:1349 #: mod/apps.php:15 src/App.php:1259
msgid "You must be logged in to use addons. " msgid "You must be logged in to use addons. "
msgstr "" msgstr ""
@ -3009,7 +3009,7 @@ msgid "Access denied."
msgstr "" msgstr ""
#: mod/cal.php:46 mod/dfrn_poll.php:486 mod/help.php:68 mod/viewcontacts.php:34 #: mod/cal.php:46 mod/dfrn_poll.php:486 mod/help.php:68 mod/viewcontacts.php:34
#: src/App.php:1400 #: src/App.php:1310
msgid "Page not found." msgid "Page not found."
msgstr "" msgstr ""
@ -3185,7 +3185,7 @@ msgstr ""
#: mod/photos.php:1137 mod/photos.php:1412 mod/photos.php:1457 #: mod/photos.php:1137 mod/photos.php:1412 mod/photos.php:1457
#: mod/photos.php:1496 mod/photos.php:1556 mod/poke.php:188 #: mod/photos.php:1496 mod/photos.php:1556 mod/poke.php:188
#: mod/profiles.php:562 src/Module/Contact.php:594 src/Module/Install.php:187 #: mod/profiles.php:562 src/Module/Contact.php:594 src/Module/Install.php:187
#: src/Module/Install.php:222 src/Object/Post.php:874 #: src/Module/Install.php:222 src/Object/Post.php:877
#: view/theme/duepuntozero/config.php:72 view/theme/frio/config.php:119 #: view/theme/duepuntozero/config.php:72 view/theme/frio/config.php:119
#: view/theme/quattro/config.php:74 view/theme/vier/config.php:120 #: view/theme/quattro/config.php:74 view/theme/vier/config.php:120
msgid "Submit" msgid "Submit"
@ -3561,56 +3561,56 @@ msgstr ""
msgid "Submit Request" msgid "Submit Request"
msgstr "" msgstr ""
#: mod/directory.php:154 mod/events.php:541 mod/notifications.php:253 #: mod/directory.php:121
msgid "No entries (some entries may be hidden)."
msgstr ""
#: mod/directory.php:128 src/Content/Widget.php:70
#: view/theme/vier/theme.php:208
msgid "Global Directory"
msgstr ""
#: mod/directory.php:130
msgid "Find on this site"
msgstr ""
#: mod/directory.php:132
msgid "Results for:"
msgstr ""
#: mod/directory.php:134
msgid "Site Directory"
msgstr ""
#: mod/directory.php:136 src/Content/Widget.php:65 src/Module/Contact.php:817
#: view/theme/vier/theme.php:203
msgid "Find"
msgstr ""
#: mod/directory.php:185 mod/events.php:541 mod/notifications.php:253
#: src/Model/Event.php:68 src/Model/Event.php:95 src/Model/Event.php:437 #: src/Model/Event.php:68 src/Model/Event.php:95 src/Model/Event.php:437
#: src/Model/Event.php:933 src/Model/Profile.php:443 src/Module/Contact.php:643 #: src/Model/Event.php:933 src/Model/Profile.php:443 src/Module/Contact.php:643
msgid "Location:" msgid "Location:"
msgstr "" msgstr ""
#: mod/directory.php:159 mod/notifications.php:259 src/Model/Profile.php:446 #: mod/directory.php:190 mod/notifications.php:259 src/Model/Profile.php:446
#: src/Model/Profile.php:758 #: src/Model/Profile.php:758
msgid "Gender:" msgid "Gender:"
msgstr "" msgstr ""
#: mod/directory.php:160 src/Model/Profile.php:447 src/Model/Profile.php:782 #: mod/directory.php:191 src/Model/Profile.php:447 src/Model/Profile.php:782
msgid "Status:" msgid "Status:"
msgstr "" msgstr ""
#: mod/directory.php:161 src/Model/Profile.php:448 src/Model/Profile.php:799 #: mod/directory.php:192 src/Model/Profile.php:448 src/Model/Profile.php:799
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
#: mod/directory.php:162 mod/notifications.php:255 src/Model/Profile.php:449 #: mod/directory.php:193 mod/notifications.php:255 src/Model/Profile.php:449
#: src/Model/Profile.php:819 src/Module/Contact.php:647 #: src/Model/Profile.php:819 src/Module/Contact.php:647
msgid "About:" msgid "About:"
msgstr "" msgstr ""
#: mod/directory.php:210 src/Content/Widget.php:70
#: view/theme/vier/theme.php:208
msgid "Global Directory"
msgstr ""
#: mod/directory.php:212
msgid "Find on this site"
msgstr ""
#: mod/directory.php:214
msgid "Results for:"
msgstr ""
#: mod/directory.php:216
msgid "Site Directory"
msgstr ""
#: mod/directory.php:217 src/Content/Widget.php:65 src/Module/Contact.php:817
#: view/theme/vier/theme.php:203
msgid "Find"
msgstr ""
#: mod/directory.php:221
msgid "No entries (some entries may be hidden)."
msgstr ""
#: mod/dirfind.php:55 #: mod/dirfind.php:55
#, php-format #, php-format
msgid "People Search - %s" msgid "People Search - %s"
@ -3747,8 +3747,8 @@ msgstr ""
#: mod/fbrowser.php:45 mod/fbrowser.php:69 mod/photos.php:201 #: mod/fbrowser.php:45 mod/fbrowser.php:69 mod/photos.php:201
#: mod/photos.php:1031 mod/photos.php:1126 mod/photos.php:1143 #: mod/photos.php:1031 mod/photos.php:1126 mod/photos.php:1143
#: mod/photos.php:1610 mod/photos.php:1625 src/Model/Photo.php:547 #: mod/photos.php:1610 mod/photos.php:1625 src/Model/Photo.php:552
#: src/Model/Photo.php:556 #: src/Model/Photo.php:561
msgid "Contact Photos" msgid "Contact Photos"
msgstr "" msgstr ""
@ -3874,7 +3874,7 @@ msgstr ""
msgid "Group name changed." msgid "Group name changed."
msgstr "" msgstr ""
#: mod/group.php:85 mod/profperm.php:30 src/App.php:1479 #: mod/group.php:85 mod/profperm.php:30 src/App.php:1389
msgid "Permission denied" msgid "Permission denied"
msgstr "" msgstr ""
@ -3951,7 +3951,7 @@ msgstr ""
msgid "Help" msgid "Help"
msgstr "" msgstr ""
#: mod/help.php:65 src/App.php:1397 #: mod/help.php:65 src/App.php:1307
msgid "Not Found" msgid "Not Found"
msgstr "" msgstr ""
@ -4873,7 +4873,7 @@ msgstr ""
msgid "failed" msgid "failed"
msgstr "" msgstr ""
#: mod/ostatus_subscribe.php:89 src/Object/Post.php:283 #: mod/ostatus_subscribe.php:89 src/Object/Post.php:284
msgid "ignored" msgid "ignored"
msgstr "" msgstr ""
@ -5030,7 +5030,7 @@ msgstr ""
msgid "Use as profile photo" msgid "Use as profile photo"
msgstr "" msgstr ""
#: mod/photos.php:1297 src/Object/Post.php:156 #: mod/photos.php:1297 src/Object/Post.php:157
msgid "Private Message" msgid "Private Message"
msgstr "" msgstr ""
@ -5074,21 +5074,21 @@ msgstr ""
msgid "Rotate CCW (left)" msgid "Rotate CCW (left)"
msgstr "" msgstr ""
#: mod/photos.php:1438 src/Object/Post.php:311 #: mod/photos.php:1438 src/Object/Post.php:312
msgid "I like this (toggle)" msgid "I like this (toggle)"
msgstr "" msgstr ""
#: mod/photos.php:1439 src/Object/Post.php:312 #: mod/photos.php:1439 src/Object/Post.php:313
msgid "I don't like this (toggle)" msgid "I don't like this (toggle)"
msgstr "" msgstr ""
#: mod/photos.php:1454 mod/photos.php:1493 mod/photos.php:1553 #: mod/photos.php:1454 mod/photos.php:1493 mod/photos.php:1553
#: src/Module/Contact.php:1018 src/Object/Post.php:871 #: src/Module/Contact.php:1018 src/Object/Post.php:874
msgid "This is you" msgid "This is you"
msgstr "" msgstr ""
#: mod/photos.php:1456 mod/photos.php:1495 mod/photos.php:1555 #: mod/photos.php:1456 mod/photos.php:1495 mod/photos.php:1555
#: src/Object/Post.php:417 src/Object/Post.php:873 #: src/Object/Post.php:418 src/Object/Post.php:876
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
@ -5736,7 +5736,7 @@ msgstr ""
msgid "Connected Apps" msgid "Connected Apps"
msgstr "" msgstr ""
#: mod/settings.php:725 src/Object/Post.php:166 src/Object/Post.php:168 #: mod/settings.php:725 src/Object/Post.php:167 src/Object/Post.php:169
msgid "Edit" msgid "Edit"
msgstr "" msgstr ""
@ -6644,15 +6644,15 @@ msgstr ""
msgid "Wall Photos" msgid "Wall Photos"
msgstr "" msgstr ""
#: src/App.php:665 #: src/App.php:610
msgid "Delete this item?" msgid "Delete this item?"
msgstr "" msgstr ""
#: src/App.php:707 #: src/App.php:652
msgid "toggle mobile" msgid "toggle mobile"
msgstr "" msgstr ""
#: src/App.php:1075 #: src/App.php:985
msgid "No system theme config value set." msgid "No system theme config value set."
msgstr "" msgstr ""
@ -6742,6 +6742,11 @@ msgstr ""
msgid "pnut" msgid "pnut"
msgstr "" msgstr ""
#: src/Content/ContactSelector.php:153 src/Content/ContactSelector.php:193
#: src/Content/ContactSelector.php:231
msgid "No answer"
msgstr ""
#: src/Content/ContactSelector.php:154 #: src/Content/ContactSelector.php:154
msgid "Male" msgid "Male"
msgstr "" msgstr ""
@ -7562,29 +7567,29 @@ msgstr ""
msgid "All pending post updates are done." msgid "All pending post updates are done."
msgstr "" msgstr ""
#: src/Core/Installer.php:163 #: src/Core/Installer.php:164
msgid "" msgid ""
"The database configuration file \"config/local.config.php\" could not be " "The database configuration file \"config/local.config.php\" could not be "
"written. Please use the enclosed text to create a configuration file in your " "written. Please use the enclosed text to create a configuration file in your "
"web server root." "web server root."
msgstr "" msgstr ""
#: src/Core/Installer.php:182 #: src/Core/Installer.php:183
msgid "" msgid ""
"You may need to import the file \"database.sql\" manually using phpmyadmin " "You may need to import the file \"database.sql\" manually using phpmyadmin "
"or mysql." "or mysql."
msgstr "" msgstr ""
#: src/Core/Installer.php:183 src/Module/Install.php:132 #: src/Core/Installer.php:184 src/Module/Install.php:132
#: src/Module/Install.php:263 #: src/Module/Install.php:263
msgid "Please see the file \"INSTALL.txt\"." msgid "Please see the file \"INSTALL.txt\"."
msgstr "" msgstr ""
#: src/Core/Installer.php:244 #: src/Core/Installer.php:245
msgid "Could not find a command line version of PHP in the web server PATH." msgid "Could not find a command line version of PHP in the web server PATH."
msgstr "" msgstr ""
#: src/Core/Installer.php:245 #: src/Core/Installer.php:246
msgid "" msgid ""
"If you don't have a command line version of PHP installed on your server, " "If you don't have a command line version of PHP installed on your server, "
"you will not be able to run the background processing. See <a href='https://" "you will not be able to run the background processing. See <a href='https://"
@ -7592,237 +7597,245 @@ msgid ""
"worker'>'Setup the worker'</a>" "worker'>'Setup the worker'</a>"
msgstr "" msgstr ""
#: src/Core/Installer.php:249 #: src/Core/Installer.php:250
msgid "PHP executable path" msgid "PHP executable path"
msgstr "" msgstr ""
#: src/Core/Installer.php:249 #: src/Core/Installer.php:250
msgid "" msgid ""
"Enter full path to php executable. You can leave this blank to continue the " "Enter full path to php executable. You can leave this blank to continue the "
"installation." "installation."
msgstr "" msgstr ""
#: src/Core/Installer.php:254 #: src/Core/Installer.php:255
msgid "Command line PHP" msgid "Command line PHP"
msgstr "" msgstr ""
#: src/Core/Installer.php:263 #: src/Core/Installer.php:264
msgid "PHP executable is not the php cli binary (could be cgi-fgci version)" msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
msgstr "" msgstr ""
#: src/Core/Installer.php:264 #: src/Core/Installer.php:265
msgid "Found PHP version: " msgid "Found PHP version: "
msgstr "" msgstr ""
#: src/Core/Installer.php:266 #: src/Core/Installer.php:267
msgid "PHP cli binary" msgid "PHP cli binary"
msgstr "" msgstr ""
#: src/Core/Installer.php:279 #: src/Core/Installer.php:280
msgid "" msgid ""
"The command line version of PHP on your system does not have " "The command line version of PHP on your system does not have "
"\"register_argc_argv\" enabled." "\"register_argc_argv\" enabled."
msgstr "" msgstr ""
#: src/Core/Installer.php:280 #: src/Core/Installer.php:281
msgid "This is required for message delivery to work." msgid "This is required for message delivery to work."
msgstr "" msgstr ""
#: src/Core/Installer.php:285 #: src/Core/Installer.php:286
msgid "PHP register_argc_argv" msgid "PHP register_argc_argv"
msgstr "" msgstr ""
#: src/Core/Installer.php:317 #: src/Core/Installer.php:318
msgid "" msgid ""
"Error: the \"openssl_pkey_new\" function on this system is not able to " "Error: the \"openssl_pkey_new\" function on this system is not able to "
"generate encryption keys" "generate encryption keys"
msgstr "" msgstr ""
#: src/Core/Installer.php:318 #: src/Core/Installer.php:319
msgid "" msgid ""
"If running under Windows, please see \"http://www.php.net/manual/en/openssl." "If running under Windows, please see \"http://www.php.net/manual/en/openssl."
"installation.php\"." "installation.php\"."
msgstr "" msgstr ""
#: src/Core/Installer.php:321 #: src/Core/Installer.php:322
msgid "Generate encryption keys" msgid "Generate encryption keys"
msgstr "" msgstr ""
#: src/Core/Installer.php:372 #: src/Core/Installer.php:374
msgid "" msgid ""
"Error: Apache webserver mod-rewrite module is required but not installed." "Error: Apache webserver mod-rewrite module is required but not installed."
msgstr "" msgstr ""
#: src/Core/Installer.php:377 #: src/Core/Installer.php:379
msgid "Apache mod_rewrite module" msgid "Apache mod_rewrite module"
msgstr "" msgstr ""
#: src/Core/Installer.php:383 #: src/Core/Installer.php:385
msgid "Error: PDO or MySQLi PHP module required but not installed." msgid "Error: PDO or MySQLi PHP module required but not installed."
msgstr "" msgstr ""
#: src/Core/Installer.php:388 #: src/Core/Installer.php:390
msgid "Error: The MySQL driver for PDO is not installed." msgid "Error: The MySQL driver for PDO is not installed."
msgstr "" msgstr ""
#: src/Core/Installer.php:392 #: src/Core/Installer.php:394
msgid "PDO or MySQLi PHP module" msgid "PDO or MySQLi PHP module"
msgstr "" msgstr ""
#: src/Core/Installer.php:400 #: src/Core/Installer.php:402
msgid "Error, XML PHP module required but not installed." msgid "Error, XML PHP module required but not installed."
msgstr "" msgstr ""
#: src/Core/Installer.php:404 #: src/Core/Installer.php:406
msgid "XML PHP module" msgid "XML PHP module"
msgstr "" msgstr ""
#: src/Core/Installer.php:407 #: src/Core/Installer.php:409
msgid "libCurl PHP module" msgid "libCurl PHP module"
msgstr "" msgstr ""
#: src/Core/Installer.php:408 #: src/Core/Installer.php:410
msgid "Error: libCURL PHP module required but not installed." msgid "Error: libCURL PHP module required but not installed."
msgstr "" msgstr ""
#: src/Core/Installer.php:414 #: src/Core/Installer.php:416
msgid "GD graphics PHP module" msgid "GD graphics PHP module"
msgstr "" msgstr ""
#: src/Core/Installer.php:415 #: src/Core/Installer.php:417
msgid "" msgid ""
"Error: GD graphics PHP module with JPEG support required but not installed." "Error: GD graphics PHP module with JPEG support required but not installed."
msgstr "" msgstr ""
#: src/Core/Installer.php:421 #: src/Core/Installer.php:423
msgid "OpenSSL PHP module" msgid "OpenSSL PHP module"
msgstr "" msgstr ""
#: src/Core/Installer.php:422 #: src/Core/Installer.php:424
msgid "Error: openssl PHP module required but not installed." msgid "Error: openssl PHP module required but not installed."
msgstr "" msgstr ""
#: src/Core/Installer.php:428 #: src/Core/Installer.php:430
msgid "mb_string PHP module" msgid "mb_string PHP module"
msgstr "" msgstr ""
#: src/Core/Installer.php:429 #: src/Core/Installer.php:431
msgid "Error: mb_string PHP module required but not installed." msgid "Error: mb_string PHP module required but not installed."
msgstr "" msgstr ""
#: src/Core/Installer.php:435 #: src/Core/Installer.php:437
msgid "iconv PHP module" msgid "iconv PHP module"
msgstr "" msgstr ""
#: src/Core/Installer.php:436 #: src/Core/Installer.php:438
msgid "Error: iconv PHP module required but not installed." msgid "Error: iconv PHP module required but not installed."
msgstr "" msgstr ""
#: src/Core/Installer.php:442 #: src/Core/Installer.php:444
msgid "POSIX PHP module" msgid "POSIX PHP module"
msgstr "" msgstr ""
#: src/Core/Installer.php:443 #: src/Core/Installer.php:445
msgid "Error: POSIX PHP module required but not installed." msgid "Error: POSIX PHP module required but not installed."
msgstr "" msgstr ""
#: src/Core/Installer.php:449 #: src/Core/Installer.php:451
msgid "JSON PHP module" msgid "JSON PHP module"
msgstr "" msgstr ""
#: src/Core/Installer.php:450 #: src/Core/Installer.php:452
msgid "Error: JSON PHP module required but not installed." msgid "Error: JSON PHP module required but not installed."
msgstr "" msgstr ""
#: src/Core/Installer.php:473 #: src/Core/Installer.php:458
msgid "File Information PHP module"
msgstr ""
#: src/Core/Installer.php:459
msgid "Error: File Information PHP module required but not installed."
msgstr ""
#: src/Core/Installer.php:482
msgid "" msgid ""
"The web installer needs to be able to create a file called \"local.config.php" "The web installer needs to be able to create a file called \"local.config.php"
"\" in the \"config\" folder of your web server and it is unable to do so." "\" in the \"config\" folder of your web server and it is unable to do so."
msgstr "" msgstr ""
#: src/Core/Installer.php:474 #: src/Core/Installer.php:483
msgid "" msgid ""
"This is most often a permission setting, as the web server may not be able " "This is most often a permission setting, as the web server may not be able "
"to write files in your folder - even if you can." "to write files in your folder - even if you can."
msgstr "" msgstr ""
#: src/Core/Installer.php:475 #: src/Core/Installer.php:484
msgid "" msgid ""
"At the end of this procedure, we will give you a text to save in a file " "At the end of this procedure, we will give you a text to save in a file "
"named local.config.php in your Friendica \"config\" folder." "named local.config.php in your Friendica \"config\" folder."
msgstr "" msgstr ""
#: src/Core/Installer.php:476 #: src/Core/Installer.php:485
msgid "" msgid ""
"You can alternatively skip this procedure and perform a manual installation. " "You can alternatively skip this procedure and perform a manual installation. "
"Please see the file \"INSTALL.txt\" for instructions." "Please see the file \"INSTALL.txt\" for instructions."
msgstr "" msgstr ""
#: src/Core/Installer.php:479 #: src/Core/Installer.php:488
msgid "config/local.config.php is writable" msgid "config/local.config.php is writable"
msgstr "" msgstr ""
#: src/Core/Installer.php:499 #: src/Core/Installer.php:508
msgid "" msgid ""
"Friendica uses the Smarty3 template engine to render its web views. Smarty3 " "Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
"compiles templates to PHP to speed up rendering." "compiles templates to PHP to speed up rendering."
msgstr "" msgstr ""
#: src/Core/Installer.php:500 #: src/Core/Installer.php:509
msgid "" msgid ""
"In order to store these compiled templates, the web server needs to have " "In order to store these compiled templates, the web server needs to have "
"write access to the directory view/smarty3/ under the Friendica top level " "write access to the directory view/smarty3/ under the Friendica top level "
"folder." "folder."
msgstr "" msgstr ""
#: src/Core/Installer.php:501 #: src/Core/Installer.php:510
msgid "" msgid ""
"Please ensure that the user that your web server runs as (e.g. www-data) has " "Please ensure that the user that your web server runs as (e.g. www-data) has "
"write access to this folder." "write access to this folder."
msgstr "" msgstr ""
#: src/Core/Installer.php:502 #: src/Core/Installer.php:511
msgid "" msgid ""
"Note: as a security measure, you should give the web server write access to " "Note: as a security measure, you should give the web server write access to "
"view/smarty3/ only--not the template files (.tpl) that it contains." "view/smarty3/ only--not the template files (.tpl) that it contains."
msgstr "" msgstr ""
#: src/Core/Installer.php:505 #: src/Core/Installer.php:514
msgid "view/smarty3 is writable" msgid "view/smarty3 is writable"
msgstr "" msgstr ""
#: src/Core/Installer.php:534 #: src/Core/Installer.php:543
msgid "" msgid ""
"Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist " "Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist "
"to .htaccess." "to .htaccess."
msgstr "" msgstr ""
#: src/Core/Installer.php:536 #: src/Core/Installer.php:545
msgid "Error message from Curl when fetching" msgid "Error message from Curl when fetching"
msgstr "" msgstr ""
#: src/Core/Installer.php:541 #: src/Core/Installer.php:550
msgid "Url rewrite is working" msgid "Url rewrite is working"
msgstr "" msgstr ""
#: src/Core/Installer.php:570 #: src/Core/Installer.php:579
msgid "ImageMagick PHP extension is not installed" msgid "ImageMagick PHP extension is not installed"
msgstr "" msgstr ""
#: src/Core/Installer.php:572 #: src/Core/Installer.php:581
msgid "ImageMagick PHP extension is installed" msgid "ImageMagick PHP extension is installed"
msgstr "" msgstr ""
#: src/Core/Installer.php:574 tests/src/Core/InstallerTest.php:329 #: src/Core/Installer.php:583 tests/src/Core/InstallerTest.php:343
#: tests/src/Core/InstallerTest.php:355 #: tests/src/Core/InstallerTest.php:369
msgid "ImageMagick supports GIF" msgid "ImageMagick supports GIF"
msgstr "" msgstr ""
#: src/Core/Installer.php:597 #: src/Core/Installer.php:608
msgid "Could not connect to database." msgid "Could not connect to database."
msgstr "" msgstr ""
#: src/Core/Installer.php:604 #: src/Core/Installer.php:615
msgid "Database already in use." msgid "Database already in use."
msgstr "" msgstr ""
@ -8401,7 +8414,7 @@ msgstr ""
msgid "activity" msgid "activity"
msgstr "" msgstr ""
#: src/Model/Item.php:3289 src/Object/Post.php:470 #: src/Model/Item.php:3289 src/Object/Post.php:471
msgid "comment" msgid "comment"
msgid_plural "comments" msgid_plural "comments"
msgstr[0] "" msgstr[0] ""
@ -9466,139 +9479,139 @@ msgstr ""
msgid "Privacy Statement" msgid "Privacy Statement"
msgstr "" msgstr ""
#: src/Object/Post.php:136 #: src/Object/Post.php:137
msgid "This entry was edited" msgid "This entry was edited"
msgstr "" msgstr ""
#: src/Object/Post.php:198 #: src/Object/Post.php:199
msgid "Delete locally" msgid "Delete locally"
msgstr "" msgstr ""
#: src/Object/Post.php:201 #: src/Object/Post.php:202
msgid "Delete globally" msgid "Delete globally"
msgstr "" msgstr ""
#: src/Object/Post.php:201 #: src/Object/Post.php:202
msgid "Remove locally" msgid "Remove locally"
msgstr "" msgstr ""
#: src/Object/Post.php:215 #: src/Object/Post.php:216
msgid "save to folder" msgid "save to folder"
msgstr "" msgstr ""
#: src/Object/Post.php:250 #: src/Object/Post.php:251
msgid "I will attend" msgid "I will attend"
msgstr "" msgstr ""
#: src/Object/Post.php:250 #: src/Object/Post.php:251
msgid "I will not attend" msgid "I will not attend"
msgstr "" msgstr ""
#: src/Object/Post.php:250 #: src/Object/Post.php:251
msgid "I might attend" msgid "I might attend"
msgstr "" msgstr ""
#: src/Object/Post.php:278 #: src/Object/Post.php:279
msgid "ignore thread" msgid "ignore thread"
msgstr "" msgstr ""
#: src/Object/Post.php:279 #: src/Object/Post.php:280
msgid "unignore thread" msgid "unignore thread"
msgstr "" msgstr ""
#: src/Object/Post.php:280 #: src/Object/Post.php:281
msgid "toggle ignore status" msgid "toggle ignore status"
msgstr "" msgstr ""
#: src/Object/Post.php:291 #: src/Object/Post.php:292
msgid "add star" msgid "add star"
msgstr "" msgstr ""
#: src/Object/Post.php:292 #: src/Object/Post.php:293
msgid "remove star" msgid "remove star"
msgstr "" msgstr ""
#: src/Object/Post.php:293 #: src/Object/Post.php:294
msgid "toggle star status" msgid "toggle star status"
msgstr "" msgstr ""
#: src/Object/Post.php:296 #: src/Object/Post.php:297
msgid "starred" msgid "starred"
msgstr "" msgstr ""
#: src/Object/Post.php:300 #: src/Object/Post.php:301
msgid "add tag" msgid "add tag"
msgstr "" msgstr ""
#: src/Object/Post.php:311 #: src/Object/Post.php:312
msgid "like" msgid "like"
msgstr "" msgstr ""
#: src/Object/Post.php:312 #: src/Object/Post.php:313
msgid "dislike" msgid "dislike"
msgstr "" msgstr ""
#: src/Object/Post.php:315 #: src/Object/Post.php:316
msgid "Share this" msgid "Share this"
msgstr "" msgstr ""
#: src/Object/Post.php:315 #: src/Object/Post.php:316
msgid "share" msgid "share"
msgstr "" msgstr ""
#: src/Object/Post.php:382 #: src/Object/Post.php:383
msgid "to" msgid "to"
msgstr "" msgstr ""
#: src/Object/Post.php:383 #: src/Object/Post.php:384
msgid "via" msgid "via"
msgstr "" msgstr ""
#: src/Object/Post.php:384 #: src/Object/Post.php:385
msgid "Wall-to-Wall" msgid "Wall-to-Wall"
msgstr "" msgstr ""
#: src/Object/Post.php:385 #: src/Object/Post.php:386
msgid "via Wall-To-Wall:" msgid "via Wall-To-Wall:"
msgstr "" msgstr ""
#: src/Object/Post.php:418 #: src/Object/Post.php:419
#, php-format #, php-format
msgid "Reply to %s" msgid "Reply to %s"
msgstr "" msgstr ""
#: src/Object/Post.php:433 #: src/Object/Post.php:434
msgid "Notifier task is pending" msgid "Notifier task is pending"
msgstr "" msgstr ""
#: src/Object/Post.php:434 #: src/Object/Post.php:435
msgid "Delivery to remote servers is pending" msgid "Delivery to remote servers is pending"
msgstr "" msgstr ""
#: src/Object/Post.php:435 #: src/Object/Post.php:436
msgid "Delivery to remote servers is underway" msgid "Delivery to remote servers is underway"
msgstr "" msgstr ""
#: src/Object/Post.php:436 #: src/Object/Post.php:437
msgid "Delivery to remote servers is mostly done" msgid "Delivery to remote servers is mostly done"
msgstr "" msgstr ""
#: src/Object/Post.php:437 #: src/Object/Post.php:438
msgid "Delivery to remote servers is done" msgid "Delivery to remote servers is done"
msgstr "" msgstr ""
#: src/Object/Post.php:457 #: src/Object/Post.php:458
#, php-format #, php-format
msgid "%d comment" msgid "%d comment"
msgid_plural "%d comments" msgid_plural "%d comments"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Object/Post.php:458 #: src/Object/Post.php:459
msgid "Show more" msgid "Show more"
msgstr "" msgstr ""
#: src/Object/Post.php:459 #: src/Object/Post.php:460
msgid "Show fewer" msgid "Show fewer"
msgstr "" msgstr ""