From 66a6970bb897454e38be6055728943aec354081c Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 14 Jan 2013 15:50:39 -0800 Subject: [PATCH] config cli will also work with Friendica without change - so bringing it over --- boot.php | 2 +- util/config | 34 +++++ util/config.md | 26 ++++ util/messages.po | 366 ++++++++++++++++++++++++----------------------- 4 files changed, 245 insertions(+), 183 deletions(-) create mode 100644 util/config create mode 100644 util/config.md diff --git a/boot.php b/boot.php index 1a93086aea..d659ac4e4c 100644 --- a/boot.php +++ b/boot.php @@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('include/features.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.1.1586' ); +define ( 'FRIENDICA_VERSION', '3.1.1588' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1158 ); diff --git a/util/config b/util/config new file mode 100644 index 0000000000..67fe14f934 --- /dev/null +++ b/util/config @@ -0,0 +1,34 @@ +#!/usr/bin/env php + 3) { + set_config($argv[1],$argv[2],$argv[3]); + echo "config[{$argv[1]}][{$argv[2]}] = " . get_config($argv[1],$argv[2]) . "\n"; +} + +if($argc == 3) { + echo "config[{$argv[1]}][{$argv[2]}] = " . get_config($argv[1],$argv[2]) . "\n"; +} + +if($argc == 2) { + load_config($argv[1]); + foreach($a->config[$argv[1]] as $k => $x) { + echo "config[{$argv[1]}][{$k}] = " . $x . "\n"; + } +} + +if($argc == 1) { + $r = q("select * from config where 1"); + if($r) { + foreach($r as $rr) { + echo "config[{$rr['cat']}][{$rr['k']}] = " . $rr['v'] . "\n"; + } + } +} + diff --git a/util/config.md b/util/config.md new file mode 100644 index 0000000000..3b834fe01a --- /dev/null +++ b/util/config.md @@ -0,0 +1,26 @@ +CLI config utility +================== + +Usage: + + +config + displays all config entries + + +config family + displays all config entries for family (system, database, etc) + + +config family key + displays single config entry for specified family and key + +config family key value + set config entry for specified family and key to value and display result + + + +Notes: + Setting config entries which are manually set in .htconfig.php may result in +conflict between database settings and the manual startup settings. + diff --git a/util/messages.po b/util/messages.po index 92e4589f94..9bcc451dc8 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.1.1586\n" +"Project-Id-Version: 3.1.1588\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-12 10:00-0800\n" +"POT-Creation-Date: 2013-01-14 10:00-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -53,8 +53,8 @@ msgstr "" #: ../../mod/message.php:38 ../../mod/message.php:172 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25 #: ../../mod/wall_upload.php:66 ../../mod/follow.php:9 -#: ../../mod/display.php:173 ../../mod/profiles.php:9 -#: ../../mod/profiles.php:148 ../../mod/delegate.php:6 +#: ../../mod/display.php:180 ../../mod/profiles.php:146 +#: ../../mod/profiles.php:567 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:15 ../../mod/invite.php:83 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:512 #: ../../addon/facebook/facebook.php:518 ../../addon/fbpost/fbpost.php:170 @@ -142,7 +142,7 @@ msgstr "" #: ../../mod/settings.php:1018 ../../mod/group.php:87 ../../mod/mood.php:137 #: ../../mod/message.php:301 ../../mod/message.php:527 ../../mod/admin.php:461 #: ../../mod/admin.php:728 ../../mod/admin.php:865 ../../mod/admin.php:1064 -#: ../../mod/admin.php:1151 ../../mod/profiles.php:623 +#: ../../mod/admin.php:1151 ../../mod/profiles.php:626 #: ../../mod/invite.php:121 ../../addon/fromgplus/fromgplus.php:44 #: ../../addon/facebook/facebook.php:621 #: ../../addon/snautofollow/snautofollow.php:64 @@ -184,7 +184,7 @@ msgstr "" #: ../../view/theme/diabook/theme.php:642 #: ../../view/theme/diabook/config.php:152 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 -#: ../../object/Item.php:609 ../../addon.old/fromgplus/fromgplus.php:40 +#: ../../object/Item.php:603 ../../addon.old/fromgplus/fromgplus.php:40 #: ../../addon.old/facebook/facebook.php:619 #: ../../addon.old/snautofollow/snautofollow.php:64 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226 @@ -289,7 +289,7 @@ msgid "link to source" msgstr "" #: ../../mod/events.php:358 ../../view/theme/diabook/theme.php:91 -#: ../../include/nav.php:52 ../../boot.php:1829 +#: ../../include/nav.php:52 ../../boot.php:1828 msgid "Events" msgstr "" @@ -364,7 +364,7 @@ msgstr "" #: ../../mod/dfrn_request.php:848 ../../mod/settings.php:561 #: ../../mod/settings.php:587 ../../mod/fbrowser.php:81 #: ../../mod/fbrowser.php:116 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:1045 +#: ../../include/conversation.php:1040 #: ../../addon.old/js_upload/js_upload.php:45 msgid "Cancel" msgstr "" @@ -418,7 +418,7 @@ msgstr "" #: ../../mod/settings.php:1005 ../../mod/settings.php:1006 #: ../../mod/settings.php:1007 ../../mod/settings.php:1008 #: ../../mod/settings.php:1009 ../../mod/register.php:239 -#: ../../mod/profiles.php:603 +#: ../../mod/profiles.php:606 msgid "Yes" msgstr "" @@ -430,11 +430,11 @@ msgstr "" #: ../../mod/settings.php:1005 ../../mod/settings.php:1006 #: ../../mod/settings.php:1007 ../../mod/settings.php:1008 #: ../../mod/settings.php:1009 ../../mod/register.php:240 -#: ../../mod/profiles.php:604 +#: ../../mod/profiles.php:607 msgid "No" msgstr "" -#: ../../mod/photos.php:51 ../../boot.php:1822 +#: ../../mod/photos.php:51 ../../boot.php:1821 msgid "Photo Albums" msgstr "" @@ -513,7 +513,7 @@ msgstr "" #: ../../mod/photos.php:865 ../../mod/community.php:18 #: ../../mod/dfrn_request.php:761 ../../mod/viewcontacts.php:17 -#: ../../mod/display.php:7 ../../mod/search.php:89 ../../mod/directory.php:31 +#: ../../mod/display.php:19 ../../mod/search.php:89 ../../mod/directory.php:31 #: ../../addon/forumdirectory/forumdirectory.php:53 msgid "Public access denied." msgstr "" @@ -638,7 +638,7 @@ msgstr "" msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1422 ../../include/conversation.php:1005 +#: ../../mod/photos.php:1422 ../../include/conversation.php:1000 msgid "Share" msgstr "" @@ -646,26 +646,26 @@ msgstr "" #: ../../mod/content.php:499 ../../mod/content.php:883 #: ../../mod/wallmessage.php:152 ../../mod/message.php:300 #: ../../mod/message.php:528 ../../include/conversation.php:645 -#: ../../include/conversation.php:1024 ../../object/Item.php:292 +#: ../../include/conversation.php:1019 ../../object/Item.php:292 msgid "Please wait" msgstr "" #: ../../mod/photos.php:1439 ../../mod/photos.php:1483 #: ../../mod/photos.php:1566 ../../mod/content.php:707 -#: ../../object/Item.php:606 +#: ../../object/Item.php:600 msgid "This is you" msgstr "" #: ../../mod/photos.php:1441 ../../mod/photos.php:1485 #: ../../mod/photos.php:1568 ../../mod/content.php:709 ../../boot.php:641 -#: ../../object/Item.php:289 ../../object/Item.php:608 +#: ../../object/Item.php:289 ../../object/Item.php:602 msgid "Comment" msgstr "" #: ../../mod/photos.php:1443 ../../mod/photos.php:1487 #: ../../mod/photos.php:1570 ../../mod/editpost.php:142 -#: ../../mod/content.php:719 ../../include/conversation.php:1042 -#: ../../object/Item.php:618 +#: ../../mod/content.php:719 ../../include/conversation.php:1037 +#: ../../object/Item.php:612 msgid "Preview" msgstr "" @@ -738,7 +738,7 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:91 ../../include/conversation.php:991 +#: ../../mod/editpost.php:91 ../../include/conversation.php:986 msgid "Post to Email" msgstr "" @@ -749,85 +749,85 @@ msgstr "" #: ../../mod/editpost.php:107 ../../mod/wallmessage.php:150 #: ../../mod/message.php:298 ../../mod/message.php:525 -#: ../../include/conversation.php:1006 +#: ../../include/conversation.php:1001 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:108 ../../include/conversation.php:1007 +#: ../../mod/editpost.php:108 ../../include/conversation.php:1002 msgid "upload photo" msgstr "" -#: ../../mod/editpost.php:109 ../../include/conversation.php:1008 +#: ../../mod/editpost.php:109 ../../include/conversation.php:1003 msgid "Attach file" msgstr "" -#: ../../mod/editpost.php:110 ../../include/conversation.php:1009 +#: ../../mod/editpost.php:110 ../../include/conversation.php:1004 msgid "attach file" msgstr "" #: ../../mod/editpost.php:111 ../../mod/wallmessage.php:151 #: ../../mod/message.php:299 ../../mod/message.php:526 -#: ../../include/conversation.php:1010 +#: ../../include/conversation.php:1005 msgid "Insert web link" msgstr "" -#: ../../mod/editpost.php:112 ../../include/conversation.php:1011 +#: ../../mod/editpost.php:112 ../../include/conversation.php:1006 msgid "web link" msgstr "" -#: ../../mod/editpost.php:113 ../../include/conversation.php:1012 +#: ../../mod/editpost.php:113 ../../include/conversation.php:1007 msgid "Insert video link" msgstr "" -#: ../../mod/editpost.php:114 ../../include/conversation.php:1013 +#: ../../mod/editpost.php:114 ../../include/conversation.php:1008 msgid "video link" msgstr "" -#: ../../mod/editpost.php:115 ../../include/conversation.php:1014 +#: ../../mod/editpost.php:115 ../../include/conversation.php:1009 msgid "Insert audio link" msgstr "" -#: ../../mod/editpost.php:116 ../../include/conversation.php:1015 +#: ../../mod/editpost.php:116 ../../include/conversation.php:1010 msgid "audio link" msgstr "" -#: ../../mod/editpost.php:117 ../../include/conversation.php:1016 +#: ../../mod/editpost.php:117 ../../include/conversation.php:1011 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:118 ../../include/conversation.php:1017 +#: ../../mod/editpost.php:118 ../../include/conversation.php:1012 msgid "set location" msgstr "" -#: ../../mod/editpost.php:119 ../../include/conversation.php:1018 +#: ../../mod/editpost.php:119 ../../include/conversation.php:1013 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:120 ../../include/conversation.php:1019 +#: ../../mod/editpost.php:120 ../../include/conversation.php:1014 msgid "clear location" msgstr "" -#: ../../mod/editpost.php:122 ../../include/conversation.php:1025 +#: ../../mod/editpost.php:122 ../../include/conversation.php:1020 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:130 ../../include/conversation.php:1034 +#: ../../mod/editpost.php:130 ../../include/conversation.php:1029 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:131 ../../include/conversation.php:1035 +#: ../../mod/editpost.php:131 ../../include/conversation.php:1030 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:134 ../../include/conversation.php:1021 +#: ../../mod/editpost.php:134 ../../include/conversation.php:1016 msgid "Set title" msgstr "" -#: ../../mod/editpost.php:136 ../../include/conversation.php:1023 +#: ../../mod/editpost.php:136 ../../include/conversation.php:1018 msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/editpost.php:137 ../../include/conversation.php:1037 +#: ../../mod/editpost.php:137 ../../include/conversation.php:1032 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -1517,35 +1517,35 @@ msgstr "" msgid "share" msgstr "" -#: ../../mod/content.php:711 ../../object/Item.php:610 +#: ../../mod/content.php:711 ../../object/Item.php:604 msgid "Bold" msgstr "" -#: ../../mod/content.php:712 ../../object/Item.php:611 +#: ../../mod/content.php:712 ../../object/Item.php:605 msgid "Italic" msgstr "" -#: ../../mod/content.php:713 ../../object/Item.php:612 +#: ../../mod/content.php:713 ../../object/Item.php:606 msgid "Underline" msgstr "" -#: ../../mod/content.php:714 ../../object/Item.php:613 +#: ../../mod/content.php:714 ../../object/Item.php:607 msgid "Quote" msgstr "" -#: ../../mod/content.php:715 ../../object/Item.php:614 +#: ../../mod/content.php:715 ../../object/Item.php:608 msgid "Code" msgstr "" -#: ../../mod/content.php:716 ../../object/Item.php:615 +#: ../../mod/content.php:716 ../../object/Item.php:609 msgid "Image" msgstr "" -#: ../../mod/content.php:717 ../../object/Item.php:616 +#: ../../mod/content.php:717 ../../object/Item.php:610 msgid "Link" msgstr "" -#: ../../mod/content.php:718 ../../object/Item.php:617 +#: ../../mod/content.php:718 ../../object/Item.php:611 msgid "Video" msgstr "" @@ -2782,7 +2782,7 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1836 +#: ../../mod/notes.php:44 ../../boot.php:1835 msgid "Personal Notes" msgstr "" @@ -2873,7 +2873,7 @@ msgstr "" #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:249 ../../mod/message.php:257 #: ../../mod/message.php:429 ../../mod/message.php:437 -#: ../../include/conversation.php:941 ../../include/conversation.php:959 +#: ../../include/conversation.php:936 ../../include/conversation.php:954 msgid "Please enter a link URL:" msgstr "" @@ -2956,7 +2956,7 @@ msgstr "" #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 #: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 -#: ../../boot.php:1812 +#: ../../boot.php:1811 msgid "Profile" msgstr "" @@ -3155,7 +3155,7 @@ msgstr "" msgid "Members" msgstr "" -#: ../../mod/group.php:223 ../../mod/profperm.php:105 +#: ../../mod/group.php:224 ../../mod/profperm.php:105 msgid "Click on a contact to add or remove." msgstr "" @@ -3272,7 +3272,7 @@ msgstr "" #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62 #: ../../addon/communityhome/communityhome.php:171 #: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1498 -#: ../../include/diaspora.php:1851 ../../include/conversation.php:125 +#: ../../include/diaspora.php:1860 ../../include/conversation.php:125 #: ../../include/conversation.php:253 #: ../../addon.old/communityhome/communityhome.php:163 msgid "photo" @@ -3283,7 +3283,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:166 #: ../../addon/communityhome/communityhome.php:175 #: ../../view/theme/diabook/theme.php:459 -#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1851 +#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1860 #: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../addon.old/facebook/facebook.php:1598 @@ -3294,7 +3294,7 @@ msgstr "" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1604 #: ../../addon/communityhome/communityhome.php:180 -#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1867 +#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1876 #: ../../include/conversation.php:136 #: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/communityhome/communityhome.php:172 @@ -3308,8 +3308,8 @@ msgid "%1$s doesn't like %2$s's %3$s" msgstr "" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 -#: ../../mod/admin.php:773 ../../mod/admin.php:972 ../../mod/display.php:47 -#: ../../mod/display.php:177 ../../include/items.php:3853 +#: ../../mod/admin.php:773 ../../mod/admin.php:972 ../../mod/display.php:51 +#: ../../mod/display.php:184 ../../include/items.php:3853 msgid "Item not found." msgstr "" @@ -3318,7 +3318,7 @@ msgid "Access denied." msgstr "" #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90 -#: ../../include/nav.php:51 ../../boot.php:1819 +#: ../../include/nav.php:51 ../../boot.php:1818 msgid "Photos" msgstr "" @@ -4259,7 +4259,7 @@ msgstr "" msgid "Requested profile is not available." msgstr "" -#: ../../mod/profile.php:155 ../../mod/display.php:95 +#: ../../mod/profile.php:155 ../../mod/display.php:99 msgid "Access to this profile has been restricted." msgstr "" @@ -4351,7 +4351,7 @@ msgstr "" msgid "link" msgstr "" -#: ../../mod/display.php:170 +#: ../../mod/display.php:177 msgid "Item has been removed." msgstr "" @@ -4368,322 +4368,322 @@ msgstr "" msgid "Search" msgstr "" -#: ../../mod/profiles.php:20 ../../mod/profiles.php:135 -#: ../../mod/profiles.php:162 ../../mod/profiles.php:576 +#: ../../mod/profiles.php:18 ../../mod/profiles.php:133 +#: ../../mod/profiles.php:160 ../../mod/profiles.php:579 #: ../../mod/dfrn_confirm.php:62 msgid "Profile not found." msgstr "" -#: ../../mod/profiles.php:39 +#: ../../mod/profiles.php:37 msgid "Profile deleted." msgstr "" -#: ../../mod/profiles.php:57 ../../mod/profiles.php:91 +#: ../../mod/profiles.php:55 ../../mod/profiles.php:89 msgid "Profile-" msgstr "" -#: ../../mod/profiles.php:76 ../../mod/profiles.php:119 +#: ../../mod/profiles.php:74 ../../mod/profiles.php:117 msgid "New profile created." msgstr "" -#: ../../mod/profiles.php:97 +#: ../../mod/profiles.php:95 msgid "Profile unavailable to clone." msgstr "" -#: ../../mod/profiles.php:172 +#: ../../mod/profiles.php:170 msgid "Profile Name is required." msgstr "" -#: ../../mod/profiles.php:319 +#: ../../mod/profiles.php:317 msgid "Marital Status" msgstr "" -#: ../../mod/profiles.php:323 +#: ../../mod/profiles.php:321 msgid "Romantic Partner" msgstr "" -#: ../../mod/profiles.php:327 +#: ../../mod/profiles.php:325 msgid "Likes" msgstr "" -#: ../../mod/profiles.php:331 +#: ../../mod/profiles.php:329 msgid "Dislikes" msgstr "" -#: ../../mod/profiles.php:335 +#: ../../mod/profiles.php:333 msgid "Work/Employment" msgstr "" -#: ../../mod/profiles.php:338 +#: ../../mod/profiles.php:336 msgid "Religion" msgstr "" -#: ../../mod/profiles.php:342 +#: ../../mod/profiles.php:340 msgid "Political Views" msgstr "" -#: ../../mod/profiles.php:346 +#: ../../mod/profiles.php:344 msgid "Gender" msgstr "" -#: ../../mod/profiles.php:350 +#: ../../mod/profiles.php:348 msgid "Sexual Preference" msgstr "" -#: ../../mod/profiles.php:354 +#: ../../mod/profiles.php:352 msgid "Homepage" msgstr "" -#: ../../mod/profiles.php:358 +#: ../../mod/profiles.php:356 msgid "Interests" msgstr "" -#: ../../mod/profiles.php:362 +#: ../../mod/profiles.php:360 msgid "Address" msgstr "" -#: ../../mod/profiles.php:369 ../../addon/dav/common/wdcal_edit.inc.php:183 +#: ../../mod/profiles.php:367 ../../addon/dav/common/wdcal_edit.inc.php:183 #: ../../addon.old/dav/common/wdcal_edit.inc.php:183 msgid "Location" msgstr "" -#: ../../mod/profiles.php:452 +#: ../../mod/profiles.php:450 msgid "Profile updated." msgstr "" -#: ../../mod/profiles.php:519 +#: ../../mod/profiles.php:517 msgid " and " msgstr "" -#: ../../mod/profiles.php:527 +#: ../../mod/profiles.php:525 msgid "public profile" msgstr "" -#: ../../mod/profiles.php:530 +#: ../../mod/profiles.php:528 #, php-format msgid "%1$s changed %2$s to “%3$s”" msgstr "" -#: ../../mod/profiles.php:531 +#: ../../mod/profiles.php:529 #, php-format msgid " - Visit %1$s's %2$s" msgstr "" -#: ../../mod/profiles.php:534 +#: ../../mod/profiles.php:532 #, php-format msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../mod/profiles.php:602 +#: ../../mod/profiles.php:605 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/profiles.php:622 +#: ../../mod/profiles.php:625 msgid "Edit Profile Details" msgstr "" -#: ../../mod/profiles.php:624 +#: ../../mod/profiles.php:627 msgid "Change Profile Photo" msgstr "" -#: ../../mod/profiles.php:625 +#: ../../mod/profiles.php:628 msgid "View this profile" msgstr "" -#: ../../mod/profiles.php:626 +#: ../../mod/profiles.php:629 msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/profiles.php:627 +#: ../../mod/profiles.php:630 msgid "Clone this profile" msgstr "" -#: ../../mod/profiles.php:628 +#: ../../mod/profiles.php:631 msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:629 +#: ../../mod/profiles.php:632 msgid "Profile Name:" msgstr "" -#: ../../mod/profiles.php:630 +#: ../../mod/profiles.php:633 msgid "Your Full Name:" msgstr "" -#: ../../mod/profiles.php:631 +#: ../../mod/profiles.php:634 msgid "Title/Description:" msgstr "" -#: ../../mod/profiles.php:632 +#: ../../mod/profiles.php:635 msgid "Your Gender:" msgstr "" -#: ../../mod/profiles.php:633 +#: ../../mod/profiles.php:636 #, php-format msgid "Birthday (%s):" msgstr "" -#: ../../mod/profiles.php:634 +#: ../../mod/profiles.php:637 msgid "Street Address:" msgstr "" -#: ../../mod/profiles.php:635 +#: ../../mod/profiles.php:638 msgid "Locality/City:" msgstr "" -#: ../../mod/profiles.php:636 +#: ../../mod/profiles.php:639 msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/profiles.php:637 +#: ../../mod/profiles.php:640 msgid "Country:" msgstr "" -#: ../../mod/profiles.php:638 +#: ../../mod/profiles.php:641 msgid "Region/State:" msgstr "" -#: ../../mod/profiles.php:639 +#: ../../mod/profiles.php:642 msgid "♥ Marital Status:" msgstr "" -#: ../../mod/profiles.php:640 +#: ../../mod/profiles.php:643 msgid "Who: (if applicable)" msgstr "" -#: ../../mod/profiles.php:641 +#: ../../mod/profiles.php:644 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:642 +#: ../../mod/profiles.php:645 msgid "Since [date]:" msgstr "" -#: ../../mod/profiles.php:643 ../../include/profile_advanced.php:46 +#: ../../mod/profiles.php:646 ../../include/profile_advanced.php:46 msgid "Sexual Preference:" msgstr "" -#: ../../mod/profiles.php:644 +#: ../../mod/profiles.php:647 msgid "Homepage URL:" msgstr "" -#: ../../mod/profiles.php:645 ../../include/profile_advanced.php:50 +#: ../../mod/profiles.php:648 ../../include/profile_advanced.php:50 msgid "Hometown:" msgstr "" -#: ../../mod/profiles.php:646 ../../include/profile_advanced.php:54 +#: ../../mod/profiles.php:649 ../../include/profile_advanced.php:54 msgid "Political Views:" msgstr "" -#: ../../mod/profiles.php:647 +#: ../../mod/profiles.php:650 msgid "Religious Views:" msgstr "" -#: ../../mod/profiles.php:648 +#: ../../mod/profiles.php:651 msgid "Public Keywords:" msgstr "" -#: ../../mod/profiles.php:649 +#: ../../mod/profiles.php:652 msgid "Private Keywords:" msgstr "" -#: ../../mod/profiles.php:650 ../../include/profile_advanced.php:62 +#: ../../mod/profiles.php:653 ../../include/profile_advanced.php:62 msgid "Likes:" msgstr "" -#: ../../mod/profiles.php:651 ../../include/profile_advanced.php:64 +#: ../../mod/profiles.php:654 ../../include/profile_advanced.php:64 msgid "Dislikes:" msgstr "" -#: ../../mod/profiles.php:652 +#: ../../mod/profiles.php:655 msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:653 +#: ../../mod/profiles.php:656 msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "" -#: ../../mod/profiles.php:654 +#: ../../mod/profiles.php:657 msgid "(Used for searching profiles, never shown to others)" msgstr "" -#: ../../mod/profiles.php:655 +#: ../../mod/profiles.php:658 msgid "Tell us about yourself..." msgstr "" -#: ../../mod/profiles.php:656 +#: ../../mod/profiles.php:659 msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:657 +#: ../../mod/profiles.php:660 msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/profiles.php:658 +#: ../../mod/profiles.php:661 msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:659 +#: ../../mod/profiles.php:662 msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:660 +#: ../../mod/profiles.php:663 msgid "Television" msgstr "" -#: ../../mod/profiles.php:661 +#: ../../mod/profiles.php:664 msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/profiles.php:662 +#: ../../mod/profiles.php:665 msgid "Love/romance" msgstr "" -#: ../../mod/profiles.php:663 +#: ../../mod/profiles.php:666 msgid "Work/employment" msgstr "" -#: ../../mod/profiles.php:664 +#: ../../mod/profiles.php:667 msgid "School/education" msgstr "" -#: ../../mod/profiles.php:669 +#: ../../mod/profiles.php:672 msgid "" "This is your public profile.
It may " "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:679 ../../mod/directory.php:111 +#: ../../mod/profiles.php:682 ../../mod/directory.php:111 #: ../../addon/forumdirectory/forumdirectory.php:133 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:718 +#: ../../mod/profiles.php:721 msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:719 ../../boot.php:1316 +#: ../../mod/profiles.php:722 ../../boot.php:1316 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:720 ../../boot.php:1317 +#: ../../mod/profiles.php:723 ../../boot.php:1317 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:731 ../../boot.php:1327 +#: ../../mod/profiles.php:734 ../../boot.php:1327 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:733 ../../boot.php:1330 +#: ../../mod/profiles.php:736 ../../boot.php:1330 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:734 ../../boot.php:1331 +#: ../../mod/profiles.php:737 ../../boot.php:1331 msgid "Edit visibility" msgstr "" -#: ../../mod/filer.php:30 ../../include/conversation.php:945 -#: ../../include/conversation.php:963 +#: ../../mod/filer.php:30 ../../include/conversation.php:940 +#: ../../include/conversation.php:958 msgid "Save to Folder:" msgstr "" @@ -4744,34 +4744,38 @@ msgid "Source input: " msgstr "" #: ../../mod/babel.php:35 -msgid "bb2html: " +msgid "bb2html (raw HTML): " msgstr "" #: ../../mod/babel.php:39 -msgid "bb2html2bb: " +msgid "bb2html: " msgstr "" #: ../../mod/babel.php:43 -msgid "bb2md: " +msgid "bb2html2bb: " msgstr "" #: ../../mod/babel.php:47 -msgid "bb2md2html: " +msgid "bb2md: " msgstr "" #: ../../mod/babel.php:51 -msgid "bb2dia2bb: " +msgid "bb2md2html: " msgstr "" #: ../../mod/babel.php:55 +msgid "bb2dia2bb: " +msgstr "" + +#: ../../mod/babel.php:59 msgid "bb2md2html2bb: " msgstr "" -#: ../../mod/babel.php:65 +#: ../../mod/babel.php:69 msgid "Source input (Diaspora format): " msgstr "" -#: ../../mod/babel.php:70 +#: ../../mod/babel.php:74 msgid "diaspora2bb: " msgstr "" @@ -4956,7 +4960,7 @@ msgstr "" msgid "Unable to set contact photo." msgstr "" -#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:619 +#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:621 #: ../../include/conversation.php:171 #, php-format msgid "%1$s is now friends with %2$s" @@ -6332,7 +6336,7 @@ msgstr "" #: ../../addon/dav/friendica/main.php:279 #: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:468 -#: ../../include/enotify.php:28 ../../include/notifier.php:781 +#: ../../include/enotify.php:28 ../../include/notifier.php:785 #: ../../addon.old/dav/friendica/main.php:279 #: ../../addon.old/dav/friendica/main.php:280 msgid "noreply" @@ -8372,7 +8376,7 @@ msgstr "" msgid "Finishes:" msgstr "" -#: ../../include/delivery.php:457 ../../include/notifier.php:771 +#: ../../include/delivery.php:457 ../../include/notifier.php:775 msgid "(no subject)" msgstr "" @@ -8619,11 +8623,11 @@ msgstr "" msgid "Item filed" msgstr "" -#: ../../include/diaspora.php:702 +#: ../../include/diaspora.php:704 msgid "Sharing notification from Diaspora network" msgstr "" -#: ../../include/diaspora.php:2239 +#: ../../include/diaspora.php:2248 msgid "Attachments:" msgstr "" @@ -8718,7 +8722,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1805 +#: ../../include/nav.php:49 ../../boot.php:1804 msgid "Status" msgstr "" @@ -9567,62 +9571,60 @@ msgstr "" msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:884 -msgid "like this" +#: ../../include/conversation.php:883 +#, php-format +msgid "%2$d people like this" msgstr "" -#: ../../include/conversation.php:888 -msgid "don't like this" +#: ../../include/conversation.php:886 +#, php-format +msgid "%2$d people don't like this" msgstr "" -#: ../../include/conversation.php:895 -msgid "people" -msgstr "" - -#: ../../include/conversation.php:905 +#: ../../include/conversation.php:900 msgid "and" msgstr "" -#: ../../include/conversation.php:911 +#: ../../include/conversation.php:906 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:913 +#: ../../include/conversation.php:908 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:913 +#: ../../include/conversation.php:908 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:940 ../../include/conversation.php:958 +#: ../../include/conversation.php:935 ../../include/conversation.php:953 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:942 ../../include/conversation.php:960 +#: ../../include/conversation.php:937 ../../include/conversation.php:955 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:943 ../../include/conversation.php:961 +#: ../../include/conversation.php:938 ../../include/conversation.php:956 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:944 ../../include/conversation.php:962 +#: ../../include/conversation.php:939 ../../include/conversation.php:957 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:946 ../../include/conversation.php:964 +#: ../../include/conversation.php:941 ../../include/conversation.php:959 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:947 +#: ../../include/conversation.php:942 msgid "Delete item(s)?" msgstr "" -#: ../../include/conversation.php:1026 +#: ../../include/conversation.php:1021 msgid "permissions" msgstr "" @@ -9712,51 +9714,51 @@ msgstr "" msgid "Manage/edit profiles" msgstr "" -#: ../../boot.php:1433 ../../boot.php:1519 +#: ../../boot.php:1432 ../../boot.php:1518 msgid "g A l F d" msgstr "" -#: ../../boot.php:1434 ../../boot.php:1520 +#: ../../boot.php:1433 ../../boot.php:1519 msgid "F d" msgstr "" -#: ../../boot.php:1479 ../../boot.php:1560 +#: ../../boot.php:1478 ../../boot.php:1559 msgid "[today]" msgstr "" -#: ../../boot.php:1491 +#: ../../boot.php:1490 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1492 +#: ../../boot.php:1491 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1553 +#: ../../boot.php:1552 msgid "[No description]" msgstr "" -#: ../../boot.php:1571 +#: ../../boot.php:1570 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1572 +#: ../../boot.php:1571 msgid "Events this week:" msgstr "" -#: ../../boot.php:1808 +#: ../../boot.php:1807 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1815 +#: ../../boot.php:1814 msgid "Profile Details" msgstr "" -#: ../../boot.php:1832 +#: ../../boot.php:1831 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1839 +#: ../../boot.php:1838 msgid "Only You Can See This" msgstr ""