diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/Doxyfile | 2 | ||||
| -rw-r--r-- | util/README | 2 | ||||
| -rw-r--r-- | util/messages.po | 10 | ||||
| -rwxr-xr-x | util/run_xgettext.sh | 6 | ||||
| -rwxr-xr-x | util/shredder/ShredOAuth.sh | 28 | ||||
| -rwxr-xr-x | util/shredder/shredder | 2 | ||||
| -rw-r--r-- | util/strings.php | 32 | ||||
| -rw-r--r-- | util/zotsh/README.txt | 2 |
8 files changed, 42 insertions, 42 deletions
diff --git a/util/Doxyfile b/util/Doxyfile index f700c2abe..55acd46eb 100644 --- a/util/Doxyfile +++ b/util/Doxyfile @@ -1,6 +1,6 @@ INPUT = README.md index.php boot.php mod/ include/ util/ view/ version.inc RECURSIVE = YES -PROJECT_NAME = "The RedMatrix" +PROJECT_NAME = "The Hubzilla" PROJECT_LOGO = images/rm-64.png EXCLUDE = .htconfig.php library/ doc/ vendor/ .git/ util/zotsh/easywebdav/ EXCLUDE_PATTERNS = *smarty3* *strings.php *.out *test* diff --git a/util/README b/util/README index 9d8fe299c..991a3fe51 100644 --- a/util/README +++ b/util/README @@ -115,7 +115,7 @@ When strings are added or modified in source, you could run to extract strings from source files and join them with the existing .po file: new strings are added, the existing are not overwritten. -If you already translated the RedMatrix using strings.php, you could import your old +If you already translated the Hubzilla using strings.php, you could import your old translation to messages.po. Run: $ php util/php2po.php view/<language>/strings.php diff --git a/util/messages.po b/util/messages.po index b76747b99..80775104b 100644 --- a/util/messages.po +++ b/util/messages.po @@ -1,5 +1,5 @@ -# Red Matrix Project -# Copyright (C) 2012-2014 the Red Matrix Project +# Hubzilla Project +# Copyright (C) 2012-2014 the Hubzilla Project # This file is distributed under the same license as the Red package. # Mike Macgirvin, 2012 # @@ -5076,7 +5076,7 @@ msgstr "" #: ../../mod/siteinfo.php:168 msgid "" -"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com" +"Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot com" msgstr "" #: ../../mod/siteinfo.php:170 @@ -8775,7 +8775,7 @@ msgid "Right offset of the aside element" msgstr "" #: ../../view/theme/redbasic/php/config.php:82 -msgid "Light (Red Matrix default)" +msgid "Light (Hubzilla default)" msgstr "" #: ../../view/theme/redbasic/php/config.php:101 @@ -8914,7 +8914,7 @@ msgstr "" #: ../../boot.php:1515 msgid "" -"Create an account to access services and applications within the Red Matrix" +"Create an account to access services and applications within the Hubzilla" msgstr "" #: ../../boot.php:1543 diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh index 3eca8a8b3..c85ab53df 100755 --- a/util/run_xgettext.sh +++ b/util/run_xgettext.sh @@ -65,12 +65,12 @@ then sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER//g" "$OUTFILE" sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.//g" "$OUTFILE" sed -i "s/PACKAGE VERSION//g" "$OUTFILE" - sed -i "s/PACKAGE/RedMatrix $ADDONNAME addon/g" "$OUTFILE" + sed -i "s/PACKAGE/Hubzilla $ADDONNAME addon/g" "$OUTFILE" sed -i "s/CHARSET/UTF-8/g" "$OUTFILE" sed -i '/^\"Plural-Forms/d' "$OUTFILE" else - sed -i "s/SOME DESCRIPTIVE TITLE./Red Matrix Project/g" "$OUTFILE" - sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2012-2014 the Red Matrix Project/g" "$OUTFILE" + sed -i "s/SOME DESCRIPTIVE TITLE./Hubzilla Project/g" "$OUTFILE" + sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2012-2014 the Hubzilla Project/g" "$OUTFILE" sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR./Mike Macgirvin, 2012/g" "$OUTFILE" sed -i "s/PACKAGE VERSION/$F9KVERSION/g" "$OUTFILE" sed -i "s/PACKAGE/Red/g" "$OUTFILE" diff --git a/util/shredder/ShredOAuth.sh b/util/shredder/ShredOAuth.sh index f39d6f7c4..e21bea353 100755 --- a/util/shredder/ShredOAuth.sh +++ b/util/shredder/ShredOAuth.sh @@ -27,13 +27,13 @@ F_API_VERSION="1" # Friendica API endpoints -F_ACCOUNF_UPDATE_PROFILE_IMAGE="${redmatrix_url}/api/account/update_profile_image" -F_STATUSES_UPDATE="${redmatrix_url}/api/statuses/update" -F_STATUSES_HOME_TIMELINE="${redmatrix_url}/api/statuses/home_timeline" +F_ACCOUNF_UPDATE_PROFILE_IMAGE="${hubzilla_url}/api/account/update_profile_image" +F_STATUSES_UPDATE="${hubzilla_url}/api/statuses/update" +F_STATUSES_HOME_TIMELINE="${hubzilla_url}/api/statuses/home_timeline" -F_REQUESF_TOKEN=${redmatrix_url}'/api/oauth/request_token' -F_ACCESS_TOKEN=${redmatrix_url}'/api/oauth/access_token' -F_AUTHORIZE_TOKEN=${redmatrix_url}'/api/oauth/authorize' +F_REQUESF_TOKEN=${hubzilla_url}'/api/oauth/request_token' +F_ACCESS_TOKEN=${hubzilla_url}'/api/oauth/access_token' +F_AUTHORIZE_TOKEN=${hubzilla_url}'/api/oauth/authorize' # Source OAuth.sh @@ -76,7 +76,7 @@ FO_access_token_helper () { # Request Token - local auth_header="$(_OAuth_authorization_header 'Authorization' "$redmatrix_url/" "$oauth_consumer_key" "$oauth_consumer_secret" '' '' "$oauth_signature_method" "$oauth_version" "$(OAuth_nonce)" "$(OAuth_timestamp)" 'POST' "$F_REQUESF_TOKEN" "$(OAuth_param 'oauth_callback' 'oob')"), $(OAuth_param_quote 'oauth_callback' 'oob')" + local auth_header="$(_OAuth_authorization_header 'Authorization' "$hubzilla_url/" "$oauth_consumer_key" "$oauth_consumer_secret" '' '' "$oauth_signature_method" "$oauth_version" "$(OAuth_nonce)" "$(OAuth_timestamp)" 'POST' "$F_REQUESF_TOKEN" "$(OAuth_param 'oauth_callback' 'oob')"), $(OAuth_param_quote 'oauth_callback' 'oob')" # echo $auth_header # echo $F_REQUESF_TOKEN @@ -95,7 +95,7 @@ FO_access_token_helper () { # Access Token - local auth_header="$(_OAuth_authorization_header 'Authorization' "$redmatrix_url/" "$oauth_consumer_key" "$oauth_consumer_secret" "$_oauth_token" "$_oauth_token_secret" "$oauth_signature_method" "$oauth_version" "$(OAuth_nonce)" "$(OAuth_timestamp)" 'POST' "$F_ACCESS_TOKEN" "$(OAuth_param 'oauth_verifier' "$PIN")"), $(OAuth_param_quote 'oauth_verifier' "$PIN")" + local auth_header="$(_OAuth_authorization_header 'Authorization' "$hubzilla_url/" "$oauth_consumer_key" "$oauth_consumer_secret" "$_oauth_token" "$_oauth_token_secret" "$oauth_signature_method" "$oauth_version" "$(OAuth_nonce)" "$(OAuth_timestamp)" 'POST' "$F_ACCESS_TOKEN" "$(OAuth_param 'oauth_verifier' "$PIN")"), $(OAuth_param_quote 'oauth_verifier' "$PIN")" resp=$(curl -s -d "" -H "$auth_header" "$F_ACCESS_TOKEN") FO_rval=$? @@ -133,7 +133,7 @@ FO_statuses_update () { [[ "$3" != "" ]] && params[${#params[@]}]=$(OAuth_param 'in_reply_to_status_id' "$3") && local in_reply_to_status_id=( '--data-urlencode' "in_reply_to_status_id=$3" ) - local auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'POST' "$F_STATUSES_UPDATE.$format" ${params[@]}) + local auth_header=$(OAuth_authorization_header 'Authorization' "$hubzilla_url" '' '' 'POST' "$F_STATUSES_UPDATE.$format" ${params[@]}) FO_ret=$(curl -s -H "$auth_header" --data-urlencode "status=$2" --data-urlencode "source=shred" ${in_reply_to_status_id[@]} "$F_STATUSES_UPDATE.$format") @@ -163,7 +163,7 @@ FO_statuses_home_timeline () { $(OAuth_param 'count' $count) ) - local auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'GET' "$F_STATUSES_HOME_TIMELINE.$format" ${params[@]}) + local auth_header=$(OAuth_authorization_header 'Authorization' "$hubzilla_url" '' '' 'GET' "$F_STATUSES_HOME_TIMELINE.$format" ${params[@]}) convscreen=$(OAuth_PE "$screen_name"); FO_ret=$(curl -s --get "${F_STATUSES_HOME_TIMELINE}.${format}" --data "screen_name=${convscreen}&count=${count}" --header "${auth_header}") @@ -204,12 +204,12 @@ FO_command () { local auth_header=''; if [ "$post" == '1' ]; then - auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'POST' "${redmatrix_url}/api/${command}.json" ${params[@]}) - FO_ret=$(curl -s "${redmatrix_url}/api/${command}.json" --data-urlencode "${data}" --header "${auth_header}") + auth_header=$(OAuth_authorization_header 'Authorization' "$hubzilla_url" '' '' 'POST' "${hubzilla_url}/api/${command}.json" ${params[@]}) + FO_ret=$(curl -s "${hubzilla_url}/api/${command}.json" --data-urlencode "${data}" --header "${auth_header}") else - auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'GET' "${redmatrix_url}/api/${command}.json" ${params[@]}) - FO_ret=$(curl -s --get "${redmatrix_url}/api/${command}.json" --data "${data}" --header "${auth_header}") + auth_header=$(OAuth_authorization_header 'Authorization' "$hubzilla_url" '' '' 'GET' "${hubzilla_url}/api/${command}.json" ${params[@]}) + FO_ret=$(curl -s --get "${hubzilla_url}/api/${command}.json" --data "${data}" --header "${auth_header}") fi diff --git a/util/shredder/shredder b/util/shredder/shredder index ac84f0541..61e6b1fd4 100755 --- a/util/shredder/shredder +++ b/util/shredder/shredder @@ -45,7 +45,7 @@ Use -h -c command to get options for the command. show_config_help () { echo "Please create $FCLI_RC with: -redmatrix_url=YOR_SERVER_URL (no trailing /) +hubzilla_url=YOR_SERVER_URL (no trailing /) oauth_consumer_key=YOUR_CONSUMER_KEY oauth_consumer_secret=YOUR_CONSUMER_SECRET diff --git a/util/strings.php b/util/strings.php index cfd6538e0..98ae2508b 100644 --- a/util/strings.php +++ b/util/strings.php @@ -307,8 +307,8 @@ $a->strings["Newest to Oldest"] = ""; $a->strings["Enable Safe Search"] = ""; $a->strings["Disable Safe Search"] = ""; $a->strings["Safe Mode"] = ""; -$a->strings["Red Matrix Notification"] = ""; -$a->strings["redmatrix"] = ""; +$a->strings["Hubzilla Notification"] = ""; +$a->strings["hubzilla"] = ""; $a->strings["Thank You,"] = ""; $a->strings["%s Administrator"] = ""; $a->strings["%s <!item_type!>"] = ""; @@ -1067,7 +1067,7 @@ $a->strings["Click on a contact to add or remove."] = ""; $a->strings["Visible To"] = ""; $a->strings["All Connections"] = ""; $a->strings["Public Sites"] = ""; -$a->strings["The listed sites allow public registration into the Red Matrix. All sites in the matrix are interlinked so membership on any of them conveys membership in the matrix as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = ""; +$a->strings["The listed sites allow public registration into the Hubzilla. All sites in the matrix are interlinked so membership on any of them conveys membership in the matrix as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = ""; $a->strings["Site URL"] = ""; $a->strings["Access Type"] = ""; $a->strings["Registration Policy"] = ""; @@ -1108,7 +1108,7 @@ $a->strings["Please re-enter your password"] = ""; $a->strings["Away"] = ""; $a->strings["Online"] = ""; $a->strings["Please login."] = ""; -$a->strings["Red Matrix - Guests: Username: {your email address}, Password: +++"] = ""; +$a->strings["Hubzilla - Guests: Username: {your email address}, Password: +++"] = ""; $a->strings["Channel removals are not allowed within 48 hours of changing the account password."] = ""; $a->strings["Remove This Channel"] = ""; $a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = ""; @@ -1259,9 +1259,9 @@ $a->strings["Hometown: "] = ""; $a->strings["About: "] = ""; $a->strings["Keywords: "] = ""; $a->strings["This site is not a directory server"] = ""; -$a->strings["Red Matrix - "The Network""] = ""; +$a->strings["Hubzilla - "The Network""] = ""; $a->strings["Welcome to %s"] = ""; -$a->strings["Red Matrix Server - Setup"] = ""; +$a->strings["Hubzilla Server - Setup"] = ""; $a->strings["Could not connect to database."] = ""; $a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = ""; $a->strings["Could not create table."] = ""; @@ -1272,7 +1272,7 @@ $a->strings["System check"] = ""; $a->strings["Next"] = ""; $a->strings["Check again"] = ""; $a->strings["Database connection"] = ""; -$a->strings["In order to install Red Matrix we need to know how to connect to your database."] = ""; +$a->strings["In order to install Hubzilla we need to know how to connect to your database."] = ""; $a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = ""; $a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = ""; $a->strings["Database Server Name"] = ""; @@ -1364,11 +1364,11 @@ $a->strings["Version %s"] = ""; $a->strings["Installed plugins/addons/apps:"] = ""; $a->strings["No installed plugins/addons/apps"] = ""; $a->strings["Red"] = ""; -$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralized privacy enhanced websites."] = ""; +$a->strings["This is a hub of the Hubzilla - a global cooperative network of decentralized privacy enhanced websites."] = ""; $a->strings["Running at web location"] = ""; -$a->strings["Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more about the Red Matrix."] = ""; +$a->strings["Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more about the Hubzilla."] = ""; $a->strings["Bug reports and issues: please visit"] = ""; -$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = ""; +$a->strings["Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot com"] = ""; $a->strings["Site Administrators"] = ""; $a->strings["Page owner information could not be retrieved."] = ""; $a->strings["Album not found."] = ""; @@ -1654,12 +1654,12 @@ $a->strings["You have no more invitations available"] = ""; $a->strings["Send invitations"] = ""; $a->strings["Enter email addresses, one per line:"] = ""; $a->strings["Your message:"] = ""; -$a->strings["You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralized communication and information tool."] = ""; +$a->strings["You are cordially invited to join me and some other close friends on the Hubzilla - a revolutionary new decentralized communication and information tool."] = ""; $a->strings["You will need to supply this invitation code: \$invite_code"] = ""; $a->strings["Please visit my channel at"] = ""; -$a->strings["Once you have registered (on ANY Red Matrix site - they are all inter-connected), please connect with my Red Matrix channel address:"] = ""; +$a->strings["Once you have registered (on ANY Hubzilla site - they are all inter-connected), please connect with my Hubzilla channel address:"] = ""; $a->strings["Click the [Register] link on the following page to join."] = ""; -$a->strings["For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = ""; +$a->strings["For more information about the Hubzilla Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = ""; $a->strings["Unable to locate original post."] = ""; $a->strings["Empty post discarded."] = ""; $a->strings["Executable content type not permitted to this channel."] = ""; @@ -1671,7 +1671,7 @@ $a->strings["Help with this feature"] = ""; $a->strings["Layout Name"] = ""; $a->strings["Like/Dislike"] = ""; $a->strings["This action is restricted to members."] = ""; -$a->strings["Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a href=\"register\">register as a new RedMatrix member</a> to continue."] = ""; +$a->strings["Please <a href=\"rmagic\">login with your Hubzilla ID</a> or <a href=\"register\">register as a new Redmatrix.member</a> to continue."] = ""; $a->strings["Invalid request."] = ""; $a->strings["thing"] = ""; $a->strings["Channel unavailable."] = ""; @@ -1822,7 +1822,7 @@ $a->strings["Right offset of the aside element"] = ""; $a->strings["None"] = ""; $a->strings["Header image"] = ""; $a->strings["Header image only on profile pages"] = ""; -$a->strings["Light (Red Matrix default)"] = ""; +$a->strings["Light (Hubzilla default)"] = ""; $a->strings["Narrow navbar"] = ""; $a->strings["Navigation bar background color"] = ""; $a->strings["Navigation bar gradient top color"] = ""; @@ -1855,7 +1855,7 @@ $a->strings["Sloppy photo albums"] = ""; $a->strings["Are you a clean desk or a messy desk person?"] = ""; $a->strings["Update %s failed. See error logs."] = ""; $a->strings["Update Error at %s"] = ""; -$a->strings["Create an account to access services and applications within the Red Matrix"] = ""; +$a->strings["Create an account to access services and applications within the Hubzilla"] = ""; $a->strings["Password"] = ""; $a->strings["Remember me"] = ""; $a->strings["Forgot your password?"] = ""; diff --git a/util/zotsh/README.txt b/util/zotsh/README.txt index 5d03aec2c..3f31bba7f 100644 --- a/util/zotsh/README.txt +++ b/util/zotsh/README.txt @@ -14,7 +14,7 @@ Extract somewere and launch zotsh.py Description
-----------
-ZotSH is a command line WebDAV client for RedMatrix.
+ZotSH is a command line WebDAV client for Hubzilla.
It knows how to magic-auth to remote hubs using Zot.
ZotSH uses 'easywebdav' library (0) with small modifications
|